Add labels field to the GKEHub Membership Binding resource (#8880) (#15753)

* Adding Terraform resources for Tenancy APIs in GKEHub

* Segregating MembershipBinding and MembershipRBACRoleBinding to keep things simpler in the review

* Fixing the docu URIs

* Adding TF support for Tenancy API for Membership Binding

* Adding dependent membership binding to the same commit chain

* Making Scope un-updatable and replacing hard coded project number with the one from test env

* Making Scope RRBAC updatable

* Making Namespace immutable

* Adding update test cases

* Removing all memberships field from Scope since it is no longer supported

* Removing all_memberships field for Scope from all test cases

* Add labels field to the Membership Binding resource

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

Author: modular-magician

.changelog/8880.txt

@@ -0,0 +1,3 @@
+```release-note:enhancement
+GKEHUB: added `labels` fields to `google_gke_hub_membership_binding` resource
+```

google/services/gkehub2/resource_gke_hub_membership_binding.go

@@ -73,6 +73,12 @@ func ResourceGKEHub2MembershipBinding() *schema.Resource {
 				Description: `A Workspace resource name in the format
 'projects/*/locations/*/scopes/*'.`,
 			},
+			"labels": {
+				Type:        schema.TypeMap,
+				Optional:    true,
+				Description: `Labels for this Membership binding.`,
+				Elem:        &schema.Schema{Type: schema.TypeString},
+			},
 			"create_time": {
 				Type:        schema.TypeString,
 				Computed:    true,
@@ -137,6 +143,12 @@ func resourceGKEHub2MembershipBindingCreate(d *schema.ResourceData, meta interfa
 	} else if v, ok := d.GetOkExists("scope"); !tpgresource.IsEmptyValue(reflect.ValueOf(scopeProp)) && (ok || !reflect.DeepEqual(v, scopeProp)) {
 		obj["scope"] = scopeProp
 	}
+	labelsProp, err := expandGKEHub2MembershipBindingLabels(d.Get("labels"), d, config)
+	if err != nil {
+		return err
+	} else if v, ok := d.GetOkExists("labels"); !tpgresource.IsEmptyValue(reflect.ValueOf(labelsProp)) && (ok || !reflect.DeepEqual(v, labelsProp)) {
+		obj["labels"] = labelsProp
+	}
 
 	url, err := tpgresource.ReplaceVars(d, config, "{{GKEHub2BasePath}}projects/{{project}}/locations/{{location}}/memberships/{{membership_id}}/bindings/?membership_binding_id={{membership_binding_id}}")
 	if err != nil {
@@ -267,6 +279,9 @@ func resourceGKEHub2MembershipBindingRead(d *schema.ResourceData, meta interface
 	if err := d.Set("state", flattenGKEHub2MembershipBindingState(res["state"], d, config)); err != nil {
 		return fmt.Errorf("Error reading MembershipBinding: %s", err)
 	}
+	if err := d.Set("labels", flattenGKEHub2MembershipBindingLabels(res["labels"], d, config)); err != nil {
+		return fmt.Errorf("Error reading MembershipBinding: %s", err)
+	}
 
 	return nil
 }
@@ -293,6 +308,12 @@ func resourceGKEHub2MembershipBindingUpdate(d *schema.ResourceData, meta interfa
 	} else if v, ok := d.GetOkExists("scope"); !tpgresource.IsEmptyValue(reflect.ValueOf(v)) && (ok || !reflect.DeepEqual(v, scopeProp)) {
 		obj["scope"] = scopeProp
 	}
+	labelsProp, err := expandGKEHub2MembershipBindingLabels(d.Get("labels"), d, config)
+	if err != nil {
+		return err
+	} else if v, ok := d.GetOkExists("labels"); !tpgresource.IsEmptyValue(reflect.ValueOf(v)) && (ok || !reflect.DeepEqual(v, labelsProp)) {
+		obj["labels"] = labelsProp
+	}
 
 	url, err := tpgresource.ReplaceVars(d, config, "{{GKEHub2BasePath}}projects/{{project}}/locations/{{location}}/memberships/{{membership_id}}/bindings/{{membership_binding_id}}")
 	if err != nil {
@@ -305,6 +326,10 @@ func resourceGKEHub2MembershipBindingUpdate(d *schema.ResourceData, meta interfa
 	if d.HasChange("scope") {
 		updateMask = append(updateMask, "scope")
 	}
+
+	if d.HasChange("labels") {
+		updateMask = append(updateMask, "labels")
+	}
 	// updateMask is a URL parameter but not present in the schema, so ReplaceVars
 	// won't set it
 	url, err = transport_tpg.AddQueryParams(url, map[string]string{"updateMask": strings.Join(updateMask, ",")})
@@ -461,6 +486,21 @@ func flattenGKEHub2MembershipBindingStateCode(v interface{}, d *schema.ResourceD
 	return v
 }
 
+func flattenGKEHub2MembershipBindingLabels(v interface{}, d *schema.ResourceData, config *transport_tpg.Config) interface{} {
+	return v
+}
+
 func expandGKEHub2MembershipBindingScope(v interface{}, d tpgresource.TerraformResourceData, config *transport_tpg.Config) (interface{}, error) {
 	return v, nil
 }
+
+func expandGKEHub2MembershipBindingLabels(v interface{}, d tpgresource.TerraformResourceData, config *transport_tpg.Config) (map[string]string, error) {
+	if v == nil {
+		return map[string]string{}, nil
+	}
+	m := make(map[string]string)
+	for k, val := range v.(map[string]interface{}) {
+		m[k] = val.(string)
+	}
+	return m, nil
+}

google/services/gkehub2/resource_gke_hub_membership_binding_generated_test.go

@@ -86,6 +86,11 @@ resource "google_gke_hub_membership_binding" "example" {
   scope = google_gke_hub_scope.example.name
   membership_id = "tf-test-membership%{random_suffix}"
   location = "global"
+  labels = {
+      keyb = "valueb"
+      keya = "valuea"
+      keyc = "valuec" 
+  }
   depends_on = [
     google_gke_hub_membership.example,
     google_gke_hub_scope.example

google/services/gkehub2/resource_gke_hub_membership_binding_test.go

@@ -74,6 +74,11 @@ resource "google_gke_hub_membership_binding" "example" {
   scope = google_gke_hub_scope.example.name
   membership_id = "tf-test-membership%{random_suffix}"
   location = "global"
+  labels = {
+      keyb = "valueb"
+      keya = "valuea"
+      keyc = "valuec" 
+  }
   depends_on = [
     google_gke_hub_membership.example,
     google_gke_hub_scope.example
@@ -110,6 +115,11 @@ resource "google_gke_hub_membership_binding" "example" {
   scope = google_gke_hub_scope.example2.name
   membership_id = "tf-test-membership%{random_suffix}"
   location = "global"
+  labels = {
+      updated_keyb = "updated_valueb"
+      updated_keya = "updated_valuea"
+      updated_keyc = "updated_valuec" 
+  }
   depends_on = [
     google_gke_hub_membership.example,
     google_gke_hub_scope.example2

website/docs/r/gke_hub_membership_binding.html.markdown

@@ -58,6 +58,11 @@ resource "google_gke_hub_membership_binding" "example" {
   scope = google_gke_hub_scope.example.name
   membership_id = "tf-test-membership%{random_suffix}"
   location = "global"
+  labels = {
+      keyb = "valueb"
+      keya = "valuea"
+      keyc = "valuec" 
+  }
   depends_on = [
     google_gke_hub_membership.example,
     google_gke_hub_scope.example
@@ -91,6 +96,10 @@ The following arguments are supported:
 - - -
 
 
+* `labels` -
+  (Optional)
+  Labels for this Membership binding.
+
 * `project` - (Optional) The ID of the project in which the resource belongs.
     If it is not provided, the provider project is used.