misc: merge main into update-merge-main

.brazil.json

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

CHANGELOG.md

@@ -1,5 +1,36 @@
 # Changelog
 
+## [1.6.14] - 05/08/2026
+
+### Features
+* Add standard retry strategy with updated exponential backoff, retry quotas, `x-amz-retry-after` header support, and service-specific behavior for DynamoDB. Gated behind the `SMITHY_NEW_RETRIES_2026` feature flag. See the [announcement](https://github.com/aws/aws-sdk-kotlin/discussions/1885) for more details.
+* Add retry logic for long polling operations. See the [announcement](https://github.com/aws/aws-sdk-kotlin/discussions/1885) for more details.
+
+### Fixes
+* Erase empty file if setting permissions fails
+
+## [1.6.13] - 04/28/2026
+
+### Miscellaneous
+* Bumping Kotlin version to 2.3.20
+
+## [1.6.12] - 04/20/2026
+
+## [1.6.11] - 04/17/2026
+
+### Fixes
+* Fix codegen for `getAttr` returning boolean in endpoint rule conditions
+
+## [1.6.10] - 04/13/2026
+
+## [1.6.9] - 03/31/2026
+
+### Fixes
+* Fix code generation of negative default values for doubles
+* Sleep outside of lock in adaptive rate limiter
+
+## [1.6.8] - 03/30/2026
+
 ## [1.6.7] - 03/24/2026
 
 ## [1.6.6] - 03/13/2026

CONTRIBUTING.md

@@ -54,6 +54,21 @@ To send us a pull request, please:
 GitHub provides additional document on [forking a repository](https://help.github.com/articles/fork-a-repo/) and
 [creating a pull request](https://help.github.com/articles/creating-a-pull-request/).
 
+### Automated Tools
+
+The use of AI tooling for assisted development work is accepted and encouraged in this repository, but due to the volume
+of submissions we ask that you observe the following rules:
+
+- All issue and pull request submissions to this repository that are sourced by AI must first be reviewed by a human
+  before submitting to the repository. Items reviewed in this way must include a statement like "generated by AI tools,
+  and reviewed by <person>"
+- Please ensure that your submissions are actually improvements. While we are grateful for any proposed fixes, even if
+  they are very small, behavior that looks like creating nuisance PRs or artificially inflating submission counts is not
+  acceptable.
+- We may close issues or pull requests, or limit your ability to interact with this repository, for behavior that in our
+  estimation violates these rules or any of the other rules in the
+  [Amazon Open Source Code of Conduct](https://aws.github.io/code-of-conduct).
+
 ### API and style guidelines
 
 Smithy Kotlin's generated code is multiplatform and intended to work for a wide variety of environments and use cases.

build.gradle.kts

@@ -23,7 +23,7 @@ buildscript {
         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.21.1"))
+        classpath(enforcedPlatform("com.fasterxml.jackson:jackson-bom:2.21.3"))
     }
 
     configurations.classpath {
@@ -34,7 +34,7 @@ buildscript {
 
             FIXME: Figure out what broke our buildscript classpath, this is a temporary fix
              */
-            force("com.squareup.okhttp3:okhttp-coroutines:5.0.0-alpha.14")
+            force("com.squareup.okhttp3:okhttp-coroutines:5.3.2")
         }
     }
 }
@@ -139,6 +139,7 @@ apiValidation {
             "compile",
             "slf4j-1x-consumer",
             "slf4j-2x-consumer",
+            "enum-tests",
         ),
     )
 }

codegen/aws-codegen/build.gradle.kts

@@ -27,10 +27,8 @@ dependencies {
     api(libs.smithy.protocol.traits)
     implementation(libs.smithy.aws.endpoints)
 
-    testImplementation(libs.junit.jupiter)
-    testImplementation(libs.junit.jupiter.params)
     testImplementation(libs.kotest.assertions.core.jvm)
-    testImplementation(libs.kotlin.test.junit5)
+    testImplementation(libs.kotlin.test)
     testImplementation(project(":codegen:codegen-testutils"))
 
     testImplementation(libs.slf4j.api)

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

@@ -13,8 +13,8 @@ import aws.smithy.kotlin.codegen.test.newTestContext
 import aws.smithy.kotlin.codegen.test.shouldContainOnlyOnceWithDiff
 import aws.smithy.kotlin.codegen.test.toRenderingContext
 import aws.smithy.kotlin.codegen.test.toSmithyModel
-import org.junit.jupiter.api.Test
 import software.amazon.smithy.model.shapes.ServiceShape
+import kotlin.test.Test
 
 class RegionSupportTest {
     @Test

codegen/codegen-testutils/build.gradle.kts

@@ -26,10 +26,8 @@ dependencies {
     api(project(":codegen:codegen"))
 
     // Test dependencies
-    implementation(libs.junit.jupiter)
     implementation(libs.kotest.assertions.core.jvm)
     implementation(libs.kotlin.test)
-    implementation(libs.kotlin.test.junit5)
 }
 
 tasks.withType<KotlinCompile> {

codegen/codegen/api/codegen.api

@@ -2152,6 +2152,21 @@ public final class aws/smithy/kotlin/codegen/rendering/endpoints/discovery/Endpo
 	public final fun isOptionalFor (Laws/smithy/kotlin/codegen/core/CodegenContext;)Z
 }
 
+public final class aws/smithy/kotlin/codegen/rendering/longpoll/LongPollingIntegration : aws/smithy/kotlin/codegen/integration/KotlinIntegration {
+	public fun <init> ()V
+	public fun additionalServiceConfigProps (Laws/smithy/kotlin/codegen/core/CodegenContext;)Ljava/util/List;
+	public fun authSchemes (Laws/smithy/kotlin/codegen/rendering/protocol/ProtocolGenerator$GenerationContext;)Ljava/util/List;
+	public fun customizeEndpointResolution (Laws/smithy/kotlin/codegen/rendering/protocol/ProtocolGenerator$GenerationContext;)Laws/smithy/kotlin/codegen/rendering/endpoints/EndpointCustomization;
+	public fun customizeMiddleware (Laws/smithy/kotlin/codegen/rendering/protocol/ProtocolGenerator$GenerationContext;Ljava/util/List;)Ljava/util/List;
+	public fun decorateSymbolProvider (Laws/smithy/kotlin/codegen/KotlinSettings;Lsoftware/amazon/smithy/model/Model;Lsoftware/amazon/smithy/codegen/core/SymbolProvider;)Lsoftware/amazon/smithy/codegen/core/SymbolProvider;
+	public fun enabledForService (Lsoftware/amazon/smithy/model/Model;Laws/smithy/kotlin/codegen/KotlinSettings;)Z
+	public fun getOrder ()B
+	public fun getProtocolGenerators ()Ljava/util/List;
+	public fun getSectionWriters ()Ljava/util/List;
+	public fun preprocessModel (Lsoftware/amazon/smithy/model/Model;Laws/smithy/kotlin/codegen/KotlinSettings;)Lsoftware/amazon/smithy/model/Model;
+	public fun writeAdditionalFiles (Laws/smithy/kotlin/codegen/core/CodegenContext;Laws/smithy/kotlin/codegen/core/KotlinDelegator;)V
+}
+
 public final class aws/smithy/kotlin/codegen/rendering/protocol/ApplicationProtocol {
 	public static final field Companion Laws/smithy/kotlin/codegen/rendering/protocol/ApplicationProtocol$Companion;
 	public fun <init> (Ljava/lang/String;Lsoftware/amazon/smithy/codegen/core/Symbol;Lsoftware/amazon/smithy/codegen/core/Symbol;)V

codegen/codegen/build.gradle.kts

@@ -33,11 +33,10 @@ dependencies {
     implementation(libs.jsoup)
 
     // Test dependencies
-    testImplementation(libs.junit.jupiter)
     testImplementation(libs.kotest.assertions.core.jvm)
     testImplementation(libs.kotlin.test)
-    testImplementation(libs.kotlin.test.junit5)
     testImplementation(project(":codegen:codegen-testutils"))
+    testImplementation(project(":runtime:testing"))
 }
 
 val generateSdkRuntimeVersion by tasks.registering {

codegen/codegen/src/main/kotlin/aws/smithy/kotlin/codegen/core/KotlinDependency.kt

@@ -37,7 +37,7 @@ private fun getDefaultRuntimeVersion(): String {
 // publishing info
 const val RUNTIME_GROUP: String = "aws.smithy.kotlin"
 val RUNTIME_VERSION: String = System.getProperty("smithy.kotlin.codegen.clientRuntimeVersion", getDefaultRuntimeVersion())
-val KOTLIN_COMPILER_VERSION: String = System.getProperty("smithy.kotlin.codegen.kotlinCompilerVersion", "2.3.0")
+val KOTLIN_COMPILER_VERSION: String = System.getProperty("smithy.kotlin.codegen.kotlinCompilerVersion", "2.3.20")
 
 enum class SourceSet {
     CommonMain,

codegen/codegen/src/main/kotlin/aws/smithy/kotlin/codegen/core/KotlinSymbolProvider.kt

@@ -361,7 +361,7 @@ class KotlinSymbolProvider(private val model: Model, private val settings: Kotli
     private fun getDefaultValueForNumber(type: ShapeType, value: String) = when (type) {
         ShapeType.LONG -> "${value}L"
         ShapeType.FLOAT -> "${value}f"
-        ShapeType.DOUBLE -> if (value.matches("[0-9]*\\.[0-9]+".toRegex())) value else "$value.0"
+        ShapeType.DOUBLE -> if (value.matches("-?[0-9]*\\.[0-9]+".toRegex())) value else "$value.0"
         ShapeType.SHORT -> "$value.toShort()"
         ShapeType.BYTE -> "$value.toByte()"
         else -> value

codegen/codegen/src/main/kotlin/aws/smithy/kotlin/codegen/rendering/EnumGenerator.kt

@@ -63,7 +63,7 @@ import java.util.logging.Logger
  *
  *         fun values(): List<SimpleYesNo> = values
  *
- *         private val values: List<SimpleYesNo> = listOf(Yes, No)
+ *         private val values: List<SimpleYesNo> by lazy { listOf(Yes, No) }
  *     }
  * }
  *
@@ -93,7 +93,7 @@ import java.util.logging.Logger
  *
  *         fun values(): List<SimpleYesNo> = values
  *
- *         private val values: List<SimpleYesNo> = listOf(Yes, No)
+ *         private val values: List<SimpleYesNo> by lazy { listOf(Yes, No) }
  *     }
  * }
  * ```
@@ -160,7 +160,7 @@ class EnumGenerator(val shape: Shape, val symbol: Symbol, val writer: KotlinWrit
             write("public fun values(): #Q<#Q> = values", KotlinTypes.Collections.List, symbol)
             write("")
 
-            withBlock("private val values: #Q<#Q> = listOf(", ")", KotlinTypes.Collections.List, symbol) {
+            withBlock("private val values: #Q<#Q> by lazy { listOf(", ") }", KotlinTypes.Collections.List, symbol) {
                 ktEnum.variants.forEach { write("#L,", it.name) }
             }
         }

codegen/codegen/src/main/kotlin/aws/smithy/kotlin/codegen/rendering/endpoints/DefaultEndpointProviderGenerator.kt

@@ -19,6 +19,8 @@ import software.amazon.smithy.codegen.core.CodegenException
 import software.amazon.smithy.codegen.core.Symbol
 import software.amazon.smithy.model.SourceLocation
 import software.amazon.smithy.rulesengine.language.EndpointRuleSet
+import software.amazon.smithy.rulesengine.language.evaluation.type.BooleanType
+import software.amazon.smithy.rulesengine.language.evaluation.type.OptionalType
 import software.amazon.smithy.rulesengine.language.syntax.Identifier
 import software.amazon.smithy.rulesengine.language.syntax.ToExpression
 import software.amazon.smithy.rulesengine.language.syntax.expressions.*
@@ -156,9 +158,7 @@ class DefaultEndpointProviderGenerator(
                 writer.openBlock("if (")
                 expressions.forEachIndexed { index, it ->
                     renderExpression(it.function)
-                    if (!it.function.isBooleanFunction()) { // these are meant to be evaluated on "truthiness" (i.e. is the result non-null)
-                        writeInline(" != null")
-                    }
+                    it.function.renderTruthinessCheck(writer)
                     write(if (index == expressions.lastIndex) "" else " &&")
                 }
                 writer.closeAndOpenBlock(") {")
@@ -418,16 +418,23 @@ private fun isSet(expression: Expression) = IsSet
     .getDefinition()
     .createFunction(FunctionNode.ofExpressions(IsSet.ID, ToExpression { expression }))
 
-private fun Expression.isBooleanFunction(): Boolean {
-    if (this !is LibraryFunction) {
-        return true
+/**
+ * Returns true if this expression generates nullable Kotlin code regardless of Smithy type.
+ */
+private fun Expression.generatesNullableKotlin(): Boolean = this is GetAttr
+
+private fun Expression.renderTruthinessCheck(writer: KotlinWriter) {
+    val exprType = runCatching { type() }.getOrNull()
+    val isNullable = exprType is OptionalType || generatesNullableKotlin()
+    val isBooleanInner = when {
+        exprType is OptionalType -> exprType.inner() is BooleanType
+        else -> exprType is BooleanType
     }
 
-    return name !in setOf(
-        "parseUrl",
-        "substring",
-        "uriEncode",
-        "aws.parseArn",
-        "aws.partition",
-    )
+    when {
+        isNullable && isBooleanInner -> writer.writeInline(" == true")
+        isNullable -> writer.writeInline(" != null")
+        // Non-nullable boolean — use as-is
+        else -> Unit
+    }
 }

codegen/codegen/src/main/kotlin/aws/smithy/kotlin/codegen/rendering/longpoll/LongPollingIntegration.kt

@@ -0,0 +1,51 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package aws.smithy.kotlin.codegen.rendering.longpoll
+
+import aws.smithy.kotlin.codegen.KotlinSettings
+import aws.smithy.kotlin.codegen.core.KotlinWriter
+import aws.smithy.kotlin.codegen.core.RuntimeTypes
+import aws.smithy.kotlin.codegen.integration.KotlinIntegration
+import aws.smithy.kotlin.codegen.lang.KotlinTypes
+import aws.smithy.kotlin.codegen.model.expectTrait
+import aws.smithy.kotlin.codegen.model.hasTrait
+import aws.smithy.kotlin.codegen.rendering.protocol.ProtocolGenerator
+import aws.smithy.kotlin.codegen.rendering.protocol.ProtocolMiddleware
+import software.amazon.smithy.model.Model
+import software.amazon.smithy.model.shapes.OperationShape
+import software.amazon.smithy.model.traits.LongPollTrait
+
+/**
+ * Sets long-polling context attributes for operations annotated with `smithy.api#longPoll`.
+ */
+class LongPollingIntegration : KotlinIntegration {
+    override fun enabledForService(model: Model, settings: KotlinSettings): Boolean = model.isTraitApplied(LongPollTrait::class.java)
+
+    override fun customizeMiddleware(
+        ctx: ProtocolGenerator.GenerationContext,
+        resolved: List<ProtocolMiddleware>,
+    ): List<ProtocolMiddleware> = resolved + longPollingMiddleware
+}
+
+private val longPollingMiddleware = object : ProtocolMiddleware {
+    override val name: String = "LongPollingMiddleware"
+
+    override fun isEnabledFor(ctx: ProtocolGenerator.GenerationContext, op: OperationShape): Boolean = op.hasTrait<LongPollTrait>()
+
+    override fun render(ctx: ProtocolGenerator.GenerationContext, op: OperationShape, writer: KotlinWriter) {
+        val trait = op.expectTrait<LongPollTrait>()
+        writer.write(
+            "op.context[#T.LongPolling] = true",
+            RuntimeTypes.HttpClient.Operation.HttpOperationContext,
+        )
+        writer.write(
+            "op.context[#T.SocketReadTimeout] = #L.#T",
+            RuntimeTypes.HttpClient.Operation.HttpOperationContext,
+            trait.timeoutMillis,
+            KotlinTypes.Time.milliseconds,
+        )
+    }
+}

codegen/codegen/src/main/resources/META-INF/services/aws.smithy.kotlin.codegen.integration.KotlinIntegration

@@ -14,4 +14,5 @@ aws.smithy.kotlin.codegen.rendering.compression.RequestCompressionIntegration
 aws.smithy.kotlin.codegen.rendering.auth.SigV4AsymmetricAuthSchemeIntegration
 aws.smithy.kotlin.codegen.rendering.smoketests.SmokeTestsIntegration
 aws.smithy.kotlin.codegen.rendering.checksums.HttpChecksumRequiredIntegration
-aws.smithy.kotlin.codegen.ProtocolGeneratorSupplier
+aws.smithy.kotlin.codegen.ProtocolGeneratorSupplier
+aws.smithy.kotlin.codegen.rendering.longpoll.LongPollingIntegration