From e4d46ce66c0d03f648b8cce4ac90930b9458ec5f Mon Sep 17 00:00:00 2001 From: Kashiwa <13825170+ksw2000@users.noreply.github.com> Date: Thu, 9 Jan 2025 13:05:33 +0000 Subject: [PATCH] fix: add missing file from previous commit 386b6f43 --- dynamodb/dynamodb.go | 18 +++--------------- 1 file changed, 3 insertions(+), 15 deletions(-) diff --git a/dynamodb/dynamodb.go b/dynamodb/dynamodb.go index b87a4888..25e9e57a 100644 --- a/dynamodb/dynamodb.go +++ b/dynamodb/dynamodb.go @@ -44,7 +44,9 @@ func New(config Config) *Storage { } // Create db - sess := awsdynamodb.NewFromConfig(awscfg) + sess := awsdynamodb.NewFromConfig(awscfg, func(o *awsdynamodb.Options) { + o.BaseEndpoint = aws.String(cfg.Endpoint) + }) timeoutCtx, cancel := context.WithTimeout(context.Background(), 5*time.Second) defer cancel() @@ -232,23 +234,10 @@ func (s *Storage) requestContext() (context.Context, context.CancelFunc) { } func returnAWSConfig(cfg Config) (aws.Config, error) { - endpoint := aws.EndpointResolverWithOptionsFunc(func(service, region string, options ...interface{}) (aws.Endpoint, error) { - if cfg.Endpoint != "" { - return aws.Endpoint{ - PartitionID: "aws", - URL: cfg.Endpoint, - SigningRegion: cfg.Region, - HostnameImmutable: true, - }, nil - } - return aws.Endpoint{}, &aws.EndpointNotFoundError{} - }) - if cfg.Credentials != (Credentials{}) { credentials := credentials.NewStaticCredentialsProvider(cfg.Credentials.AccessKey, cfg.Credentials.SecretAccessKey, "") return awsconfig.LoadDefaultConfig(context.TODO(), awsconfig.WithRegion(cfg.Region), - awsconfig.WithEndpointResolverWithOptions(endpoint), awsconfig.WithCredentialsProvider(credentials), awsconfig.WithRetryer(func() aws.Retryer { return retry.AddWithMaxAttempts(retry.NewStandard(), cfg.MaxAttempts) @@ -258,7 +247,6 @@ func returnAWSConfig(cfg Config) (aws.Config, error) { return awsconfig.LoadDefaultConfig(context.TODO(), awsconfig.WithRegion(cfg.Region), - awsconfig.WithEndpointResolverWithOptions(endpoint), awsconfig.WithRetryer(func() aws.Retryer { return retry.AddWithMaxAttempts(retry.NewStandard(), cfg.MaxAttempts) }),