fix(iam_policy): use TypeList for rules (#1410)

scaleway/helpers_iam.go

@@ -1,9 +1,6 @@
 package scaleway
 
 import (
-	"bytes"
-	"fmt"
-
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
 	iam "github.com/scaleway/scaleway-sdk-go/api/iam/v1alpha1"
 	"github.com/scaleway/scaleway-sdk-go/scw"
@@ -53,8 +50,8 @@ func flattenPermissionSetNames(permissions []string) *schema.Set {
 
 func expandPolicyRuleSpecs(d interface{}) []*iam.RuleSpecs {
 	rules := []*iam.RuleSpecs(nil)
-	rawRules := d.(*schema.Set)
-	for _, rawRule := range rawRules.List() {
+	rawRules := d.([]interface{})
+	for _, rawRule := range rawRules {
 		mapRule := rawRule.(map[string]interface{})
 		rule := &iam.RuleSpecs{
 			PermissionSetNames: expandPermissionSetNames(mapRule["permission_set_names"]),
@@ -70,32 +67,6 @@ func expandPolicyRuleSpecs(d interface{}) []*iam.RuleSpecs {
 	return rules
 }
 
-func iamPolicyRuleHash(v interface{}) int {
-	var buf bytes.Buffer
-	m, ok := v.(map[string]interface{})
-
-	if !ok {
-		return 0
-	}
-
-	if orgID, hasOrgID := m["organization_id"]; hasOrgID && orgID != nil {
-		buf.WriteString(fmt.Sprintf("%s-", orgID.(string)))
-	}
-	if projIDs, hasProjIDs := m["project_ids"]; hasProjIDs && projIDs != nil {
-		projIDList := projIDs.([]interface{})
-		for _, projID := range projIDList {
-			buf.WriteString(fmt.Sprintf("%s-", projID.(string)))
-		}
-	}
-	if permSet, hasPermSet := m["permission_set_names"]; hasPermSet {
-		permSetNames := permSet.(*schema.Set)
-		for _, permName := range permSetNames.List() {
-			buf.WriteString(fmt.Sprintf("%s-", permName.(string)))
-		}
-	}
-	return StringHashcode(buf.String())
-}
-
 func flattenPolicyRules(rules []*iam.Rule) interface{} {
 	rawRules := []interface{}(nil)
 	for _, rule := range rules {
@@ -113,5 +84,5 @@ func flattenPolicyRules(rules []*iam.Rule) interface{} {
 		}
 		rawRules = append(rawRules, rawRule)
 	}
-	return schema.NewSet(iamPolicyRuleHash, rawRules)
+	return rawRules
 }

scaleway/resource_iam_policy.go

@@ -78,10 +78,9 @@ func resourceScalewayIamPolicy() *schema.Resource {
 				ExactlyOneOf: []string{"user_id", "group_id", "application_id"},
 			},
 			"rule": {
-				Type:        schema.TypeSet,
+				Type:        schema.TypeList,
 				Required:    true,
 				Description: "Rules of the policy to create",
-				Set:         iamPolicyRuleHash,
 				Elem: &schema.Resource{
 					Schema: map[string]*schema.Schema{
 						"organization_id": {