kn: merge from main

.github/ISSUE_TEMPLATE/config.yml

@@ -1,5 +1,5 @@
 blank_issues_enabled: false
 contact_links:
   - name: 💬 General Question
-    url: https://github.com/awslabs/aws-sdk-kotlin/discussions/new/choose
+    url: https://github.com/aws/aws-sdk-kotlin/discussions/new/choose
     about: Please ask and answer questions as a discussion thread

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

@@ -9,7 +9,7 @@ runs:
       uses: actions/checkout@v4
       with:
         path: 'aws-kotlin-repo-tools'
-        repository: 'awslabs/aws-kotlin-repo-tools'
+        repository: 'aws/aws-kotlin-repo-tools'
         ref: '0.4.2'
         sparse-checkout: |
           .github
@@ -21,14 +21,6 @@ runs:
         path: 'smithy-kotlin'
         repository: 'smithy-lang/smithy-kotlin'
 
-    # FIXME Remove this checkout of aws-crt-kotlin once K/N artifacts are published to Maven
-    - name: Checkout aws-crt-kotlin
-      uses: ./aws-kotlin-repo-tools/.github/actions/checkout-head
-      with:
-        # checkout aws-crt-kotlin as a sibling which will automatically make it an included build (transitively, through smithy-kotlin)
-        path: 'aws-crt-kotlin'
-        repository: 'awslabs/aws-crt-kotlin'
-
     - name: Configure JDK
       uses: actions/setup-java@v3
       with:

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

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

.github/workflows/changelog-verification.yml

@@ -21,4 +21,4 @@ jobs:
           aws-region: us-west-2
 
       - name: Verify changelog
-        uses: awslabs/aws-kotlin-repo-tools/.github/actions/changelog-verification@main
+        uses: aws/aws-kotlin-repo-tools/.github/actions/changelog-verification@main

.github/workflows/codebuild-ci.yml

@@ -43,6 +43,9 @@ jobs:
     if: github.event_name == 'pull_request' || github.event_name == 'workflow_dispatch'
     runs-on: ubuntu-latest
     steps:
+      - name: Set start timestamp
+        id: start
+        run: printf 'timestamp=%(%s)T\n' >> "$GITHUB_OUTPUT"
       - name: Verify PRs are not running malicious code
         if: ${{ (inputs.aws-sdk-kotlin-pr != '' || inputs.smithy-kotlin-pr != '') && inputs.check-pr == false }}
         run: |
@@ -53,6 +56,8 @@ jobs:
         with:
           role-to-assume: ${{ secrets.CI_AWS_ROLE_ARN }}
           aws-region: us-west-2
+      - name: Setup kat
+        uses: aws/aws-kotlin-repo-tools/.github/actions/setup-kat@main
       - name: Run E2E Tests
         id: e2e-tests
         uses: aws-actions/aws-codebuild-run-build@v1
@@ -68,11 +73,33 @@ jobs:
             echo "cancelling in-progress build: id=$BUILD_ID"
             aws codebuild stop-build --id $BUILD_ID
           fi
+      - name: Calculate duration
+        id: end
+        if: always()
+        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: aws/aws-kotlin-repo-tools/.github/actions/emit-metrics@main
+        with:
+          namespace: CI Metrics
+          dimensions: |
+            Product=aws-sdk-kotlin
+            JobName=${{ github.job }}
+            Branch=${{ github.base_ref || github.ref_name }}
+          metrics: |
+            WorkflowSucceeded:${{ job.status == 'success' && '1' || '0' }}:Count
+            WorkflowDuration:${{ steps.end.outputs.duration }}:Seconds
 
   service-check-batch-and-artifact-size-metrics:
     if: github.event_name == 'pull_request' || github.event_name == 'workflow_dispatch'
     runs-on: ubuntu-latest
     steps:
+      - name: Set start timestamp
+        id: start
+        run: printf 'timestamp=%(%s)T\n' >> "$GITHUB_OUTPUT"
       - name: Verify PRs are not running malicious code
         if: ${{ (inputs.aws-sdk-kotlin-pr != '' || inputs.smithy-kotlin-pr != '') && inputs.check-pr == false }}
         run: |
@@ -85,8 +112,10 @@ jobs:
         with:
           role-to-assume: ${{ secrets.CI_AWS_ROLE_ARN }}
           aws-region: us-west-2
+      - name: Setup kat
+        uses: aws/aws-kotlin-repo-tools/.github/actions/setup-kat@main
       - name: Configure Gradle
-        uses: awslabs/aws-kotlin-repo-tools/.github/actions/configure-gradle@main
+        uses: aws/aws-kotlin-repo-tools/.github/actions/configure-gradle@main
       - name: Run Service Check Batch and Calculate Artifact Size Metrics
         id: svc-check-batch
         run: | 
@@ -144,7 +173,7 @@ jobs:
         run: ./gradlew analyzeArtifactSizeMetrics
 
       - name: Show Results
-        uses: awslabs/aws-kotlin-repo-tools/.github/actions/artifact-size-metrics/show-results@main
+        uses: aws/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') }}
@@ -155,6 +184,25 @@ jobs:
             echo If this is expected please add the 'acknowledge-artifact-size-increase' label to this pull request.
             exit 1
           }
+      - name: Calculate duration
+        id: end
+        if: always()
+        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: aws/aws-kotlin-repo-tools/.github/actions/emit-metrics@main
+        with:
+          namespace: CI Metrics
+          dimensions: |
+            Product=aws-sdk-kotlin
+            JobName=${{ github.job }}
+            Branch=${{ github.base_ref || github.ref_name }}
+          metrics: |
+            WorkflowSucceeded:${{ job.status == 'success' && '1' || '0' }}:Count
+            WorkflowDuration:${{ steps.end.outputs.duration }}:Seconds
 
   release-artifact-size-metrics:
     if: github.event_name == 'release'
@@ -168,7 +216,7 @@ 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
+        uses: aws/aws-kotlin-repo-tools/.github/actions/configure-gradle@main
       - name: Calculate Artifact Size Metrics
         id: svc-check-batch
         run: |

.github/workflows/codegen-preview.yml

@@ -48,7 +48,7 @@ jobs:
           path: 'aws-sdk-kotlin'
       - uses: actions/checkout@v4
         with:
-          repository: 'awslabs/aws-kotlin-repo-tools'
+          repository: 'aws/aws-kotlin-repo-tools'
           path: 'aws-kotlin-repo-tools'
       - uses: actions/checkout@v4
         with:

.github/workflows/continuous-integration.yml

@@ -4,8 +4,9 @@ on:
   pull_request:
   workflow_dispatch:
 
-permissions: { }
-
+permissions:
+  id-token: write
+  contents: read
 # Allow one instance of this workflow per pull request, and cancel older runs when new changes are pushed
 concurrency:
   group: ci-pr-${{ github.ref }}
@@ -29,23 +30,52 @@ jobs:
           - 17
           - 21
     steps:
+      - name: Set start timestamp
+        id: start
+        run: printf 'timestamp=%(%s)T\n' >> "$GITHUB_OUTPUT"
       - name: Checkout sources
         uses: actions/checkout@v4
         with:
           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
+        uses: aws/aws-kotlin-repo-tools/.github/actions/configure-gradle@main
         with:
           working-directory: ./aws-sdk-kotlin
+      - 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: aws/aws-kotlin-repo-tools/.github/actions/setup-kat@main
       - name: Test
         working-directory: ./aws-sdk-kotlin
         shell: bash
         run: |
           pwd
           ls -lsa
           ./gradlew -Ptest.java.version=${{ matrix.java-version }} jvmTest --stacktrace
+      - name: Calculate duration
+        id: end
+        if: always()
+        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: aws/aws-kotlin-repo-tools/.github/actions/emit-metrics@main
+        with:
+          namespace: CI Metrics
+          dimensions: |
+            Product=aws-sdk-kotlin
+            JobName=${{ github.job }}(${{ matrix.java-version }})
+            Branch=${{ github.base_ref || github.ref_name }}
+          metrics: |
+            WorkflowSucceeded:${{ job.status == 'success' && '1' || '0' }}:Count
+            WorkflowDuration:${{ steps.end.outputs.duration }}:Seconds
       - name: Save Test Reports
         if: failure()
         uses: actions/upload-artifact@v4
@@ -60,6 +90,10 @@ jobs:
       matrix:
         os: [ ubuntu-latest, macos-latest, windows-latest ]
     steps:
+      - name: Set start timestamp
+        id: start
+        shell: bash
+        run: echo "timestamp=$(date +%s)" >> "$GITHUB_OUTPUT"
       - name: Checkout sources
         uses: actions/checkout@v4
         with:
@@ -68,19 +102,26 @@ jobs:
       - name: Setup Build
         uses: ./aws-sdk-kotlin/.github/actions/setup-build
 
-      # FIXME Re-enable Kotlin/Native builds when artifacts are available
-      - name: Disable Kotlin/Native builds
-        shell: bash
-        run: |
-          echo -e "\naws.kotlin.native=false" >> ./aws-sdk-kotlin/gradle.properties
-          echo -e "\naws.kotlin.native=false" >> ./smithy-kotlin/gradle.properties
-          echo -e "\naws.kotlin.native=false" >> ./aws-crt-kotlin/gradle.properties
-
+      - 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: aws/aws-kotlin-repo-tools/.github/actions/setup-kat@main
       - name: Configure Gradle - smithy-kotlin
-        uses: awslabs/aws-kotlin-repo-tools/.github/actions/configure-gradle@main
+        uses: aws/aws-kotlin-repo-tools/.github/actions/configure-gradle@main
         with:
           working-directory: ./smithy-kotlin
 
+      - name: Disable native builds # FIXME remove this step once K/N is merged
+        shell: bash
+        run: |
+          echo "Appending aws.kotlin.native=false to smithy-kotlin/gradle.properties..."
+          echo -e "\n\naws.kotlin.native=false" >> ./smithy-kotlin/gradle.properties
+          echo "Appending aws.kotlin.native=false to aws-sdk-kotlin/gradle.properties..."
+          echo -e "\n\naws.kotlin.native=false" >> ./aws-sdk-kotlin/gradle.properties
+
       - name: Build smithy-kotlin
         working-directory: ./smithy-kotlin
         shell: bash
@@ -91,7 +132,7 @@ jobs:
           ./gradlew publishToMavenLocal
 
       - name: Configure Gradle aws-sdk-kotlin
-        uses: awslabs/aws-kotlin-repo-tools/.github/actions/configure-gradle@main
+        uses: aws/aws-kotlin-repo-tools/.github/actions/configure-gradle@main
         with:
           working-directory: ./aws-sdk-kotlin
 
@@ -106,6 +147,26 @@ jobs:
           ./gradlew test jvmTest
           ./gradlew testAllProtocols
 
+      - name: Calculate duration
+        id: end
+        if: always()
+        shell: bash
+        run: |
+          now=$(date +%s)
+          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: aws/aws-kotlin-repo-tools/.github/actions/emit-metrics@main
+        with:
+          namespace: CI Metrics
+          dimensions: |
+            Product=aws-sdk-kotlin
+            JobName=${{ github.job }}(${{ matrix.os }})
+            Branch=${{ github.base_ref || github.ref_name }}
+          metrics: |
+            WorkflowSucceeded:${{ job.status == 'success' && '1' || '0' }}:Count
+            WorkflowDuration:${{ steps.end.outputs.duration }}:Seconds
       - name: Save Test Reports
         if: failure()
         uses: actions/upload-artifact@v4

.github/workflows/kat-transform.yml

@@ -39,12 +39,12 @@ jobs:
           aws-region: us-west-2
 
       - name: Configure Gradle
-        uses: awslabs/aws-kotlin-repo-tools/.github/actions/configure-gradle@main
+        uses: aws/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
+        uses: aws/aws-kotlin-repo-tools/.github/actions/setup-kat@main
 
       - name: Build
         working-directory: ./aws-sdk-kotlin

.github/workflows/lint.yml

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

.github/workflows/merge-main.yml

@@ -11,7 +11,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Merge main
-        uses: awslabs/aws-kotlin-repo-tools/.github/actions/merge-main@main
+        uses: aws/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/minor-version-bump.yml

@@ -0,0 +1,11 @@
+name: Minor version bump check
+on:
+  pull_request:
+
+jobs:
+  minor-version-bump-check:
+    permissions: {}
+    runs-on: ubuntu-latest
+    steps:
+      - name: Minor version bump check
+        uses: awslabs/aws-kotlin-repo-tools/.github/actions/minor-version-bump@main

.github/workflows/release-readiness.yml

@@ -21,7 +21,7 @@ jobs:
           path: 'aws-sdk-kotlin'
 
       - name: Configure Gradle
-        uses: awslabs/aws-kotlin-repo-tools/.github/actions/configure-gradle@main
+        uses: aws/aws-kotlin-repo-tools/.github/actions/configure-gradle@main
         with:
           working-directory: ./aws-sdk-kotlin
 
@@ -36,7 +36,7 @@ jobs:
           ./gradlew -Paws.kotlin.native=false build
 
       - name: Checkout smithy-kotlin
-        uses: awslabs/aws-kotlin-repo-tools/.github/actions/checkout-head@main
+        uses: aws/aws-kotlin-repo-tools/.github/actions/checkout-head@main
         with:
           path: 'smithy-kotlin'
           repository: 'smithy-lang/smithy-kotlin'

.github/workflows/sync-mirror.yml

@@ -10,13 +10,13 @@ permissions: { }
 jobs:
   git-sync:
     # Only sync when pushing to source repo
-    if: github.repository == 'awslabs/aws-sdk-kotlin'
+    if: github.repository == 'aws/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_repo: "https://aws-sdk-kotlin-ci:${{ secrets.CI_USER_PAT }}@github.com/aws/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_repo: "https://aws-sdk-kotlin-ci:${{ secrets.CI_USER_PAT }}@github.com/aws/private-aws-sdk-kotlin-staging.git"
           destination_branch: "main"