Fix issue aws#135

MatteCarra · Sep 18, 2017 · 4113efb · 4113efb
1 parent 568e336
commit 4113efb
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/core/src/main/java/software/amazon/awssdk/AwsSystemSetting.java b/core/src/main/java/software/amazon/awssdk/AwsSystemSetting.java
@@ -134,7 +134,7 @@ public enum AwsSystemSetting implements SystemSetting {
      * This allows a service running in an elastic container to automatically load its credentials without needing to configure
      * them in the {@link ClientBuilder}.
      *
-     * This is not used if the {@link #AWS_CONTAINER_CREDENTIALS_PATH} is not specified.
+     * This is not used if the {@link #AWS_CONTAINER_CREDENTIALS_RELATIVE_URI} is not specified.
      */
     AWS_CONTAINER_SERVICE_ENDPOINT("aws.containerServiceEndpoint", "http://169.254.170.2"),
 
@@ -145,7 +145,7 @@ public enum AwsSystemSetting implements SystemSetting {
      *
      * @see #AWS_CONTAINER_SERVICE_ENDPOINT
      */
-    AWS_CONTAINER_CREDENTIALS_PATH("aws.containerCredentialsPath", null),
+    AWS_CONTAINER_CREDENTIALS_RELATIVE_URI("aws.containerCredentialsPath", null),
 
     /**
      * Whether CBOR optimization should automatically be used if its support is found on the classpath and the service supports

diff --git a/core/src/main/java/software/amazon/awssdk/auth/ElasticContainerCredentialsProvider.java b/core/src/main/java/software/amazon/awssdk/auth/ElasticContainerCredentialsProvider.java
@@ -87,7 +87,7 @@ public String toString() {
     }
 
     private static boolean isEnabled() {
-        return AwsSystemSetting.AWS_CONTAINER_CREDENTIALS_PATH.getStringValue().isPresent();
+        return AwsSystemSetting.AWS_CONTAINER_CREDENTIALS_RELATIVE_URI.getStringValue().isPresent();
     }
 
     /**
@@ -97,7 +97,7 @@ private static class EcsCredentialsEndpointProvider extends CredentialsEndpointP
         @Override
         public URI getCredentialsEndpoint() throws URISyntaxException {
             return new URI(AwsSystemSetting.AWS_CONTAINER_SERVICE_ENDPOINT.getStringValueOrThrow() +
-                           AwsSystemSetting.AWS_CONTAINER_CREDENTIALS_PATH.getStringValueOrThrow());
+                           AwsSystemSetting.AWS_CONTAINER_CREDENTIALS_RELATIVE_URI.getStringValueOrThrow());
         }
 
         @Override

diff --git a/core/src/test/java/software/amazon/awssdk/auth/ElasticContainerCredentialsProviderTest.java b/core/src/test/java/software/amazon/awssdk/auth/ElasticContainerCredentialsProviderTest.java
@@ -68,7 +68,7 @@ public void testEnvVariableNotSet() {
     @Test
     public void testGetCredentialsReturnsValidResponseFromEcsEndpoint() {
         try {
-            System.setProperty(AwsSystemSetting.AWS_CONTAINER_CREDENTIALS_PATH.property(), "");
+            System.setProperty(AwsSystemSetting.AWS_CONTAINER_CREDENTIALS_RELATIVE_URI.property(), "");
 
             stubForSuccessResponse();
 
@@ -79,7 +79,7 @@ public void testGetCredentialsReturnsValidResponseFromEcsEndpoint() {
             assertThat(credentials.secretAccessKey()).isEqualTo(SECRET_ACCESS_KEY);
             assertThat(credentials.sessionToken()).isEqualTo(TOKEN);
         } finally {
-            System.clearProperty(AwsSystemSetting.AWS_CONTAINER_CREDENTIALS_PATH.property());
+            System.clearProperty(AwsSystemSetting.AWS_CONTAINER_CREDENTIALS_RELATIVE_URI.property());
         }
     }