Skip to content

Commit beb5667

Browse files
authored
feat!: Added custom_key_store_id, bump version of AWS provider to 4.x (#23)
Co-authored-by: magreenbaum <magreenbaum>
1 parent 87be9cc commit beb5667

File tree

6 files changed

+18
-10
lines changed

6 files changed

+18
-10
lines changed

README.md

+4-3
Original file line numberDiff line numberDiff line change
@@ -146,14 +146,14 @@ Examples codified under the [`examples`](https://github.com/terraform-aws-module
146146

147147
| Name | Version |
148148
|------|---------|
149-
| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 0.13.1 |
150-
| <a name="requirement_aws"></a> [aws](#requirement\_aws) | >= 3.72 |
149+
| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 1.0 |
150+
| <a name="requirement_aws"></a> [aws](#requirement\_aws) | >= 4.33 |
151151

152152
## Providers
153153

154154
| Name | Version |
155155
|------|---------|
156-
| <a name="provider_aws"></a> [aws](#provider\_aws) | >= 3.72 |
156+
| <a name="provider_aws"></a> [aws](#provider\_aws) | >= 4.33 |
157157

158158
## Modules
159159

@@ -185,6 +185,7 @@ No modules.
185185
| <a name="input_create_external"></a> [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 |
186186
| <a name="input_create_replica"></a> [create\_replica](#input\_create\_replica) | Determines whether a replica standard CMK will be created (AWS provided material) | `bool` | `false` | no |
187187
| <a name="input_create_replica_external"></a> [create\_replica\_external](#input\_create\_replica\_external) | Determines whether a replica external CMK will be created (externally provided material) | `bool` | `false` | no |
188+
| <a name="input_custom_key_store_id"></a> [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 |
188189
| <a name="input_customer_master_key_spec"></a> [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 |
189190
| <a name="input_deletion_window_in_days"></a> [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 |
190191
| <a name="input_description"></a> [description](#input\_description) | The description of the key as viewed in AWS console | `string` | `null` | no |

examples/complete/README.md

+3-3
Original file line numberDiff line numberDiff line change
@@ -24,14 +24,14 @@ Note that this example may create resources which will incur monetary charges on
2424

2525
| Name | Version |
2626
|------|---------|
27-
| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 0.13.1 |
28-
| <a name="requirement_aws"></a> [aws](#requirement\_aws) | >= 3.72 |
27+
| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 1.0 |
28+
| <a name="requirement_aws"></a> [aws](#requirement\_aws) | >= 4.33 |
2929

3030
## Providers
3131

3232
| Name | Version |
3333
|------|---------|
34-
| <a name="provider_aws"></a> [aws](#provider\_aws) | >= 3.72 |
34+
| <a name="provider_aws"></a> [aws](#provider\_aws) | >= 4.33 |
3535

3636
## Modules
3737

examples/complete/versions.tf

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
terraform {
2-
required_version = ">= 0.13.1"
2+
required_version = ">= 1.0"
33

44
required_providers {
55
aws = {
66
source = "hashicorp/aws"
7-
version = ">= 3.72"
7+
version = ">= 4.33"
88
}
99
}
1010
}

main.tf

+1
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ resource "aws_kms_key" "this" {
1010

1111
bypass_policy_lockout_safety_check = var.bypass_policy_lockout_safety_check
1212
customer_master_key_spec = var.customer_master_key_spec
13+
custom_key_store_id = var.custom_key_store_id
1314
deletion_window_in_days = var.deletion_window_in_days
1415
description = var.description
1516
enable_key_rotation = var.enable_key_rotation

variables.tf

+6
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,12 @@ variable "customer_master_key_spec" {
3232
default = null
3333
}
3434

35+
variable "custom_key_store_id" {
36+
description = "ID of the KMS Custom Key Store where the key will be stored instead of KMS (eg CloudHSM)."
37+
type = string
38+
default = null
39+
}
40+
3541
variable "deletion_window_in_days" {
3642
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`"
3743
type = number

versions.tf

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
terraform {
2-
required_version = ">= 0.13.1"
2+
required_version = ">= 1.0"
33

44
required_providers {
55
aws = {
66
source = "hashicorp/aws"
7-
version = ">= 3.72"
7+
version = ">= 4.33"
88
}
99
}
1010
}

0 commit comments

Comments
 (0)