kubernetes
/
kops
mirror of https://github.com/kubernetes/kops.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Use SDK's built-in resolver for S3Path.GetHTTPsUrl

This commit is contained in:
Peter Rifel 2025-01-07 23:10:40 -06:00
parent 7663a76e85
commit e632f18644
No known key found for this signature in database
1 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
util/pkg/vfs/s3fs.go
View File

@ -572,13 +572,18 @@ func (p *S3Path) GetHTTPsUrl(dualstack bool) (string, error) {
return "", fmt.Errorf("failed to get bucket details for %q: %w", p.String(), err)
}
var url string
if dualstack {
url = fmt.Sprintf("https://s3.dualstack.%s.amazonaws.com/%s/%s", bucketDetails.region, bucketDetails.name, p.Key())
} else {
url = fmt.Sprintf("https://%s.s3.%s.amazonaws.com/%s", bucketDetails.name, bucketDetails.region, p.Key())
resolver := s3.NewDefaultEndpointResolverV2()
endpoint, err := resolver.ResolveEndpoint(ctx, s3.EndpointParameters{
Bucket: aws.String(bucketDetails.name),
Region: aws.String(bucketDetails.region),
UseDualStack: aws.Bool(dualstack),
})
if err != nil {
return "", fmt.Errorf("failed to resolve endpoint for %q: %w", p.String(), err)
}
return strings.TrimSuffix(url, "/"), nil
endpoint.URI.Path = path.Join(endpoint.URI.Path, p.Key())
return endpoint.URI.String(), nil
}
func (p *S3Path) IsBucketPublic(ctx context.Context) (bool, error) {