diff --git a/go.mod b/go.mod index 5d2f1b37ec..9dae77472d 100644 --- a/go.mod +++ b/go.mod @@ -18,6 +18,7 @@ require ( github.com/akamai/AkamaiOPEN-edgegrid-golang v1.2.2 github.com/aliyun/alibaba-cloud-sdk-go v1.61.1755 github.com/aws/aws-sdk-go v1.39.0 + github.com/aws/aws-sdk-go-v2 v1.19.0 github.com/aws/aws-sdk-go-v2/config v1.18.28 github.com/aws/aws-sdk-go-v2/service/s3 v1.37.0 github.com/cenkalti/backoff/v4 v4.2.1 @@ -91,7 +92,6 @@ require ( github.com/Azure/go-autorest/tracing v0.6.0 // indirect github.com/AzureAD/microsoft-authentication-library-for-go v1.0.0 // indirect github.com/andres-erbsen/clock v0.0.0-20160526145045-9e14626cd129 // indirect - github.com/aws/aws-sdk-go-v2 v1.19.0 // indirect github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.4.10 // indirect github.com/aws/aws-sdk-go-v2/credentials v1.13.27 // indirect github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.13.5 // indirect diff --git a/providers/http/s3/s3.go b/providers/http/s3/s3.go index a7c7ce17a3..0df63bf174 100644 --- a/providers/http/s3/s3.go +++ b/providers/http/s3/s3.go @@ -7,6 +7,7 @@ import ( "fmt" "strings" + "github.com/aws/aws-sdk-go-v2/aws" "github.com/aws/aws-sdk-go-v2/config" "github.com/aws/aws-sdk-go-v2/service/s3" "github.com/go-acme/lego/v4/challenge/http01" @@ -46,8 +47,8 @@ func (s *HTTPProvider) Present(domain, token, keyAuth string) error { params := &s3.PutObjectInput{ ACL: "public-read", - Bucket: pointer(s.bucket), - Key: pointer(strings.Trim(http01.ChallengePath(token), "/")), + Bucket: aws.String(s.bucket), + Key: aws.String(strings.Trim(http01.ChallengePath(token), "/")), Body: bytes.NewReader([]byte(keyAuth)), } @@ -63,8 +64,8 @@ func (s *HTTPProvider) CleanUp(domain, token, keyAuth string) error { ctx := context.Background() params := &s3.DeleteObjectInput{ - Bucket: pointer(s.bucket), - Key: pointer(strings.Trim(http01.ChallengePath(token), "/")), + Bucket: aws.String(s.bucket), + Key: aws.String(strings.Trim(http01.ChallengePath(token), "/")), } _, err := s.client.DeleteObject(ctx, params) @@ -74,5 +75,3 @@ func (s *HTTPProvider) CleanUp(domain, token, keyAuth string) error { return nil } - -func pointer[T string | int | int32 | int64](v T) *T { return &v }