'AWSClient.S3ConnURICleaningDisabled' always creates a new S3 client.

kavan-aws · Jun 7, 2023 · 053922f · 053922f
1 parent 883dc8b
commit 053922f
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/internal/conns/awsclient.go b/internal/conns/awsclient.go
@@ -1,9 +1,11 @@
 package conns
 
 import (
+	"context"
 	"fmt"
 	"net/http"
 
+	"github.com/aws/aws-sdk-go/aws"
 	"github.com/aws/aws-sdk-go/aws/endpoints"
 	"github.com/aws/aws-sdk-go/service/apigatewayv2"
 	"github.com/aws/aws-sdk-go/service/s3"
@@ -23,8 +25,11 @@ func (client *AWSClient) RegionalHostname(prefix string) string {
 	return fmt.Sprintf("%s.%s.%s", prefix, client.Region, client.DNSSuffix)
 }
 
-func (client *AWSClient) S3ConnURICleaningDisabled() *s3.S3 {
-	return client.s3ConnURICleaningDisabled
+func (client *AWSClient) S3ConnURICleaningDisabled(context.Context) *s3.S3 {
+	config := client.S3Conn().Config
+	config.DisableRestProtocolURICleaning = aws.Bool(true)
+
+	return s3.New(client.Session.Copy(&config))
 }
 
 // SetHTTPClient sets the http.Client used for AWS API calls.

diff --git a/internal/conns/config.go b/internal/conns/config.go
@@ -218,9 +218,6 @@ func (c *Config) ConfigureProvider(ctx context.Context, client *AWSClient) (*AWS
 	}
 	client.s3Conn = s3.New(sess.Copy(s3Config))
 
-	s3Config.DisableRestProtocolURICleaning = aws.Bool(true)
-	client.s3ConnURICleaningDisabled = s3.New(sess.Copy(s3Config))
-
 	// "Global" services that require customizations.
 	globalAcceleratorConfig := &aws.Config{
 		Endpoint: aws.String(c.Endpoints[names.GlobalAccelerator]),