include ContainerCredentialsProvider & update aws-sdk to version 1.11…

….28 (#51)
awslabs · Sep 6, 2016 · 9c29857 · 9c29857
1 parent 61a6726
commit 9c29857
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/pom.xml b/pom.xml
@@ -23,7 +23,7 @@
     </licenses>
 
     <properties>
-        <aws-java-sdk.version>1.10.26</aws-java-sdk.version>
+        <aws-java-sdk.version>1.11.28</aws-java-sdk.version>
     </properties>
 
     <dependencies>
@@ -209,4 +209,4 @@
       </plugins>
     </build>
 
-</project>
+</project>
diff --git a/setup b/setup
@@ -87,7 +87,7 @@ download_dependencies() {
   install -d ${dependencies_dir}
 
   echo "Downloading dependencies ..."
-  aws_java_sdk_version="1.10.26"
+  aws_java_sdk_version="1.11.28"
 
   remote_mvn_pkg="com.amazonaws:aws-java-sdk-core:${aws_java_sdk_version} \
                   com.amazonaws:aws-java-sdk-kinesis:${aws_java_sdk_version} \

diff --git a/src/com/amazon/kinesis/streaming/agent/AgentAWSCredentialsProviderChain.java b/src/com/amazon/kinesis/streaming/agent/AgentAWSCredentialsProviderChain.java
@@ -18,13 +18,15 @@
 import com.amazonaws.auth.EnvironmentVariableCredentialsProvider;
 import com.amazonaws.auth.InstanceProfileCredentialsProvider;
 import com.amazonaws.auth.SystemPropertiesCredentialsProvider;
+import com.amazonaws.auth.ContainerCredentialsProvider;
 import com.amazonaws.auth.profile.ProfileCredentialsProvider;
 
 public class AgentAWSCredentialsProviderChain extends AWSCredentialsProviderChain {
     public AgentAWSCredentialsProviderChain(AgentConfiguration config) {
         super(new AgentAWSCredentialsProvider(config),
                 new EnvironmentVariableCredentialsProvider(),
                 new SystemPropertiesCredentialsProvider(),
+                new ContainerCredentialsProvider(),
                 new ProfileCredentialsProvider(),
                 new InstanceProfileCredentialsProvider());
     }