Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use the local.common_tags_map #42

Merged
merged 2 commits into from
Sep 20, 2023
Merged

Use the local.common_tags_map #42

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a0f7730
Use the local.common_tags_map on all resources so that var.tags can a…
renegaderyu Sep 20, 2023
f0bf25b
Merge branch 'main' into use_tag_var
renegaderyu Sep 20, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
89 changes: 62 additions & 27 deletions modules/aws-asg/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,12 @@ resource "aws_secretsmanager_secret" "token" { #tfsec:ignore:AWS095
description = "CloudGen Access Proxy Enrollment Token"
recovery_window_in_days = 0

tags = {
Name = "cga_proxy_${random_string.prefix.result}_enrollment_token"
}
tags = merge(
local.common_tags_map,
{
Name = "cga_proxy_${random_string.prefix.result}_enrollment_token"
}
)
}

resource "aws_secretsmanager_secret_version" "token" {
Expand All @@ -43,6 +46,10 @@ resource "aws_lb" "nlb" {
lifecycle {
create_before_destroy = true
}

tags = merge(
local.common_tags_map
)
}

resource "aws_lb_listener" "nlb_listener" {
Expand Down Expand Up @@ -77,6 +84,10 @@ resource "aws_lb_target_group" "nlb_target_group" {
lifecycle {
create_before_destroy = true
}

tags = merge(
local.common_tags_map
)
}

#
Expand Down Expand Up @@ -107,9 +118,12 @@ resource "aws_security_group" "inbound" {
cidr_blocks = ["0.0.0.0/0"] #tfsec:ignore:aws-vpc-no-public-egress-sgr
}

tags = {
Name = "cga-proxy-${random_string.prefix.result}-inbound"
}
tags = merge(
local.common_tags_map,
{
Name = "cga-proxy-${random_string.prefix.result}-inbound"
}
)
}

resource "aws_security_group" "resources" {
Expand All @@ -125,9 +139,12 @@ resource "aws_security_group" "resources" {
self = true
}

tags = {
Name = "cga-proxy-${random_string.prefix.result}-resources"
}
tags = merge(
local.common_tags_map,
{
Name = "cga-proxy-${random_string.prefix.result}-resources"
}
)
}

resource "aws_security_group" "redis" {
Expand All @@ -153,9 +170,12 @@ resource "aws_security_group" "redis" {
self = true
}

tags = {
Name = "cga-proxy-${random_string.prefix.result}-redis"
}
tags = merge(
local.common_tags_map,
{
Name = "cga-proxy-${random_string.prefix.result}-redis"
}
)
}

#
Expand Down Expand Up @@ -281,9 +301,12 @@ resource "aws_launch_template" "launch_template" {
tag_specifications {
resource_type = "volume"

tags = {
Name = "cga-proxy-${random_string.prefix.result}"
}
tags = merge(
local.common_tags_map,
{
Name = "cga-proxy-${random_string.prefix.result}"
}
)
}

# tflint-ignore: terraform_deprecated_index
Expand Down Expand Up @@ -359,9 +382,12 @@ resource "aws_iam_role" "role" {

managed_policy_arns = var.ssm_allow_console ? ["arn:aws:iam::aws:policy/AmazonSSMManagedInstanceCore"] : null

tags = {
Name = "cga-proxy-${random_string.prefix.result}-role"
}
tags = merge(
local.common_tags_map,
{
Name = "cga-proxy-${random_string.prefix.result}-role"
}
)
}

resource "aws_iam_role_policy" "cloudgen_access_proxy_secrets" {
Expand Down Expand Up @@ -446,9 +472,12 @@ resource "aws_cloudwatch_log_group" "cloudgen_access_proxy" { #tfsec:ignore:AWS0
name = "/aws/ec2/cga-proxy-${random_string.prefix.result}"
retention_in_days = var.cloudWatch_logs_retention_in_days

tags = {
Name = "/aws/ec2/cga-proxy-${random_string.prefix.result}"
}
tags = merge(
local.common_tags_map,
{
Name = "/aws/ec2/cga-proxy-${random_string.prefix.result}"
}
)
}

#
Expand All @@ -471,9 +500,12 @@ resource "aws_elasticache_replication_group" "redis" {
transit_encryption_enabled = false #tfsec:ignore:AWS036
multi_az_enabled = true

tags = {
Name = "cga-proxy-${random_string.prefix.result}"
}
tags = merge(
local.common_tags_map,
{
Name = "cga-proxy-${random_string.prefix.result}"
}
)
}

resource "aws_elasticache_subnet_group" "redis" {
Expand All @@ -483,7 +515,10 @@ resource "aws_elasticache_subnet_group" "redis" {
description = "Redis Subnet Group for CloudGen Access Proxy"
subnet_ids = coalescelist(var.redis_subnets, var.asg_subnets)

tags = {
Name = "cga-proxy-${random_string.prefix.result}"
}
tags = merge(
local.common_tags_map,
{
Name = "cga-proxy-${random_string.prefix.result}"
}
)
}