chore: merge main into v1.5-main

.github/workflows/codebuild-ci.yml

@@ -85,6 +85,8 @@ jobs:
         with:
           role-to-assume: ${{ secrets.CI_AWS_ROLE_ARN }}
           aws-region: us-west-2
+      - name: Configure Gradle
+        uses: awslabs/aws-kotlin-repo-tools/.github/actions/configure-gradle@main
       - name: Run Service Check Batch and Calculate Artifact Size Metrics
         id: svc-check-batch
         run: | 
@@ -140,56 +142,9 @@ jobs:
           ./gradlew collectDelegatedArtifactSizeMetrics -PpullRequest=$PULL_REQUEST
       - name: Analyze Artifact Size Metrics
         run: ./gradlew analyzeArtifactSizeMetrics
-      - name: Show Results
-        uses: actions/github-script@v7
-        with:
-          script: |
-            const getComments = 
-              `query { 
-                repository(owner:"${context.repo.owner}", name:"${context.repo.repo}"){
-                  pullRequest(number: ${context.issue.number ?? process.env.SDK_PR}) {
-                    id
-                    comments(last:100) {
-                      nodes {
-                        id
-                        body
-                        author {
-                          login
-                        }
-                        isMinimized
-                      }
-                    }
-                  }
-                } 
-              }`
-
-            const response = await github.graphql(getComments)
-            const comments = response.repository.pullRequest.comments.nodes
-
-            const mutations = comments
-              .filter(comment => comment.author.login == 'github-actions' && !comment.isMinimized && comment.body.startsWith('Affected Artifacts'))
-              .map(comment =>
-                github.graphql(
-                  `mutation {
-                    minimizeComment(input:{subjectId:"${comment.id}", classifier:OUTDATED}){
-                      clientMutationId
-                    }
-                  }`
-                )
-              )
-            await Promise.all(mutations)
 
-            const fs = require('node:fs')
-            const comment = fs.readFileSync('build/reports/metrics/artifact-analysis.md', 'utf8')
-
-            const writeComment = 
-              `mutation {
-                addComment(input:{body:"""${comment}""", subjectId:"${response.repository.pullRequest.id}"}){
-                  clientMutationId
-                }
-              }`
-
-            await github.graphql(writeComment)
+      - name: Show Results
+        uses: awslabs/aws-kotlin-repo-tools/.github/actions/artifact-size-metrics/show-results@main
 
       - name: Evaluate Result
         if: ${{ !contains(github.event.pull_request.labels.*.name, 'acknowledge-artifact-size-increase') }}
@@ -212,6 +167,8 @@ jobs:
         with:
           role-to-assume: ${{ secrets.CI_AWS_ROLE_ARN }}
           aws-region: us-west-2
+      - name: Configure Gradle
+        uses: awslabs/aws-kotlin-repo-tools/.github/actions/configure-gradle@main
       - name: Calculate Artifact Size Metrics
         id: svc-check-batch
         run: |

.github/workflows/continuous-integration.yml

@@ -33,6 +33,10 @@ jobs:
           path: 'aws-sdk-kotlin'
       - name: Setup Build
         uses: ./aws-sdk-kotlin/.github/actions/setup-build
+      - name: Configure Gradle
+        uses: awslabs/aws-kotlin-repo-tools/.github/actions/configure-gradle@main
+        with:
+          working-directory: ./aws-sdk-kotlin
       - name: Test
         working-directory: ./aws-sdk-kotlin
         shell: bash
@@ -42,7 +46,7 @@ jobs:
           ./gradlew -Ptest.java.version=${{ matrix.java-version }} jvmTest --stacktrace
       - name: Save Test Reports
         if: failure()
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: test-reports
           path: '**/build/reports'
@@ -60,6 +64,10 @@ jobs:
           path: 'aws-sdk-kotlin'
       - name: Setup Build
         uses: ./aws-sdk-kotlin/.github/actions/setup-build
+      - name: Configure Gradle - smithy-kotlin
+        uses: awslabs/aws-kotlin-repo-tools/.github/actions/configure-gradle@main
+        with:
+          working-directory: ./smithy-kotlin
       - name: Build smithy-kotlin
         working-directory: ./smithy-kotlin
         shell: bash
@@ -68,6 +76,10 @@ jobs:
           pwd
           ./gradlew --parallel assemble 
           ./gradlew publishToMavenLocal
+      - name: Configure Gradle aws-sdk-kotlin
+        uses: awslabs/aws-kotlin-repo-tools/.github/actions/configure-gradle@main
+        with:
+          working-directory: ./aws-sdk-kotlin
       - name: Test
         working-directory: ./aws-sdk-kotlin
         shell: bash
@@ -80,7 +92,7 @@ jobs:
           ./gradlew testAllProtocols
       - name: Save Test Reports
         if: failure()
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: test-reports
           path: '**/build/reports'

.github/workflows/kat-transform.yml

@@ -38,6 +38,11 @@ jobs:
           role-to-assume: ${{ secrets.CI_AWS_ROLE_ARN }}
           aws-region: us-west-2
 
+      - name: Configure Gradle
+        uses: awslabs/aws-kotlin-repo-tools/.github/actions/configure-gradle@main
+        with:
+          working-directory: ./aws-sdk-kotlin
+
       - name: Setup kat
         uses: awslabs/aws-kotlin-repo-tools/.github/actions/setup-kat@main
 

.github/workflows/lint.yml

@@ -21,6 +21,8 @@ jobs:
     steps:
     - name: Checkout sources
       uses: actions/checkout@v4
+    - name: Configure Gradle
+      uses: awslabs/aws-kotlin-repo-tools/.github/actions/configure-gradle@main
     - name: Lint ${{ env.PACKAGE_NAME }}
       run: |
         ./gradlew ktlint

.github/workflows/merge-main.yml

@@ -0,0 +1,14 @@
+name: Merge main
+on:
+  push:
+    branches: [ main ]
+  workflow_dispatch:
+
+jobs:
+  merge:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Merge main
+        uses: awslabs/aws-kotlin-repo-tools/.github/actions/merge-main@main
+        with:
+          exempt-branches: # Add any if required

.github/workflows/sync-mirror.yml

@@ -0,0 +1,20 @@
+name: Sync Mirror
+
+on:
+  push:
+    branches: [ main ]
+  workflow_dispatch:
+
+jobs:
+  git-sync:
+    # Only sync when pushing to source repo
+    if: github.repository == 'awslabs/aws-sdk-kotlin'
+    runs-on: ubuntu-latest
+    steps:
+      - name: git-sync
+        uses: wei/git-sync@v3
+        with:
+          source_repo: "https://aws-sdk-kotlin-ci:${{ secrets.CI_USER_PAT }}@github.com/awslabs/aws-sdk-kotlin.git"
+          source_branch: "main"
+          destination_repo: "https://aws-sdk-kotlin-ci:${{ secrets.CI_USER_PAT }}@github.com/awslabs/private-aws-sdk-kotlin-staging.git"
+          destination_branch: "main"

.github/workflows/update-release-branch.yml

@@ -16,6 +16,10 @@ on:
   schedule:
     - cron: "0 7 * * 1-5"  # At 07:00 UTC (00:00 PST, 03:00 EST), Monday through Friday
 
+permissions:
+  id-token: write
+  contents: read
+
 concurrency:
   group: release-manual-${{ github.ref }}
   cancel-in-progress: true
@@ -27,6 +31,16 @@ jobs:
   update-release:
     runs-on: ubuntu-latest
     steps:
+      - name: Set start timestamp
+        id: start
+        run: printf 'timestamp=%(%s)T\n' >> "$GITHUB_OUTPUT"
+      - 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: Setup kat
+        uses: awslabs/aws-kotlin-repo-tools/.github/actions/setup-kat@main
       - uses: actions/checkout@v4
         with:
           ref: 'main'
@@ -43,6 +57,8 @@ jobs:
           distribution: 'corretto'
           java-version: 17
           cache: 'gradle'
+      - name: Configure Gradle
+        uses: awslabs/aws-kotlin-repo-tools/.github/actions/configure-gradle@main
       - name: Check merge base
         shell: bash
         run: |
@@ -89,6 +105,10 @@ jobs:
         shell: bash
         run: |
           echo "merging main @ $main_sha into release @ $release_sha";
+
+          # Getting rid of the Gradle URL config changes caused by "Configure Gradle"
+          git stash -- gradle/wrapper/gradle-wrapper.properties
+
           git switch release;
           input_message=${{ inputs.commit_message }}
           message=${input_message:-"Merging main into release"}
@@ -101,3 +121,23 @@ jobs:
             echo "pushing changes to release branch";
             git push origin release;
           fi
+      - name: Calculate duration
+        id: end
+        run: |
+          printf -v now '%(%s)T'
+          duration=$(( now - ${{ steps.start.outputs.timestamp }} ))
+          echo "duration=$duration" >> "$GITHUB_OUTPUT"
+      - name: Emit metrics
+        if: always() # run this step even if previous steps failed or the job is canceled
+        uses: awslabs/aws-kotlin-repo-tools/.github/actions/emit-metrics@main
+        with:
+          namespace: CI Metrics
+          dimensions: |
+            Product=aws-sdk-kotlin
+            Trigger=${{ github.event_name == 'schedule' && 'schedule' || 'manual' }}
+          metrics: |
+            ReleaseMergeAttempted:1:Count
+            ReleaseMergeSucceeded:${{ job.status == 'success' && '1' || '0' }}:Count
+            ReleaseMergeCanceled:${{ job.status == 'cancelled' && '1' || '0' }}:Count
+            ReleaseMergeFailed:${{ job.status == 'failure' && '1' || '0' }}:Count
+            ReleaseMergeDuration:${{ steps.end.outputs.duration }}:Seconds

.gitignore

@@ -16,6 +16,7 @@ local.properties
 # ignore generated files
 services/*/generated-src
 services/*/build.gradle.kts
+services/*/API.md
 .kotest/
 .kotlin/
 *.klib