Skip to content

Update disk type schema field to support db-c4a-highmem-4 tier #13236

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 11 commits into from
Apr 23, 2025
+3 −7
Merged

Update disk type schema field to support db-c4a-highmem-4 tier #13236

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
8c2319b
replace default disk type with computed, so CloudSQL can choose disk …
shuang2018g Feb 28, 2025
65fa678
shuang2018g:update disk_type schema field to allow CloudSQL internall…
shuang2018g Feb 28, 2025
b64a9ef
update testdata to reflect the change
shuang2018g Mar 1, 2025
32e9f56
update datastream testdata to reflect the change
shuang2018g Mar 1, 2025
5526019
update new tier naming
shuang2018g Apr 14, 2025
06ab719
Merge branch 'main' of github.com:shuang2018g/magic-modules
shuang2018g Apr 21, 2025
0ccc4cc
Merge branch 'main' into magic-module-fork
shuang2018g Apr 22, 2025
693f147
Merge branch 'main' of github.com:shuang2018g/magic-modules
shuang2018g Apr 22, 2025
3fa464f
Merge branch 'main' of github.com:shuang2018g/magic-modules into magi…
shuang2018g Apr 22, 2025
964e7ec
Merge branch 'main' of github.com:shuang2018g/magic-modules into magi…
shuang2018g Apr 22, 2025
fed7606
Merge branch 'GoogleCloudPlatform:main' into magic-module-fork
shuang2018g Apr 23, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions mmv1/third_party/terraform/services/sql/resource_sql_database_instance.go.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -426,10 +426,10 @@ is set to true. Defaults to ZONAL.`,
"disk_type": {
Type: schema.TypeString,
Optional: true,
Default: "PD_SSD",
Computed: true,
ForceNew: true,
DiffSuppressFunc: caseDiffDashSuppress,
Description: `The type of data disk: PD_SSD, PD_HDD, or HYPERDISK_BALANCED. Defaults to PD_SSD.`,
Description: `The type of supported data disk is tier dependent and can be PD_SSD or PD_HDD or HyperDisk_Balanced `,
},
{{- if ne $.TargetVersionName "ga" }}
"data_disk_provisioned_iops": {
Expand Down
2 changes: 1 addition & 1 deletion mmv1/third_party/terraform/services/sql/resource_sql_database_instance_test.go.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1744,7 +1744,7 @@ func TestAccSQLDatabaseInstance_DefaultEdition(t *testing.T) {
t.Parallel()
databaseName := "tf-test-" + acctest.RandString(t, 10)
databaseVersion := "POSTGRES_16"
enterprisePlusTier := "db-perf-optimized-N-2"
enterprisePlusTier := "db-c4a-highmem-4"
acctest.VcrTest(t, resource.TestCase{
PreCheck: func() { acctest.AccTestPreCheck(t) },
ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories(t),
Expand Down
1 change: 0 additions & 1 deletion mmv1/third_party/tgc/tests/data/example_google_datastream_stream.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,6 @@
"binaryLogEnabled": true,
"enabled": true
},
"dataDiskType": "PD_SSD",
"ipConfiguration": {
"authorizedNetworks": [
{
Expand Down
1 change: 0 additions & 1 deletion mmv1/third_party/tgc/tests/data/example_google_datastream_stream_append_only.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,6 @@
"binaryLogEnabled": true,
"enabled": true
},
"dataDiskType": "PD_SSD",
"ipConfiguration": {
"authorizedNetworks": [
{
Expand Down
1 change: 0 additions & 1 deletion mmv1/third_party/tgc/tests/data/example_sql_database_instance.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@
"settings": {
"activationPolicy": "ALWAYS",
"availabilityType": "ZONAL",
"dataDiskType": "PD_SSD",
"pricingPlan": "PER_USE",
"storageAutoResize": true,
"tier": "db-f1-micro"
Expand Down
1 change: 0 additions & 1 deletion mmv1/third_party/tgc/tests/data/sql.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@
"settings": {
"activationPolicy": "ALWAYS",
"availabilityType": "ZONAL",
"dataDiskType": "PD_SSD",
"pricingPlan": "PER_USE",
"storageAutoResize": true,
"tier": "db-f1-micro"
Expand Down
Loading