kn: merge from main

.brazil.json

@@ -6,6 +6,7 @@
     "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",

.github/workflows/merge-main.yml

@@ -0,0 +1,14 @@
+name: Merge main
+on:
+  schedule:
+    - cron: "0 7 * * 1-5"  # At 07:00 UTC (00:00 PST, 03:00 EST), Monday through Friday
+  workflow_dispatch:
+
+jobs:
+  test:
+    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

CHANGELOG.md

@@ -1,5 +1,49 @@
 # Changelog
 
+## [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/src/test/kotlin/software/amazon/smithy/kotlin/codegen/aws/protocols/AwsQueryTest.kt

@@ -0,0 +1,105 @@
+package software.amazon.smithy.kotlin.codegen.aws.protocols
+
+import software.amazon.smithy.kotlin.codegen.test.*
+import kotlin.test.Test
+
+class AwsQueryTest {
+    @Test
+    fun testNonNestedIdempotencyToken() {
+        val ctx = model.newTestContext("Example")
+
+        val generator = AwsQuery()
+        generator.generateProtocolClient(ctx.generationCtx)
+
+        ctx.generationCtx.delegator.finalize()
+        ctx.generationCtx.delegator.flushWriters()
+
+        val expected = """
+            serializer.serializeStruct(OBJ_DESCRIPTOR) {
+                input.bar?.let { field(BAR_DESCRIPTOR, it) } ?: field(BAR_DESCRIPTOR, context.idempotencyTokenProvider.generateToken())
+            }
+        """.trimIndent()
+
+        val actual = ctx
+            .manifest
+            .expectFileString("/src/main/kotlin/com/test/serde/GetBarUnNestedOperationSerializer.kt")
+            .lines("    serializer.serializeStruct(OBJ_DESCRIPTOR) {", "    }")
+            .trimIndent()
+
+        actual.shouldContainOnlyOnceWithDiff(expected)
+    }
+
+    @Test
+    fun testNestedIdempotencyToken() {
+        val ctx = model.newTestContext("Example")
+
+        val generator = AwsQuery()
+        generator.generateProtocolClient(ctx.generationCtx)
+
+        ctx.generationCtx.delegator.finalize()
+        ctx.generationCtx.delegator.flushWriters()
+
+        val expected = """
+            serializer.serializeStruct(OBJ_DESCRIPTOR) {
+                input.baz?.let { field(BAZ_DESCRIPTOR, it) }
+            }
+        """.trimIndent()
+
+        val actual = ctx
+            .manifest
+            .expectFileString("/src/main/kotlin/com/test/serde/NestDocumentSerializer.kt")
+            .lines("    serializer.serializeStruct(OBJ_DESCRIPTOR) {", "    }")
+            .trimIndent()
+
+        actual.shouldContainOnlyOnceWithDiff(expected)
+
+        val unexpected = """
+            serializer.serializeStruct(OBJ_DESCRIPTOR) {
+                input.baz?.let { field(BAZ_DESCRIPTOR, it) } ?: field(BAR_DESCRIPTOR, context.idempotencyTokenProvider.generateToken())
+            }
+        """.trimIndent()
+
+        actual.shouldNotContainOnlyOnceWithDiff(unexpected)
+    }
+
+    private val model = """
+        ${"$"}version: "2"
+
+        namespace com.test
+
+        use aws.protocols#awsQuery
+        use aws.api#service
+
+        @awsQuery
+        @service(sdkId: "Example")
+        @xmlNamespace(uri: "http://foo.com")
+        service Example {
+            version: "1.0.0",
+            operations: [GetBarUnNested, GetBarNested]
+        }
+
+        @http(method: "POST", uri: "/get-bar-un-nested")
+        operation GetBarUnNested {
+            input: BarUnNested
+        }
+
+        structure BarUnNested {
+            @idempotencyToken
+            bar: String
+        }
+
+        @http(method: "POST", uri: "/get-bar-nested")
+        operation GetBarNested {
+            input: BarNested
+        }
+
+        structure BarNested {
+            bar: Nest
+        }
+
+        structure Nest {
+            @idempotencyToken
+            baz: String
+        }
+    """.toSmithyModel()
+}

codegen/smithy-aws-kotlin-codegen/src/test/kotlin/software/amazon/smithy/kotlin/codegen/aws/protocols/RestJson1Test.kt

@@ -0,0 +1,104 @@
+package software.amazon.smithy.kotlin.codegen.aws.protocols
+
+import software.amazon.smithy.kotlin.codegen.test.*
+import kotlin.test.Test
+
+class RestJson1Test {
+    @Test
+    fun testNonNestedIdempotencyToken() {
+        val ctx = model.newTestContext("Example")
+
+        val generator = RestJson1()
+        generator.generateProtocolClient(ctx.generationCtx)
+
+        ctx.generationCtx.delegator.finalize()
+        ctx.generationCtx.delegator.flushWriters()
+
+        val expected = """
+            serializer.serializeStruct(OBJ_DESCRIPTOR) {
+                input.bar?.let { field(BAR_DESCRIPTOR, it) } ?: field(BAR_DESCRIPTOR, context.idempotencyTokenProvider.generateToken())
+            }
+        """.trimIndent()
+
+        val actual = ctx
+            .manifest
+            .expectFileString("/src/main/kotlin/com/test/serde/GetBarUnNestedOperationSerializer.kt")
+            .lines("    serializer.serializeStruct(OBJ_DESCRIPTOR) {", "    }")
+            .trimIndent()
+
+        actual.shouldContainOnlyOnceWithDiff(expected)
+    }
+
+    @Test
+    fun testNestedIdempotencyToken() {
+        val ctx = model.newTestContext("Example")
+
+        val generator = RestJson1()
+        generator.generateProtocolClient(ctx.generationCtx)
+
+        ctx.generationCtx.delegator.finalize()
+        ctx.generationCtx.delegator.flushWriters()
+
+        val expected = """
+            serializer.serializeStruct(OBJ_DESCRIPTOR) {
+                input.baz?.let { field(BAZ_DESCRIPTOR, it) }
+            }
+        """.trimIndent()
+
+        val actual = ctx
+            .manifest
+            .expectFileString("/src/main/kotlin/com/test/serde/NestDocumentSerializer.kt")
+            .lines("    serializer.serializeStruct(OBJ_DESCRIPTOR) {", "    }")
+            .trimIndent()
+
+        actual.shouldContainOnlyOnceWithDiff(expected)
+
+        val unexpected = """
+            serializer.serializeStruct(OBJ_DESCRIPTOR) {
+                input.baz?.let { field(BAZ_DESCRIPTOR, it) } ?: field(BAR_DESCRIPTOR, context.idempotencyTokenProvider.generateToken())
+            }
+        """.trimIndent()
+
+        actual.shouldNotContainOnlyOnceWithDiff(unexpected)
+    }
+
+    private val model = """
+        ${"$"}version: "2"
+
+        namespace com.test
+
+        use aws.protocols#restJson1
+        use aws.api#service
+
+        @restJson1
+        @service(sdkId: "Example")
+        service Example {
+            version: "1.0.0",
+            operations: [GetBarUnNested, GetBarNested]
+        }
+
+        @http(method: "POST", uri: "/get-bar-un-nested")
+        operation GetBarUnNested {
+            input: BarUnNested
+        }
+
+        structure BarUnNested {
+            @idempotencyToken
+            bar: String
+        }
+
+        @http(method: "POST", uri: "/get-bar-nested")
+        operation GetBarNested {
+            input: BarNested
+        }
+
+        structure BarNested {
+            bar: Nest
+        }
+
+        structure Nest {
+            @idempotencyToken
+            baz: String
+        }
+    """.toSmithyModel()
+}

codegen/smithy-aws-kotlin-codegen/src/test/kotlin/software/amazon/smithy/kotlin/codegen/aws/protocols/RestXmlTest.kt

@@ -0,0 +1,104 @@
+package software.amazon.smithy.kotlin.codegen.aws.protocols
+
+import software.amazon.smithy.kotlin.codegen.test.*
+import kotlin.test.Test
+
+class RestXmlTest {
+    @Test
+    fun testNonNestedIdempotencyToken() {
+        val ctx = model.newTestContext("Example")
+
+        val generator = RestXml()
+        generator.generateProtocolClient(ctx.generationCtx)
+
+        ctx.generationCtx.delegator.finalize()
+        ctx.generationCtx.delegator.flushWriters()
+
+        val expected = """
+            serializer.serializeStruct(OBJ_DESCRIPTOR) {
+                input.bar?.let { field(BAR_DESCRIPTOR, it) } ?: field(BAR_DESCRIPTOR, context.idempotencyTokenProvider.generateToken())
+            }
+        """.trimIndent()
+
+        val actual = ctx
+            .manifest
+            .expectFileString("/src/main/kotlin/com/test/serde/GetBarUnNestedOperationSerializer.kt")
+            .lines("    serializer.serializeStruct(OBJ_DESCRIPTOR) {", "    }")
+            .trimIndent()
+
+        actual.shouldContainOnlyOnceWithDiff(expected)
+    }
+
+    @Test
+    fun testNestedIdempotencyToken() {
+        val ctx = model.newTestContext("Example")
+
+        val generator = RestXml()
+        generator.generateProtocolClient(ctx.generationCtx)
+
+        ctx.generationCtx.delegator.finalize()
+        ctx.generationCtx.delegator.flushWriters()
+
+        val expected = """
+            serializer.serializeStruct(OBJ_DESCRIPTOR) {
+                input.baz?.let { field(BAZ_DESCRIPTOR, it) }
+            }
+        """.trimIndent()
+
+        val actual = ctx
+            .manifest
+            .expectFileString("/src/main/kotlin/com/test/serde/NestDocumentSerializer.kt")
+            .lines("    serializer.serializeStruct(OBJ_DESCRIPTOR) {", "    }")
+            .trimIndent()
+
+        actual.shouldContainOnlyOnceWithDiff(expected)
+
+        val unexpected = """
+            serializer.serializeStruct(OBJ_DESCRIPTOR) {
+                input.baz?.let { field(BAZ_DESCRIPTOR, it) } ?: field(BAR_DESCRIPTOR, context.idempotencyTokenProvider.generateToken())
+            }
+        """.trimIndent()
+
+        actual.shouldNotContainOnlyOnceWithDiff(unexpected)
+    }
+
+    private val model = """
+        ${"$"}version: "2"
+
+        namespace com.test
+
+        use aws.protocols#restXml
+        use aws.api#service
+
+        @restXml
+        @service(sdkId: "Example")
+        service Example {
+            version: "1.0.0",
+            operations: [GetBarUnNested, GetBarNested]
+        }
+
+        @http(method: "POST", uri: "/get-bar-un-nested")
+        operation GetBarUnNested {
+            input: BarUnNested
+        }
+
+        structure BarUnNested {
+            @idempotencyToken
+            bar: String
+        }
+
+        @http(method: "POST", uri: "/get-bar-nested")
+        operation GetBarNested {
+            input: BarNested
+        }
+
+        structure BarNested {
+            bar: Nest
+        }
+
+        structure Nest {
+            @idempotencyToken
+            baz: String
+        }
+    """.toSmithyModel()
+}