Skip to content

Commit 1348758

Browse files
author
Sol Rosenberg
authored
Merge pull request #3 from solsglasses/improve_default_sg_output
Improve output default_security_group_id
2 parents 9e690ab + 4147837 commit 1348758

File tree

3 files changed

+8
-42
lines changed

3 files changed

+8
-42
lines changed

data.tf

Lines changed: 4 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,6 @@
11
data "aws_availability_zones" "available" {}
22

3-
data "aws_ami" "ubuntu" {
4-
most_recent = true
5-
6-
filter {
7-
name = "name"
8-
values = ["ubuntu/images/hvm-ssd/ubuntu-xenial-16.04-amd64-server-*"]
9-
}
10-
11-
filter {
12-
name = "virtualization-type"
13-
values = ["hvm"]
14-
}
15-
16-
owners = ["099720109477"] # Canonical
17-
}
3+
data "aws_security_group" "default" {
4+
vpc_id = "${aws_vpc.main.id}"
5+
name = "default"
6+
}

main.tf

Lines changed: 0 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,6 @@ resource "aws_nat_gateway" "main" {
5555
tags {
5656
Name = "${trimspace(var.name_tag_prefix)}"
5757
}
58-
5958
}
6059

6160
resource "aws_route_table" "private" {
@@ -104,24 +103,3 @@ resource "aws_route_table_association" "public" {
104103
subnet_id = "${element(aws_subnet.public.*.id, count.index)}"
105104
route_table_id = "${aws_route_table.public.id}"
106105
}
107-
108-
resource "aws_default_security_group" "default" {
109-
# Yes this is created automatically by the aws_vpc resource, however,
110-
# we have to declare it within terraform to be able to use it as an output
111-
# for other terraform activities
112-
vpc_id = "${aws_vpc.main.id}"
113-
114-
ingress {
115-
from_port = 0
116-
to_port = 0
117-
protocol = "-1"
118-
self = true
119-
}
120-
121-
egress {
122-
from_port = 0
123-
to_port = 0
124-
protocol = "-1"
125-
cidr_blocks = ["0.0.0.0/0"]
126-
}
127-
}

outputs.tf

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,13 @@ output "vpc_id" {
33
}
44

55
output "default_security_group_id" {
6-
value = "${aws_default_security_group.default.id}"
6+
value = "${data.aws_security_group.default.id}"
77
}
88

99
locals {
10-
empty_list = ["","","","","","","","","",""]
10+
empty_list = ["", "", "", "", "", "", "", "", "", ""]
1111

12-
private_subnet_padded = "${concat(var.private_subnet_nametags,local.empty_list)}"
12+
private_subnet_padded = "${concat(var.private_subnet_nametags,local.empty_list)}"
1313
private_subnet_ids_type0 = "${coalescelist(matchkeys(aws_subnet.private.*.id, aws_subnet.private.*.tags.Description,list("${element(local.private_subnet_padded,0)}")),list(""))}"
1414
private_subnet_ids_type1 = "${coalescelist(matchkeys(aws_subnet.private.*.id, aws_subnet.private.*.tags.Description,list("${element(local.private_subnet_padded,1)}")),list(""))}"
1515
private_subnet_ids_type2 = "${coalescelist(matchkeys(aws_subnet.private.*.id, aws_subnet.private.*.tags.Description,list("${element(local.private_subnet_padded,2)}")),list(""))}"
@@ -21,7 +21,7 @@ locals {
2121
private_subnet_ids_type8 = "${coalescelist(matchkeys(aws_subnet.private.*.id, aws_subnet.private.*.tags.Description,list("${element(local.private_subnet_padded,8)}")),list(""))}"
2222
private_subnet_ids_type9 = "${coalescelist(matchkeys(aws_subnet.private.*.id, aws_subnet.private.*.tags.Description,list("${element(local.private_subnet_padded,9)}")),list(""))}"
2323

24-
public_subnet_padded = "${concat(var.public_subnet_nametags,local.empty_list)}"
24+
public_subnet_padded = "${concat(var.public_subnet_nametags,local.empty_list)}"
2525
public_subnet_ids_type0 = "${coalescelist(matchkeys(aws_subnet.public.*.id, aws_subnet.public.*.tags.Description,list("${element(local.public_subnet_padded,0)}")),list(""))}"
2626
public_subnet_ids_type1 = "${coalescelist(matchkeys(aws_subnet.public.*.id, aws_subnet.public.*.tags.Description,list("${element(local.public_subnet_padded,1)}")),list(""))}"
2727
public_subnet_ids_type2 = "${coalescelist(matchkeys(aws_subnet.public.*.id, aws_subnet.public.*.tags.Description,list("${element(local.public_subnet_padded,2)}")),list(""))}"
@@ -32,7 +32,6 @@ locals {
3232
public_subnet_ids_type7 = "${coalescelist(matchkeys(aws_subnet.public.*.id, aws_subnet.public.*.tags.Description,list("${element(local.public_subnet_padded,7)}")),list(""))}"
3333
public_subnet_ids_type8 = "${coalescelist(matchkeys(aws_subnet.public.*.id, aws_subnet.public.*.tags.Description,list("${element(local.public_subnet_padded,8)}")),list(""))}"
3434
public_subnet_ids_type9 = "${coalescelist(matchkeys(aws_subnet.public.*.id, aws_subnet.public.*.tags.Description,list("${element(local.public_subnet_padded,9)}")),list(""))}"
35-
3635
}
3736

3837
output "private_subnet_ids" {

0 commit comments

Comments
 (0)