Skip to content

Commit cae8b6d

Browse files
minor updates in aws route config
1 parent 818ef3e commit cae8b6d

File tree

3 files changed

+4
-45
lines changed

3 files changed

+4
-45
lines changed

modules/security-groups/main.tf

Lines changed: 1 addition & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,4 @@
11
# AWS Public Security Group
2-
# module "public_security_group" {
3-
# source = "./resources"
4-
# count = var.cluster_architecture == "1-tier" || var.cluster_architecture == "2-tier" || var.cluster_architecture == "3-tier" ? 1 : 0
5-
# vpc_id = var.vpc_id
6-
# cluster_prefix = var.cluster_prefix
7-
# cluster_environment = var.cluster_environment
8-
# sg_type = "public"
9-
# sg_description = "Allow connections from internet"
10-
# cluster_architecture = var.cluster_architecture
11-
# }
12-
132
resource "aws_security_group" "public_security_group" {
143
count = var.cluster_architecture == "1-tier" || var.cluster_architecture == "2-tier" || var.cluster_architecture == "3-tier" ? 1 : 0
154
name = "${var.cluster_prefix}-public"
@@ -68,17 +57,6 @@ resource "aws_security_group" "public_security_group" {
6857
# }
6958

7059
# AWS Private Security Group
71-
# module "private_security_group" {
72-
# source = "./resources"
73-
# count = var.cluster_architecture == "2-tier" || var.cluster_architecture == "3-tier" ? 1 : 0
74-
# vpc_id = var.vpc_id
75-
# cluster_prefix = var.cluster_prefix
76-
# cluster_environment = var.cluster_environment
77-
# sg_type = "private"
78-
# sg_description = "The private security group to allows inbound traffic from public group"
79-
# cluster_architecture = var.cluster_architecture
80-
# }
81-
8260
resource "aws_security_group" "private_security_group" {
8361
count = var.cluster_architecture == "2-tier" || var.cluster_architecture == "3-tier" ? 1 : 0
8462
name = "${var.cluster_prefix}-private"
@@ -112,17 +90,6 @@ resource "aws_security_group_rule" "allow_inbound_private" {
11290
}
11391

11492
# AWS Storage Security Group
115-
# module "storage_security_group" {
116-
# source = "./resources"
117-
# count = var.cluster_architecture == "3-tier" ? 1 : 0
118-
# vpc_id = var.vpc_id
119-
# cluster_prefix = var.cluster_prefix
120-
# cluster_environment = var.cluster_environment
121-
# sg_type = "storage"
122-
# sg_description = "The storage security group to allows inbound traffic from private group"
123-
# cluster_architecture = var.cluster_architecture
124-
# }
125-
12693
resource "aws_security_group" "storage_security_group" {
12794
count = var.cluster_architecture == "3-tier" ? 1 : 0
12895
name = "${var.cluster_prefix}-storage"
@@ -153,4 +120,4 @@ resource "aws_security_group_rule" "allow_inbound_storage" {
153120
protocol = "-1"
154121
source_security_group_id = aws_security_group.private_security_group[0].id
155122
security_group_id = aws_security_group.storage_security_group[0].id
156-
}
123+
}

modules/security-groups/output.tf

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,3 @@
1-
output "public_security_group_ids" {
2-
value = aws_security_group.public_security_group.*.id
1+
output "public_security_group_id" {
2+
value = aws_security_group.public_security_group[0].id
33
}
4-
5-
output "private_security_group_ids" {
6-
value = aws_security_group.private_security_group.*.id
7-
}
8-
9-
output "storage_security_group_ids" {
10-
value = aws_security_group.storage_security_group.*.id
11-
}

modules/subnets/main.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ resource "aws_route" "public_route" {
5555

5656
# AWS Route Tables - Private Route
5757
resource "aws_route" "private_route" {
58-
count = var.cluster_architecture == "2-tier" || var.cluster_architecture == "3-tier" && contains(var.subnet_type, "private") ? length(data.aws_availability_zones.available_zones.names) : 0
58+
count = var.cluster_architecture == "3-tier" && contains(var.subnet_type, "private") ? length(data.aws_availability_zones.available_zones.names) : 0
5959
route_table_id = module.aws_private_subnet.route_table_ids[count.index]
6060
destination_cidr_block = "0.0.0.0/0"
6161
nat_gateway_id = var.aws_nat_gateway_id[0]

0 commit comments

Comments
 (0)