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

skysarthak · Sarthak Tandon · web-flow · commit 821357e87c51 · 2024-11-19T10:03:29.000-08:00
Co-authored-by: Sarthak Tandon &lt;sarthaktn@google.com&gt;
diff --git a/mmv1/third_party/terraform/services/sql/resource_sql_database_instance.go.tmpl b/mmv1/third_party/terraform/services/sql/resource_sql_database_instance.go.tmpl
@@ -2024,6 +2024,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/mmv1/third_party/terraform/services/sql/resource_sql_database_instance_test.go b/mmv1/third_party/terraform/services/sql/resource_sql_database_instance_test.go
@@ -1879,7 +1879,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
`@@ -1879,7 +1879,6 @@ func TestAccSqlDatabaseInstance_Postgres_Edition_Upgrade(t *testing.T) {`
`1879`	`1879`	`}`
`1880`	`1880`
`1881`	`1881`	`func TestAccSqlDatabaseInstance_Edition_Downgrade(t *testing.T) {`
`1882`		`- t.Skip("https://github.com/hashicorp/terraform-provider-google/issues/20010")`
`1883`	`1882`	`t.Parallel()`
`1884`	`1883`	`enterprisePlusTier := "db-perf-optimized-N-2"`
`1885`	`1884`	`enterpriseTier := "db-custom-2-13312"`