Update AssumeRoleIntegrationTest to work even if the current environment includes a AWS_SESSION_TOKEN

Author: millems

services/sts/src/it/java/software/amazon/awssdk/services/sts/AssumeRoleIntegrationTest.java

@@ -186,6 +186,7 @@ public void profileCredentialProviderCanAssumeRolesWithEnvironmentCredentialSour
         EnvironmentVariableHelper.run(helper -> {
             helper.set("AWS_ACCESS_KEY_ID", userCredentials.accessKeyId());
             helper.set("AWS_SECRET_ACCESS_KEY", userCredentials.secretAccessKey());
+            helper.remove("AWS_SESSION_TOKEN");
 
             String ASSUME_ROLE_PROFILE =
                 "[test]\n"
@@ -218,36 +219,39 @@ public void profileCredentialProviderWithEnvironmentCredentialSourceAndSystemPro
         System.setProperty("aws.accessKeyId", userCredentials.accessKeyId());
         System.setProperty("aws.secretAccessKey", userCredentials.secretAccessKey());
 
-        EnvironmentVariableHelper.run(helper -> {
-            helper.remove("AWS_ACCESS_KEY_ID");
-            helper.remove("AWS_SECRET_ACCESS_KEY");
-
-            String ASSUME_ROLE_PROFILE =
-                "[test]\n"
-                + "region = us-west-1\n"
-                + "credential_source = Environment\n"
-                + "role_arn = " + ROLE_ARN;
-
-            ProfileFile profiles = ProfileFile.builder()
-                                              .content(new StringInputStream(ASSUME_ROLE_PROFILE))
-                                              .type(ProfileFile.Type.CREDENTIALS)
-                                              .build();
-            Optional<Profile> profile = profiles.profile("test");
-            AwsCredentialsProvider awsCredentialsProvider =
-                new ProfileCredentialsUtils(profile.get(), profiles::profile).credentialsProvider().get();
-
-
-            // Try to assume the role until the eventual consistency catches up.
-            AwsCredentials awsCredentials = Waiter.run(awsCredentialsProvider::resolveCredentials)
-                                                  .ignoringException(StsException.class)
-                                                  .orFail();
-
-            assertThat(awsCredentials.accessKeyId()).isNotBlank();
-            assertThat(awsCredentials.secretAccessKey()).isNotBlank();
-            ((SdkAutoCloseable) awsCredentialsProvider).close();
-        });
-
-        System.clearProperty("aws.accessKeyId");
-        System.clearProperty("aws.secretAccessKey");
+        try {
+            EnvironmentVariableHelper.run(helper -> {
+                helper.remove("AWS_ACCESS_KEY_ID");
+                helper.remove("AWS_SECRET_ACCESS_KEY");
+                helper.remove("AWS_SESSION_TOKEN");
+
+                String ASSUME_ROLE_PROFILE =
+                    "[test]\n"
+                    + "region = us-west-1\n"
+                    + "credential_source = Environment\n"
+                    + "role_arn = " + ROLE_ARN;
+
+                ProfileFile profiles = ProfileFile.builder()
+                                                  .content(new StringInputStream(ASSUME_ROLE_PROFILE))
+                                                  .type(ProfileFile.Type.CREDENTIALS)
+                                                  .build();
+                Optional<Profile> profile = profiles.profile("test");
+                AwsCredentialsProvider awsCredentialsProvider =
+                    new ProfileCredentialsUtils(profile.get(), profiles::profile).credentialsProvider().get();
+
+
+                // Try to assume the role until the eventual consistency catches up.
+                AwsCredentials awsCredentials = Waiter.run(awsCredentialsProvider::resolveCredentials)
+                                                      .ignoringException(StsException.class)
+                                                      .orFail();
+
+                assertThat(awsCredentials.accessKeyId()).isNotBlank();
+                assertThat(awsCredentials.secretAccessKey()).isNotBlank();
+                ((SdkAutoCloseable) awsCredentialsProvider).close();
+            });
+        } finally {
+            System.clearProperty("aws.accessKeyId");
+            System.clearProperty("aws.secretAccessKey");
+        }
     }
 }