fix(rdb-acl): tags, ACL description attribute and documentation (#1180)

Co-authored-by: Rémy Léone <[email protected]>

Author: Monitob

docs/resources/rdb_acl.md

@@ -1,13 +1,13 @@
 ---
 page_title: "Scaleway: scaleway_rdb_acl"
 description: |-
-  Manages Scaleway Database Instances.
+  Manages Scaleway Database ACL rules.
 ---
 
 # scaleway_rdb_acl
 
-Creates and manages Scaleway Database instance autorized IPs.
-For more information, see [the documentation](https://developers.scaleway.com/en/products/rdb/api).
+Creates and manages Scaleway Database instance authorized IPs.
+For more information, see [the documentation](https://developers.scaleway.com/en/products/rdb/api/#acl-rules-allowed-ips).
 
 ## Examples
 
@@ -36,7 +36,7 @@ The following arguments are supported:
 The `acl_rules` block supports:
 
 - `ip` - (Required) The ip range to whitelist in [CIDR notation](https://en.wikipedia.org/wiki/Classless_Inter-Domain_Routing#CIDR_notation)
-- `description` - (Optional) A simple text describing this rule
+- `description` - (Optional) A text describing this rule. Default description: `IP allowed`
 
 
 ## Attributes Reference

docs/resources/rdb_instance.md

@@ -149,8 +149,8 @@ The following arguments are supported:
 In addition to all arguments above, the following attributes are exported:
 
 - `id` - The ID of the Database Instance.
-- `endpoint_ip` - The IP of the Database Instance.
-- `endpoint_port` - The port of the Database Instance.
+- `endpoint_ip` - (Deprecated) The IP of the Database Instance.
+- `endpoint_port` - (Deprecated) The port of the Database Instance.
 - `read_replicas` - List of read replicas of the database instance.
     - `ip` - IP of the replica.
     - `port` - Port of the replica.

scaleway/resource_instance_ip.go

@@ -119,7 +119,9 @@ func resourceScalewayInstanceIPRead(ctx context.Context, d *schema.ResourceData,
 	_ = d.Set("organization_id", res.IP.Organization)
 	_ = d.Set("project_id", res.IP.Project)
 	_ = d.Set("reverse", res.IP.Reverse)
-	_ = d.Set("tags", res.IP.Tags)
+	if len(res.IP.Tags) > 0 {
+		_ = d.Set("tags", flattenSliceString(res.IP.Tags))
+	}
 
 	if res.IP.Server != nil {
 		_ = d.Set("server_id", newZonedIDString(res.IP.Zone, res.IP.Server.ID))

scaleway/resource_rdb_acl.go

@@ -46,6 +46,7 @@ func resourceScalewayRdbACL() *schema.Resource {
 						"description": {
 							Type:        schema.TypeString,
 							Optional:    true,
+							Computed:    true,
 							Description: "Description of the rule",
 						},
 					},

scaleway/resource_rdb_acl_test.go

@@ -23,6 +23,38 @@ func TestAccScalewayRdbACL_Basic(t *testing.T) {
 		ProviderFactories: tt.ProviderFactories,
 		CheckDestroy:      testAccCheckScalewayRdbInstanceDestroy(tt),
 		Steps: []resource.TestStep{
+			{
+				Config: fmt.Sprintf(`
+					resource "scaleway_instance_ip" "front1_ip" {
+					}
+
+					resource "scaleway_instance_ip" "front2_ip" {
+					}
+
+					resource scaleway_rdb_instance main {
+						name = "%s"
+						node_type = "db-dev-s"
+						engine = "PostgreSQL-12"
+						is_ha_cluster = false
+					}
+
+					resource "scaleway_rdb_acl" "main" {
+					  instance_id = scaleway_rdb_instance.main.id
+
+					  acl_rules {
+						ip = "${scaleway_instance_ip.front1_ip.address}/32"
+					  }
+
+					  acl_rules {
+						ip = "${scaleway_instance_ip.front2_ip.address}/32"
+					  }
+					}
+				`, instanceName),
+				Check: resource.ComposeTestCheckFunc(
+					resource.TestCheckResourceAttrSet("scaleway_rdb_acl.main", "acl_rules.0.description"),
+					resource.TestCheckResourceAttrSet("scaleway_rdb_acl.main", "acl_rules.1.description"),
+				),
+			},
 			{
 				Config: fmt.Sprintf(`
 					resource scaleway_rdb_instance main {

scaleway/resource_rdb_instance.go

@@ -185,6 +185,7 @@ func resourceScalewayRdbInstance() *schema.Resource {
 				Type:        schema.TypeString,
 				Computed:    true,
 				Description: "Endpoint IP of the database instance",
+				Deprecated:  "Please use the private_network or the load_balancer attribute",
 			},
 			"endpoint_port": {
 				Type:        schema.TypeInt,
@@ -286,10 +287,14 @@ func resourceScalewayRdbInstanceCreate(ctx context.Context, d *schema.ResourceDa
 		DisableBackup: d.Get("disable_backup").(bool),
 		UserName:      d.Get("user_name").(string),
 		Password:      d.Get("password").(string),
-		Tags:          expandStrings(d.Get("tags")),
 		VolumeType:    rdb.VolumeType(d.Get("volume_type").(string)),
 	}
 
+	rawTag, tagExist := d.GetOk("tags")
+	if tagExist {
+		createReq.Tags = expandStrings(rawTag)
+	}
+
 	pn, pnExist := d.GetOk("private_network")
 	if pnExist {
 		createReq.InitEndpoints, err = expandPrivateNetwork(pn, pnExist)
@@ -387,7 +392,9 @@ func resourceScalewayRdbInstanceRead(ctx context.Context, d *schema.ResourceData
 	_ = d.Set("backup_same_region", res.BackupSameRegion)
 	_ = d.Set("user_name", d.Get("user_name").(string)) // user name and
 	_ = d.Set("password", d.Get("password").(string))   // password are immutable
-	_ = d.Set("tags", res.Tags)
+	if len(res.Tags) > 0 {
+		_ = d.Set("tags", flattenSliceString(res.Tags))
+	}
 	if res.Endpoint != nil {
 		_ = d.Set("endpoint_ip", flattenIPPtr(res.Endpoint.IP))
 		_ = d.Set("endpoint_port", int(res.Endpoint.Port))

scaleway/resource_rdb_instance_test.go

@@ -83,6 +83,37 @@ func TestAccScalewayRdbInstance_Basic(t *testing.T) {
 					resource.TestCheckResourceAttrSet("scaleway_rdb_instance.main", "load_balancer.0.port"),
 				),
 			},
+			{
+				Config: `
+					resource scaleway_rdb_instance main {
+						name = "test-rdb-basic"
+						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"
+						tags = [ "terraform-change-tag" ]
+					}
+				`,
+				Check: resource.ComposeTestCheckFunc(
+					testAccCheckScalewayRdbExists(tt, "scaleway_rdb_instance.main"),
+					resource.TestCheckResourceAttr("scaleway_rdb_instance.main", "name", "test-rdb-basic"),
+					resource.TestCheckResourceAttr("scaleway_rdb_instance.main", "node_type", "db-dev-s"),
+					resource.TestCheckResourceAttr("scaleway_rdb_instance.main", "engine", "PostgreSQL-11"),
+					resource.TestCheckResourceAttr("scaleway_rdb_instance.main", "is_ha_cluster", "false"),
+					resource.TestCheckResourceAttr("scaleway_rdb_instance.main", "disable_backup", "true"),
+					resource.TestCheckResourceAttr("scaleway_rdb_instance.main", "user_name", "my_initial_user"),
+					resource.TestCheckResourceAttr("scaleway_rdb_instance.main", "password", "thiZ_is_v&ry_s3cret"),
+					resource.TestCheckResourceAttr("scaleway_rdb_instance.main", "tags.0", "terraform-change-tag"),
+					resource.TestCheckResourceAttrSet("scaleway_rdb_instance.main", "endpoint_ip"),
+					resource.TestCheckResourceAttrSet("scaleway_rdb_instance.main", "endpoint_port"),
+					resource.TestCheckResourceAttrSet("scaleway_rdb_instance.main", "certificate"),
+					resource.TestCheckResourceAttrSet("scaleway_rdb_instance.main", "load_balancer.0.ip"),
+					resource.TestCheckResourceAttrSet("scaleway_rdb_instance.main", "load_balancer.0.endpoint_id"),
+					resource.TestCheckResourceAttrSet("scaleway_rdb_instance.main", "load_balancer.0.port"),
+				),
+			},
 		},
 	})
 }