Skip to content

Commit

Permalink
feat: Allow setting ALB specific tags (#404)
Browse files Browse the repository at this point in the history
* 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 <bryantbiggs@gmail.com>
  • Loading branch information
RafPe and bryantbiggs authored Jul 5, 2024
1 parent f120124 commit bbf63ba
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 3 deletions.
4 changes: 2 additions & 2 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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
Expand Down
5 changes: 4 additions & 1 deletion main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -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
)
}

################################################################################
Expand Down

0 comments on commit bbf63ba

Please sign in to comment.