Skip to content

Commit

Permalink
Merge pull request #114 from trussworks/update-module-versions
Browse files Browse the repository at this point in the history
Update module versions
  • Loading branch information
chtakahashi authored Jul 25, 2023
2 parents 27753d4 + 600a553 commit 5f1973f
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 7 deletions.
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand All @@ -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 |
Expand Down
5 changes: 2 additions & 3 deletions main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -14,15 +14,14 @@ 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

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
Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion variables.tf
Original file line number Diff line number Diff line change
Expand Up @@ -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."
}

Expand Down

0 comments on commit 5f1973f

Please sign in to comment.