remove calls to deprecated functions.

Signed-off-by: Fabiano Graças <fabiano.gracas@faro.com>
This commit is contained in:
Fabiano Graças 2022-01-07 02:05:26 +01:00
parent 725fef3ab1
commit 10787dedaf
3 changed files with 8 additions and 8 deletions

View file

@ -90,7 +90,7 @@ func (checkpointer *DynamoCheckpoint) Init() error {
checkpointer.log.Infof("Creating DynamoDB session") checkpointer.log.Infof("Creating DynamoDB session")
if checkpointer.svc == nil { 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 { if service == dynamodb.ServiceID && len(checkpointer.kclConfig.DynamoDBEndpoint) > 0 {
return aws.Endpoint{ return aws.Endpoint{
PartitionID: "aws", PartitionID: "aws",
@ -106,7 +106,7 @@ func (checkpointer *DynamoCheckpoint) Init() error {
context.TODO(), context.TODO(),
awsConfig.WithRegion(checkpointer.kclConfig.RegionName), awsConfig.WithRegion(checkpointer.kclConfig.RegionName),
awsConfig.WithCredentialsProvider(checkpointer.kclConfig.DynamoDBCredentials), awsConfig.WithCredentialsProvider(checkpointer.kclConfig.DynamoDBCredentials),
awsConfig.WithEndpointResolver(er), awsConfig.WithEndpointResolverWithOptions(resolver),
awsConfig.WithRetryer(func() aws.Retryer { awsConfig.WithRetryer(func() aws.Retryer {
return retry.AddWithMaxBackoffDelay(retry.NewStandard(), retry.DefaultMaxBackoff) return retry.AddWithMaxBackoffDelay(retry.NewStandard(), retry.DefaultMaxBackoff)
}), }),

View file

@ -159,7 +159,7 @@ func (w *Worker) initialize() error {
// create session for Kinesis // create session for Kinesis
log.Infof("Creating Kinesis client") 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{ return aws.Endpoint{
PartitionID: "aws", PartitionID: "aws",
URL: w.kclConfig.KinesisEndpoint, URL: w.kclConfig.KinesisEndpoint,
@ -171,7 +171,7 @@ func (w *Worker) initialize() error {
context.TODO(), context.TODO(),
awsConfig.WithRegion(w.regionName), awsConfig.WithRegion(w.regionName),
awsConfig.WithCredentialsProvider(w.kclConfig.KinesisCredentials), awsConfig.WithCredentialsProvider(w.kclConfig.KinesisCredentials),
awsConfig.WithEndpointResolver(resolver), awsConfig.WithEndpointResolverWithOptions(resolver),
awsConfig.WithRetryer(func() aws.Retryer { awsConfig.WithRetryer(func() aws.Retryer {
return retry.AddWithMaxBackoffDelay(retry.NewStandard(), retry.DefaultMaxBackoff) return retry.AddWithMaxBackoffDelay(retry.NewStandard(), retry.DefaultMaxBackoff)
}), }),

View file

@ -45,7 +45,7 @@ func NewKinesisClient(t *testing.T, regionName, endpoint string, creds aws.Crede
// create session for Kinesis // create session for Kinesis
t.Logf("Creating Kinesis client") 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{ return aws.Endpoint{
PartitionID: "aws", PartitionID: "aws",
URL: endpoint, URL: endpoint,
@ -57,7 +57,7 @@ func NewKinesisClient(t *testing.T, regionName, endpoint string, creds aws.Crede
context.TODO(), context.TODO(),
awsConfig.WithRegion(regionName), awsConfig.WithRegion(regionName),
awsConfig.WithCredentialsProvider(creds), awsConfig.WithCredentialsProvider(creds),
awsConfig.WithEndpointResolver(resolver), awsConfig.WithEndpointResolverWithOptions(resolver),
awsConfig.WithRetryer(func() aws.Retryer { awsConfig.WithRetryer(func() aws.Retryer {
return retry.AddWithMaxBackoffDelay(retry.NewStandard(), retry.DefaultMaxBackoff) 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. // NewDynamoDBClient to create a Kinesis Client.
func NewDynamoDBClient(t *testing.T, regionName, endpoint string, creds aws.CredentialsProvider) *dynamodb.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{ return aws.Endpoint{
PartitionID: "aws", PartitionID: "aws",
URL: endpoint, URL: endpoint,
@ -85,7 +85,7 @@ func NewDynamoDBClient(t *testing.T, regionName, endpoint string, creds aws.Cred
context.TODO(), context.TODO(),
awsConfig.WithRegion(regionName), awsConfig.WithRegion(regionName),
awsConfig.WithCredentialsProvider(creds), awsConfig.WithCredentialsProvider(creds),
awsConfig.WithEndpointResolver(resolver), awsConfig.WithEndpointResolverWithOptions(resolver),
awsConfig.WithRetryer(func() aws.Retryer { awsConfig.WithRetryer(func() aws.Retryer {
return retry.AddWithMaxBackoffDelay(retry.NewStandard(), retry.DefaultMaxBackoff) return retry.AddWithMaxBackoffDelay(retry.NewStandard(), retry.DefaultMaxBackoff)
}), }),