V1.5 main merge

.brazil-1.x.json

@@ -0,0 +1,28 @@
+{
+  "dependencies": {
+    "org.jetbrains.kotlin:kotlin-gradle-plugin:2.*": "KotlinGradlePlugin-2.x",
+    "org.jetbrains.kotlin:kotlin-stdlib-common:2.*.*": "KotlinStdlibCommon-2.x",
+    "org.jetbrains.kotlin:kotlin-stdlib-jdk8:2.*.*": "KotlinStdlibJdk8-2.x",
+    "org.jetbrains.kotlin:kotlin-stdlib:2.*.*": "KotlinStdlib-2.x",
+    "org.jetbrains.kotlinx:atomicfu:0.*.*": "Atomicfu-0.x",
+    "org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.*": "KotlinxCoroutinesCoreJvm-1.x",
+    "org.jetbrains.kotlinx:kotlinx-coroutines-jdk8:1.*": "KotlinxCoroutinesJdk8-1.x",
+    "com.google.devtools.ksp:symbol-processing-api:2.*": "Maven-com-google-devtools-ksp_symbol-processing-api-2.x",
+    "com.google.devtools.ksp:symbol-processing-gradle-plugin:2.*": "Maven-com-google-devtools-ksp_symbol-processing-gradle-plugin-2.x"
+  },
+  "packageHandlingRules": {
+    "versioning": {
+      "defaultVersionLayout": "{MAJOR}.x"
+    },
+    "ignore": [
+      "aws.sdk.kotlin:bom",
+      "aws.sdk.kotlin:testing",
+      "aws.sdk.kotlin:version-catalog"
+    ],
+    "resolvesConflictDependencies": {
+      "org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.*" : ["KotlinxCoroutinesCoreJvm-1.x"],
+      "org.jetbrains.kotlinx:kotlinx-coroutines-jdk8:1.*": ["KotlinxCoroutinesJdk8-1.x"],
+      "aws.smithy.kotlin:aws-event-stream:1.*": ["KotlinxCoroutinesCoreJvm-1.x"]
+    }
+  }
+}

.github/scripts/run-codebuild-batch-job.sh

@@ -94,7 +94,8 @@ START_RESULT=$(
   aws codebuild start-build-batch \
     --project-name ${PROJECT_NAME} \
     --source-version $SOURCE_VERSION \
-    --environment-variables-override file:///tmp/gh_env_vars.json
+    --environment-variables-override file:///tmp/gh_env_vars.json \
+    --source-location-override "https://github.com/awslabs/$GITHUB_REPOSITORY_NO_ORG.git"
 )
 
 if [ "$?" != "0" ]; then

.github/workflows/changelog-verification.yml

@@ -1,5 +1,8 @@
 name: Changelog verification
 
+permissions:
+  id-token: write
+
 on:
   pull_request:
     types: [ opened, synchronize, reopened, labeled, unlabeled ]
@@ -11,16 +14,11 @@ jobs:
   changelog-verification:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
-      - name: Check for changelog entry
-        if: ${{ !contains(github.event.pull_request.labels.*.name, 'no-changelog') }}
-        run: |
-          git fetch origin ${{ github.base_ref }} --depth 1 && \
-          git diff remotes/origin/${{ github.base_ref }} --name-only | grep -P "\.changes/[0-9a-f-]+\.json"
-      - name: Error message
-        if: ${{ failure() }}
-        run: |
-          echo "::error ::No new/updated changelog entry found in /.changes directory. Please either:"
-          echo "::error ::* Add a changelog entry (see CONTRIBUTING.md for instructions) –or–"
-          echo "::error ::* Add the 'no-changelog' label to this PR (in rare cases not warranting a changelog entry)"
-          exit 1
+      - name: Configure AWS Credentials
+        uses: aws-actions/configure-aws-credentials@v4
+        with:
+          role-to-assume: ${{ secrets.CI_AWS_ROLE_ARN }}
+          aws-region: us-west-2
+
+      - name: Verify changelog
+        uses: awslabs/aws-kotlin-repo-tools/.github/actions/changelog-verification@main

.github/workflows/merge-main.yml

@@ -11,4 +11,5 @@ jobs:
       - name: Merge main
         uses: awslabs/aws-kotlin-repo-tools/.github/actions/merge-main@main
         with:
-          exempt-branches: # Add any if required
+          ci-user-pat: ${{ secrets.CI_USER_PAT }}
+          exempt-branches: # Add any if required

.github/workflows/release-readiness.yml

@@ -0,0 +1,69 @@
+name: Release readiness (snapshot dependency)
+description: >
+  Makes sure that we aren't relying on SNAPSHOT/dev versions of smithy-kotlin before merging
+  otherwise we could forget because the rest of CI is masking it.
+
+on:
+  pull_request:
+    types: [ opened, synchronize, reopened, labeled, unlabeled ]
+    branches: [ main ]
+
+jobs:
+  release-readiness:
+    if: ${{ !contains(github.event.pull_request.labels.*.name, 'ready-for-release') }}
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout SDK
+        uses: actions/checkout@v4
+        with:
+          path: 'aws-sdk-kotlin'
+
+      - name: Configure Gradle
+        uses: awslabs/aws-kotlin-repo-tools/.github/actions/configure-gradle@main
+        with:
+          working-directory: ./aws-sdk-kotlin
+
+      - name: Build SDK
+        working-directory: ./aws-sdk-kotlin
+        run: ./gradlew test jvmTest
+
+      - name: Build SDK client
+        working-directory: ./aws-sdk-kotlin
+        run: |
+          ./gradlew -Paws.kotlin.native=false -Paws.services=s3 bootstrap
+          ./gradlew -Paws.kotlin.native=false build
+
+      - name: Checkout smithy-kotlin
+        uses: awslabs/aws-kotlin-repo-tools/.github/actions/checkout-head@main
+        with:
+          path: 'smithy-kotlin'
+          repository: 'smithy-lang/smithy-kotlin'
+
+      - name: Check for smithy-kotlin unreleased changes
+        run: |
+          echo "aws-sdk-kotlin branch: $GITHUB_HEAD_REF"
+
+          cd smithy-kotlin
+          SMITHY_KOTLIN_BRANCH=$(git branch --show-current)
+          echo "smithy-kotlin branch: $SMITHY_KOTLIN_BRANCH"
+
+          if [ "$GITHUB_HEAD_REF" == "$SMITHY_KOTLIN_BRANCH" ]; then
+            cd ../aws-sdk-kotlin
+            git fetch origin
+
+            DIFF=$(git diff origin/main -- gradle/libs.versions.toml | grep '^[-+][^-+]'; exit 0)
+            SMITHY_KOTLIN_VERSION_BUMP=$(echo "$DIFF" | grep "smithy-kotlin-runtime-version =\|smithy-kotlin-codegen-version ="; exit 0)
+
+            if [ -z "$SMITHY_KOTLIN_VERSION_BUMP" ]; then
+              echo "::error::Matching smithy-kotlin and aws-sdk-kotlin branches but no smithy-kotlin version bump"
+              exit 1
+            else
+              echo "Matching smithy-kotlin and aws-sdk-kotlin branches with smithy-kotlin version bump detected"
+            fi
+          fi
+
+      - name: Emit error message
+        if: ${{ failure() }}
+        run: |
+          echo "::error::Did you forget to release smithy-kotlin and bump the dependency version?"
+          exit 1

.github/workflows/update-canary.yml

@@ -0,0 +1,80 @@
+# After every GitHub release, verify that the Maven artifacts are available, then kick off
+# a canary deployment with the latest version of the SDK.
+name: Update Canary
+on:
+  release:
+    types: [ published ]
+
+permissions:
+  id-token: write
+  contents: read
+
+jobs:
+  update-canary:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Configure AWS Credentials
+        uses: aws-actions/configure-aws-credentials@v4
+        with:
+          role-to-assume: ${{ secrets.CI_AWS_ROLE_ARN }}
+          aws-region: us-west-2
+
+
+      - name: Verify artifact is available on Maven
+        shell: bash
+        # Maven can take up to 2 hours after the release has succeeded to publish our artifacts
+        # FIXME Track execution duration over time and see if this can be shortened
+        timeout-minutes: 120
+        run: |
+          TAG="${{ github.event.release.tag_name }}"
+          VERSION="${TAG#v}"
+          MAVEN_URL="https://repo.maven.apache.org/maven2/aws/sdk/kotlin/s3/${VERSION}/"
+
+          echo "Checking for an artifact at $MAVEN_URL"
+
+          while true; do
+            STATUS=$(curl -i -s -o /dev/null -w "%{http_code}" "$MAVEN_URL")
+            echo "Status: $STATUS"
+
+            if [[ "$STATUS" == "200" ]]; then
+              echo "Artifact is available at $MAVEN_URL"
+              exit 0
+            fi
+
+            sleep 30
+          done
+
+      - name: Update canary
+        shell: bash
+        timeout-minutes: 15
+        run: |
+          set -euo pipefail
+
+          TAG="${{ github.event.release.tag_name }}"
+          EXECUTION_NAME="update-canary-${TAG}"
+          STATE_MACHINE_ARN="arn:aws:states:us-west-2:${{ secrets.CI_USER }}:stateMachine:DeployLatestSdkVersion"
+
+          echo "Starting step function: $EXECUTION_NAME"
+            EXECUTION_ARN=$(aws stepfunctions start-execution \
+            --state-machine-arn "$STATE_MACHINE_ARN" \
+            --name "$EXECUTION_NAME" \
+            --input '{}' \
+            --query 'executionArn' \
+            --output text)
+
+          echo "Waiting for step function to complete..."
+
+          while true; do
+            STATUS=$(aws stepfunctions describe-execution --execution-arn "$EXECUTION_ARN" --query 'status' --output text)
+            echo "Status: $STATUS"
+
+            if [[ "$STATUS" == "SUCCEEDED" ]]; then
+              echo "Step Function completed successfully"
+              exit 0
+            elif [[ "$STATUS" == "FAILED" || "$STATUS" == "TIMED_OUT" || "$STATUS" == "ABORTED" ]]; then
+              echo "Step Function failed with status: $STATUS"
+              exit 1
+            fi
+
+            sleep 10
+          done

.gitignore

@@ -17,6 +17,7 @@ local.properties
 services/*/generated-src
 services/*/build.gradle.kts
 services/*/API.md
+services/*/OVERVIEW.md
 .kotest/
 .kotlin/
 *.klib