Skip to content

Commit a93db7f

Browse files
authored
fix: pass attributes to resolve function (#1027)
1 parent 517db76 commit a93db7f

File tree

3 files changed

+7
-2
lines changed

3 files changed

+7
-2
lines changed
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
{
2+
"id": "21f40dd1-529e-40d1-8cd9-ebee9a649ff7",
3+
"type": "bugfix",
4+
"description": "Ensure attributes are passed to credentials providers during resolution"
5+
}

runtime/auth/aws-credentials/common/src/aws/smithy/kotlin/runtime/auth/awscredentials/CachedCredentialsProvider.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ public class CachedCredentialsProvider(
6060

6161
return cachedCredentials.getOrLoad {
6262
coroutineContext.trace<CachedCredentialsProvider> { "refreshing credentials cache" }
63-
val providerCreds = source.resolve()
63+
val providerCreds = source.resolve(attributes)
6464
val cacheExpiration = listOfNotNull(providerCreds.expiration, clock.now() + expireCredentialsAfter).min()
6565
val credsExpiration = providerCreds.expiration ?: cacheExpiration
6666
val creds = providerCreds.copy(expiration = credsExpiration)

runtime/auth/aws-signing-common/common/src/aws/smithy/kotlin/runtime/auth/awssigning/Presigner.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ public suspend fun presignRequest(
2929
): HttpRequest {
3030
unsignedRequestBuilder.body = HttpBody.Empty
3131

32-
val credentials = credentialsProvider.resolve()
32+
val credentials = credentialsProvider.resolve(ctx.attributes)
3333
val eprRequest = ResolveEndpointRequest(ctx, unsignedRequestBuilder.build(), credentials)
3434
val endpoint = endpointResolver.resolve(eprRequest)
3535
setResolvedEndpoint(unsignedRequestBuilder, ctx, endpoint)

0 commit comments

Comments
 (0)