Skip to content

Commit f38b38f

Browse files
committed
lb_tags
1 parent 3f17f76 commit f38b38f

File tree

4 files changed

+13
-0
lines changed

4 files changed

+13
-0
lines changed

action.yaml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -317,6 +317,9 @@ inputs:
317317
aws_alb_access_log_expire:
318318
description: "Delete the access logs after this amount of days"
319319
required: false
320+
aws_alb_additional_tags:
321+
description: 'A JSON object of additional tags that will be included on created resources. Example: `{"key1": "value1", "key2": "value2"}`'
322+
required: false
320323

321324
# AWS WAF
322325
aws_waf_enable:
@@ -1358,6 +1361,7 @@ runs:
13581361
AWS_ALB_ACCESS_LOG_ENABLED: ${{ inputs.aws_alb_access_log_enabled }}
13591362
AWS_ALB_ACCESS_LOG_BUCKET_NAME: ${{ inputs.aws_alb_access_log_bucket_name }}
13601363
AWS_ALB_ACCESS_LOG_EXPIRE: ${{ inputs.aws_alb_access_log_expire }}
1364+
AWS_ALB_ADDITIONAL_TAGS: ${{ inputs.aws_alb_additional_tags }}
13611365

13621366
# AWS WAF
13631367
AWS_WAF_ENABLE: ${{ inputs.aws_waf_enable }}

operations/_scripts/generate/generate_vars_terraform.sh

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -146,6 +146,7 @@ if [[ $(alpha_only "$AWS_ALB_CREATE") == true ]]; then
146146
aws_alb_access_log_enabled=$(generate_var aws_alb_access_log_enabled $AWS_ALB_ACCESS_LOG_ENABLED)
147147
aws_alb_access_log_bucket_name=$(generate_var aws_alb_access_log_bucket_name $AWS_ALB_ACCESS_LOG_BUCKET_NAME)
148148
aws_alb_access_log_expire=$(generate_var aws_alb_access_log_expire $AWS_ALB_ACCESS_LOG_EXPIRE)
149+
aws_alb_additional_tags=$(generate_var aws_alb_additional_tags $AWS_ALB_ADDITIONAL_TAGS)
149150
fi
150151

151152
#-- AWS WAF --#
@@ -538,6 +539,7 @@ $aws_alb_ssl_policy
538539
$aws_alb_access_log_enabled
539540
$aws_alb_access_log_bucket_name
540541
$aws_alb_access_log_expire
542+
$aws_alb_additional_tags
541543
542544
#-- WAF --#
543545
$aws_waf_enable

operations/deployment/terraform/aws/aws_variables.tf

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -401,6 +401,12 @@ variable "aws_alb_access_log_expire" {
401401
default = "90"
402402
}
403403

404+
variable "aws_alb_additional_tags" {
405+
type = string
406+
description = "A list of strings that will be added to created resources"
407+
default = "{}"
408+
}
409+
404410
# AWS WAF
405411
variable "aws_waf_enable" {
406412
type = bool

operations/deployment/terraform/aws/bitovi_main.tf

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -766,6 +766,7 @@ locals {
766766
db_proxy_tags = merge(local.default_tags, jsondecode(var.aws_db_proxy_additional_tags))
767767
redis_tags = merge(local.default_tags, jsondecode(var.aws_redis_additional_tags))
768768
waf_tags = merge(local.default_tags, jsondecode(var.aws_waf_additional_tags))
769+
lb_tags = merge(local.default_tags, jsondecode(var.aws_alb_additional_tags))
769770

770771
eks_vpc_tags = {
771772
// This is needed for k8s to use VPC resources

0 commit comments

Comments
 (0)