Skip to content

Commit d79ffe0

Browse files
committed
modify ProcessCredentialsProviderTest to correctly interpret session tokens in script
fix RANDOM function in bat script for unit test
1 parent 4ae9b05 commit d79ffe0

File tree

3 files changed

+16
-5
lines changed

3 files changed

+16
-5
lines changed

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

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@
3737
public class ProcessCredentialsProviderTest {
3838

3939
private final static String PROCESS_RESOURCE_PATH = "/resources/process/";
40+
private final static String RANDOM_SESSION_TOKEN = "RANDOM_TOKEN";
4041
private static String scriptLocation;
4142

4243
@BeforeClass
@@ -102,8 +103,10 @@ public void resultsAreCached() {
102103
public void expirationBufferOverrideIsApplied() {
103104
ProcessCredentialsProvider credentialsProvider =
104105
ProcessCredentialsProvider.builder()
105-
.command(scriptLocation + " accessKeyId secretAccessKey sessionToken " +
106-
DateUtils.formatIso8601Date(Instant.now().plusSeconds(20)))
106+
.command(String.format("%s accessKeyId secretAccessKey %s %s",
107+
scriptLocation,
108+
RANDOM_SESSION_TOKEN,
109+
DateUtils.formatIso8601Date(Instant.now().plusSeconds(20))))
107110
.credentialRefreshThreshold(Duration.ofSeconds(20))
108111
.build();
109112

core/auth/src/test/resources/resources/process/linux-credentials-script.sh

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,12 @@ echo '"Version": 1,';
44
echo "\"AccessKeyId\": \"$1\",";
55
echo "\"SecretAccessKey\": \"$2\"";
66
if [[ $# -ge 3 ]]; then
7-
echo ','
8-
echo "\"SessionToken\": \"$RANDOM\"";
7+
echo ',';
8+
if [[ "$3" = "RANDOM_TOKEN" ]]; then
9+
echo "\"SessionToken\": \"$RANDOM\""
10+
else
11+
echo "\"SessionToken\": \"$3\""
12+
fi;
913
fi;
1014
if [[ $# -ge 4 ]]; then
1115
echo ','

core/auth/src/test/resources/resources/process/windows-credentials-script.bat

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,11 @@ ECHO "AccessKeyId": "%1",
66
ECHO "SecretAccessKey": "%2"
77
IF NOT "%3"=="" (
88
ECHO ,
9-
ECHO "SessionToken": "%RANDOM"
9+
IF "%3"=="RANDOM_TOKEN" (
10+
ECHO "SessionToken": "%RANDOM%"
11+
) ELSE (
12+
ECHO "SessionToken": "%3"
13+
)
1014
)
1115
IF NOT "%4"=="" (
1216
ECHO ,

0 commit comments

Comments
 (0)