patched nil pointer

adrianwit@gmail.com · adrianwit@gmail.com · commit 249b57fdbbfd · 2019-10-25T09:09:06.000-07:00
diff --git a/s3/storager.go b/s3/storager.go
@@ -78,6 +78,9 @@ func getAwsConfig(options []storage.Option) (config *aws.Config, err error) {
 	if config, err = filterAuthOption(options); err != nil {
 		return nil, err
 	}
+	if config == nil {
+		config = &aws.Config{}
+	}
 	region := &Region{}
 	if _, ok := option.Assign(options, &region); ok {
 		config.Region = &region.Name
@@ -105,7 +108,7 @@ func newStorager(ctx context.Context, baseURL string, options ...storage.Option)
 	}
 	output, err := result.S3.GetBucketLocation(&s3.GetBucketLocationInput{Bucket: &result.bucket})
 	if err == nil {
-		if output.LocationConstraint != nil && result.config != nil {
+		if output.LocationConstraint != nil  {
 			result.config.Region = output.LocationConstraint
 			result.S3 = s3.New(session.New(), result.config)
 		}

Original file line number	Diff line number	Diff line change
`@@ -78,6 +78,9 @@ func getAwsConfig(options []storage.Option) (config *aws.Config, err error) {`
`78`	`78`	`if config, err = filterAuthOption(options); err != nil {`
`79`	`79`	`return nil, err`
`80`	`80`	`}`
	`81`	`+ if config == nil {`
	`82`	`+ config = &aws.Config{}`
	`83`	`+ }`
`81`	`84`	`region := &Region{}`
`82`	`85`	`if _, ok := option.Assign(options, &region); ok {`
`83`	`86`	`config.Region = &region.Name`
`@@ -105,7 +108,7 @@ func newStorager(ctx context.Context, baseURL string, options ...storage.Option)`
`105`	`108`	`}`
`106`	`109`	`output, err := result.S3.GetBucketLocation(&s3.GetBucketLocationInput{Bucket: &result.bucket})`
`107`	`110`	`if err == nil {`
`108`		`- if output.LocationConstraint != nil && result.config != nil {`
	`111`	`+ if output.LocationConstraint != nil {`
`109`	`112`	`result.config.Region = output.LocationConstraint`
`110`	`113`	`result.S3 = s3.New(session.New(), result.config)`
`111`	`114`	`}`