From 8bf667ff05103d92a140fb007f9aaea57aa9a949 Mon Sep 17 00:00:00 2001 From: Robert van Gent Date: Tue, 13 Aug 2024 18:18:22 +0000 Subject: [PATCH] aws/all: Change the default for AWS URLs from V1 to V2. --- aws/aws.go | 9 ++++----- aws/aws_test.go | 3 +++ 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/aws/aws.go b/aws/aws.go index 55dc38644d..21d4ec5afa 100644 --- a/aws/aws.go +++ b/aws/aws.go @@ -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. diff --git a/aws/aws_test.go b/aws/aws_test.go index 3a3d602d5a..5d04dae75d 100644 --- a/aws/aws_test.go +++ b/aws/aws_test.go @@ -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",