fix: resolve testsys interface compatibility issues

Fix type mismatches and dependency conflicts that arose from the
testsys interface migration, ensuring compatibility with the
testsys repository structure and dependencies. This change also deprecates the
metal k8s test functionality in the testsys interface.

Author: gthao313

Cargo.toml

@@ -13,6 +13,11 @@ members = [
     "controller",
     "model",
     "selftest",
+    "testsys-launcher/parse-datetime",
+    "testsys-launcher/pubsys-config",
+    "testsys-launcher/bottlerocket-variant",
+    "testsys-launcher/testsys-config",
+    "testsys-launcher/testsys",
 ]
 
 resolver = "2"

testsys-launcher/bottlerocket-variant/Cargo.toml

@@ -9,6 +9,6 @@ publish = false
 exclude = ["README.md"]
 
 [dependencies]
-serde.workspace = true
-snafu.workspace = true
+serde = "1"
+snafu = "0.8"
 

testsys-launcher/parse-datetime/Cargo.toml

@@ -9,5 +9,5 @@ publish = false
 exclude = ["README.md"]
 
 [dependencies]
-chrono = { workspace = true, features = ["clock", "std"] }
-snafu = { workspace = true, features = ["backtraces-impl-backtrace-crate"] }
+chrono = { version = "0.4", features = ["clock", "std"] }
+snafu = { version = "0.8", features = ["backtraces-impl-backtrace-crate"] }

testsys-launcher/pubsys-config/Cargo.toml

@@ -7,13 +7,13 @@ edition = "2021"
 publish = false
 
 [dependencies]
-chrono = { workspace = true, features = ["clock", "std"] }
-home.workspace = true
-lazy_static.workspace = true
-log.workspace = true
-parse-datetime.workspace = true
-serde = { workspace = true, features = ["derive"] }
-serde_yaml.workspace = true
-snafu.workspace = true
-toml.workspace = true
-url = { workspace = true, features = ["serde"] }
+chrono = { version = "0.4", features = ["clock", "std"] }
+home = "0.5"
+lazy_static = "1"
+log = "0.4"
+parse-datetime = { version = "0.1", path = "../parse-datetime" }
+serde = { version = "1", features = ["derive"] }
+serde_yaml = "0.9"
+snafu = "0.8"
+toml = "0.8"
+url = { version = "2", features = ["serde"] }

testsys-launcher/pubsys-config/src/lib.rs

@@ -295,11 +295,6 @@ pub type Result<T> = std::result::Result<T, error::Error>;
 
 #[test]
 fn repo_expiration_deserialization_test() {
-    let path = PathBuf::from(env!("CARGO_MANIFEST_DIR"))
-        .join("..")
-        .join("pubsys")
-        .join("policies")
-        .join("repo-expiration")
-        .join("2w-2w-1w.toml");
+    let path = PathBuf::from(env!("CARGO_MANIFEST_DIR")).join("2w-2w-1w.toml");
     let _ = RepoExpirationPolicy::from_path(path).unwrap();
 }

testsys-launcher/testsys-config/Cargo.toml

@@ -7,14 +7,14 @@ edition = "2021"
 publish = false
 
 [dependencies]
-bottlerocket-types.workspace = true
-bottlerocket-variant.workspace = true
-handlebars.workspace = true
-log.workspace = true
-maplit.workspace = true
-testsys-model.workspace = true
-serde = { workspace = true, features = ["derive"] }
-serde_plain.workspace = true
-serde_yaml.workspace = true
-snafu.workspace = true
-toml.workspace = true
+bottlerocket-types = { version = "0.0.17", path = "../../bottlerocket/types" }
+bottlerocket-variant = { version = "0.1", path = "../bottlerocket-variant" }
+handlebars = "5"
+log = "0.4"
+maplit = "1"
+testsys-model = { version = "0.0.17", path = "../../model" }
+serde = "1"
+serde_plain = "1"
+serde_yaml = "0.9"
+snafu = "0.8"
+toml = "0.8"

testsys-launcher/testsys/Cargo.toml

@@ -10,28 +10,28 @@ edition = "2021"
 publish = false
 
 [dependencies]
-async-trait.workspace = true
-aws-config.workspace = true
-aws-sdk-ec2.workspace = true
-base64.workspace = true
-bottlerocket-types.workspace = true
-bottlerocket-variant.workspace = true
-clap = { workspace = true, features = ["derive", "env"] }
-env_logger.workspace = true
-futures.workspace = true
-handlebars.workspace = true
-log.workspace = true
-maplit.workspace = true
-testsys-model.workspace = true
-pubsys-config.workspace = true
-fastrand.workspace = true
-serde = { workspace = true, features = ["derive"] }
-serde_json.workspace = true
-serde_plain.workspace = true
-serde_yaml.workspace = true
-snafu.workspace = true
-terminal_size.workspace = true
-testsys-config.workspace = true
-tokio = { workspace = true, features = ["fs", "macros", "rt-multi-thread"] }
-unescape.workspace = true
-url.workspace = true
+async-trait = "0.1"
+aws-config = { version = "1", default-features = false, features = ["credentials-process", "default-https-client", "rt-tokio" ] }
+aws-sdk-ec2 = { version = "1", default-features = false, features = ["default-https-client", "rt-tokio"] }
+base64 = "0.22"
+bottlerocket-types = { version = "0.0.17", path = "../../bottlerocket/types" }
+bottlerocket-variant = { version = "0.1", path = "../bottlerocket-variant" }
+clap = { version = "4", features = ["derive", "env"] }
+env_logger = "0.11"
+futures = "0.3"
+handlebars = "5"
+log = "0.4"
+maplit = "1"
+testsys-model = { version = "0.0.17", path = "../../model" }
+pubsys-config = { version = "0.1", path = "../pubsys-config" }
+fastrand = "2"
+serde = "1"
+serde_json = "1"
+serde_plain = "1"
+serde_yaml = "0.9"
+snafu = "0.8"
+terminal_size = "0.4"
+testsys-config = { version = "0.1", path = "../testsys-config" }
+tokio = { version = "1", features = ["fs", "macros", "rt-multi-thread"] }
+unescape = "0.1"
+url = "2"

testsys-launcher/testsys/src/main.rs

@@ -22,7 +22,6 @@ mod delete;
 mod error;
 mod install;
 mod logs;
-mod metal_k8s;
 mod migration;
 mod restart_test;
 mod run;