Skip to content

Commit d84cd40

Browse files
committed
aws: Add support for non-camelcased version of two URL parameters.
1 parent 2cb18bb commit d84cd40

File tree

2 files changed

+14
-4
lines changed

2 files changed

+14
-4
lines changed

aws/aws.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -80,8 +80,8 @@ func (co ConfigOverrider) ClientConfig(serviceName string, cfgs ...*aws.Config)
8080
// The following query options are supported:
8181
// - region: The AWS region for requests; sets aws.Config.Region.
8282
// - endpoint: The endpoint URL (hostname only or fully qualified URI); sets aws.Config.Endpoint.
83-
// - disableSSL: A value of "true" disables SSL when sending requests; sets aws.Config.DisableSSL.
84-
// - s3ForcePathStyle: A value of "true" forces the request to use path-style addressing; sets aws.Config.S3ForcePathStyle.
83+
// - disable_ssl (or disableSSL): A value of "true" disables SSL when sending requests; sets aws.Config.DisableSSL.
84+
// - s3_force_path_style (or s3ForcePathStyle): A value of "true" forces the request to use path-style addressing; sets aws.Config.S3ForcePathStyle.
8585
// - dualstack: A value of "true" enables dual stack (IPv4 and IPv6) endpoints
8686
// - fips: A value of "true" enables the use of FIPS endpoints
8787
func ConfigFromURLParams(q url.Values) (*aws.Config, error) {
@@ -93,13 +93,13 @@ func ConfigFromURLParams(q url.Values) (*aws.Config, error) {
9393
cfg.Region = aws.String(value)
9494
case "endpoint":
9595
cfg.Endpoint = aws.String(value)
96-
case "disableSSL":
96+
case "disable_ssl", "disableSSL":
9797
b, err := strconv.ParseBool(value)
9898
if err != nil {
9999
return nil, fmt.Errorf("invalid value for query parameter %q: %v", param, err)
100100
}
101101
cfg.DisableSSL = aws.Bool(b)
102-
case "s3ForcePathStyle":
102+
case "s3_force_path_style", "s3ForcePathStyle":
103103
b, err := strconv.ParseBool(value)
104104
if err != nil {
105105
return nil, fmt.Errorf("invalid value for query parameter %q: %v", param, err)

aws/aws_test.go

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,11 @@ func TestConfigFromURLParams(t *testing.T) {
5353
query: url.Values{"endpoint": {"foo"}},
5454
wantCfg: &aws.Config{Endpoint: aws.String("foo")},
5555
},
56+
{
57+
name: "disable_ssl true",
58+
query: url.Values{"disable_ssl": {"true"}},
59+
wantCfg: &aws.Config{DisableSSL: aws.Bool(true)},
60+
},
5661
{
5762
name: "DisableSSL true",
5863
query: url.Values{"disableSSL": {"true"}},
@@ -68,6 +73,11 @@ func TestConfigFromURLParams(t *testing.T) {
6873
query: url.Values{"disableSSL": {"invalid"}},
6974
wantErr: true,
7075
},
76+
{
77+
name: "s3_force_path_style true",
78+
query: url.Values{"s3_force_path_style": {"true"}},
79+
wantCfg: &aws.Config{S3ForcePathStyle: aws.Bool(true)},
80+
},
7181
{
7282
name: "S3ForcePathStyle true",
7383
query: url.Values{"s3ForcePathStyle": {"true"}},

0 commit comments

Comments
 (0)