Fixed ServiceAttachment target_service region/location inconsistency when referencing a Secure Web Proxy on creation

mmv1/templates/terraform/custom_expand/service_attachment_target_service.go.tmpl

@@ -1,12 +1,12 @@
 func expand{{$.GetPrefix}}{{$.TitlelizeProperty}}(v interface{}, d tpgresource.TerraformResourceData, config *transport_tpg.Config) (interface{}, error) {
 	resource := strings.Split(v.(string), "/")
     resourceKind := resource[len(resource)-2]
-    resourceBound := resource[len(resource)-4]
+    // resourceBound := resource[len(resource)-4]
     if len(resource) < 4 {
 		return nil, fmt.Errorf("invalid value for target_service")
 	}
 
-    _, err := tpgresource.ParseRegionalFieldValue(resourceKind, v.(string), "project", resourceBound, "zone", d, config, true)
+    _, err := tpgresource.ParseRegionalFieldValue(resourceKind, v.(string), "project", "region", "zone", d, config, true)
 	if err != nil {
 		return nil, fmt.Errorf("invalid value for target_service: %w", err)
 	}

mmv1/third_party/terraform/tpgresource/field_helpers.go

@@ -17,6 +17,8 @@ const (
 	RegionalLinkTemplate           = "projects/%s/regions/%s/%s/%s"
 	RegionalLinkBasePattern        = "projects/(.+)/regions/(.+)/%s/(.+)"
 	RegionalPartialLinkBasePattern = "regions/(.+)/%s/(.+)"
+	LocalLinkBasePattern           = "projects/(.+)/locations/(.+)/%s/(.+)"
+	LocalPartialLinkBasePattern    = "locations/(.+)/%s/(.+)"
 	ProjectLinkTemplate            = "projects/%s/%s/%s"
 	ProjectBasePattern             = "projects/(.+)/%s/(.+)"
 	OrganizationLinkTemplate       = "organizations/%s/%s/%s"
@@ -414,6 +416,16 @@ func ParseRegionalFieldValue(resourceType, fieldValue, projectSchemaField, regio
 		}, nil
 	}
 
+	r = regexp.MustCompile(fmt.Sprintf(LocalLinkBasePattern, resourceType))
+	if parts := r.FindStringSubmatch(fieldValue); parts != nil {
+		return &RegionalFieldValue{
+			Project:      parts[1],
+			Region:       parts[2],
+			Name:         parts[3],
+			resourceType: resourceType,
+		}, nil
+	}
+
 	project, err := GetProjectFromSchema(projectSchemaField, d, config)
 	if err != nil {
 		return nil, err
@@ -429,6 +441,16 @@ func ParseRegionalFieldValue(resourceType, fieldValue, projectSchemaField, regio
 		}, nil
 	}
 
+	r = regexp.MustCompile(fmt.Sprintf(LocalPartialLinkBasePattern, resourceType))
+	if parts := r.FindStringSubmatch(fieldValue); parts != nil {
+		return &RegionalFieldValue{
+			Project:      project,
+			Region:       parts[1],
+			Name:         parts[2],
+			resourceType: resourceType,
+		}, nil
+	}
+
 	region, err := GetRegionFromSchema(regionSchemaField, zoneSchemaField, d, config)
 	if err != nil {
 		return nil, err