From 10787dedaf19e0c617bb5a8abd29c77fc4f79a3c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabiano=20Grac=CC=A7as?= Date: Fri, 7 Jan 2022 02:05:26 +0100 Subject: [PATCH] remove calls to deprecated functions. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Fabiano Graças --- clientlibrary/checkpoint/dynamodb-checkpointer.go | 4 ++-- clientlibrary/worker/worker.go | 4 ++-- test/record_publisher_test.go | 8 ++++---- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/clientlibrary/checkpoint/dynamodb-checkpointer.go b/clientlibrary/checkpoint/dynamodb-checkpointer.go index e5b5250..fe8f69c 100644 --- a/clientlibrary/checkpoint/dynamodb-checkpointer.go +++ b/clientlibrary/checkpoint/dynamodb-checkpointer.go @@ -90,7 +90,7 @@ func (checkpointer *DynamoCheckpoint) Init() error { checkpointer.log.Infof("Creating DynamoDB session") if checkpointer.svc == nil { - er := aws.EndpointResolverFunc(func(service, region string) (aws.Endpoint, error) { + resolver := aws.EndpointResolverWithOptionsFunc(func(service, region string, options ...interface{}) (aws.Endpoint, error) { if service == dynamodb.ServiceID && len(checkpointer.kclConfig.DynamoDBEndpoint) > 0 { return aws.Endpoint{ PartitionID: "aws", @@ -106,7 +106,7 @@ func (checkpointer *DynamoCheckpoint) Init() error { context.TODO(), awsConfig.WithRegion(checkpointer.kclConfig.RegionName), awsConfig.WithCredentialsProvider(checkpointer.kclConfig.DynamoDBCredentials), - awsConfig.WithEndpointResolver(er), + awsConfig.WithEndpointResolverWithOptions(resolver), awsConfig.WithRetryer(func() aws.Retryer { return retry.AddWithMaxBackoffDelay(retry.NewStandard(), retry.DefaultMaxBackoff) }), diff --git a/clientlibrary/worker/worker.go b/clientlibrary/worker/worker.go index e230d4a..2b54f0d 100644 --- a/clientlibrary/worker/worker.go +++ b/clientlibrary/worker/worker.go @@ -159,7 +159,7 @@ func (w *Worker) initialize() error { // create session for Kinesis log.Infof("Creating Kinesis client") - resolver := aws.EndpointResolverFunc(func(service, region string) (aws.Endpoint, error) { + resolver := aws.EndpointResolverWithOptionsFunc(func(service, region string, options ...interface{}) (aws.Endpoint, error) { return aws.Endpoint{ PartitionID: "aws", URL: w.kclConfig.KinesisEndpoint, @@ -171,7 +171,7 @@ func (w *Worker) initialize() error { context.TODO(), awsConfig.WithRegion(w.regionName), awsConfig.WithCredentialsProvider(w.kclConfig.KinesisCredentials), - awsConfig.WithEndpointResolver(resolver), + awsConfig.WithEndpointResolverWithOptions(resolver), awsConfig.WithRetryer(func() aws.Retryer { return retry.AddWithMaxBackoffDelay(retry.NewStandard(), retry.DefaultMaxBackoff) }), diff --git a/test/record_publisher_test.go b/test/record_publisher_test.go index 35e60d3..9e02ef3 100644 --- a/test/record_publisher_test.go +++ b/test/record_publisher_test.go @@ -45,7 +45,7 @@ func NewKinesisClient(t *testing.T, regionName, endpoint string, creds aws.Crede // create session for Kinesis t.Logf("Creating Kinesis client") - resolver := aws.EndpointResolverFunc(func(service, region string) (aws.Endpoint, error) { + resolver := aws.EndpointResolverWithOptionsFunc(func(service, region string, options ...interface{}) (aws.Endpoint, error) { return aws.Endpoint{ PartitionID: "aws", URL: endpoint, @@ -57,7 +57,7 @@ func NewKinesisClient(t *testing.T, regionName, endpoint string, creds aws.Crede context.TODO(), awsConfig.WithRegion(regionName), awsConfig.WithCredentialsProvider(creds), - awsConfig.WithEndpointResolver(resolver), + awsConfig.WithEndpointResolverWithOptions(resolver), awsConfig.WithRetryer(func() aws.Retryer { return retry.AddWithMaxBackoffDelay(retry.NewStandard(), retry.DefaultMaxBackoff) }), @@ -73,7 +73,7 @@ func NewKinesisClient(t *testing.T, regionName, endpoint string, creds aws.Crede // NewDynamoDBClient to create a Kinesis Client. func NewDynamoDBClient(t *testing.T, regionName, endpoint string, creds aws.CredentialsProvider) *dynamodb.Client { - resolver := aws.EndpointResolverFunc(func(service, region string) (aws.Endpoint, error) { + resolver := aws.EndpointResolverWithOptionsFunc(func(service, region string, options ...interface{}) (aws.Endpoint, error) { return aws.Endpoint{ PartitionID: "aws", URL: endpoint, @@ -85,7 +85,7 @@ func NewDynamoDBClient(t *testing.T, regionName, endpoint string, creds aws.Cred context.TODO(), awsConfig.WithRegion(regionName), awsConfig.WithCredentialsProvider(creds), - awsConfig.WithEndpointResolver(resolver), + awsConfig.WithEndpointResolverWithOptions(resolver), awsConfig.WithRetryer(func() aws.Retryer { return retry.AddWithMaxBackoffDelay(retry.NewStandard(), retry.DefaultMaxBackoff) }),