kn: merge from main, upgrade to latest version of aws-kotlin-repo-tools

.brazil.json

@@ -5,10 +5,12 @@
 
     "com.squareup.okhttp3:okhttp-coroutines:5.*": "OkHttp3Coroutines-5.x",
     "com.squareup.okhttp3:okhttp:5.*": "OkHttp3-5.x",
+    "com.squareup.okhttp3:okhttp-jvm: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.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",
     "com.squareup.okhttp3:okhttp:4.*": "OkHttp3-4.x",

.github/dependabot.yml

@@ -0,0 +1,6 @@
+version: 2
+updates:
+  - package-ecosystem: gradle
+    directory: /
+    schedule:
+      interval: daily # means every _weekday_ (Monday through Friday)

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

@@ -1,6 +1,6 @@
 name: Artifact Size Metrics
 on:
-  pull_request:
+  pull_request_target:
     types: [ opened, synchronize, reopened, labeled, unlabeled ]
     branches:
       - main
@@ -40,7 +40,7 @@ jobs:
       - name: Put Artifact Size Metrics in CloudWatch
         run: ./gradlew putArtifactSizeMetricsInCloudWatch -Prelease=${{ github.event.release.tag_name }}
   size-check:
-    if: github.event_name == 'pull_request'
+    if: github.event_name == 'pull_request_target'
     runs-on: ubuntu-latest
     steps:
       - name: Checkout Sources
@@ -70,10 +70,10 @@ jobs:
       - name: Analyze Artifact Size Metrics
         run: ./gradlew analyzeArtifactSizeMetrics
         working-directory: smithy-kotlin
+
       - name: Show Results
         uses: awslabs/aws-kotlin-repo-tools/.github/actions/artifact-size-metrics/show-results@main
-        with:
-          working-directory: smithy-kotlin
+
       - name: Evaluate
         if: ${{ !contains(github.event.pull_request.labels.*.name, 'acknowledge-artifact-size-increase') }}
         working-directory: smithy-kotlin

.github/workflows/changelog-verification.yml

@@ -4,7 +4,7 @@ permissions:
   id-token: write
 
 on:
-  pull_request:
+  pull_request_target:
     types: [ opened, synchronize, reopened, labeled, unlabeled ]
     branches:
       - main
@@ -13,6 +13,7 @@ on:
 jobs:
   changelog-verification:
     runs-on: ubuntu-latest
+    if: github.event.pull_request.user.login != 'dependabot[bot]' # no changelogs for Dependabot version bumps
     steps:
       - name: Configure AWS Credentials
         uses: aws-actions/configure-aws-credentials@v4

.github/workflows/continuous-integration.yml

@@ -45,6 +45,10 @@ jobs:
           distribution: 'corretto'
           java-version: 17
           cache: 'gradle'
+      - name: Configure Gradle
+        uses: awslabs/aws-kotlin-repo-tools/.github/actions/configure-gradle@main
+        with:
+          working-directory: 'smithy-kotlin'
 
       - name: Build and Test on JVM
         working-directory: ./smithy-kotlin

.github/workflows/kat-transform.yml

@@ -1,7 +1,7 @@
 name: Kat Transform
 
 on:
-  pull_request:
+  pull_request_target:
     types: [ opened, synchronize, reopened, labeled, unlabeled ]
     branches:
       - main

.github/workflows/merge-main.yml

@@ -12,4 +12,4 @@ jobs:
         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
+          exempt-branches: # Add any if required

CHANGELOG.md

@@ -1,5 +1,31 @@
 # Changelog
 
+## [1.5.3] - 07/28/2025
+
+### Features
+* [#1320](https://github.com/smithy-lang/smithy-kotlin/issues/1320) Enable configuration of timeouts for calls and attempt
+
+## [1.5.2] - 07/24/2025
+
+### Miscellaneous
+* [#1339](https://github.com/smithy-lang/smithy-kotlin/issues/1339) Add documentation for OkHttp4Engine when using Android with R8 / ProGuard
+
+## [1.5.1] - 07/17/2025
+
+## [1.5.0] - 07/17/2025
+
+### Features
+* Upgrade to Kotlin 2.2.0
+* [#1413](https://github.com/awslabs/aws-sdk-kotlin/issues/1413) ⚠️ **IMPORTANT**: Refactor endpoint discoverer classes into interfaces so custom implementations may be provided
+
+### Fixes
+* [#1311](https://github.com/smithy-lang/smithy-kotlin/issues/1311) Reimplement idle connection monitoring using `okhttp3.EventListener` instead of now-internal `okhttp3.ConnectionListener`
+* [#1608](https://github.com/awslabs/aws-sdk-kotlin/issues/1608) Switch to always serialize defaults in requests. Previously fields were not serialized in requests if they weren't `@required` and hadn't been changed from the default value.
+* [#1413](https://github.com/awslabs/aws-sdk-kotlin/issues/1413) Favor `endpointUrl` instead of endpoint discovery if both are provided
+
+### Miscellaneous
+* Add telemetry provider configuration to `DefaultAwsSigner`
+
 ## [1.4.23] - 07/15/2025
 
 ## [1.4.22] - 07/02/2025

build.gradle.kts

@@ -2,8 +2,8 @@
  * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
+import aws.sdk.kotlin.gradle.dsl.configureJReleaser
 import aws.sdk.kotlin.gradle.dsl.configureLinting
-import aws.sdk.kotlin.gradle.dsl.configureNexus
 import aws.sdk.kotlin.gradle.util.typedProp
 
 buildscript {
@@ -14,6 +14,12 @@ buildscript {
         classpath(libs.kotlinx.atomicfu.plugin)
         // Add our custom gradle build logic to buildscript classpath
         classpath(libs.aws.kotlin.repo.tools.build.support)
+        /*
+        Enforce jackson to a version supported both by dokka and jreleaser:
+        https://github.com/Kotlin/dokka/issues/3472#issuecomment-1929712374
+        https://github.com/Kotlin/dokka/issues/3194#issuecomment-1929382630
+         */
+        classpath(enforcedPlatform("com.fasterxml.jackson:jackson-bom:2.19.2"))
     }
 }
 
@@ -79,7 +85,7 @@ dependencies {
 }
 
 // Publishing
-configureNexus()
+configureJReleaser()
 
 // Code Style
 val lintPaths = listOf(

codegen/smithy-aws-kotlin-codegen/src/main/kotlin/software/amazon/smithy/kotlin/codegen/aws/customization/RegionSupport.kt

@@ -40,7 +40,27 @@ class RegionSupport : KotlinIntegration {
             name = "region"
             symbol = KotlinTypes.String.toBuilder().nullable().build()
             documentation = """
-                The region to sign with and make requests to.
+                The AWS region to sign with and make requests to. When specified, this static region configuration
+                takes precedence over other region resolution methods. 
+
+                The region resolution order is:
+                1. Static region (if specified)
+                2. Custom region provider (if configured)
+                3. Default region provider chain
+            """.trimIndent()
+        }
+
+        val RegionProviderProp: ConfigProperty = ConfigProperty {
+            name = "regionProvider"
+            symbol = RuntimeTypes.SmithyClient.Region.RegionProvider
+            documentation = """
+                An optional region provider that determines the AWS region for client operations. When specified, this provider
+                takes precedence over the default region provider chain, unless a static region is explicitly configured.
+
+                The region resolution order is:
+                1. Static region (if specified)
+                2. Custom region provider (if configured)
+                3. Default region provider chain
             """.trimIndent()
         }
     }
@@ -57,7 +77,7 @@ class RegionSupport : KotlinIntegration {
         return supportsSigv4 || hasRegionBuiltin || isAwsSdk
     }
 
-    override fun additionalServiceConfigProps(ctx: CodegenContext): List<ConfigProperty> = listOf(RegionProp)
+    override fun additionalServiceConfigProps(ctx: CodegenContext): List<ConfigProperty> = listOf(RegionProp, RegionProviderProp)
 
     override fun customizeEndpointResolution(ctx: ProtocolGenerator.GenerationContext): EndpointCustomization =
         object : EndpointCustomization {

codegen/smithy-aws-kotlin-codegen/src/main/kotlin/software/amazon/smithy/kotlin/codegen/aws/protocols/AwsQuery.kt

@@ -11,13 +11,23 @@ import software.amazon.smithy.kotlin.codegen.aws.protocols.core.AbstractQueryFor
 import software.amazon.smithy.kotlin.codegen.aws.protocols.core.AwsHttpBindingProtocolGenerator
 import software.amazon.smithy.kotlin.codegen.aws.protocols.core.QueryHttpBindingProtocolGenerator
 import software.amazon.smithy.kotlin.codegen.aws.protocols.formurl.QuerySerdeFormUrlDescriptorGenerator
-import software.amazon.smithy.kotlin.codegen.core.*
+import software.amazon.smithy.kotlin.codegen.core.KotlinWriter
+import software.amazon.smithy.kotlin.codegen.core.RenderingContext
+import software.amazon.smithy.kotlin.codegen.core.RuntimeTypes
+import software.amazon.smithy.kotlin.codegen.core.withBlock
 import software.amazon.smithy.kotlin.codegen.lang.KotlinTypes
-import software.amazon.smithy.kotlin.codegen.model.*
-import software.amazon.smithy.kotlin.codegen.rendering.protocol.*
-import software.amazon.smithy.kotlin.codegen.rendering.serde.*
+import software.amazon.smithy.kotlin.codegen.model.buildSymbol
+import software.amazon.smithy.kotlin.codegen.model.getTrait
+import software.amazon.smithy.kotlin.codegen.model.hasTrait
+import software.amazon.smithy.kotlin.codegen.rendering.protocol.ProtocolGenerator
+import software.amazon.smithy.kotlin.codegen.rendering.protocol.toRenderingContext
+import software.amazon.smithy.kotlin.codegen.rendering.serde.FormUrlSerdeDescriptorGenerator
+import software.amazon.smithy.kotlin.codegen.rendering.serde.StructuredDataParserGenerator
+import software.amazon.smithy.kotlin.codegen.rendering.serde.StructuredDataSerializerGenerator
+import software.amazon.smithy.kotlin.codegen.rendering.serde.XmlParserGenerator
 import software.amazon.smithy.model.shapes.*
-import software.amazon.smithy.model.traits.*
+import software.amazon.smithy.model.traits.XmlFlattenedTrait
+import software.amazon.smithy.model.traits.XmlNameTrait
 
 /**
  * Handles generating the aws.protocols#awsQuery protocol for services.
@@ -45,7 +55,7 @@ class AwsQuery : QueryHttpBindingProtocolGenerator() {
         writer: KotlinWriter,
     ) {
         writer.write("""checkNotNull(payload){ "unable to parse error from empty response" }""")
-        writer.write("#T(payload)", RuntimeTypes.AwsXmlProtocols.parseRestXmlErrorResponseNoSuspend)
+        writer.write("#T(payload)", RuntimeTypes.AwsXmlProtocols.parseRestXmlErrorResponse)
     }
 }
 

codegen/smithy-aws-kotlin-codegen/src/main/kotlin/software/amazon/smithy/kotlin/codegen/aws/protocols/Ec2Query.kt

@@ -10,7 +10,10 @@ import software.amazon.smithy.codegen.core.Symbol
 import software.amazon.smithy.kotlin.codegen.aws.protocols.core.AbstractQueryFormUrlSerializerGenerator
 import software.amazon.smithy.kotlin.codegen.aws.protocols.core.QueryHttpBindingProtocolGenerator
 import software.amazon.smithy.kotlin.codegen.aws.protocols.formurl.QuerySerdeFormUrlDescriptorGenerator
-import software.amazon.smithy.kotlin.codegen.core.*
+import software.amazon.smithy.kotlin.codegen.core.KotlinWriter
+import software.amazon.smithy.kotlin.codegen.core.RenderingContext
+import software.amazon.smithy.kotlin.codegen.core.RuntimeTypes
+import software.amazon.smithy.kotlin.codegen.core.withBlock
 import software.amazon.smithy.kotlin.codegen.model.buildSymbol
 import software.amazon.smithy.kotlin.codegen.model.getTrait
 import software.amazon.smithy.kotlin.codegen.model.isNullable
@@ -39,7 +42,7 @@ class Ec2Query : QueryHttpBindingProtocolGenerator() {
         writer: KotlinWriter,
     ) {
         writer.write("""checkNotNull(payload){ "unable to parse error from empty response" }""")
-        writer.write("#T(payload)", RuntimeTypes.AwsXmlProtocols.parseEc2QueryErrorResponseNoSuspend)
+        writer.write("#T(payload)", RuntimeTypes.AwsXmlProtocols.parseEc2QueryErrorResponse)
     }
 }
 

codegen/smithy-aws-kotlin-codegen/src/main/kotlin/software/amazon/smithy/kotlin/codegen/aws/protocols/RestXml.kt

@@ -63,7 +63,7 @@ open class RestXml : AwsHttpBindingProtocolGenerator() {
         writer: KotlinWriter,
     ) {
         writer.write("""checkNotNull(payload){ "unable to parse error from empty response" }""")
-        writer.write("#T(payload)", RuntimeTypes.AwsXmlProtocols.parseRestXmlErrorResponseNoSuspend)
+        writer.write("#T(payload)", RuntimeTypes.AwsXmlProtocols.parseRestXmlErrorResponse)
     }
 }
 

codegen/smithy-aws-kotlin-codegen/src/test/kotlin/software/amazon/smithy/kotlin/codegen/aws/customization/RegionSupportTest.kt

@@ -0,0 +1,73 @@
+package software.amazon.smithy.kotlin.codegen.aws.customization
+
+import org.junit.jupiter.api.Test
+import software.amazon.smithy.kotlin.codegen.core.KotlinWriter
+import software.amazon.smithy.kotlin.codegen.model.expectShape
+import software.amazon.smithy.kotlin.codegen.rendering.ServiceClientConfigGenerator
+import software.amazon.smithy.kotlin.codegen.test.*
+import software.amazon.smithy.model.shapes.ServiceShape
+
+class RegionSupportTest {
+    @Test
+    fun testRegionSupportProperties() {
+        val model = """
+            namespace com.test
+
+            use aws.protocols#awsJson1_1
+            use aws.api#service
+            use aws.auth#sigv4
+
+            @service(sdkId: "service with overrides", endpointPrefix: "service-with-overrides")
+            @sigv4(name: "example")
+            @awsJson1_1
+            service Example {
+                version: "1.0.0",
+                operations: [GetFoo]
+            }
+
+            operation GetFoo {}
+        """.toSmithyModel()
+
+        val serviceShape = model.expectShape<ServiceShape>("com.test#Example")
+
+        val testCtx = model.newTestContext(serviceName = "Example")
+        val writer = KotlinWriter("com.test")
+
+        val renderingCtx = testCtx.toRenderingContext(writer, serviceShape)
+            .copy(integrations = listOf(RegionSupport()))
+
+        ServiceClientConfigGenerator(serviceShape, detectDefaultProps = false).render(renderingCtx, renderingCtx.writer)
+        val contents = writer.toString()
+
+        val expectedProps = """
+            public val region: String? = builder.region
+            public val regionProvider: RegionProvider? = builder.regionProvider
+        """.formatForTest()
+        contents.shouldContainOnlyOnceWithDiff(expectedProps)
+
+        val expectedImpl = """
+            /**
+             * The AWS region to sign with and make requests to. When specified, this static region configuration
+             * takes precedence over other region resolution methods.
+             *
+             * The region resolution order is:
+             * 1. Static region (if specified)
+             * 2. Custom region provider (if configured)
+             * 3. Default region provider chain
+             */
+            public var region: String? = null
+
+            /**
+             * An optional region provider that determines the AWS region for client operations. When specified, this provider
+             * takes precedence over the default region provider chain, unless a static region is explicitly configured.
+             *
+             * The region resolution order is:
+             * 1. Static region (if specified)
+             * 2. Custom region provider (if configured)
+             * 3. Default region provider chain
+             */
+            public var regionProvider: RegionProvider? = null
+        """.formatForTest(indent = "        ")
+        contents.shouldContainOnlyOnceWithDiff(expectedImpl)
+    }
+}

codegen/smithy-kotlin-codegen-testutils/src/main/kotlin/software/amazon/smithy/kotlin/codegen/test/ModelTestUtils.kt

@@ -8,6 +8,7 @@ import software.amazon.smithy.build.MockManifest
 import software.amazon.smithy.codegen.core.SymbolProvider
 import software.amazon.smithy.kotlin.codegen.*
 import software.amazon.smithy.kotlin.codegen.core.CodegenContext
+import software.amazon.smithy.kotlin.codegen.core.GenerationContext
 import software.amazon.smithy.kotlin.codegen.core.KotlinDelegator
 import software.amazon.smithy.kotlin.codegen.integration.KotlinIntegration
 import software.amazon.smithy.kotlin.codegen.model.OperationNormalizer
@@ -122,9 +123,11 @@ fun Model.newTestContext(
     val manifest = MockManifest()
     val provider: SymbolProvider = KotlinCodegenPlugin.createSymbolProvider(model = this, rootNamespace = packageName, serviceName = serviceName, settings = settings)
     val service = this.getShape(ShapeId.from("$packageName#$serviceName")).get().asServiceShape().get()
-    val delegator = KotlinDelegator(settings, this, manifest, provider, integrations)
 
-    val ctx = ProtocolGenerator.GenerationContext(
+    val codegenCtx = GenerationContext(this, provider, settings, generator, integrations)
+    val delegator = KotlinDelegator(codegenCtx, manifest, integrations)
+
+    val generationCtx = ProtocolGenerator.GenerationContext(
         settings,
         this,
         service,
@@ -133,7 +136,8 @@ fun Model.newTestContext(
         generator.protocol,
         delegator,
     )
-    return TestContext(ctx, manifest, generator)
+
+    return TestContext(generationCtx, manifest, generator)
 }
 
 fun TestContext.toCodegenContext() = object : CodegenContext {
@@ -173,7 +177,7 @@ fun Model.defaultSettings(
     sdkId: String = TestModelDefault.SDK_ID,
     generateDefaultBuildFiles: Boolean = false,
     nullabilityCheckMode: CheckMode = CheckMode.CLIENT_CAREFUL,
-    defaultValueSerializationMode: DefaultValueSerializationMode = DefaultValueSerializationMode.WHEN_DIFFERENT,
+    defaultValueSerializationMode: DefaultValueSerializationMode = DefaultValueSerializationMode.DEFAULT,
 ): KotlinSettings {
     val serviceId = if (serviceName == null) {
         this.inferService()

codegen/smithy-kotlin-codegen/src/main/kotlin/software/amazon/smithy/kotlin/codegen/CodegenVisitor.kt

@@ -87,12 +87,12 @@ class CodegenVisitor(context: PluginContext) : ShapeVisitor.Default<Unit>() {
             integration.decorateSymbolProvider(settings, model, provider)
         }
 
-        writers = KotlinDelegator(settings, model, fileManifest, symbolProvider, integrations)
-
         protocolGenerator = resolveProtocolGenerator(integrations, model, service, settings)
-        applicationProtocol = protocolGenerator?.applicationProtocol ?: ApplicationProtocol.createDefaultHttpApplicationProtocol()
-
         baseGenerationContext = GenerationContext(model, symbolProvider, settings, protocolGenerator, integrations)
+
+        writers = KotlinDelegator(baseGenerationContext, fileManifest, integrations)
+
+        applicationProtocol = protocolGenerator?.applicationProtocol ?: ApplicationProtocol.createDefaultHttpApplicationProtocol()
     }
 
     private fun resolveProtocolGenerator(