Fix Hub Membership Import format (#6341) (#12207)

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

Author: modular-magician

.changelog/6341.txt

@@ -0,0 +1,3 @@
+```release-note:enhancement
+gkehub: added better support for import for `google_gke_hub_membership`
+```

google/resource_gke_hub_membership.go

@@ -184,7 +184,7 @@ func resourceGKEHubMembershipCreate(d *schema.ResourceData, meta interface{}) er
 	}
 
 	// Store the ID now
-	id, err := replaceVars(d, config, "{{name}}")
+	id, err := replaceVars(d, config, "projects/{{project}}/locations/global/memberships/{{membership_id}}")
 	if err != nil {
 		return fmt.Errorf("Error constructing id: %s", err)
 	}
@@ -207,7 +207,7 @@ func resourceGKEHubMembershipCreate(d *schema.ResourceData, meta interface{}) er
 	}
 
 	// This may have caused the ID to update - update it if so.
-	id, err = replaceVars(d, config, "{{name}}")
+	id, err = replaceVars(d, config, "projects/{{project}}/locations/global/memberships/{{membership_id}}")
 	if err != nil {
 		return fmt.Errorf("Error constructing id: %s", err)
 	}
@@ -225,7 +225,7 @@ func resourceGKEHubMembershipRead(d *schema.ResourceData, meta interface{}) erro
 		return err
 	}
 
-	url, err := replaceVars(d, config, "{{GKEHubBasePath}}{{name}}")
+	url, err := replaceVars(d, config, "{{GKEHubBasePath}}projects/{{project}}/locations/global/memberships/{{membership_id}}")
 	if err != nil {
 		return err
 	}
@@ -358,7 +358,7 @@ func resourceGKEHubMembershipDelete(d *schema.ResourceData, meta interface{}) er
 	}
 	billingProject = project
 
-	url, err := replaceVars(d, config, "{{GKEHubBasePath}}{{name}}")
+	url, err := replaceVars(d, config, "{{GKEHubBasePath}}projects/{{project}}/locations/global/memberships/{{membership_id}}")
 	if err != nil {
 		return err
 	}
@@ -391,13 +391,15 @@ func resourceGKEHubMembershipDelete(d *schema.ResourceData, meta interface{}) er
 func resourceGKEHubMembershipImport(d *schema.ResourceData, meta interface{}) ([]*schema.ResourceData, error) {
 	config := meta.(*Config)
 	if err := parseImportId([]string{
-		"(?P<name>.+)",
+		"projects/(?P<project>[^/]+)/locations/global/memberships/(?P<membership_id>[^/]+)",
+		"(?P<project>[^/]+)/(?P<membership_id>[^/]+)",
+		"(?P<membership_id>[^/]+)",
 	}, d, config); err != nil {
 		return nil, err
 	}
 
 	// Replace import id for the resource id
-	id, err := replaceVars(d, config, "{{name}}")
+	id, err := replaceVars(d, config, "projects/{{project}}/locations/global/memberships/{{membership_id}}")
 	if err != nil {
 		return nil, fmt.Errorf("Error constructing id: %s", err)
 	}

google/resource_gke_hub_membership_generated_test.go

@@ -130,7 +130,7 @@ func testAccCheckGKEHubMembershipDestroyProducer(t *testing.T) func(s *terraform
 
 			config := googleProviderConfig(t)
 
-			url, err := replaceVarsForTest(config, rs, "{{GKEHubBasePath}}{{name}}")
+			url, err := replaceVarsForTest(config, rs, "{{GKEHubBasePath}}projects/{{project}}/locations/global/memberships/{{membership_id}}")
 			if err != nil {
 				return err
 			}

website/docs/r/gke_hub_membership.html.markdown

@@ -145,7 +145,7 @@ The following arguments are supported:
 
 In addition to the arguments listed above, the following computed attributes are exported:
 
-* `id` - an identifier for the resource with format `{{name}}`
+* `id` - an identifier for the resource with format `projects/{{project}}/locations/global/memberships/{{membership_id}}`
 
 * `name` -
   The unique identifier of the membership.
@@ -166,7 +166,9 @@ This resource provides the following
 Membership can be imported using any of these accepted formats:
 
 ```
-$ terraform import google_gke_hub_membership.default {{name}}
+$ terraform import google_gke_hub_membership.default projects/{{project}}/locations/global/memberships/{{membership_id}}
+$ terraform import google_gke_hub_membership.default {{project}}/{{membership_id}}
+$ terraform import google_gke_hub_membership.default {{membership_id}}
 ```
 
 ## User Project Overrides