Accecpt AlloyDB cluster database version as an input (#9798) (#16967)

[upstream:f2ee7d847b87c0ea348cdbba3330dfc354df46e4]

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

Author: modular-magician

.changelog/9798.txt

@@ -0,0 +1,5 @@
+```release-note:enhancement
+
+AlloyDB: removed output label to `databaseVersion` field
+
+```

google/services/alloydb/resource_alloydb_cluster.go

@@ -265,6 +265,12 @@ If not set, defaults to 14 days.`,
 					},
 				},
 			},
+			"database_version": {
+				Type:        schema.TypeString,
+				Computed:    true,
+				Optional:    true,
+				Description: `The database engine major version. This is an optional field and it's populated at the Cluster creation time. This field cannot be changed after cluster creation.`,
+			},
 			"display_name": {
 				Type:        schema.TypeString,
 				Optional:    true,
@@ -478,11 +484,6 @@ It is specified in the form: "projects/{projectNumber}/global/networks/{network_
 					},
 				},
 			},
-			"database_version": {
-				Type:        schema.TypeString,
-				Computed:    true,
-				Description: `The database engine major version. This is an output-only field and it's populated at the Cluster creation time. This field cannot be changed after cluster creation.`,
-			},
 			"effective_annotations": {
 				Type:        schema.TypeMap,
 				Computed:    true,
@@ -627,6 +628,12 @@ func resourceAlloydbClusterCreate(d *schema.ResourceData, meta interface{}) erro
 	} else if v, ok := d.GetOkExists("etag"); !tpgresource.IsEmptyValue(reflect.ValueOf(etagProp)) && (ok || !reflect.DeepEqual(v, etagProp)) {
 		obj["etag"] = etagProp
 	}
+	databaseVersionProp, err := expandAlloydbClusterDatabaseVersion(d.Get("database_version"), d, config)
+	if err != nil {
+		return err
+	} else if v, ok := d.GetOkExists("database_version"); !tpgresource.IsEmptyValue(reflect.ValueOf(databaseVersionProp)) && (ok || !reflect.DeepEqual(v, databaseVersionProp)) {
+		obj["databaseVersion"] = databaseVersionProp
+	}
 	initialUserProp, err := expandAlloydbClusterInitialUser(d.Get("initial_user"), d, config)
 	if err != nil {
 		return err
@@ -965,6 +972,12 @@ func resourceAlloydbClusterUpdate(d *schema.ResourceData, meta interface{}) erro
 	} else if v, ok := d.GetOkExists("etag"); !tpgresource.IsEmptyValue(reflect.ValueOf(v)) && (ok || !reflect.DeepEqual(v, etagProp)) {
 		obj["etag"] = etagProp
 	}
+	databaseVersionProp, err := expandAlloydbClusterDatabaseVersion(d.Get("database_version"), d, config)
+	if err != nil {
+		return err
+	} else if v, ok := d.GetOkExists("database_version"); !tpgresource.IsEmptyValue(reflect.ValueOf(v)) && (ok || !reflect.DeepEqual(v, databaseVersionProp)) {
+		obj["databaseVersion"] = databaseVersionProp
+	}
 	initialUserProp, err := expandAlloydbClusterInitialUser(d.Get("initial_user"), d, config)
 	if err != nil {
 		return err
@@ -1036,6 +1049,10 @@ func resourceAlloydbClusterUpdate(d *schema.ResourceData, meta interface{}) erro
 		updateMask = append(updateMask, "etag")
 	}
 
+	if d.HasChange("database_version") {
+		updateMask = append(updateMask, "databaseVersion")
+	}
+
 	if d.HasChange("initial_user") {
 		updateMask = append(updateMask, "initialUser")
 	}
@@ -1869,6 +1886,10 @@ func expandAlloydbClusterEtag(v interface{}, d tpgresource.TerraformResourceData
 	return v, nil
 }
 
+func expandAlloydbClusterDatabaseVersion(v interface{}, d tpgresource.TerraformResourceData, config *transport_tpg.Config) (interface{}, error) {
+	return v, nil
+}
+
 func expandAlloydbClusterInitialUser(v interface{}, d tpgresource.TerraformResourceData, config *transport_tpg.Config) (interface{}, error) {
 	l := v.([]interface{})
 	if len(l) == 0 || l[0] == nil {

google/services/alloydb/resource_alloydb_cluster_generated_test.go

@@ -102,6 +102,7 @@ resource "google_alloydb_cluster" "full" {
   cluster_id   = "tf-test-alloydb-cluster-full%{random_suffix}"
   location     = "us-central1"
   network      = google_compute_network.default.id
+  database_version = "POSTGRES_15"
 
   initial_user {
     user     = "tf-test-alloydb-cluster-full%{random_suffix}"

website/docs/r/alloydb_cluster.html.markdown

@@ -66,6 +66,7 @@ resource "google_alloydb_cluster" "full" {
   cluster_id   = "alloydb-cluster-full"
   location     = "us-central1"
   network      = google_compute_network.default.id
+  database_version = "POSTGRES_15"
 
   initial_user {
     user     = "alloydb-cluster-full"
@@ -303,6 +304,10 @@ The following arguments are supported:
   **Note**: This field is non-authoritative, and will only manage the annotations present in your configuration.
   Please refer to the field `effective_annotations` for all of the annotations present on the resource.
 
+* `database_version` -
+  (Optional)
+  The database engine major version. This is an optional field and it's populated at the Cluster creation time. This field cannot be changed after cluster creation.
+
 * `initial_user` -
   (Optional)
   Initial user to setup during cluster creation.
@@ -542,9 +547,6 @@ In addition to the arguments listed above, the following computed attributes are
 * `state` -
   Output only. The current serving state of the cluster.
 
-* `database_version` -
-  The database engine major version. This is an output-only field and it's populated at the Cluster creation time. This field cannot be changed after cluster creation.
-
 * `backup_source` -
   Cluster created from backup.
   Structure is [documented below](#nested_backup_source).