From 88191b6848252bfa78d843de1f7590da6b62c9c4 Mon Sep 17 00:00:00 2001 From: Gillian Stravers Date: Mon, 20 Jan 2025 15:05:01 +0100 Subject: [PATCH 1/2] new version keyvault --- main.tf | 2 +- variables.tf | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/main.tf b/main.tf index 9cd25fd..71b6032 100644 --- a/main.tf +++ b/main.tf @@ -12,7 +12,7 @@ resource "azurerm_resource_group" "this" { } module "keyvault_with_cmk" { - source = "github.com/schubergphilis/terraform-azure-mcaf-key-vault.git?ref=v0.3.1" + source = "github.com/schubergphilis/terraform-azure-mcaf-key-vault.git?ref=v0.3.2" key_vault = { name = var.key_vault.name diff --git a/variables.tf b/variables.tf index 55a9a7f..f9d5880 100644 --- a/variables.tf +++ b/variables.tf @@ -27,6 +27,7 @@ variable "key_vault" { cmk_rotation_period = optional(string, "P18M") cmk_expiry_period = optional(string, "P2Y") cmk_notify_period = optional(string, "P30D") + cmk_expiration_date = optional(string, null) }) } From 626f3b4b9c40761b3ba9111ad8b5084f740cc61e Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Mon, 20 Jan 2025 14:06:54 +0000 Subject: [PATCH 2/2] docs(readme): update module usage --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 721fca9..c514b98 100644 --- a/README.md +++ b/README.md @@ -19,7 +19,7 @@ Terraform module to create the Core component of each workload, currently only i | Name | Source | Version | |------|--------|---------| -| [keyvault\_with\_cmk](#module\_keyvault\_with\_cmk) | github.com/schubergphilis/terraform-azure-mcaf-key-vault.git | v0.3.1 | +| [keyvault\_with\_cmk](#module\_keyvault\_with\_cmk) | github.com/schubergphilis/terraform-azure-mcaf-key-vault.git | v0.3.2 | ## Resources @@ -32,7 +32,7 @@ Terraform module to create the Core component of each workload, currently only i | Name | Description | Type | Default | Required | |------|-------------|------|---------|:--------:| -| [key\_vault](#input\_key\_vault) | n/a |
object({
name = string
enabled_for_disk_encryption = optional(bool, false)
enabled_for_deployment = optional(bool, false)
enabled_for_template_deployment = optional(bool, false)
enable_rbac_authorization = optional(bool, true)
purge_protection = optional(bool, true)
soft_delete_retention_days = optional(number, 30)
sku = optional(string, "standard")
ip_rules = optional(list(string), [])
subnet_ids = optional(list(string), [])
network_bypass = optional(string, "None")
cmk_keys_create = optional(bool, true)
cmkrsa_key_name = optional(string, "cmkrsa")
cmkec_key_name = optional(string, "cmkec")
cmk_rotation_period = optional(string, "P18M")
cmk_expiry_period = optional(string, "P2Y")
cmk_notify_period = optional(string, "P30D")
})
| n/a | yes | +| [key\_vault](#input\_key\_vault) | n/a |
object({
name = string
enabled_for_disk_encryption = optional(bool, false)
enabled_for_deployment = optional(bool, false)
enabled_for_template_deployment = optional(bool, false)
enable_rbac_authorization = optional(bool, true)
purge_protection = optional(bool, true)
soft_delete_retention_days = optional(number, 30)
sku = optional(string, "standard")
ip_rules = optional(list(string), [])
subnet_ids = optional(list(string), [])
network_bypass = optional(string, "None")
cmk_keys_create = optional(bool, true)
cmkrsa_key_name = optional(string, "cmkrsa")
cmkec_key_name = optional(string, "cmkec")
cmk_rotation_period = optional(string, "P18M")
cmk_expiry_period = optional(string, "P2Y")
cmk_notify_period = optional(string, "P30D")
cmk_expiration_date = optional(string, null)
})
| n/a | yes | | [location](#input\_location) | Location of the resources to create | `string` | n/a | yes | | [resource\_group](#input\_resource\_group) | The name of the resource group in which to create the resources. |
object({
name = string
})
|
{
"name": null
}
| no | | [tags](#input\_tags) | A map of tags to assign to the resource. | `map(string)` | `{}` | no |