From c60160d9c8005ec256bffb24de7d64810c707cc9 Mon Sep 17 00:00:00 2001 From: magreenbaum Date: Mon, 4 Sep 2023 15:13:19 -0400 Subject: [PATCH] add custom_key_store_id --- README.md | 7 ++++--- examples/complete/README.md | 6 +++--- examples/complete/versions.tf | 4 ++-- main.tf | 1 + variables.tf | 6 ++++++ versions.tf | 4 ++-- 6 files changed, 18 insertions(+), 10 deletions(-) diff --git a/README.md b/README.md index a3a3048..0e813f0 100644 --- a/README.md +++ b/README.md @@ -146,14 +146,14 @@ Examples codified under the [`examples`](https://github.com/terraform-aws-module | Name | Version | |------|---------| -| [terraform](#requirement\_terraform) | >= 0.13.1 | -| [aws](#requirement\_aws) | >= 3.72 | +| [terraform](#requirement\_terraform) | >= 1.0 | +| [aws](#requirement\_aws) | >= 4.33 | ## Providers | Name | Version | |------|---------| -| [aws](#provider\_aws) | >= 3.72 | +| [aws](#provider\_aws) | >= 4.33 | ## Modules @@ -185,6 +185,7 @@ No modules. | [create\_external](#input\_create\_external) | Determines whether an external CMK (externally provided material) will be created or a standard CMK (AWS provided material) | `bool` | `false` | no | | [create\_replica](#input\_create\_replica) | Determines whether a replica standard CMK will be created (AWS provided material) | `bool` | `false` | no | | [create\_replica\_external](#input\_create\_replica\_external) | Determines whether a replica external CMK will be created (externally provided material) | `bool` | `false` | no | +| [custom\_key\_store\_id](#input\_custom\_key\_store\_id) | ID of the KMS Custom Key Store where the key will be stored instead of KMS (eg CloudHSM). | `string` | `null` | no | | [customer\_master\_key\_spec](#input\_customer\_master\_key\_spec) | Specifies whether the key contains a symmetric key or an asymmetric key pair and the encryption algorithms or signing algorithms that the key supports. Valid values: `SYMMETRIC_DEFAULT`, `RSA_2048`, `RSA_3072`, `RSA_4096`, `HMAC_256`, `ECC_NIST_P256`, `ECC_NIST_P384`, `ECC_NIST_P521`, or `ECC_SECG_P256K1`. Defaults to `SYMMETRIC_DEFAULT` | `string` | `null` | no | | [deletion\_window\_in\_days](#input\_deletion\_window\_in\_days) | The waiting period, specified in number of days. After the waiting period ends, AWS KMS deletes the KMS key. If you specify a value, it must be between `7` and `30`, inclusive. If you do not specify a value, it defaults to `30` | `number` | `null` | no | | [description](#input\_description) | The description of the key as viewed in AWS console | `string` | `null` | no | diff --git a/examples/complete/README.md b/examples/complete/README.md index 8a4297f..48d306d 100644 --- a/examples/complete/README.md +++ b/examples/complete/README.md @@ -24,14 +24,14 @@ Note that this example may create resources which will incur monetary charges on | Name | Version | |------|---------| -| [terraform](#requirement\_terraform) | >= 0.13.1 | -| [aws](#requirement\_aws) | >= 3.72 | +| [terraform](#requirement\_terraform) | >= 1.0 | +| [aws](#requirement\_aws) | >= 4.33 | ## Providers | Name | Version | |------|---------| -| [aws](#provider\_aws) | >= 3.72 | +| [aws](#provider\_aws) | >= 4.33 | ## Modules diff --git a/examples/complete/versions.tf b/examples/complete/versions.tf index 22e8d72..14a7ee2 100644 --- a/examples/complete/versions.tf +++ b/examples/complete/versions.tf @@ -1,10 +1,10 @@ terraform { - required_version = ">= 0.13.1" + required_version = ">= 1.0" required_providers { aws = { source = "hashicorp/aws" - version = ">= 3.72" + version = ">= 4.33" } } } diff --git a/main.tf b/main.tf index b25763c..2b3ac10 100644 --- a/main.tf +++ b/main.tf @@ -10,6 +10,7 @@ resource "aws_kms_key" "this" { bypass_policy_lockout_safety_check = var.bypass_policy_lockout_safety_check customer_master_key_spec = var.customer_master_key_spec + custom_key_store_id = var.custom_key_store_id deletion_window_in_days = var.deletion_window_in_days description = var.description enable_key_rotation = var.enable_key_rotation diff --git a/variables.tf b/variables.tf index ab860a3..0eb9b90 100644 --- a/variables.tf +++ b/variables.tf @@ -32,6 +32,12 @@ variable "customer_master_key_spec" { default = null } +variable "custom_key_store_id" { + description = "ID of the KMS Custom Key Store where the key will be stored instead of KMS (eg CloudHSM)." + type = string + default = null +} + variable "deletion_window_in_days" { description = "The waiting period, specified in number of days. After the waiting period ends, AWS KMS deletes the KMS key. If you specify a value, it must be between `7` and `30`, inclusive. If you do not specify a value, it defaults to `30`" type = number diff --git a/versions.tf b/versions.tf index 22e8d72..14a7ee2 100644 --- a/versions.tf +++ b/versions.tf @@ -1,10 +1,10 @@ terraform { - required_version = ">= 0.13.1" + required_version = ">= 1.0" required_providers { aws = { source = "hashicorp/aws" - version = ">= 3.72" + version = ">= 4.33" } } }