chore: merge main into v1.5-main (#1269)

Author: ianbotsf

.brazil.json

@@ -7,30 +7,44 @@
     "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"
+    "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}.0.x",
       "overrides": {
-        "software.amazon.smithy.kotlin:smithy-kotlin-codegen": "{MAJOR}.{MINOR}.x",
-        "software.amazon.smithy.kotlin:smithy-kotlin-codegen-testutils": "{MAJOR}.{MINOR}.x"
+        "software.amazon.smithy.kotlin:smithy-aws-kotlin-codegen": "{MAJOR}.x",
+        "software.amazon.smithy.kotlin:smithy-kotlin-codegen": "{MAJOR}.x"
       }
     },
     "rename": {
-        "software.amazon.smithy.kotlin:smithy-kotlin-codegen": "SmithyKotlinCodegen",
-        "software.amazon.smithy.kotlin:smithy-kotlin-codegen-testutils": "SmithyKotlinCodegenTestUtils"
+        "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"
+      "aws.smithy.kotlin:version-catalog",
+      "software.amazon.smithy.kotlin:smithy-kotlin-codegen-testutils"
     ],
     "resolvesConflictDependencies": {
       "org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.*": [

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

@@ -31,6 +31,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: Generate Artifact Size Metrics
         run: ./gradlew artifactSizeMetrics
       - name: Save Artifact Size Metrics
@@ -54,60 +56,15 @@ 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: Generate Artifact Size Metrics
         run: ./gradlew artifactSizeMetrics
       - 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}) {
-                    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
         if: ${{ !contains(github.event.pull_request.labels.*.name, 'acknowledge-artifact-size-increase') }}

.github/workflows/continuous-integration.yml

@@ -39,6 +39,8 @@ jobs:
           distribution: 'corretto'
           java-version: 17
           cache: 'gradle'
+      - name: Configure Gradle
+        uses: awslabs/aws-kotlin-repo-tools/.github/actions/configure-gradle@main
       - name: Test
         shell: bash
         run: |
@@ -59,6 +61,8 @@ jobs:
           distribution: 'corretto'
           java-version: 17
           cache: 'gradle'
+      - name: Configure Gradle
+        uses: awslabs/aws-kotlin-repo-tools/.github/actions/configure-gradle@main
       - name: Test
         shell: bash
         run: |
@@ -83,6 +87,8 @@ jobs:
           distribution: 'corretto'
           java-version: 17
           cache: 'gradle'
+      - name: Configure Gradle
+        uses: awslabs/aws-kotlin-repo-tools/.github/actions/configure-gradle@main
       - name: Test
         shell: bash
         run: |
@@ -110,6 +116,14 @@ jobs:
         # smithy-kotlin is checked out as a sibling dir which will automatically make it an included build
         path: 'aws-sdk-kotlin'
         repository: 'awslabs/aws-sdk-kotlin'
+    - name: Configure Gradle - smithy-kotlin
+      uses: awslabs/aws-kotlin-repo-tools/.github/actions/configure-gradle@main
+      with:
+        working-directory: ./smithy-kotlin
+    - name: Configure Gradle - aws-sdk-kotlin
+      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:

.github/workflows/kat-transform.yml

@@ -35,6 +35,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: ./smithy-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@v2
+    - 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 == 'smithy-lang/smithy-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/smithy-lang/smithy-kotlin.git"
+          source_branch: "main"
+          destination_repo: "https://aws-sdk-kotlin-ci:${{ secrets.CI_USER_PAT }}@github.com/smithy-lang/private-smithy-kotlin-staging.git"
+          destination_branch: "main"

CHANGELOG.md

@@ -1,5 +1,53 @@
 # Changelog
 
+## [1.4.13] - 04/10/2025
+
+## [1.4.12] - 04/04/2025
+
+## [1.4.11] - 03/14/2025
+
+## [1.4.10] - 03/06/2025
+
+### Fixes
+* Correctly handle sequential calls to `SingleFlightGroup`
+
+## [1.4.9] - 02/27/2025
+
+### Fixes
+* Correctly generate paginators for item type names which collide with other used types (e.g., an item type `com.foo.Flow` which conflicts with `kotlinx.coroutines.flow.Flow`)
+
+## [1.4.8] - 02/27/2025
+
+### Fixes
+* Idempotency tokens are no longer code-generated for nested structures. See: https://smithy.io/2.0/spec/behavior-traits.html#smithy-api-idempotencytoken-trait
+
+## [1.4.7] - 02/25/2025
+
+### Fixes
+* [#1211](https://github.com/smithy-lang/smithy-kotlin/issues/1211) Fix OpenTelemetry span concurrency by using Span.asContextElement() instead of Span.makeCurrent()
+
+## [1.4.6] - 02/25/2025
+
+## [1.4.5] - 02/24/2025
+
+### Features
+* Add SigV4a support to the default AWS signer
+
+## [1.4.4] - 02/18/2025
+
+### Miscellaneous
+* Increase maximum event stream message length to 24MB
+
+## [1.4.3] - 02/13/2025
+
+### Fixes
+* Fix errors in equality checks for `CaseInsensitiveMap` which affect `Headers` and `ValuesMap` implementations
+* fix: correct hash code calculation for case-insensitive map entries
+* [#1413](https://github.com/awslabs/aws-sdk-kotlin/issues/1413) Favor `endpointUrl` over endpoint discovery when provided
+
+### Miscellaneous
+* Add telemetry provider configuration to `DefaultAwsSigner`
+
 ## [1.4.2] - 01/28/2025
 
 ### Fixes

codegen/smithy-aws-kotlin-codegen/build.gradle.kts

@@ -13,15 +13,11 @@ plugins {
 }
 
 val codegenVersion: String by project
-description = "Codegen support for AWS protocols"
+description = "Smithy codegen support for AWS protocols"
 group = "software.amazon.smithy.kotlin"
 version = codegenVersion
 
-val sdkVersion: String by project
-
 dependencies {
-
-    implementation(libs.kotlin.stdlib.jdk8)
     api(project(":codegen:smithy-kotlin-codegen"))
 
     api(libs.smithy.aws.traits)