Skip to content

Commit bbf63ba

Browse files
RafPebryantbiggs
andauthored
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 <[email protected]>
1 parent f120124 commit bbf63ba

File tree

2 files changed

+6
-3
lines changed

2 files changed

+6
-3
lines changed

.pre-commit-config.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
repos:
22
- repo: https://github.com/antonbabenko/pre-commit-terraform
3-
rev: v1.88.0
3+
rev: v1.92.0
44
hooks:
55
- id: terraform_fmt
66
- id: terraform_docs
@@ -24,7 +24,7 @@ repos:
2424
- '--args=--only=terraform_unused_required_providers'
2525
- id: terraform_validate
2626
- repo: https://github.com/pre-commit/pre-commit-hooks
27-
rev: v4.5.0
27+
rev: v4.6.0
2828
hooks:
2929
- id: check-merge-conflict
3030
- id: end-of-file-fixer

main.tf

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,10 @@ module "alb" {
156156
associate_web_acl = try(var.alb.associate_web_acl, false)
157157
web_acl_arn = try(var.alb.web_acl_arn, null)
158158

159-
tags = var.tags
159+
tags = merge(
160+
try(var.alb.tags, {}),
161+
var.tags
162+
)
160163
}
161164

162165
################################################################################

0 commit comments

Comments
 (0)