Skip to content

Commit 818ef3e

Browse files
applied tf fmt recurisively
1 parent 22314f0 commit 818ef3e

File tree

6 files changed

+69
-131
lines changed

6 files changed

+69
-131
lines changed

main.tf

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -37,28 +37,28 @@ module "public_subnet" {
3737
cluster_prefix = var.cluster_prefix
3838
cluster_environment = var.cluster_environment
3939
subnet_type = ["public"]
40-
cluster_architecture = var.cluster_architecture
40+
cluster_architecture = var.cluster_architecture
4141
}
4242

4343
# AWS NAT Gateway Module
4444
module "nat_gateway" {
45-
source = "./modules/nat-gateways"
46-
cluster_prefix = var.cluster_prefix
47-
cluster_environment = var.cluster_environment
48-
public_subnet_ids = module.public_subnet.public_subnet_ids
45+
source = "./modules/nat-gateways"
46+
cluster_prefix = var.cluster_prefix
47+
cluster_environment = var.cluster_environment
48+
public_subnet_ids = module.public_subnet.public_subnet_ids
4949
cluster_architecture = var.cluster_architecture
5050
}
5151

5252
# AWS VPC Subnets Module - Private Subnet
5353
module "private_subnet" {
54-
source = "./modules/subnets"
55-
vpc_id = aws_vpc.vpc.id
56-
aws_nat_gateway_id = module.nat_gateway.nat_gateway_ids
57-
cidr = var.cidr
58-
cluster_prefix = var.cluster_prefix
59-
cluster_environment = var.cluster_environment
60-
subnet_bits = var.subnet_bits
61-
subnet_type = ["private", "storage"]
54+
source = "./modules/subnets"
55+
vpc_id = aws_vpc.vpc.id
56+
aws_nat_gateway_id = module.nat_gateway.nat_gateway_ids
57+
cidr = var.cidr
58+
cluster_prefix = var.cluster_prefix
59+
cluster_environment = var.cluster_environment
60+
subnet_bits = var.subnet_bits
61+
subnet_type = ["private", "storage"]
6262
cluster_architecture = var.cluster_architecture
6363
}
6464

modules/security-groups/main.tf

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -18,27 +18,27 @@ resource "aws_security_group" "public_security_group" {
1818
revoke_rules_on_delete = true
1919

2020
egress {
21-
description = "Allow all outbound"
22-
from_port = 0
23-
to_port = 65535
24-
protocol = "-1"
25-
cidr_blocks = ["0.0.0.0/0"]
21+
description = "Allow all outbound"
22+
from_port = 0
23+
to_port = 65535
24+
protocol = "-1"
25+
cidr_blocks = ["0.0.0.0/0"]
2626
}
2727

2828
ingress {
29-
description = "Allow http inbound public"
30-
from_port = 80
31-
to_port = 80
32-
protocol = "tcp"
33-
cidr_blocks = ["0.0.0.0/0"]
29+
description = "Allow http inbound public"
30+
from_port = 80
31+
to_port = 80
32+
protocol = "tcp"
33+
cidr_blocks = ["0.0.0.0/0"]
3434
}
3535

3636
ingress {
37-
description = "Allow https inbound public"
38-
from_port = 443
39-
to_port = 443
40-
protocol = "tcp"
41-
cidr_blocks = ["0.0.0.0/0"]
37+
description = "Allow https inbound public"
38+
from_port = 443
39+
to_port = 443
40+
protocol = "tcp"
41+
cidr_blocks = ["0.0.0.0/0"]
4242
}
4343

4444
tags = {
@@ -87,10 +87,10 @@ resource "aws_security_group" "private_security_group" {
8787
revoke_rules_on_delete = true
8888

8989
egress {
90-
from_port = 0
91-
to_port = 65535
92-
protocol = "-1"
93-
cidr_blocks = ["0.0.0.0/0"]
90+
from_port = 0
91+
to_port = 65535
92+
protocol = "-1"
93+
cidr_blocks = ["0.0.0.0/0"]
9494
}
9595

9696
tags = {
@@ -131,10 +131,10 @@ resource "aws_security_group" "storage_security_group" {
131131
revoke_rules_on_delete = true
132132

133133
egress {
134-
from_port = 0
135-
to_port = 65535
136-
protocol = "-1"
137-
cidr_blocks = ["0.0.0.0/0"]
134+
from_port = 0
135+
to_port = 65535
136+
protocol = "-1"
137+
cidr_blocks = ["0.0.0.0/0"]
138138
}
139139

140140
tags = {

modules/security-groups/resources/main.tf

Lines changed: 0 additions & 30 deletions
This file was deleted.

modules/security-groups/resources/output.tf

Lines changed: 0 additions & 3 deletions
This file was deleted.

modules/security-groups/resources/variables.tf

Lines changed: 0 additions & 29 deletions
This file was deleted.

modules/subnets/main.tf

Lines changed: 33 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -3,46 +3,46 @@ data "aws_availability_zones" "available_zones" {}
33

44
# AWS Public Subnets
55
module "aws_public_subnet" {
6-
source = "./resources"
7-
create = contains(var.subnet_type, "public") ? 1 : 0
8-
tier = var.cluster_architecture == "1-tier" || var.cluster_architecture == "2-tier" || var.cluster_architecture == "3-tier" ? 1 : 0
9-
cluster_prefix = var.cluster_prefix
10-
cluster_environment = var.cluster_environment
11-
vpc_id = var.vpc_id
12-
cidr = var.cidr
13-
subnet_bits = var.subnet_bits
14-
subnet_type = "public"
15-
cluster_architecture = var.cluster_architecture
6+
source = "./resources"
7+
create = contains(var.subnet_type, "public") ? 1 : 0
8+
tier = var.cluster_architecture == "1-tier" || var.cluster_architecture == "2-tier" || var.cluster_architecture == "3-tier" ? 1 : 0
9+
cluster_prefix = var.cluster_prefix
10+
cluster_environment = var.cluster_environment
11+
cluster_architecture = var.cluster_architecture
12+
vpc_id = var.vpc_id
13+
cidr = var.cidr
14+
subnet_bits = var.subnet_bits
15+
subnet_type = "public"
1616
}
1717

1818
# AWS Private Subnets
1919
module "aws_private_subnet" {
20-
source = "./resources"
21-
create = contains(var.subnet_type, "private") ? 1 : 0
22-
tier = var.cluster_architecture == "2-tier" || var.cluster_architecture == "3-tier" ? 1 : 0
23-
cluster_prefix = var.cluster_prefix
24-
cluster_environment = var.cluster_environment
25-
vpc_id = var.vpc_id
26-
cidr = var.cidr
27-
offset = length(data.aws_availability_zones.available_zones.names)
28-
subnet_bits = var.subnet_bits
29-
subnet_type = "private"
30-
cluster_architecture = var.cluster_architecture
20+
source = "./resources"
21+
create = contains(var.subnet_type, "private") ? 1 : 0
22+
tier = var.cluster_architecture == "2-tier" || var.cluster_architecture == "3-tier" ? 1 : 0
23+
cluster_prefix = var.cluster_prefix
24+
cluster_environment = var.cluster_environment
25+
cluster_architecture = var.cluster_architecture
26+
vpc_id = var.vpc_id
27+
cidr = var.cidr
28+
offset = length(data.aws_availability_zones.available_zones.names)
29+
subnet_bits = var.subnet_bits
30+
subnet_type = "private"
3131
}
3232

3333
# AWS Storage Subnets
3434
module "aws_storage_subnet" {
35-
source = "./resources"
36-
create = contains(var.subnet_type, "storage") ? 1 : 0
37-
tier = var.cluster_architecture == "3-tier" ? 1 : 0
38-
cluster_prefix = var.cluster_prefix
39-
cluster_environment = var.cluster_environment
40-
cidr = var.cidr
41-
vpc_id = var.vpc_id
42-
offset = 2 * length(data.aws_availability_zones.available_zones.names)
43-
subnet_bits = var.subnet_bits
44-
subnet_type = "storage"
45-
cluster_architecture = var.cluster_architecture
35+
source = "./resources"
36+
create = contains(var.subnet_type, "storage") ? 1 : 0
37+
tier = var.cluster_architecture == "3-tier" ? 1 : 0
38+
cluster_prefix = var.cluster_prefix
39+
cluster_environment = var.cluster_environment
40+
cluster_architecture = var.cluster_architecture
41+
cidr = var.cidr
42+
vpc_id = var.vpc_id
43+
offset = 2 * length(data.aws_availability_zones.available_zones.names)
44+
subnet_bits = var.subnet_bits
45+
subnet_type = "storage"
4646
}
4747

4848
# AWS Route Tables - Public Route
@@ -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 == "2-tier" || 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)