Merge pull request #6179 from r0bnet/analysis-services-server-ip4rule…

…-set Change type of ipv4_firewall_rule for Analysis Services Server
hashicorp · Mar 19, 2020 · e07a3b4 · e07a3b4
2 parents 46611c1 + b6933ef
commit e07a3b4
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 11 deletions.
diff --git a/azurerm/internal/services/analysisservices/analysis_services_server_resource.go b/azurerm/internal/services/analysisservices/analysis_services_server_resource.go
@@ -80,7 +80,7 @@ func resourceArmAnalysisServicesServer() *schema.Resource {
 			},
 
 			"ipv4_firewall_rule": {
-				Type:     schema.TypeList,
+				Type:     schema.TypeSet,
 				Optional: true,
 				Elem: &schema.Resource{
 					Schema: map[string]*schema.Schema{
@@ -368,7 +368,7 @@ func expandAnalysisServicesServerFirewallSettings(d *schema.ResourceData) *analy
 		EnablePowerBIService: utils.Bool(d.Get("enable_power_bi_service").(bool)),
 	}
 
-	firewallRules := d.Get("ipv4_firewall_rule").([]interface{})
+	firewallRules := d.Get("ipv4_firewall_rule").(*schema.Set).List()
 
 	fwRules := make([]analysisservices.IPv4FirewallRule, len(firewallRules))
 	for i, v := range firewallRules {

diff --git a/azurerm/internal/services/analysisservices/tests/analysis_services_server_resource_test.go b/azurerm/internal/services/analysisservices/tests/analysis_services_server_resource_test.go
@@ -115,25 +115,26 @@ func TestAccAzureRMAnalysisServicesServer_firewallSettings(t *testing.T) {
 					testCheckAzureRMAnalysisServicesServerExists(data.ResourceName),
 					resource.TestCheckResourceAttr(data.ResourceName, "enable_power_bi_service", "false"),
 					resource.TestCheckResourceAttr(data.ResourceName, "ipv4_firewall_rule.#", "1"),
-					resource.TestCheckResourceAttr(data.ResourceName, "ipv4_firewall_rule.0.name", "test1"),
-					resource.TestCheckResourceAttr(data.ResourceName, "ipv4_firewall_rule.0.range_start", "92.123.234.11"),
-					resource.TestCheckResourceAttr(data.ResourceName, "ipv4_firewall_rule.0.range_end", "92.123.234.12"),
 				),
 			},
+			{
+				ResourceName:      data.ResourceName,
+				ImportState:       true,
+				ImportStateVerify: true,
+			},
 			{
 				Config: config3,
 				Check: resource.ComposeTestCheckFunc(
 					testCheckAzureRMAnalysisServicesServerExists(data.ResourceName),
 					resource.TestCheckResourceAttr(data.ResourceName, "enable_power_bi_service", "true"),
 					resource.TestCheckResourceAttr(data.ResourceName, "ipv4_firewall_rule.#", "2"),
-					resource.TestCheckResourceAttr(data.ResourceName, "ipv4_firewall_rule.0.name", "test1"),
-					resource.TestCheckResourceAttr(data.ResourceName, "ipv4_firewall_rule.0.range_start", "92.123.234.11"),
-					resource.TestCheckResourceAttr(data.ResourceName, "ipv4_firewall_rule.0.range_end", "92.123.234.13"),
-					resource.TestCheckResourceAttr(data.ResourceName, "ipv4_firewall_rule.1.name", "test2"),
-					resource.TestCheckResourceAttr(data.ResourceName, "ipv4_firewall_rule.1.range_start", "226.202.187.57"),
-					resource.TestCheckResourceAttr(data.ResourceName, "ipv4_firewall_rule.1.range_end", "226.208.192.47"),
 				),
 			},
+			{
+				ResourceName:      data.ResourceName,
+				ImportState:       true,
+				ImportStateVerify: true,
+			},
 		},
 	})
 }