Skip to content

Commit 3f36653

Browse files
authored
Merge pull request #160 from agorapulse/develop
Do not fail build if AWS is not configured
2 parents 309cf70 + 00d8ed5 commit 3f36653

File tree

1 file changed

+19
-6
lines changed

1 file changed

+19
-6
lines changed

src/main/java/jp/classmethod/aws/gradle/AwsPluginExtension.java

+19-6
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@
2828

2929
import com.amazonaws.AmazonWebServiceClient;
3030
import com.amazonaws.ClientConfiguration;
31+
import com.amazonaws.SdkClientException;
3132
import com.amazonaws.auth.AWSCredentialsProvider;
3233
import com.amazonaws.auth.AWSCredentialsProviderChain;
3334
import com.amazonaws.auth.DefaultAWSCredentialsProviderChain;
@@ -146,14 +147,26 @@ public String getActiveProfileName(String clientProfileName) {
146147
}
147148

148149
public String getAccountId() {
149-
AWSSecurityTokenService sts = createClient(AWSSecurityTokenServiceClient.class, profileName);
150-
sts.setRegion(getActiveRegion(region));
151-
return sts.getCallerIdentity(new GetCallerIdentityRequest()).getAccount();
150+
try {
151+
AWSSecurityTokenService sts = createClient(AWSSecurityTokenServiceClient.class, profileName);
152+
sts.setRegion(getActiveRegion(region));
153+
return sts.getCallerIdentity(new GetCallerIdentityRequest()).getAccount();
154+
} catch (SdkClientException e) {
155+
project.getLogger().lifecycle("AWS credentials not configured!");
156+
return null;
157+
}
158+
152159
}
153160

154161
public String getUserArn() {
155-
AWSSecurityTokenService sts = createClient(AWSSecurityTokenServiceClient.class, profileName);
156-
sts.setRegion(getActiveRegion(region));
157-
return sts.getCallerIdentity(new GetCallerIdentityRequest()).getArn();
162+
try {
163+
AWSSecurityTokenService sts = createClient(AWSSecurityTokenServiceClient.class, profileName);
164+
sts.setRegion(getActiveRegion(region));
165+
return sts.getCallerIdentity(new GetCallerIdentityRequest()).getArn();
166+
} catch (SdkClientException e) {
167+
project.getLogger().lifecycle("AWS credentials not configured!");
168+
return null;
169+
}
170+
158171
}
159172
}

0 commit comments

Comments
 (0)