Skip to content

Commit 5556232

Browse files
carhazRyanTheKodiakzoewangg
authored
bugfix: set expiration time for container credential provider (#6481)
Co-authored-by: carhaz <36483641+carhaz@users.noreply.github.com> Co-authored-by: Zoe Wang <33073555+zoewangg@users.noreply.github.com>
1 parent ffb92b7 commit 5556232

3 files changed

Lines changed: 12 additions & 0 deletions

File tree

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
{
2+
"type": "bugfix",
3+
"category": "AWS SDK for Java v2",
4+
"contributor": "carhaz",
5+
"description": "Update session credentials builder in HttpsCredentialsLoader to include expiration time so it's set in session credentials for ContainerCredentialsProvider"
6+
}

core/auth/src/main/java/software/amazon/awssdk/auth/credentials/internal/HttpCredentialsLoader.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -104,6 +104,7 @@ public AwsCredentials getAwsCredentials() {
104104
.accessKeyId(accessKeyId)
105105
.secretAccessKey(secretKey)
106106
.sessionToken(token)
107+
.expirationTime(expiration)
107108
.providerName(providerName)
108109
.build() :
109110
AwsBasicCredentials.builder()

core/auth/src/test/java/software/amazon/awssdk/auth/credentials/ContainerCredentialsProviderTest.java

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,8 @@
3535
import software.amazon.awssdk.core.util.SdkUserAgent;
3636
import software.amazon.awssdk.testutils.EnvironmentVariableHelper;
3737

38+
import java.util.Optional;
39+
3840
/**
3941
* Tests for the {@link ContainerCredentialsProviderTest}.
4042
*/
@@ -47,6 +49,7 @@ public class ContainerCredentialsProviderTest {
4749
private static final String ACCESS_KEY_ID = "ACCESS_KEY_ID";
4850
private static final String SECRET_ACCESS_KEY = "SECRET_ACCESS_KEY";
4951
private static final String TOKEN = "TOKEN_TOKEN_TOKEN";
52+
private static final String EXPIRATION_TIME = "3000-05-03T04:55:54Z";
5053
private ContainerCredentialsProvider credentialsProvider;
5154
private static EnvironmentVariableHelper helper = new EnvironmentVariableHelper();
5255

@@ -92,6 +95,8 @@ public void testGetCredentialsReturnsValidResponseFromEcsEndpoint() {
9295
assertThat(credentials.accessKeyId()).isEqualTo(ACCESS_KEY_ID);
9396
assertThat(credentials.secretAccessKey()).isEqualTo(SECRET_ACCESS_KEY);
9497
assertThat(credentials.sessionToken()).isEqualTo(TOKEN);
98+
assertThat(credentials.expirationTime().isPresent());
99+
assertThat(credentials.expirationTime().get()).isEqualTo(EXPIRATION_TIME);
95100
assertThat(credentials.providerName()).isPresent().contains(BusinessMetricFeatureId.CREDENTIALS_HTTP.value());
96101
}
97102

0 commit comments

Comments
 (0)