Skip to content

Commit

Permalink
Merge pull request #374 from civascu/fix_tf_crash_certificates
Browse files Browse the repository at this point in the history
Fixes crash when no certificate_permissions are defined
  • Loading branch information
tombuildsstuff authored Oct 2, 2017
2 parents 6e054b5 + 8b79a90 commit e7b5a1c
Showing 1 changed file with 8 additions and 6 deletions.
14 changes: 8 additions & 6 deletions azurerm/resource_arm_key_vault.go
Original file line number Diff line number Diff line change
Expand Up @@ -343,11 +343,6 @@ func flattenKeyVaultAccessPolicies(policies *[]keyvault.AccessPolicyEntry) []int
for _, policy := range *policies {
policyRaw := make(map[string]interface{})

certificatePermissionsRaw := make([]interface{}, 0, len(*policy.Permissions.Keys))
for _, certificatePermission := range *policy.Permissions.Certificates {
certificatePermissionsRaw = append(certificatePermissionsRaw, string(certificatePermission))
}

keyPermissionsRaw := make([]interface{}, 0, len(*policy.Permissions.Keys))
for _, keyPermission := range *policy.Permissions.Keys {
keyPermissionsRaw = append(keyPermissionsRaw, string(keyPermission))
Expand All @@ -363,10 +358,17 @@ func flattenKeyVaultAccessPolicies(policies *[]keyvault.AccessPolicyEntry) []int
if policy.ApplicationID != nil {
policyRaw["application_id"] = policy.ApplicationID.String()
}
policyRaw["certificate_permissions"] = certificatePermissionsRaw
policyRaw["key_permissions"] = keyPermissionsRaw
policyRaw["secret_permissions"] = secretPermissionsRaw

if policy.Permissions.Certificates != nil {
certificatePermissionsRaw := make([]interface{}, 0, len(*policy.Permissions.Certificates))
for _, certificatePermission := range *policy.Permissions.Certificates {
certificatePermissionsRaw = append(certificatePermissionsRaw, string(certificatePermission))
}
policyRaw["certificate_permissions"] = certificatePermissionsRaw
}

result = append(result, policyRaw)
}

Expand Down

0 comments on commit e7b5a1c

Please sign in to comment.