Skip to content

Commit

Permalink
aws/all: BREAKING CHANGE Change the default for AWS URLs from V1 to V…
Browse files Browse the repository at this point in the history
…2. (#3465)
  • Loading branch information
vangent committed Aug 13, 2024
1 parent 526ff45 commit 56e722d
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 7 deletions.
9 changes: 4 additions & 5 deletions aws/aws.go
Original file line number Diff line number Diff line change
Expand Up @@ -148,15 +148,14 @@ func NewSessionFromURLParams(q url.Values) (*session.Session, url.Values, error)
//
// "awssdk=v1" will force V1.
// "awssdk=v2" will force V2.
// No "awssdk" parameter (or any other value) will return the default, currently V1.
// Note that the default may change in the future.
// No "awssdk" parameter (or any other value) will return the default, currently V2.
func UseV2(q url.Values) bool {
if values, ok := q["awssdk"]; ok {
if values[0] == "v2" || values[0] == "V2" {
return true
if values[0] == "v1" || values[0] == "V1" {
return false
}
}
return false
return true
}

// NewDefaultV2Config returns a aws.Config for AWS SDK v2, using the default options.
Expand Down
3 changes: 3 additions & 0 deletions aws/aws_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -108,14 +108,17 @@ func TestUseV2(t *testing.T) {
{
name: "No overrides",
query: url.Values{},
want: true,
},
{
name: "unused param",
query: url.Values{"foo": {"bar"}},
want: true,
},
{
name: "force v1",
query: url.Values{"awssdk": {"v1"}},
want: false,
},
{
name: "force v1 cap",
Expand Down
4 changes: 2 additions & 2 deletions blob/s3blob/s3blob_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -469,9 +469,9 @@ func TestOpenBucketFromURL(t *testing.T) {
// OK, setting region.
{"s3://mybucket?region=us-west1", false},
// OK, setting profile.
{"s3://mybucket?profile=main", false},
{"s3://mybucket?awssdk=v1&profile=main", false},
// OK, setting both profile and region.
{"s3://mybucket?profile=main&region=us-west-1", false},
{"s3://mybucket?awssdk=v1&profile=main&region=us-west-1", false},
// OK, use V2.
{"s3://mybucket?awssdk=v2", false},
// OK, use KMS Server Side Encryption
Expand Down

0 comments on commit 56e722d

Please sign in to comment.