Skip to content

Commit 10caeb4

Browse files
author
wreulicke
committed
reduce deprecation
1 parent 0324443 commit 10caeb4

File tree

1 file changed

+8
-5
lines changed

1 file changed

+8
-5
lines changed

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

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -29,12 +29,12 @@
2929
import com.amazonaws.AmazonClientException;
3030
import com.amazonaws.auth.AWSCredentialsProvider;
3131
import com.amazonaws.auth.AWSCredentialsProviderChain;
32+
import com.amazonaws.auth.AWSStaticCredentialsProvider;
3233
import com.amazonaws.auth.BasicAWSCredentials;
3334
import com.amazonaws.auth.BasicSessionCredentials;
3435
import com.amazonaws.auth.STSAssumeRoleSessionCredentialsProvider;
3536
import com.amazonaws.auth.profile.ProfileCredentialsProvider;
3637
import com.amazonaws.auth.profile.internal.AbstractProfilesConfigFileScanner;
37-
import com.amazonaws.internal.StaticCredentialsProvider;
3838

3939
/**
4040
* TODO for daisuke
@@ -100,7 +100,7 @@ private static Map<String, AwsCliProfile> loadProfiles(InputStream is) throws IO
100100
"Unable to load credentials into profile: ProfileName is empty.");
101101
if (accessKey != null && secretKey != null) {
102102
if (sessionToken == null) {
103-
AWSCredentialsProvider cp = new StaticCredentialsProvider(
103+
AWSCredentialsProvider cp = new AWSStaticCredentialsProvider(
104104
new BasicAWSCredentials(accessKey, secretKey));
105105
profilesByName.put(profileName, new AwsCliProfile(profileName, cp));
106106
} else {
@@ -110,7 +110,8 @@ private static Map<String, AwsCliProfile> loadProfiles(InputStream is) throws IO
110110
profileName);
111111
throw new AmazonClientException(msg);
112112
}
113-
AWSCredentialsProvider cp = new StaticCredentialsProvider(
113+
114+
AWSCredentialsProvider cp = new AWSStaticCredentialsProvider(
114115
new BasicSessionCredentials(accessKey, secretKey, sessionToken));
115116
profilesByName.put(profileName, new AwsCliProfile(profileName, cp));
116117
}
@@ -121,8 +122,10 @@ private static Map<String, AwsCliProfile> loadProfiles(InputStream is) throws IO
121122
AWSCredentialsProvider source = new AWSCredentialsProviderChain(
122123
new AwsCliConfigProfileCredentialsProvider(sourceProfile),
123124
new ProfileCredentialsProvider(sourceProfile));
124-
AWSCredentialsProvider cp = new STSAssumeRoleSessionCredentialsProvider(
125-
source, roleArn, roleSessionName);
125+
AWSCredentialsProvider cp =
126+
new STSAssumeRoleSessionCredentialsProvider.Builder(roleArn, roleSessionName)
127+
.withLongLivedCredentialsProvider(source)
128+
.build();
126129
profilesByName.put(profileName, new AwsCliProfile(profileName, cp));
127130
}
128131
}

0 commit comments

Comments
 (0)