Kn main merge

.brazil.json

@@ -26,7 +26,7 @@
     "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"
+    "org.jsoup:jsoup:1.*": "Maven-jsoup-1.x"
   },
   "packageHandlingRules": {
     "versioning": {

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

@@ -1,6 +1,6 @@
 name: Artifact Size Metrics
 on:
-  pull_request_target:
+  pull_request:
     types: [ opened, synchronize, reopened, labeled, unlabeled ]
     branches:
       - main
@@ -40,7 +40,6 @@ 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_target'
     runs-on: ubuntu-latest
     steps:
       - name: Checkout Sources

.github/workflows/changelog-verification.yml

@@ -4,7 +4,7 @@ permissions:
   id-token: write
 
 on:
-  pull_request_target:
+  pull_request:
     types: [ opened, synchronize, reopened, labeled, unlabeled ]
     branches:
       - main
@@ -22,4 +22,4 @@ jobs:
           aws-region: us-west-2
 
       - name: Verify changelog
-        uses: awslabs/aws-kotlin-repo-tools/.github/actions/changelog-verification@main
+        uses: awslabs/aws-kotlin-repo-tools/.github/actions/changelog-verification@main

.github/workflows/continuous-integration.yml

@@ -180,14 +180,58 @@ jobs:
         with:
           working-directory: 'smithy-kotlin'
 
+      - name: Configure Linux CRT Docker Images
+        shell: bash
+        if: ${{ matrix.os == 'ubuntu-latest' }}
+        run: |
+          ./aws-crt-kotlin/docker-images/build-images.sh linux-x64 linux-arm64
+
+      - name: Set up MSYS2
+        if: ${{ matrix.os == 'windows-latest' }}
+        uses: msys2/setup-msys2@v2
+        with:
+          msystem: MINGW64
+          install: >-
+            mingw-w64-x86_64-cmake
+            mingw-w64-x86_64-gcc
+
+      - name: Sanity checks
+        shell: bash
+        run: |
+          for dir in *; do
+            pushd "$dir"
+            echo "===================================="
+            echo "Status checks for $dir"
+            echo "===================================="
+            echo "Git status for $dir:"
+            git status
+            echo "Git hash:"
+            git rev-parse HEAD
+            echo "File listing:"
+            ls -alsh
+            echo "Dry run task list:"
+            ./gradlew build --dry-run || true
+            echo " "
+            popd
+          done
+
       - name: Test
+        if: ${{ matrix.os != 'windows-latest' }}
         working-directory: ./smithy-kotlin
         shell: bash
         run: |
           # FIXME K2. Re-enable warnings as errors after this warning is removed: https://youtrack.jetbrains.com/issue/KT-68532
           # echo "kotlinWarningsAsErrors=true" >> $GITHUB_WORKSPACE/local.properties
-          ./gradlew -Paws.kotlin.native=false apiCheck
-          ./gradlew -Paws.kotlin.native=false test jvmTest
+          ./gradlew build
+
+      - name: Test on Windows
+        if: ${{ matrix.os == 'windows-latest' }}
+        working-directory: ./smithy-kotlin
+        shell: msys2 {0}
+        run: |
+          # FIXME K2. Re-enable warnings as errors after this warning is removed: https://youtrack.jetbrains.com/issue/KT-68532
+          # echo "kotlinWarningsAsErrors=true" >> $GITHUB_WORKSPACE/local.properties
+          ./gradlew build -Paws.crt.disableContainerTargets=mingw_x64
 
       - name: Save Test Reports
         if: failure()
@@ -243,7 +287,6 @@ 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:
@@ -277,4 +320,4 @@ jobs:
         sed -i "s/smithy-kotlin-codegen-version = .*$/smithy-kotlin-codegen-version = \"$SMITHY_KOTLIN_CODEGEN_VERSION\"/" gradle/libs.versions.toml
         ./gradlew --parallel -Paws.kotlin.native=false publishToMavenLocal
         ./gradlew -Paws.kotlin.native=false test jvmTest
-        ./gradlew -Paws.kotlin.native=false testAllProtocols
+        ./gradlew -Paws.kotlin.native=false testAllProtocols

.github/workflows/kat-transform.yml

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

CHANGELOG.md

@@ -1,5 +1,7 @@
 # Changelog
 
+## [1.5.4] - 08/07/2025
+
 ## [1.5.3] - 07/28/2025
 
 ### Features

build.gradle.kts

@@ -19,7 +19,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.19.2"))
+        classpath(enforcedPlatform("com.fasterxml.jackson:jackson-bom:2.15.3"))
     }
 }
 

gradle.properties

@@ -14,10 +14,10 @@ kotlinx.atomicfu.enableNativeIrTransformation=false
 org.gradle.jvmargs=-Xmx2G -XX:MaxMetaspaceSize=1G
 
 # SDK
-sdkVersion=1.5.4-SNAPSHOT
+sdkVersion=1.5.5-SNAPSHOT
 
 # codegen
-codegenVersion=0.35.4-SNAPSHOT
+codegenVersion=0.35.5-SNAPSHOT
 
 # FIXME Remove after Dokka 2.0 Gradle plugin is stable
 org.jetbrains.dokka.experimental.gradle.pluginMode=V2Enabled

gradle/libs.versions.toml

@@ -2,16 +2,16 @@
 kotlin-version = "2.2.0"
 dokka-version = "2.0.0"
 
-aws-kotlin-repo-tools-version = "0.4.30-kn"
+aws-kotlin-repo-tools-version = "0.4.38"
 
 # libs
 coroutines-version = "1.10.2"
 atomicfu-version = "0.29.0"
 okhttp-version = "5.1.0"
 okhttp4-version = "4.12.0"
 okio-version = "3.16.0"
-otel-version = "1.45.0"
-slf4j-version = "2.0.16"
+otel-version = "1.52.0"
+slf4j-version = "2.0.17"
 slf4j-v1x-version = "1.7.36"
 crt-kotlin-version = "0.10.0"
 micrometer-version = "1.15.2"
@@ -27,8 +27,8 @@ junit-version = "5.13.4"
 kotest-version = "5.9.1"
 kotlin-compile-testing-version = "0.8.0"
 kotlinx-benchmark-version = "0.4.14"
-kotlinx-serialization-version = "1.7.3"
-docker-java-version = "3.4.0"
+kotlinx-serialization-version = "1.9.0"
+docker-java-version = "3.5.3"
 ktor-version = "3.2.3"
 kaml-version = "0.55.0"
 jsoup-version = "1.21.1"

runtime/auth/http-auth/api/http-auth.api

@@ -62,6 +62,8 @@ public abstract interface class aws/smithy/kotlin/runtime/http/auth/CloseableBea
 public final class aws/smithy/kotlin/runtime/http/auth/EnvironmentBearerTokenProvider : aws/smithy/kotlin/runtime/http/auth/BearerTokenProvider {
 	public fun <init> (Ljava/lang/String;Laws/smithy/kotlin/runtime/util/PlatformProvider;)V
 	public synthetic fun <init> (Ljava/lang/String;Laws/smithy/kotlin/runtime/util/PlatformProvider;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
+	public fun <init> (Ljava/lang/String;Ljava/lang/String;Laws/smithy/kotlin/runtime/util/PlatformProvider;)V
+	public synthetic fun <init> (Ljava/lang/String;Ljava/lang/String;Laws/smithy/kotlin/runtime/util/PlatformProvider;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
 	public fun resolve (Laws/smithy/kotlin/runtime/collections/Attributes;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 }
 

runtime/auth/http-auth/common/src/aws/smithy/kotlin/runtime/http/auth/EnvironmentBearerTokenProvider.kt

@@ -4,25 +4,37 @@
  */
 package aws.smithy.kotlin.runtime.http.auth
 
+import aws.smithy.kotlin.runtime.businessmetrics.SmithyBusinessMetric
+import aws.smithy.kotlin.runtime.businessmetrics.emitBusinessMetric
 import aws.smithy.kotlin.runtime.collections.Attributes
-import aws.smithy.kotlin.runtime.collections.emptyAttributes
+import aws.smithy.kotlin.runtime.collections.mutableAttributes
 import aws.smithy.kotlin.runtime.time.Instant
 import aws.smithy.kotlin.runtime.util.PlatformProvider
 
 /**
- * A [BearerTokenProvider] that extracts the bearer token from the target environment variable.
+ * A [BearerTokenProvider] that extracts the bearer token from JVM system properties or environment variables.
  */
 public class EnvironmentBearerTokenProvider(
-    private val key: String,
+    private val sysPropKey: String,
+    private val envKey: String,
     private val platform: PlatformProvider = PlatformProvider.System,
 ) : BearerTokenProvider {
+    @Deprecated("This constructor does not support a parameter for a system property key and will be removed in version 1.6.x")
+    public constructor(
+        envKey: String,
+        platform: PlatformProvider = PlatformProvider.System,
+    ) : this("", envKey, platform)
+
     override suspend fun resolve(attributes: Attributes): BearerToken {
-        val bearerToken = platform.getenv(key)
-            ?: error("$key environment variable is not set")
+        val bearerToken = sysPropKey.takeUnless(String::isBlank)?.let(platform::getProperty)
+            ?: platform.getenv(envKey)
+        if (bearerToken.isNullOrBlank()) throw IllegalStateException("""Missing values for system property "$sysPropKey" and environment variable "$envKey"""")
 
         return object : BearerToken {
             override val token: String = bearerToken
-            override val attributes: Attributes = emptyAttributes()
+            override val attributes: Attributes = mutableAttributes().apply {
+                emitBusinessMetric(SmithyBusinessMetric.BEARER_SERVICE_ENV_VARS)
+            }
             override val expiration: Instant? = null
         }
     }

runtime/auth/http-auth/common/test/aws/smithy/kotlin/runtime/http/auth/EnvironmentBearerTokenProviderTest.kt

@@ -1,6 +1,5 @@
 package aws.smithy.kotlin.runtime.http.auth
 
-import aws.smithy.kotlin.runtime.collections.emptyAttributes
 import aws.smithy.kotlin.runtime.util.TestPlatformProvider
 import kotlinx.coroutines.test.runTest
 import kotlin.test.Test
@@ -9,27 +8,65 @@ import kotlin.test.assertFailsWith
 
 class EnvironmentBearerTokenProviderTest {
     @Test
-    fun testResolveWithValidToken() = runTest {
+    fun testResolveFromEnvVar() = runTest {
         val provider = EnvironmentBearerTokenProvider(
-            "TEST_TOKEN",
-            TestPlatformProvider(mutableMapOf("TEST_TOKEN" to "test-bearer-token")),
+            "TEST_SYS_PROPS_TOKEN",
+            "TEST_ENV_TOKEN",
+            TestPlatformProvider(
+                env = mapOf("TEST_ENV_TOKEN" to "test-env-bearer-token"),
+            ),
         )
 
         val token = provider.resolve()
 
-        assertEquals("test-bearer-token", token.token)
+        assertEquals("test-env-bearer-token", token.token)
+    }
+
+    @Test
+    fun testResolveFromSysProps() = runTest {
+        val provider = EnvironmentBearerTokenProvider(
+            "TEST_SYS_PROPS_TOKEN",
+            "TEST_ENV_TOKEN",
+            TestPlatformProvider(
+                props = mapOf("TEST_SYS_PROPS_TOKEN" to "test-sys-props-bearer-token"),
+            ),
+        )
+
+        val token = provider.resolve()
+
+        assertEquals("test-sys-props-bearer-token", token.token)
+    }
+
+    @Test
+    fun testResolutionOrder() = runTest {
+        val provider = EnvironmentBearerTokenProvider(
+            "TEST_SYS_PROPS_TOKEN",
+            "TEST_ENV_TOKEN",
+            TestPlatformProvider(
+                props = mapOf("TEST_SYS_PROPS_TOKEN" to "test-sys-props-bearer-token"),
+                env = mapOf("TEST_ENV_TOKEN" to "test-env-bearer-token"),
+            ),
+        )
+
+        val token = provider.resolve()
+
+        assertEquals("test-sys-props-bearer-token", token.token)
     }
 
     @Test
     fun testResolveWithMissingToken() = runTest {
         val provider = EnvironmentBearerTokenProvider(
             "MISSING_TEST_TOKEN",
-            TestPlatformProvider(mutableMapOf()),
+            "MISSING_TEST_TOKEN",
+            TestPlatformProvider(
+                env = mapOf("TEST_TOKEN" to "test-env-bearer-token"),
+                props = mapOf("TEST_TOKEN" to "test-sys-props-bearer-token"),
+            ),
         )
 
         val exception = assertFailsWith<IllegalStateException> {
-            provider.resolve(emptyAttributes())
+            provider.resolve()
         }
-        assertEquals("MISSING_TEST_TOKEN environment variable is not set", exception.message)
+        assertEquals("Missing values for system property \"MISSING_TEST_TOKEN\" and environment variable \"MISSING_TEST_TOKEN\"", exception.message)
     }
 }

runtime/build.gradle.kts

@@ -4,8 +4,6 @@
  */
 import aws.sdk.kotlin.gradle.dsl.configurePublishing
 import aws.sdk.kotlin.gradle.kmp.*
-import org.gradle.kotlin.dsl.apply
-import org.gradle.kotlin.dsl.withType
 import org.jetbrains.kotlin.gradle.dsl.JvmTarget
 import org.jetbrains.kotlin.gradle.targets.native.tasks.KotlinNativeSimulatorTest
 
@@ -17,9 +15,6 @@ plugins {
 
 val sdkVersion: String by project
 
-// Apply KMP configuration from build plugin
-configureKmpTargets()
-
 // capture locally - scope issue with custom KMP plugin
 val libraries = libs
 
@@ -33,6 +28,11 @@ subprojects {
         plugin(libraries.plugins.aws.kotlin.repo.tools.kmp.get().pluginId)
     }
 
+    println("Project $name: hasNative=$hasNative, NATIVE_ENABLED=$NATIVE_ENABLED")
+
+    // Apply KMP configuration from build plugin
+    configureKmpTargets()
+
     configurePublishing("smithy-kotlin", "smithy-lang")
     kotlin {
         explicitApi()
@@ -64,7 +64,11 @@ subprojects {
     kotlin.sourceSets.all {
         // Allow subprojects to use internal APIs
         // See https://kotlinlang.org/docs/reference/opt-in-requirements.html#opting-in-to-using-api
-        listOf("kotlin.RequiresOptIn", "kotlinx.cinterop.ExperimentalForeignApi").forEach { languageSettings.optIn(it) }
+        languageSettings.optIn("kotlin.RequiresOptIn")
+
+        if (!name.contains("metadata", ignoreCase = true)) {
+            languageSettings.optIn("kotlinx.cinterop.ExperimentalForeignApi")
+        }
     }
 
     tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile> {
@@ -118,6 +122,15 @@ subprojects {
     tasks.withType<KotlinNativeSimulatorTest> {
         enabled = false
     }
+
+    tasks.withType<ProcessResources> {
+        // FIXME this shouldn't be necessary but without it the following message is observed:
+        //  Execution failed for task ':runtime:auth:aws-signing-tests:metadataCommonMainProcessResources'.
+        //  > Entry aws-signing-test-suite/README.md is a duplicate but no duplicate handling strategy has been set.
+        //  Please refer to https://docs.gradle.org/8.14.2/dsl/org.gradle.api.tasks.Copy.html#org.gradle.api.tasks.Copy:duplicatesStrategy
+        //  for details.
+        duplicatesStrategy = DuplicatesStrategy.WARN
+    }
 }
 
 // configureIosSimulatorTasks()

runtime/runtime-core/api/runtime-core.api

@@ -110,6 +110,7 @@ public final class aws/smithy/kotlin/runtime/businessmetrics/SmithyBusinessMetri
 	public static final field ACCOUNT_ID_MODE_DISABLED Laws/smithy/kotlin/runtime/businessmetrics/SmithyBusinessMetric;
 	public static final field ACCOUNT_ID_MODE_PREFERRED Laws/smithy/kotlin/runtime/businessmetrics/SmithyBusinessMetric;
 	public static final field ACCOUNT_ID_MODE_REQUIRED Laws/smithy/kotlin/runtime/businessmetrics/SmithyBusinessMetric;
+	public static final field BEARER_SERVICE_ENV_VARS Laws/smithy/kotlin/runtime/businessmetrics/SmithyBusinessMetric;
 	public static final field FLEXIBLE_CHECKSUMS_REQ_CRC32 Laws/smithy/kotlin/runtime/businessmetrics/SmithyBusinessMetric;
 	public static final field FLEXIBLE_CHECKSUMS_REQ_CRC32C Laws/smithy/kotlin/runtime/businessmetrics/SmithyBusinessMetric;
 	public static final field FLEXIBLE_CHECKSUMS_REQ_SHA1 Laws/smithy/kotlin/runtime/businessmetrics/SmithyBusinessMetric;

runtime/runtime-core/common/src/aws/smithy/kotlin/runtime/businessmetrics/BusinessMetricsUtils.kt

@@ -102,6 +102,7 @@ public enum class SmithyBusinessMetric(public override val identifier: String) :
     FLEXIBLE_CHECKSUMS_REQ_WHEN_REQUIRED("a"),
     FLEXIBLE_CHECKSUMS_RES_WHEN_SUPPORTED("b"),
     FLEXIBLE_CHECKSUMS_RES_WHEN_REQUIRED("c"),
+    BEARER_SERVICE_ENV_VARS("3"),
     ;
 
     override fun toString(): String = identifier