Revert "merge"

This reverts commit 6f00505.

Author: thomas-k-cameron

.editorconfig

@@ -9,11 +9,5 @@ indent_size = 4
 indent_style = space
 insert_final_newline = true
 max_line_length = 120
-
 # Ktlint-specific config
-ktlint_standard = enabled
-ktlint_experimental = disabled
-ktlint_standard_filename = disabled
-ktlint_standard_max-line-length = disabled
-ktlint_standard_argument-list-wrapping = disabled
-ktlint_standard_parameter-list-wrapping = disabled
+disabled_rules = filename, max-line-length, argument-list-wrapping, parameter-list-wrapping

.github/scripts/docker-image-hash

@@ -11,4 +11,4 @@ set -eo pipefail
 cd "$(dirname "$0")"
 cd "$(git rev-parse --show-toplevel)"
 
-git ls-files -s --full-name "tools/ci-build" | git hash-object --stdin
+git ls-files -s --full-name "tools" | git hash-object --stdin

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

@@ -8,6 +8,8 @@ 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).
+# If it isn't the beginning of a new release series, the script makes sure that the commit that will be tagged is at
+# the tip of the (pre-existing) release branch.
 #
 # 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
@@ -55,7 +57,16 @@ if [[ "${DRY_RUN}" == "true" ]]; then
     git push --force origin "HEAD:refs/heads/${branch_name}"
 else
     commit_sha=$(git rev-parse --short HEAD)
-    if ! git ls-remote --exit-code --heads origin "${branch_name}"; then
+    if git ls-remote --exit-code --heads origin "${branch_name}"; then
+        # The release branch already exists, we need to make sure that our commit is its current tip
+        branch_head_sha=$(git rev-parse --verify --short "refs/heads/${branch_name}")
+        if [[ "${branch_head_sha}" != "${commit_sha}" ]]; then
+            echo "The release branch - ${branch_name} - already exists. ${commit_sha}, the commit you chose when "
+            echo "launching this release, is not its current HEAD (${branch_head_sha}). This is not allowed: you "
+            echo "MUST release from the HEAD of the release branch if it already exists."
+            exit 1
+        fi
+    else
         # The release branch does not exist.
         # We need to make sure that the commit SHA that we are releasing is on `main`.
         git fetch origin main
@@ -64,7 +75,7 @@ else
             git checkout -b "${branch_name}"
             git push origin "${branch_name}"
         else
-            echo "You must choose a commit from main to create a new release branch!"
+            echo "You must choose a commit from main to create a new release series!"
             exit 1
         fi
     fi

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

@@ -29,7 +29,7 @@ on:
         required: false
 
 env:
-  rust_version: 1.66.1
+  rust_version: 1.62.1
   rust_toolchain_components: clippy,rustfmt
   ENCRYPTED_DOCKER_PASSWORD: ${{ secrets.ENCRYPTED_DOCKER_PASSWORD }}
   DOCKER_LOGIN_TOKEN_PASSPHRASE: ${{ secrets.DOCKER_LOGIN_TOKEN_PASSPHRASE }}

.github/workflows/ci.yml

@@ -10,7 +10,7 @@ concurrency:
   cancel-in-progress: true
 
 env:
-  rust_version: 1.66.1
+  rust_version: 1.62.1
 
 name: Claim unpublished crate names on crates.io
 run-name: ${{ github.workflow }}

.github/workflows/claim-crate-names.yml

@@ -28,7 +28,7 @@ concurrency:
 
 env:
   java_version: 11
-  rust_version: 1.66.1
+  rust_version: 1.62.1
   rust_toolchain_components: clippy,rustfmt
   apt_dependencies: libssl-dev gnuplot jq
 

.github/workflows/pull-request-bot.yml

@@ -44,13 +44,10 @@ module.exports = async ({
     isDryRun,
     // Release manifest file path
     releaseManifestPath,
-    // The commit-like reference that we want to release (e.g. a commit SHA or a branch name)
-    releaseCommitish,
 }) => {
     assert(github !== undefined, "The `github` argument is required");
     assert(isDryRun !== undefined, "The `isDryRun` argument is required");
     assert(releaseManifestPath !== undefined, "The `releaseManifestPath` argument is required");
-    assert(releaseCommitish !== undefined, "The `releaseCommitish` argument is required");
 
     console.info(`Starting GitHub release creation with isDryRun: ${isDryRun}, and releaseManifestPath: '${releaseManifestPath}'`);
 
@@ -77,7 +74,6 @@ module.exports = async ({
                 name: releaseManifest.name,
                 body: releaseManifest.body,
                 prerelease: releaseManifest.prerelease,
-                target_commitish: releaseCommitish,
             });
             console.info(`SUCCESS: Created release with ID: ${response.data.id}, URL: ${response.data.html_url} `);
         } else {

.github/workflows/release-scripts/create-release.js

@@ -10,16 +10,16 @@ concurrency:
   cancel-in-progress: true
 
 env:
-  rust_version: 1.66.1
+  rust_version: 1.62.1
 
 name: Release smithy-rs
 run-name: ${{ github.workflow }} ${{ inputs.semantic_version }} (${{ inputs.commit_sha }}) - ${{ inputs.dry_run && 'Dry run' || 'Production run' }}
 on:
   workflow_dispatch:
     inputs:
       commit_sha:
-        description: |
-          The SHA of the git commit that you want to release.
+        description: | 
+          The SHA of the git commit that you want to release.  
           You must use the non-abbreviated SHA (e.g. b2318b0 won't work!).
         required: true
         type: string
@@ -75,8 +75,8 @@ jobs:
     # We need `always` here otherwise this job won't run if the previous job has been skipped
     # See https://samanpavel.medium.com/github-actions-conditional-job-execution-e6aa363d2867
     if: |
-      always() &&
-      needs.acquire-base-image.result == 'success' &&
+      always() && 
+      needs.acquire-base-image.result == 'success' && 
       (needs.release-ci.result == 'success' || needs.release-ci.result == 'skipped')
     runs-on: ubuntu-latest
     outputs:
@@ -87,7 +87,6 @@ jobs:
       with:
         ref: ${{ inputs.commit_sha }}
         token: ${{ secrets.RELEASE_AUTOMATION_BOT_PAT }}
-        fetch-depth: 0
     - name: Get or create release branch
       id: branch-push
       shell: bash
@@ -113,13 +112,11 @@ jobs:
     runs-on: ubuntu-latest
     outputs:
       release_branch: ${{ needs.get-or-create-release-branch.outputs.release_branch }}
-      commit_sha: ${{ steps.gradle-push.outputs.commit_sha }}
     steps:
     - uses: actions/checkout@v3
       with:
-        ref: ${{ inputs.commit_sha }}
+        ref: ${{ needs.get-or-create-release-branch.outputs.release_branch }}
         path: smithy-rs
-        fetch-depth: 0
         token: ${{ secrets.RELEASE_AUTOMATION_BOT_PAT }}
     - name: Upgrade gradle.properties
       uses: ./smithy-rs/.github/actions/docker-build
@@ -134,30 +131,13 @@ jobs:
       shell: bash
       env:
         SEMANTIC_VERSION: ${{ inputs.semantic_version }}
-        RELEASE_COMMIT_SHA: ${{ inputs.commit_sha }}
-        RELEASE_BRANCH_NAME: ${{ needs.get-or-create-release-branch.outputs.release_branch }}
         DRY_RUN: ${{ inputs.dry_run }}
       run: |
         set -x
-
         # For debugging purposes
         git status
-
-        if ! git diff-index --quiet HEAD; then
-          # gradle.properties was changed, we need to commit and push the diff
-          git -c 'user.name=AWS SDK Rust Bot' -c 'user.email=aws-sdk-rust-primary@amazon.com' commit gradle.properties --message "Upgrade the smithy-rs runtime crates version to ${SEMANTIC_VERSION}"
-
-          # This will fail if we tried to release from a non-HEAD commit on the release branch.
-          # The only scenario where we would try to release a non-HEAD commit from the release branch is
-          # to retry a release action execution that failed due to a transient issue.
-          # In that case, we expect the commit to be releasable as-is, i.e. the runtime crate version in gradle.properties
-          # should already be the expected one.
-          git push origin "HEAD:refs/heads/${RELEASE_BRANCH_NAME}"
-
-          echo "commit_sha=$(git rev-parse HEAD)" > $GITHUB_OUTPUT
-        else
-          echo "commit_sha=${RELEASE_COMMIT_SHA}" > $GITHUB_OUTPUT
-        fi
+        # The file was actually changed, we need to commit the changes
+        git diff-index --quiet HEAD || { git -c 'user.name=AWS SDK Rust Bot' -c 'user.email=aws-sdk-rust-primary@amazon.com' commit gradle.properties --message "Upgrade the smithy-rs runtime crates version to ${SEMANTIC_VERSION}" && git push origin; }
 
   release:
     name: Release
@@ -178,7 +158,7 @@ jobs:
     - name: Checkout smithy-rs
       uses: actions/checkout@v3
       with:
-        ref: ${{ needs.upgrade-gradle-properties.outputs.commit_sha }}
+        ref: ${{ needs.upgrade-gradle-properties.outputs.release_branch }}
         path: smithy-rs
         token: ${{ secrets.RELEASE_AUTOMATION_BOT_PAT }}
     - name: Generate release artifacts
@@ -190,20 +170,9 @@ jobs:
     - name: Push smithy-rs changes
       shell: bash
       working-directory: smithy-rs-release/smithy-rs
-      id: push-changelog
-      env:
-        RELEASE_BRANCH_NAME: ${{ needs.upgrade-gradle-properties.outputs.release_branch }}
       run: |
-        if ! git diff-index --quiet HEAD; then
-          echo "Pushing release commits..."
-          # This will fail if we tried to release from a non-HEAD commit on the release branch.
-          # The only scenario where we would try to release a non-HEAD commit from the release branch is
-          # to retry a release action execution that failed due to a transient issue.
-          # In that case, we expect the commit to be releasable as-is, i.e. the changelog should have already
-          # been processed.
-          git push origin "HEAD:refs/heads/${RELEASE_BRANCH_NAME}"
-        fi
-        echo "commit_sha=$(git rev-parse HEAD)" > $GITHUB_OUTPUT
+        echo "Pushing release commits..."
+        git push origin
     - name: Tag release
       uses: actions/github-script@v6
       with:
@@ -213,8 +182,7 @@ jobs:
           await createReleaseScript({
             github,
             isDryRun: ${{ inputs.dry_run }},
-            releaseManifestPath: "smithy-rs-release/smithy-rs-release-manifest.json",
-            releaseCommitish: "${{ steps.push-changelog.outputs.commit_sha }}"
+            releaseManifestPath: "smithy-rs-release/smithy-rs-release-manifest.json"
           });
     - name: Publish to crates.io
       shell: bash
@@ -264,7 +232,7 @@ jobs:
       shell: bash
       run: |
         set -eux
-
+        
         # This will fail if other commits have been pushed to `main` after `commit_sha`
         # In particular, this will ALWAYS fail if you are creating a new release series from
         # a commit that is not the current tip of `main`.

.github/workflows/release.yml

@@ -32,7 +32,7 @@ jobs:
     - name: Set up Rust
       uses: dtolnay/rust-toolchain@master
       with:
-        toolchain: 1.66.1
+        toolchain: 1.62.1
     - name: Delete old SDK
       run: |
     - name: Generate a fresh SDK