Merge pull request #2392 from ecpullen/update-testsys

testsys: Update testsys commit to `07b9ae8`

tools/testsys/Cargo.toml

@@ -10,19 +10,19 @@ publish = false
 anyhow = "1.0"
 aws-config = "0.46"
 aws-sdk-ec2 = "0.16"
-bottlerocket-types = { git = "https://github.com/bottlerocket-os/bottlerocket-test-system", rev = "021e8d6", version = "0.1"}
+bottlerocket-types = { git = "https://github.com/bottlerocket-os/bottlerocket-test-system", rev = "07b9ae8", version = "0.0.1"}
 bottlerocket-variant = { version = "0.1", path = "../../sources/bottlerocket-variant" }
 clap = { version = "3", features = ["derive", "env"] }
 env_logger = "0.9"
 futures = "0.3.8"
 k8s-openapi = { version = "0.15", features = ["v1_20", "api"], default-features = false }
 log = "0.4"
 maplit = "1.0.2"
-model = { git = "https://github.com/bottlerocket-os/bottlerocket-test-system", rev = "021e8d6", version = "0.1"}
+model = { git = "https://github.com/bottlerocket-os/bottlerocket-test-system", rev = "07b9ae8", version = "0.0.1"}
 pubsys-config = { path = "../pubsys-config/", version = "0.1.0" }
 serde = { version = "1", features = ["derive"] }
 serde_json = "1"
 serde_plain = "1"
-terminal_size = "0.1"
+term_size = "0.3"
 tokio = { version = "1", features = ["macros", "rt-multi-thread", "fs"] }
 unescape = "0.1.0"

tools/testsys/src/aws_resources.rs

@@ -170,6 +170,7 @@ impl AwsK8s {
             },
             spec: ResourceSpec {
                 depends_on: None,
+                conflicts_with: None,
                 agent: Agent {
                     name: "eks-provider".to_string(),
                     image: testsys_images.eks_resource.clone(),
@@ -233,6 +234,7 @@ impl AwsK8s {
             },
             spec: ResourceSpec {
                 depends_on: Some(vec![cluster_name]),
+                conflicts_with: None,
                 agent: Agent {
                     name: "ec2-provider".to_string(),
                     image: testsys_images.ec2_resource.clone(),
@@ -284,6 +286,7 @@ impl AwsK8s {
                             mode: sonobuoy_mode,
                             kubernetes_version: None,
                             kube_conformance_image: self.kube_conformance_image.clone(),
+                            e2e_repo_config_base64: None,
                             assume_role: self.assume_role.clone(),
                         }
                         .into_map()
@@ -493,6 +496,7 @@ impl AwsEcs {
             },
             spec: ResourceSpec {
                 depends_on: None,
+                conflicts_with: None,
                 agent: Agent {
                     name: "ecs-provider".to_string(),
                     image: testsys_images.ecs_resource.clone(),
@@ -548,6 +552,7 @@ impl AwsEcs {
             },
             spec: ResourceSpec {
                 depends_on: Some(vec![cluster_name]),
+                conflicts_with: None,
                 agent: Agent {
                     name: "ec2-provider".to_string(),
                     image: testsys_images.ec2_resource.clone(),

tools/testsys/src/status.rs

@@ -2,7 +2,6 @@ use anyhow::{Context, Result};
 use clap::Parser;
 use log::{debug, info};
 use model::test_manager::{SelectionParams, TestManager};
-use terminal_size::{Height, Width};
 
 /// Check the status of testsys objects.
 #[derive(Debug, Parser)]
@@ -45,10 +44,9 @@ impl Status {
                     .context("Could not create string from status.")?
             );
         } else {
-            let (terminal_size::Width(width), _) =
-                terminal_size::terminal_size().unwrap_or((Width(80), Height(0)));
+            let (width, _) = term_size::dimensions().unwrap_or((80, 0));
             debug!("Window width '{}'", width);
-            println!("{}", status.to_string(width as usize));
+            println!("{:width$}", status.to_string());
         }
         Ok(())
     }