Merge pull request #418 from dmage/force-path-style

Bug 1784208: force path style for custom endpoints

pkg/storage/s3/s3.go

@@ -118,18 +118,22 @@ func (d *driver) getS3Service() (*s3.S3, error) {
 
 	// A custom HTTPClient is used here since the default HTTPClients ProxyFromEnvironment
 	// uses a cache which won't let us update the proxy env vars
-	sess, err := session.NewSession(&aws.Config{
+	awsConfig := &aws.Config{
 		Credentials: credentials.NewStaticCredentials(cfg.AccessKey, cfg.SecretKey, ""),
 		Region:      &d.Config.Region,
-		Endpoint:    &d.Config.RegionEndpoint,
 		HTTPClient: &http.Client{
 			Transport: &http.Transport{
 				Proxy: func(req *http.Request) (*url.URL, error) {
 					return httpproxy.FromEnvironment().ProxyFunc()(req.URL)
 				},
 			},
 		},
-	})
+	}
+	if d.Config.RegionEndpoint != "" {
+		awsConfig.WithS3ForcePathStyle(true)
+		awsConfig.WithEndpoint(d.Config.RegionEndpoint)
+	}
+	sess, err := session.NewSession(awsConfig)
 	if err != nil {
 		return nil, err
 	}