Merge pull request #2117 from JordanP/patch-1

pkg/common/utils.go: update regionalLocationFmt for Europe with 10+ regions

Author: k8s-ci-robot

pkg/common/utils.go

@@ -71,7 +71,7 @@ const (
 	// Example: us
 	multiRegionalLocationFmt = "^[a-z]+$"
 	// Example: us-east1
-	regionalLocationFmt = "^[a-z]+-[a-z]+[0-9]$"
+	regionalLocationFmt = "^[a-z]+-[a-z]+[0-9]{1,2}$"
 
 	// Full or partial URL of the machine type resource, in the format:
 	//   zones/zone/machineTypes/machine-type

pkg/common/utils_test.go

@@ -804,10 +804,16 @@ func TestSnapshotStorageLocations(t *testing.T) {
 			[]string{"us-east1"},
 			false,
 		},
+		{
+			"valid region in large continent",
+			"europe-west12",
+			[]string{"europe-west12"},
+			false,
+		},
 		{
 			// Zones are not valid bucket/snapshot locations.
 			"single zone",
-			"us-east1a",
+			"us-east1-a",
 			[]string{},
 			true,
 		},