support binary_logging for replica instances (#4907) (#3379)

Signed-off-by: Modular Magician <[email protected]>
hashicorp · Jun 24, 2021 · d0ebd64 · d0ebd64
1 parent 61e9b53
commit d0ebd64
Show file tree

Hide file tree

Showing 3 changed files with 35 additions and 3 deletions.
diff --git a/.changelog/4907.txt b/.changelog/4907.txt
@@ -0,0 +1,3 @@
+```release-note:bug
+sql: add support for `binary_logging` on replica instances for `googe_sql_database_instance`
+```
diff --git a/google-beta/resource_sql_database_instance.go b/google-beta/resource_sql_database_instance.go
@@ -852,6 +852,17 @@ func resourceSqlDatabaseInstanceCreate(d *schema.ResourceData, meta interface{})
 		}
 	}
 
+	var patchData *sqladmin.DatabaseInstance
+
+	// BinaryLogging can be enabled on replica instances but only after creation.
+	if instance.MasterInstanceName != "" && instance.Settings != nil && instance.Settings.BackupConfiguration != nil {
+		bc := instance.Settings.BackupConfiguration
+		instance.Settings.BackupConfiguration = nil
+		if bc.BinaryLogEnabled {
+			patchData = &sqladmin.DatabaseInstance{Settings: &sqladmin.Settings{BackupConfiguration: bc}}
+		}
+	}
+
 	var op *sqladmin.Operation
 	err = retryTimeDuration(func() (operr error) {
 		if cloneContext != nil {
@@ -879,6 +890,21 @@ func resourceSqlDatabaseInstanceCreate(d *schema.ResourceData, meta interface{})
 		return err
 	}
 
+	// patch any fields that need to be sent postcreation
+	if patchData != nil {
+		err = retryTimeDuration(func() (rerr error) {
+			op, rerr = config.NewSqlAdminClient(userAgent).Instances.Patch(project, instance.Name, patchData).Do()
+			return rerr
+		}, d.Timeout(schema.TimeoutUpdate), isSqlOperationInProgressError)
+		if err != nil {
+			return fmt.Errorf("Error, failed to update instance settings for %s: %s", instance.Name, err)
+		}
+		err = sqlAdminOperationWaitTime(config, op, project, "Patch Instance", userAgent, d.Timeout(schema.TimeoutUpdate))
+		if err != nil {
+			return err
+		}
+	}
+
 	err = resourceSqlDatabaseInstanceRead(d, meta)
 	if err != nil {
 		return err

diff --git a/google-beta/resource_sql_database_instance_test.go b/google-beta/resource_sql_database_instance_test.go
@@ -1137,7 +1137,7 @@ resource "google_sql_database_instance" "instance" {
 var testGoogleSqlDatabaseInstance_replica = `
 resource "google_sql_database_instance" "instance_master" {
   name             = "tf-lw-%d"
-  database_version = "MYSQL_5_6"
+  database_version = "MYSQL_5_7"
   region           = "us-central1"
   deletion_protection = false
 
@@ -1154,12 +1154,15 @@ resource "google_sql_database_instance" "instance_master" {
 
 resource "google_sql_database_instance" "replica1" {
   name             = "tf-lw-%d-1"
-  database_version = "MYSQL_5_6"
+  database_version = "MYSQL_5_7"
   region           = "us-central1"
   deletion_protection = false
 
   settings {
     tier = "db-n1-standard-1"
+		backup_configuration {
+      binary_log_enabled = true
+		}
   }
 
   master_instance_name = google_sql_database_instance.instance_master.name
@@ -1176,7 +1179,7 @@ resource "google_sql_database_instance" "replica1" {
 
 resource "google_sql_database_instance" "replica2" {
   name             = "tf-lw-%d-2"
-  database_version = "MYSQL_5_6"
+  database_version = "MYSQL_5_7"
   region           = "us-central1"
   deletion_protection = false