Skip to content

Commit c9bb7ce

Browse files
author
Premdeep Saini
committed
move resource name evaluation to locals
1 parent 89134cd commit c9bb7ce

File tree

6 files changed

+52
-29
lines changed

6 files changed

+52
-29
lines changed

backup.tf

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
/* Resources for setting up Gitlab remote backup on Amazon S3 */
2-
2+
locals {
3+
gitlab_backup_iam_policy_name = "${local.environment_prefix}-gitlab-backup"
4+
gitlab_backup_iam_role_name = "${local.environment_prefix}-gitlab-backup"
5+
}
36
resource "aws_s3_bucket" "gitlab_backup" {
47
count = var.enable_gitlab_backup_to_s3 ? 1 : 0
58
bucket = var.gitlab_backup_bucket_name
@@ -64,15 +67,15 @@ data "aws_iam_policy_document" "gitlab_s3_backup" {
6467

6568
resource "aws_iam_policy" "gitlab_backup" {
6669
count = var.enable_gitlab_backup_to_s3 ? 1 : 0
67-
name = "${local.environment_prefix}-gitlab-backup"
70+
name = local.gitlab_backup_iam_policy_name
6871
policy = data.aws_iam_policy_document.gitlab_s3_backup[0].json
6972
tags = merge({
70-
Name = "${local.environment_prefix}-gitlab-backup"
73+
Name = local.gitlab_backup_iam_policy_name
7174
}, local.default_tags, var.additional_tags)
7275
}
7376

7477
resource "aws_iam_role" "gitlab_backup" {
75-
name = "${local.environment_prefix}-gitlab-backup"
78+
name = local.gitlab_backup_iam_role_name
7679
assume_role_policy = <<EOF
7780
{
7881
"Version": "2012-10-17",
@@ -90,6 +93,6 @@ resource "aws_iam_role" "gitlab_backup" {
9093
EOF
9194
managed_policy_arns = var.enable_gitlab_backup_to_s3 ? [aws_iam_policy.gitlab_backup[0].arn] : []
9295
tags = merge({
93-
Name = "${local.environment_prefix}-gitlab-backup"
96+
Name = local.gitlab_backup_iam_role_name
9497
}, local.default_tags, var.additional_tags)
9598
}

load_balancers.tf

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,10 @@
11
/* Resources for Gitlab classic load balancer */
2+
locals {
3+
gitlab_lb_sg_name = "${local.environment_prefix}-gitlab-lb"
4+
gitlab_lb_name = "${local.environment_prefix}-gitlab"
5+
}
26
resource "aws_security_group" "gitlab_lb" {
3-
name = "${local.environment_prefix}-gitlab-lb"
7+
name = local.gitlab_lb_sg_name
48
vpc_id = data.aws_vpc.vpc.id
59
description = "Security group for Gitlab load balancer"
610
ingress = [
@@ -52,14 +56,14 @@ resource "aws_security_group" "gitlab_lb" {
5256
}
5357
]
5458
tags = merge({
55-
Name = "${local.environment_prefix}-gitlab-lb"
59+
Name = local.gitlab_lb_sg_name
5660
}, local.default_tags, var.additional_tags)
5761
}
5862

5963
module "elb" {
6064
source = "terraform-aws-modules/elb/aws"
6165
version = "~> 2.0"
62-
name = "${local.environment_prefix}-gitlab"
66+
name = local.gitlab_lb_name
6367
subnets = var.public_subnet_ids
6468
security_groups = [aws_security_group.gitlab_lb.id]
6569
internal = false
@@ -94,6 +98,6 @@ module "elb" {
9498
number_of_instances = 1
9599
instances = tolist([aws_instance.gitlab.id])
96100
tags = merge({
97-
Name = "${local.environment_prefix}-gitlab"
101+
Name = local.gitlab_lb_name
98102
}, local.default_tags, var.additional_tags)
99103
}

main.tf

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,11 @@ locals {
33
ManagedBy = "Terraform"
44
Environment = var.environment
55
}
6-
environment_prefix = substr(var.environment, 0, 1)
6+
environment_prefix = substr(var.environment, 0, 1)
7+
gitlab_instance_name = "${local.environment_prefix}-gitlab"
8+
gitlab_ssh_key_name = "${local.environment_prefix}-gitlab-key-pair"
9+
gitlab_instance_sg_name = "${local.environment_prefix}-gitlab"
10+
gitlab_instance_profile_name = "${local.environment_prefix}-gitlab"
711
}
812

913
resource "aws_instance" "gitlab" {
@@ -22,17 +26,17 @@ resource "aws_instance" "gitlab" {
2226
}
2327

2428
tags = merge({
25-
Name = "${local.environment_prefix}-gitlab"
29+
Name = local.gitlab_instance_name
2630
}, local.default_tags, var.additional_tags)
2731

2832
}
2933

3034
resource "aws_key_pair" "gitlab_ssh" {
3135
count = var.gitlab_ssh_public_key != null ? 1 : 0
32-
key_name = "${local.environment_prefix}-gitlab-key-pair"
36+
key_name = local.gitlab_ssh_key_name
3337
public_key = var.gitlab_ssh_public_key
3438
tags = merge({
35-
Name = "${local.environment_prefix}-gitlab-key-pair"
39+
Name = local.gitlab_ssh_key_name
3640
}, local.default_tags, var.additional_tags)
3741
}
3842

@@ -45,7 +49,7 @@ data "aws_route53_zone" "zone" {
4549
}
4650

4751
resource "aws_security_group" "gitlab" {
48-
name = "${local.environment_prefix}-gitlab"
52+
name = local.gitlab_instance_sg_name
4953
vpc_id = data.aws_vpc.vpc.id
5054
description = "Security group for Gitlab instance"
5155
ingress = [
@@ -97,7 +101,7 @@ resource "aws_security_group" "gitlab" {
97101
}
98102
]
99103
tags = merge({
100-
Name = "${local.environment_prefix}-gitlab"
104+
Name = local.gitlab_instance_sg_name
101105
}, local.default_tags, var.additional_tags)
102106
}
103107

@@ -134,9 +138,9 @@ module "acm" {
134138
}
135139

136140
resource "aws_iam_instance_profile" "gitlab" {
137-
name = "${local.environment_prefix}-gitlab"
141+
name = local.gitlab_instance_profile_name
138142
role = aws_iam_role.gitlab_backup.name
139143
tags = merge({
140-
Name = "${local.environment_prefix}-gitlab"
144+
Name = local.gitlab_instance_profile_name
141145
}, local.default_tags, var.additional_tags)
142146
}

rds.tf

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,10 @@
11
/* Resources for RDS setup */
2+
locals {
3+
gitlab_rds_cluster_name = "${local.environment_prefix}-gitlab-pg"
4+
gitlab_rds_sg_name = "${local.environment_prefix}-gitlab-rds"
5+
}
26
resource "aws_security_group" "gitlab_rds" {
3-
name = "${local.environment_prefix}-gitlab-rds"
7+
name = local.gitlab_rds_sg_name
48
vpc_id = data.aws_vpc.vpc.id
59
description = "Security group for Gitlab RDS"
610
ingress = [
@@ -17,13 +21,13 @@ resource "aws_security_group" "gitlab_rds" {
1721
}
1822
]
1923
tags = merge({
20-
Name = "${local.environment_prefix}-gitlab-rds"
24+
Name = local.gitlab_rds_sg_name
2125
}, local.default_tags, var.additional_tags)
2226
}
2327

2428
module "gitlab_pg" {
2529
source = "terraform-aws-modules/rds/aws"
26-
identifier = "${local.environment_prefix}-gitlab-pg"
30+
identifier = local.gitlab_rds_cluster_name
2731
create_db_instance = true
2832
create_db_subnet_group = true
2933
create_db_parameter_group = var.gitlab_pg_create_db_parameter_group
@@ -44,6 +48,6 @@ module "gitlab_pg" {
4448
publicly_accessible = var.gitlab_pg_publicly_accessible
4549
vpc_security_group_ids = [aws_security_group.gitlab_rds.id]
4650
tags = merge({
47-
Name = "${local.environment_prefix}-gitlab-pg"
51+
Name = local.gitlab_rds_cluster_name
4852
}, local.default_tags, var.additional_tags)
4953
}

redis.tf

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,11 @@
11
/* Resources for Gitlab Redis setup */
2+
locals {
3+
gitlab_redis_sg_name = "${local.environment_prefix}-gitlab-redis"
4+
gitlab_redis_subnet_group_name = "${local.environment_prefix}-gitlab-redis"
5+
gitlab_redis_cluster_id = "${local.environment_prefix}-gitlab-redis"
6+
}
27
resource "aws_security_group" "gitlab_redis" {
3-
name = "${local.environment_prefix}-gitlab-redis"
8+
name = local.gitlab_redis_sg_name
49
vpc_id = data.aws_vpc.vpc.id
510
description = "Security group for Gitlab Redis"
611
ingress = [
@@ -17,7 +22,7 @@ resource "aws_security_group" "gitlab_redis" {
1722
}
1823
]
1924
tags = merge({
20-
Name = "${local.environment_prefix}-gitlab-redis"
25+
Name = local.gitlab_redis_sg_name
2126
}, local.default_tags, var.additional_tags)
2227
}
2328

@@ -38,11 +43,11 @@ resource "aws_elasticache_parameter_group" "gitlab_redis" {
3843

3944
resource "aws_elasticache_subnet_group" "gitlab_redis" {
4045
count = var.gitlab_redis_create_subnet_group == true ? 1 : 0
41-
name = "${local.environment_prefix}-gitlab-redis"
46+
name = local.gitlab_redis_subnet_group_name
4247
subnet_ids = var.gitlab_redis_subnet_ids
4348

4449
tags = merge({
45-
Name = "${local.environment_prefix}-gitlab-redis"
50+
Name = local.gitlab_redis_subnet_group_name
4651
}, local.default_tags, var.additional_tags)
4752

4853
lifecycle {
@@ -54,7 +59,7 @@ resource "aws_elasticache_subnet_group" "gitlab_redis" {
5459
}
5560

5661
resource "aws_elasticache_cluster" "gitlab_redis" {
57-
cluster_id = "${local.environment_prefix}-gitlab-redis"
62+
cluster_id = local.gitlab_redis_cluster_id
5863
engine = "redis"
5964
node_type = var.gitlab_redis_node_type
6065
num_cache_nodes = var.gitlab_redis_num_cache_nodes
@@ -65,7 +70,7 @@ resource "aws_elasticache_cluster" "gitlab_redis" {
6570
subnet_group_name = var.gitlab_redis_create_subnet_group == true ? aws_elasticache_subnet_group.gitlab_redis[0].name : var.gitlab_redis_subnet_group_name
6671

6772
tags = merge({
68-
Name = "${local.environment_prefix}-gitlab-redis"
73+
Name = local.gitlab_redis_cluster_id
6974
}, local.default_tags, var.additional_tags)
7075

7176
lifecycle {

ses.tf

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
11
/* Resources for Amazon SES setup to be used as SMTP service for Gitlab */
2+
locals {
3+
gitlab_ses_sender_name = "${local.environment_prefix}-gitlab-ses-sender"
4+
}
25
data "aws_route53_zone" "email_domain" {
36
count = var.create_ses_identity ? 1 : 0
47
name = var.ses_domain != null ? var.ses_domain : var.hosted_zone
@@ -45,11 +48,11 @@ data "aws_iam_policy_document" "gitlab_ses_sender" {
4548

4649
resource "aws_iam_policy" "gitlab_ses_sender" {
4750
count = var.create_ses_identity ? 1 : 0
48-
name = "${local.environment_prefix}-gitlab-ses-sender"
51+
name = local.gitlab_ses_sender_name
4952
description = "Allows sending of e-mails via Simple Email Service"
5053
policy = data.aws_iam_policy_document.gitlab_ses_sender[0].json
5154
tags = merge({
52-
Name = "${local.environment_prefix}-gitlab-ses-sender"
55+
Name = local.gitlab_ses_sender_name
5356
}, local.default_tags, var.additional_tags)
5457
}
5558

0 commit comments

Comments
 (0)