GetProjectFromRegionalSelfLink: Accept projects with a colon in the n…

…ame (#12628) Signed-off-by: Norbert Kamiński <[email protected]> [upstream:f5e373575e0c43293f7f4a2402e90bc960c5d03b] Signed-off-by: Modular Magician <[email protected]>
hashicorp · Dec 26, 2024 · c4b3d84 · c4b3d84
1 parent 9c9f5b7
commit c4b3d84
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 3 deletions.
diff --git a/.changelog/12628.txt b/.changelog/12628.txt
@@ -0,0 +1,3 @@
+```release-note:bug
+compute: GetProjectFromRegionalSelfLink accepts projects with a colon in the name
+```
diff --git a/google/tpgresource/self_link_helpers.go b/google/tpgresource/self_link_helpers.go
@@ -174,7 +174,7 @@ func GetRegionFromRegionalSelfLink(selfLink string) string {
 }
 
 func GetProjectFromRegionalSelfLink(selfLink string) string {
-	re := regexp.MustCompile("projects/([a-zA-Z0-9-]*)/(?:locations|regions)/[a-zA-Z0-9-]*")
+	re := regexp.MustCompile("projects/([a-zA-Z0-9-:]*)/(?:locations|regions)/[a-zA-Z0-9-:]*")
 	switch {
 	case re.MatchString(selfLink):
 		if res := re.FindStringSubmatch(selfLink); len(res) == 2 && res[1] != "" {

diff --git a/google/tpgresource/self_link_helpers_test.go b/google/tpgresource/self_link_helpers_test.go
@@ -127,8 +127,9 @@ func TestGetRegionFromRegionalSelfLink(t *testing.T) {
 
 func TestGetProjectFromRegionalSelfLink(t *testing.T) {
 	cases := map[string]string{
-		"projects/foo/locations/europe-north1/datasets/bar/operations/foobar":        "foo",
-		"projects/REDACTED/regions/europe-north1/subnetworks/tf-test-net-xbwhsmlfm8": "REDACTED",
+		"projects/foo/locations/europe-north1/datasets/bar/operations/foobar":            "foo",
+		"projects/REDACTED/regions/europe-north1/subnetworks/tf-test-net-xbwhsmlfm8":     "REDACTED",
+		"projects/REDA:CT-ED09/regions/europe-north1/subnetworks/tf-test-net-xbwhsmlfm8": "REDA:CT-ED09",
 	}
 	for input, expected := range cases {
 		if result := GetProjectFromRegionalSelfLink(input); result != expected {