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

Commit ce08acc

Browse files
authored
fix setting of the region (#103)
* fix setting of the region * bumped version
1 parent 31cb139 commit ce08acc

File tree

6 files changed

+18
-9
lines changed

6 files changed

+18
-9
lines changed

gradle.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
version=2.4.2
1+
version=2.4.3
22
awsJavaSdkVersion=1.11.592
33
awsKinesisClientVersion=1.10.0
44
gradleWrapperVersion=5.5.1

grails-aws-sdk-cognito/src/main/groovy/grails/plugin/awssdk/cognito/AbstractCognitoAuthService.groovy

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ abstract class AbstractCognitoAuthService implements GrailsApplicationAware {
5050
init() {
5151
client = AmazonCognitoIdentityClient.builder()
5252
.withCredentials(AwsClientUtil.buildCredentials(config, cognitoConfig))
53-
.withRegion(AwsClientUtil.buildRegion(config, cognitoConfig))
53+
.withRegion(AwsClientUtil.buildRegion(config, cognitoConfig).name)
5454
.build()
5555
}
5656

grails-aws-sdk-s3/grails-app/services/grails/plugin/awssdk/s3/AmazonS3Service.groovy

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,6 @@ import com.amazonaws.services.s3.model.*
1111
import com.amazonaws.services.s3.transfer.TransferManager
1212
import com.amazonaws.services.s3.transfer.Upload
1313
import grails.core.GrailsApplication
14-
import groovy.transform.stc.ClosureParams
15-
import groovy.transform.stc.SimpleType
1614
import groovy.util.logging.Slf4j
1715
import org.apache.commons.codec.digest.DigestUtils
1816
import org.springframework.beans.factory.InitializingBean

grails-aws-sdk-sns/grails-app/services/grails/plugin/awssdk/sns/AmazonSNSService.groovy

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ class AmazonSNSService implements InitializingBean {
3232

3333
// Create client
3434
client = AmazonSNSClientBuilder.standard()
35-
.withRegion(region)
35+
.withRegion(region.name)
3636
.withCredentials(AwsClientUtil.buildCredentials(config, serviceConfig))
3737
.withClientConfiguration(AwsClientUtil.buildClientConfiguration(config, serviceConfig))
3838
.build()

groovy-aws-sdk-s3/src/test/groovy/agorapulse/libs/awssdk/s3/S3TransmitSpec.groovy

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ class S3TransmitSpec extends Specification {
2121
def credentials = new BasicAWSCredentials(accessKey, secretKey)
2222
def clientConfiguration = AwsSdkUtils.clientConfigurationWithMap([:])
2323

24-
s3transmit.client = new AmazonS3Client(credentials, clientConfiguration).withRegion(RegionUtils.getRegion(regionName)) as AmazonS3Client
24+
s3transmit.client = new AmazonS3Client(credentials, clientConfiguration).withRegion(regionName) as AmazonS3Client
2525
def result = s3transmit.listBucketNames()
2626

2727
then:

groovy-aws-sdk-ses/src/main/groovy/com/agorapulse/awssdk/ses/AwsSesMailer.groovy

Lines changed: 14 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,15 @@ package com.agorapulse.awssdk.ses
33
import com.agorapulse.awssdk.AwsSdkUtils
44
import com.amazonaws.AmazonClientException
55
import com.amazonaws.AmazonServiceException
6+
import com.amazonaws.ClientConfiguration
7+
import com.amazonaws.auth.AWSCredentials
8+
import com.amazonaws.auth.AWSCredentialsProvider
69
import com.amazonaws.auth.BasicAWSCredentials
710
import com.amazonaws.regions.Region
811
import com.amazonaws.regions.RegionUtils
912
import com.amazonaws.services.simpleemail.AmazonSimpleEmailService
1013
import com.amazonaws.services.simpleemail.AmazonSimpleEmailServiceClient
14+
import com.amazonaws.services.simpleemail.AmazonSimpleEmailServiceClientBuilder
1115
import com.amazonaws.services.simpleemail.model.*
1216
import groovy.transform.CompileStatic
1317
import groovy.util.logging.Slf4j
@@ -35,9 +39,16 @@ class AwsSesMailer {
3539
log.error("${AmazonSimpleEmailService.ENDPOINT_PREFIX} is not supported in region $regionName")
3640
return
3741
}
38-
def credentials = new BasicAWSCredentials(accessKey, secretKey)
39-
def clientConfiguration = AwsSdkUtils.clientConfigurationWithMap([:])
40-
client = new AmazonSimpleEmailServiceClient(credentials, clientConfiguration).withRegion(region) as AmazonSimpleEmailServiceClient
42+
43+
ClientConfiguration clientConfiguration = AwsSdkUtils.clientConfigurationWithMap([:])
44+
client = AmazonSimpleEmailServiceClientBuilder.standard()
45+
.withCredentials(new AWSCredentialsProvider() {
46+
@Override AWSCredentials getCredentials() { return new BasicAWSCredentials(accessKey, secretKey) }
47+
48+
@Override void refresh() { }
49+
})
50+
.withClientConfiguration(clientConfiguration)
51+
.withRegion(region.name).build()
4152
}
4253

4354
/**

0 commit comments

Comments
 (0)