Support setting 'location' in google_sql_database_instance backup_con…

…figuration (GoogleCloudPlatform#2498) Merged PR GoogleCloudPlatform#2498.
JanMa · Oct 25, 2019 · 4799c48 · 4799c48
1 parent bb49c5c
commit 4799c48
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 3 deletions.
diff --git a/build/terraform b/build/terraform
diff --git a/build/terraform-beta b/build/terraform-beta
diff --git a/third_party/terraform/resources/resource_sql_database_instance.go b/third_party/terraform/resources/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/third_party/terraform/tests/resource_sql_database_instance_test.go.erb b/third_party/terraform/tests/resource_sql_database_instance_test.go.erb
@@ -911,7 +911,8 @@ resource "google_sql_database_instance" "instance" {
 		availability_type = "REGIONAL"
 
 		backup_configuration {
-			enabled = true
+			enabled   = true
+			location  = "us"
 		}
 	}
 }