diff --git a/README.md b/README.md index 4f67930..6395ff8 100644 --- a/README.md +++ b/README.md @@ -98,13 +98,13 @@ module "aws-energy-labeler" { | Name | Description | Type | Default | Required | |------|-------------|------|---------|:--------:| | [config](#input\_config) | Map containing labeler configuration options |
object({| n/a | yes | +| [kms\_key\_arn](#input\_kms\_key\_arn) | The ARN of the KMS key to use for encryption | `string` | n/a | yes | | [bucket\_name](#input\_bucket\_name) | The name of the bucket to store the exported findings (will be created if not specified) | `string` | `null` | no | | [bucket\_prefix](#input\_bucket\_prefix) | The prefix to use for the bucket | `string` | `"/"` | no | -| [cluster\_arn](#input\_cluster\_arn) | ARN of an existing ECS cluster, if not provided a new one will be created | `string` | `null` | no | +| [cluster\_arn](#input\_cluster\_arn) | ARN of an existing ECS cluster, if left empty a new cluster will be created | `string` | `null` | no | | [iam\_permissions\_boundary](#input\_iam\_permissions\_boundary) | The permissions boundary to attach to the IAM role | `string` | `null` | no | | [iam\_role\_path](#input\_iam\_role\_path) | The path for the IAM role | `string` | `"/"` | no | | [image\_uri](#input\_image\_uri) | The URI of the container image to use | `string` | `"ghcr.io/schubergphilis/awsenergylabeler:main"` | no | -| [kms\_key\_arn](#input\_kms\_key\_arn) | The ARN of the KMS key to use for encryption | `string` | `null` | no | | [memory](#input\_memory) | The memory size of the task | `number` | `512` | no | | [name](#input\_name) | Name prefix of labeler resources | `string` | `"aws-energy-labeler"` | no | | [schedule\_expression](#input\_schedule\_expression) | The cron expression to be used for triggering the labeler | `string` | `"cron(0 13 ? * SUN *)"` | no | diff --git a/examples/basic/main.tf b/examples/basic/main.tf index a07d9ce..d62d0d9 100644 --- a/examples/basic/main.tf +++ b/examples/basic/main.tf @@ -16,6 +16,8 @@ provider "aws" { module "aws-energy-labeler" { source = "../../" + kms_key_arn = "arn:aws:kms:eu-west-1:123456789012:key/1234abcd-12ab-34cd-56ef-123456789012" + config = { zone_name = "MYZONE" } diff --git a/main.tf b/main.tf index 4dca27d..8d7449c 100644 --- a/main.tf +++ b/main.tf @@ -211,6 +211,7 @@ module "s3" { version = "~> 0.14.1" name_prefix = "${lower(var.name)}-" + kms_key_arn = var.kms_key_arn versioning = true tags = var.tags diff --git a/variables.tf b/variables.tf index 76108bb..0151716 100644 --- a/variables.tf +++ b/variables.tf @@ -28,7 +28,7 @@ variable "bucket_prefix" { variable "cluster_arn" { type = string default = null - description = "ARN of an existing ECS cluster, if not provided a new one will be created" + description = "ARN of an existing ECS cluster, if left empty a new cluster will be created" } variable "config" { @@ -45,7 +45,6 @@ variable "config" { variable "kms_key_arn" { type = string - default = null description = "The ARN of the KMS key to use for encryption" }
allowed_account_ids = optional(list(string), [])
denied_account_ids = optional(list(string), [])
frameworks = optional(list(string), [])
log_level = optional(string)
report_suppressed_findings = optional(bool, false)
zone_name = string
})