Merge branch 'master' of github.com:larrabee/s3sync

Author: larrabee

cli/cli.go

@@ -41,13 +41,15 @@ type connect struct {
 type args struct {
 	// Source config
 	Source         string `arg:"positional"`
+	SourceNoSign   bool   `arg:"--sn" help:"Don't sign request to source AWS for anonymous access"`
 	SourceKey      string `arg:"--sk" help:"Source AWS key"`
 	SourceSecret   string `arg:"--ss" help:"Source AWS session secret"`
 	SourceToken    string `arg:"--st" help:"Source AWS token"`
 	SourceRegion   string `arg:"--sr" help:"Source AWS Region"`
 	SourceEndpoint string `arg:"--se" help:"Source AWS Endpoint"`
 	// Target config
 	Target         string `arg:"positional"`
+	TargetNoSign   bool   `arg:"--tn" help:"Don't sign request to target AWS for anonymous access"`
 	TargetKey      string `arg:"--tk" help:"Target AWS key"`
 	TargetSecret   string `arg:"--ts" help:"Target AWS secret"`
 	TargetToken    string `arg:"--tt" help:"Target AWS session token"`

cli/setup.go

@@ -15,7 +15,7 @@ func setupStorages(ctx context.Context, syncGroup *pipeline.Group, cli *argsPars
 	var sourceStorage, targetStorage storage.Storage
 	switch cli.Source.Type {
 	case storage.TypeS3:
-		sourceStorage = s3.NewS3Storage(cli.SourceKey, cli.SourceSecret, cli.SourceToken, cli.SourceRegion, cli.SourceEndpoint,
+		sourceStorage = s3.NewS3Storage(cli.SourceNoSign, cli.SourceKey, cli.SourceSecret, cli.SourceToken, cli.SourceRegion, cli.SourceEndpoint,
 			cli.Source.Bucket, cli.Source.Path, cli.S3KeysPerReq, cli.S3Retry, cli.S3RetryInterval,
 		)
 	case storage.TypeFS:
@@ -24,7 +24,7 @@ func setupStorages(ctx context.Context, syncGroup *pipeline.Group, cli *argsPars
 
 	switch cli.Target.Type {
 	case storage.TypeS3:
-		targetStorage = s3.NewS3Storage(cli.TargetKey, cli.TargetSecret, cli.TargetToken, cli.TargetRegion, cli.TargetEndpoint,
+		targetStorage = s3.NewS3Storage(cli.TargetNoSign, cli.TargetKey, cli.TargetSecret, cli.TargetToken, cli.TargetRegion, cli.TargetEndpoint,
 			cli.Target.Bucket, cli.Target.Path, cli.S3KeysPerReq, cli.S3Retry, cli.S3RetryInterval,
 		)
 	case storage.TypeFS:

storage/s3/s3.go

@@ -33,15 +33,17 @@ type S3Storage struct {
 // NewS3Storage return new configured S3 storage.
 //
 // You should always create new storage with this constructor.
-func NewS3Storage(awsAccessKey, awsSecretKey, awsToken, awsRegion, endpoint, bucketName, prefix string, keysPerReq int64, retryCnt uint, retryDelay time.Duration) *S3Storage {
+func NewS3Storage(awsNoSign bool, awsAccessKey, awsSecretKey, awsToken, awsRegion, endpoint, bucketName, prefix string, keysPerReq int64, retryCnt uint, retryDelay time.Duration) *S3Storage {
 	sess := session.Must(session.NewSessionWithOptions(session.Options{
 		SharedConfigState: session.SharedConfigEnable,
 	}))
 	sess.Config.S3ForcePathStyle = aws.Bool(true)
 	sess.Config.Region = aws.String(awsRegion)
 	sess.Config.Retryer = &Retryer{RetryCnt: retryCnt, RetryDelay: retryDelay}
 
-	if awsAccessKey != "" || awsSecretKey != "" {
+	if awsNoSign {
+		sess.Config.Credentials = credentials.AnonymousCredentials
+	} else if awsAccessKey != "" || awsSecretKey != "" {
 		sess.Config.Credentials = credentials.NewStaticCredentials(awsAccessKey, awsSecretKey, awsToken)
 	} else if _, err := sess.Config.Credentials.Get(); err != nil {
 		storage.Log.Debugf("Failed to load credentials from default config")