highperfocused/imgproxy
1
0
Fork 0
mirror of https://github.com/imgproxy/imgproxy.git synced 2025-10-04 18:33:36 +02:00
Code Issues Packages Projects Releases Wiki Activity

Add IMGPROXY_S3_ENDPOINT_USE_PATH_STYLE control UsePathStyle (#1314)

Browse Source
This commit is contained in:
Xie Wu
2024-08-29 21:24:54 +08:00
committed by GitHub
parent dc6acc78c3
commit 43af46b48b
2 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
config/config.go
View File

@@ -107,6 +107,7 @@ var (
S3Enabled bool S3Enabled bool
S3Region string S3Region string
S3Endpoint string S3Endpoint string
S3EndpointUsePathStyle bool
S3AssumeRoleArn string S3AssumeRoleArn string
S3AssumeRoleExternalID string S3AssumeRoleExternalID string
S3MultiRegion bool S3MultiRegion bool
@@ -308,6 +309,7 @@ func Reset() {
S3Enabled = false S3Enabled = false
S3Region = "" S3Region = ""
S3Endpoint = "" S3Endpoint = ""
S3EndpointUsePathStyle = true
S3AssumeRoleArn = "" S3AssumeRoleArn = ""
S3AssumeRoleExternalID = "" S3AssumeRoleExternalID = ""
S3MultiRegion = false S3MultiRegion = false
@@ -539,6 +541,7 @@ func Configure() error {
configurators.Bool(&S3Enabled, "IMGPROXY_USE_S3") configurators.Bool(&S3Enabled, "IMGPROXY_USE_S3")
configurators.String(&S3Region, "IMGPROXY_S3_REGION") configurators.String(&S3Region, "IMGPROXY_S3_REGION")
configurators.String(&S3Endpoint, "IMGPROXY_S3_ENDPOINT") configurators.String(&S3Endpoint, "IMGPROXY_S3_ENDPOINT")
configurators.Bool(&S3EndpointUsePathStyle, "IMGPROXY_S3_ENDPOINT_USE_PATH_STYLE")
configurators.String(&S3AssumeRoleArn, "IMGPROXY_S3_ASSUME_ROLE_ARN") configurators.String(&S3AssumeRoleArn, "IMGPROXY_S3_ASSUME_ROLE_ARN")
configurators.String(&S3AssumeRoleExternalID, "IMGPROXY_S3_ASSUME_ROLE_EXTERNAL_ID") configurators.String(&S3AssumeRoleExternalID, "IMGPROXY_S3_ASSUME_ROLE_EXTERNAL_ID")
configurators.Bool(&S3MultiRegion, "IMGPROXY_S3_MULTI_REGION") configurators.Bool(&S3MultiRegion, "IMGPROXY_S3_MULTI_REGION")

2
transport/s3/s3.go
View File

@@ -84,7 +84,7 @@ func New() (http.RoundTripper, error) {
} }
clientOptions = append(clientOptions, func(o *s3.Options) { clientOptions = append(clientOptions, func(o *s3.Options) {
o.BaseEndpoint = aws.String(endpoint) o.BaseEndpoint = aws.String(endpoint)
o.UsePathStyle = true o.UsePathStyle = config.S3EndpointUsePathStyle
}) })
} }