Merge pull request #16657 from justinsb/export_s3_bucket_region

k8s-ci-robot · web-flow · commit aac8226daff1 · 2024-07-04T16:17:35.000-07:00
refactor: allow access to S3 bucket region
diff --git a/util/pkg/vfs/s3fs.go b/util/pkg/vfs/s3fs.go
@@ -77,6 +77,15 @@ func newS3Path(s3Context *S3Context, scheme string, bucket string, key string, s
 	}
 }
 
+func (p *S3Path) Region(ctx context.Context) (string, error) {
+	bucketDetails, err := p.getBucketDetails(ctx)
+	if err != nil {
+		return "", err
+	}
+
+	return bucketDetails.region, nil
+}
+
 func (p *S3Path) Path() string {
 	return p.scheme + "://" + p.bucket + "/" + p.key
 }

Original file line number	Diff line number	Diff line change
`@@ -77,6 +77,15 @@ func newS3Path(s3Context *S3Context, scheme string, bucket string, key string, s`
`77`	`77`	`}`
`78`	`78`	`}`
`79`	`79`
	`80`	`+func (p *S3Path) Region(ctx context.Context) (string, error) {`
	`81`	`+ bucketDetails, err := p.getBucketDetails(ctx)`
	`82`	`+ if err != nil {`
	`83`	`+ return "", err`
	`84`	`+ }`
	`85`	`+`
	`86`	`+ return bucketDetails.region, nil`
	`87`	`+}`
	`88`	`+`
`80`	`89`	`func (p *S3Path) Path() string {`
`81`	`90`	`return p.scheme + "://" + p.bucket + "/" + p.key`
`82`	`91`	`}`