From 03ae8da3c79be0179225fa8f7a5d5038008454e2 Mon Sep 17 00:00:00 2001 From: Anton Babenko Date: Fri, 9 Feb 2024 13:18:48 +0100 Subject: [PATCH] fix: Fixed logging in the example code --- .pre-commit-config.yaml | 4 ++-- examples/complete/README.md | 6 ++--- examples/complete/main.tf | 11 +++++---- wrappers/main.tf | 48 ++++++++++++++++++------------------- wrappers/outputs.tf | 2 +- 5 files changed, 37 insertions(+), 34 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 314c02b..61ef178 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -1,6 +1,6 @@ repos: - repo: https://github.com/antonbabenko/pre-commit-terraform - rev: v1.76.0 + rev: v1.86.0 hooks: - id: terraform_fmt - id: terraform_wrapper_module_for_each @@ -24,7 +24,7 @@ repos: - '--args=--only=terraform_standard_module_structure' - '--args=--only=terraform_workspace_remote' - repo: https://github.com/pre-commit/pre-commit-hooks - rev: v4.3.0 + rev: v4.5.0 hooks: - id: check-merge-conflict - id: end-of-file-fixer diff --git a/examples/complete/README.md b/examples/complete/README.md index 597fd41..1932f4d 100644 --- a/examples/complete/README.md +++ b/examples/complete/README.md @@ -47,10 +47,10 @@ Note that this example may create resources which cost money. Run `terraform des |------|--------|---------| | [acm](#module\_acm) | terraform-aws-modules/acm/aws | ~> 4.0 | | [cloudfront](#module\_cloudfront) | ../../ | n/a | -| [lambda\_function](#module\_lambda\_function) | terraform-aws-modules/lambda/aws | ~> 4.0 | -| [log\_bucket](#module\_log\_bucket) | terraform-aws-modules/s3-bucket/aws | ~> 3.0 | +| [lambda\_function](#module\_lambda\_function) | terraform-aws-modules/lambda/aws | ~> 7.0 | +| [log\_bucket](#module\_log\_bucket) | terraform-aws-modules/s3-bucket/aws | ~> 4.0 | | [records](#module\_records) | terraform-aws-modules/route53/aws//modules/records | ~> 2.0 | -| [s3\_one](#module\_s3\_one) | terraform-aws-modules/s3-bucket/aws | ~> 3.0 | +| [s3\_one](#module\_s3\_one) | terraform-aws-modules/s3-bucket/aws | ~> 4.0 | ## Resources diff --git a/examples/complete/main.tf b/examples/complete/main.tf index 1f9fa02..9308091 100644 --- a/examples/complete/main.tf +++ b/examples/complete/main.tf @@ -199,7 +199,7 @@ data "aws_cloudfront_log_delivery_canonical_user_id" "cloudfront" {} module "s3_one" { source = "terraform-aws-modules/s3-bucket/aws" - version = "~> 3.0" + version = "~> 4.0" bucket = "s3-one-${random_pet.this.id}" force_destroy = true @@ -207,10 +207,13 @@ module "s3_one" { module "log_bucket" { source = "terraform-aws-modules/s3-bucket/aws" - version = "~> 3.0" + version = "~> 4.0" bucket = "logs-${random_pet.this.id}" - acl = null + + control_object_ownership = true + object_ownership = "ObjectWriter" + grant = [{ type = "CanonicalUser" permission = "FULL_CONTROL" @@ -246,7 +249,7 @@ resource "null_resource" "download_package" { module "lambda_function" { source = "terraform-aws-modules/lambda/aws" - version = "~> 4.0" + version = "~> 7.0" function_name = "${random_pet.this.id}-lambda" description = "My awesome lambda function" diff --git a/wrappers/main.tf b/wrappers/main.tf index fb9ba78..d07f8c5 100644 --- a/wrappers/main.tf +++ b/wrappers/main.tf @@ -3,10 +3,22 @@ module "wrapper" { for_each = var.items - create_distribution = try(each.value.create_distribution, var.defaults.create_distribution, true) - create_origin_access_identity = try(each.value.create_origin_access_identity, var.defaults.create_origin_access_identity, false) - origin_access_identities = try(each.value.origin_access_identities, var.defaults.origin_access_identities, {}) - create_origin_access_control = try(each.value.create_origin_access_control, var.defaults.create_origin_access_control, false) + aliases = try(each.value.aliases, var.defaults.aliases, null) + comment = try(each.value.comment, var.defaults.comment, null) + create_distribution = try(each.value.create_distribution, var.defaults.create_distribution, true) + create_monitoring_subscription = try(each.value.create_monitoring_subscription, var.defaults.create_monitoring_subscription, false) + create_origin_access_control = try(each.value.create_origin_access_control, var.defaults.create_origin_access_control, false) + create_origin_access_identity = try(each.value.create_origin_access_identity, var.defaults.create_origin_access_identity, false) + custom_error_response = try(each.value.custom_error_response, var.defaults.custom_error_response, {}) + default_cache_behavior = try(each.value.default_cache_behavior, var.defaults.default_cache_behavior, null) + default_root_object = try(each.value.default_root_object, var.defaults.default_root_object, null) + enabled = try(each.value.enabled, var.defaults.enabled, true) + geo_restriction = try(each.value.geo_restriction, var.defaults.geo_restriction, {}) + http_version = try(each.value.http_version, var.defaults.http_version, "http2") + is_ipv6_enabled = try(each.value.is_ipv6_enabled, var.defaults.is_ipv6_enabled, null) + logging_config = try(each.value.logging_config, var.defaults.logging_config, {}) + ordered_cache_behavior = try(each.value.ordered_cache_behavior, var.defaults.ordered_cache_behavior, []) + origin = try(each.value.origin, var.defaults.origin, null) origin_access_control = try(each.value.origin_access_control, var.defaults.origin_access_control, { s3 = { description = "", @@ -15,28 +27,16 @@ module "wrapper" { signing_protocol = "sigv4" } }) - aliases = try(each.value.aliases, var.defaults.aliases, null) - comment = try(each.value.comment, var.defaults.comment, null) - default_root_object = try(each.value.default_root_object, var.defaults.default_root_object, null) - enabled = try(each.value.enabled, var.defaults.enabled, true) - http_version = try(each.value.http_version, var.defaults.http_version, "http2") - is_ipv6_enabled = try(each.value.is_ipv6_enabled, var.defaults.is_ipv6_enabled, null) - price_class = try(each.value.price_class, var.defaults.price_class, null) - retain_on_delete = try(each.value.retain_on_delete, var.defaults.retain_on_delete, false) - wait_for_deployment = try(each.value.wait_for_deployment, var.defaults.wait_for_deployment, true) - web_acl_id = try(each.value.web_acl_id, var.defaults.web_acl_id, null) - tags = try(each.value.tags, var.defaults.tags, null) - origin = try(each.value.origin, var.defaults.origin, null) - origin_group = try(each.value.origin_group, var.defaults.origin_group, {}) + origin_access_identities = try(each.value.origin_access_identities, var.defaults.origin_access_identities, {}) + origin_group = try(each.value.origin_group, var.defaults.origin_group, {}) + price_class = try(each.value.price_class, var.defaults.price_class, null) + realtime_metrics_subscription_status = try(each.value.realtime_metrics_subscription_status, var.defaults.realtime_metrics_subscription_status, "Enabled") + retain_on_delete = try(each.value.retain_on_delete, var.defaults.retain_on_delete, false) + tags = try(each.value.tags, var.defaults.tags, null) viewer_certificate = try(each.value.viewer_certificate, var.defaults.viewer_certificate, { cloudfront_default_certificate = true minimum_protocol_version = "TLSv1" }) - geo_restriction = try(each.value.geo_restriction, var.defaults.geo_restriction, {}) - logging_config = try(each.value.logging_config, var.defaults.logging_config, {}) - custom_error_response = try(each.value.custom_error_response, var.defaults.custom_error_response, {}) - default_cache_behavior = try(each.value.default_cache_behavior, var.defaults.default_cache_behavior, null) - ordered_cache_behavior = try(each.value.ordered_cache_behavior, var.defaults.ordered_cache_behavior, []) - create_monitoring_subscription = try(each.value.create_monitoring_subscription, var.defaults.create_monitoring_subscription, false) - realtime_metrics_subscription_status = try(each.value.realtime_metrics_subscription_status, var.defaults.realtime_metrics_subscription_status, "Enabled") + wait_for_deployment = try(each.value.wait_for_deployment, var.defaults.wait_for_deployment, true) + web_acl_id = try(each.value.web_acl_id, var.defaults.web_acl_id, null) } diff --git a/wrappers/outputs.tf b/wrappers/outputs.tf index 5da7c09..ec6da5f 100644 --- a/wrappers/outputs.tf +++ b/wrappers/outputs.tf @@ -1,5 +1,5 @@ output "wrapper" { description = "Map of outputs of a wrapper." value = module.wrapper - # sensitive = false # No sensitive module output found + # sensitive = false # No sensitive module output found }