object: enable vhost style via JFS_S3_VHOST_STYLE=1 (#4697)

juicedata · Apr 15, 2024 · 8ee5279 · 8ee5279
1 parent 70011ff
commit 8ee5279
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 7 deletions.
diff --git a/pkg/object/eos.go b/pkg/object/eos.go
@@ -77,7 +77,7 @@ func newEos(endpoint, accessKey, secretKey, token string) (ObjectStorage, error)
 		Endpoint:         &endpoint,
 		Region:           &region,
 		DisableSSL:       aws.Bool(!ssl),
-		S3ForcePathStyle: aws.Bool(true),
+		S3ForcePathStyle: aws.Bool(defaultPathStyle()),
 		HTTPClient:       httpClient,
 		Credentials:      credentials.NewStaticCredentials(accessKey, secretKey, token),
 	}

diff --git a/pkg/object/ibmcos.go b/pkg/object/ibmcos.go
@@ -314,7 +314,7 @@ func newIBMCOS(endpoint, apiKey, serviceInstanceID, token string) (ObjectStorage
 		WithEndpoint(serviceEndpoint).
 		WithCredentials(ibmiam.NewStaticCredentials(aws.NewConfig(),
 			authEndpoint, apiKey, serviceInstanceID)).
-		WithS3ForcePathStyle(true)
+		WithS3ForcePathStyle(defaultPathStyle())
 	sess := session.Must(session.NewSession())
 	client := s3.New(sess, conf)
 	return &ibmcos{bucket: bucket, s3: client}, nil

diff --git a/pkg/object/ks3.go b/pkg/object/ks3.go
@@ -343,7 +343,7 @@ func newKS3(endpoint, accessKey, secretKey, token string) (ObjectStorage, error)
 	bucket := hostParts[0]
 	region := hostParts[1][3:]
 	region = strings.TrimLeft(region, "-")
-	var pathStyle bool = true
+	var pathStyle bool = defaultPathStyle()
 	if strings.HasSuffix(uri.Host, "ksyun.com") || strings.HasSuffix(uri.Host, "ksyuncs.com") {
 		region = strings.TrimSuffix(region, "-internal")
 		region = ks3Regions[region]

diff --git a/pkg/object/minio.go b/pkg/object/minio.go
@@ -73,7 +73,7 @@ func newMinio(endpoint, accessKey, secretKey, token string) (ObjectStorage, erro
 		Region:           aws.String(region),
 		Endpoint:         &uri.Host,
 		DisableSSL:       aws.Bool(!ssl),
-		S3ForcePathStyle: aws.Bool(true),
+		S3ForcePathStyle: aws.Bool(defaultPathStyle()),
 		HTTPClient:       httpClient,
 	}
 	if accessKey == "" {

diff --git a/pkg/object/oos.go b/pkg/object/oos.go
@@ -76,13 +76,13 @@ func newOOS(endpoint, accessKey, secretKey, token string) (ObjectStorage, error)
 	bucket := hostParts[0]
 	region := hostParts[1][4:]
 	endpoint = uri.Host[len(bucket)+1:]
-	forcePathStyle := strings.Contains(strings.ToLower(endpoint), "xstore.ctyun.cn")
+	forcePathStyle := !strings.Contains(strings.ToLower(endpoint), "xstore.ctyun.cn")
 
 	awsConfig := &aws.Config{
 		Region:           &region,
 		Endpoint:         &endpoint,
 		DisableSSL:       aws.Bool(!ssl),
-		S3ForcePathStyle: aws.Bool(!forcePathStyle),
+		S3ForcePathStyle: aws.Bool(forcePathStyle),
 		HTTPClient:       httpClient,
 		Credentials:      credentials.NewStaticCredentials(accessKey, secretKey, token),
 	}

diff --git a/pkg/object/s3.go b/pkg/object/s3.go
@@ -432,6 +432,11 @@ func parseRegion(endpoint string) string {
 	return region
 }
 
+func defaultPathStyle() bool {
+	v := os.Getenv("JFS_S3_VHOST_STYLE")
+	return v == "" || v == "0" || v == "false"
+}
+
 var oracleCompileRegexp = `.*\.compat.objectstorage\.(.*)\.oraclecloud\.com`
 var OVHCompileRegexp = `^s3\.(\w*)(\.\w*)?\.cloud\.ovh\.net$`
 
@@ -554,7 +559,7 @@ func newS3(endpoint, accessKey, secretKey, token string) (ObjectStorage, error)
 	}
 	if ep != "" {
 		awsConfig.Endpoint = aws.String(ep)
-		awsConfig.S3ForcePathStyle = aws.Bool(true)
+		awsConfig.S3ForcePathStyle = aws.Bool(defaultPathStyle())
 	}
 
 	ses, err := session.NewSession(awsConfig)