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

r/key_vault: making the network_acls block computed #5207

Merged
merged 2 commits into from
Dec 18, 2019
Merged

r/key_vault: making the network_acls block computed #5207

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8562bc6
r/key_vault: defaulting the `network_acl` block to `allowed` to match…
tombuildsstuff Dec 18, 2019
d304c1f
r/key_vault: making the `network_acls` block computed
tombuildsstuff Dec 18, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 9 additions & 1 deletion azurerm/resource_arm_key_vault.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -157,6 +157,7 @@ func resourceArmKeyVault() *schema.Resource {
"network_acls": {
Type: schema.TypeList,
Optional: true,
Computed: true,
MaxItems: 1,
Elem: &schema.Resource{
Schema: map[string]*schema.Schema{
Expand Down Expand Up @@ -471,7 +472,14 @@ func flattenKeyVaultSku(sku *keyvault.Sku) []interface{} {

func flattenKeyVaultNetworkAcls(input *keyvault.NetworkRuleSet) []interface{} {
if input == nil {
return []interface{}{}
return []interface{}{
map[string]interface{}{
"bypass": string(keyvault.AzureServices),
"default_action": string(keyvault.Allow),
"ip_rules": schema.NewSet(schema.HashString, []interface{}{}),
"virtual_network_subnet_ids": schema.NewSet(schema.HashString, []interface{}{}),
},
}
}

output := make(map[string]interface{})
Expand Down
84 changes: 70 additions & 14 deletions azurerm/resource_arm_key_vault_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,6 @@ func TestAccAzureRMKeyVault_basic(t *testing.T) {
Config: config,
Check: resource.ComposeTestCheckFunc(
testCheckAzureRMKeyVaultExists(resourceName),
resource.TestCheckResourceAttr(resourceName, "network_acls.#", "0"),
resource.TestCheckResourceAttr(resourceName, "sku_name", "premium"),
),
},
Expand Down Expand Up @@ -132,7 +131,6 @@ func TestAccAzureRMKeyVault_basicClassic(t *testing.T) {
Config: config,
Check: resource.ComposeTestCheckFunc(
testCheckAzureRMKeyVaultExists(resourceName),
resource.TestCheckResourceAttr(resourceName, "network_acls.#", "0"),
resource.TestCheckResourceAttr(resourceName, "sku.0.name", "premium"),
),
},
Expand Down Expand Up @@ -164,7 +162,6 @@ func TestAccAzureRMKeyVault_requiresImport(t *testing.T) {
Config: testAccAzureRMKeyVault_basic(ri, location),
Check: resource.ComposeTestCheckFunc(
testCheckAzureRMKeyVaultExists(resourceName),
resource.TestCheckResourceAttr(resourceName, "network_acls.#", "0"),
),
},
{
Expand All @@ -189,24 +186,49 @@ func TestAccAzureRMKeyVault_networkAcls(t *testing.T) {
Config: testAccAzureRMKeyVault_networkAcls(ri, location),
Check: resource.ComposeTestCheckFunc(
testCheckAzureRMKeyVaultExists(resourceName),
resource.TestCheckResourceAttr(resourceName, "network_acls.#", "1"),
resource.TestCheckResourceAttr(resourceName, "network_acls.0.bypass", "None"),
resource.TestCheckResourceAttr(resourceName, "network_acls.0.default_action", "Deny"),
resource.TestCheckResourceAttr(resourceName, "network_acls.0.ip_rules.#", "0"),
resource.TestCheckResourceAttr(resourceName, "network_acls.0.virtual_network_subnet_ids.#", "2"),
),
},
{
ResourceName: resourceName,
ImportState: true,
ImportStateVerify: true,
},
{
Config: testAccAzureRMKeyVault_networkAclsUpdated(ri, location),
Check: resource.ComposeTestCheckFunc(
testCheckAzureRMKeyVaultExists(resourceName),
resource.TestCheckResourceAttr(resourceName, "network_acls.#", "1"),
resource.TestCheckResourceAttr(resourceName, "network_acls.0.bypass", "AzureServices"),
resource.TestCheckResourceAttr(resourceName, "network_acls.0.default_action", "Allow"),
resource.TestCheckResourceAttr(resourceName, "network_acls.0.ip_rules.#", "1"),
resource.TestCheckResourceAttr(resourceName, "network_acls.0.virtual_network_subnet_ids.#", "1"),
),
},
{
ResourceName: resourceName,
ImportState: true,
ImportStateVerify: true,
},
},
})
}

func TestAccAzureRMKeyVault_networkAclsAllowed(t *testing.T) {
resourceName := "azurerm_key_vault.test"
ri := tf.AccRandTimeInt()
location := testLocation()

resource.ParallelTest(t, resource.TestCase{
PreCheck: func() { testAccPreCheck(t) },
Providers: testAccProviders,
CheckDestroy: testCheckAzureRMKeyVaultDestroy,
Steps: []resource.TestStep{
{
Config: testAccAzureRMKeyVault_networkAclsAllowed(ri, location),
Check: resource.ComposeTestCheckFunc(
testCheckAzureRMKeyVaultExists(resourceName),
),
},
{
ResourceName: resourceName,
ImportState: true,
ImportStateVerify: true,
},
},
})
}
Expand Down Expand Up @@ -673,13 +695,47 @@ resource "azurerm_key_vault" "test" {
network_acls {
default_action = "Allow"
bypass = "AzureServices"
ip_rules = ["10.0.0.102/32"]
ip_rules = ["123.0.0.102/32"]
virtual_network_subnet_ids = ["${azurerm_subnet.test_a.id}"]
}
}
`, template, rInt)
}

func testAccAzureRMKeyVault_networkAclsAllowed(rInt int, location string) string {
template := testAccAzureRMKeyVault_networkAclsTemplate(rInt, location)
return fmt.Sprintf(`
%s

resource "azurerm_key_vault" "test" {
name = "vault%d"
location = "${azurerm_resource_group.test.location}"
resource_group_name = "${azurerm_resource_group.test.name}"
tenant_id = "${data.azurerm_client_config.current.tenant_id}"

sku_name = "premium"

access_policy {
tenant_id = "${data.azurerm_client_config.current.tenant_id}"
object_id = "${data.azurerm_client_config.current.client_id}"

key_permissions = [
"create",
]

secret_permissions = [
"set",
]
}

network_acls {
default_action = "Allow"
bypass = "AzureServices"
}
}
`, template, rInt)
}

func testAccAzureRMKeyVault_update(rInt int, location string) string {
return fmt.Sprintf(`
data "azurerm_client_config" "current" {}
Expand Down