Skip to content

Commit 35dce3a

Browse files
Volatusramonskie
Volatus
authored and
ramonskie
committed
fix: apply terraform fmt to update syntax
Signed-off-by: Ismayil Mirzali <[email protected]>
1 parent bc1884a commit 35dce3a

File tree

9 files changed

+333
-341
lines changed

9 files changed

+333
-341
lines changed

‎terraform/aws/templates/base.tf

Lines changed: 113 additions & 117 deletions
Large diffs are not rendered by default.

‎terraform/aws/templates/cf_dns.tf

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@ variable "parent_zone" {
99
}
1010

1111
data "aws_route53_zone" "parent" {
12-
count = "${var.parent_zone == "" ? 0 : 1}"
12+
count = var.parent_zone == "" ? 0 : 1
1313

14-
name = "${var.parent_zone}"
14+
name = var.parent_zone
1515
}
1616

1717
output "env_dns_zone_name_servers" {
@@ -24,17 +24,17 @@ locals {
2424
}
2525

2626
resource "aws_route53_zone" "env_dns_zone" {
27-
count = "${var.parent_zone == "" ? 1 : 0}"
27+
count = var.parent_zone == "" ? 1 : 0
2828

29-
name = "${var.system_domain}"
29+
name = var.system_domain
3030

3131
tags = {
3232
Name = "${var.env_id}-hosted-zone"
3333
}
3434
}
3535

3636
resource "aws_route53_record" "wildcard_dns" {
37-
zone_id = "${local.zone_id}"
37+
zone_id = local.zone_id
3838
name = "*.${var.system_domain}"
3939
type = "CNAME"
4040
ttl = 300
@@ -43,7 +43,7 @@ resource "aws_route53_record" "wildcard_dns" {
4343
}
4444

4545
resource "aws_route53_record" "ssh" {
46-
zone_id = "${local.zone_id}"
46+
zone_id = local.zone_id
4747
name = "ssh.${var.system_domain}"
4848
type = "CNAME"
4949
ttl = 300
@@ -52,7 +52,7 @@ resource "aws_route53_record" "ssh" {
5252
}
5353

5454
resource "aws_route53_record" "bosh" {
55-
zone_id = "${local.zone_id}"
55+
zone_id = local.zone_id
5656
name = "bosh.${var.system_domain}"
5757
type = "A"
5858
ttl = 300
@@ -61,7 +61,7 @@ resource "aws_route53_record" "bosh" {
6161
}
6262

6363
resource "aws_route53_record" "tcp" {
64-
zone_id = "${local.zone_id}"
64+
zone_id = local.zone_id
6565
name = "tcp.${var.system_domain}"
6666
type = "CNAME"
6767
ttl = 300
@@ -70,9 +70,9 @@ resource "aws_route53_record" "tcp" {
7070
}
7171

7272
resource "aws_route53_record" "iso" {
73-
count = "${var.isolation_segments}"
73+
count = var.isolation_segments
7474

75-
zone_id = "${local.zone_id}"
75+
zone_id = local.zone_id
7676
name = "*.iso-seg.${var.system_domain}"
7777
type = "CNAME"
7878
ttl = 300

‎terraform/aws/templates/cf_lb.tf

Lines changed: 69 additions & 69 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,26 @@
11
variable "elb_idle_timeout" {
2-
type = number
2+
type = number
33
default = 60
44
}
55

66
resource "aws_security_group" "cf_ssh_lb_security_group" {
77
name = "${var.env_id}-cf-ssh-lb-security-group"
88
description = "CF SSH"
9-
vpc_id = "${local.vpc_id}"
9+
vpc_id = local.vpc_id
1010

1111
ingress {
12-
cidr_blocks = ["0.0.0.0/0"]
12+
cidr_blocks = ["0.0.0.0/0"]
1313
ipv6_cidr_blocks = var.dualstack ? ["::/0"] : null
14-
protocol = "tcp"
15-
from_port = 2222
16-
to_port = 2222
14+
protocol = "tcp"
15+
from_port = 2222
16+
to_port = 2222
1717
}
1818

1919
egress {
20-
from_port = 0
21-
to_port = 0
22-
protocol = "-1"
23-
cidr_blocks = ["0.0.0.0/0"]
20+
from_port = 0
21+
to_port = 0
22+
protocol = "-1"
23+
cidr_blocks = ["0.0.0.0/0"]
2424
ipv6_cidr_blocks = var.dualstack ? ["::/0"] : null
2525
}
2626

@@ -34,13 +34,13 @@ resource "aws_security_group" "cf_ssh_lb_security_group" {
3434
}
3535

3636
output "cf_ssh_lb_security_group" {
37-
value = "${aws_security_group.cf_ssh_lb_security_group.id}"
37+
value = aws_security_group.cf_ssh_lb_security_group.id
3838
}
3939

4040
resource "aws_security_group" "cf_ssh_lb_internal_security_group" {
4141
name = "${var.env_id}-cf-ssh-lb-internal-security-group"
4242
description = "CF SSH Internal"
43-
vpc_id = "${local.vpc_id}"
43+
vpc_id = local.vpc_id
4444

4545
ingress {
4646
security_groups = ["${aws_security_group.cf_ssh_lb_security_group.id}"]
@@ -50,10 +50,10 @@ resource "aws_security_group" "cf_ssh_lb_internal_security_group" {
5050
}
5151

5252
egress {
53-
from_port = 0
54-
to_port = 0
55-
protocol = "-1"
56-
cidr_blocks = ["0.0.0.0/0"]
53+
from_port = 0
54+
to_port = 0
55+
protocol = "-1"
56+
cidr_blocks = ["0.0.0.0/0"]
5757
ipv6_cidr_blocks = var.dualstack ? ["::/0"] : null
5858
}
5959

@@ -67,7 +67,7 @@ resource "aws_security_group" "cf_ssh_lb_internal_security_group" {
6767
}
6868

6969
output "cf_ssh_lb_internal_security_group" {
70-
value = "${aws_security_group.cf_ssh_lb_internal_security_group.id}"
70+
value = aws_security_group.cf_ssh_lb_internal_security_group.id
7171
}
7272

7373
resource "aws_elb" "cf_ssh_lb" {
@@ -89,7 +89,7 @@ resource "aws_elb" "cf_ssh_lb" {
8989
lb_protocol = "tcp"
9090
}
9191

92-
idle_timeout = "${var.elb_idle_timeout}"
92+
idle_timeout = var.elb_idle_timeout
9393

9494
security_groups = ["${aws_security_group.cf_ssh_lb_security_group.id}"]
9595
subnets = flatten(["${aws_subnet.lb_subnets.*.id}"])
@@ -100,47 +100,47 @@ resource "aws_elb" "cf_ssh_lb" {
100100
}
101101

102102
output "cf_ssh_lb_name" {
103-
value = "${aws_elb.cf_ssh_lb.name}"
103+
value = aws_elb.cf_ssh_lb.name
104104
}
105105

106106
output "cf_ssh_lb_url" {
107-
value = "${aws_elb.cf_ssh_lb.dns_name}"
107+
value = aws_elb.cf_ssh_lb.dns_name
108108
}
109109

110110
resource "aws_security_group" "cf_router_lb_security_group" {
111111
name = "${var.env_id}-cf-router-lb-security-group"
112112
description = "CF Router"
113-
vpc_id = "${local.vpc_id}"
113+
vpc_id = local.vpc_id
114114

115115
ingress {
116-
cidr_blocks = ["0.0.0.0/0"]
116+
cidr_blocks = ["0.0.0.0/0"]
117117
ipv6_cidr_blocks = var.dualstack ? ["::/0"] : null
118-
protocol = "tcp"
119-
from_port = 80
120-
to_port = 80
118+
protocol = "tcp"
119+
from_port = 80
120+
to_port = 80
121121
}
122122

123123
ingress {
124-
cidr_blocks = ["0.0.0.0/0"]
124+
cidr_blocks = ["0.0.0.0/0"]
125125
ipv6_cidr_blocks = var.dualstack ? ["::/0"] : null
126-
protocol = "tcp"
127-
from_port = 443
128-
to_port = 443
126+
protocol = "tcp"
127+
from_port = 443
128+
to_port = 443
129129
}
130130

131131
ingress {
132-
cidr_blocks = ["0.0.0.0/0"]
132+
cidr_blocks = ["0.0.0.0/0"]
133133
ipv6_cidr_blocks = var.dualstack ? ["::/0"] : null
134-
protocol = "tcp"
135-
from_port = 4443
136-
to_port = 4443
134+
protocol = "tcp"
135+
from_port = 4443
136+
to_port = 4443
137137
}
138138

139139
egress {
140-
from_port = 0
141-
to_port = 0
142-
protocol = "-1"
143-
cidr_blocks = ["0.0.0.0/0"]
140+
from_port = 0
141+
to_port = 0
142+
protocol = "-1"
143+
cidr_blocks = ["0.0.0.0/0"]
144144
ipv6_cidr_blocks = var.dualstack ? ["::/0"] : null
145145
}
146146

@@ -154,13 +154,13 @@ resource "aws_security_group" "cf_router_lb_security_group" {
154154
}
155155

156156
output "cf_router_lb_security_group" {
157-
value = "${aws_security_group.cf_router_lb_security_group.id}"
157+
value = aws_security_group.cf_router_lb_security_group.id
158158
}
159159

160160
resource "aws_security_group" "cf_router_lb_internal_security_group" {
161161
name = "${var.env_id}-cf-router-lb-internal-security-group"
162162
description = "CF Router Internal"
163-
vpc_id = "${local.vpc_id}"
163+
vpc_id = local.vpc_id
164164

165165
ingress {
166166
security_groups = ["${aws_security_group.cf_router_lb_security_group.id}"]
@@ -170,10 +170,10 @@ resource "aws_security_group" "cf_router_lb_internal_security_group" {
170170
}
171171

172172
egress {
173-
from_port = 0
174-
to_port = 0
175-
protocol = "-1"
176-
cidr_blocks = ["0.0.0.0/0"]
173+
from_port = 0
174+
to_port = 0
175+
protocol = "-1"
176+
cidr_blocks = ["0.0.0.0/0"]
177177
ipv6_cidr_blocks = var.dualstack ? ["::/0"] : null
178178
}
179179

@@ -187,7 +187,7 @@ resource "aws_security_group" "cf_router_lb_internal_security_group" {
187187
}
188188

189189
output "cf_router_lb_internal_security_group" {
190-
value = "${aws_security_group.cf_router_lb_internal_security_group.id}"
190+
value = aws_security_group.cf_router_lb_internal_security_group.id
191191
}
192192

193193
resource "aws_elb" "cf_router_lb" {
@@ -214,18 +214,18 @@ resource "aws_elb" "cf_router_lb" {
214214
instance_protocol = "http"
215215
lb_port = 443
216216
lb_protocol = "https"
217-
ssl_certificate_id = "${aws_iam_server_certificate.lb_cert.arn}"
217+
ssl_certificate_id = aws_iam_server_certificate.lb_cert.arn
218218
}
219219

220220
listener {
221221
instance_port = 80
222222
instance_protocol = "tcp"
223223
lb_port = 4443
224224
lb_protocol = "ssl"
225-
ssl_certificate_id = "${aws_iam_server_certificate.lb_cert.arn}"
225+
ssl_certificate_id = aws_iam_server_certificate.lb_cert.arn
226226
}
227227

228-
idle_timeout = "${var.elb_idle_timeout}"
228+
idle_timeout = var.elb_idle_timeout
229229

230230
security_groups = ["${aws_security_group.cf_router_lb_security_group.id}"]
231231
subnets = flatten(["${aws_subnet.lb_subnets.*.id}"])
@@ -239,7 +239,7 @@ resource "aws_lb_target_group" "cf_router_4443" {
239239
name = "${var.short_env_id}-routertg-4443"
240240
port = 4443
241241
protocol = "TCP"
242-
vpc_id = "${local.vpc_id}"
242+
vpc_id = local.vpc_id
243243

244244
health_check {
245245
protocol = "TCP"
@@ -251,31 +251,31 @@ resource "aws_lb_target_group" "cf_router_4443" {
251251
}
252252

253253
output "cf_router_lb_name" {
254-
value = "${aws_elb.cf_router_lb.name}"
254+
value = aws_elb.cf_router_lb.name
255255
}
256256

257257
output "cf_router_lb_url" {
258-
value = "${aws_elb.cf_router_lb.dns_name}"
258+
value = aws_elb.cf_router_lb.dns_name
259259
}
260260

261261
resource "aws_security_group" "cf_tcp_lb_security_group" {
262262
name = "${var.env_id}-cf-tcp-lb-security-group"
263263
description = "CF TCP"
264-
vpc_id = "${local.vpc_id}"
264+
vpc_id = local.vpc_id
265265

266266
ingress {
267-
cidr_blocks = ["0.0.0.0/0"]
267+
cidr_blocks = ["0.0.0.0/0"]
268268
ipv6_cidr_blocks = var.dualstack ? ["::/0"] : null
269-
protocol = "tcp"
270-
from_port = 1024
271-
to_port = 1123
269+
protocol = "tcp"
270+
from_port = 1024
271+
to_port = 1123
272272
}
273273

274274
egress {
275-
from_port = 0
276-
to_port = 0
277-
protocol = "-1"
278-
cidr_blocks = ["0.0.0.0/0"]
275+
from_port = 0
276+
to_port = 0
277+
protocol = "-1"
278+
cidr_blocks = ["0.0.0.0/0"]
279279
ipv6_cidr_blocks = var.dualstack ? ["::/0"] : null
280280
}
281281

@@ -289,13 +289,13 @@ resource "aws_security_group" "cf_tcp_lb_security_group" {
289289
}
290290

291291
output "cf_tcp_lb_security_group" {
292-
value = "${aws_security_group.cf_tcp_lb_security_group.id}"
292+
value = aws_security_group.cf_tcp_lb_security_group.id
293293
}
294294

295295
resource "aws_security_group" "cf_tcp_lb_internal_security_group" {
296296
name = "${var.env_id}-cf-tcp-lb-internal-security-group"
297297
description = "CF TCP Internal"
298-
vpc_id = "${local.vpc_id}"
298+
vpc_id = local.vpc_id
299299

300300
ingress {
301301
security_groups = ["${aws_security_group.cf_tcp_lb_security_group.id}"]
@@ -312,10 +312,10 @@ resource "aws_security_group" "cf_tcp_lb_internal_security_group" {
312312
}
313313

314314
egress {
315-
from_port = 0
316-
to_port = 0
317-
protocol = "-1"
318-
cidr_blocks = ["0.0.0.0/0"]
315+
from_port = 0
316+
to_port = 0
317+
protocol = "-1"
318+
cidr_blocks = ["0.0.0.0/0"]
319319
ipv6_cidr_blocks = var.dualstack ? ["::/0"] : null
320320
}
321321

@@ -329,7 +329,7 @@ resource "aws_security_group" "cf_tcp_lb_internal_security_group" {
329329
}
330330

331331
output "cf_tcp_lb_internal_security_group" {
332-
value = "${aws_security_group.cf_tcp_lb_internal_security_group.id}"
332+
value = aws_security_group.cf_tcp_lb_internal_security_group.id
333333
}
334334

335335
resource "aws_elb" "cf_tcp_lb" {
@@ -355,7 +355,7 @@ resource "aws_elb" "cf_tcp_lb" {
355355
}
356356
}
357357

358-
idle_timeout = "${var.elb_idle_timeout}"
358+
idle_timeout = var.elb_idle_timeout
359359

360360
security_groups = ["${aws_security_group.cf_tcp_lb_security_group.id}"]
361361
subnets = flatten(["${aws_subnet.lb_subnets.*.id}"])
@@ -366,9 +366,9 @@ resource "aws_elb" "cf_tcp_lb" {
366366
}
367367

368368
output "cf_tcp_lb_name" {
369-
value = "${aws_elb.cf_tcp_lb.name}"
369+
value = aws_elb.cf_tcp_lb.name
370370
}
371371

372372
output "cf_tcp_lb_url" {
373-
value = "${aws_elb.cf_tcp_lb.dns_name}"
373+
value = aws_elb.cf_tcp_lb.dns_name
374374
}

0 commit comments

Comments
 (0)