Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

azurerm_storage_account_network_rules - correctly clear ip_rules, virtual_network_subnet_ids when set to [] #7385

Merged
merged 1 commit into from Jun 23, 2020
Merged

azurerm_storage_account_network_rules - correctly clear ip_rules, virtual_network_subnet_ids when set to [] #7385

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
18 changes: 4 additions & 14 deletions azurerm/internal/services/storage/resource_arm_storage_account_network_rules.go
View file
Open in desktop
Expand Up @@ -11,7 +11,6 @@ import (
"github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/azure"
"github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/tf"
"github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/clients"
"github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/features"
"github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/locks"
"github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/timeouts"
"github.com/terraform-providers/terraform-provider-azurerm/azurerm/utils"
Expand Down Expand Up @@ -116,7 +115,7 @@ func resourceArmStorageAccountNetworkRulesCreateUpdate(d *schema.ResourceData, m
return fmt.Errorf("Error retrieving Storage Account %q (Resource Group %q): %+v", storageAccountName, resourceGroup, err)
}

if features.ShouldResourcesBeImported() && d.IsNewResource() {
if d.IsNewResource() {
if storageAccount.AccountProperties == nil {
return fmt.Errorf("Error retrieving Storage Account %q (Resource Group %q): `properties` was nil", storageAccountName, resourceGroup)
}
Expand All @@ -132,18 +131,9 @@ func resourceArmStorageAccountNetworkRulesCreateUpdate(d *schema.ResourceData, m
}

rules.DefaultAction = storage.DefaultAction(d.Get("default_action").(string))

if v, ok := d.GetOk("bypass"); ok {
rules.Bypass = expandStorageAccountNetworkRuleBypass(v.(*schema.Set).List())
}

if v, ok := d.GetOk("ip_rules"); ok {
rules.IPRules = expandStorageAccountNetworkRuleIpRules(v.(*schema.Set).List())
}

if v, ok := d.GetOk("virtual_network_subnet_ids"); ok {
rules.VirtualNetworkRules = expandStorageAccountNetworkRuleVirtualRules(v.(*schema.Set).List())
}
rules.Bypass = expandStorageAccountNetworkRuleBypass(d.Get("bypass").(*schema.Set).List())
rules.IPRules = expandStorageAccountNetworkRuleIpRules(d.Get("ip_rules").(*schema.Set).List())
rules.VirtualNetworkRules = expandStorageAccountNetworkRuleVirtualRules(d.Get("virtual_network_subnet_ids").(*schema.Set).List())

opts := storage.AccountUpdateParameters{
AccountPropertiesUpdateParameters: &storage.AccountPropertiesUpdateParameters{
Expand Down
13 changes: 11 additions & 2 deletions azurerm/internal/services/storage/tests/resource_arm_storage_account_network_rules_test.go
View file
Open in desktop
Expand Up @@ -49,6 +49,13 @@ func TestAccAzureRMStorageAccountNetworkRules_update(t *testing.T) {
),
},
data.ImportStep(),
{
Config: testAccAzureRMStorageAccountNetworkRules_empty(data),
Check: resource.ComposeTestCheckFunc(
testCheckAzureRMStorageAccountExists("azurerm_storage_account.test"),
),
},
data.ImportStep(),
{
Config: testAccAzureRMStorageAccountNetworkRules_basic(data),
Check: resource.ComposeTestCheckFunc(
Expand Down Expand Up @@ -213,8 +220,10 @@ resource "azurerm_storage_account_network_rules" "test" {
resource_group_name = azurerm_resource_group.test.name
storage_account_name = azurerm_storage_account.test.name

default_action = "Deny"
bypass = ["Metrics"]
default_action = "Deny"
bypass = ["None"]
ip_rules = []
virtual_network_subnet_ids = []
}
`, data.RandomInteger, data.Locations.Primary, data.RandomString)
}