Removal of "${ }" characters and subnet variables

terraform/modules/infrastructure/assets/network/gateways.tf

@@ -1,13 +1,13 @@
 resource "aws_internet_gateway" "gw" {
-  vpc_id = "${aws_vpc.main.id}"
+  vpc_id = aws_vpc.main.id
 }
 
 resource "aws_nat_gateway" "nat-a" {
-  allocation_id = "${aws_eip.nat-a.id}"
-  subnet_id     = "${aws_subnet.attacker_subnet.id}"
+  allocation_id = aws_eip.nat-a.id
+  subnet_id     = aws_subnet.attacker_subnet.id
 }
 
 resource "aws_nat_gateway" "nat-b" {
-  allocation_id = "${aws_eip.nat-b.id}"
-  subnet_id     = "${aws_subnet.target_subnet.id}"
+  allocation_id = aws_eip.nat-b.id
+  subnet_id     = aws_subnet.target_subnet.id
 }

terraform/modules/infrastructure/assets/network/routes.tf

@@ -1,9 +1,9 @@
 resource "aws_route_table" "public-a" {
-  vpc_id = "${aws_vpc.main.id}"
+  vpc_id = aws_vpc.main.id
 
   route {
     cidr_block = "0.0.0.0/0"
-    gateway_id = "${aws_internet_gateway.gw.id}"
+    gateway_id = aws_internet_gateway.gw.id
   }
 
   tags = {
@@ -13,17 +13,17 @@ resource "aws_route_table" "public-a" {
 }
 
 resource "aws_route_table_association" "public-a" {
-  subnet_id      = "${aws_subnet.attacker_subnet.id}"
-  route_table_id = "${aws_route_table.public-a.id}"
+  subnet_id      = aws_subnet.attacker_subnet.id
+  route_table_id = aws_route_table.public-a.id
 }
 
 
 resource "aws_route_table" "public-b" {
-  vpc_id = "${aws_vpc.main.id}"
+  vpc_id = aws_vpc.main.id
 
   route {
     cidr_block = "0.0.0.0/0"
-    gateway_id = "${aws_internet_gateway.gw.id}"
+    gateway_id = aws_internet_gateway.gw.id
   }
 
   tags = {
@@ -33,16 +33,16 @@ resource "aws_route_table" "public-b" {
 }
 
 resource "aws_route_table_association" "public-b" {
-  subnet_id      = "${aws_subnet.target_subnet.id}"
-  route_table_id = "${aws_route_table.public-b.id}"
+  subnet_id      = aws_subnet.target_subnet.id
+  route_table_id = aws_route_table.public-b.id
 }
 
 resource "aws_route_table" "private-a" {
-  vpc_id = "${aws_vpc.main.id}"
+  vpc_id = aws_vpc.main.id
 
   route {
     cidr_block     = "0.0.0.0/0"
-    nat_gateway_id = "${aws_nat_gateway.nat-a.id}"
+    nat_gateway_id = aws_nat_gateway.nat-a.id
   }
 
   tags = {
@@ -52,16 +52,16 @@ resource "aws_route_table" "private-a" {
 }
 
 resource "aws_route_table_association" "private-a" {
-  subnet_id      = "${aws_subnet.private-a.id}"
-  route_table_id = "${aws_route_table.private-a.id}"
+  subnet_id      = aws_subnet.private-a.id
+  route_table_id = aws_route_table.private-a.id
 }
 
 resource "aws_route_table" "private-b" {
-  vpc_id = "${aws_vpc.main.id}"
+  vpc_id = aws_vpc.main.id
 
   route {
     cidr_block     = "0.0.0.0/0"
-    nat_gateway_id = "${aws_nat_gateway.nat-b.id}"
+    nat_gateway_id = aws_nat_gateway.nat-b.id
   }
 
   tags = {
@@ -71,13 +71,13 @@ resource "aws_route_table" "private-b" {
 }
 
 resource "aws_route_table_association" "private-b" {
-  subnet_id      = "${aws_subnet.private-b.id}"
-  route_table_id = "${aws_route_table.private-b.id}"
+  subnet_id      = aws_subnet.private-b.id
+  route_table_id = aws_route_table.private-b.id
 }
 
 // public-b
 //resource "aws_route" "internet_access" {
-//  route_table_id         = "${aws_vpc.main.main_route_table_id}"
+//  route_table_id         = aws_vpc.main.main_route_table_id
 //  destination_cidr_block = "0.0.0.0/0"
-//  gateway_id             = "${aws_internet_gateway.gw.id}"
+//  gateway_id             = "aws_internet_gateway.gw.id"
 //}

terraform/modules/infrastructure/assets/network/subnets.tf

@@ -1,7 +1,7 @@
 resource "aws_subnet" "attacker_subnet" {
-  vpc_id            = "${aws_vpc.main.id}"
-  cidr_block        = "${var.cidr}"
-  availability_zone = "${data.aws_availability_zones.available.names[1]}"
+  vpc_id            = aws_vpc.main.id
+  cidr_block        = var.cidr
+  availability_zone = data.aws_availability_zones.available.names[1]
   map_public_ip_on_launch = true
 
   tags = {
@@ -15,10 +15,10 @@ resource "aws_subnet" "attacker_subnet" {
 }
 
 resource "aws_subnet" "target_subnet" {
-  vpc_id                  = "${aws_vpc.main.id}"
+  vpc_id                  = aws_vpc.main.id
   cidr_block        = "192.168.39.0/24"
-  availability_zone       = "${data.aws_availability_zones.available.names[0]}"
-//  map_public_ip_on_launch = true
+  availability_zone       = data.aws_availability_zones.available.names[0]
+  map_public_ip_on_launch = false
 
   tags = {
     name        = "target_subnet"
@@ -30,10 +30,10 @@ resource "aws_subnet" "target_subnet" {
 }
 
 resource "aws_subnet" "malware_subnet" {
-  vpc_id            = "${aws_vpc.main.id}"
+  vpc_id            = aws_vpc.main.id
   cidr_block        = "192.168.40.0/24"
-  availability_zone = "${data.aws_availability_zones.available.names[1]}"
-  map_public_ip_on_launch = true
+  availability_zone = data.aws_availability_zones.available.names[1]
+  map_public_ip_on_launch = false
 
   tags = {
     name        = "malware_subnet"
@@ -46,10 +46,10 @@ resource "aws_subnet" "malware_subnet" {
 }
 
 resource "aws_subnet" "honeypot_subnet" {
-  vpc_id            = "${aws_vpc.main.id}"
+  vpc_id            = aws_vpc.main.id
   cidr_block        = "192.168.41.0/24"
-  availability_zone = "${data.aws_availability_zones.available.names[1]}"
-  map_public_ip_on_launch = true
+  availability_zone = data.aws_availability_zones.available.names[1]
+  map_public_ip_on_launch = false
 
   tags = {
     name        = "malware_subnet"
@@ -62,9 +62,9 @@ resource "aws_subnet" "honeypot_subnet" {
 }
 
 resource "aws_subnet" "private-a" {
-  vpc_id            = "${aws_vpc.main.id}"
+  vpc_id            = aws_vpc.main.id
   cidr_block        = "192.168.42.0/24"
-  availability_zone = "${data.aws_availability_zones.available.names[0]}"
+  availability_zone = data.aws_availability_zones.available.names[0]
 
   tags = {
     name        = "not-in-use-private-a"
@@ -77,9 +77,9 @@ resource "aws_subnet" "private-a" {
 }
 
 resource "aws_subnet" "private-b" {
-  vpc_id            = "${aws_vpc.main.id}"
+  vpc_id            = aws_vpc.main.id
   cidr_block        = "192.168.43.0/24"
-  availability_zone = "${data.aws_availability_zones.available.names[1]}"
+  availability_zone = data.aws_availability_zones.available.names[1]
 
   tags = {
     name        = "not-in-use-private-b"

terraform/modules/infrastructure/assets/secdevops/attackers.tf

@@ -6,13 +6,13 @@ locals {
 }
 
 resource "aws_instance" "kali" {
-  count = "${var.kali_ct}"
-  ami = "${data.aws_ami.kali.id}"
-  instance_type = "${var.instance_type_kali}"
-  subnet_id              = "${element(local.pen_subnet_ids, count.index)}"
+  count = var.kali_ct
+  ami = data.aws_ami.kali.id
+  instance_type = var.instance_type_kali
+  subnet_id              = element(local.pen_subnet_ids, count.index)
   vpc_security_group_ids = ["${aws_security_group.kali.id}"]
-  key_name = "${aws_key_pair.circleci_key.key_name}"
-  user_data = "${file("../../modules/infrastructure/cloud-init/kali.yml")}"
+  key_name = aws_key_pair.circleci_key.key_name
+  user_data = file("../../modules/infrastructure/cloud-init/kali.yml")
 
   root_block_device {
     delete_on_termination = true
@@ -26,12 +26,12 @@ resource "aws_instance" "kali" {
 }
 
 resource "aws_instance" "commando" {
-  count = "${var.docker_ct}"
-  ami = "${data.aws_ami.commando.id}"
-  instance_type = "${var.instance_type_win}"
-  subnet_id              = "${element(local.pen_subnet_ids, count.index)}"
+  count = var.docker_ct
+  ami = data.aws_ami.commando.id
+  instance_type = var.instance_type_win
+  subnet_id              = element(local.pen_subnet_ids, count.index)
   vpc_security_group_ids = ["${aws_security_group.windows.id}"]
-  key_name = "${aws_key_pair.circleci_key.key_name}"
+  key_name = aws_key_pair.circleci_key.key_name
 
   root_block_device {
     delete_on_termination = true
@@ -45,14 +45,14 @@ resource "aws_instance" "commando" {
 }
 
 resource "aws_instance" "r7vm" {
-  count = "${var.kali_ct}"
+  count = var.kali_ct
 
-  ami = "${data.aws_ami.r7.id}"
-  instance_type = "${var.instance_type_kali}"
+  ami = data.aws_ami.r7.id
+  instance_type = var.instance_type_kali
 
-  subnet_id              = "${element(local.pen_subnet_ids, count.index)}"
+  subnet_id              = element(local.pen_subnet_ids, count.index)
   vpc_security_group_ids = ["${aws_security_group.kali.id}"]
-  key_name = "${aws_key_pair.circleci_key.key_name}"
+  key_name = aws_key_pair.circleci_key.key_name
 
   root_block_device {
     delete_on_termination = true
@@ -67,12 +67,12 @@ resource "aws_instance" "r7vm" {
 }
 
 resource "aws_instance" "commandov2" {
-  count = "${var.docker_ct}"
-  ami           = "${data.aws_ami.commandov2.id}"
-  instance_type = "${var.instance_type_commandov2}"
-  subnet_id              = "${element(local.pen_subnet_ids, count.index)}"
+  count = var.docker_ct
+  ami           = data.aws_ami.commandov2.id
+  instance_type = var.instance_type_commandov2
+  subnet_id              = element(local.pen_subnet_ids, count.index)
   vpc_security_group_ids = ["${aws_security_group.kali.id}"]
-  key_name = "${aws_key_pair.circleci_key.key_name}"
+  key_name = aws_key_pair.circleci_key.key_name
   root_block_device {
     delete_on_termination = true
     volume_size           = 160

terraform/modules/infrastructure/assets/secdevops/aws_key_pairs.tf

@@ -1,4 +1,4 @@
 resource "aws_key_pair" "circleci_key" {
   key_name   = "v2"
-  public_key = "${file("../../keys/circleci_terraform.pub")}"
+  public_key = file("../../keys/circleci_terraform.pub")
 }

terraform/modules/infrastructure/assets/secdevops/ctf.playground.tf

@@ -1,27 +1,29 @@
 locals {
   fbctf_subnets_ids = [
-    "${var.attacker_subnet_id}",
     "${var.target_subnet_id}",
   ]
 }
 
 resource "aws_instance" "fbctf" {
-  count = "${var.fbctf_ct}"
+  count = var.fbctf_ct
 
-  ami           = "${data.aws_ami.ubuntu1604.id}"
-  instance_type = "${var.instance_type_docker}"
+  ami           = data.aws_ami.ubuntu1604.id
+  instance_type = var.instance_type_docker
 
-  subnet_id = "${element(local.fbctf_subnets_ids, count.index)}"
+  subnet_id = element(local.fbctf_subnets_ids, count.index)
 
   vpc_security_group_ids = ["${aws_security_group.fbctf.id}"]
 
-  key_name = "${aws_key_pair.circleci_key.key_name}"
+  key_name = aws_key_pair.circleci_key.key_name
+
+  #user_data = "${file("var.fbctf_user_data")}"
+
+
 
-  user_data = "${file("${var.fbctf_user_data}")}"
 
   root_block_device {
     volume_type = "gp2"
-    volume_size = "${var.fbctf_root_vol_size}"
+    volume_size = var.fbctf_root_vol_size
     delete_on_termination = "true"
   }
 

terraform/modules/infrastructure/assets/secdevops/detection.lab.tf

@@ -7,12 +7,12 @@ locals {
 
 
 resource "aws_instance" "dl-wef" {
-  count = "${var.docker_ct}"
-  ami           = "${data.aws_ami.detection-wef.id}"
-  instance_type = "${var.instance_type_tpot}"
-  subnet_id              = "${element(local.cyberRange_detection_subnets_ids, count.index)}"
-  vpc_security_group_ids = ["${aws_security_group.windows.id}"]
-  key_name = "${aws_key_pair.circleci_key.key_name}"
+  count = var.docker_ct
+  ami           = data.aws_ami.detection-wef.id
+  instance_type = var.instance_type_tpot
+  subnet_id              = element(local.cyberRange_detection_subnets_ids, count.index)
+  vpc_security_group_ids = [aws_security_group.windows.id]
+  key_name = aws_key_pair.circleci_key.key_name
   private_ip             = "192.168.38.103"
 
   root_block_device {
@@ -26,12 +26,12 @@ resource "aws_instance" "dl-wef" {
 }
 
 resource "aws_instance" "dl-dc" {
-  count = "${var.docker_ct}"
-  ami           = "${data.aws_ami.detection-dc.id}"
-  instance_type = "${var.instance_type_tpot}"
-  subnet_id              = "${element(local.cyberRange_detection_subnets_ids, count.index)}"
-  vpc_security_group_ids = ["${aws_security_group.windows.id}"]
-  key_name = "${aws_key_pair.circleci_key.key_name}"
+  count = var.docker_ct
+  ami           = data.aws_ami.detection-dc.id
+  instance_type = var.instance_type_tpot
+  subnet_id              = element(local.cyberRange_detection_subnets_ids, count.index)
+  vpc_security_group_ids = [aws_security_group.windows.id]
+  key_name = aws_key_pair.circleci_key.key_name
   private_ip             = "192.168.38.102"
 
   root_block_device {
@@ -44,12 +44,12 @@ resource "aws_instance" "dl-dc" {
   }
 }
 resource "aws_instance" "dl-win10" {
-  count = "${var.docker_ct}"
-  ami           = "${data.aws_ami.detection-dc.id}"
-  instance_type = "${var.instance_type_tpot}"
-  subnet_id              = "${element(local.cyberRange_detection_subnets_ids, count.index)}"
-  vpc_security_group_ids = ["${aws_security_group.windows.id}"]
-  key_name = "${aws_key_pair.circleci_key.key_name}"
+  count = var.docker_ct
+  ami           = data.aws_ami.detection-dc.id
+  instance_type = var.instance_type_tpot
+  subnet_id              = element(local.cyberRange_detection_subnets_ids, count.index)
+  vpc_security_group_ids = [aws_security_group.windows.id]
+  key_name = aws_key_pair.circleci_key.key_name
   private_ip             = "192.168.38.104"
 
   root_block_device {
@@ -63,17 +63,17 @@ resource "aws_instance" "dl-win10" {
 }
 
 resource "aws_instance" "dl-logger" {
-  count = "${var.docker_ct}"
-  instance_type = "${var.instance_type_tpot}"
-  ami           = "${data.aws_ami.logger_ami.image_id}"
+  count = var.docker_ct
+  instance_type = var.instance_type_tpot
+  ami           = data.aws_ami.logger_ami.image_id
 
   tags = {
     Name = "dl.logger"
   }
 
-  subnet_id              = "${element(local.cyberRange_detection_subnets_ids, count.index)}"
-  vpc_security_group_ids = ["${aws_security_group.logger.id}"]
-  key_name               = "${aws_key_pair.circleci_key.key_name}"
+  subnet_id              = element(local.cyberRange_detection_subnets_ids, count.index)
+  vpc_security_group_ids = [aws_security_group.logger.id]
+  key_name               = aws_key_pair.circleci_key.key_name
   private_ip             = "192.168.38.105"