make ipv4_enabled default to true (#3330) (#6041)

Signed-off-by: Modular Magician <[email protected]>
hashicorp · Apr 3, 2020 · ae6d21e · ae6d21e
1 parent 7e7ebe2
commit ae6d21e
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 5 deletions.
diff --git a/.changelog/3330.txt b/.changelog/3330.txt
@@ -0,0 +1,3 @@
+```release-note:bug
+* sql: fixed error that occurred on `google_sql_database_instance` when `settings.ip_configuration` was set but `ipv4_enabled` was not set to true and `private_network` was not configured, by defaulting `ipv4_enabled` to true.
+```
diff --git a/google/resource_sql_database_instance.go b/google/resource_sql_database_instance.go
@@ -228,10 +228,9 @@ func resourceSqlDatabaseInstance() *schema.Resource {
 										AtLeastOneOf: ipConfigurationKeys,
 									},
 									"ipv4_enabled": {
-										Type:     schema.TypeBool,
-										Optional: true,
-										// Defaults differ between first and second gen instances
-										Computed:     true,
+										Type:         schema.TypeBool,
+										Optional:     true,
+										Default:      true,
 										AtLeastOneOf: ipConfigurationKeys,
 									},
 									"require_ssl": {

diff --git a/google/resource_sql_database_instance_test.go b/google/resource_sql_database_instance_test.go
@@ -848,7 +848,6 @@ resource "google_sql_database_instance" "instance" {
     tier                   = "db-f1-micro"
 
     ip_configuration {
-      ipv4_enabled = "true"
       authorized_networks {
         value           = "108.12.12.12"
         name            = "misc"