add credential error handling

viant · Dec 17, 2021 · e971cda · e971cda
1 parent 0ae6809
commit e971cda
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 11 deletions.
diff --git a/s3/list.go b/s3/list.go
@@ -3,6 +3,7 @@ package s3
 import (
 	"context"
 	"github.com/aws/aws-sdk-go/aws"
+	"github.com/aws/aws-sdk-go/aws/credentials"
 	"github.com/aws/aws-sdk-go/service/s3"
 	"github.com/pkg/errors"
 	"github.com/viant/afs/file"
@@ -90,6 +91,9 @@ func (s *storager) list(ctx context.Context, parent string, result *[]os.FileInf
 		return (!page.HasReachedLimit()) && !lastPage
 	})
 	if err != nil {
+		if err == credentials.ErrNoValidProvidersFoundInChain {
+			s.initS3Client()
+		}
 		err = errors.Wrapf(err, "failed to list: s3://%v/%v", s.bucket, parent)
 	}
 	return files, folder, err

diff --git a/s3/open.go b/s3/open.go
@@ -4,6 +4,7 @@ import (
 	"bytes"
 	"context"
 	"fmt"
+	"github.com/aws/aws-sdk-go/aws/credentials"
 	"github.com/aws/aws-sdk-go/aws/session"
 	"github.com/aws/aws-sdk-go/service/s3"
 	"github.com/aws/aws-sdk-go/service/s3/s3manager"
@@ -61,6 +62,9 @@ func (s *storager) Open(ctx context.Context, location string, options ...storage
 	_, err = downloader.DownloadWithContext(ctx, writer, input)
 	data := writer.Bytes()
 	if err != nil {
+		if err == credentials.ErrNoValidProvidersFoundInChain {
+			s.initS3Client()
+		}
 		return nil, errors.Wrapf(err, "failed to download: s3://%v/%v", s.bucket, location)
 	}
 	return ioutil.NopCloser(bytes.NewReader(data)), nil

diff --git a/s3/storager.go b/s3/storager.go
@@ -116,20 +116,22 @@ func newStorager(ctx context.Context, baseURL string, options ...storage.Option)
 	if err != nil {
 		return nil, errors.Wrapf(err, "failed to get aws config")
 	}
+	result.initS3Client()
+	return result, nil
+}
 
-	if result.config != nil {
-		result.S3 = s3.New(session.New(), result.config)
+func (s *storager) initS3Client() {
+	if s.config != nil {
+		s.S3 = s3.New(session.New(), s.config)
 	} else {
-		result.S3 = s3.New(session.New())
+		s.S3 = s3.New(session.New())
 	}
-
-	if result.S3.Config.Region == nil || *result.S3.Config.Region == "" {
-		result.S3.Config.Region = &awsDefaultRegion
-		result.Config.Region = &awsDefaultRegion
-		result.S3 = s3.New(session.New(), result.config)
+	if s.S3.Config.Region == nil || *s.S3.Config.Region == "" {
+		s.S3.Config.Region = &awsDefaultRegion
+		s.Config.Region = &awsDefaultRegion
+		s.S3 = s3.New(session.New(), s.config)
 	}
-	result.adjustRegionIfNeeded()
-	return result, nil
+	s.adjustRegionIfNeeded()
 }
 
 func (s *storager) adjustRegionIfNeeded() {
@@ -148,6 +150,5 @@ func (s *storager) adjustRegionIfNeeded() {
 			s.config.Region = &awsDefaultRegion
 			s.S3 = s3.New(session.New(), s.config)
 		}
-
 	}
 }
diff --git a/s3/upload.go b/s3/upload.go
@@ -4,6 +4,7 @@ import (
 	"bytes"
 	"context"
 	"github.com/aws/aws-sdk-go/aws"
+	"github.com/aws/aws-sdk-go/aws/credentials"
 	"github.com/aws/aws-sdk-go/aws/session"
 	"github.com/aws/aws-sdk-go/service/s3"
 	"github.com/aws/aws-sdk-go/service/s3/s3manager"
@@ -90,6 +91,9 @@ func (s *storager) upload(ctx context.Context, destination string, mode os.FileM
 
 		_, err = s.PutObjectWithContext(ctx, input)
 		if err != nil {
+			if err == credentials.ErrNoValidProvidersFoundInChain {
+				s.initS3Client()
+			}
 			if strings.Contains(err.Error(), noSuchBucketMessage) {
 				if err = s.createBucket(ctx); err != nil {
 					return err