Support setting 'location' in google_sql_database_instance back… (#4681)

hashicorp · Oct 21, 2019 · dd8f51b · dd8f51b
1 parent 93c2c84
commit dd8f51b
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/google/resource_sql_database_instance.go b/google/resource_sql_database_instance.go
@@ -118,6 +118,10 @@ func resourceSqlDatabaseInstance() *schema.Resource {
 										// start_time is randomly assigned if not set
 										Computed: true,
 									},
+									"location": {
+										Type:     schema.TypeString,
+										Optional: true,
+									},
 								},
 							},
 						},
@@ -690,6 +694,7 @@ func expandBackupConfiguration(configured []interface{}) *sqladmin.BackupConfigu
 		BinaryLogEnabled: _backupConfiguration["binary_log_enabled"].(bool),
 		Enabled:          _backupConfiguration["enabled"].(bool),
 		StartTime:        _backupConfiguration["start_time"].(string),
+		Location:         _backupConfiguration["location"].(string),
 	}
 }
 
@@ -898,6 +903,7 @@ func flattenBackupConfiguration(backupConfiguration *sqladmin.BackupConfiguratio
 		"binary_log_enabled": backupConfiguration.BinaryLogEnabled,
 		"enabled":            backupConfiguration.Enabled,
 		"start_time":         backupConfiguration.StartTime,
+		"location":           backupConfiguration.Location,
 	}
 
 	return []map[string]interface{}{data}

diff --git a/google/resource_sql_database_instance_test.go b/google/resource_sql_database_instance_test.go
@@ -843,7 +843,8 @@ resource "google_sql_database_instance" "instance" {
 		availability_type = "REGIONAL"
 
 		backup_configuration {
-			enabled = true
+			enabled   = true
+            location  = "us"
 		}
 	}
 }