Merge pull request #36 from wreulicke/feature/update-aws-sdk

Update aws sdk

Author: dai0304

gradle.properties

@@ -6,7 +6,7 @@ springRetryVersion = 1.1.2.RELEASE
 springSecurityOauth2Version = 2.0.6.RELEASE
 springDataVersion = 1.11.4.RELEASE
 springHateoasVersion = 0.19.0.RELEASE
-awsJavaSdkVersion = 1.11.21
+awsJavaSdkVersion = 1.11.233
 jacksonVersion = 2.7.2
 
 lombokVersion = 1.16.18

spar-wings-awscli-config/src/main/java/jp/xet/sparwings/aws/auth/AwsCliConfigFileLoader.java

@@ -29,12 +29,12 @@
 import com.amazonaws.AmazonClientException;
 import com.amazonaws.auth.AWSCredentialsProvider;
 import com.amazonaws.auth.AWSCredentialsProviderChain;
+import com.amazonaws.auth.AWSStaticCredentialsProvider;
 import com.amazonaws.auth.BasicAWSCredentials;
 import com.amazonaws.auth.BasicSessionCredentials;
 import com.amazonaws.auth.STSAssumeRoleSessionCredentialsProvider;
 import com.amazonaws.auth.profile.ProfileCredentialsProvider;
 import com.amazonaws.auth.profile.internal.AbstractProfilesConfigFileScanner;
-import com.amazonaws.internal.StaticCredentialsProvider;
 
 /**
  * TODO for daisuke
@@ -100,7 +100,7 @@ private static Map<String, AwsCliProfile> loadProfiles(InputStream is) throws IO
 						"Unable to load credentials into profile: ProfileName is empty.");
 				if (accessKey != null && secretKey != null) {
 					if (sessionToken == null) {
-						AWSCredentialsProvider cp = new StaticCredentialsProvider(
+						AWSCredentialsProvider cp = new AWSStaticCredentialsProvider(
 								new BasicAWSCredentials(accessKey, secretKey));
 						profilesByName.put(profileName, new AwsCliProfile(profileName, cp));
 					} else {
@@ -110,7 +110,8 @@ private static Map<String, AwsCliProfile> loadProfiles(InputStream is) throws IO
 									profileName);
 							throw new AmazonClientException(msg);
 						}
-						AWSCredentialsProvider cp = new StaticCredentialsProvider(
+						
+						AWSCredentialsProvider cp = new AWSStaticCredentialsProvider(
 								new BasicSessionCredentials(accessKey, secretKey, sessionToken));
 						profilesByName.put(profileName, new AwsCliProfile(profileName, cp));
 					}
@@ -121,8 +122,10 @@ private static Map<String, AwsCliProfile> loadProfiles(InputStream is) throws IO
 					AWSCredentialsProvider source = new AWSCredentialsProviderChain(
 							new AwsCliConfigProfileCredentialsProvider(sourceProfile),
 							new ProfileCredentialsProvider(sourceProfile));
-					AWSCredentialsProvider cp = new STSAssumeRoleSessionCredentialsProvider(
-							source, roleArn, roleSessionName);
+					AWSCredentialsProvider cp =
+							new STSAssumeRoleSessionCredentialsProvider.Builder(roleArn, roleSessionName)
+								.withLongLivedCredentialsProvider(source)
+								.build();
 					profilesByName.put(profileName, new AwsCliProfile(profileName, cp));
 				}
 			}

spar-wings-awscli-config/src/test/java/jp/xet/sparwings/aws/auth/AwsCliConfigFileTest.java

@@ -29,8 +29,8 @@
 import org.mockito.runners.MockitoJUnitRunner;
 
 import com.amazonaws.auth.AWSCredentialsProvider;
+import com.amazonaws.auth.AWSStaticCredentialsProvider;
 import com.amazonaws.auth.STSAssumeRoleSessionCredentialsProvider;
-import com.amazonaws.internal.StaticCredentialsProvider;
 
 /**
  * Test for {@link AwsCliConfigFile}.
@@ -64,7 +64,7 @@ public void testSrcProfiles() {
 		// exercise
 		AWSCredentialsProvider actual = sut.getCredentialsProvider("src");
 		// verify
-		assertThat(actual, is(instanceOf(StaticCredentialsProvider.class)));
+		assertThat(actual, is(instanceOf(AWSStaticCredentialsProvider.class)));
 
 	}