Allow the use of region selflinks in provider configs. (#2156)

Merged PR #2156.
GoogleCloudPlatform · Aug 12, 2019 · ca5f20e · ca5f20e
1 parent 480803d
commit ca5f20e
Show file tree

Hide file tree

Showing 6 changed files with 28 additions and 3 deletions.
diff --git a/build/terraform b/build/terraform
diff --git a/build/terraform-beta b/build/terraform-beta
diff --git a/build/terraform-mapper b/build/terraform-mapper
diff --git a/third_party/terraform/utils/config.go.erb b/third_party/terraform/utils/config.go.erb
@@ -564,6 +564,7 @@ func (c *Config) LoadAndValidate() error {
 	c.clientHealthcare.BasePath = healthcareClientBasePath
 	<% end -%>
 
+	c.Region = GetRegionFromRegionSelfLink(c.Region)
 	return nil
 }
 

diff --git a/third_party/terraform/utils/self_link_helpers.go b/third_party/terraform/utils/self_link_helpers.go
@@ -145,3 +145,15 @@ func GetLocationalResourcePropertiesFromSelfLinkString(selfLink string) (string,
 	s := strings.Split(parsed.Path, "/")
 	return s[4], s[6], s[8], nil
 }
+
+// return the region a selfLink is referring to
+func GetRegionFromRegionSelfLink(selfLink string) string {
+	re := regexp.MustCompile("/compute/[a-zA-Z0-9]*/projects/[a-zA-Z0-9-]*/regions/([a-zA-Z0-9-]*)")
+	switch {
+	case re.MatchString(selfLink):
+		if res := re.FindStringSubmatch(selfLink); len(res) == 2 && res[1] != "" {
+			return res[1]
+		}
+	}
+	return selfLink
+}
diff --git a/third_party/terraform/utils/self_link_helpers_test.go b/third_party/terraform/utils/self_link_helpers_test.go
@@ -110,3 +110,15 @@ func TestSelfLinkNameHash(t *testing.T) {
 		}
 	}
 }
+
+func TestGetRegionFromRegionSelfLink(t *testing.T) {
+	cases := map[string]string{
+		"https://www.googleapis.com/compute/v1/projects/test/regions/europe-west3": "europe-west3",
+		"europe-west3": "europe-west3",
+	}
+	for input, expected := range cases {
+		if result := GetRegionFromRegionSelfLink(input); result != expected {
+			t.Errorf("expected to get %q from %q, got %q", expected, input, result)
+		}
+	}
+}