Merge branch 'master' into feat-domain-add-wait-dns-zone-state

Author: remyleone

scaleway/data_source_rdb_acl_test.go

@@ -7,7 +7,7 @@ import (
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
 )
 
-func TestAccScalewayDataSourceRDBAcl_Basic(t *testing.T) {
+func TestAccScalewayDataSourceRdbAcl_Basic(t *testing.T) {
 	tt := NewTestTools(t)
 	defer tt.Cleanup()
 	instanceName := "TestAccScalewayDataSourceRDBAcl_Basic"
@@ -63,9 +63,9 @@ func TestAccScalewayDataSourceRDBAcl_Basic(t *testing.T) {
 							description = "bar"
 						}
 					}
+
 					data "scaleway_rdb_acl" "maindata" {
 						instance_id = scaleway_rdb_instance.main.id
-
 					}`, instanceName),
 				Check: resource.ComposeTestCheckFunc(
 					resource.TestCheckResourceAttr("scaleway_rdb_acl.main", "acl_rules.0.ip", "1.2.3.4/32"),

scaleway/resource_rdb_acl.go

@@ -1,7 +1,10 @@
 package scaleway
 
 import (
+	"bytes"
 	"context"
+	"net"
+	"sort"
 
 	"github.com/hashicorp/terraform-plugin-sdk/v2/diag"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
@@ -32,7 +35,7 @@ func resourceScalewayRdbACL() *schema.Resource {
 				Description:  "Instance on which the ACL is applied",
 			},
 			"acl_rules": {
-				Type:        schema.TypeSet,
+				Type:        schema.TypeList,
 				Required:    true,
 				Description: "List of ACL rules to apply",
 				Elem: &schema.Resource{
@@ -70,7 +73,7 @@ func resourceScalewayRdbACLCreate(ctx context.Context, d *schema.ResourceData, m
 		return diag.FromErr(err)
 	}
 
-	aclRules, err := rdbACLExpand(d.Get("acl_rules").(*schema.Set))
+	aclRules, err := rdbACLExpand(d.Get("acl_rules").([]interface{}))
 	if err != nil {
 		return diag.FromErr(err)
 	}
@@ -139,7 +142,7 @@ func resourceScalewayRdbACLUpdate(ctx context.Context, d *schema.ResourceData, m
 			return diag.FromErr(err)
 		}
 
-		aclRules, err := rdbACLExpand(d.Get("acl_rules").(*schema.Set))
+		aclRules, err := rdbACLExpand(d.Get("acl_rules").([]interface{}))
 		if err != nil {
 			return diag.FromErr(err)
 		}
@@ -164,7 +167,7 @@ func resourceScalewayRdbACLDelete(ctx context.Context, d *schema.ResourceData, m
 		return diag.FromErr(err)
 	}
 	aclRuleIPs := make([]string, 0)
-	aclRules, err := rdbACLExpand(d.Get("acl_rules").(*schema.Set))
+	aclRules, err := rdbACLExpand(d.Get("acl_rules").([]interface{}))
 	if err != nil {
 		return diag.FromErr(err)
 	}
@@ -182,17 +185,21 @@ func resourceScalewayRdbACLDelete(ctx context.Context, d *schema.ResourceData, m
 		InstanceID: instanceID,
 		ACLRuleIPs: aclRuleIPs,
 	}, scw.WithContext(ctx))
+	if err != nil && !is404Error(err) {
+		return diag.FromErr(err)
+	}
 
+	_, err = waitForRDBInstance(ctx, rdbAPI, region, instanceID, d.Timeout(schema.TimeoutDelete))
 	if err != nil && !is404Error(err) {
 		return diag.FromErr(err)
 	}
 
 	return nil
 }
 
-func rdbACLExpand(data *schema.Set) ([]*rdb.ACLRuleRequest, error) {
+func rdbACLExpand(data []interface{}) ([]*rdb.ACLRuleRequest, error) {
 	var res []*rdb.ACLRuleRequest
-	for _, rule := range data.List() {
+	for _, rule := range data {
 		r := rule.(map[string]interface{})
 		ip, err := expandIPNet(r["ip"].(string))
 		if err != nil {
@@ -204,6 +211,10 @@ func rdbACLExpand(data *schema.Set) ([]*rdb.ACLRuleRequest, error) {
 		})
 	}
 
+	sort.Slice(res, func(i, j int) bool {
+		return bytes.Compare(res[i].IP.IP, res[j].IP.IP) < 0
+	})
+
 	return res, nil
 }
 
@@ -216,5 +227,12 @@ func rdbACLRulesFlatten(rules []*rdb.ACLRule) []map[string]interface{} {
 		}
 		res = append(res, r)
 	}
+
+	sort.Slice(res, func(i, j int) bool {
+		ipI, _, _ := net.ParseCIDR(res[i]["ip"].(string))
+		ipJ, _, _ := net.ParseCIDR(res[j]["ip"].(string))
+		return bytes.Compare(ipI, ipJ) < 0
+	})
+
 	return res
 }

scaleway/resource_rdb_acl_test.go

@@ -77,10 +77,10 @@ func TestAccScalewayRdbACL_Basic(t *testing.T) {
 						}
 					}`, instanceName),
 				Check: resource.ComposeTestCheckFunc(
-					resource.TestCheckResourceAttr("scaleway_rdb_acl.main", "acl_rules.0.ip", "4.5.6.7/32"),
-					resource.TestCheckResourceAttr("scaleway_rdb_acl.main", "acl_rules.0.description", "bar"),
-					resource.TestCheckResourceAttr("scaleway_rdb_acl.main", "acl_rules.1.ip", "1.2.3.4/32"),
-					resource.TestCheckResourceAttr("scaleway_rdb_acl.main", "acl_rules.1.description", "foo"),
+					resource.TestCheckResourceAttr("scaleway_rdb_acl.main", "acl_rules.0.ip", "1.2.3.4/32"),
+					resource.TestCheckResourceAttr("scaleway_rdb_acl.main", "acl_rules.0.description", "foo"),
+					resource.TestCheckResourceAttr("scaleway_rdb_acl.main", "acl_rules.1.ip", "4.5.6.7/32"),
+					resource.TestCheckResourceAttr("scaleway_rdb_acl.main", "acl_rules.1.description", "bar"),
 				),
 			},
 			{
@@ -105,10 +105,10 @@ func TestAccScalewayRdbACL_Basic(t *testing.T) {
 						}
 					}`, instanceName),
 				Check: resource.ComposeTestCheckFunc(
-					resource.TestCheckResourceAttr("scaleway_rdb_acl.main", "acl_rules.0.ip", "9.0.0.0/16"),
-					resource.TestCheckResourceAttr("scaleway_rdb_acl.main", "acl_rules.0.description", "baz"),
-					resource.TestCheckResourceAttr("scaleway_rdb_acl.main", "acl_rules.1.ip", "1.2.3.4/32"),
-					resource.TestCheckResourceAttr("scaleway_rdb_acl.main", "acl_rules.1.description", "foo"),
+					resource.TestCheckResourceAttr("scaleway_rdb_acl.main", "acl_rules.1.ip", "9.0.0.0/16"),
+					resource.TestCheckResourceAttr("scaleway_rdb_acl.main", "acl_rules.1.description", "baz"),
+					resource.TestCheckResourceAttr("scaleway_rdb_acl.main", "acl_rules.0.ip", "1.2.3.4/32"),
+					resource.TestCheckResourceAttr("scaleway_rdb_acl.main", "acl_rules.0.description", "foo"),
 				),
 			},
 			{