Add enable_advanced_cluster example to vmware admin cluster (#14750) (#23908)

[upstream:bb5e3dc755ca008c4c10274452ff686a14849f6e]

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

Author: modular-magician

.changelog/14750.txt

@@ -0,0 +1,3 @@
+```release-note:enhancement
+gkeonprem: added `enable_advanced_cluster` field to `google_gkeonprem_vmware_admin_cluster` resource
+```

google/services/gkeonprem/resource_gkeonprem_vmware_admin_cluster.go

@@ -401,6 +401,12 @@ full access to the cluster.`,
 				Optional:    true,
 				Description: `A human readable description of this VMware admin cluster.`,
 			},
+			"enable_advanced_cluster": {
+				Type:        schema.TypeBool,
+				Computed:    true,
+				Optional:    true,
+				Description: `If set, the advanced cluster feature is enabled.`,
+			},
 			"image_type": {
 				Type:        schema.TypeString,
 				Computed:    true,
@@ -762,11 +768,6 @@ indicate real problems requiring user intervention.`,
 				Description: `All of annotations (key/value pairs) present on the resource in GCP, including the annotations configured through Terraform, other clients and services.`,
 				Elem:        &schema.Schema{Type: schema.TypeString},
 			},
-			"enable_advanced_cluster": {
-				Type:        schema.TypeBool,
-				Computed:    true,
-				Description: `If set, the advanced cluster feature is enabled.`,
-			},
 			"endpoint": {
 				Type:        schema.TypeString,
 				Computed:    true,
@@ -981,6 +982,12 @@ func resourceGkeonpremVmwareAdminClusterCreate(d *schema.ResourceData, meta inte
 	} else if v, ok := d.GetOkExists("platform_config"); !tpgresource.IsEmptyValue(reflect.ValueOf(platformConfigProp)) && (ok || !reflect.DeepEqual(v, platformConfigProp)) {
 		obj["platformConfig"] = platformConfigProp
 	}
+	enableAdvancedClusterProp, err := expandGkeonpremVmwareAdminClusterEnableAdvancedCluster(d.Get("enable_advanced_cluster"), d, config)
+	if err != nil {
+		return err
+	} else if v, ok := d.GetOkExists("enable_advanced_cluster"); !tpgresource.IsEmptyValue(reflect.ValueOf(enableAdvancedClusterProp)) && (ok || !reflect.DeepEqual(v, enableAdvancedClusterProp)) {
+		obj["enableAdvancedCluster"] = enableAdvancedClusterProp
+	}
 	privateRegistryConfigProp, err := expandGkeonpremVmwareAdminClusterPrivateRegistryConfig(d.Get("private_registry_config"), d, config)
 	if err != nil {
 		return err
@@ -1270,6 +1277,12 @@ func resourceGkeonpremVmwareAdminClusterUpdate(d *schema.ResourceData, meta inte
 	} else if v, ok := d.GetOkExists("platform_config"); !tpgresource.IsEmptyValue(reflect.ValueOf(v)) && (ok || !reflect.DeepEqual(v, platformConfigProp)) {
 		obj["platformConfig"] = platformConfigProp
 	}
+	enableAdvancedClusterProp, err := expandGkeonpremVmwareAdminClusterEnableAdvancedCluster(d.Get("enable_advanced_cluster"), d, config)
+	if err != nil {
+		return err
+	} else if v, ok := d.GetOkExists("enable_advanced_cluster"); !tpgresource.IsEmptyValue(reflect.ValueOf(v)) && (ok || !reflect.DeepEqual(v, enableAdvancedClusterProp)) {
+		obj["enableAdvancedCluster"] = enableAdvancedClusterProp
+	}
 	privateRegistryConfigProp, err := expandGkeonpremVmwareAdminClusterPrivateRegistryConfig(d.Get("private_registry_config"), d, config)
 	if err != nil {
 		return err
@@ -1344,6 +1357,10 @@ func resourceGkeonpremVmwareAdminClusterUpdate(d *schema.ResourceData, meta inte
 		updateMask = append(updateMask, "platformConfig")
 	}
 
+	if d.HasChange("enable_advanced_cluster") {
+		updateMask = append(updateMask, "enableAdvancedCluster")
+	}
+
 	if d.HasChange("private_registry_config") {
 		updateMask = append(updateMask, "privateRegistryConfig")
 	}
@@ -3542,6 +3559,10 @@ func expandGkeonpremVmwareAdminClusterPlatformConfigStatusConditionsState(v inte
 	return v, nil
 }
 
+func expandGkeonpremVmwareAdminClusterEnableAdvancedCluster(v interface{}, d tpgresource.TerraformResourceData, config *transport_tpg.Config) (interface{}, error) {
+	return v, nil
+}
+
 func expandGkeonpremVmwareAdminClusterPrivateRegistryConfig(v interface{}, d tpgresource.TerraformResourceData, config *transport_tpg.Config) (interface{}, error) {
 	l := v.([]interface{})
 	if len(l) == 0 || l[0] == nil {

google/services/gkeonprem/resource_gkeonprem_vmware_admin_cluster_generated_test.go

@@ -249,8 +249,9 @@ resource "google_gkeonprem_vmware_admin_cluster" "admin-cluster-metallb" {
   location = "us-west1"
   description = "test admin cluster"
   bootstrap_cluster_membership = "projects/870316890899/locations/global/memberships/gkeonprem-terraform-test"
-  on_prem_version = "1.31.0-gke.35"
+  on_prem_version = "1.33.0-gke.35"
   image_type = "ubuntu_containerd"
+  enable_advanced_cluster = true
   vcenter {
     resource_pool = "test resource pool"
     datastore = "test data store"

website/docs/r/gkeonprem_vmware_admin_cluster.html.markdown

@@ -182,8 +182,9 @@ resource "google_gkeonprem_vmware_admin_cluster" "admin-cluster-metallb" {
   location = "us-west1"
   description = "test admin cluster"
   bootstrap_cluster_membership = "projects/870316890899/locations/global/memberships/gkeonprem-terraform-test"
-  on_prem_version = "1.31.0-gke.35"
+  on_prem_version = "1.33.0-gke.35"
   image_type = "ubuntu_containerd"
+  enable_advanced_cluster = true
   vcenter {
     resource_pool = "test resource pool"
     datastore = "test data store"
@@ -311,6 +312,10 @@ The following arguments are supported:
   The VMware platform configuration.
   Structure is [documented below](#nested_platform_config).
 
+* `enable_advanced_cluster` -
+  (Optional)
+  If set, the advanced cluster feature is enabled.
+
 * `private_registry_config` -
   (Optional)
   Configuration for private registry.
@@ -801,9 +806,6 @@ In addition to the arguments listed above, the following computed attributes are
   ResourceStatus representing detailed cluster state.
   Structure is [documented below](#nested_status).
 
-* `enable_advanced_cluster` -
-  If set, the advanced cluster feature is enabled.
-
 * `effective_annotations` -
   All of annotations (key/value pairs) present on the resource in GCP, including the annotations configured through Terraform, other clients and services.