From bbf63baaefe89650eb61fce51babf54b5ae29208 Mon Sep 17 00:00:00 2001 From: Rafal Pieniazek Date: Fri, 5 Jul 2024 19:27:18 +0200 Subject: [PATCH] feat: Allow setting ALB specific tags (#404) * Update main.tf Adds ability to provide custom ALB tags * Update main.tf * fix: Update and run pre-commit checks to pass CI --------- Co-authored-by: Bryant Biggs --- .pre-commit-config.yaml | 4 ++-- main.tf | 5 ++++- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 395404e8..60e89f35 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.88.0 + rev: v1.92.0 hooks: - id: terraform_fmt - id: terraform_docs @@ -24,7 +24,7 @@ repos: - '--args=--only=terraform_unused_required_providers' - id: terraform_validate - repo: https://github.com/pre-commit/pre-commit-hooks - rev: v4.5.0 + rev: v4.6.0 hooks: - id: check-merge-conflict - id: end-of-file-fixer diff --git a/main.tf b/main.tf index 96cc128f..84317650 100644 --- a/main.tf +++ b/main.tf @@ -156,7 +156,10 @@ module "alb" { associate_web_acl = try(var.alb.associate_web_acl, false) web_acl_arn = try(var.alb.web_acl_arn, null) - tags = var.tags + tags = merge( + try(var.alb.tags, {}), + var.tags + ) } ################################################################################