feat: provide client config property for region provider (#1488)

* feat: provide client config property for region provider

* lint

* change log

* remove commented code

* Trigger CI

* address PR reviews

* address PR reviews

* address PR reviews

* address pr reviews

* add missing import

* remove extra space

* update smithy version

* retrigger CI

* address pr reviews

* lint

* modify comment

* align smithy version

* disable smithy version

* update libs.versions.toml

* retrigger CI

* Trigger Build

* Trigger Build

* retrigger CI

* update smithy codegen version

* address pr review

* lint

* sync smithy-kotlin version

---------

Co-authored-by: 0marperez <[email protected]>

Author: xinsong-cui

.changes/05ac561b-963f-4953-bb4f-1fc19fc1207c.json

@@ -0,0 +1,8 @@
+{
+    "id": "05ac561b-963f-4953-bb4f-1fc19fc1207c",
+    "type": "feature",
+    "description": "Add `regionProvider` property to client config",
+    "issues": [
+        "awslabs/aws-sdk-kotlin#1478"
+    ]
+}

aws-runtime/aws-config/api/aws-config.api

@@ -244,6 +244,27 @@ public abstract class aws/sdk/kotlin/runtime/config/AbstractAwsSdkClientFactory
 	public static synthetic fun fromEnvironment$default (Laws/sdk/kotlin/runtime/config/AbstractAwsSdkClientFactory;Lkotlin/jvm/functions/Function1;Lkotlin/coroutines/Continuation;ILjava/lang/Object;)Ljava/lang/Object;
 }
 
+public abstract interface class aws/sdk/kotlin/runtime/config/AwsSdkClientConfig : aws/smithy/kotlin/runtime/client/SdkClientConfig {
+	public abstract fun getApplicationId ()Ljava/lang/String;
+	public abstract fun getRegion ()Ljava/lang/String;
+	public abstract fun getRegionProvider ()Laws/smithy/kotlin/runtime/client/region/RegionProvider;
+	public abstract fun getUseDualStack ()Z
+	public abstract fun getUseFips ()Z
+}
+
+public abstract interface class aws/sdk/kotlin/runtime/config/AwsSdkClientConfig$Builder {
+	public abstract fun getApplicationId ()Ljava/lang/String;
+	public abstract fun getRegion ()Ljava/lang/String;
+	public abstract fun getRegionProvider ()Laws/smithy/kotlin/runtime/client/region/RegionProvider;
+	public abstract fun getUseDualStack ()Ljava/lang/Boolean;
+	public abstract fun getUseFips ()Ljava/lang/Boolean;
+	public abstract fun setApplicationId (Ljava/lang/String;)V
+	public abstract fun setRegion (Ljava/lang/String;)V
+	public abstract fun setRegionProvider (Laws/smithy/kotlin/runtime/client/region/RegionProvider;)V
+	public abstract fun setUseDualStack (Ljava/lang/Boolean;)V
+	public abstract fun setUseFips (Ljava/lang/Boolean;)V
+}
+
 public final class aws/sdk/kotlin/runtime/config/AwsSdkSetting {
 	public static final field INSTANCE Laws/sdk/kotlin/runtime/config/AwsSdkSetting;
 	public final fun getAwsAccessKeyId ()Laws/smithy/kotlin/runtime/config/EnvironmentSetting;
@@ -549,55 +570,43 @@ public final class aws/sdk/kotlin/runtime/config/useragent/ResolveUserAgentKt {
 	public static synthetic fun resolveUserAgentAppId$default (Laws/smithy/kotlin/runtime/util/PlatformProvider;Laws/smithy/kotlin/runtime/util/LazyAsyncValue;Lkotlin/coroutines/Continuation;ILjava/lang/Object;)Ljava/lang/Object;
 }
 
-public final class aws/sdk/kotlin/runtime/region/DefaultRegionProviderChain : aws/sdk/kotlin/runtime/region/RegionProviderChain, aws/sdk/kotlin/runtime/region/RegionProvider, java/io/Closeable {
+public final class aws/sdk/kotlin/runtime/region/DefaultRegionProviderChain : aws/smithy/kotlin/runtime/client/region/RegionProviderChain, aws/smithy/kotlin/runtime/client/region/RegionProvider, java/io/Closeable {
 	public fun <init> ()V
 	public fun <init> (Laws/smithy/kotlin/runtime/util/PlatformProvider;Lkotlin/Lazy;Laws/smithy/kotlin/runtime/util/LazyAsyncValue;)V
 	public synthetic fun <init> (Laws/smithy/kotlin/runtime/util/PlatformProvider;Lkotlin/Lazy;Laws/smithy/kotlin/runtime/util/LazyAsyncValue;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
 	public fun close ()V
 }
 
-public final class aws/sdk/kotlin/runtime/region/EnvironmentRegionProvider : aws/sdk/kotlin/runtime/region/RegionProvider {
+public final class aws/sdk/kotlin/runtime/region/EnvironmentRegionProvider : aws/smithy/kotlin/runtime/client/region/RegionProvider {
 	public fun <init> ()V
 	public fun <init> (Laws/smithy/kotlin/runtime/util/EnvironmentProvider;)V
 	public synthetic fun <init> (Laws/smithy/kotlin/runtime/util/EnvironmentProvider;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
 	public fun getRegion (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 }
 
-public final class aws/sdk/kotlin/runtime/region/ImdsRegionProvider : aws/sdk/kotlin/runtime/region/RegionProvider, java/io/Closeable {
+public final class aws/sdk/kotlin/runtime/region/ImdsRegionProvider : aws/smithy/kotlin/runtime/client/region/RegionProvider, java/io/Closeable {
 	public fun <init> ()V
 	public fun <init> (Lkotlin/Lazy;Laws/smithy/kotlin/runtime/util/PlatformEnvironProvider;)V
 	public synthetic fun <init> (Lkotlin/Lazy;Laws/smithy/kotlin/runtime/util/PlatformEnvironProvider;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
 	public fun close ()V
 	public fun getRegion (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 }
 
-public final class aws/sdk/kotlin/runtime/region/JvmSystemPropRegionProvider : aws/sdk/kotlin/runtime/region/RegionProvider {
+public final class aws/sdk/kotlin/runtime/region/JvmSystemPropRegionProvider : aws/smithy/kotlin/runtime/client/region/RegionProvider {
 	public fun <init> ()V
 	public fun <init> (Laws/smithy/kotlin/runtime/util/PropertyProvider;)V
 	public synthetic fun <init> (Laws/smithy/kotlin/runtime/util/PropertyProvider;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
 	public fun getRegion (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 }
 
-public final class aws/sdk/kotlin/runtime/region/ProfileRegionProvider : aws/sdk/kotlin/runtime/region/RegionProvider {
+public final class aws/sdk/kotlin/runtime/region/ProfileRegionProvider : aws/smithy/kotlin/runtime/client/region/RegionProvider {
 	public fun <init> ()V
 	public fun <init> (Laws/smithy/kotlin/runtime/util/LazyAsyncValue;)V
 	public synthetic fun <init> (Laws/smithy/kotlin/runtime/util/LazyAsyncValue;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
 	public fun <init> (Ljava/lang/String;)V
 	public fun getRegion (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 }
 
-public abstract interface class aws/sdk/kotlin/runtime/region/RegionProvider {
-	public abstract fun getRegion (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-}
-
-public class aws/sdk/kotlin/runtime/region/RegionProviderChain : aws/sdk/kotlin/runtime/region/RegionProvider {
-	public fun <init> (Ljava/util/List;)V
-	public fun <init> ([Laws/sdk/kotlin/runtime/region/RegionProvider;)V
-	protected final fun getProviders ()[Laws/sdk/kotlin/runtime/region/RegionProvider;
-	public fun getRegion (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public fun toString ()Ljava/lang/String;
-}
-
 public final class aws/sdk/kotlin/runtime/region/ResolveRegionKt {
 	public static final fun resolveRegion (Laws/smithy/kotlin/runtime/util/PlatformProvider;Laws/smithy/kotlin/runtime/util/LazyAsyncValue;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public static synthetic fun resolveRegion$default (Laws/smithy/kotlin/runtime/util/PlatformProvider;Laws/smithy/kotlin/runtime/util/LazyAsyncValue;Lkotlin/coroutines/Continuation;ILjava/lang/Object;)Ljava/lang/Object;

aws-runtime/aws-config/common/src/aws/sdk/kotlin/runtime/config/AbstractAwsSdkClientFactory.kt

@@ -5,7 +5,6 @@
 
 package aws.sdk.kotlin.runtime.config
 
-import aws.sdk.kotlin.runtime.client.AwsSdkClientConfig
 import aws.sdk.kotlin.runtime.config.checksums.resolveRequestChecksumCalculation
 import aws.sdk.kotlin.runtime.config.checksums.resolveResponseChecksumValidation
 import aws.sdk.kotlin.runtime.config.compression.resolveDisableRequestCompression
@@ -77,7 +76,7 @@ public abstract class AbstractAwsSdkClientFactory<
             block?.let(config::apply)
 
             config.logMode = config.logMode ?: ClientSettings.LogMode.resolve(platform = platform)
-            config.region = config.region ?: resolveRegion(profile = profile)
+            config.region = config.region ?: config.regionProvider?.getRegion() ?: resolveRegion(profile = profile)
             config.useFips = config.useFips ?: resolveUseFips(profile = profile)
             config.useDualStack = config.useDualStack ?: resolveUseDualStack(profile = profile)
             config.applicationId = config.applicationId ?: resolveUserAgentAppId(platform, profile)

aws-runtime/aws-core/common/src/aws/sdk/kotlin/runtime/client/AwsSdkClientConfig.kt renamed to aws-runtime/aws-config/common/src/aws/sdk/kotlin/runtime/config/AwsSdkClientConfig.kt

@@ -3,9 +3,10 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package aws.sdk.kotlin.runtime.client
+package aws.sdk.kotlin.runtime.config
 
 import aws.smithy.kotlin.runtime.client.SdkClientConfig
+import aws.smithy.kotlin.runtime.client.region.RegionProvider
 
 /**
  * Base interface all generated AWS SDK Kotlin clients implement
@@ -14,11 +15,27 @@ public interface AwsSdkClientConfig : SdkClientConfig {
 
     /**
      * The AWS region (e.g. `us-west-2`) to make requests to. See about AWS
-     * [global infrastructure](https://aws.amazon.com/about-aws/global-infrastructure/regions_az/) for more
-     * information
+     * [global infrastructure](https://aws.amazon.com/about-aws/global-infrastructure/regions_az/) for more information.
+     * 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 val region: String?
 
+    /**
+     * 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 val regionProvider: RegionProvider
+
     /**
      * Flag to toggle whether to use [FIPS](https://aws.amazon.com/compliance/fips/) endpoints when making requests.
      * Disabled by default.
@@ -49,11 +66,27 @@ public interface AwsSdkClientConfig : SdkClientConfig {
     public interface Builder {
         /**
          * The AWS region (e.g. `us-west-2`) to make requests to. See about AWS
-         * [global infrastructure](https://aws.amazon.com/about-aws/global-infrastructure/regions_az/) for more
-         * information
+         * [global infrastructure](https://aws.amazon.com/about-aws/global-infrastructure/regions_az/) for more information.
+         * 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?
 
+        /**
+         * 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?
+
         /**
          * Flag to toggle whether to use [FIPS](https://aws.amazon.com/compliance/fips/) endpoints when making requests.
          * Disabled by default.

aws-runtime/aws-config/common/src/aws/sdk/kotlin/runtime/region/DefaultRegionProviderChain.kt

@@ -9,6 +9,7 @@ import aws.sdk.kotlin.runtime.config.imds.ImdsClient
 import aws.sdk.kotlin.runtime.config.imds.InstanceMetadataProvider
 import aws.sdk.kotlin.runtime.config.profile.AwsProfile
 import aws.sdk.kotlin.runtime.config.profile.loadAwsSharedConfig
+import aws.smithy.kotlin.runtime.client.region.RegionProvider
 import aws.smithy.kotlin.runtime.io.Closeable
 import aws.smithy.kotlin.runtime.util.LazyAsyncValue
 import aws.smithy.kotlin.runtime.util.PlatformProvider

aws-runtime/aws-config/common/src/aws/sdk/kotlin/runtime/region/EnvironmentRegionProvider.kt

@@ -6,6 +6,7 @@
 package aws.sdk.kotlin.runtime.region
 
 import aws.sdk.kotlin.runtime.config.AwsSdkSetting
+import aws.smithy.kotlin.runtime.client.region.RegionProvider
 import aws.smithy.kotlin.runtime.util.EnvironmentProvider
 import aws.smithy.kotlin.runtime.util.PlatformProvider
 

aws-runtime/aws-config/common/src/aws/sdk/kotlin/runtime/region/ImdsRegionProvider.kt

@@ -8,6 +8,7 @@ package aws.sdk.kotlin.runtime.region
 import aws.sdk.kotlin.runtime.config.AwsSdkSetting
 import aws.sdk.kotlin.runtime.config.imds.ImdsClient
 import aws.sdk.kotlin.runtime.config.imds.InstanceMetadataProvider
+import aws.smithy.kotlin.runtime.client.region.RegionProvider
 import aws.smithy.kotlin.runtime.config.resolve
 import aws.smithy.kotlin.runtime.io.Closeable
 import aws.smithy.kotlin.runtime.util.PlatformEnvironProvider

aws-runtime/aws-config/common/src/aws/sdk/kotlin/runtime/region/ProfileRegionProvider.kt

@@ -8,6 +8,7 @@ package aws.sdk.kotlin.runtime.region
 import aws.sdk.kotlin.runtime.config.profile.AwsProfile
 import aws.sdk.kotlin.runtime.config.profile.loadAwsSharedConfig
 import aws.sdk.kotlin.runtime.config.profile.region
+import aws.smithy.kotlin.runtime.client.region.RegionProvider
 import aws.smithy.kotlin.runtime.util.LazyAsyncValue
 import aws.smithy.kotlin.runtime.util.PlatformProvider
 import aws.smithy.kotlin.runtime.util.asyncLazy