Test setting AvailabilityType for PostgreSQL

Add tests that cover the creation of a Postgres database with
AvailabilityType set to REGIONAL, and correct some small issues that
were preventing compilation.

Author: lawrencejones

google/resource_sql_database_instance.go

@@ -77,8 +77,11 @@ func resourceSqlDatabaseInstance() *schema.Resource {
 							Type:             schema.TypeString,
 							Optional:         true,
 							DiffSuppressFunc: suppressFirstGen,
-							// Set computed instead of default because this property is for second-gen only.
-							Computed: true,
+							// Set computed instead of default because this property is for second-gen
+							// only. The default when not provided is ZONAL, which means no explicit HA
+							// configuration.
+							Computed:     true,
+							ValidateFunc: validation.StringInSlice([]string{"REGIONAL", "ZONAL"}, false),
 						},
 						"backup_configuration": &schema.Schema{
 							Type:     schema.TypeList,
@@ -350,18 +353,19 @@ func resourceSqlDatabaseInstance() *schema.Resource {
 	}
 }
 
-// Suppress diff with any disk_autoresize value on 1st Generation Instances
+// Suppress diff with any attribute value that is not supported on 1st Generation
+// Instances
 func suppressFirstGen(k, old, new string, d *schema.ResourceData) bool {
 	settingsList := d.Get("settings").([]interface{})
 
 	settings := settingsList[0].(map[string]interface{})
 	tier := settings["tier"].(string)
 	matched, err := regexp.MatchString("db*", tier)
 	if err != nil {
-		log.Printf("[ERR] error with regex in diff supression for disk_autoresize: %s", err)
+		log.Printf("[ERR] error with regex in diff supression for %s: %s", k, err)
 	}
 	if !matched {
-		log.Printf("[DEBUG] suppressing diff on disk_autoresize due to 1st gen instance type")
+		log.Printf("[DEBUG] suppressing diff on %s due to 1st gen instance type", k)
 		return true
 	}
 	return false
@@ -427,7 +431,8 @@ func resourceSqlDatabaseInstanceCreate(d *schema.ResourceData, meta interface{})
 		settings.CrashSafeReplicationEnabled = v.(bool)
 	}
 
-	settings.StorageAutoResize = _settings["disk_autoresize"].(*bool)
+	autoResize := _settings["disk_autoresize"].(bool)
+	settings.StorageAutoResize = &autoResize
 
 	if v, ok := _settings["disk_size"]; ok && v.(int) > 0 {
 		settings.DataDiskSizeGb = int64(v.(int))
@@ -729,10 +734,12 @@ func resourceSqlDatabaseInstanceUpdate(d *schema.ResourceData, meta interface{})
 		_settingsList := _settingsListCast.([]interface{})
 
 		_settings := _settingsList[0].(map[string]interface{})
+		_autoResize := _settings["disk_autoresize"].(bool)
+
 		settings := &sqladmin.Settings{
 			Tier:              _settings["tier"].(string),
 			SettingsVersion:   instance.Settings.SettingsVersion,
-			StorageAutoResize: _settings["disk_autoresize"].(*bool),
+			StorageAutoResize: &_autoResize,
 			ForceSendFields:   []string{"StorageAutoResize"},
 		}
 

google/resource_sql_database_instance_test.go

@@ -318,6 +318,38 @@ func TestAccGoogleSqlDatabaseInstance_slave(t *testing.T) {
 	})
 }
 
+func TestAccGoogleSqlDatabaseInstance_highAvailability(t *testing.T) {
+	var instance sqladmin.DatabaseInstance
+	instanceID := acctest.RandInt()
+
+	resource.Test(t, resource.TestCase{
+		PreCheck:     func() { testAccPreCheck(t) },
+		Providers:    testAccProviders,
+		CheckDestroy: testAccGoogleSqlDatabaseInstanceDestroy,
+		Steps: []resource.TestStep{
+			resource.TestStep{
+				Config: fmt.Sprintf(
+					testGoogleSqlDatabaseInstance_highAvailability, instanceID),
+				Check: resource.ComposeTestCheckFunc(
+					testAccCheckGoogleSqlDatabaseInstanceExists(
+						"google_sql_database_instance.instance", &instance),
+					testAccCheckGoogleSqlDatabaseInstanceEquals(
+						"google_sql_database_instance.instance", &instance),
+					// Check that we've set our high availability type correctly, and it's been
+					// accepted by the API
+					func(s *terraform.State) error {
+						if instance.Settings.AvailabilityType != "REGIONAL" {
+							return fmt.Errorf("Database %s was not configured with Regional HA", instance.Name)
+						}
+
+						return nil
+					},
+				),
+			},
+		},
+	})
+}
+
 func TestAccGoogleSqlDatabaseInstance_diskspecs(t *testing.T) {
 	t.Parallel()
 
@@ -910,6 +942,25 @@ resource "google_sql_database_instance" "instance_slave" {
 }
 `
 
+var testGoogleSqlDatabaseInstance_highAvailability = `
+resource "google_sql_database_instance" "instance" {
+	name = "tf-lw-%d"
+	region = "us-central1"
+	database_version = "POSTGRES_9_6"
+
+	settings {
+		tier = "db-f1-micro"
+
+		availability_type = "REGIONAL"
+
+		backup_configuration {
+			enabled = true
+			binary_log_enabled = true
+		}
+	}
+}
+`
+
 var testGoogleSqlDatabaseInstance_diskspecs = `
 resource "google_sql_database_instance" "instance" {
 	name = "tf-lw-%d"