fix: Add optional configurationSource parameter to `ProfileCredenti…

…alsProvider` (#1140)
awslabs · Dec 1, 2023 · 8dfa5af · 8dfa5af
1 parent f09c714
commit 8dfa5af
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 3 deletions.
diff --git a/.changes/d7c1e490-7fc3-48fe-8faf-914a5f09c671.json b/.changes/d7c1e490-7fc3-48fe-8faf-914a5f09c671.json
@@ -0,0 +1,5 @@
+{
+    "id": "d7c1e490-7fc3-48fe-8faf-914a5f09c671",
+    "type": "misc",
+    "description": "Add optional `configurationSource` parameter to `ProfileCredentialsProvider`"
+}
diff --git a/aws-runtime/aws-config/api/aws-config.api b/aws-runtime/aws-config/api/aws-config.api
@@ -99,8 +99,8 @@ public final class aws/sdk/kotlin/runtime/auth/credentials/ProcessCredentialsPro
 
 public final class aws/sdk/kotlin/runtime/auth/credentials/ProfileCredentialsProvider : aws/smithy/kotlin/runtime/auth/awscredentials/CloseableCredentialsProvider {
 	public fun <init> ()V
-	public fun <init> (Ljava/lang/String;Ljava/lang/String;Laws/smithy/kotlin/runtime/util/PlatformProvider;Laws/smithy/kotlin/runtime/http/engine/HttpClientEngine;)V
-	public synthetic fun <init> (Ljava/lang/String;Ljava/lang/String;Laws/smithy/kotlin/runtime/util/PlatformProvider;Laws/smithy/kotlin/runtime/http/engine/HttpClientEngine;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
+	public fun <init> (Ljava/lang/String;Ljava/lang/String;Laws/smithy/kotlin/runtime/util/PlatformProvider;Laws/smithy/kotlin/runtime/http/engine/HttpClientEngine;Laws/sdk/kotlin/runtime/config/profile/AwsConfigurationSource;)V
+	public synthetic fun <init> (Ljava/lang/String;Ljava/lang/String;Laws/smithy/kotlin/runtime/util/PlatformProvider;Laws/smithy/kotlin/runtime/http/engine/HttpClientEngine;Laws/sdk/kotlin/runtime/config/profile/AwsConfigurationSource;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
 	public fun close ()V
 	public final fun getHttpClient ()Laws/smithy/kotlin/runtime/http/engine/HttpClientEngine;
 	public final fun getPlatformProvider ()Laws/smithy/kotlin/runtime/util/PlatformProvider;

diff --git a/...s-config/common/src/aws/sdk/kotlin/runtime/auth/credentials/ProfileCredentialsProvider.kt b/...s-config/common/src/aws/sdk/kotlin/runtime/auth/credentials/ProfileCredentialsProvider.kt
@@ -11,6 +11,7 @@ import aws.sdk.kotlin.runtime.auth.credentials.profile.RoleArn
 import aws.sdk.kotlin.runtime.client.AwsClientOption
 import aws.sdk.kotlin.runtime.config.AwsSdkSetting
 import aws.sdk.kotlin.runtime.config.imds.ImdsClient
+import aws.sdk.kotlin.runtime.config.profile.AwsConfigurationSource
 import aws.sdk.kotlin.runtime.config.profile.loadAwsSharedConfig
 import aws.sdk.kotlin.runtime.region.resolveRegion
 import aws.smithy.kotlin.runtime.auth.awscredentials.CloseableCredentialsProvider
@@ -73,12 +74,15 @@ import kotlin.coroutines.coroutineContext
  * @param platformProvider The platform API provider
  * @param httpClient the [HttpClientEngine] instance to use to make requests. NOTE: This engine's resources and lifetime
  * are NOT managed by the provider. Caller is responsible for closing.
+ * @param configurationSource An optional configuration source to use for loading shared config. If not provided,
+ * it will be resolved from the environment.
  */
 public class ProfileCredentialsProvider(
     public val profileName: String? = null,
     public val region: String? = null,
     public val platformProvider: PlatformProvider = PlatformProvider.System,
     public val httpClient: HttpClientEngine? = null,
+    private val configurationSource: AwsConfigurationSource? = null,
 ) : CloseableCredentialsProvider {
     private val namedProviders = mapOf(
         "Environment" to EnvironmentCredentialsProvider(platformProvider::getenv),
@@ -97,7 +101,7 @@ public class ProfileCredentialsProvider(
 
     override suspend fun resolve(attributes: Attributes): Credentials {
         val logger = coroutineContext.logger<ProfileCredentialsProvider>()
-        val sharedConfig = loadAwsSharedConfig(platformProvider, profileName)
+        val sharedConfig = loadAwsSharedConfig(platformProvider, profileName, configurationSource)
         logger.debug { "Loading credentials from profile `${sharedConfig.activeProfile.name}`" }
         val chain = ProfileChain.resolve(sharedConfig)