merge main

Author: xinsong-cui

.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/merge-main.yml

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

.github/workflows/release-readiness.yml

@@ -0,0 +1,68 @@
+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:
+    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

@@ -5,6 +5,10 @@ on:
   release:
     types: [ published ]
 
+permissions:
+  id-token: write
+  contents: read
+
 jobs:
   update-canary:
     runs-on: ubuntu-latest