Always pick us-east-1 for the "aws" partition (#8679)

* always pick us-east-1 for aws partition * Update builtin/credential/aws/backend.go Co-Authored-By: Jim Kalafut <[email protected]> Co-authored-by: Jim Kalafut <[email protected]>
hashicorp · Apr 3, 2020 · d0f7531 · d0f7531
1 parent 9c50767
commit d0f7531
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 1 deletion.
diff --git a/builtin/credential/aws/backend.go b/builtin/credential/aws/backend.go
@@ -307,8 +307,13 @@ func generatePartitionToRegionMap() map[string]*endpoints.Region {
 	partitions := resolver.(endpoints.EnumPartitions).Partitions()
 
 	for _, p := range partitions {
-		// Choose a single region randomly from the partition
+		// For most partitions, it's fine to choose a single region randomly.
+		// However, for the "aws" partition, it's best to choose "us-east-1"
+		// because it is always enabled (and enabled for STS) by default.
 		for _, r := range p.Regions() {
+			if p.ID() == "aws" && r.ID() != "us-east-1" {
+				continue
+			}
 			partitionToRegion[p.ID()] = &r
 			break
 		}

diff --git a/builtin/credential/aws/backend_test.go b/builtin/credential/aws/backend_test.go
@@ -1813,3 +1813,10 @@ func generateRenewRequest(s logical.Storage, auth *logical.Auth) *logical.Reques
 
 	return renewReq
 }
+
+func TestGeneratePartitionToRegionMap(t *testing.T) {
+	m := generatePartitionToRegionMap()
+	if m["aws"].ID() != "us-east-1" {
+		t.Fatal("expected us-east-1 but received " + m["aws"].ID())
+	}
+}