Remove output_only restriction on OnPremVersion field (#15311) (#24614)

[upstream:79b81fcaa29fdbfc3106f80dc1effabe73af2a88]

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

Author: modular-magician

.changelog/15311.txt

@@ -0,0 +1,3 @@
+```release-note:enhancement
+gkeonprem: made it possible to set the `on_prem_version` field on `google_gkeonprem_vmware_node_pool` (previously output-only)
+```

google/services/gkeonprem/resource_gkeonprem_vmware_node_pool.go

@@ -248,6 +248,11 @@ Please refer to the field 'effective_annotations' for all of the annotations pre
 					},
 				},
 			},
+			"on_prem_version": {
+				Type:        schema.TypeString,
+				Optional:    true,
+				Description: `Anthos version for the node pool. Defaults to the user cluster version.`,
+			},
 			"create_time": {
 				Type:        schema.TypeString,
 				Computed:    true,
@@ -273,11 +278,6 @@ client has an up-to-date value before proceeding.
 Allows clients to perform consistent read-modify-writes
 through optimistic concurrency control.`,
 			},
-			"on_prem_version": {
-				Type:        schema.TypeString,
-				Computed:    true,
-				Description: `Anthos version for the node pool. Defaults to the user cluster version.`,
-			},
 			"reconciling": {
 				Type:        schema.TypeBool,
 				Computed:    true,
@@ -388,6 +388,12 @@ func resourceGkeonpremVmwareNodePoolCreate(d *schema.ResourceData, meta interfac
 	} else if v, ok := d.GetOkExists("config"); !tpgresource.IsEmptyValue(reflect.ValueOf(configProp)) && (ok || !reflect.DeepEqual(v, configProp)) {
 		obj["config"] = configProp
 	}
+	onPremVersionProp, err := expandGkeonpremVmwareNodePoolOnPremVersion(d.Get("on_prem_version"), d, config)
+	if err != nil {
+		return err
+	} else if v, ok := d.GetOkExists("on_prem_version"); !tpgresource.IsEmptyValue(reflect.ValueOf(onPremVersionProp)) && (ok || !reflect.DeepEqual(v, onPremVersionProp)) {
+		obj["onPremVersion"] = onPremVersionProp
+	}
 	effectiveAnnotationsProp, err := expandGkeonpremVmwareNodePoolEffectiveAnnotations(d.Get("effective_annotations"), d, config)
 	if err != nil {
 		return err
@@ -572,6 +578,12 @@ func resourceGkeonpremVmwareNodePoolUpdate(d *schema.ResourceData, meta interfac
 	} else if v, ok := d.GetOkExists("config"); !tpgresource.IsEmptyValue(reflect.ValueOf(v)) && (ok || !reflect.DeepEqual(v, configProp)) {
 		obj["config"] = configProp
 	}
+	onPremVersionProp, err := expandGkeonpremVmwareNodePoolOnPremVersion(d.Get("on_prem_version"), d, config)
+	if err != nil {
+		return err
+	} else if v, ok := d.GetOkExists("on_prem_version"); !tpgresource.IsEmptyValue(reflect.ValueOf(v)) && (ok || !reflect.DeepEqual(v, onPremVersionProp)) {
+		obj["onPremVersion"] = onPremVersionProp
+	}
 	effectiveAnnotationsProp, err := expandGkeonpremVmwareNodePoolEffectiveAnnotations(d.Get("effective_annotations"), d, config)
 	if err != nil {
 		return err
@@ -600,6 +612,10 @@ func resourceGkeonpremVmwareNodePoolUpdate(d *schema.ResourceData, meta interfac
 		updateMask = append(updateMask, "config")
 	}
 
+	if d.HasChange("on_prem_version") {
+		updateMask = append(updateMask, "onPremVersion")
+	}
+
 	if d.HasChange("effective_annotations") {
 		updateMask = append(updateMask, "annotations")
 	}
@@ -1386,6 +1402,10 @@ func expandGkeonpremVmwareNodePoolConfigEnableLoadBalancer(v interface{}, d tpgr
 	return v, nil
 }
 
+func expandGkeonpremVmwareNodePoolOnPremVersion(v interface{}, d tpgresource.TerraformResourceData, config *transport_tpg.Config) (interface{}, error) {
+	return v, nil
+}
+
 func expandGkeonpremVmwareNodePoolEffectiveAnnotations(v interface{}, d tpgresource.TerraformResourceData, config *transport_tpg.Config) (map[string]string, error) {
 	if v == nil {
 		return map[string]string{}, nil

google/services/gkeonprem/resource_gkeonprem_vmware_node_pool_generated_test.go

@@ -140,7 +140,7 @@ resource "google_gkeonprem_vmware_cluster" "default-full" {
   location = "us-west1"
   admin_cluster_membership = "projects/870316890899/locations/global/memberships/gkeonprem-terraform-test"
   description = "test cluster"
-  on_prem_version = "1.13.1-gke.35"
+  on_prem_version = "1.33.0-gke.35"
   network_config {
     service_address_cidr_blocks = ["10.96.0.0/12"]
     pod_address_cidr_blocks = ["192.168.0.0/16"]
@@ -177,6 +177,7 @@ resource "google_gkeonprem_vmware_node_pool" "nodepool-full" {
   name = "tf-test-my-nodepool%{random_suffix}"
   location = "us-west1"
   vmware_cluster = google_gkeonprem_vmware_cluster.default-full.name
+  on_prem_version = "1.33.0-gke.35"
   annotations = {}
   config {
     cpus = 4

google/services/gkeonprem/resource_gkeonprem_vmware_node_pool_test.go

@@ -20,6 +20,7 @@ import (
 	"testing"
 
 	"github.com/hashicorp/terraform-plugin-testing/helper/resource"
+	"github.com/hashicorp/terraform-plugin-testing/plancheck"
 	"github.com/hashicorp/terraform-provider-google/google/acctest"
 )
 
@@ -46,6 +47,11 @@ func TestAccGkeonpremVmwareNodePool_vmwareNodePoolUpdate(t *testing.T) {
 			},
 			{
 				Config: testAccGkeonpremVmwareNodePool_vmwareNodePoolUpdate(context),
+				ConfigPlanChecks: resource.ConfigPlanChecks{
+					PreApply: []plancheck.PlanCheck{
+						plancheck.ExpectResourceAction("google_gkeonprem_vmware_node_pool.nodepool", plancheck.ResourceActionUpdate),
+					},
+				},
 			},
 			{
 				ResourceName:            "google_gkeonprem_vmware_node_pool.nodepool",
@@ -65,7 +71,7 @@ func testAccGkeonpremVmwareNodePool_vmwareNodePoolUpdateStart(context map[string
     location = "us-west1"
     admin_cluster_membership = "projects/870316890899/locations/global/memberships/gkeonprem-terraform-test"
     description = "test cluster"
-    on_prem_version = "1.13.1-gke.35"
+    on_prem_version = "1.33.1-gke.35"
     annotations = {}
     network_config {
       service_address_cidr_blocks = ["10.96.0.0/12"]
@@ -105,6 +111,7 @@ func testAccGkeonpremVmwareNodePool_vmwareNodePoolUpdateStart(context map[string
     name = "tf-test-nodepool-%{random_suffix}"
     location = "us-west1"
     vmware_cluster = google_gkeonprem_vmware_cluster.cluster.name
+    on_prem_version = "1.33.1-gke.35"
     annotations = {
       env = "test"
     }
@@ -150,7 +157,7 @@ func testAccGkeonpremVmwareNodePool_vmwareNodePoolUpdate(context map[string]inte
     location = "us-west1"
     admin_cluster_membership = "projects/870316890899/locations/global/memberships/gkeonprem-terraform-test"
     description = "test cluster"
-    on_prem_version = "1.13.1-gke.35"
+    on_prem_version = "1.33.1-gke.35"
     annotations = {}
     network_config {
       service_address_cidr_blocks = ["10.96.0.0/12"]

website/docs/r/gkeonprem_vmware_node_pool.html.markdown

@@ -90,7 +90,7 @@ resource "google_gkeonprem_vmware_cluster" "default-full" {
   location = "us-west1"
   admin_cluster_membership = "projects/870316890899/locations/global/memberships/gkeonprem-terraform-test"
   description = "test cluster"
-  on_prem_version = "1.13.1-gke.35"
+  on_prem_version = "1.33.0-gke.35"
   network_config {
     service_address_cidr_blocks = ["10.96.0.0/12"]
     pod_address_cidr_blocks = ["192.168.0.0/16"]
@@ -127,6 +127,7 @@ resource "google_gkeonprem_vmware_node_pool" "nodepool-full" {
   name = "my-nodepool"
   location = "us-west1"
   vmware_cluster = google_gkeonprem_vmware_cluster.default-full.name
+  on_prem_version = "1.33.0-gke.35"
   annotations = {}
   config {
     cpus = 4
@@ -212,6 +213,10 @@ The following arguments are supported:
   Node Pool autoscaling config for the node pool.
   Structure is [documented below](#nested_node_pool_autoscaling).
 
+* `on_prem_version` -
+  (Optional)
+  Anthos version for the node pool. Defaults to the user cluster version.
+
 * `project` - (Optional) The ID of the project in which the resource belongs.
     If it is not provided, the provider project is used.
 
@@ -355,9 +360,6 @@ In addition to the arguments listed above, the following computed attributes are
   Allows clients to perform consistent read-modify-writes
   through optimistic concurrency control.
 
-* `on_prem_version` -
-  Anthos version for the node pool. Defaults to the user cluster version.
-
 * `effective_annotations` -
   All of annotations (key/value pairs) present on the resource in GCP, including the annotations configured through Terraform, other clients and services.