Add disable_bundled_ingress in google_gkeonprem_vmware_cluster (#1031…

…0) (#7163) [upstream:bd42e573fb11c414fe217f3cc35e891b77490faa] Signed-off-by: Modular Magician <[email protected]>
hashicorp · Mar 28, 2024 · 80fc7aa · 80fc7aa
1 parent cc77c4a
commit 80fc7aa
Show file tree

Hide file tree

Showing 5 changed files with 43 additions and 0 deletions.
diff --git a/.changelog/10310.txt b/.changelog/10310.txt
@@ -0,0 +1,3 @@
+```release-note:enhancement
+gkeonprem: added `disable_bundled_ingress` field to `google_gkeonprem_vmware_cluster` resource
+```
diff --git a/google-beta/services/gkeonprem/resource_gkeonprem_vmware_cluster.go b/google-beta/services/gkeonprem/resource_gkeonprem_vmware_cluster.go
@@ -255,6 +255,11 @@ full access to the cluster.`,
 				Optional:    true,
 				Description: `A human readable description of this VMware User Cluster.`,
 			},
+			"disable_bundled_ingress": {
+				Type:        schema.TypeBool,
+				Optional:    true,
+				Description: `Disable bundled ingress.`,
+			},
 			"enable_control_plane_v2": {
 				Type:        schema.TypeBool,
 				Optional:    true,
@@ -980,6 +985,12 @@ func resourceGkeonpremVmwareClusterCreate(d *schema.ResourceData, meta interface
 	} else if v, ok := d.GetOkExists("enable_control_plane_v2"); !tpgresource.IsEmptyValue(reflect.ValueOf(enableControlPlaneV2Prop)) && (ok || !reflect.DeepEqual(v, enableControlPlaneV2Prop)) {
 		obj["enableControlPlaneV2"] = enableControlPlaneV2Prop
 	}
+	disableBundledIngressProp, err := expandGkeonpremVmwareClusterDisableBundledIngress(d.Get("disable_bundled_ingress"), d, config)
+	if err != nil {
+		return err
+	} else if v, ok := d.GetOkExists("disable_bundled_ingress"); !tpgresource.IsEmptyValue(reflect.ValueOf(disableBundledIngressProp)) && (ok || !reflect.DeepEqual(v, disableBundledIngressProp)) {
+		obj["disableBundledIngress"] = disableBundledIngressProp
+	}
 	upgradePolicyProp, err := expandGkeonpremVmwareClusterUpgradePolicy(d.Get("upgrade_policy"), d, config)
 	if err != nil {
 		return err
@@ -1145,6 +1156,9 @@ func resourceGkeonpremVmwareClusterRead(d *schema.ResourceData, meta interface{}
 	if err := d.Set("enable_control_plane_v2", flattenGkeonpremVmwareClusterEnableControlPlaneV2(res["enableControlPlaneV2"], d, config)); err != nil {
 		return fmt.Errorf("Error reading VmwareCluster: %s", err)
 	}
+	if err := d.Set("disable_bundled_ingress", flattenGkeonpremVmwareClusterDisableBundledIngress(res["disableBundledIngress"], d, config)); err != nil {
+		return fmt.Errorf("Error reading VmwareCluster: %s", err)
+	}
 	if err := d.Set("upgrade_policy", flattenGkeonpremVmwareClusterUpgradePolicy(res["upgradePolicy"], d, config)); err != nil {
 		return fmt.Errorf("Error reading VmwareCluster: %s", err)
 	}
@@ -1279,6 +1293,12 @@ func resourceGkeonpremVmwareClusterUpdate(d *schema.ResourceData, meta interface
 	} else if v, ok := d.GetOkExists("enable_control_plane_v2"); !tpgresource.IsEmptyValue(reflect.ValueOf(v)) && (ok || !reflect.DeepEqual(v, enableControlPlaneV2Prop)) {
 		obj["enableControlPlaneV2"] = enableControlPlaneV2Prop
 	}
+	disableBundledIngressProp, err := expandGkeonpremVmwareClusterDisableBundledIngress(d.Get("disable_bundled_ingress"), d, config)
+	if err != nil {
+		return err
+	} else if v, ok := d.GetOkExists("disable_bundled_ingress"); !tpgresource.IsEmptyValue(reflect.ValueOf(v)) && (ok || !reflect.DeepEqual(v, disableBundledIngressProp)) {
+		obj["disableBundledIngress"] = disableBundledIngressProp
+	}
 	upgradePolicyProp, err := expandGkeonpremVmwareClusterUpgradePolicy(d.Get("upgrade_policy"), d, config)
 	if err != nil {
 		return err
@@ -1354,6 +1374,10 @@ func resourceGkeonpremVmwareClusterUpdate(d *schema.ResourceData, meta interface
 		updateMask = append(updateMask, "enableControlPlaneV2")
 	}
 
+	if d.HasChange("disable_bundled_ingress") {
+		updateMask = append(updateMask, "disableBundledIngress")
+	}
+
 	if d.HasChange("upgrade_policy") {
 		updateMask = append(updateMask, "upgradePolicy")
 	}
@@ -2246,6 +2270,10 @@ func flattenGkeonpremVmwareClusterEnableControlPlaneV2(v interface{}, d *schema.
 	return v
 }
 
+func flattenGkeonpremVmwareClusterDisableBundledIngress(v interface{}, d *schema.ResourceData, config *transport_tpg.Config) interface{} {
+	return v
+}
+
 func flattenGkeonpremVmwareClusterUpgradePolicy(v interface{}, d *schema.ResourceData, config *transport_tpg.Config) interface{} {
 	if v == nil {
 		return nil
@@ -3326,6 +3354,10 @@ func expandGkeonpremVmwareClusterEnableControlPlaneV2(v interface{}, d tpgresour
 	return v, nil
 }
 
+func expandGkeonpremVmwareClusterDisableBundledIngress(v interface{}, d tpgresource.TerraformResourceData, config *transport_tpg.Config) (interface{}, error) {
+	return v, nil
+}
+
 func expandGkeonpremVmwareClusterUpgradePolicy(v interface{}, d tpgresource.TerraformResourceData, config *transport_tpg.Config) (interface{}, error) {
 	l := v.([]interface{})
 	if len(l) == 0 || l[0] == nil {

diff --git a/google-beta/services/gkeonprem/resource_gkeonprem_vmware_cluster_generated_test.go b/google-beta/services/gkeonprem/resource_gkeonprem_vmware_cluster_generated_test.go
@@ -178,6 +178,7 @@ resource "google_gkeonprem_vmware_cluster" "cluster-f5lb" {
   }
   vm_tracking_enabled = true
   enable_control_plane_v2 = true
+  disable_bundled_ingress = true
   authorization {
     admin_users {
       username = "[email protected]"

diff --git a/google-beta/services/gkeonprem/resource_gkeonprem_vmware_cluster_test.go b/google-beta/services/gkeonprem/resource_gkeonprem_vmware_cluster_test.go
@@ -373,6 +373,7 @@ func testAccGkeonpremVmwareCluster_vmwareClusterUpdateManualLbStart(context map[
     }
     vm_tracking_enabled = true
     enable_control_plane_v2 = true
+    disable_bundled_ingress = true
     upgrade_policy {
       control_plane_only = true
     }
@@ -465,6 +466,7 @@ func testAccGkeonpremVmwareCluster_vmwareClusterUpdateManualLb(context map[strin
     }
     vm_tracking_enabled = false
     enable_control_plane_v2 = false
+    disable_bundled_ingress = false
     upgrade_policy {
       control_plane_only = true
     }

diff --git a/website/docs/r/gkeonprem_vmware_cluster.html.markdown b/website/docs/r/gkeonprem_vmware_cluster.html.markdown
@@ -123,6 +123,7 @@ resource "google_gkeonprem_vmware_cluster" "cluster-f5lb" {
   }
   vm_tracking_enabled = true
   enable_control_plane_v2 = true
+  disable_bundled_ingress = true
   authorization {
     admin_users {
       username = "[email protected]"
@@ -374,6 +375,10 @@ The following arguments are supported:
   (Optional)
   Enable control plane V2. Default to false.
 
+* `disable_bundled_ingress` -
+  (Optional)
+  Disable bundled ingress.
+
 * `upgrade_policy` -
   (Optional)
   Specifies upgrade policy for the cluster.