Merge branch 'main' into add-RUSTFLAG-aws_sdk_unstable

.cargo-deny-config.toml

@@ -22,6 +22,8 @@ allow = [
 confidence-threshold = 1.0
 exceptions = [
     { allow = ["OpenSSL"], name = "ring", version = "*" },
+    { allow = ["OpenSSL"], name = "aws-lc-sys", version = "*" },
+    { allow = ["OpenSSL"], name = "aws-lc-fips-sys", version = "*" },
 ]
 
 [[licenses.clarify]]

.github/actions/docker-build/action.yml

@@ -15,7 +15,7 @@ inputs:
 runs:
   using: composite
   steps:
-  - uses: actions/cache@v3
+  - uses: actions/cache@v4
     name: Gradle Cache
     with:
       path: |
@@ -24,8 +24,8 @@ runs:
       key: ${{ runner.os }}-gradle-${{ hashFiles('gradle/caches/**/*', 'gradle/wrapper/**/*') }}
       restore-keys: |
         ${{ runner.os }}-gradle-
-    # Pinned to the commit hash of v2.1.0
-  - uses: Swatinem/rust-cache@b894d59a8d236e2979b247b80dac8d053ab340dd
+    # Pinned to the commit hash of v2.7.3
+  - uses: Swatinem/rust-cache@23bce251a8cd2ffc3c1075eaa2367cf899916d84
     with:
       shared-key: ${{ runner.os }}-${{ github.job }}
       workspaces: |
@@ -60,9 +60,10 @@ runs:
       ./smithy-rs/tools/ci-build/ci-action ${{ inputs.action }} ${{ inputs.action-arguments}}
       tar cfz artifacts-${{ inputs.action }}.tar.gz -C artifacts .
   - name: Upload artifacts
-    uses: actions/upload-artifact@v3
+    uses: actions/upload-artifact@v4
     with:
       name: artifacts-${{ inputs.action }}
       path: artifacts-${{ inputs.action }}.tar.gz
       if-no-files-found: error
       retention-days: 3
+      overwrite: true

.github/actions/download-all-artifacts/action.yml

@@ -7,7 +7,7 @@ runs:
   using: composite
   steps:
   - name: Download artifacts
-    uses: actions/download-artifact@v3
+    uses: actions/download-artifact@v4
   - name: Untar artifacts
     shell: bash
     run: find . -maxdepth 2 -iname 'artifacts-*.tar.gz' -print -exec tar xfz {} \;

.github/scripts/get-or-create-release-branch.sh

@@ -5,46 +5,18 @@
 #
 set -eux
 
-# Compute the name of the release branch starting from the version that needs to be released ($SEMANTIC_VERSION).
-# If it's the beginning of a new release series, the branch is created and pushed to the remote (chosen according to
-# the value $DRY_RUN).
-#
 # The script populates an output file with key-value pairs that are needed in the release CI workflow to carry out
 # the next steps in the release flow: the name of the release branch and a boolean flag that is set to 'true' if this
 # is the beginning of a new release series.
 
-if [ -z "$SEMANTIC_VERSION" ]; then
-  echo "'SEMANTIC_VERSION' must be populated."
-  exit 1
-fi
-
 if [ -z "$1" ]; then
   echo "You need to specify the path of the file where you want to collect the output"
   exit 1
 else
   output_file="$1"
 fi
 
-# Split on the dots
-version_array=(${SEMANTIC_VERSION//./ })
-major=${version_array[0]}
-minor=${version_array[1]}
-patch=${version_array[2]}
-if [[ "${major}" == "" || "${minor}" == "" || "${patch}" == "" ]]; then
-  echo "'${SEMANTIC_VERSION}' is not a valid semver tag"
-  exit 1
-fi
-if [[ $major == 0 ]]; then
-  branch_name="smithy-rs-release-${major}.${minor}.x"
-  if [[ $patch == 0 ]]; then
-    echo "new_release_series=true" >"${output_file}"
-  fi
-else
-  branch_name="smithy-rs-release-${major}.x.y"
-  if [[ $minor == 0 && $patch == 0 ]]; then
-    echo "new_release_series=true" >"${output_file}"
-  fi
-fi
+branch_name="smithy-rs-release-1.x.y"
 
 if [[ "${DRY_RUN}" == "true" ]]; then
   branch_name="${branch_name}-preview"

.github/workflows/canary.yml

@@ -0,0 +1,14 @@
+# Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+# SPDX-License-Identifier: Apache-2.0
+
+name: Canary
+on:
+  workflow_dispatch:
+
+jobs:
+  canary:
+    name: Canary
+    runs-on: ubuntu-latest
+    steps:
+    - name: Invoke canary in aws-sdk-rust
+      run: echo "Hello World"

.github/workflows/ci-main.yml

@@ -30,9 +30,9 @@ jobs:
       contents: read
     steps:
     - name: Checkout
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
     - name: Acquire credentials
-      uses: aws-actions/configure-aws-credentials@v2.2.0
+      uses: aws-actions/configure-aws-credentials@v4
       with:
         role-to-assume: ${{ secrets.SMITHY_RS_PUBLIC_ECR_PUSH_ROLE_ARN }}
         role-session-name: GitHubActions

.github/workflows/ci-merge-queue.yml

@@ -31,7 +31,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - name: Attempt to load a docker login password
-      uses: aws-actions/configure-aws-credentials@v2.2.0
+      uses: aws-actions/configure-aws-credentials@v4
       with:
         role-to-assume: ${{ secrets.SMITHY_RS_PUBLIC_ECR_PUSH_ROLE_ARN }}
         role-session-name: GitHubActions
@@ -58,7 +58,7 @@ jobs:
       id-token: write
       contents: read
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
       with:
         path: smithy-rs
     - name: Acquire base image
@@ -67,7 +67,7 @@ jobs:
         DOCKER_BUILDKIT: 1
       run: ./smithy-rs/.github/scripts/acquire-build-image
     - name: Acquire credentials
-      uses: aws-actions/configure-aws-credentials@v2.2.0
+      uses: aws-actions/configure-aws-credentials@v4
       with:
         role-to-assume: ${{ secrets.SMITHY_RS_PUBLIC_ECR_PUSH_ROLE_ARN }}
         role-session-name: GitHubActions

.github/workflows/ci-pr-forks.yml

@@ -21,7 +21,7 @@ jobs:
     if: ${{ github.event.pull_request.head.repo.full_name != 'smithy-lang/smithy-rs' }}
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
       with:
         path: smithy-rs
     - name: Acquire base image
@@ -30,7 +30,7 @@ jobs:
         DOCKER_BUILDKIT: 1
       run: ./smithy-rs/.github/scripts/acquire-build-image
     - name: Upload base image
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       with:
         name: smithy-rs-base-image
         path: smithy-rs-base-image

.github/workflows/ci-pr.yml

@@ -31,7 +31,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - name: Attempt to load a docker login password
-      uses: aws-actions/configure-aws-credentials@v2.2.0
+      uses: aws-actions/configure-aws-credentials@v4
       with:
         role-to-assume: ${{ secrets.SMITHY_RS_PUBLIC_ECR_PUSH_ROLE_ARN }}
         role-session-name: GitHubActions
@@ -60,7 +60,7 @@ jobs:
       id-token: write
       contents: read
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
       with:
         path: smithy-rs
     - name: Acquire base image
@@ -69,7 +69,7 @@ jobs:
         DOCKER_BUILDKIT: 1
       run: ./smithy-rs/.github/scripts/acquire-build-image
     - name: Acquire credentials
-      uses: aws-actions/configure-aws-credentials@v2.2.0
+      uses: aws-actions/configure-aws-credentials@v4
       with:
         role-to-assume: ${{ secrets.SMITHY_RS_PUBLIC_ECR_PUSH_ROLE_ARN }}
         role-session-name: GitHubActions
@@ -121,13 +121,13 @@ jobs:
       !contains(needs.*.result, 'failure') &&
       !contains(needs.*.result, 'cancelled')
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
       with:
         path: smithy-rs
         ref: ${{ inputs.git_ref }}
     - name: Get PR info
       id: check-breaking-label
-      uses: actions/github-script@v6
+      uses: actions/github-script@v7
       with:
         script: |
           const response = await github.rest.pulls.get({

.github/workflows/ci-tls.yml

@@ -29,21 +29,21 @@ jobs:
     - name: Stop nginx
       run: sudo systemctl stop nginx
     - name: Checkout smithy-rs
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
       with:
         path: ./smithy-rs
     - name: Checkout trytls
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
       with:
         repository: ouspg/trytls
         path: ./trytls
     - name: Checkout badtls
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
       with:
         repository: wbond/badtls.io
         path: ./badtls.io
     - name: Checkout badssl
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
       with:
         repository: chromium/badssl.com
         path: ./badssl.com