kn: merge from main (#1332)

Co-authored-by: 0marperez <60363173+0marperez@users.noreply.github.com>
Co-authored-by: aws-sdk-kotlin-ci <aws-kotlin-sdk-automation@amazon.com>
Co-authored-by: Ian Botsford <83236726+ianbotsf@users.noreply.github.com>
Co-authored-by: Xinsong Cui <xicu@amazon.com>
Co-authored-by: Manuel Sugawara <sugmanue@amazon.com>

Author: 6 people

.brazil-1.x.json

@@ -0,0 +1,66 @@
+{
+  "dependencies": {
+    "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",
+    "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.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",
+
+    "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",
+    "software.amazon.smithy:smithy-aws-cloudformation-traits:1.*": "Maven-software-amazon-smithy_smithy-aws-cloudformation-traits-1.x",
+    "software.amazon.smithy:smithy-protocol-test-traits:1.*": "Maven-software-amazon-smithy_smithy-protocol-test-traits-1.x",
+    "software.amazon.smithy:smithy-protocol-traits:1.*": "Maven-software-amazon-smithy_smithy-protocol-traits-1.x",
+    "software.amazon.smithy:smithy-aws-endpoints:1.*": "Maven-software-amazon-smithy_smithy-aws-endpoints-1.x",
+    "software.amazon.smithy:smithy-codegen-core:1.*": "Maven-software-amazon-smithy_smithy-codegen-core-1.x",
+    "software.amazon.smithy:smithy-waiters:1.*": "Maven-software-amazon-smithy_smithy-waiters-1.x",
+    "software.amazon.smithy:smithy-rules-engine:1.*": "Maven-software-amazon-smithy_smithy-rules-engine-1.x",
+    "software.amazon.smithy:smithy-smoke-test-traits:1.*": "Maven-software-amazon-smithy_smithy-smoke-test-traits-1.x",
+    "org.jsoup:jsoup:1.19.*": "Maven-jsoup-1.19.x"
+  },
+  "packageHandlingRules": {
+    "versioning": {
+      "defaultVersionLayout": "{MAJOR}.x"
+    },
+    "rename": {
+        "software.amazon.smithy.kotlin:smithy-aws-kotlin-codegen": "AwsSmithyAwsKotlinCodegen",
+        "software.amazon.smithy.kotlin:smithy-kotlin-codegen": "AwsSmithyKotlinCodegen"
+    },
+    "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",
+      "software.amazon.smithy.kotlin:smithy-kotlin-codegen-testutils"
+    ],
+    "resolvesConflictDependencies": {
+      "org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.*": [
+        "KotlinxCoroutinesCoreJvm-1.x"
+      ],
+      "com.squareup.okhttp3:okhttp-coroutines:5.*": [
+        "KotlinStdlib-2.x",
+        "KotlinxCoroutinesCoreJvm-1.x",
+        "KotlinStdlibJdk7-2.x",
+        "KotlinStdlibJdk8-2.x"
+      ],
+      "com.squareup.okhttp3:okhttp:5.*": [
+        "KotlinStdlib-2.x"
+      ],
+      "com.squareup.okio:okio-jvm:3.*": [
+        "KotlinStdlib-2.x"
+      ],
+      "com.squareup.okhttp3:okhttp:4.*": [
+        "OkHttp3-4.x"
+      ]
+    }
+  }
+}

.brazil.json

@@ -2,6 +2,7 @@
   "dependencies": {
     "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",

.editorconfig

@@ -9,4 +9,4 @@ ktlint_standard_backing-property-naming = 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
-ij_kotlin_allow_trailing_comma = true
+ij_kotlin_allow_trailing_comma = true

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

@@ -45,22 +45,23 @@ jobs:
     steps:
       - name: Checkout Sources
         uses: actions/checkout@v4
-
       - name: Setup build
         uses: .github/actions/setup-build
-
+      - name: Configure JDK
+        uses: actions/setup-java@v3
+        with:
+          distribution: 'corretto'
+          java-version: 17
+          cache: 'gradle'
       - 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: Configure Gradle
         uses: awslabs/aws-kotlin-repo-tools/.github/actions/configure-gradle@main
-
       - name: Generate Artifact Size Metrics
         run: ./gradlew -Paws.kotlin.native=false artifactSizeMetrics
-
       - name: Analyze Artifact Size Metrics
         run: ./gradlew analyzeArtifactSizeMetrics
 

.github/workflows/changelog-verification.yml

@@ -1,5 +1,8 @@
 name: Changelog verification
 
+permissions:
+  id-token: write
+
 on:
   pull_request:
     types: [ opened, synchronize, reopened, labeled, unlabeled ]
@@ -11,16 +14,11 @@ jobs:
   changelog-verification:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
-      - name: Check for changelog entry
-        if: ${{ !contains(github.event.pull_request.labels.*.name, 'no-changelog') }}
-        run: |
-          git fetch origin ${{ github.base_ref }} --depth 1 && \
-          git diff remotes/origin/${{ github.base_ref }} --name-only | grep -P "\.changes/[0-9a-f-]+\.json"
-      - name: Error message
-        if: ${{ failure() }}
-        run: |
-          echo "::error ::No new/updated changelog entry found in /.changes directory. Please either:"
-          echo "::error ::* Add a changelog entry (see CONTRIBUTING.md for instructions) –or–"
-          echo "::error ::* Add the 'no-changelog' label to this PR (in rare cases not warranting a changelog entry)"
-          exit 1
+      - 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: Verify changelog
+        uses: awslabs/aws-kotlin-repo-tools/.github/actions/changelog-verification@main

.github/workflows/continuous-integration.yml

@@ -39,6 +39,13 @@ jobs:
       - name: Setup build
         uses: ./smithy-kotlin/.github/actions/setup-build
 
+      - name: Configure JDK
+        uses: actions/setup-java@v3
+        with:
+          distribution: 'corretto'
+          java-version: 17
+          cache: 'gradle'
+
       - name: Build and Test on JVM
         working-directory: ./smithy-kotlin
         shell: bash
@@ -157,6 +164,13 @@ jobs:
       - name: Setup build
         uses: ./smithy-kotlin/.github/actions/setup-build
 
+      - name: Configure JDK
+        uses: actions/setup-java@v3
+        with:
+          distribution: 'corretto'
+          java-version: 17
+          cache: 'gradle'
+
       - name: Configure Gradle
         uses: awslabs/aws-kotlin-repo-tools/.github/actions/configure-gradle@main
         with:
@@ -189,6 +203,13 @@ jobs:
       - name: Setup build
         uses: ./smithy-kotlin/.github/actions/setup-build
 
+      - name: Configure JDK
+        uses: actions/setup-java@v3
+        with:
+          distribution: 'corretto'
+          java-version: 17
+          cache: 'gradle'
+
       - name: Configure Gradle
         uses: awslabs/aws-kotlin-repo-tools/.github/actions/configure-gradle@main
         with:
@@ -228,7 +249,12 @@ jobs:
       uses: awslabs/aws-kotlin-repo-tools/.github/actions/configure-gradle@main
       with:
         working-directory: ./aws-sdk-kotlin
-
+    - name: Configure JDK
+      uses: actions/setup-java@v3
+      with:
+        distribution: 'corretto'
+        java-version: 17
+        cache: 'gradle'
     - name: Build and Test aws-sdk-kotlin downstream
       working-directory: ./smithy-kotlin
       run: |

.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,28 @@
+name: Release readiness (snapshot dependency)
+description: >
+  Makes sure that we aren't relying on SNAPSHOT/dev versions of aws-crt-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 sources
+        uses: actions/checkout@v4
+
+      - name: Configure Gradle
+        uses: awslabs/aws-kotlin-repo-tools/.github/actions/configure-gradle@main
+
+      - name: Build smithy-kotlin
+        run: ./gradlew test jvmTest
+
+      - name: Emit error message
+        if: ${{ failure() }}
+        run: |
+          echo "::error ::Build failed. Did you forget to release aws-crt-kotlin and bump the dependency version?"
+          exit 1

CHANGELOG.md

@@ -1,5 +1,41 @@
 # Changelog
 
+## [1.4.23] - 07/15/2025
+
+## [1.4.22] - 07/02/2025
+
+## [1.4.21] - 06/27/2025
+
+## [1.4.20] - 06/20/2025
+
+### Fixes
+* Explicitly qualify shape member names in smoke tests and protocol tests
+* [#1295](https://github.com/smithy-lang/smithy-kotlin/issues/1295) Enable building this project on JDK21 by setting -Xjdk-release flag
+
+## [1.4.19] - 06/19/2025
+
+## [1.4.18] - 06/13/2025
+
+### Miscellaneous
+* Upgrade to Dokka 2.0.0
+
+## [1.4.17] - 06/11/2025
+
+### Fixes
+* Adds import to the symbols references when needed. This issue surfaced when building the protocol tests with the latest Smithy release
+
+## [1.4.16] - 04/28/2025
+
+### Features
+* Add `authSchemePreference` configuration
+
+## [1.4.15] - 04/21/2025
+
+### Fixes
+* [#1214](https://github.com/awslabs/aws-sdk-kotlin/issues/1214) Improve handling of excepted socket exceptions when using connection polling
+
+## [1.4.14] - 04/18/2025
+
 ## [1.4.13] - 04/10/2025
 
 ## [1.4.12] - 04/04/2025

CONTRIBUTING.md

@@ -204,6 +204,17 @@ The `.api` files can be updated by running `./gradlew apiDump`.
 
 The binary compatibility validator can also be run manually using `./gradlew apiCheck`.
 
+#### Release readiness
+
+This checks for cross repo changes by looking at matching branch names across repos.
+It verifies that downstream changes are ready to be released. If your change spans
+multiple repos (aws-sdk-kotlin, smithy-kotlin, aws-crt-kotlin), the upstream
+changes must be merged and released first. For release assistance ask the team
+to run a release for you.
+
+If this check is failing, and you have cross repo changes that do not rely on
+each other, you can add the `ready-for-release` label to your PR to override it.
+
 ## Finding contributions to work on
 Looking at the existing issues is a great way to find something to contribute on. As our projects, by default, use the default GitHub issue labels (enhancement/bug/duplicate/help wanted/invalid/question/wontfix), looking at any 'help wanted' issues is a great place to start.