Merge pull request #932 from cbgbt/tabled-bugfix

fix bug from updating tabled
bottlerocket-os · Aug 1, 2024 · 7f6b52b · 7f6b52b
2 parents 1b91057 + bda120b
commit 7f6b52b
Show file tree

Hide file tree

Showing 18 changed files with 126 additions and 62 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -6,7 +6,17 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 
 ## [Unreleased]
 
-[Unreleased]: https://github.com/bottlerocket-os/bottlerocket-test-system/compare/v0.0.13...develop
+[Unreleased]: https://github.com/bottlerocket-os/bottlerocket-test-system/compare/v0.0.14...develop
+
+## [0.0.14] - 2024-07-31
+
+### Fixed
+
+- fixed a bug preventing test names from being printed by `cli status` ([#932])
+
+[#932]: https://github.com/bottlerocket-os/bottlerocket-test-system/pull/932
+
+[0.0.14]: https://github.com/bottlerocket-os/bottlerocket-test-system/tree/v0.0.14
 
 ## [0.0.13] - 2024-07-31
 

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/agent/agent-common/Cargo.toml b/agent/agent-common/Cargo.toml
@@ -1,12 +1,12 @@
 [package]
 name = "agent-common"
-version = "0.0.13"
+version = "0.0.14"
 edition = "2021"
 publish = false
 license = "MIT OR Apache-2.0"
 
 [dependencies]
-testsys-model = { version = "0.0.13", path = "../../model" }
+testsys-model = { version = "0.0.14", path = "../../model" }
 snafu = "0.8"
 
 [dev-dependencies]

diff --git a/agent/builder-derive/Cargo.toml b/agent/builder-derive/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "builder-derive"
-version = "0.0.13"
+version = "0.0.14"
 edition = "2018"
 publish = false
 license = "MIT OR Apache-2.0"
@@ -17,5 +17,5 @@ proc-macro = true
 [dev-dependencies]
 serde = "1"
 serde_json= "1"
-testsys-model = { version = "0.0.13", path = "../../model" }
-configuration-derive = { version = "0.0.13", path = "../configuration-derive" }
+testsys-model = { version = "0.0.14", path = "../../model" }
+configuration-derive = { version = "0.0.14", path = "../configuration-derive" }
diff --git a/agent/configuration-derive/Cargo.toml b/agent/configuration-derive/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "configuration-derive"
-version = "0.0.13"
+version = "0.0.14"
 edition = "2018"
 publish = false
 license = "MIT OR Apache-2.0"

diff --git a/agent/resource-agent/Cargo.toml b/agent/resource-agent/Cargo.toml
@@ -1,15 +1,15 @@
 [package]
 name = "resource-agent"
-version = "0.0.13"
+version = "0.0.14"
 edition = "2021"
 publish = false
 license = "MIT OR Apache-2.0"
 
 [dependencies]
-agent-common = { version = "0.0.13", path = "../agent-common" }
+agent-common = { version = "0.0.14", path = "../agent-common" }
 async-trait = "0.1"
 log = "0.4"
-testsys-model = { version = "0.0.13", path = "../../model" }
+testsys-model = { version = "0.0.14", path = "../../model" }
 serde = { version = "1", features = ["derive"] }
 serde_json = "1"
 snafu = "0.8"

diff --git a/agent/test-agent-cli/Cargo.toml b/agent/test-agent-cli/Cargo.toml
@@ -1,18 +1,18 @@
 [package]
 name = "test-agent-cli"
-version = "0.0.13"
+version = "0.0.14"
 edition = "2021"
 publish = false
 license = "MIT OR Apache-2.0"
 
 [dependencies]
 argh = "0.1"
-agent-common = { version = "0.0.13", path = "../agent-common" }
+agent-common = { version = "0.0.14", path = "../agent-common" }
 copy_dir = "0.1"
-test-agent = { version = "0.0.13", path = "../test-agent" }
+test-agent = { version = "0.0.14", path = "../test-agent" }
 tokio = { version = "1", features = ["macros", "rt-multi-thread", "fs"] }
 log = "0.4"
-testsys-model = { version = "0.0.13", path = "../../model" }
+testsys-model = { version = "0.0.14", path = "../../model" }
 snafu = "0.8"
 serde_json = "1"
 env_logger = "0.10"
@@ -22,4 +22,4 @@ tar = "0.4"
 
 [dev-dependencies]
 assert_cmd = "2"
-selftest = { version = "0.0.13", path = "../../selftest" }
+selftest = { version = "0.0.14", path = "../../selftest" }
diff --git a/agent/test-agent/Cargo.toml b/agent/test-agent/Cargo.toml
@@ -1,15 +1,15 @@
 [package]
 name = "test-agent"
-version = "0.0.13"
+version = "0.0.14"
 edition = "2021"
 publish = false
 license = "MIT OR Apache-2.0"
 
 [dependencies]
-agent-common = { version = "0.0.13", path = "../agent-common" }
+agent-common = { version = "0.0.14", path = "../agent-common" }
 async-trait = "0.1"
 log = "0.4"
-testsys-model = { version = "0.0.13", path = "../../model" }
+testsys-model = { version = "0.0.14", path = "../../model" }
 serde = { version = "1", features = ["derive"] }
 serde_json = "1"
 snafu = "0.8"

diff --git a/agent/test-agent/src/k8s_client.rs b/agent/test-agent/src/k8s_client.rs
@@ -72,10 +72,7 @@ impl Client for DefaultClient {
     {
         let test_data = self.client.get(&self.name).await.context(K8sSnafu)?;
 
-        let raw_config = match test_data.spec.agent.configuration {
-            Some(serde_map) => serde_map,
-            None => Default::default(),
-        };
+        let raw_config = test_data.spec.agent.configuration.unwrap_or_default();
 
         let resource_client = ResourceClient::new()
             .await

diff --git a/agent/utils/Cargo.toml b/agent/utils/Cargo.toml
@@ -1,12 +1,12 @@
 [package]
 name = "agent-utils"
-version = "0.0.13"
+version = "0.0.14"
 edition = "2018"
 publish = false
 license = "MIT OR Apache-2.0"
 
 [dependencies]
-agent-common = { version = "0.0.13", path = "../../agent/agent-common" }
+agent-common = { version = "0.0.14", path = "../../agent/agent-common" }
 aws-config = "1"
 aws-credential-types = "1"
 aws-types = "1"
@@ -17,10 +17,10 @@ aws-smithy-types = "1"
 base64 = "0.21"
 env_logger = "0.10"
 log = "0.4"
-testsys-model = { version = "0.0.13", path = "../../model" }
-resource-agent = { version = "0.0.13", path = "../../agent/resource-agent" }
+testsys-model = { version = "0.0.14", path = "../../model" }
+resource-agent = { version = "0.0.14", path = "../../agent/resource-agent" }
 serde = { version = "1", features = ["derive"] }
 serde_json = "1"
 snafu = "0.8"
-test-agent = { version = "0.0.13", path = "../../agent/test-agent" }
+test-agent = { version = "0.0.14", path = "../../agent/test-agent" }
 tokio = { version = "1", default-features = false, features = ["time"] }
diff --git a/bottlerocket/agents/Cargo.toml b/bottlerocket/agents/Cargo.toml
@@ -1,14 +1,14 @@
 [package]
 name = "bottlerocket-agents"
-version = "0.0.13"
+version = "0.0.14"
 edition = "2018"
 publish = false
 license = "MIT OR Apache-2.0"
 
 [dependencies]
-agent-common = { version = "0.0.13", path = "../../agent/agent-common" }
-agent-utils = { version = "0.0.13", path = "../../agent/utils" }
-bottlerocket-types = { version = "0.0.13", path = "../types" }
+agent-common = { version = "0.0.14", path = "../../agent/agent-common" }
+agent-utils = { version = "0.0.14", path = "../../agent/utils" }
+bottlerocket-types = { version = "0.0.14", path = "../types" }
 async-trait = "0.1"
 aws-types = "1"
 aws-sdk-ec2 = "1"
@@ -26,16 +26,16 @@ kube = { version = "0.88", default-features = false, features = ["config", "deri
 log = "0.4"
 maplit = "1"
 openssh = { version = "0.10", features = ["native-mux"] }
-testsys-model = { version = "0.0.13", path = "../../model" }
+testsys-model = { version = "0.0.14", path = "../../model" }
 reqwest = { version = "0.11", default-features = false, features = ["rustls-tls", "blocking"] }
-resource-agent = { version = "0.0.13", path = "../../agent/resource-agent" }
+resource-agent = { version = "0.0.14", path = "../../agent/resource-agent" }
 serde = { version = "1", features = ["derive"] }
 serde_json = "1"
 serde_yaml = "0.9"
 sha2 = "0.10"
 snafu = "0.8"
 tar = "0.4"
-test-agent = { version = "0.0.13", path = "../../agent/test-agent" }
+test-agent = { version = "0.0.14", path = "../../agent/test-agent" }
 tokio = { version = "1", default-features = false, features = ["macros", "rt-multi-thread", "time"] }
 toml = "0.5"
 tough = { version = "0.17", features = ["http"] }

diff --git a/bottlerocket/types/Cargo.toml b/bottlerocket/types/Cargo.toml
@@ -1,14 +1,14 @@
 [package]
 name = "bottlerocket-types"
-version = "0.0.13"
+version = "0.0.14"
 edition = "2018"
 publish = false
 license = "MIT OR Apache-2.0"
 
 [dependencies]
-configuration-derive = { version = "0.0.13", path = "../../agent/configuration-derive" }
-builder-derive = { version = "0.0.13", path = "../../agent/builder-derive" }
-testsys-model = { version = "0.0.13", path = "../../model" }
+configuration-derive = { version = "0.0.14", path = "../../agent/configuration-derive" }
+builder-derive = { version = "0.0.14", path = "../../agent/builder-derive" }
+testsys-model = { version = "0.0.14", path = "../../model" }
 serde = "1"
 serde_plain = "1"
 serde_yaml = "0.9"

diff --git a/cli/Cargo.toml b/cli/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "cli"
-version = "0.0.13"
+version = "0.0.14"
 edition = "2021"
 publish = false
 license = "MIT OR Apache-2.0"

diff --git a/controller/Cargo.toml b/controller/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "controller"
-version = "0.0.13"
+version = "0.0.14"
 edition = "2021"
 publish = false
 license = "MIT OR Apache-2.0"
@@ -18,6 +18,6 @@ kube = { version = "0.88", default-features = false, features = ["derive", "clie
 kube-runtime = "0.88"
 lazy_static = "1"
 log = "0.4"
-testsys-model = { version = "0.0.13", path = "../model" }
+testsys-model = { version = "0.0.14", path = "../model" }
 snafu = "0.8"
 tokio = { version = "1", features = ["macros", "rt-multi-thread"] }
diff --git a/model/Cargo.toml b/model/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "testsys-model"
-version = "0.0.13"
+version = "0.0.14"
 edition = "2021"
 publish = false
 license = "MIT OR Apache-2.0"
@@ -32,7 +32,7 @@ tokio-util = "0.7"
 topological-sort = "0.2"
 
 [dev-dependencies]
-selftest = { version = "0.0.13", path = "../selftest" }
+selftest = { version = "0.0.14", path = "../selftest" }
 tokio = { version = "1", features = ["macros"] }
 
 [features]

diff --git a/model/src/test_manager/manager_impl.rs b/model/src/test_manager/manager_impl.rs
@@ -200,7 +200,7 @@ impl TestManager {
     where
         S: Into<String>,
     {
-        let resource_crd = self.resource_client().get(&resource.into()).await;
+        let resource_crd = self.resource_client().get(resource.into()).await;
         match resource_crd {
             // if the resource exists, retrieve the pod based on the truncated resource name + UID + resource state
             Ok(resource_object) => {