-
Notifications
You must be signed in to change notification settings - Fork 4.6k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #1499 from terraform-providers/datalake-firewall-r…
…ules New Resource: `azurerm_data_lake_store_firewall_rule`
- Loading branch information
Showing
7 changed files
with
408 additions
and
23 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,146 @@ | ||
| package azurerm | ||
|
|
||
| import ( | ||
| "fmt" | ||
| "log" | ||
|
|
||
| "github.com/Azure/azure-sdk-for-go/services/datalake/store/mgmt/2016-11-01/account" | ||
| "github.com/hashicorp/terraform/helper/schema" | ||
| "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/response" | ||
| "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/validate" | ||
| "github.com/terraform-providers/terraform-provider-azurerm/azurerm/utils" | ||
| ) | ||
|
|
||
| func resourceArmDataLakeStoreFirewallRule() *schema.Resource { | ||
| return &schema.Resource{ | ||
| Create: resourceArmDateLakeStoreAccountFirewallRuleCreateUpdate, | ||
| Read: resourceArmDateLakeStoreAccountFirewallRuleRead, | ||
| Update: resourceArmDateLakeStoreAccountFirewallRuleCreateUpdate, | ||
| Delete: resourceArmDateLakeStoreAccountFirewallRuleDelete, | ||
| Importer: &schema.ResourceImporter{ | ||
| State: schema.ImportStatePassthrough, | ||
| }, | ||
|
|
||
| Schema: map[string]*schema.Schema{ | ||
| "name": { | ||
| Type: schema.TypeString, | ||
| Required: true, | ||
| ForceNew: true, | ||
| }, | ||
|
|
||
| "account_name": { | ||
| Type: schema.TypeString, | ||
| Required: true, | ||
| ForceNew: true, | ||
| }, | ||
|
|
||
| "resource_group_name": resourceGroupNameSchema(), | ||
|
|
||
| "start_ip_address": { | ||
| Type: schema.TypeString, | ||
| Required: true, | ||
| ValidateFunc: validate.IPv4Address, | ||
| }, | ||
|
|
||
| "end_ip_address": { | ||
| Type: schema.TypeString, | ||
| Required: true, | ||
| ValidateFunc: validate.IPv4Address, | ||
| }, | ||
| }, | ||
| } | ||
| } | ||
|
|
||
| func resourceArmDateLakeStoreAccountFirewallRuleCreateUpdate(d *schema.ResourceData, meta interface{}) error { | ||
| client := meta.(*ArmClient).dataLakeStoreFirewallRulesClient | ||
| ctx := meta.(*ArmClient).StopContext | ||
|
|
||
| log.Printf("[INFO] preparing arguments for Date Lake Store Firewall Rule creation.") | ||
|
|
||
| name := d.Get("name").(string) | ||
| accountName := d.Get("account_name").(string) | ||
| resourceGroup := d.Get("resource_group_name").(string) | ||
| startIPAddress := d.Get("start_ip_address").(string) | ||
| endIPAddress := d.Get("end_ip_address").(string) | ||
|
|
||
| dateLakeStore := account.CreateOrUpdateFirewallRuleParameters{ | ||
| CreateOrUpdateFirewallRuleProperties: &account.CreateOrUpdateFirewallRuleProperties{ | ||
| StartIPAddress: utils.String(startIPAddress), | ||
| EndIPAddress: utils.String(endIPAddress), | ||
| }, | ||
| } | ||
|
|
||
| _, err := client.CreateOrUpdate(ctx, resourceGroup, accountName, name, dateLakeStore) | ||
| if err != nil { | ||
| return fmt.Errorf("Error issuing create request for Data Lake Store %q (Resource Group %q): %+v", name, resourceGroup, err) | ||
| } | ||
|
|
||
| read, err := client.Get(ctx, resourceGroup, accountName, name) | ||
| if err != nil { | ||
| return fmt.Errorf("Error retrieving Data Lake Store Firewall Rule %q (Account %q / Resource Group %q): %+v", name, accountName, resourceGroup, err) | ||
| } | ||
| if read.ID == nil { | ||
| return fmt.Errorf("Cannot read Data Lake Store %q (Account %q / Resource Group %q) ID", name, accountName, resourceGroup) | ||
| } | ||
|
|
||
| d.SetId(*read.ID) | ||
|
|
||
| return resourceArmDateLakeStoreAccountFirewallRuleRead(d, meta) | ||
| } | ||
|
|
||
| func resourceArmDateLakeStoreAccountFirewallRuleRead(d *schema.ResourceData, meta interface{}) error { | ||
| client := meta.(*ArmClient).dataLakeStoreFirewallRulesClient | ||
| ctx := meta.(*ArmClient).StopContext | ||
|
|
||
| id, err := parseAzureResourceID(d.Id()) | ||
| if err != nil { | ||
| return err | ||
| } | ||
| resourceGroup := id.ResourceGroup | ||
| accountName := id.Path["accounts"] | ||
| name := id.Path["firewallRules"] | ||
|
|
||
| resp, err := client.Get(ctx, resourceGroup, accountName, name) | ||
| if err != nil { | ||
| if utils.ResponseWasNotFound(resp.Response) { | ||
| log.Printf("[WARN] Data Lake Store Firewall Rule %q was not found (Account %q / Resource Group %q)", name, accountName, resourceGroup) | ||
| d.SetId("") | ||
| return nil | ||
| } | ||
| return fmt.Errorf("Error making Read request on Azure Data Lake Store Firewall Rule %q (Account %q / Resource Group %q): %+v", name, accountName, resourceGroup, err) | ||
| } | ||
|
|
||
| d.Set("name", name) | ||
| d.Set("account_name", accountName) | ||
| d.Set("resource_group_name", resourceGroup) | ||
|
|
||
| if props := resp.FirewallRuleProperties; props != nil { | ||
| d.Set("start_ip_address", props.StartIPAddress) | ||
| d.Set("end_ip_address", props.EndIPAddress) | ||
| } | ||
|
|
||
| return nil | ||
| } | ||
|
|
||
| func resourceArmDateLakeStoreAccountFirewallRuleDelete(d *schema.ResourceData, meta interface{}) error { | ||
| client := meta.(*ArmClient).dataLakeStoreFirewallRulesClient | ||
| ctx := meta.(*ArmClient).StopContext | ||
|
|
||
| id, err := parseAzureResourceID(d.Id()) | ||
| if err != nil { | ||
| return err | ||
| } | ||
|
|
||
| resourceGroup := id.ResourceGroup | ||
| accountName := id.Path["accounts"] | ||
| name := id.Path["firewallRules"] | ||
| resp, err := client.Delete(ctx, resourceGroup, accountName, name) | ||
| if err != nil { | ||
| if response.WasNotFound(resp.Response) { | ||
| return nil | ||
| } | ||
| return fmt.Errorf("Error issuing delete request for Data Lake Store Firewall Rule %q (Account %q / Resource Group %q): %+v", name, accountName, resourceGroup, err) | ||
| } | ||
|
|
||
| return nil | ||
| } |
181 changes: 181 additions & 0 deletions
181
azurerm/resource_arm_data_lake_store_firewall_rule_test.go
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,181 @@ | ||
| package azurerm | ||
|
|
||
| import ( | ||
| "fmt" | ||
| "net/http" | ||
| "testing" | ||
|
|
||
| "github.com/hashicorp/terraform/helper/acctest" | ||
| "github.com/hashicorp/terraform/helper/resource" | ||
| "github.com/hashicorp/terraform/terraform" | ||
| ) | ||
|
|
||
| func TestAccAzureRMDataLakeStoreFirewallRule_basic(t *testing.T) { | ||
| resourceName := "azurerm_data_lake_store_firewall_rule.test" | ||
| startIP := "1.1.1.1" | ||
| endIP := "2.2.2.2" | ||
|
|
||
| ri := acctest.RandInt() | ||
| rs := acctest.RandString(4) | ||
|
|
||
| resource.Test(t, resource.TestCase{ | ||
| PreCheck: func() { testAccPreCheck(t) }, | ||
| Providers: testAccProviders, | ||
| CheckDestroy: testCheckAzureRMDataLakeStoreFirewallRuleDestroy, | ||
| Steps: []resource.TestStep{ | ||
| { | ||
| Config: testAccAzureRMDataLakeStoreFirewallRule_basic(ri, rs, testLocation(), startIP, endIP), | ||
| Check: resource.ComposeTestCheckFunc( | ||
| testCheckAzureRMDataLakeStoreFirewallRuleExists(resourceName), | ||
| resource.TestCheckResourceAttr(resourceName, "start_ip_address", startIP), | ||
| resource.TestCheckResourceAttr(resourceName, "end_ip_address", endIP), | ||
| ), | ||
| }, | ||
| { | ||
| ResourceName: resourceName, | ||
| ImportState: true, | ||
| ImportStateVerify: true, | ||
| }, | ||
| }, | ||
| }) | ||
| } | ||
|
|
||
| func TestAccAzureRMDataLakeStoreFirewallRule_update(t *testing.T) { | ||
| resourceName := "azurerm_data_lake_store_firewall_rule.test" | ||
| ri := acctest.RandInt() | ||
| rs := acctest.RandString(4) | ||
|
|
||
| resource.Test(t, resource.TestCase{ | ||
| PreCheck: func() { testAccPreCheck(t) }, | ||
| Providers: testAccProviders, | ||
| CheckDestroy: testCheckAzureRMDataLakeStoreFirewallRuleDestroy, | ||
| Steps: []resource.TestStep{ | ||
| { | ||
| Config: testAccAzureRMDataLakeStoreFirewallRule_basic(ri, rs, testLocation(), "1.1.1.1", "2.2.2.2"), | ||
| Check: resource.ComposeTestCheckFunc( | ||
| testCheckAzureRMDataLakeStoreFirewallRuleExists(resourceName), | ||
| resource.TestCheckResourceAttr(resourceName, "start_ip_address", "1.1.1.1"), | ||
| resource.TestCheckResourceAttr(resourceName, "end_ip_address", "2.2.2.2"), | ||
| ), | ||
| }, | ||
| { | ||
| Config: testAccAzureRMDataLakeStoreFirewallRule_basic(ri, rs, testLocation(), "2.2.2.2", "3.3.3.3"), | ||
| Check: resource.ComposeTestCheckFunc( | ||
| testCheckAzureRMDataLakeStoreFirewallRuleExists(resourceName), | ||
| resource.TestCheckResourceAttr(resourceName, "start_ip_address", "2.2.2.2"), | ||
| resource.TestCheckResourceAttr(resourceName, "end_ip_address", "3.3.3.3"), | ||
| ), | ||
| }, | ||
| }, | ||
| }) | ||
| } | ||
|
|
||
| func TestAccAzureRMDataLakeStoreFirewallRule_azureServices(t *testing.T) { | ||
| resourceName := "azurerm_data_lake_store_firewall_rule.test" | ||
| azureServicesIP := "0.0.0.0" | ||
| ri := acctest.RandInt() | ||
| rs := acctest.RandString(4) | ||
|
|
||
| resource.Test(t, resource.TestCase{ | ||
| PreCheck: func() { testAccPreCheck(t) }, | ||
| Providers: testAccProviders, | ||
| CheckDestroy: testCheckAzureRMDataLakeStoreFirewallRuleDestroy, | ||
| Steps: []resource.TestStep{ | ||
| { | ||
| Config: testAccAzureRMDataLakeStoreFirewallRule_basic(ri, rs, testLocation(), azureServicesIP, azureServicesIP), | ||
| Check: resource.ComposeTestCheckFunc( | ||
| testCheckAzureRMDataLakeStoreFirewallRuleExists(resourceName), | ||
| resource.TestCheckResourceAttr(resourceName, "start_ip_address", azureServicesIP), | ||
| resource.TestCheckResourceAttr(resourceName, "end_ip_address", azureServicesIP), | ||
| ), | ||
| }, | ||
| { | ||
| ResourceName: resourceName, | ||
| ImportState: true, | ||
| ImportStateVerify: true, | ||
| }, | ||
| }, | ||
| }) | ||
| } | ||
|
|
||
| func testCheckAzureRMDataLakeStoreFirewallRuleExists(name string) resource.TestCheckFunc { | ||
| return func(s *terraform.State) error { | ||
| // Ensure we have enough information in state to look up in API | ||
| rs, ok := s.RootModule().Resources[name] | ||
| if !ok { | ||
| return fmt.Errorf("Not found: %s", name) | ||
| } | ||
|
|
||
| firewallRuleName := rs.Primary.Attributes["name"] | ||
| accountName := rs.Primary.Attributes["account_name"] | ||
| resourceGroup, hasResourceGroup := rs.Primary.Attributes["resource_group_name"] | ||
| if !hasResourceGroup { | ||
| return fmt.Errorf("Bad: no resource group found in state for data lake store firewall rule: %s", name) | ||
| } | ||
|
|
||
| conn := testAccProvider.Meta().(*ArmClient).dataLakeStoreFirewallRulesClient | ||
| ctx := testAccProvider.Meta().(*ArmClient).StopContext | ||
|
|
||
| resp, err := conn.Get(ctx, resourceGroup, accountName, firewallRuleName) | ||
| if err != nil { | ||
| return fmt.Errorf("Bad: Get on dataLakeStoreFirewallRulesClient: %+v", err) | ||
| } | ||
|
|
||
| if resp.StatusCode == http.StatusNotFound { | ||
| return fmt.Errorf("Bad: Date Lake Store Firewall Rule %q (Account %q / Resource Group: %q) does not exist", firewallRuleName, accountName, resourceGroup) | ||
| } | ||
|
|
||
| return nil | ||
| } | ||
| } | ||
|
|
||
| func testCheckAzureRMDataLakeStoreFirewallRuleDestroy(s *terraform.State) error { | ||
| conn := testAccProvider.Meta().(*ArmClient).dataLakeStoreFirewallRulesClient | ||
| ctx := testAccProvider.Meta().(*ArmClient).StopContext | ||
|
|
||
| for _, rs := range s.RootModule().Resources { | ||
| if rs.Type != "azurerm_data_lake_store_firewall_rule" { | ||
| continue | ||
| } | ||
|
|
||
| firewallRuleName := rs.Primary.Attributes["name"] | ||
| accountName := rs.Primary.Attributes["account_name"] | ||
| resourceGroup := rs.Primary.Attributes["resource_group_name"] | ||
|
|
||
| resp, err := conn.Get(ctx, resourceGroup, accountName, firewallRuleName) | ||
| if err != nil { | ||
| if resp.StatusCode == http.StatusNotFound { | ||
| return nil | ||
| } | ||
|
|
||
| return err | ||
| } | ||
|
|
||
| return fmt.Errorf("Data Lake Store Firewall Rule still exists:\n%#v", resp) | ||
| } | ||
|
|
||
| return nil | ||
| } | ||
|
|
||
| func testAccAzureRMDataLakeStoreFirewallRule_basic(rInt int, rs, location, startIP, endIP string) string { | ||
| return fmt.Sprintf(` | ||
| resource "azurerm_resource_group" "test" { | ||
| name = "acctestRG-%d" | ||
| location = "%s" | ||
| } | ||
| resource "azurerm_data_lake_store" "test" { | ||
| name = "unlikely23exst2acct%s" | ||
| resource_group_name = "${azurerm_resource_group.test.name}" | ||
| location = "%s" | ||
| } | ||
| resource "azurerm_data_lake_store_firewall_rule" "test" { | ||
| name = "example" | ||
| account_name = "${azurerm_data_lake_store.test.name}" | ||
| resource_group_name = "${azurerm_resource_group.test.name}" | ||
| start_ip_address = "%s" | ||
| end_ip_address = "%s" | ||
| } | ||
| `, rInt, location, rs, location, startIP, endIP) | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.