Skip to content

modify ProcessCredentialsProviderTest to interpret session tokens #1528

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Dec 3, 2019
Merged

modify ProcessCredentialsProviderTest to interpret session tokens #1528

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d79ffe0
modify ProcessCredentialsProviderTest to correctly interpret session …
cenedhryn Nov 25, 2019
75d01c4
Merge branch 'master' into salande/processcredentialsprovider-update-…
cenedhryn Dec 3, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions ...src/test/java/software/amazon/awssdk/auth/credentials/ProcessCredentialsProviderTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@
public class ProcessCredentialsProviderTest {

private final static String PROCESS_RESOURCE_PATH = "/resources/process/";
private final static String RANDOM_SESSION_TOKEN = "RANDOM_TOKEN";
private static String scriptLocation;

@BeforeClass
Expand Down Expand Up @@ -102,8 +103,10 @@ public void resultsAreCached() {
public void expirationBufferOverrideIsApplied() {
ProcessCredentialsProvider credentialsProvider =
ProcessCredentialsProvider.builder()
.command(scriptLocation + " accessKeyId secretAccessKey sessionToken " +
DateUtils.formatIso8601Date(Instant.now().plusSeconds(20)))
.command(String.format("%s accessKeyId secretAccessKey %s %s",
scriptLocation,
RANDOM_SESSION_TOKEN,
DateUtils.formatIso8601Date(Instant.now().plusSeconds(20))))
.credentialRefreshThreshold(Duration.ofSeconds(20))
.build();

Expand Down
8 changes: 6 additions & 2 deletions core/auth/src/test/resources/resources/process/linux-credentials-script.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,12 @@ echo '"Version": 1,';
echo "\"AccessKeyId\": \"$1\",";
echo "\"SecretAccessKey\": \"$2\"";
if [[ $# -ge 3 ]]; then
echo ','
echo "\"SessionToken\": \"$RANDOM\"";
echo ',';
if [[ "$3" = "RANDOM_TOKEN" ]]; then
echo "\"SessionToken\": \"$RANDOM\""
else
echo "\"SessionToken\": \"$3\""
fi;
fi;
if [[ $# -ge 4 ]]; then
echo ','
Expand Down
6 changes: 5 additions & 1 deletion core/auth/src/test/resources/resources/process/windows-credentials-script.bat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,11 @@ ECHO "AccessKeyId": "%1",
ECHO "SecretAccessKey": "%2"
IF NOT "%3"=="" (
ECHO ,
ECHO "SessionToken": "%RANDOM"
IF "%3"=="RANDOM_TOKEN" (
ECHO "SessionToken": "%RANDOM%"
) ELSE (
ECHO "SessionToken": "%3"
)
)
IF NOT "%4"=="" (
ECHO ,
Expand Down