Fix breaking change w/ disk_autoresize in cloudsql

googleapis/google-api-go-client@95e5582

The cloudsql admin client changed the way it handles StorageAutoResize
as a parameter, in order to be more explicit about when the server has
ommitted the field. This changed the type from being bool to *bool, and
we need to modify provider code so that we supply the right value to the
api client.

Author: lawrencejones

google/resource_sql_database_instance.go

@@ -356,21 +356,25 @@ func resourceSqlDatabaseInstance() *schema.Resource {
 // 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 %s: %s", k, err)
-	}
-	if !matched {
+	if isFirstGen(d) {
 		log.Printf("[DEBUG] suppressing diff on %s due to 1st gen instance type", k)
 		return true
 	}
+
 	return false
 }
 
+// Detects whether a database is 1st Generation by inspecting the tier name
+func isFirstGen(d *schema.ResourceData) bool {
+	settingsList := d.Get("settings").([]interface{})
+	settings := settingsList[0].(map[string]interface{})
+	tier := settings["tier"].(string)
+
+	// 1st Generation databases have tiers like 'D0', as opposed to 2nd Generation which are
+	// prefixed with 'db'
+	return !regexp.MustCompile("db*").Match([]byte(tier))
+}
+
 func resourceSqlDatabaseInstanceCreate(d *schema.ResourceData, meta interface{}) error {
 	config := meta.(*Config)
 
@@ -431,8 +435,11 @@ func resourceSqlDatabaseInstanceCreate(d *schema.ResourceData, meta interface{})
 		settings.CrashSafeReplicationEnabled = v.(bool)
 	}
 
-	autoResize := _settings["disk_autoresize"].(bool)
-	settings.StorageAutoResize = &autoResize
+	// 1st Generation instances don't support the disk_autoresize parameter
+	if !isFirstGen(d) {
+		autoResize := _settings["disk_autoresize"].(bool)
+		settings.StorageAutoResize = &autoResize
+	}
 
 	if v, ok := _settings["disk_size"]; ok && v.(int) > 0 {
 		settings.DataDiskSizeGb = int64(v.(int))
@@ -734,13 +741,16 @@ 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: &_autoResize,
-			ForceSendFields:   []string{"StorageAutoResize"},
+			Tier:            _settings["tier"].(string),
+			SettingsVersion: instance.Settings.SettingsVersion,
+			ForceSendFields: []string{"StorageAutoResize"},
+		}
+
+		if !isFirstGen(d) {
+			autoResize := _settings["disk_autoresize"].(bool)
+			settings.StorageAutoResize = &autoResize
 		}
 
 		if v, ok := _settings["activation_policy"]; ok {

google/resource_sql_database_instance_test.go

@@ -437,7 +437,7 @@ func TestAccGoogleSqlDatabaseInstance_settings_upgrade(t *testing.T) {
 	})
 }
 
-func TestAccGoogleSqlDatabaseInstance_settings_downgrade(t *testing.T) {
+func TestAccGoogleSqlDatabaseInstance_settingsDowngrade(t *testing.T) {
 	t.Parallel()
 
 	var instance sqladmin.DatabaseInstance
@@ -608,10 +608,15 @@ func testAccCheckGoogleSqlDatabaseInstanceEquals(n string,
 			return fmt.Errorf("Error settings.crash_safe_replication mismatch, (%s, %s)", server, local)
 		}
 
-		server = strconv.FormatBool(*instance.Settings.StorageAutoResize)
-		local = attributes["settings.0.disk_autoresize"]
-		if server != local && len(server) > 0 && len(local) > 0 {
-			return fmt.Errorf("Error settings.disk_autoresize mismatch, (%s, %s)", server, local)
+		// First generation CloudSQL instances will not have any value for StorageAutoResize.
+		// We need to check if this value has been omitted before we potentially deference a
+		// nil pointer.
+		if instance.Settings.StorageAutoResize != nil {
+			server = strconv.FormatBool(*instance.Settings.StorageAutoResize)
+			local = attributes["settings.0.disk_autoresize"]
+			if server != local && len(server) > 0 && len(local) > 0 {
+				return fmt.Errorf("Error settings.disk_autoresize mismatch, (%s, %s)", server, local)
+			}
 		}
 
 		server = strconv.FormatInt(instance.Settings.DataDiskSizeGb, 10)