fix(redis): change acl from list to set (#1366)

scaleway · Jul 12, 2022 · 05b7d09 · 05b7d09
1 parent 27b2a0c
commit 05b7d09
Show file tree

Hide file tree

Showing 4 changed files with 258 additions and 325 deletions.
diff --git a/scaleway/helpers_redis.go b/scaleway/helpers_redis.go
@@ -85,7 +85,7 @@ func expandRedisPrivateNetwork(data []interface{}) ([]*redis.EndpointSpec, error
 func expandRedisACLSpecs(i interface{}) ([]*redis.ACLRuleSpec, error) {
 	rules := []*redis.ACLRuleSpec(nil)
 
-	for _, aclRule := range i.([]interface{}) {
+	for _, aclRule := range i.(*schema.Set).List() {
 		rawRule := aclRule.(map[string]interface{})
 		rule := &redis.ACLRuleSpec{}
 		if ruleDescription, hasDescription := rawRule["description"]; hasDescription {

diff --git a/scaleway/resource_redis_cluster.go b/scaleway/resource_redis_cluster.go
@@ -76,7 +76,7 @@ func resourceScalewayRedisCluster() *schema.Resource {
 				ForceNew:    true,
 			},
 			"acl": {
-				Type:        schema.TypeList,
+				Type:        schema.TypeSet,
 				Description: "List of acl rules.",
 				Optional:    true,
 				Elem: &schema.Resource{

diff --git a/scaleway/resource_redis_cluster_test.go b/scaleway/resource_redis_cluster_test.go
@@ -204,11 +204,15 @@ func TestAccScalewayRedisCluster_ACL(t *testing.T) {
 					resource.TestCheckResourceAttr("scaleway_redis_cluster.main", "node_type", "MDB-BETA-M"),
 					resource.TestCheckResourceAttr("scaleway_redis_cluster.main", "user_name", "my_initial_user"),
 					resource.TestCheckResourceAttr("scaleway_redis_cluster.main", "password", "thiZ_is_v&ry_s3cret"),
-					resource.TestCheckResourceAttr("scaleway_redis_cluster.main", "acl.0.ip", "0.0.0.0/0"),
-					resource.TestCheckResourceAttr("scaleway_redis_cluster.main", "acl.0.description", "An acl description"),
+					resource.TestCheckTypeSetElemNestedAttrs("scaleway_redis_cluster.main", "acl.*", map[string]string{
+						"ip":          "0.0.0.0/0",
+						"description": "An acl description",
+					}),
+					resource.TestCheckTypeSetElemNestedAttrs("scaleway_redis_cluster.main", "acl.*", map[string]string{
+						"ip":          "192.168.10.0/24",
+						"description": "A second acl description",
+					}),
 					resource.TestCheckResourceAttrSet("scaleway_redis_cluster.main", "acl.0.id"),
-					resource.TestCheckResourceAttr("scaleway_redis_cluster.main", "acl.1.ip", "192.168.10.0/24"),
-					resource.TestCheckResourceAttr("scaleway_redis_cluster.main", "acl.1.description", "A second acl description"),
 					resource.TestCheckResourceAttrSet("scaleway_redis_cluster.main", "acl.1.id"),
 				),
 			},