Unverified Commit 82b190cd authored by John DiSanti's avatar John DiSanti Committed by GitHub
Browse files

Upgrade canary-runner to 1.x and fix bundle naming issue (#3289) 

The SDK canary was failing due to the `.N` suffix on release tags (see
https://github.com/awslabs/aws-sdk-rust/issues/993). This change
upgrades the canary to the 1.x SDK and also fixes the bundle naming
issue by removing periods.

----

_By submitting this pull request, I confirm that you can use, modify,
copy, and redistribute this contribution, under the terms of your
choice._
parent 1c445774

tools/ci-cdk/canary-runner/Cargo.lock

+691 −455

File changed.

Preview size limit exceeded, changes collapsed.

tools/ci-cdk/canary-runner/Cargo.toml

+4 −4
Original line number Diff line number Diff line
@@ -12,10 +12,10 @@ publish = false 
[dependencies]

anyhow = "1"

async-trait = "0.1.56"

aws-config = "0.56.0"

aws-sdk-cloudwatch = "0.29.0"

aws-sdk-lambda = "0.29.0"

aws-sdk-s3 = "0.29.0"

aws-config = { version = "1", features = ["behavior-version-latest"] }

aws-sdk-cloudwatch = "1"

aws-sdk-lambda = "1"

aws-sdk-s3 = "1"

base64 = "0.13"

clap = { version = "3.2.17", features = ["derive"] }

hex = "0.4.3"

tools/ci-cdk/canary-runner/src/build_bundle.rs

+10 −1
Original line number Diff line number Diff line
@@ -215,7 +215,7 @@ fn name_hashed_bundle( 
    // Lambda function names can't have periods in them

    let rust_version = rust_version.map(|s| s.replace('.', ""));

    let rust_version = rust_version.as_deref().unwrap_or("unknown");

    let sdk_release_tag = sdk_release_tag.map(|s| s.to_string().replace('-', ""));

    let sdk_release_tag = sdk_release_tag.map(|s| s.to_string().replace(['-', '.'], ""));

    let sdk_release_tag = sdk_release_tag.as_deref().unwrap_or("untagged");

    Ok(format!(

        "canary-{sdk_release_tag}-{rust_version}-{bin_hash}.zip"
@@ -549,6 +549,15 @@ default = ["latest"] 
            )

            .unwrap(),

        );

        check(

            "canary-release202212162-1621-7ae6085d2105d5d1e13b10f8.zip",

            &name_hashed_bundle(

                "7ae6085d2105d5d1e13b10f882c6cb072ff5bbf8",

                Some("1.62.1"),

                Some(&ReleaseTag::from_str("release-2022-12-16.2").unwrap()),

            )

            .unwrap(),

        );

        check(

            "canary-untagged-1621-7ae6085d2105d5d1e13b10f8.zip",

            &name_hashed_bundle(