Merge pull request #152 from instaclustr/INS-1745-fix-firewall-rule-o…

…rdering

Make firewall rules sets instead

Makefile

@@ -5,7 +5,7 @@ BIN_NAME=terraform-provider-instaclustr
 # for VERSION, don't add prefix "v", e.g., use "1.9.8" instead of "v1.9.8" as it could break circleCI stuff
 
 
-VERSION=1.15.1
+VERSION=1.15.2
 
 INSTALL_FOLDER=$(HOME)/.terraform.d/plugins/terraform.instaclustr.com/instaclustr/instaclustr/$(VERSION)/darwin_amd64
 
@@ -72,7 +72,7 @@ ifndef IC_AZURE_STORAGE_CONTAINER_NAME
 	@echo "IC_AZURE_STORAGE_CONTAINER_NAME must be set for acceptance test (Kafka Connect custom connector bucket)"
 	@exit 1
 endif
-	cd acc_test && TF_ACC=1 go test -v -timeout 200m -count=1 -parallel=4
+	cd acc_test && TF_ACC=1 go test -v -timeout 200m -count=1 -parallel=6
 
 
 

instaclustr/resource_firewall_rule.go

@@ -38,7 +38,7 @@ func resourceFirewallRule() *schema.Resource {
 			},
 
 			"rules": {
-				Type:     schema.TypeList,
+				Type:     schema.TypeSet,
 				Required: true,
 				ForceNew: true,
 				Elem: &schema.Schema{
@@ -62,7 +62,7 @@ func resourceFirewallRuleCreate(d *schema.ResourceData, meta interface{}) error
 
 	rules := make([]RuleType, 0)
 
-	for _, rule := range d.Get("rules").([]interface{}) {
+	for _, rule := range d.Get("rules").(*schema.Set).List() {
 		aRule := ""
 
 		for _, value := range rule.(map[string]interface{}) {
@@ -129,6 +129,7 @@ func resourceFirewallRuleRead(d *schema.ResourceData, meta interface{}) error {
 			}
 		}
 	}
+	log.Printf("[INFO] Finished Reading the status of cluster %s.", id)
 	return nil
 }
 
@@ -149,7 +150,7 @@ func resourceFirewallRuleDelete(d *schema.ResourceData, meta interface{}) error
 
 	rules := make([]RuleType, 0)
 
-	for _, rule := range d.Get("rules").([]interface{}) {
+	for _, rule := range d.Get("rules").(*schema.Set).List() {
 		aRule := ""
 
 		for _, value := range rule.(map[string]interface{}) {