Skip to content
This repository was archived by the owner on Jul 28, 2023. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
version=2.4.2
version=2.4.3
awsJavaSdkVersion=1.11.592
awsKinesisClientVersion=1.10.0
gradleWrapperVersion=5.5.1
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ abstract class AbstractCognitoAuthService implements GrailsApplicationAware {
init() {
client = AmazonCognitoIdentityClient.builder()
.withCredentials(AwsClientUtil.buildCredentials(config, cognitoConfig))
.withRegion(AwsClientUtil.buildRegion(config, cognitoConfig))
.withRegion(AwsClientUtil.buildRegion(config, cognitoConfig).name)
.build()
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,6 @@ import com.amazonaws.services.s3.model.*
import com.amazonaws.services.s3.transfer.TransferManager
import com.amazonaws.services.s3.transfer.Upload
import grails.core.GrailsApplication
import groovy.transform.stc.ClosureParams
import groovy.transform.stc.SimpleType
import groovy.util.logging.Slf4j
import org.apache.commons.codec.digest.DigestUtils
import org.springframework.beans.factory.InitializingBean
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ class AmazonSNSService implements InitializingBean {

// Create client
client = AmazonSNSClientBuilder.standard()
.withRegion(region)
.withRegion(region.name)
.withCredentials(AwsClientUtil.buildCredentials(config, serviceConfig))
.withClientConfiguration(AwsClientUtil.buildClientConfiguration(config, serviceConfig))
.build()
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ class S3TransmitSpec extends Specification {
def credentials = new BasicAWSCredentials(accessKey, secretKey)
def clientConfiguration = AwsSdkUtils.clientConfigurationWithMap([:])

s3transmit.client = new AmazonS3Client(credentials, clientConfiguration).withRegion(RegionUtils.getRegion(regionName)) as AmazonS3Client
s3transmit.client = new AmazonS3Client(credentials, clientConfiguration).withRegion(regionName) as AmazonS3Client
def result = s3transmit.listBucketNames()

then:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,15 @@ package com.agorapulse.awssdk.ses
import com.agorapulse.awssdk.AwsSdkUtils
import com.amazonaws.AmazonClientException
import com.amazonaws.AmazonServiceException
import com.amazonaws.ClientConfiguration
import com.amazonaws.auth.AWSCredentials
import com.amazonaws.auth.AWSCredentialsProvider
import com.amazonaws.auth.BasicAWSCredentials
import com.amazonaws.regions.Region
import com.amazonaws.regions.RegionUtils
import com.amazonaws.services.simpleemail.AmazonSimpleEmailService
import com.amazonaws.services.simpleemail.AmazonSimpleEmailServiceClient
import com.amazonaws.services.simpleemail.AmazonSimpleEmailServiceClientBuilder
import com.amazonaws.services.simpleemail.model.*
import groovy.transform.CompileStatic
import groovy.util.logging.Slf4j
Expand Down Expand Up @@ -35,9 +39,16 @@ class AwsSesMailer {
log.error("${AmazonSimpleEmailService.ENDPOINT_PREFIX} is not supported in region $regionName")
return
}
def credentials = new BasicAWSCredentials(accessKey, secretKey)
def clientConfiguration = AwsSdkUtils.clientConfigurationWithMap([:])
client = new AmazonSimpleEmailServiceClient(credentials, clientConfiguration).withRegion(region) as AmazonSimpleEmailServiceClient

ClientConfiguration clientConfiguration = AwsSdkUtils.clientConfigurationWithMap([:])
client = AmazonSimpleEmailServiceClientBuilder.standard()
.withCredentials(new AWSCredentialsProvider() {
@Override AWSCredentials getCredentials() { return new BasicAWSCredentials(accessKey, secretKey) }

@Override void refresh() { }
})
.withClientConfiguration(clientConfiguration)
.withRegion(region.name).build()
}

/**
Expand Down