fix: ignore-order-of-controls (#640)

* fix: ignore-order-of-controls

* fix test

* fix test

fix test

fix test

Author: ishtayger

sysdig/data_source_sysdig_secure_posture_zone_test.go

@@ -5,6 +5,7 @@ package sysdig_test
 import (
 	"fmt"
 	"github.com/draios/terraform-provider-sysdig/sysdig"
+	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/acctest"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
 	"testing"
 
@@ -13,6 +14,8 @@ import (
 )
 
 func TestAccDataSourceSysdigSecurePostureZones(t *testing.T) {
+	rID := func() string { return acctest.RandStringFromCharSet(36, acctest.CharSetAlphaNum) }
+	randomZoneId := fmt.Sprintf("test-zone-%s", rID())
 	resource.Test(t, resource.TestCase{
 		PreCheck: preCheckAnyEnv(t, SysdigSecureApiTokenEnv, SysdigIBMSecureAPIKeyEnv),
 		ProviderFactories: map[string]func() (*schema.Provider, error){
@@ -22,10 +25,10 @@ func TestAccDataSourceSysdigSecurePostureZones(t *testing.T) {
 		},
 		Steps: []resource.TestStep{
 			{
-				Config: testAccDataSourceSysdigSecurePostureZonesWithMultipleResourcesConfig(),
+				Config: testAccDataSourceSysdigSecurePostureZonesWithMultipleResourcesConfig(randomZoneId),
 				Check: resource.ComposeTestCheckFunc(
 					testAccCheckDataSourceSysdigSecurePostureZonesExists("data.sysdig_secure_posture_zone.test_posture_zone"),
-					resource.TestCheckResourceAttr("data.sysdig_secure_posture_zone.test_posture_zone", "name", "test-zone-1"),
+					resource.TestCheckResourceAttr("data.sysdig_secure_posture_zone.test_posture_zone", "name", randomZoneId),
 					resource.TestCheckResourceAttr("data.sysdig_secure_posture_zone.test_posture_zone", "description", "Test description 1"),
 					resource.TestCheckTypeSetElemNestedAttrs(
 						"data.sysdig_secure_posture_zone.test_posture_zone",
@@ -41,10 +44,10 @@ func TestAccDataSourceSysdigSecurePostureZones(t *testing.T) {
 	})
 }
 
-func testAccDataSourceSysdigSecurePostureZonesWithMultipleResourcesConfig() string {
-	return `
+func testAccDataSourceSysdigSecurePostureZonesWithMultipleResourcesConfig(zoneID string) string {
+	return fmt.Sprintf(`
 	resource "sysdig_secure_posture_zone" "test_posture_zone" {
-		name        = "test-zone-1"
+		name        = "%s"
 		description = "Test description 1"
 
 		scopes {
@@ -58,7 +61,7 @@ func testAccDataSourceSysdigSecurePostureZonesWithMultipleResourcesConfig() stri
 	data "sysdig_secure_posture_zone" "test_posture_zone" {
 		id = sysdig_secure_posture_zone.test_posture_zone.id
 	}
-	`
+	`, zoneID)
 }
 
 func testAccCheckDataSourceSysdigSecurePostureZonesExists(resourceName string) resource.TestCheckFunc {

sysdig/resource_sysdig_secure_posture_policy.go

@@ -27,7 +27,7 @@ func createGroupSchema(i int) *schema.Resource {
 					Required: true,
 				},
 				"requirement": {
-					Type:     schema.TypeList,
+					Type:     schema.TypeSet,
 					Optional: true,
 					Elem: &schema.Resource{
 						Schema: map[string]*schema.Schema{
@@ -44,7 +44,7 @@ func createGroupSchema(i int) *schema.Resource {
 								Required: true,
 							},
 							"control": {
-								Type:     schema.TypeList,
+								Type:     schema.TypeSet,
 								Optional: true,
 								Elem: &schema.Resource{
 									Schema: map[string]*schema.Schema{
@@ -86,7 +86,7 @@ func createGroupSchema(i int) *schema.Resource {
 				Elem:     createGroupSchema(i + 1),
 			},
 			"requirement": {
-				Type:     schema.TypeList,
+				Type:     schema.TypeSet,
 				Optional: true,
 				Elem: &schema.Resource{
 					Schema: map[string]*schema.Schema{
@@ -103,7 +103,7 @@ func createGroupSchema(i int) *schema.Resource {
 							Required: true,
 						},
 						"control": {
-							Type:     schema.TypeList,
+							Type:     schema.TypeSet,
 							Optional: true,
 							Elem: &schema.Resource{
 								Schema: map[string]*schema.Schema{
@@ -464,17 +464,17 @@ func extractGroupsRecursive(data interface{}) []v2.CreateRequirementsGroup {
 			Description: d["description"].(string),
 		}
 
-		if reqs, ok := d["requirement"].([]interface{}); ok {
-			for _, reqData := range reqs {
+		if reqs, ok := d["requirement"].(*schema.Set); ok {
+			for _, reqData := range reqs.List() {
 				reqMap := reqData.(map[string]interface{})
 				requirement := v2.CreateRequirement{
 					ID:          reqMap["id"].(string),
 					Name:        reqMap["name"].(string),
 					Description: reqMap["description"].(string),
 				}
 
-				if controlsData, ok := reqMap["control"].([]interface{}); ok {
-					for _, controlData := range controlsData {
+				if controlsData, ok := reqMap["control"].(*schema.Set); ok {
+					for _, controlData := range controlsData.List() {
 						controlMap := controlData.(map[string]interface{})
 						control := v2.CreateRequirementControl{
 							Name:    controlMap["name"].(string),