feat: move testsys interface from twoliter to testsys repo

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"

Makefile

@@ -8,7 +8,7 @@ SHELL = /bin/bash
 TOP := $(dir $(firstword $(MAKEFILE_LIST)))
 
 # Variables we update as newer versions are released
-BOTTLEROCKET_SDK_VERSION = v0.50.1
+BOTTLEROCKET_SDK_VERSION = v0.62.0
 BOTTLEROCKET_SDK_ARCH = $(TESTSYS_BUILD_HOST_UNAME_ARCH)
 BOTTLEROCKET_TOOLS_VERSION ?= v0.10.0
 

agent/builder-derive/src/derive.rs

@@ -33,7 +33,7 @@ pub(crate) fn build_struct(ast: &syn::DeriveInput) -> TokenStream {
                 None
             }
         })
-        .last()
+        .next_back()
         .expect("`crd` is a required attribute (Test, Resource)")
         .value();
 

agent/utils/src/aws.rs

@@ -34,7 +34,7 @@ pub async fn aws_config(
         region
     );
 
-    let mut config_loader = aws_config::defaults(BehaviorVersion::v2025_01_17()).retry_config(
+    let mut config_loader = aws_config::defaults(BehaviorVersion::v2025_08_07()).retry_config(
         RetryConfig::standard()
             .with_retry_mode(RetryMode::Adaptive)
             .with_max_attempts(15),
@@ -95,7 +95,10 @@ pub async fn aws_config(
             .set_duration_seconds(*assume_role_session_duration)
             .send()
             .await
-            .context(error::AssumeRoleSnafu { role_arn })?
+            .map_err(|source| Error::AssumeRole {
+                role_arn: role_arn.to_string(),
+                source: Box::new(source),
+            })?
             .credentials()
             .context(error::CredentialsMissingSnafu { role_arn })?
             .clone();

agent/utils/src/error.rs

@@ -15,7 +15,7 @@ use std::string::FromUtf8Error;
 pub enum Error {
     AssumeRole {
         role_arn: String,
-        source: StsSdkError<AssumeRoleError>,
+        source: Box<StsSdkError<AssumeRoleError>>,
     },
 
     #[snafu(display(
@@ -27,7 +27,7 @@ pub enum Error {
     AttachRolePolicy {
         role_name: String,
         policy_arn: String,
-        source: IamSdkError<aws_sdk_iam::operation::attach_role_policy::AttachRolePolicyError>,
+        source: Box<IamSdkError<aws_sdk_iam::operation::attach_role_policy::AttachRolePolicyError>>,
     },
 
     #[snafu(display("Failed to decode base64 blob: {}", source))]
@@ -48,7 +48,7 @@ pub enum Error {
 
     #[snafu(display("Failed to send create SSM command: {}", source))]
     CreateSsmActivation {
-        source: aws_sdk_ssm::error::SdkError<CreateActivationError>,
+        source: Box<aws_sdk_ssm::error::SdkError<CreateActivationError>>,
     },
 
     #[snafu(display(
@@ -60,7 +60,7 @@ pub enum Error {
     CreateRole {
         role_name: String,
         role_policy: String,
-        source: IamSdkError<CreateRoleError>,
+        source: Box<IamSdkError<CreateRoleError>>,
     },
 
     #[snafu(display("Credentials were missing for assumed role '{}'", role_arn))]
@@ -71,13 +71,13 @@ pub enum Error {
 
     #[snafu(display("Unable to get managed instance information: {}", source))]
     GetManagedInstanceInfo {
-        source: SsmSdkError<DescribeInstanceInformationError>,
+        source: Box<SsmSdkError<DescribeInstanceInformationError>>,
     },
 
     #[snafu(display("Unable to get SSM role '{}': {}", role_name, source))]
     GetSSMRole {
         role_name: String,
-        source: IamSdkError<GetRoleError>,
+        source: Box<IamSdkError<GetRoleError>>,
     },
 
     #[snafu(display("{} was missing from {}", what, from))]

agent/utils/src/ssm.rs

@@ -1,4 +1,4 @@
-use crate::error::{self, Result};
+use crate::error::{self, Error, Result};
 use aws_sdk_iam::error::SdkError as IamSdkError;
 use aws_sdk_ssm::types::{InstanceInformation, InstanceInformationStringFilter, Tag};
 use log::info;
@@ -40,15 +40,16 @@ pub async fn ensure_ssm_service_role(iam_client: &aws_sdk_iam::Client) -> Result
                     .assume_role_policy_document(&assume_role_doc)
                     .send()
                     .await
-                    .context(error::CreateRoleSnafu {
-                        role_name: SSM_MANAGED_INSTANCE_SERVICE_ROLE_NAME,
+                    .map_err(|source| Error::CreateRole {
+                        source: Box::new(source),
+                        role_name: SSM_MANAGED_INSTANCE_SERVICE_ROLE_NAME.to_string(),
                         role_policy: assume_role_doc,
                     })?;
             }
             e => {
-                return Err(error::Error::GetSSMRole {
+                return Err(Error::GetSSMRole {
                     role_name: SSM_MANAGED_INSTANCE_SERVICE_ROLE_NAME.to_string(),
-                    source: e,
+                    source: Box::new(e),
                 });
             }
         }
@@ -61,9 +62,10 @@ pub async fn ensure_ssm_service_role(iam_client: &aws_sdk_iam::Client) -> Result
         .policy_arn(SSM_MANAGED_INSTANCE_POLICY_ARN)
         .send()
         .await
-        .context(error::AttachRolePolicySnafu {
-            role_name: SSM_MANAGED_INSTANCE_SERVICE_ROLE_NAME,
-            policy_arn: SSM_MANAGED_INSTANCE_POLICY_ARN,
+        .map_err(|source| Error::AttachRolePolicy {
+            source: Box::new(source),
+            role_name: SSM_MANAGED_INSTANCE_SERVICE_ROLE_NAME.to_string(),
+            policy_arn: SSM_MANAGED_INSTANCE_POLICY_ARN.to_string(),
         })?;
 
     Ok(())
@@ -87,7 +89,9 @@ pub async fn create_ssm_activation(
         )
         .send()
         .await
-        .context(error::CreateSsmActivationSnafu {})?;
+        .map_err(|source| Error::CreateSsmActivation {
+            source: Box::new(source),
+        })?;
     let activation_id = activations.activation_id.context(error::MissingSnafu {
         what: "activation id",
         from: "activations",
@@ -118,7 +122,9 @@ pub async fn wait_for_ssm_ready(
             )
             .send()
             .await
-            .context(error::GetManagedInstanceInfoSnafu {})?;
+            .map_err(|source| Error::GetManagedInstanceInfo {
+                source: Box::new(source),
+            })?;
         if let Some(info) = instance_info
             .instance_information_list()
             .iter()

bottlerocket/agents/src/bin/ecs-test-agent/main.rs

@@ -81,7 +81,9 @@ where
             .launch_type(LaunchType::Ec2)
             .send()
             .await
-            .context(error::TaskRunCreationSnafu)?;
+            .map_err(|source| Error::TaskRunCreation {
+                source: Box::new(source),
+            })?;
         let task_arns: Vec<String> = run_task_output
             .tasks()
             .iter()
@@ -146,7 +148,9 @@ async fn test_results(
         .set_tasks(Some(task_arns.to_vec()))
         .send()
         .await
-        .context(error::TaskDescribeSnafu)?
+        .map_err(|source| Error::TaskDescribe {
+            source: Box::new(source),
+        })?
         .tasks()
         .to_owned();
     let running_count = tasks
@@ -184,7 +188,9 @@ async fn wait_for_registered_containers(
             .clusters(cluster)
             .send()
             .await
-            .context(error::ClusterDescribeSnafu)?
+            .map_err(|source| Error::ClusterDescribe {
+                source: Box::new(source),
+            })?
             .clusters()
             .first()
             .context(error::NoTaskSnafu)?
@@ -234,7 +240,9 @@ async fn create_task_definition(ecs_client: &aws_sdk_ecs::Client) -> Result<Stri
         .memory("512")
         .send()
         .await
-        .context(error::TaskDefinitionCreationSnafu)?;
+        .map_err(|source| Error::TaskDefinitionCreation {
+            source: Box::new(source),
+        })?;
     let revision = task_info
         .task_definition()
         .context(error::TaskDefinitionMissingSnafu)?
@@ -249,7 +257,9 @@ async fn latest_task_revision(ecs_client: &aws_sdk_ecs::Client) -> Result<String
         .task_definition(DEFAULT_TASK_DEFINITION)
         .send()
         .await
-        .context(error::TaskDefinitionDescribeSnafu)?;
+        .map_err(|source| Error::TaskDefinitionDescribe {
+            source: Box::new(source),
+        })?;
     let revision = task_info
         .task_definition()
         .context(error::TaskDefinitionMissingSnafu)?

bottlerocket/agents/src/bin/ecs-workload-agent/main.rs

@@ -135,7 +135,9 @@ where
                 .launch_type(LaunchType::Ec2)
                 .send()
                 .await
-                .context(error::TaskRunCreationSnafu)?;
+                .map_err(|source| Error::TaskRunCreation {
+                    source: Box::new(source),
+                })?;
             let run_task_arns: Vec<String> = run_task_output
                 .tasks()
                 .iter()
@@ -243,7 +245,9 @@ async fn test_results(
         .set_tasks(Some(task_arns.to_vec()))
         .send()
         .await
-        .context(error::TaskDescribeSnafu)?
+        .map_err(|source| Error::TaskDescribe {
+            source: Box::new(source),
+        })?
         .tasks()
         .to_owned();
     let passed_count = tasks
@@ -300,7 +304,9 @@ async fn wait_for_cluster_ready(
             .clusters(cluster)
             .send()
             .await
-            .context(error::ClusterDescribeSnafu)?
+            .map_err(|source| Error::ClusterDescribe {
+                source: Box::new(source),
+            })?
             .clusters()
             .first()
             .context(error::NoTaskSnafu)?
@@ -363,7 +369,9 @@ async fn find_task_rev(
         .family_prefix(task_def_name)
         .send()
         .await
-        .context(error::TaskDefinitionListSnafu)?;
+        .map_err(|source| Error::TaskDefinitionList {
+            source: Box::new(source),
+        })?;
     let task_revisions = task_revisions.task_definition_arns();
 
     for task_rev_arn in task_revisions {
@@ -454,7 +462,9 @@ async fn create_task_definition(
         .container_definitions(create_container_definition(test_def)?)
         .send()
         .await
-        .context(error::TaskDefinitionCreationSnafu)?;
+        .map_err(|source| Error::TaskDefinitionCreation {
+            source: Box::new(source),
+        })?;
     if let Some(task_arn) = task_info
         .task_definition()
         .context(error::TaskDefinitionMissingSnafu)?

bottlerocket/agents/src/bin/migration-test-agent/ssm.rs

@@ -4,7 +4,7 @@ use aws_sdk_ssm::types::{
     CommandInvocation, CommandInvocationStatus, DocumentFormat, DocumentType,
     InstanceInformationStringFilter,
 };
-use bottlerocket_agents::error;
+use bottlerocket_agents::error::{self, Error};
 use log::{debug, info};
 use maplit::hashmap;
 use sha2::{Digest, Sha256};
@@ -34,7 +34,9 @@ pub(crate) async fn wait_for_ssm_ready(
             )
             .send()
             .await
-            .context(error::SsmDescribeInstanceInfoSnafu)?;
+            .map_err(|source| Error::SsmDescribeInstanceInfo {
+                source: Box::new(source),
+            })?;
         num_ready = instance_info.instance_information_list().len();
         sleep(sec_between_checks);
     }
@@ -73,7 +75,9 @@ pub(crate) async fn create_or_update_ssm_document(
                                 .document_format(DocumentFormat::Yaml)
                                 .send()
                                 .await
-                                .context(error::SsmCreateDocumentSnafu)?;
+                                .map_err(|source| Error::SsmCreateDocument {
+                                    source: Box::new(source),
+                                })?;
                             Ok(())
                         }
                         _ => error::SsmDescribeDocumentSnafu {
@@ -120,7 +124,9 @@ pub(crate) async fn create_or_update_ssm_document(
         .document_format(DocumentFormat::Yaml)
         .send()
         .await
-        .context(error::SsmUpdateDocumentSnafu)?;
+        .map_err(|source| Error::SsmUpdateDocument {
+            source: Box::new(source),
+        })?;
     Ok(())
 }
 
@@ -135,7 +141,9 @@ async fn wait_command_finish(
             .command_id(cmd_id.to_owned())
             .send()
             .await
-            .context(error::SsmListCommandInvocationsSnafu)?;
+            .map_err(|source| Error::SsmListCommandInvocations {
+                source: Box::new(source),
+            })?;
         if let Some(invocations) = cmd_status.command_invocations {
             if invocations.is_empty()
                 || invocations.iter().any(|i| {
@@ -171,7 +179,9 @@ pub(crate) async fn ssm_run_command(
         .timeout_seconds(30)
         .send()
         .await
-        .context(error::SsmSendCommandSnafu)?
+        .map_err(|source| Error::SsmSendCommand {
+            source: Box::new(source),
+        })?
         .command()
         .and_then(|c| c.command_id().map(|s| s.to_string()))
         .context(error::SsmCommandIdSnafu)?;