diff --git a/README.md b/README.md index e7f6ffe..312b97a 100644 --- a/README.md +++ b/README.md @@ -38,8 +38,8 @@ module "bootstrap" { | Name | Source | Version | |------|--------|---------| -| terraform\_state\_bucket | trussworks/s3-private-bucket/aws | ~> 4.3.0 | -| terraform\_state\_bucket\_logs | trussworks/logs/aws | ~> 14.2.0 | +| terraform\_state\_bucket | trussworks/s3-private-bucket/aws | ~> 7.1.0 | +| terraform\_state\_bucket\_logs | trussworks/logs/aws | ~> 16.1.0 | ## Resources @@ -59,7 +59,7 @@ module "bootstrap" { | dynamodb\_table\_name | Name of the DynamoDB Table for locking Terraform state. | `string` | `"terraform-state-lock"` | no | | dynamodb\_table\_tags | Tags of the DynamoDB Table for locking Terraform state. | `map(string)` | ```{ "Automation": "Terraform", "Name": "terraform-state-lock" }``` | no | | enable\_s3\_public\_access\_block | Bool for toggling whether the s3 public access block resource should be enabled. | `bool` | `true` | no | -| kms\_master\_key\_id | The AWS KMS master key ID used for the SSE-KMS encryption of the state bucket. | `string` | `null` | no | +| kms\_master\_key\_id | The AWS KMS master key ID used for the SSE-KMS encryption of the state bucket. | `string` | `""` | no | | log\_bucket\_tags | Tags to associate with the bucket storing the Terraform state bucket logs | `map(string)` | ```{ "Automation": "Terraform" }``` | no | | log\_bucket\_versioning | A string that indicates the versioning status for the log bucket. | `string` | `"Disabled"` | no | | log\_name | Log name (for backwards compatibility this can be modified to logs) | `string` | `"log"` | no | diff --git a/main.tf b/main.tf index f6ba0de..30c4d08 100644 --- a/main.tf +++ b/main.tf @@ -14,7 +14,7 @@ resource "aws_iam_account_alias" "alias" { module "terraform_state_bucket" { source = "trussworks/s3-private-bucket/aws" - version = "~> 4.3.0" + version = "~> 7.1.0" bucket = local.state_bucket logging_bucket = local.logging_bucket @@ -22,7 +22,6 @@ module "terraform_state_bucket" { use_account_alias_prefix = false bucket_key_enabled = var.bucket_key_enabled kms_master_key_id = var.kms_master_key_id - sse_algorithm = var.kms_master_key_id != null ? "aws:kms" : null enable_s3_public_access_block = var.enable_s3_public_access_block tags = var.state_bucket_tags @@ -38,7 +37,7 @@ module "terraform_state_bucket" { module "terraform_state_bucket_logs" { source = "trussworks/logs/aws" - version = "~> 14.2.0" + version = "~> 16.1.0" s3_bucket_name = local.logging_bucket default_allow = false diff --git a/variables.tf b/variables.tf index 7b92869..1f2081e 100644 --- a/variables.tf +++ b/variables.tf @@ -83,7 +83,7 @@ variable "manage_account_alias" { variable "kms_master_key_id" { type = string - default = null + default = "" description = "The AWS KMS master key ID used for the SSE-KMS encryption of the state bucket." }