Merge remote-tracking branch 'origin/main' into feat-invocation-scoped-metrics

Author: ianbotsf

.brazil.json

@@ -1,14 +1,16 @@
 {
   "dependencies": {
-    "org.jetbrains.kotlin:kotlin-stdlib:2.0.*": "KotlinStdlib-2.x",
-    "org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.8.*": "KotlinxCoroutinesCoreJvm-1.8.x",
+    "org.jetbrains.kotlin:kotlin-stdlib:2.*": "KotlinStdlib-2.x",
+    "org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.*": "KotlinxCoroutinesCoreJvm-1.x",
 
     "com.squareup.okhttp3:okhttp-coroutines:5.*": "OkHttp3Coroutines-5.x",
     "com.squareup.okhttp3:okhttp:5.*": "OkHttp3-5.x",
     "com.squareup.okio:okio-jvm:3.*": "OkioJvm-3.x",
     "io.opentelemetry:opentelemetry-api:1.*": "Maven-io-opentelemetry_opentelemetry-api-1.x",
     "org.slf4j:slf4j-api:2.*": "Maven-org-slf4j_slf4j-api-2.x",
-    "aws.sdk.kotlin.crt:aws-crt-kotlin:0.8.*": "AwsCrtKotlin-0.8.x"
+    "aws.sdk.kotlin.crt:aws-crt-kotlin:0.9.*": "AwsCrtKotlin-0.9.x",
+    "aws.sdk.kotlin.crt:aws-crt-kotlin:0.8.*": "AwsCrtKotlin-0.8.x",
+    "com.squareup.okhttp3:okhttp:4.*": "OkHttp3-4.x"
   },
   "packageHandlingRules": {
     "versioning": {
@@ -25,14 +27,18 @@
     "ignore": [
       "aws.smithy.kotlin:http-test",
       "aws.smithy.kotlin:smithy-test",
+      "aws.smithy.kotlin:telemetry-provider-micrometer",
       "aws.smithy.kotlin:testing",
       "aws.smithy.kotlin:bom",
       "aws.smithy.kotlin:version-catalog"
     ],
     "resolvesConflictDependencies": {
+      "org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.*": [
+        "KotlinxCoroutinesCoreJvm-1.x"
+      ],
       "com.squareup.okhttp3:okhttp-coroutines:5.*": [
         "KotlinStdlib-2.x",
-        "KotlinxCoroutinesCoreJvm-1.8.x",
+        "KotlinxCoroutinesCoreJvm-1.x",
         "KotlinStdlibJdk7-2.x",
         "KotlinStdlibJdk8-2.x"
       ],
@@ -41,6 +47,9 @@
       ],
       "com.squareup.okio:okio-jvm:3.*": [
         "KotlinStdlib-2.x"
+      ],
+      "com.squareup.okhttp3:okhttp:4.*": [
+        "OkHttp3-4.x"
       ]
     }
   }

.changes/29e93882-7346-4a2f-bbcd-1cdf478a3b10.json

@@ -11,6 +11,15 @@ body:
     validations:
       required: true
 
+  - type: checkboxes
+    id: regression
+    attributes:
+      label: Regression Issue
+      description: What is a regression? If it worked in a previous version but doesn't in the latest version, it's considered a regression. In this case, please provide specific version number in the report.
+      options:
+        - label: Select this option if this issue appears to be a regression.
+          required: false
+
   - type: textarea
     id: expected
     attributes:

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -3,7 +3,9 @@ name: API compatibility verification
 on:
   pull_request:
     types: [ opened, synchronize, reopened, labeled, unlabeled ]
-    branches: [ main ]
+    branches:
+      - main
+      - '*-main'
 
 jobs:
   api-compat-verification:

.github/workflows/api-compat-verification.yml

@@ -2,7 +2,9 @@ name: Artifact Size Metrics
 on:
   pull_request:
     types: [ opened, synchronize, reopened, labeled, unlabeled ]
-    branches: [ main ]
+    branches:
+      - main
+      - '*-main'
   release:
     types: [published]
 

.github/workflows/artifact-size-metrics.yml

@@ -3,7 +3,9 @@ name: Changelog verification
 on:
   pull_request:
     types: [ opened, synchronize, reopened, labeled, unlabeled ]
-    branches: [ main ]
+    branches:
+      - main
+      - '*-main'
 
 jobs:
   changelog-verification:

.github/workflows/changelog-verification.yml

@@ -2,7 +2,9 @@ name: CI
 
 on:
   push:
-    branches: [ main ]
+    branches:
+      - main
+      - '*-main'
   pull_request:
   workflow_dispatch:
 
@@ -66,7 +68,7 @@ jobs:
           ./gradlew test jvmTest
       - name: Save Test Reports
         if: failure()
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: test-reports-${{ matrix.os }}
           path: '**/build/reports'

.github/workflows/continuous-integration.yml

@@ -2,7 +2,9 @@ name: Dependabot Dependency Submission
 
 on:
   push:
-    branches: [ main ]
+    branches:
+      - main
+      - '*-main'
 
 permissions:
   contents: write

.github/workflows/dependabot.yml

@@ -0,0 +1,32 @@
+# Apply potential regression label on issues
+name: issue-regression-label
+on:
+  issues:
+    types: [opened, edited]
+jobs:
+  add-regression-label:
+    runs-on: ubuntu-latest
+    permissions:
+      issues: write
+    steps:
+      - name: Fetch template body
+        id: check_regression
+        uses: actions/github-script@v7
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          TEMPLATE_BODY: ${{ github.event.issue.body }}
+        with:
+          script: |
+            const regressionPattern = /\[x\] Select this option if this issue appears to be a regression\./i;
+            const template = `${process.env.TEMPLATE_BODY}`
+            const match = regressionPattern.test(template);
+            core.setOutput('is_regression', match);
+      - name: Manage regression label
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        run: |
+          if [ "${{ steps.check_regression.outputs.is_regression }}" == "true" ]; then
+            gh issue edit ${{ github.event.issue.number }} --add-label "potential-regression" -R ${{ github.repository }}
+          else
+            gh issue edit ${{ github.event.issue.number }} --remove-label "potential-regression" -R ${{ github.repository }}
+          fi

.github/workflows/issue-regression-labeler.yml

@@ -0,0 +1,73 @@
+name: Kat Transform
+
+on:
+  pull_request:
+    types: [ opened, synchronize, reopened, labeled, unlabeled ]
+    branches:
+      - main
+      - '*-main'
+
+# Allow one instance of this workflow per pull request, and cancel older runs when new changes are pushed
+concurrency:
+  group: kat-pr-${{ github.ref }}
+  cancel-in-progress: true
+
+permissions:
+  id-token: write
+  contents: read
+
+env:
+  RUN: ${{ github.run_id }}-${{ github.run_number }}
+  GRADLE_OPTS: "-Dorg.gradle.daemon=false -Dkotlin.incremental=false"
+
+jobs:
+  verify-transform:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout sources
+        uses: actions/checkout@v4
+        with:
+          path: 'smithy-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: awslabs/aws-kotlin-repo-tools/.github/actions/setup-kat@main
+
+      - name: Configure JDK
+        uses: actions/setup-java@v3
+        with:
+          distribution: 'corretto'
+          java-version: 17
+          cache: 'gradle'
+
+      - name: Build
+        working-directory: ./smithy-kotlin
+        shell: bash
+        run: |
+          pwd
+          ls -lsa
+          kat bump-version  # Bump from `vNext-SNAPSHOT` to `vNext`. kat transform only works on non-SNAPSHOT versions
+          kat bump-version --property codegenVersion
+          ./gradlew build
+          ./gradlew publishAllPublicationsToTestLocalRepository
+
+      - name: Transform
+        working-directory: ./smithy-kotlin
+        shell: bash
+        run: |
+          pwd
+          ls -lsa
+          kat brazil transform -i ./build/m2 -o ./transformed -t .brazil.json -v live
+          
+          # Check for manifest file
+          if [ ! -f "./transformed/brazil-import-manifest.json" ]; then
+            echo "Error: brazil-import-manifest.json not found in the transformed artifact"
+            exit 1
+          fi
+          
+          echo "Transformation succeeded!"