vfs: Pass VFS scheme to S3 client

Signed-off-by: Ciprian Hacman <ciprian@hakman.dev>

Author: hakman

util/pkg/vfs/s3context.go

@@ -84,10 +84,11 @@ func (*ResolverV2) ResolveEndpoint(ctx context.Context, params s3.EndpointParame
 	return s3.NewDefaultEndpointResolverV2().ResolveEndpoint(ctx, params)
 }
 
-func (s *S3Context) getClient(ctx context.Context, region string) (*s3.Client, error) {
+func (s *S3Context) getClient(ctx context.Context, region string, scheme string) (*s3.Client, error) {
 	s.mutex.Lock()
 	defer s.mutex.Unlock()
 
+	// Client configuration is currently determined by region and process-wide environment.
 	s3Client := s.clients[region]
 	if s3Client == nil {
 		_, span := tracer.Start(ctx, "S3Context::getClient")
@@ -198,7 +199,7 @@ func (s *S3Context) getDetailsForBucket(ctx context.Context, bucket string) (*S3
 	}
 	var response *s3.GetBucketLocationOutput
 
-	s3Client, err := s.getClient(ctx, awsRegion)
+	s3Client, err := s.getClient(ctx, awsRegion, "s3")
 	if err != nil {
 		return bucketDetails, fmt.Errorf("error connecting to S3: %s", err)
 	}
@@ -235,7 +236,7 @@ func (s *S3Context) getDetailsForBucket(ctx context.Context, bucket string) (*S3
 	return bucketDetails, nil
 }
 
-func (b *S3BucketDetails) hasServerSideEncryptionByDefault(ctx context.Context) bool {
+func (b *S3BucketDetails) hasServerSideEncryptionByDefault(ctx context.Context, scheme string) bool {
 	b.mutex.Lock()
 	defer b.mutex.Unlock()
 
@@ -251,7 +252,7 @@ func (b *S3BucketDetails) hasServerSideEncryptionByDefault(ctx context.Context)
 	// We only make one attempt to find the SSE policy (even if there's an error)
 	b.applyServerSideEncryptionByDefault = &applyServerSideEncryptionByDefault
 
-	client, err := b.context.getClient(ctx, b.region)
+	client, err := b.context.getClient(ctx, b.region, scheme)
 	if err != nil {
 		klog.Warningf("Unable to read bucket encryption policy for %q in region %q: will encrypt using AES256", b.name, b.region)
 		return false

util/pkg/vfs/s3fs.go

@@ -282,7 +282,7 @@ func (p *S3Path) getServerSideEncryption(ctx context.Context) (sse types.ServerS
 		if err != nil {
 			return "", "", err
 		}
-		defaultEncryption := bucketDetails.hasServerSideEncryptionByDefault(ctx)
+		defaultEncryption := bucketDetails.hasServerSideEncryptionByDefault(ctx, p.scheme)
 		if defaultEncryption {
 			sseLog = "DefaultBucketEncryption"
 		} else {
@@ -529,7 +529,7 @@ func (p *S3Path) client(ctx context.Context) (*s3.Client, error) {
 		return nil, err
 	}
 
-	client, err := p.s3Context.getClient(ctx, bucketDetails.region)
+	client, err := p.s3Context.getClient(ctx, bucketDetails.region, p.scheme)
 	if err != nil {
 		return nil, err
 	}