Add two output-only fields (membership_id, membership_location) u…

…nder google_container_cluster.fleet (#9974) (#6983) * add 2 output only fields under resource_container_cluster.fleet * fix format * fix format * fix format * fix format * fix format * fix format * fix format * fix format * fix format * update documentation * update documentation * update documentation * update documentation * fix [upstream:3577ce32d9754ee0da8b2c23a4c732ae455ad98f] Signed-off-by: Modular Magician <[email protected]>
hashicorp · Feb 16, 2024 · 08cbf32 · 08cbf32
1 parent 50d8cb6
commit 08cbf32
Show file tree

Hide file tree

Showing 3 changed files with 31 additions and 3 deletions.
diff --git a/.changelog/9974.txt b/.changelog/9974.txt
@@ -0,0 +1,3 @@
+```release-note:enhancement
+container: added output-only fields `membership_id` and  `membership_location` under `fleet` in `google_container_cluster` resource
+```
diff --git a/google-beta/services/container/resource_container_cluster.go b/google-beta/services/container/resource_container_cluster.go
@@ -2048,6 +2048,16 @@ func ResourceContainerCluster() *schema.Resource {
 							Computed:    true,
 							Description: `Whether the cluster has been registered via the fleet API.`,
 						},
+						"membership_id": {
+							Type:        schema.TypeString,
+							Computed:    true,
+							Description: `Short name of the fleet membership, for example "member-1".`,
+						},
+						"membership_location": {
+							Type:        schema.TypeString,
+							Computed:    true,
+							Description: `Location of the fleet membership, for example "us-central1".`,
+						},
 					},
 				},
 			},
@@ -6025,11 +6035,22 @@ func flattenFleet(c *container.Fleet) []map[string]interface{} {
 	if c == nil {
 		return nil
 	}
+
+	// Parse membership_id and membership_location from full membership name.
+	var membership_id, membership_location string
+	membershipRE := regexp.MustCompile(`^(//[a-zA-Z0-9\.\-]+)?/?projects/([^/]+)/locations/([a-zA-Z0-9\-]+)/memberships/([^/]+)$`)
+	if match := membershipRE.FindStringSubmatch(c.Membership); match != nil {
+		membership_id = match[4]
+		membership_location = match[3]
+	}
+
 	return []map[string]interface{}{
 		{
-			"project":        c.Project,
-			"membership":     c.Membership,
-			"pre_registered": c.PreRegistered,
+			"project":             c.Project,
+			"membership":          c.Membership,
+			"membership_id":       membership_id,
+			"membership_location": membership_location,
+			"pre_registered":      c.PreRegistered,
 		},
 	}
 }

diff --git a/website/docs/r/container_cluster.html.markdown b/website/docs/r/container_cluster.html.markdown
@@ -1348,6 +1348,10 @@ exported:
 
 * `fleet.0.membership` - The resource name of the fleet Membership resource associated to this cluster with format `//gkehub.googleapis.com/projects/{{project}}/locations/{{location}}/memberships/{{name}}`. See the official doc for [fleet management](https://cloud.google.com/kubernetes-engine/docs/fleets-overview). 
 
+* `fleet.0.membership_id` - The short name of the fleet membership, extracted from `fleet.0.membership`. You can use this field to configure `membership_id` under [google_gkehub_feature_membership](https://registry.terraform.io/providers/hashicorp/google/latest/docs/resources/gke_hub_feature_membership).
+
+* `fleet.0.membership_location` - The location of the fleet membership,  extracted from `fleet.0.membership`. You can use this field to configure `membership_location` under [google_gkehub_feature_membership](https://registry.terraform.io/providers/hashicorp/google/latest/docs/resources/gke_hub_feature_membership).
+
 ## Timeouts
 
 This resource provides the following