recover some deprecated func

aws · May 17, 2023 · 2168800 · 2168800
1 parent ceeb008
commit 2168800
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 15 deletions.
diff --git a/aws/config.go b/aws/config.go
@@ -597,6 +597,10 @@ func mergeInConfig(dst *Config, other *Config) {
 		dst.SleepDelay = other.SleepDelay
 	}
 
+	if other.DisableRestProtocolURICleaning != nil {
+		dst.DisableRestProtocolURICleaning = other.DisableRestProtocolURICleaning
+	}
+
 	if other.EnforceShouldRetryCheck != nil {
 		dst.EnforceShouldRetryCheck = other.EnforceShouldRetryCheck
 	}

diff --git a/aws/config_test.go b/aws/config_test.go
@@ -49,21 +49,22 @@ func TestCopyReturnsNewInstance(t *testing.T) {
 var mergeTestZeroValueConfig = Config{}
 
 var mergeTestConfig = Config{
-	Credentials:               testCredentials,
-	Endpoint:                  String("MergeTestEndpoint"),
-	Region:                    String("MERGE_TEST_AWS_REGION"),
-	DisableSSL:                Bool(true),
-	HTTPClient:                http.DefaultClient,
-	LogLevel:                  LogLevel(LogDebug),
-	Logger:                    NewDefaultLogger(),
-	MaxRetries:                Int(10),
-	DisableParamValidation:    Bool(true),
-	DisableComputeChecksums:   Bool(true),
-	DisableEndpointHostPrefix: Bool(true),
-	EnableEndpointDiscovery:   Bool(true),
-	EnforceShouldRetryCheck:   Bool(true),
-	S3ForcePathStyle:          Bool(true),
-	LowerCaseHeaderMaps:       Bool(true),
+	Credentials:                    testCredentials,
+	Endpoint:                       String("MergeTestEndpoint"),
+	Region:                         String("MERGE_TEST_AWS_REGION"),
+	DisableSSL:                     Bool(true),
+	HTTPClient:                     http.DefaultClient,
+	LogLevel:                       LogLevel(LogDebug),
+	Logger:                         NewDefaultLogger(),
+	MaxRetries:                     Int(10),
+	DisableParamValidation:         Bool(true),
+	DisableComputeChecksums:        Bool(true),
+	DisableEndpointHostPrefix:      Bool(true),
+	EnableEndpointDiscovery:        Bool(true),
+	EnforceShouldRetryCheck:        Bool(true),
+	DisableRestProtocolURICleaning: Bool(true),
+	S3ForcePathStyle:               Bool(true),
+	LowerCaseHeaderMaps:            Bool(true),
 }
 
 var mergeTests = []struct {