chore: v1.5-main merge (#1328)

Author: ianbotsf

.brazil.json

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

.changes/2ec4ad9a-f964-4cf1-be58-d0229493bb81.json

@@ -0,0 +1,5 @@
+{
+    "id": "2ec4ad9a-f964-4cf1-be58-d0229493bb81",
+    "type": "feature",
+    "description": "Upgrade to Kotlin 2.2.0"
+}

.changes/49af01b8-6fed-4add-ace0-9f027e83425a.json

@@ -0,0 +1,9 @@
+{
+    "id": "49af01b8-6fed-4add-ace0-9f027e83425a",
+    "type": "feature",
+    "description": "⚠️ **IMPORTANT**: Refactor endpoint discoverer classes into interfaces so custom implementations may be provided",
+    "issues": [
+        "awslabs/aws-sdk-kotlin#1413"
+    ],
+    "requiresMinorVersionBump": true
+}

.changes/d3ce7511-6fb2-4435-8f46-db724551b384.json

@@ -0,0 +1,5 @@
+{
+    "id": "d3ce7511-6fb2-4435-8f46-db724551b384",
+    "type": "misc",
+    "description": "Add telemetry provider configuration to `DefaultAwsSigner`"
+}

.changes/d4f09e32-8bcc-406e-96e0-2743280c13d9.json

@@ -0,0 +1,8 @@
+{
+    "id": "d4f09e32-8bcc-406e-96e0-2743280c13d9",
+    "type": "bugfix",
+    "description": "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.",
+    "issues": [
+        "https://github.com/awslabs/aws-sdk-kotlin/issues/1608"
+    ]
+}

.changes/db001c20-3788-4cfe-9ec2-284fd86a80bd.json

@@ -0,0 +1,8 @@
+{
+    "id": "db001c20-3788-4cfe-9ec2-284fd86a80bd",
+    "type": "bugfix",
+    "description": "Reimplement idle connection monitoring using `okhttp3.EventListener` instead of now-internal `okhttp3.ConnectionListener`",
+    "issues": [
+        "https://github.com/smithy-lang/smithy-kotlin/issues/1311"
+    ]
+}

.changes/e6515649-dab5-4be9-b4b4-b289369960d5.json

@@ -0,0 +1,8 @@
+{
+    "id": "e6515649-dab5-4be9-b4b4-b289369960d5",
+    "type": "bugfix",
+    "description": "Favor `endpointUrl` instead of endpoint discovery if both are provided",
+    "issues": [
+        "awslabs/aws-sdk-kotlin#1413"
+    ]
+}

.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

bom/build.gradle.kts

@@ -7,8 +7,6 @@ import org.jetbrains.kotlin.gradle.dsl.KotlinMultiplatformExtension
 import org.jetbrains.kotlin.gradle.plugin.KotlinMultiplatformPluginWrapper
 import org.jetbrains.kotlin.gradle.plugin.KotlinTarget
 import org.jetbrains.kotlin.gradle.plugin.mpp.KotlinMetadataTarget
-import org.jetbrains.kotlin.gradle.targets.js.KotlinJsTarget
-import java.util.*
 
 plugins {
     `maven-publish`
@@ -52,7 +50,6 @@ fun createBomConstraintsAndVersionCatalog() {
 
 fun Project.artifactId(target: KotlinTarget): String = when (target) {
     is KotlinMetadataTarget -> name
-    is KotlinJsTarget -> "$name-js"
     else -> "$name-${target.targetName.lowercase()}"
 }
 

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 {