address pr reviews

xinsong-cui · xinsong-cui · commit 8b0e8502d646 · 2025-01-13T14:54:16.000-05:00
diff --git a/aws-runtime/aws-config/common/src/aws/sdk/kotlin/runtime/config/AwsSdkClientConfig.kt b/aws-runtime/aws-config/common/src/aws/sdk/kotlin/runtime/config/AwsSdkClientConfig.kt
@@ -14,22 +14,26 @@ import aws.smithy.kotlin.runtime.client.region.RegionProvider
 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
+     * 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
      */
     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.
      *
-     * Region Resolution Priority:
+     * 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?
+    public val regionProvider: RegionProvider
 
     /**
      * Flag to toggle whether to use [FIPS](https://aws.amazon.com/compliance/fips/) endpoints when making requests.
@@ -60,9 +64,13 @@ 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
+         * The AWS region to sign with and make requests to. When specified, this static region configuration
+         * takes precedence over other region resolution methods.
+         *
+         * Region Resolution Priority:
+         * 1. Static region (if specified)
+         * 2. Custom region provider (if configured)
+         * 3. Default region provider chain
          */
         public var region: String?
 
diff --git a/aws-runtime/aws-config/jvm/test/aws/sdk/kotlin/runtime/config/AbstractAwsSdkClientFactoryTest.kt b/aws-runtime/aws-config/jvm/test/aws/sdk/kotlin/runtime/config/AbstractAwsSdkClientFactoryTest.kt
@@ -8,6 +8,7 @@ package aws.sdk.kotlin.runtime.config
 import aws.sdk.kotlin.runtime.config.profile.loadAwsSharedConfig
 import aws.sdk.kotlin.runtime.config.useragent.resolveUserAgentAppId
 import aws.sdk.kotlin.runtime.config.utils.mockPlatform
+import aws.sdk.kotlin.runtime.region.DefaultRegionProviderChain
 import aws.smithy.kotlin.runtime.client.*
 import aws.smithy.kotlin.runtime.client.region.RegionProvider
 import aws.smithy.kotlin.runtime.retries.StandardRetryStrategy
@@ -129,7 +130,7 @@ private interface TestClient : SdkClient {
         override val clientName: String = builder.clientName
         override val logMode: LogMode = builder.logMode ?: LogMode.Default
         override val region: String? = builder.region
-        override var regionProvider: RegionProvider? = builder.regionProvider
+        override var regionProvider: RegionProvider = builder.regionProvider ?: DefaultRegionProviderChain()
         override var useFips: Boolean = builder.useFips ?: false
         override var useDualStack: Boolean = builder.useDualStack ?: false
         override val applicationId: String? = builder.applicationId
diff --git a/codegen/aws-sdk-codegen/src/main/kotlin/aws/sdk/kotlin/codegen/AwsRuntimeTypes.kt b/codegen/aws-sdk-codegen/src/main/kotlin/aws/sdk/kotlin/codegen/AwsRuntimeTypes.kt
@@ -54,6 +54,7 @@ object AwsRuntimeTypes {
         }
 
         object Region : RuntimeTypePackage(AwsKotlinDependency.AWS_CONFIG, "region") {
+            val DefaultRegionProviderChain = symbol("DefaultRegionProviderChain")
             val resolveRegion = symbol("resolveRegion")
         }
     }
diff --git a/codegen/aws-sdk-codegen/src/main/kotlin/aws/sdk/kotlin/codegen/AwsServiceConfigIntegration.kt b/codegen/aws-sdk-codegen/src/main/kotlin/aws/sdk/kotlin/codegen/AwsServiceConfigIntegration.kt
@@ -27,9 +27,14 @@ class AwsServiceConfigIntegration : KotlinIntegration {
             baseClass = AwsRuntimeTypes.Config.AwsSdkClientConfig
             useNestedBuilderBaseClass()
             documentation = """
-                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
+                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()
 
             propertyType = ConfigPropertyType.Custom(
@@ -49,18 +54,29 @@ class AwsServiceConfigIntegration : KotlinIntegration {
 
         val RegionProviderProp: ConfigProperty = ConfigProperty {
             name = "regionProvider"
-            symbol = RuntimeTypes.SmithyClient.Region.RegionProvider.asNullable()
+            symbol = RuntimeTypes.SmithyClient.Region.RegionProvider
             baseClass = AwsRuntimeTypes.Config.AwsSdkClientConfig
             useNestedBuilderBaseClass()
             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()
 
+            propertyType = ConfigPropertyType.Custom(
+                render = { prop, writer ->
+                    writer.write(
+                        "override val #1L: #2T = builder.#1L ?: #3T()",
+                        prop.propertyName,
+                        prop.symbol,
+                        AwsRuntimeTypes.Config.Region.DefaultRegionProviderChain
+                    )
+                },
+            )
             order = -100
         }
 
diff --git a/codegen/aws-sdk-codegen/src/test/kotlin/aws/sdk/kotlin/codegen/AwsServiceConfigIntegrationTest.kt b/codegen/aws-sdk-codegen/src/test/kotlin/aws/sdk/kotlin/codegen/AwsServiceConfigIntegrationTest.kt
@@ -46,22 +46,28 @@ class AwsServiceConfigIntegrationTest {
 
         val expectedProps = """
     override val region: String? = builder.region ?: runBlocking { builder.regionProvider?.getRegion() ?: resolveRegion() }
-    override val regionProvider: RegionProvider? = builder.regionProvider
+    override val regionProvider: RegionProvider = builder.regionProvider ?: DefaultRegionProviderChain()
     override val credentialsProvider: CredentialsProvider = builder.credentialsProvider ?: DefaultChainCredentialsProvider(httpClient = httpClient, region = region).manage()
 """
         contents.shouldContainOnlyOnceWithDiff(expectedProps)
 
         val expectedImpl = """
         /**
-         * 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
+         * 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
          */
         override var region: String? = null
 
         /**
          * 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)

Original file line number	Diff line number	Diff line change
`@@ -54,6 +54,7 @@ object AwsRuntimeTypes {`
`54`	`54`	`}`
`55`	`55`
`56`	`56`	`object Region : RuntimeTypePackage(AwsKotlinDependency.AWS_CONFIG, "region") {`
	`57`	`+ val DefaultRegionProviderChain = symbol("DefaultRegionProviderChain")`
`57`	`58`	`val resolveRegion = symbol("resolveRegion")`
`58`	`59`	`}`
`59`	`60`	`}`