Fix edition downgrade failure for an ENTERPRISE_PLUS instance with da… (#12289) (#8731)

modular-magician · web-flow · commit d90dbc057446 · 2024-11-19T10:07:32.000-08:00
[upstream:821357e87c510c090aabc8502fae4190152a5d99]

Signed-off-by: Modular Magician &lt;magic-modules@google.com&gt;
diff --git a/.changelog/12289.txt b/.changelog/12289.txt
@@ -0,0 +1,3 @@
+```release-note:bug
+sql: fixed edition downgrade failure for an `ENTERPRISE_PLUS` instance with data cache enabled.
+```
diff --git a/google-beta/services/sql/resource_sql_database_instance.go b/google-beta/services/sql/resource_sql_database_instance.go
@@ -2026,6 +2026,7 @@ func resourceSqlDatabaseInstanceUpdate(d *schema.ResourceData, meta interface{})
 	instance.Settings.SettingsVersion = int64(_settings["version"].(int))
 	// Collation cannot be included in the update request
 	instance.Settings.Collation = ""
+	instance.Settings.DataCacheConfig = expandDataCacheConfig(_settings["data_cache_config"].([]interface{}))
 
 	// Lock on the master_instance_name just in case updating any replica
 	// settings causes operations on the master.
diff --git a/google-beta/services/sql/resource_sql_database_instance_test.go b/google-beta/services/sql/resource_sql_database_instance_test.go
@@ -1881,7 +1881,6 @@ func TestAccSqlDatabaseInstance_Postgres_Edition_Upgrade(t *testing.T) {
 }
 
 func TestAccSqlDatabaseInstance_Edition_Downgrade(t *testing.T) {
-	t.Skip("https://github.com/hashicorp/terraform-provider-google/issues/20010")
 	t.Parallel()
 	enterprisePlusTier := "db-perf-optimized-N-2"
 	enterpriseTier := "db-custom-2-13312"

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	+```release-note:bug
	`2`	+sql: fixed edition downgrade failure for an `ENTERPRISE_PLUS` instance with data cache enabled.
	`3`	+```
Original file line number	Diff line number	Diff line change
`@@ -1881,7 +1881,6 @@ func TestAccSqlDatabaseInstance_Postgres_Edition_Upgrade(t *testing.T) {`
`1881`	`1881`	`}`
`1882`	`1882`
`1883`	`1883`	`func TestAccSqlDatabaseInstance_Edition_Downgrade(t *testing.T) {`
`1884`		`- t.Skip("https://github.com/hashicorp/terraform-provider-google/issues/20010")`
`1885`	`1884`	`t.Parallel()`
`1886`	`1885`	`enterprisePlusTier := "db-perf-optimized-N-2"`
`1887`	`1886`	`enterpriseTier := "db-custom-2-13312"`