Merge branch 'main' of github.com:smithy-lang/smithy-kotlin into kn-main-merge

lauzadis · lauzadis · commit 8d3087c7a938 · 2025-09-24T11:25:12.000-04:00
diff --git a/.changes/4855cecf-6a96-4622-b7ff-5d09e54f6564.json b/.changes/4855cecf-6a96-4622-b7ff-5d09e54f6564.json
@@ -0,0 +1,5 @@
+{
+    "id": "4855cecf-6a96-4622-b7ff-5d09e54f6564",
+    "type": "bugfix",
+    "description": "Overwrite `Content-Length` header rather than appending in `CrtHttpEngine`"
+}
diff --git a/.changes/7e4f8c08-941c-4ea5-91b3-4c284746c453.json b/.changes/7e4f8c08-941c-4ea5-91b3-4c284746c453.json
diff --git a/.github/workflows/api-compat-verification.yml b/.github/workflows/api-compat-verification.yml
@@ -7,6 +7,8 @@ on:
       - main
       - '*-main'
 
+permissions: { }
+
 jobs:
   api-compat-verification:
     runs-on: ubuntu-latest
diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml
@@ -8,6 +8,8 @@ on:
   pull_request:
   workflow_dispatch:
 
+permissions: { }
+
 # Allow one instance of this workflow per pull request, and cancel older runs when new changes are pushed
 concurrency:
   group: ci-pr-${{ github.ref }}
diff --git a/.github/workflows/issue-regression-labeler.yml b/.github/workflows/issue-regression-labeler.yml
@@ -3,6 +3,7 @@ name: issue-regression-label
 on:
   issues:
     types: [opened, edited]
+permissions: { }
 jobs:
   add-regression-label:
     runs-on: ubuntu-latest
diff --git a/.github/workflows/jreleaser.yml b/.github/workflows/jreleaser.yml
@@ -3,7 +3,7 @@
 name: JReleaser check
 on:
   pull_request:
-
+permissions: { }
 jobs:
   jreleaser-check:
     permissions: {}
diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
@@ -12,6 +12,8 @@ on:
       - '*-main'
   workflow_dispatch:
 
+permissions: { }
+
 env:
   PACKAGE_NAME: smithy-kotlin
 
diff --git a/.github/workflows/merge-main.yml b/.github/workflows/merge-main.yml
@@ -3,7 +3,7 @@ on:
   push:
     branches: [ main ]
   workflow_dispatch:
-
+permissions: { }
 jobs:
   merge:
     runs-on: ubuntu-latest
diff --git a/.github/workflows/minor-version-bump.yml b/.github/workflows/minor-version-bump.yml
@@ -0,0 +1,11 @@
+name: Minor version bump check
+on:
+  pull_request:
+permissions: { }
+jobs:
+  minor-version-bump-check:
+    permissions: {}
+    runs-on: ubuntu-latest
+    steps:
+      - name: Minor version bump check
+        uses: awslabs/aws-kotlin-repo-tools/.github/actions/minor-version-bump@main
diff --git a/.github/workflows/release-readiness.yml b/.github/workflows/release-readiness.yml
@@ -7,6 +7,8 @@ on:
   pull_request:
     branches: [ main ]
 
+permissions: { }
+
 jobs:
   release-readiness:
     if: ${{ !contains(github.event.pull_request.labels.*.name, 'ready-for-release') }}
diff --git a/.github/workflows/stale_issue.yaml b/.github/workflows/stale_issue.yaml
@@ -5,6 +5,8 @@ on:
   schedule:
   - cron: "0 0/3 * * *"
 
+permissions: { }
+
 jobs:
   cleanup:
     name: Stale issue job
diff --git a/.github/workflows/sync-mirror.yml b/.github/workflows/sync-mirror.yml
@@ -5,6 +5,8 @@ on:
     branches: [ main ]
   workflow_dispatch:
 
+permissions: { }
+
 jobs:
   git-sync:
     # Only sync when pushing to source repo
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,10 @@
 # Changelog
 
+## [1.5.10] - 09/22/2025
+
+### Documentation
+* Improve documentation for [`StandardRetryPolicy`](https://docs.aws.amazon.com/smithy-kotlin/api/latest/runtime-core/aws.smithy.kotlin.runtime.retries.policy/-standard-retry-policy/)
+
 ## [1.5.8] - 09/04/2025
 
 ## [1.5.7] - 09/04/2025
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -4,6 +4,7 @@
  */
 import aws.sdk.kotlin.gradle.dsl.configureJReleaser
 import aws.sdk.kotlin.gradle.dsl.configureLinting
+import aws.sdk.kotlin.gradle.dsl.configureMinorVersionStrategyRules
 import aws.sdk.kotlin.gradle.util.typedProp
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
@@ -109,6 +110,7 @@ val lintPaths = listOf(
 )
 
 configureLinting(lintPaths)
+configureMinorVersionStrategyRules(lintPaths)
 
 // Binary compatibility
 apiValidation {
diff --git a/gradle.properties b/gradle.properties
@@ -14,10 +14,10 @@ kotlinx.atomicfu.enableNativeIrTransformation=false
 org.gradle.jvmargs=-Xmx2G -XX:MaxMetaspaceSize=1G
 
 # SDK
-sdkVersion=1.5.9-SNAPSHOT
+sdkVersion=1.5.11-SNAPSHOT
 
 # codegen
-codegenVersion=0.35.9-SNAPSHOT
+codegenVersion=0.35.11-SNAPSHOT
 
 # FIXME Remove after Dokka 2.0 Gradle plugin is stable
 org.jetbrains.dokka.experimental.gradle.pluginMode=V2Enabled
diff --git a/runtime/protocol/http-client-engines/http-client-engine-crt/jvmAndNative/src/aws/smithy/kotlin/runtime/http/engine/crt/RequestUtil.kt b/runtime/protocol/http-client-engines/http-client-engine-crt/jvmAndNative/src/aws/smithy/kotlin/runtime/http/engine/crt/RequestUtil.kt
@@ -68,7 +68,7 @@ internal fun HttpRequest.toCrtRequest(callContext: CoroutineContext): aws.sdk.ko
     }
 
     val contentLength = body.contentLength?.takeIf { it >= 0 }?.toString() ?: headers[CONTENT_LENGTH_HEADER]
-    contentLength?.let { crtHeaders.append(CONTENT_LENGTH_HEADER, it) }
+    contentLength?.let { crtHeaders[CONTENT_LENGTH_HEADER] = it }
 
     return aws.sdk.kotlin.crt.http.HttpRequest(method.name, url.requestRelativePath, crtHeaders.build(), bodyStream)
 }
diff --git a/runtime/protocol/http-client-engines/http-client-engine-crt/jvmAndNative/test/aws/smithy/kotlin/runtime/http/engine/crt/RequestUtilTest.kt b/runtime/protocol/http-client-engines/http-client-engine-crt/jvmAndNative/test/aws/smithy/kotlin/runtime/http/engine/crt/RequestUtilTest.kt
@@ -4,7 +4,15 @@
  */
 package aws.smithy.kotlin.runtime.http.engine.crt
 
+import aws.smithy.kotlin.runtime.content.ByteStream
+import aws.smithy.kotlin.runtime.http.Headers
+import aws.smithy.kotlin.runtime.http.HttpMethod
+import aws.smithy.kotlin.runtime.http.request.HttpRequest
+import aws.smithy.kotlin.runtime.http.toHttpBody
+import aws.smithy.kotlin.runtime.net.url.Url
+import kotlinx.coroutines.test.runTest
 import kotlin.test.Test
+import kotlin.test.assertEquals
 import kotlin.test.assertFalse
 import kotlin.test.assertTrue
 
@@ -42,4 +50,19 @@ class RequestUtilTest {
             assertFalse(isRetryable(code, name), "Expected $name to not be retryable!")
         }
     }
+
+    @Test
+    fun testContentLengthHeader() = runTest {
+        val data = "a".repeat(100)
+
+        val request = HttpRequest(
+            HttpMethod.POST,
+            url = Url.parse("https://notarealurl.com"),
+            headers = Headers { set("Content-Length", data.length.toString()) },
+            body = ByteStream.fromString(data).toHttpBody(),
+        )
+
+        val crtRequest = request.toCrtRequest(coroutineContext)
+        assertEquals(listOf(data.length.toString()), crtRequest.headers.getAll("Content-Length"))
+    }
 }
diff --git a/runtime/protocol/http-client-engines/http-client-engine-okhttp/jvm/test/aws/smithy/kotlin/runtime/http/engine/okhttp/OkHttpRequestTest.kt b/runtime/protocol/http-client-engines/http-client-engine-okhttp/jvm/test/aws/smithy/kotlin/runtime/http/engine/okhttp/OkHttpRequestTest.kt
@@ -5,6 +5,7 @@
 
 package aws.smithy.kotlin.runtime.http.engine.okhttp
 
+import aws.smithy.kotlin.runtime.content.ByteStream
 import aws.smithy.kotlin.runtime.http.*
 import aws.smithy.kotlin.runtime.http.engine.internal.HttpClientMetrics
 import aws.smithy.kotlin.runtime.http.request.HttpRequest
@@ -71,6 +72,22 @@ class OkHttpRequestTest {
         assertEquals(listOf("bar", "baz"), actual.headers("FoO"))
     }
 
+    @Test
+    fun itConvertsContentLengthHeader() {
+        val data = "a".repeat(100)
+        val url = Url.parse("https://aws.amazon.com")
+        val headers = Headers {
+            append("Content-Length", data.length.toString())
+        }
+        val request = HttpRequest(HttpMethod.POST, url, headers, ByteStream.fromString(data).toHttpBody())
+
+        val execContext = ExecutionContext()
+        val actual = request.toOkHttpRequest(execContext, EmptyCoroutineContext, testMetrics)
+
+        assertTrue(actual.headers.size >= 1)
+        assertEquals(listOf(data.length.toString()), actual.headers("Content-Length"))
+    }
+
     @Test
     fun itSupportsNonAsciiHeaderValues() {
         val url = Url.parse("https://aws.amazon.com")
diff --git a/runtime/runtime-core/api/runtime-core.api b/runtime/runtime-core/api/runtime-core.api
@@ -39,6 +39,11 @@ public abstract interface annotation class aws/smithy/kotlin/runtime/IgnoreNativ
 public abstract interface annotation class aws/smithy/kotlin/runtime/InternalApi : java/lang/annotation/Annotation {
 }
 
+public abstract interface annotation class aws/smithy/kotlin/runtime/PlannedRemoval : java/lang/annotation/Annotation {
+	public abstract fun major ()I
+	public abstract fun minor ()I
+}
+
 public abstract interface class aws/smithy/kotlin/runtime/ProtocolResponse {
 	public abstract fun getSummary ()Ljava/lang/String;
 }
diff --git a/runtime/runtime-core/common/src/aws/smithy/kotlin/runtime/Annotations.kt b/runtime/runtime-core/common/src/aws/smithy/kotlin/runtime/Annotations.kt
@@ -59,6 +59,19 @@ public annotation class ExperimentalApi
 @DslMarker
 public annotation class SdkDsl
 
+/**
+ * Indicates that the annotated API is deprecated and scheduled for removal in an upcoming version.
+ * Any code using this API should migrate to the suggested replacement as soon as possible.
+ */
+@RequiresOptIn(
+    message = "This API is deprecated and scheduled for removal in an upcoming version.",
+    level = RequiresOptIn.Level.WARNING,
+)
+public annotation class PlannedRemoval(
+    val major: Int,
+    val minor: Int,
+)
+
 /**
  * Marks a test that should be ignored on Native platforms
  */
