feat(rdb): allow RDB instance upgrade to HA without replacing the resource (#518)

* Allow RDB instance upgrade to HA without replacing the resource.
* Add RDB conversion to HA into acceptance tests.
* RDB: allow updating initial user password.

Author: paulez

scaleway/resource_rdb_instance_beta.go

@@ -2,6 +2,7 @@ package scaleway
 
 import (
 	"io/ioutil"
+	"time"
 
 	"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
 	"github.com/scaleway/scaleway-sdk-go/api/rdb/v1"
@@ -39,7 +40,6 @@ func resourceScalewayRdbInstanceBeta() *schema.Resource {
 			"is_ha_cluster": {
 				Type:        schema.TypeBool,
 				Optional:    true,
-				ForceNew:    true,
 				Default:     false,
 				Description: "Enable or disable high availability for the database instance",
 			},
@@ -52,11 +52,13 @@ func resourceScalewayRdbInstanceBeta() *schema.Resource {
 			"user_name": {
 				Type:        schema.TypeString,
 				Required:    true,
+				ForceNew:    true,
 				Description: "Identifier for the first user of the database instance",
 			},
 			"password": {
 				Type:        schema.TypeString,
 				Required:    true,
+				Sensitive:   true,
 				Description: "Password for the first user of the database instance",
 			},
 			"tags": {
@@ -234,13 +236,26 @@ func resourceScalewayRdbInstanceBetaUpdate(d *schema.ResourceData, m interface{}
 	if err != nil {
 		return err
 	}
-
+	upgradeInstanceRequests := []rdb.UpgradeInstanceRequest(nil)
 	if d.HasChange("node_type") {
-		_, err = rdbAPI.UpgradeInstance(&rdb.UpgradeInstanceRequest{
-			Region:     region,
-			InstanceID: ID,
-			NodeType:   scw.StringPtr(d.Get("node_type").(string)),
-		})
+		upgradeInstanceRequests = append(upgradeInstanceRequests,
+			rdb.UpgradeInstanceRequest{
+				Region:     region,
+				InstanceID: ID,
+				NodeType:   scw.StringPtr(d.Get("node_type").(string)),
+			})
+	}
+
+	if d.HasChange("is_ha_cluster") {
+		upgradeInstanceRequests = append(upgradeInstanceRequests,
+			rdb.UpgradeInstanceRequest{
+				Region:     region,
+				InstanceID: ID,
+				EnableHa:   scw.BoolPtr(d.Get("is_ha_cluster").(bool)),
+			})
+	}
+	for _, request := range upgradeInstanceRequests {
+		_, err = rdbAPI.UpgradeInstance(&request)
 		if err != nil {
 			return err
 		}
@@ -253,7 +268,26 @@ func resourceScalewayRdbInstanceBetaUpdate(d *schema.ResourceData, m interface{}
 		if err != nil {
 			return err
 		}
+
+		// Wait for the instance to settle after upgrading
+		time.Sleep(30 * time.Second)
+
 	}
+
+	if d.HasChange("password") {
+		req := &rdb.UpdateUserRequest{
+			Region:     region,
+			InstanceID: ID,
+			Name:       d.Get("user_name").(string),
+			Password:   scw.StringPtr(d.Get("password").(string)),
+		}
+
+		_, err = rdbAPI.UpdateUser(req)
+		if err != nil {
+			return err
+		}
+	}
+
 	return resourceScalewayRdbInstanceBetaRead(d, m)
 }
 

scaleway/resource_rdb_instance_beta_test.go

@@ -53,7 +53,7 @@ func TestAccScalewayRdbInstanceBeta(t *testing.T) {
 						name = "test-rdb"
 						node_type = "db-dev-s"
 						engine = "PostgreSQL-11"
-						is_ha_cluster = true
+						is_ha_cluster = false
 						disable_backup = true
 						user_name = "my_initial_user"
 						password = "thiZ_is_v&ry_s3cret"
@@ -65,7 +65,7 @@ func TestAccScalewayRdbInstanceBeta(t *testing.T) {
 					resource.TestCheckResourceAttr("scaleway_rdb_instance_beta.main", "name", "test-rdb"),
 					resource.TestCheckResourceAttr("scaleway_rdb_instance_beta.main", "node_type", "db-dev-s"),
 					resource.TestCheckResourceAttr("scaleway_rdb_instance_beta.main", "engine", "PostgreSQL-11"),
-					resource.TestCheckResourceAttr("scaleway_rdb_instance_beta.main", "is_ha_cluster", "true"),
+					resource.TestCheckResourceAttr("scaleway_rdb_instance_beta.main", "is_ha_cluster", "false"),
 					resource.TestCheckResourceAttr("scaleway_rdb_instance_beta.main", "disable_backup", "true"),
 					resource.TestCheckResourceAttr("scaleway_rdb_instance_beta.main", "user_name", "my_initial_user"),
 					resource.TestCheckResourceAttr("scaleway_rdb_instance_beta.main", "password", "thiZ_is_v&ry_s3cret"),
@@ -86,7 +86,7 @@ func TestAccScalewayRdbInstanceBeta(t *testing.T) {
 						is_ha_cluster = true
 						disable_backup = false
 						user_name = "my_initial_user"
-						password = "thiZ_is_v&ry_s3cret"
+						password = "thiZ_is_v&ry_s8cret"
 						tags = [ "terraform-test", "scaleway_rdb_instance_beta", "minimal" ]
 					}
 				`,
@@ -98,7 +98,7 @@ func TestAccScalewayRdbInstanceBeta(t *testing.T) {
 					resource.TestCheckResourceAttr("scaleway_rdb_instance_beta.main", "is_ha_cluster", "true"),
 					resource.TestCheckResourceAttr("scaleway_rdb_instance_beta.main", "disable_backup", "false"),
 					resource.TestCheckResourceAttr("scaleway_rdb_instance_beta.main", "user_name", "my_initial_user"),
-					resource.TestCheckResourceAttr("scaleway_rdb_instance_beta.main", "password", "thiZ_is_v&ry_s3cret"),
+					resource.TestCheckResourceAttr("scaleway_rdb_instance_beta.main", "password", "thiZ_is_v&ry_s8cret"),
 					resource.TestCheckResourceAttr("scaleway_rdb_instance_beta.main", "tags.0", "terraform-test"),
 					resource.TestCheckResourceAttr("scaleway_rdb_instance_beta.main", "tags.1", "scaleway_rdb_instance_beta"),
 					resource.TestCheckResourceAttr("scaleway_rdb_instance_beta.main", "tags.2", "minimal"),