Skip to content
This repository was archived by the owner on Jul 28, 2023. It is now read-only.

Commit 169be60

Browse files
committed
reverted static credentials usage
1 parent 6b90931 commit 169be60

File tree

1 file changed

+1
-16
lines changed

1 file changed

+1
-16
lines changed

groovy-aws-sdk-util/src/main/groovy/agorapulse/libs/awssdk/util/AwsClientUtil.groovy

Lines changed: 1 addition & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -2,25 +2,18 @@ package agorapulse.libs.awssdk.util
22

33
import com.amazonaws.ClientConfiguration
44
import com.amazonaws.Protocol
5-
import com.amazonaws.SdkClientException
6-
import com.amazonaws.auth.AWSCredentials
75
import com.amazonaws.auth.AWSCredentialsProvider
86
import com.amazonaws.auth.AWSStaticCredentialsProvider
9-
import com.amazonaws.auth.AnonymousAWSCredentials
107
import com.amazonaws.auth.BasicAWSCredentials
118
import com.amazonaws.auth.DefaultAWSCredentialsProviderChain
129
import com.amazonaws.client.builder.AwsSyncClientBuilder
1310
import com.amazonaws.client.builder.AwsClientBuilder.EndpointConfiguration
1411
import com.amazonaws.regions.Region
1512
import com.amazonaws.regions.RegionUtils
16-
import org.slf4j.Logger
17-
import org.slf4j.LoggerFactory
1813

1914
@SuppressWarnings(['FactoryMethodName'])
2015
class AwsClientUtil {
2116

22-
private static final Logger LOGGER = LoggerFactory.getLogger(AwsClientUtil)
23-
2417
static final String DEFAULT_REGION = 'us-east-1'
2518

2619
static <C, B extends AwsSyncClientBuilder<B, C>> B configure(B builder, String serviceName, config, serviceConfig) {
@@ -166,15 +159,7 @@ class AwsClientUtil {
166159
}
167160

168161
if (!config.accessKey || !config.secretKey) {
169-
try {
170-
// only fetch the credentials once when inititalized
171-
AWSCredentials credentials = new DefaultAWSCredentialsProviderChain().getCredentials()
172-
return new AWSStaticCredentialsProvider(credentials)
173-
} catch(SdkClientException e) {
174-
LOGGER.warn('Failed to obtain credentials from the chain. ' +
175-
'Please, configure grails.plugin.awssdk.accessKey and grails.plugin.awssdk.secretKey ', e)
176-
return new AWSStaticCredentialsProvider(new AnonymousAWSCredentials())
177-
}
162+
new DefaultAWSCredentialsProviderChain()
178163
} else {
179164
new AWSStaticCredentialsProvider(new BasicAWSCredentials(config.accessKey, config.secretKey))
180165
}

0 commit comments

Comments
 (0)