Merge branch 'master' of github.com:Start9Labs/start-os into rebase/integration/refactors

2026-03-31 04:23:40 +00:00 · 2023-07-26 10:48:45 -06:00
parent 941650f668 9e03ac084e
commit da37d649ec
89 changed files with 3972 additions and 2851 deletions
--- a/system-images/compat/Cargo.lock
+++ b/system-images/compat/Cargo.lock
@@ -487,6 +487,15 @@ dependencies = [
 "winapi",
 ]

+[[package]]
+name = "chumsky"
+version = "0.9.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "23170228b96236b5a7299057ac284a321457700bc8c41a4476052f0f4ba5349d"
+dependencies = [
+ "hashbrown",
+]
+
 [[package]]
 name = "ciborium"
 version = "0.2.0"
@@ -607,7 +616,6 @@ dependencies = [
 "beau_collector",
 "clap 2.34.0",
 "dashmap",
- "embassy-os",
 "emver",
 "failure",
 "indexmap",
@@ -624,6 +632,7 @@ dependencies = [
 "serde",
 "serde_json",
 "serde_yaml 0.8.26",
+ "start-os",
 ]

 [[package]]
@@ -1098,6 +1107,12 @@ version = "0.15.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "03d8c417d7a8cb362e0c37e5d815f5eb7c37f79ff93707329d5a194e42e54ca0"

+[[package]]
+name = "dyn-clone"
+version = "1.0.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "304e6508efa593091e97a9abbc10f90aa7ca635b6d2784feff3c89d41dd12272"
+
 [[package]]
 name = "ecdsa"
 version = "0.14.8"
@@ -1178,114 +1193,6 @@ dependencies = [
 "zeroize",
 ]

-[[package]]
-name = "embassy-os"
-version = "0.3.4-rev.3"
-dependencies = [
- "aes",
- "async-compression",
- "async-stream",
- "async-trait",
- "base32",
- "base64 0.13.1",
- "base64ct",
- "basic-cookies",
- "bimap",
- "bollard",
- "bytes",
- "chrono",
- "ciborium",
- "clap 3.2.23",
- "color-eyre",
- "cookie",
- "cookie_store 0.19.0",
- "current_platform",
- "digest 0.10.6",
- "digest 0.9.0",
- "divrem",
- "ed25519",
- "ed25519-dalek",
- "embassy_container_init",
- "emver",
- "fd-lock-rs",
- "futures",
- "git-version",
- "gpt",
- "helpers",
- "hex",
- "hmac 0.12.1",
- "http",
- "hyper",
- "hyper-ws-listener",
- "id-pool",
- "imbl 2.0.0",
- "indexmap",
- "ipnet",
- "iprange",
- "isocountry",
- "itertools 0.10.5",
- "josekit",
- "jsonpath_lib",
- "lazy_static",
- "libc",
- "log",
- "mbrman",
- "models",
- "nix 0.25.1",
- "nom",
- "num",
- "num_enum",
- "openssh-keys",
- "openssl",
- "p256 0.12.0",
- "patch-db",
- "pbkdf2",
- "pin-project",
- "pkcs8",
- "prettytable-rs",
- "proptest",
- "proptest-derive",
- "rand 0.7.3",
- "rand 0.8.5",
- "regex",
- "reqwest",
- "reqwest_cookie_store",
- "rpassword",
- "rpc-toolkit",
- "rust-argon2",
- "scopeguard",
- "serde",
- "serde_json",
- "serde_with 2.2.0",
- "serde_yaml 0.9.16",
- "sha2 0.10.6",
- "sha2 0.9.9",
- "simple-logging",
- "sqlx",
- "ssh-key",
- "stderrlog",
- "tar",
- "thiserror",
- "tokio",
- "tokio-rustls",
- "tokio-socks",
- "tokio-stream",
- "tokio-tar",
- "tokio-tungstenite",
- "tokio-util",
- "toml",
- "torut",
- "tracing",
- "tracing-error 0.2.0",
- "tracing-futures",
- "tracing-subscriber 0.3.16",
- "trust-dns-server",
- "typed-builder",
- "url",
- "uuid 1.2.2",
- "zeroize",
-]
-
 [[package]]
 name = "embassy_container_init"
 version = "0.1.0"
@@ -1826,6 +1733,12 @@ version = "0.4.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70"

+[[package]]
+name = "hifijson"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "85ef6b41c333e6dd2a4aaa59125a19b633cd17e7aaf372b2260809777bcdef4a"
+
 [[package]]
 name = "hkdf"
 version = "0.12.3"
@@ -2057,6 +1970,25 @@ dependencies = [
 "bitmaps 3.2.0",
 ]

+[[package]]
+name = "include_dir"
+version = "0.7.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "18762faeff7122e89e0857b02f7ce6fcc0d101d5e9ad2ad7846cc01d61b7f19e"
+dependencies = [
+ "include_dir_macros",
+]
+
+[[package]]
+name = "include_dir_macros"
+version = "0.7.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b139284b5cf57ecfa712bcc66950bb635b31aff41c188e8a4cfc758eca374a3f"
+dependencies = [
+ "proc-macro2 1.0.50",
+ "quote 1.0.23",
+]
+
 [[package]]
 name = "indenter"
 version = "0.3.3"
@@ -2187,6 +2119,44 @@ version = "1.0.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "fad582f4b9e86b6caa621cabeb0963332d92eea04729ab12892c2533951e6440"

+[[package]]
+name = "jaq-core"
+version = "0.10.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "eb52eeac20f256459e909bd4a03bb8c4fab6a1fdbb8ed52d00f644152df48ece"
+dependencies = [
+ "ahash",
+ "dyn-clone",
+ "hifijson",
+ "indexmap",
+ "itertools 0.10.5",
+ "jaq-parse",
+ "log",
+ "once_cell",
+ "regex",
+ "serde_json",
+]
+
+[[package]]
+name = "jaq-parse"
+version = "0.10.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2f0f97f01eb9e87af3cbcc843b0dfe693fc6b0a2b9093dc8980dd9fc682826b0"
+dependencies = [
+ "chumsky",
+ "serde",
+]
+
+[[package]]
+name = "jaq-std"
+version = "0.10.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5b261109851c8687bc55eab26e6d81e96f3fdab367e2d3d5706947c218ddaf22"
+dependencies = [
+ "bincode",
+ "jaq-parse",
+]
+
 [[package]]
 name = "josekit"
 version = "0.8.1"
@@ -2513,6 +2483,16 @@ version = "1.0.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e4a24736216ec316047a1fc4252e27dabb04218aa4a3f37c6e7ddbf1f9782b54"

+[[package]]
+name = "new_mime_guess"
+version = "4.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c2d684d1b59e0dc07b37e2203ef576987473288f530082512aff850585c61b1f"
+dependencies = [
+ "mime",
+ "unicase",
+]
+
 [[package]]
 name = "nibble_vec"
 version = "0.1.0"
@@ -4229,6 +4209,116 @@ dependencies = [
 "zeroize",
 ]

+[[package]]
+name = "start-os"
+version = "0.3.4-rev.4"
+dependencies = [
+ "aes",
+ "async-compression",
+ "async-stream",
+ "async-trait",
+ "base32",
+ "base64 0.13.1",
+ "base64ct",
+ "basic-cookies",
+ "bollard",
+ "bytes",
+ "chrono",
+ "ciborium",
+ "clap 3.2.23",
+ "color-eyre",
+ "cookie",
+ "cookie_store 0.19.0",
+ "current_platform",
+ "digest 0.10.6",
+ "digest 0.9.0",
+ "divrem",
+ "ed25519",
+ "ed25519-dalek",
+ "embassy_container_init",
+ "emver",
+ "fd-lock-rs",
+ "futures",
+ "git-version",
+ "gpt",
+ "helpers",
+ "hex",
+ "hmac 0.12.1",
+ "http",
+ "hyper",
+ "hyper-ws-listener",
+ "imbl 2.0.0",
+ "include_dir",
+ "indexmap",
+ "ipnet",
+ "iprange",
+ "isocountry",
+ "itertools 0.10.5",
+ "jaq-core",
+ "jaq-std",
+ "josekit",
+ "jsonpath_lib",
+ "lazy_static",
+ "libc",
+ "log",
+ "mbrman",
+ "models",
+ "new_mime_guess",
+ "nix 0.25.1",
+ "nom",
+ "num",
+ "num_enum",
+ "openssh-keys",
+ "openssl",
+ "p256 0.12.0",
+ "patch-db",
+ "pbkdf2",
+ "pin-project",
+ "pkcs8",
+ "prettytable-rs",
+ "proptest",
+ "proptest-derive",
+ "rand 0.7.3",
+ "rand 0.8.5",
+ "regex",
+ "reqwest",
+ "reqwest_cookie_store",
+ "rpassword",
+ "rpc-toolkit",
+ "rust-argon2",
+ "scopeguard",
+ "serde",
+ "serde_json",
+ "serde_with 2.2.0",
+ "serde_yaml 0.9.16",
+ "sha2 0.10.6",
+ "sha2 0.9.9",
+ "simple-logging",
+ "sqlx",
+ "ssh-key",
+ "stderrlog",
+ "tar",
+ "thiserror",
+ "tokio",
+ "tokio-rustls",
+ "tokio-socks",
+ "tokio-stream",
+ "tokio-tar",
+ "tokio-tungstenite",
+ "tokio-util",
+ "toml",
+ "torut",
+ "tracing",
+ "tracing-error 0.2.0",
+ "tracing-futures",
+ "tracing-subscriber 0.3.16",
+ "trust-dns-server",
+ "typed-builder",
+ "url",
+ "uuid 1.2.2",
+ "zeroize",
+]
+
 [[package]]
 name = "stderrlog"
 version = "0.5.4"
@@ -4866,6 +4956,15 @@ version = "0.1.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9e79c4d996edb816c91e4308506774452e55e95c3c9de07b6729e17e15a5ef81"

+[[package]]
+name = "unicase"
+version = "2.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "50f37be617794602aabbeee0be4f259dc1778fabe05e2d67ee8f79326d5cb4f6"
+dependencies = [
+ "version_check",
+]
+
 [[package]]
 name = "unicode-bidi"
 version = "0.3.8"
--- a/system-images/compat/Cargo.toml
+++ b/system-images/compat/Cargo.toml
@@ -11,7 +11,7 @@ anyhow = { version = "1.0.40", features = ["backtrace"] }
 beau_collector = "0.2.1"
 clap = "2.33.3"
 dashmap = "5.3.2"
-embassy-os = { path = "../../backend", default-features = false }
+start-os = { path = "../../backend", default-features = false }
 emver = { version = "0.1.7", git = "https://github.com/Start9Labs/emver-rs.git", features = [
    "serde",
 ] }
--- a/system-images/compat/src/backup.rs
+++ b/system-images/compat/src/backup.rs
@@ -1,6 +1,6 @@
 use std::{path::Path, process::Stdio};

-use embassy::disk::main::DEFAULT_PASSWORD;
+use startos::disk::main::DEFAULT_PASSWORD;

 pub fn create_backup(
    mountpoint: impl AsRef<Path>,
@@ -19,17 +19,21 @@ pub fn create_backup(
    let mut data_cmd = std::process::Command::new("duplicity");
    for exclude in exclude.lines().map(|s| s.trim()).filter(|s| !s.is_empty()) {
        if exclude.to_string().starts_with('!') {
-            data_cmd.arg(format!(
-                "--include={}",
-                data_path
-                    .join(exclude.to_string().trim_start_matches('!'))
-                    .display()
-            )).arg("--allow-source-mismatch");
+            data_cmd
+                .arg(format!(
+                    "--include={}",
+                    data_path
+                        .join(exclude.to_string().trim_start_matches('!'))
+                        .display()
+                ))
+                .arg("--allow-source-mismatch");
        } else {
-            data_cmd.arg(format!(
-                "--exclude={}",
-                data_path.join(exclude.to_string()).display()
-            )).arg("--allow-source-mismatch");
+            data_cmd
+                .arg(format!(
+                    "--exclude={}",
+                    data_path.join(exclude.to_string()).display()
+                ))
+                .arg("--allow-source-mismatch");
        }
    }
    let data_output = data_cmd
--- a/system-images/compat/src/config/mod.rs
+++ b/system-images/compat/src/config/mod.rs
@@ -3,11 +3,11 @@ use std::collections::{BTreeMap, BTreeSet, HashMap};
 use std::path::Path;

 use beau_collector::BeauCollector;
-use embassy::config::action::SetResult;
-use embassy::config::{spec, Config};
-use embassy::s9pk::manifest::PackageId;
-use embassy::status::health_check::HealthCheckId;
 use linear_map::LinearMap;
+use startos::config::action::SetResult;
+use startos::config::{spec, Config};
+use startos::s9pk::manifest::PackageId;
+use startos::status::health_check::HealthCheckId;

 pub mod rules;

--- a/system-images/compat/src/config/rules.rs
+++ b/system-images/compat/src/config/rules.rs
@@ -7,8 +7,8 @@ use pest::Parser;
 use rand::SeedableRng;
 use serde_json::Value;

-use embassy::config::util::STATIC_NULL;
-use embassy::config::Config;
+use startos::config::util::STATIC_NULL;
+use startos::config::Config;

 #[derive(Parser)]
 #[grammar = "config/rule_parser.pest"]
--- a/system-images/compat/src/main.rs
+++ b/system-images/compat/src/main.rs
@@ -19,8 +19,8 @@ use clap::{App, Arg, SubCommand};
 use config::{
    apply_dependency_configuration, validate_configuration, validate_dependency_configuration,
 };
-use embassy::config::action::ConfigRes;
 use serde_json::json;
+use startos::config::action::ConfigRes;

 const PROPERTIES_FALLBACK_MESSAGE: &str =
    "Could not find properties. The service might still be starting";