1Panel-dev/1Panel
1
1
Fork 0
mirror of https://github.com/1Panel-dev/1Panel.git synced 2026-01-16 12:04:10 +08:00
Code Issues Projects Releases Packages Wiki Activity Actions

refactor: Simplify endpoint handling in S3 client initialization

Browse source
This commit is contained in:
HynoR 2025-11-18 12:18:43 +08:00
parent 68dd9d608f
commit d060edab23
2 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
agent/utils/cloud_storage/client/s3.go
View file

@ -46,8 +46,7 @@ func NewS3Client(vars map[string]interface{}) (*s3Client, error) {
client := s3.NewFromConfig(cfg, func(o *s3.Options) {
o.UsePathStyle = mode == "path"
if endpoint != "" {
base := normalizeEndpoint(endpoint)
o.BaseEndpoint = aws.String(base)
o.BaseEndpoint = aws.String(normalizeEndpoint(endpoint))
}
})

2
core/utils/cloud_storage/client/s3.go
View file

@ -44,7 +44,7 @@ func NewS3Client(vars map[string]interface{}) (*s3Client, error) {
client := s3.NewFromConfig(cfg, func(o *s3.Options) {
o.UsePathStyle = mode == "path"
if endpoint != "" {
o.EndpointResolver = s3.EndpointResolverFromURL(normalizeEndpoint(endpoint))
o.BaseEndpoint = aws.String(normalizeEndpoint(endpoint))
}
})
return &s3Client{scType: scType, bucket: bucket, client: client}, nil