Skip to content

Commit a7ddf54

Browse files
authored
Add account ID to resolved SSO session credentials (#5592)
1 parent cfc4a3e commit a7ddf54

File tree

2 files changed

+6
-1
lines changed

2 files changed

+6
-1
lines changed

services/sso/src/main/java/software/amazon/awssdk/services/sso/auth/SsoCredentialsProvider.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -111,6 +111,7 @@ private SessionCredentialsHolder getUpdatedCredentials(SsoClient ssoClient) {
111111
.accessKeyId(roleCredentials.accessKeyId())
112112
.secretAccessKey(roleCredentials.secretAccessKey())
113113
.sessionToken(roleCredentials.sessionToken())
114+
.accountId(request.accountId())
114115
.providerName(PROVIDER_NAME)
115116
.build();
116117
return new SessionCredentialsHolder(sessionCredentials, Instant.ofEpochMilli(roleCredentials.expiration()));

services/sso/src/test/java/software/amazon/awssdk/services/sso/auth/SsoCredentialsProviderTest.java

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,10 @@ public void distantExpiringCredentialsUpdatedInBackground_OverridePrefetchAndSta
9090

9191

9292
private GetRoleCredentialsRequestSupplier getRequestSupplier() {
93-
return new GetRoleCredentialsRequestSupplier(GetRoleCredentialsRequest.builder().build(), "cachedToken");
93+
return new GetRoleCredentialsRequestSupplier(GetRoleCredentialsRequest.builder()
94+
.accountId("123456789")
95+
.build(),
96+
"cachedToken");
9497
}
9598

9699
private GetRoleCredentialsResponse getResponse(RoleCredentials roleCredentials) {
@@ -134,6 +137,7 @@ private void callClientWithCredentialsProvider(Instant credentialsExpirationDate
134137
assertThat(actualCredentials.secretAccessKey()).isEqualTo("b");
135138
assertThat(actualCredentials.sessionToken()).isEqualTo("c");
136139
assertThat(actualCredentials.providerName()).isPresent().contains("SsoCredentialsProvider");
140+
assertThat(actualCredentials.accountId()).isPresent().contains("123456789");
137141
}
138142
}
139143

0 commit comments

Comments
 (0)