Skip to content

Commit 1588828

Browse files
alloydb: Revert incorrect removal of machine_type from machine_config (it is GA) (#14470) (#10330)
[upstream:74b39560c129dbb2fbf72e0c90c45a046a1ebafc] Signed-off-by: Modular Magician <[email protected]>
1 parent c7146b0 commit 1588828

File tree

3 files changed

+5
-4
lines changed

3 files changed

+5
-4
lines changed

.changelog/14470.txt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
```release-note:bug
2+
alloydb: Restored support for the machine_type field in the machine_config block. It is GA.
3+
```

google-beta/services/alloydb/resource_alloydb_instance_test.go

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
//
99
// This code is generated by Magic Modules using the following:
1010
//
11-
// Source file: https://github.com/GoogleCloudPlatform/magic-modules/tree/main/mmv1/third_party/terraform/services/alloydb/resource_alloydb_instance_test.go.tmpl
11+
// Source file: https://github.com/GoogleCloudPlatform/magic-modules/tree/main/mmv1/third_party/terraform/services/alloydb/resource_alloydb_instance_test.go
1212
//
1313
// DO NOT EDIT this file directly. Any changes made to this file will be
1414
// overwritten during the next generation cycle.
@@ -98,7 +98,6 @@ resource "google_alloydb_instance" "default" {
9898
machine_config {
9999
cpu_count = 4
100100
machine_type = "n2-highmem-4"
101-
102101
}
103102
104103
labels = {
@@ -972,7 +971,6 @@ resource "google_alloydb_instance" "default" {
972971
machine_config {
973972
cpu_count = 2
974973
machine_type = "n2-highmem-2"
975-
976974
}
977975
psc_instance_config {
978976
allowed_consumer_projects = ["${data.google_project.project.number}"]

website/docs/r/alloydb_instance.html.markdown

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -345,7 +345,7 @@ The following arguments are supported:
345345
The number of CPU's in the VM instance.
346346

347347
* `machine_type` -
348-
(Optional, [Beta](https://terraform.io/docs/providers/google/guides/provider_versions.html))
348+
(Optional)
349349
Machine type of the VM instance.
350350
E.g. "n2-highmem-4", "n2-highmem-8", "c4a-highmem-4-lssd".
351351
`cpu_count` must match the number of vCPUs in the machine type.

0 commit comments

Comments
 (0)