Skip to content
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

Jump to bottom

update aws sdk to 1.11.270, add aws credentails provider EC2Container… #33

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

update aws sdk to 1.11.270, add aws credentails provider EC2Container… #33

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
a26c7f4
update aws sdk to 1.11.270, add aws credentails provider EC2Container…
pegacn Feb 7, 2018
0b21b11
update aws sdk to 1.11.250, add aws credentails provider EC2Container…
pegacn Feb 7, 2018
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
4 changes: 2 additions & 2 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
</parent>
<groupId>org.kuali.maven.wagons</groupId>
<artifactId>maven-s3-wagon</artifactId>
<version>1.2.2-SNAPSHOT</version>
<version>1.2.3-SNAPSHOT</version>
<name>Maven S3 Wagon</name>
<inceptionYear>2010</inceptionYear>
<description>
Expand All @@ -37,7 +37,7 @@
<project.scm.vendor>git</project.scm.vendor>
<project.java.version>1.5</project.java.version>
<slf4j.version>1.7.5</slf4j.version>
<aws.version>1.6.4</aws.version>
<aws.version>1.11.250</aws.version>
<spring.version>3.2.5.RELEASE</spring.version>
<kuali-s3.version>1.0.1</kuali-s3.version>
<junit.version>4.11</junit.version>
Expand Down
5 changes: 4 additions & 1 deletion src/main/java/org/kuali/maven/wagon/auth/MavenAwsCredentialsProviderChain.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
import com.amazonaws.auth.EnvironmentVariableCredentialsProvider;
import com.amazonaws.auth.InstanceProfileCredentialsProvider;
import com.amazonaws.auth.SystemPropertiesCredentialsProvider;
import com.amazonaws.auth.EC2ContainerCredentialsProviderWrapper;
import com.google.common.base.Optional;

/**
Expand Down Expand Up @@ -52,7 +53,9 @@ private static AWSCredentialsProvider[] getProviders(Optional<AuthenticationInfo
// http://docs.aws.amazon.com/AWSSdkDocsJava/latest/DeveloperGuide/java-dg-roles.html
// This allows you setup an IAM role, attach that role to an EC2 Instance at launch time,
// and thus automatically provide the wagon with the credentials it needs
providers.add(new InstanceProfileCredentialsProvider());
providers.add(new EC2ContainerCredentialsProviderWrapper());

providers.add(InstanceProfileCredentialsProvider.getInstance());

return providers.toArray(new AWSCredentialsProvider[providers.size()]);
}
Expand Down