alloydb: Revert incorrect removal of machine_type from machine_config (it is GA) (#14470) (#23562)

[upstream:74b39560c129dbb2fbf72e0c90c45a046a1ebafc]

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

Author: modular-magician

.changelog/14470.txt

@@ -0,0 +1,3 @@
+```release-note:bug
+alloydb: Restored support for the machine_type field in the machine_config block. It is GA.
+```

google/services/alloydb/resource_alloydb_instance.go

@@ -194,6 +194,14 @@ Please refer to the field 'effective_labels' for all of the labels present on th
 							Optional:    true,
 							Description: `The number of CPU's in the VM instance.`,
 						},
+						"machine_type": {
+							Type:     schema.TypeString,
+							Computed: true,
+							Optional: true,
+							Description: `Machine type of the VM instance.
+E.g. "n2-highmem-4", "n2-highmem-8", "c4a-highmem-4-lssd".
+'cpu_count' must match the number of vCPUs in the machine type.`,
+						},
 					},
 				},
 			},
@@ -1180,6 +1188,8 @@ func flattenAlloydbInstanceMachineConfig(v interface{}, d *schema.ResourceData,
 	transformed := make(map[string]interface{})
 	transformed["cpu_count"] =
 		flattenAlloydbInstanceMachineConfigCpuCount(original["cpuCount"], d, config)
+	transformed["machine_type"] =
+		flattenAlloydbInstanceMachineConfigMachineType(original["machineType"], d, config)
 	return []interface{}{transformed}
 }
 func flattenAlloydbInstanceMachineConfigCpuCount(v interface{}, d *schema.ResourceData, config *transport_tpg.Config) interface{} {
@@ -1199,6 +1209,10 @@ func flattenAlloydbInstanceMachineConfigCpuCount(v interface{}, d *schema.Resour
 	return v // let terraform core handle it otherwise
 }
 
+func flattenAlloydbInstanceMachineConfigMachineType(v interface{}, d *schema.ResourceData, config *transport_tpg.Config) interface{} {
+	return v
+}
+
 func flattenAlloydbInstanceClientConnectionConfig(v interface{}, d *schema.ResourceData, config *transport_tpg.Config) interface{} {
 	if v == nil {
 		return nil
@@ -1542,13 +1556,24 @@ func expandAlloydbInstanceMachineConfig(v interface{}, d tpgresource.TerraformRe
 		transformed["cpuCount"] = transformedCpuCount
 	}
 
+	transformedMachineType, err := expandAlloydbInstanceMachineConfigMachineType(original["machine_type"], d, config)
+	if err != nil {
+		return nil, err
+	} else if val := reflect.ValueOf(transformedMachineType); val.IsValid() && !tpgresource.IsEmptyValue(val) {
+		transformed["machineType"] = transformedMachineType
+	}
+
 	return transformed, nil
 }
 
 func expandAlloydbInstanceMachineConfigCpuCount(v interface{}, d tpgresource.TerraformResourceData, config *transport_tpg.Config) (interface{}, error) {
 	return v, nil
 }
 
+func expandAlloydbInstanceMachineConfigMachineType(v interface{}, d tpgresource.TerraformResourceData, config *transport_tpg.Config) (interface{}, error) {
+	return v, nil
+}
+
 func expandAlloydbInstanceClientConnectionConfig(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_instance_generated_meta.yaml

@@ -26,6 +26,7 @@ fields:
   - field: 'ip_address'
   - field: 'labels'
   - field: 'machine_config.cpu_count'
+  - field: 'machine_config.machine_type'
   - field: 'name'
   - field: 'network_config.allocated_ip_range_override'
   - field: 'network_config.authorized_external_networks.cidr_range'

google/services/alloydb/resource_alloydb_instance_test.go

@@ -8,7 +8,7 @@
 //
 //	This code is generated by Magic Modules using the following:
 //
-//	Source file: https://github.com/GoogleCloudPlatform/magic-modules/tree/main/mmv1/third_party/terraform/services/alloydb/resource_alloydb_instance_test.go.tmpl
+//	Source file: https://github.com/GoogleCloudPlatform/magic-modules/tree/main/mmv1/third_party/terraform/services/alloydb/resource_alloydb_instance_test.go
 //
 //	DO NOT EDIT this file directly. Any changes made to this file will be
 //	overwritten during the next generation cycle.
@@ -97,6 +97,7 @@ resource "google_alloydb_instance" "default" {
 
   machine_config {
     cpu_count = 4
+    machine_type = "n2-highmem-4"
   }
 
   labels = {
@@ -969,6 +970,7 @@ resource "google_alloydb_instance" "default" {
   instance_type = "PRIMARY"
   machine_config {
     cpu_count = 2
+    machine_type = "n2-highmem-2"
   }
   psc_instance_config {
 	allowed_consumer_projects = ["${data.google_project.project.number}"]

website/docs/r/alloydb_instance.html.markdown

@@ -345,7 +345,7 @@ The following arguments are supported:
   The number of CPU's in the VM instance.
 
 * `machine_type` -
-  (Optional, [Beta](https://terraform.io/docs/providers/google/guides/provider_versions.html))
+  (Optional)
   Machine type of the VM instance.
   E.g. "n2-highmem-4", "n2-highmem-8", "c4a-highmem-4-lssd".
   `cpu_count` must match the number of vCPUs in the machine type.