misc: merge main into feat-generic-client-codegen-main

.brazil-1.x.json

@@ -30,8 +30,8 @@
       "defaultVersionLayout": "{MAJOR}.x"
     },
     "rename": {
-        "software.amazon.smithy.kotlin:smithy-aws-kotlin-codegen": "AwsSmithyAwsKotlinCodegen",
-        "software.amazon.smithy.kotlin:smithy-kotlin-codegen": "AwsSmithyKotlinCodegen"
+        "aws.smithy.kotlin:aws-codegen": "AwsSmithyAwsKotlinCodegen",
+        "aws.smithy.kotlin:codegen": "AwsSmithyKotlinCodegen"
     },
     "ignore": [
       "aws.smithy.kotlin:http-test",
@@ -40,7 +40,7 @@
       "aws.smithy.kotlin:testing",
       "aws.smithy.kotlin:bom",
       "aws.smithy.kotlin:version-catalog",
-      "software.amazon.smithy.kotlin:smithy-kotlin-codegen-testutils"
+      "aws.smithy.kotlin:codegen-testutils"
     ],
     "resolvesConflictDependencies": {
       "org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.*": [

.brazil.json

@@ -10,11 +10,10 @@
     "io.opentelemetry:opentelemetry-api:1.*": "Maven-io-opentelemetry_opentelemetry-api-1.x",
     "io.opentelemetry:opentelemetry-extension-kotlin:1.*": "Maven-io-opentelemetry_opentelemetry-extension-kotlin-1.x",
     "org.slf4j:slf4j-api:2.*": "Maven-org-slf4j_slf4j-api-2.x",
-    "aws.sdk.kotlin.crt:aws-crt-kotlin:0.10.*": "AwsCrtKotlin-0.10.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",
+    "aws.sdk.kotlin.crt:aws-crt-kotlin:0.12.*": "AwsCrtKotlin-0.12.x",
     "com.squareup.okhttp3:okhttp:4.*": "OkHttp3-4.x",
     "org.jetbrains.kotlinx:kotlinx-datetime-jvm:0.*": "KotlinxDatetimeJvm-0.x",
+    "org.jetbrains.kotlinx:kotlinx-io-core-jvm:0.*": "Maven-org-jetbrains-kotlinx_kotlinx-io-core-jvm-0.x",
 
     "software.amazon.smithy:smithy-aws-traits:1.*": "Maven-software-amazon-smithy_smithy-aws-traits-1.x",
     "software.amazon.smithy:smithy-aws-iam-traits:1.*": "Maven-software-amazon-smithy_smithy-aws-iam-traits-1.x",
@@ -32,13 +31,13 @@
     "versioning": {
       "defaultVersionLayout": "{MAJOR}.0.x",
       "overrides": {
-        "software.amazon.smithy.kotlin:smithy-aws-kotlin-codegen": "{MAJOR}.x",
-        "software.amazon.smithy.kotlin:smithy-kotlin-codegen": "{MAJOR}.x"
+        "aws.smithy.kotlin:aws-codegen": "{MAJOR}.x",
+        "aws.smithy.kotlin:codegen": "{MAJOR}.x"
       }
     },
     "rename": {
-        "software.amazon.smithy.kotlin:smithy-aws-kotlin-codegen": "AwsSmithyAwsKotlinCodegen",
-        "software.amazon.smithy.kotlin:smithy-kotlin-codegen": "AwsSmithyKotlinCodegen"
+        "aws.smithy.kotlin:aws-codegen": "AwsSmithyAwsKotlinCodegen",
+        "aws.smithy.kotlin:codegen": "AwsSmithyKotlinCodegen"
     },
     "ignore": [
       "aws.smithy.kotlin:http-test",
@@ -47,7 +46,7 @@
       "aws.smithy.kotlin:testing",
       "aws.smithy.kotlin:bom",
       "aws.smithy.kotlin:version-catalog",
-      "software.amazon.smithy.kotlin:smithy-kotlin-codegen-testutils"
+      "aws.smithy.kotlin:codegen-testutils"
     ],
     "resolvesConflictDependencies": {
       "org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.*": [

.editorconfig

@@ -6,6 +6,10 @@ ktlint_standard_no-wildcard-imports = disabled
 ktlint_standard_filename = disabled
 ktlint_standard_backing-property-naming = disabled
 
+# TODO decide if we want to enable these new rules
+ktlint_standard_mixed-condition-operators = disabled
+ktlint_standard_blank-line-between-when-conditions = disabled
+
 # enable trailing commas per JetBrains recommendation
 # (https://kotlinlang.org/docs/coding-conventions.html#trailing-commas)
 ij_kotlin_allow_trailing_comma_on_call_site = true

.github/dependabot.yml

@@ -4,3 +4,4 @@ updates:
     directory: /
     schedule:
       interval: daily # means every _weekday_ (Monday through Friday)
+    open-pull-requests-limit: 100

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

@@ -7,13 +7,14 @@ on:
       - main
       - '*-main'
 
-permissions: { }
+permissions:
+  contents: read
 
 jobs:
   api-compat-verification:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
       - name: Check for API compatibility
         if: ${{ !contains(github.event.pull_request.labels.*.name, 'acknowledge-api-break') }}
         run: |

.github/workflows/changelog-verification.yml

@@ -1,6 +1,7 @@
 name: Changelog verification
 
 permissions:
+  contents: read
   id-token: write
 
 on:

.github/workflows/continuous-integration-reduced.yml

@@ -0,0 +1,116 @@
+# Copied and modified from continuous-integration.yml
+
+name: CI w/ reduced CRT Kotlin
+
+on:
+  pull_request:
+  workflow_dispatch:
+
+permissions:
+  id-token: write
+  contents: read
+
+concurrency:
+  group: ci-reduced-pr-${{ github.ref }}
+  cancel-in-progress: true
+
+env:
+  GRADLE_OPTS: "-Dorg.gradle.daemon=false -Dkotlin.incremental=false"
+
+jobs:
+  jvm:
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        java-version:
+          - 8
+          - 11
+          - 17
+          - 21
+    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: aws/aws-kotlin-repo-tools/.github/actions/setup-kat@main
+
+      - name: Checkout smithy-kotlin
+        uses: actions/checkout@v4
+
+      - name: Configure Gradle (Smithy Kotlin)
+        uses: aws/aws-kotlin-repo-tools/.github/actions/configure-gradle@main
+
+      - name: Checkout aws-crt-kotlin
+        uses: aws/aws-kotlin-repo-tools/.github/actions/checkout-head@main
+        with:
+          path: 'aws-crt-kotlin' # '.' would make this a sibling, and include build. Overriding reduced JAR dependency.
+          repository: 'aws/aws-crt-kotlin'
+          submodules: 'true'
+
+      - name: Configure Gradle (CRT Kotlin)
+        uses: aws/aws-kotlin-repo-tools/.github/actions/configure-gradle@main
+        with:
+          working-directory: './aws-crt-kotlin'
+
+      - name: Configure JDK
+        uses: actions/setup-java@v3
+        with:
+          distribution: 'corretto'
+          java-version: 17
+          cache: 'gradle'
+
+      # TODO: Replace with kat command (SDK-KT-1089)
+      - name: Enable JAR reduction & disable Kotlin Native
+        uses: aws/aws-kotlin-repo-tools/.github/actions/utils/add-to-local-properties@main
+        with:
+          working-directory: '~/.sdkdev'
+          addition: 'aws.kotlin.native = false'
+
+      - name: Publish reduced CRT Kotlin to Maven Local
+        working-directory: './aws-crt-kotlin'
+        run: |
+          ./gradlew publishToMavenLocal # publish full size and reduced JARs
+          ./gradlew replaceMavenLocalFullSizeJars # reduce JARs become the default
+
+      # The checked out CRT Kotlin version might be a SNAPSHOT version e.g. in cross repo features (and include builds are off).
+      - name: Depend on checked out CRT Kotlin version
+        run: |
+          cd ./aws-crt-kotlin
+          version=$(kat get-property sdkVersion)
+          echo "Found CRT version: $version"
+
+          cd ..
+          kat bump-version --file gradle/libs.versions.toml --property crt-kotlin-version --version $version
+
+      - name: Build and Test Smithy Kotlin on JVM (with dependency on reduced CRT Kotlin)
+        run: |
+          ./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()
+        uses: aws/aws-kotlin-repo-tools/.github/actions/emit-metrics@main
+        with:
+          namespace: CI Metrics
+          dimensions: |
+            Product=smithy-kotlin
+            JobName=${{ github.job }}(${{ matrix.java-version }})-reduced
+            Branch=${{ github.base_ref || github.ref_name }}
+          metrics: |
+            WorkflowSucceeded:${{ job.status == 'success' && '1' || '0' }}:Count
+            WorkflowDuration:${{ steps.end.outputs.duration }}:Seconds

.github/workflows/continuous-integration.yml

@@ -412,16 +412,14 @@ jobs:
         # TODO - JVM only
         cd $GITHUB_WORKSPACE/smithy-kotlin
         ./gradlew -Paws.kotlin.native=false publishToMavenLocal
-        SMITHY_KOTLIN_RUNTIME_VERSION=$(grep sdkVersion= gradle.properties | cut -d = -f 2)
-        SMITHY_KOTLIN_CODEGEN_VERSION=$(grep codegenVersion= gradle.properties | cut -d = -f 2)
+        SMITHY_KOTLIN_VERSION=$(grep sdkVersion= gradle.properties | cut -d = -f 2)
         cd $GITHUB_WORKSPACE/aws-sdk-kotlin
-        # replace smithy-kotlin-runtime-version and smithy-kotlin-codegen-version to be
+        # replace smithy-kotlin-version to be
         # whatever we are testing such that the protocol test projects don't fail with a
         # version that doesn't exist locally or in maven central. Otherwise the generated
         # protocol test projects will use whatever the SDK thinks the version of
         # smithy-kotlin should be
-        sed -i "s/smithy-kotlin-runtime-version = .*$/smithy-kotlin-runtime-version = \"$SMITHY_KOTLIN_RUNTIME_VERSION\"/" gradle/libs.versions.toml
-        sed -i "s/smithy-kotlin-codegen-version = .*$/smithy-kotlin-codegen-version = \"$SMITHY_KOTLIN_CODEGEN_VERSION\"/" gradle/libs.versions.toml
+        sed -i "s/smithy-kotlin-version = .*$/smithy-kotlin-version = \"$SMITHY_KOTLIN_VERSION\"/" gradle/libs.versions.toml
         ./gradlew -Paws.kotlin.native=false publishToMavenLocal
         ./gradlew -Paws.kotlin.native=false test jvmTest
         ./gradlew -Paws.kotlin.native=false testAllProtocols

.github/workflows/lint.yml

@@ -12,7 +12,8 @@ on:
       - '*-main'
   workflow_dispatch:
 
-permissions: { }
+permissions:
+  contents: read
 
 env:
   PACKAGE_NAME: smithy-kotlin
@@ -22,7 +23,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - name: Checkout sources
-      uses: actions/checkout@v2
+      uses: actions/checkout@v4
     - name: Configure Gradle
       uses: aws/aws-kotlin-repo-tools/.github/actions/configure-gradle@main
     - name: Lint ${{ env.PACKAGE_NAME }}

.github/workflows/pull-request-metrics.yml

@@ -10,7 +10,7 @@ jobs:
         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: Build
         shell: bash
@@ -19,7 +19,7 @@ jobs:
           ./gradlew publishAllPublicationsToTestLocalRepository --parallel
 
       - name: Calculate metrics
-        uses: awslabs/aws-kotlin-repo-tools/.github/actions/artifact-size-metrics/calculate-and-upload@main
+        uses: aws/aws-kotlin-repo-tools/.github/actions/artifact-size-metrics/calculate-and-upload@main
         with:
           upload: 'false'
           release_metrics: 'false'
@@ -31,7 +31,7 @@ jobs:
           aws-region: us-west-2
 
       - name: Process metrics
-        uses: awslabs/aws-kotlin-repo-tools/.github/actions/artifact-size-metrics/download-and-process@main
+        uses: aws/aws-kotlin-repo-tools/.github/actions/artifact-size-metrics/download-and-process@main
         with:
           download: 'false'
 

.github/workflows/release-metrics.yml

@@ -12,7 +12,7 @@ jobs:
         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: Build
         shell: bash
@@ -27,7 +27,7 @@ jobs:
           aws-region: us-west-2
 
       - name: Calculate and upload metrics
-        uses: awslabs/aws-kotlin-repo-tools/.github/actions/artifact-size-metrics/calculate-and-upload@main
+        uses: aws/aws-kotlin-repo-tools/.github/actions/artifact-size-metrics/calculate-and-upload@main
         with:
           upload: 'true'
           release_metrics: 'true'

.github/workflows/release-readiness.yml

@@ -7,7 +7,8 @@ on:
   pull_request:
     branches: [ main ]
 
-permissions: { }
+permissions:
+  contents: read
 
 jobs:
   release-readiness:

.github/workflows/stale_issue.yaml

@@ -5,7 +5,8 @@ on:
   schedule:
   - cron: "0 0/3 * * *"
 
-permissions: { }
+permissions:
+  issues: write
 
 jobs:
   cleanup: