From 32664c34a70125e71cc678cac399baa67e95a6cf Mon Sep 17 00:00:00 2001 From: David Date: Fri, 12 May 2017 14:14:44 -0700 Subject: [PATCH 1/2] Updating aws SDK and restricting to necessary packages Adding ContainerCredentialsProvider as IAM option --- build.sbt | 5 +++-- .../github/cloudify/scala/aws/auth/CredentialsProvider.scala | 5 +++++ 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/build.sbt b/build.sbt index 8055e2f..8fee7b6 100644 --- a/build.sbt +++ b/build.sbt @@ -24,8 +24,9 @@ licenses += ( "MIT" -> url("http://opensource.org/licenses/MIT") ) unmanagedSourceDirectories in Compile += baseDirectory.value / "examples" libraryDependencies ++= Seq( - "com.amazonaws" % "aws-java-sdk" % "1.9.23", - "org.mockito" % "mockito-all" % "1.10.8" % "test" + "com.amazonaws" % "aws-java-sdk-kinesis" % "1.11.128", + "com.amazonaws" % "aws-java-sdk-core" % "1.11.128", + "org.mockito" % "mockito-all" % "1.10.8" % "test" ) def scalatestDependency(scalaVersion: String) = scalaVersion match { diff --git a/src/main/scala/io/github/cloudify/scala/aws/auth/CredentialsProvider.scala b/src/main/scala/io/github/cloudify/scala/aws/auth/CredentialsProvider.scala index 535757f..023d162 100644 --- a/src/main/scala/io/github/cloudify/scala/aws/auth/CredentialsProvider.scala +++ b/src/main/scala/io/github/cloudify/scala/aws/auth/CredentialsProvider.scala @@ -35,6 +35,11 @@ object CredentialsProvider { */ lazy val InstanceProfile = new InstanceProfileCredentialsProvider() + /** + * Provides an instance of the `Container` provider + */ + lazy val Container = new ContainerCredentialsProvider() + /** * Provides an instance of the default `ClasspathPropertiesFileCredentialsProvider` provider. */ From 7837714374c78b29720a8c07b2c9dc4cb5d4fc45 Mon Sep 17 00:00:00 2001 From: David Dawson Date: Fri, 12 May 2017 17:22:31 -0700 Subject: [PATCH 2/2] removing deprecated method warning --- .../io/github/cloudify/scala/aws/auth/CredentialsProvider.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/scala/io/github/cloudify/scala/aws/auth/CredentialsProvider.scala b/src/main/scala/io/github/cloudify/scala/aws/auth/CredentialsProvider.scala index 023d162..95bab73 100644 --- a/src/main/scala/io/github/cloudify/scala/aws/auth/CredentialsProvider.scala +++ b/src/main/scala/io/github/cloudify/scala/aws/auth/CredentialsProvider.scala @@ -33,7 +33,7 @@ object CredentialsProvider { /** * Provides an instance of the `InstanceProfile` provider */ - lazy val InstanceProfile = new InstanceProfileCredentialsProvider() + lazy val InstanceProfile = new InstanceProfileCredentialsProvider(false) /** * Provides an instance of the `Container` provider