feat(rdb): add support for settings (#777)

Co-authored-by: Olivier Cano <[email protected]>

Author: remyleone

docs/resources/rdb_instance.md

@@ -51,6 +51,8 @@ The following arguments are supported:
 
 - `disable_backup` - (Optional) Disable automated backup for the database instance.
 
+- `settings` - Map of engine settings to be set.
+
 - `tags` - (Optional) The tags associated with the Database Instance.
 
 - `region` - (Defaults to [provider](../index.md#region) `region`) The [region](../guides/regions_and_zones.md#regions) in which the Database Instance should be created.

scaleway/helpers_rdb.go

@@ -47,3 +47,25 @@ func flattenRdbInstanceReadReplicas(readReplicas []*rdb.Endpoint) interface{} {
 	}
 	return replicasI
 }
+
+func flattenInstanceSettings(settings []*rdb.InstanceSetting) interface{} {
+	res := make(map[string]string)
+	for _, value := range settings {
+		res[value.Name] = value.Value
+	}
+
+	return res
+}
+
+func expandInstanceSettings(i interface{}) []*rdb.InstanceSetting {
+	rawRule := i.(map[string]interface{})
+	var res []*rdb.InstanceSetting
+	for key, value := range rawRule {
+		res = append(res, &rdb.InstanceSetting{
+			Name:  key,
+			Value: value.(string),
+		})
+	}
+
+	return res
+}

scaleway/resource_rdb_instance.go

@@ -66,6 +66,14 @@ func resourceScalewayRdbInstance() *schema.Resource {
 				Optional:    true,
 				Description: "Password for the first user of the database instance",
 			},
+			"settings": {
+				Type: schema.TypeMap,
+				Elem: &schema.Schema{
+					Type: schema.TypeString,
+				},
+				Description: "Map of engine settings to be set.",
+				Optional:    true,
+			},
 			"tags": {
 				Type: schema.TypeList,
 				Elem: &schema.Schema{
@@ -159,6 +167,17 @@ func resourceScalewayRdbInstanceCreate(ctx context.Context, d *schema.ResourceDa
 		return diag.FromErr(err)
 	}
 
+	if settings, ok := d.GetOk("settings"); ok {
+		_, err := rdbAPI.SetInstanceSettings(&rdb.SetInstanceSettingsRequest{
+			InstanceID: res.ID,
+			Region:     region,
+			Settings:   expandInstanceSettings(settings),
+		})
+		if err != nil {
+			return diag.FromErr(err)
+		}
+	}
+
 	return resourceScalewayRdbInstanceRead(ctx, d, m)
 }
 
@@ -214,6 +233,9 @@ func resourceScalewayRdbInstanceRead(ctx context.Context, d *schema.ResourceData
 	}
 	_ = d.Set("certificate", string(certContent))
 
+	// set settings
+	_ = d.Set("settings", flattenInstanceSettings(res.Settings))
+
 	return nil
 }
 
@@ -243,6 +265,19 @@ func resourceScalewayRdbInstanceUpdate(ctx context.Context, d *schema.ResourceDa
 	if err != nil {
 		return diag.FromErr(err)
 	}
+
+	// Change settings
+	if d.HasChange("settings") {
+		_, err := rdbAPI.SetInstanceSettings(&rdb.SetInstanceSettingsRequest{
+			InstanceID: ID,
+			Region:     region,
+			Settings:   expandInstanceSettings(d.Get("settings")),
+		}, scw.WithContext(ctx))
+		if err != nil {
+			return diag.FromErr(err)
+		}
+	}
+
 	upgradeInstanceRequests := []rdb.UpgradeInstanceRequest(nil)
 	if d.HasChange("node_type") {
 		upgradeInstanceRequests = append(upgradeInstanceRequests,
@@ -303,6 +338,17 @@ func resourceScalewayRdbInstanceDelete(ctx context.Context, d *schema.ResourceDa
 		return diag.FromErr(err)
 	}
 
+	// We first wait in case the instance is in a transient state
+	_, err = rdbAPI.WaitForInstance(&rdb.WaitForInstanceRequest{
+		InstanceID: ID,
+		Region:     region,
+		Timeout:    scw.TimeDurationPtr(LbWaitForTimeout),
+	}, scw.WithContext(ctx))
+
+	if err != nil && !is404Error(err) {
+		return diag.FromErr(err)
+	}
+
 	_, err = rdbAPI.DeleteInstance(&rdb.DeleteInstanceRequest{
 		Region:     region,
 		InstanceID: ID,

scaleway/resource_rdb_instance_test.go

@@ -108,6 +108,47 @@ func TestAccScalewayRdbInstance_Basic(t *testing.T) {
 	})
 }
 
+func TestAccScalewayRdbInstance_Settings(t *testing.T) {
+	tt := NewTestTools(t)
+	defer tt.Cleanup()
+	resource.ParallelTest(t, resource.TestCase{
+		PreCheck:          func() { testAccPreCheck(t) },
+		ProviderFactories: tt.ProviderFactories,
+		CheckDestroy:      testAccCheckScalewayRdbInstanceDestroy(tt),
+		Steps: []resource.TestStep{
+			{
+				Config: `
+					resource scaleway_rdb_instance main {
+						name = "test-rdb"
+						node_type = "db-dev-s"
+						engine = "PostgreSQL-11"
+						is_ha_cluster = false
+						disable_backup = true
+						user_name = "my_initial_user"
+						password = "thiZ_is_v&ry_s3cret"
+						settings = {
+							work_mem = "4"
+							max_connections = "200"
+							effective_cache_size = "1300"
+							maintenance_work_mem = "150"
+							max_parallel_workers = "2"
+							max_parallel_workers_per_gather = "2"
+						}
+					}
+				`,
+				Check: resource.ComposeTestCheckFunc(
+					testAccCheckScalewayRdbExists(tt, "scaleway_rdb_instance.main"),
+					resource.TestCheckResourceAttr("scaleway_rdb_instance.main", "settings.work_mem", "4"),
+					resource.TestCheckResourceAttr("scaleway_rdb_instance.main", "settings.max_connections", "200"),
+					resource.TestCheckResourceAttr("scaleway_rdb_instance.main", "settings.effective_cache_size", "1300"),
+					resource.TestCheckResourceAttr("scaleway_rdb_instance.main", "settings.maintenance_work_mem", "150"),
+					resource.TestCheckResourceAttr("scaleway_rdb_instance.main", "settings.max_parallel_workers", "2"),
+					resource.TestCheckResourceAttr("scaleway_rdb_instance.main", "settings.max_parallel_workers_per_gather", "2"),
+				),
+			},
+		},
+	})
+}
 func testAccCheckScalewayRdbExists(tt *TestTools, n string) resource.TestCheckFunc {
 	return func(s *terraform.State) error {
 		rs, ok := s.RootModule().Resources[n]