Fix the bug when validating subnetwork project for compute instance (#13823) (#9913)

[upstream:62565ce9dcdb4d13344e26cc63ff2427183c6461]

Signed-off-by: Modular Magician <[email protected]>

Author: modular-magician

.changelog/13823.txt

@@ -0,0 +1,3 @@
+```release-note:bug
+compute: fixed the bug when validating the subnetwork project in `google_compute_instance` resource
+```

google-beta/services/compute/resource_compute_instance.go

@@ -139,8 +139,9 @@ func ValidateSubnetworkProjectFunc(d tpgresource.TerraformResourceDiff) error {
 			return nil
 		}
 
-		if tpgresource.GetProjectFromRegionalSelfLink(subnetwork.(string)) != subnetworkProject.(string) {
-			return fmt.Errorf("project in subnetwork's self_link %q must match subnetwork_project %q", subnetwork, subnetworkProject)
+		project := tpgresource.GetProjectFromRegionalSelfLink(subnetwork.(string))
+		if project != subnetworkProject.(string) {
+			return fmt.Errorf("project %s in subnetwork's self_link %q must match subnetwork_project %q", project, subnetwork, subnetworkProject)
 		}
 	}
 	return nil

google-beta/tpgresource/self_link_helpers.go

@@ -191,7 +191,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] != "" {

google-beta/tpgresource/self_link_helpers_test.go

@@ -191,9 +191,10 @@ 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/REDA:CT-ED09/regions/europe-north1/subnetworks/tf-test-net-xbwhsmlfm8": "REDA:CT-ED09",
+		"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",
+		"projects/REDA.com:CT-ED09/regions/europe-north1/subnetworks/tf-test-net-xbwhsmlfm8": "REDA.com:CT-ED09",
 	}
 	for input, expected := range cases {
 		if result := GetProjectFromRegionalSelfLink(input); result != expected {