Fix firewall filerting rules panic issue (#242)

* fix firewall filtering rules data panic * fix firewall filtering rules resource test
zscaler · May 24, 2023 · 4a58ebb · 4a58ebb
1 parent 9551344
commit 4a58ebb
Show file tree

Hide file tree

Showing 2 changed files with 48 additions and 12 deletions.
diff --git a/zia/data_source_zia_firewall_filtering_rules.go b/zia/data_source_zia_firewall_filtering_rules.go
@@ -223,7 +223,25 @@ func dataSourceFirewallFilteringRule() *schema.Resource {
 			"src_ip_groups": {
 				Type:     schema.TypeList,
 				Computed: true,
-				Elem:     &schema.Schema{Type: schema.TypeString},
+				Elem: &schema.Resource{
+					Schema: map[string]*schema.Schema{
+						"id": {
+							Type:     schema.TypeInt,
+							Computed: true,
+						},
+						"name": {
+							Type:     schema.TypeString,
+							Computed: true,
+						},
+						"extensions": {
+							Type:     schema.TypeMap,
+							Computed: true,
+							Elem: &schema.Schema{
+								Type: schema.TypeString,
+							},
+						},
+					},
+				},
 			},
 			"dest_addresses": {
 				Type:     schema.TypeList,
@@ -243,7 +261,25 @@ func dataSourceFirewallFilteringRule() *schema.Resource {
 			"dest_ip_groups": {
 				Type:     schema.TypeList,
 				Computed: true,
-				Elem:     &schema.Schema{Type: schema.TypeString},
+				Elem: &schema.Resource{
+					Schema: map[string]*schema.Schema{
+						"id": {
+							Type:     schema.TypeInt,
+							Computed: true,
+						},
+						"name": {
+							Type:     schema.TypeString,
+							Computed: true,
+						},
+						"extensions": {
+							Type:     schema.TypeMap,
+							Computed: true,
+							Elem: &schema.Schema{
+								Type: schema.TypeString,
+							},
+						},
+					},
+				},
 			},
 			"nw_services": {
 				Type:     schema.TypeList,

diff --git a/zia/resource_zia_firewall_filtering_rules_test.go b/zia/resource_zia_firewall_filtering_rules_test.go
@@ -33,11 +33,11 @@ func TestAccResourceFirewallFilteringRuleBasic(t *testing.T) {
 					resource.TestCheckResourceAttr(resourceTypeAndName, "state", variable.FWRuleResourceState),
 					resource.TestCheckResourceAttrSet(resourceTypeAndName, "order"),
 					resource.TestCheckResourceAttr(resourceTypeAndName, "nw_services.#", "1"),
-					resource.TestCheckResourceAttr(resourceTypeAndName, "departments.#", "2"),
-					resource.TestCheckResourceAttr(resourceTypeAndName, "groups.#", "2"),
-					resource.TestCheckResourceAttr(resourceTypeAndName, "time_windows.#", "2"),
-					resource.TestCheckResourceAttr(resourceTypeAndName, "src_ip_groups.#", "2"),
-					resource.TestCheckResourceAttr(resourceTypeAndName, "dest_ip_groups.#", "2"),
+					resource.TestCheckResourceAttr(resourceTypeAndName, "departments.0.id.#", "2"),
+					resource.TestCheckResourceAttr(resourceTypeAndName, "groups.0.id.#", "2"),
+					resource.TestCheckResourceAttr(resourceTypeAndName, "time_windows.0.id.#", "2"),
+					resource.TestCheckResourceAttr(resourceTypeAndName, "src_ip_groups.0.id.#", "2"),
+					resource.TestCheckResourceAttr(resourceTypeAndName, "dest_ip_groups.0.id.#", "2"),
 					resource.TestCheckResourceAttr(resourceTypeAndName, "enable_full_logging", strconv.FormatBool(variable.FWRuleEnableLogging)),
 				),
 			},
@@ -53,11 +53,11 @@ func TestAccResourceFirewallFilteringRuleBasic(t *testing.T) {
 					resource.TestCheckResourceAttr(resourceTypeAndName, "state", variable.FWRuleResourceState),
 					resource.TestCheckResourceAttrSet(resourceTypeAndName, "order"),
 					resource.TestCheckResourceAttr(resourceTypeAndName, "nw_services.#", "1"),
-					resource.TestCheckResourceAttr(resourceTypeAndName, "departments.#", "2"),
-					resource.TestCheckResourceAttr(resourceTypeAndName, "groups.#", "2"),
-					resource.TestCheckResourceAttr(resourceTypeAndName, "time_windows.#", "2"),
-					resource.TestCheckResourceAttr(resourceTypeAndName, "src_ip_groups.#", "2"),
-					resource.TestCheckResourceAttr(resourceTypeAndName, "dest_ip_groups.#", "2"),
+					resource.TestCheckResourceAttr(resourceTypeAndName, "departments.0.id.#", "2"),
+					resource.TestCheckResourceAttr(resourceTypeAndName, "groups.0.id.#", "2"),
+					resource.TestCheckResourceAttr(resourceTypeAndName, "time_windows.0.id.#", "2"),
+					resource.TestCheckResourceAttr(resourceTypeAndName, "src_ip_groups.0.id.#", "2"),
+					resource.TestCheckResourceAttr(resourceTypeAndName, "dest_ip_groups.0.id.#", "2"),
 					resource.TestCheckResourceAttr(resourceTypeAndName, "enable_full_logging", strconv.FormatBool(variable.FWRuleEnableLogging)),
 				),
 			},