@@ -8,30 +8,30 @@ import (
88 "sync"
99 "time"
1010
11- "github.com/aws/aws-sdk-go/aws"
12- "github.com/aws/aws-sdk-go/aws/credentials"
13- "github.com/aws/aws-sdk-go/aws/session"
14- "github.com/aws/aws-sdk-go/service/s3"
11+ "github.com/aws/aws-sdk-go-v2/aws"
12+ "github.com/aws/aws-sdk-go-v2/config"
13+ "github.com/aws/aws-sdk-go-v2/credentials"
14+ "github.com/aws/aws-sdk-go-v2/service/s3"
15+ "github.com/aws/aws-sdk-go-v2/service/s3/types"
1516)
1617
1718// Service is simple abstraction layer to work with a S3-compatible storage service
1819type Service struct {
19- Client * s3.S3
20+ Client * s3.Client
2021 urler ObjectURLer
2122}
2223
2324// NewService creates a new S3 service with the given credentials and configuration
2425func NewService (accessKey , secretKey , region , endpoint string , minio bool ) (* Service , error ) {
25- cfg := & aws.Config {
26- Region : aws .String (region ),
27- Endpoint : aws .String (endpoint ),
28- S3ForcePathStyle : aws .Bool (minio ), // urls as endpoint/bucket/key instead of bucket.endpoint/key
29- MaxRetries : aws .Int (3 ),
30- }
31- if accessKey != "" || secretKey != "" {
32- cfg .Credentials = credentials .NewStaticCredentials (accessKey , secretKey , "" )
26+ opts := []func (* config.LoadOptions ) error {config .WithRegion (region )}
27+
28+ if accessKey != "" && secretKey != "" {
29+ opts = append (opts , config .WithCredentialsProvider (credentials.StaticCredentialsProvider {Value : aws.Credentials {
30+ AccessKeyID : accessKey , SecretAccessKey : secretKey ,
31+ }}))
3332 }
34- s , err := session .NewSession (cfg )
33+
34+ cfg , err := config .LoadDefaultConfig (context .TODO (), opts ... )
3535 if err != nil {
3636 return nil , err
3737 }
@@ -43,7 +43,15 @@ func NewService(accessKey, secretKey, region, endpoint string, minio bool) (*Ser
4343 urler = AWSURLer (region )
4444 }
4545
46- return & Service {Client : s3 .New (s ), urler : urler }, nil
46+ client := s3 .NewFromConfig (cfg , func (o * s3.Options ) {
47+ o .UsePathStyle = minio // urls as endpoint/bucket/key instead of bucket.endpoint/key
48+
49+ if endpoint != "" {
50+ o .BaseEndpoint = aws .String (endpoint )
51+ }
52+ })
53+
54+ return & Service {Client : client , urler : urler }, nil
4755}
4856
4957// ObjectURL returns the publicly accessible URL for the given object
@@ -53,13 +61,13 @@ func (s *Service) ObjectURL(bucket, key string) string {
5361
5462// Test is a convenience method to HEAD a bucket to test if it exists and we can access it
5563func (s * Service ) Test (ctx context.Context , bucket string ) error {
56- _ , err := s .Client .HeadBucket (& s3.HeadBucketInput {Bucket : aws .String (bucket )})
64+ _ , err := s .Client .HeadBucket (ctx , & s3.HeadBucketInput {Bucket : aws .String (bucket )})
5765 return err
5866}
5967
6068// GetObject is a convenience method to get an object from S3 and read its contents into a byte slice
6169func (s * Service ) GetObject (ctx context.Context , bucket , key string ) (string , []byte , error ) {
62- out , err := s .Client .GetObjectWithContext (ctx , & s3.GetObjectInput {
70+ out , err := s .Client .GetObject (ctx , & s3.GetObjectInput {
6371 Bucket : aws .String (bucket ),
6472 Key : aws .String (key ),
6573 })
@@ -72,17 +80,17 @@ func (s *Service) GetObject(ctx context.Context, bucket, key string) (string, []
7280 return "" , nil , fmt .Errorf ("error reading S3 object: %w" , err )
7381 }
7482
75- return aws .StringValue (out .ContentType ), body , nil
83+ return aws .ToString (out .ContentType ), body , nil
7684}
7785
7886// PutObject is a convenience method to put the given object and return its publicly accessible URL
79- func (s * Service ) PutObject (ctx context.Context , bucket , key string , contentType string , body []byte , acl string ) (string , error ) {
80- _ , err := s .Client .PutObjectWithContext (ctx , & s3.PutObjectInput {
87+ func (s * Service ) PutObject (ctx context.Context , bucket , key string , contentType string , body []byte , acl types. ObjectCannedACL ) (string , error ) {
88+ _ , err := s .Client .PutObject (ctx , & s3.PutObjectInput {
8189 Bucket : aws .String (bucket ),
8290 Body : bytes .NewReader (body ),
8391 Key : aws .String (key ),
8492 ContentType : aws .String (contentType ),
85- ACL : aws . String ( acl ) ,
93+ ACL : acl ,
8694 })
8795 if err != nil {
8896 return "" , fmt .Errorf ("error putting S3 object: %w" , err )
@@ -96,7 +104,7 @@ type Upload struct {
96104 Key string
97105 ContentType string
98106 Body []byte
99- ACL string
107+ ACL types. ObjectCannedACL
100108
101109 // set by BatchPut
102110 URL string
@@ -154,12 +162,12 @@ func (s *Service) batchWorker(ctx context.Context, uploads chan *Upload, errors
154162 uctx , cancel := context .WithTimeout (ctx , time .Second * 15 )
155163 defer cancel ()
156164
157- _ , err = s .Client .PutObjectWithContext (uctx , & s3.PutObjectInput {
165+ _ , err = s .Client .PutObject (uctx , & s3.PutObjectInput {
158166 Bucket : aws .String (u .Bucket ),
159167 Body : bytes .NewReader (u .Body ),
160168 Key : aws .String (u .Key ),
161169 ContentType : aws .String (u .ContentType ),
162- ACL : aws . String ( u .ACL ) ,
170+ ACL : u .ACL ,
163171 })
164172
165173 if err == nil {
@@ -186,27 +194,27 @@ func (s *Service) EmptyBucket(ctx context.Context, bucket string) error {
186194 request := & s3.ListObjectsV2Input {Bucket : aws .String (bucket )}
187195
188196 for {
189- response , err := s .Client .ListObjectsV2WithContext (ctx , request )
197+ response , err := s .Client .ListObjectsV2 (ctx , request )
190198 if err != nil {
191199 return fmt .Errorf ("error listing S3 objects: %w" , err )
192200 }
193201
194202 if len (response .Contents ) > 0 {
195- del := & s3 .Delete {}
203+ del := & types .Delete {}
196204
197205 for _ , obj := range response .Contents {
198- del .Objects = append (del .Objects , & s3 .ObjectIdentifier {Key : obj .Key })
206+ del .Objects = append (del .Objects , types .ObjectIdentifier {Key : obj .Key })
199207 }
200208
201- _ , err = s .Client .DeleteObjectsWithContext (ctx , & s3.DeleteObjectsInput {Bucket : aws .String (bucket ), Delete : del })
209+ _ , err = s .Client .DeleteObjects (ctx , & s3.DeleteObjectsInput {Bucket : aws .String (bucket ), Delete : del })
202210 if err != nil {
203211 return fmt .Errorf ("error deleting S3 objects: %w" , err )
204212 }
205213 }
206214
207215 request .ContinuationToken = response .NextContinuationToken
208216
209- if ! aws .BoolValue (response .IsTruncated ) {
217+ if ! aws .ToBool (response .IsTruncated ) {
210218 break
211219 }
212220 }
0 commit comments