Terraform 0.12 (#20)

* Terraform 0.12

jenkins-packer-demo/amivar.tf

@@ -1 +1,4 @@
-variable "APP_INSTANCE_AMI" { default = "" }
+variable "APP_INSTANCE_AMI" {
+  default = ""
+}
+

jenkins-packer-demo/cloudinit.tf

@@ -1,19 +1,19 @@
 data "template_file" "jenkins-init" {
-  template = "${file("scripts/jenkins-init.sh")}"
-  vars {
-    DEVICE = "${var.INSTANCE_DEVICE_NAME}"
-    JENKINS_VERSION = "${var.JENKINS_VERSION}"
-    TERRAFORM_VERSION = "${var.TERRAFORM_VERSION}"
+  template = file("scripts/jenkins-init.sh")
+  vars = {
+    DEVICE            = var.INSTANCE_DEVICE_NAME
+    JENKINS_VERSION   = var.JENKINS_VERSION
+    TERRAFORM_VERSION = var.TERRAFORM_VERSION
   }
 }
-data "template_cloudinit_config" "cloudinit-jenkins" {
 
-  gzip = false
+data "template_cloudinit_config" "cloudinit-jenkins" {
+  gzip          = false
   base64_encode = false
 
   part {
     content_type = "text/x-shellscript"
-    content      = "${data.template_file.jenkins-init.rendered}"
+    content      = data.template_file.jenkins-init.rendered
   }
-
 }
+

jenkins-packer-demo/instance.tf

@@ -1,48 +1,48 @@
 resource "aws_instance" "jenkins-instance" {
-  ami           = "${lookup(var.AMIS, var.AWS_REGION)}"
+  ami           = var.AMIS[var.AWS_REGION]
   instance_type = "t2.small"
 
   # the VPC subnet
-  subnet_id = "${aws_subnet.main-public-1.id}"
+  subnet_id = aws_subnet.main-public-1.id
 
   # the security group
-  vpc_security_group_ids = ["${aws_security_group.jenkins-securitygroup.id}"]
+  vpc_security_group_ids = [aws_security_group.jenkins-securitygroup.id]
 
   # the public SSH key
-  key_name = "${aws_key_pair.mykeypair.key_name}"
+  key_name = aws_key_pair.mykeypair.key_name
 
   # user data
-  user_data = "${data.template_cloudinit_config.cloudinit-jenkins.rendered}"
-
+  user_data = data.template_cloudinit_config.cloudinit-jenkins.rendered
 }
 
 resource "aws_ebs_volume" "jenkins-data" {
-    availability_zone = "eu-west-1a"
-    size = 20
-    type = "gp2" 
-    tags {
-        Name = "jenkins-data"
-    }
+  availability_zone = "eu-west-1a"
+  size              = 20
+  type              = "gp2"
+  tags = {
+    Name = "jenkins-data"
+  }
 }
 
 resource "aws_volume_attachment" "jenkins-data-attachment" {
-  device_name = "${var.INSTANCE_DEVICE_NAME}"
-  volume_id = "${aws_ebs_volume.jenkins-data.id}"
-  instance_id = "${aws_instance.jenkins-instance.id}"
+  device_name  = var.INSTANCE_DEVICE_NAME
+  volume_id    = aws_ebs_volume.jenkins-data.id
+  instance_id  = aws_instance.jenkins-instance.id
   skip_destroy = true
 }
 
 resource "aws_instance" "app-instance" {
-  count = "${var.APP_INSTANCE_COUNT}"
-  ami = "${var.APP_INSTANCE_AMI}"
+  count         = var.APP_INSTANCE_COUNT
+  ami           = var.APP_INSTANCE_AMI
   instance_type = "t2.micro"
 
   # the VPC subnet
-  subnet_id = "${aws_subnet.main-public-1.id}"
+  subnet_id = aws_subnet.main-public-1.id
 
   # the security group
-  vpc_security_group_ids = ["${aws_security_group.app-securitygroup.id}"]
+  vpc_security_group_ids = [aws_security_group.app-securitygroup.id]
 
   # the public SSH key
-  key_name = "${aws_key_pair.mykeypair.key_name}"
+  key_name = aws_key_pair.mykeypair.key_name
 }
+

jenkins-packer-demo/key.tf

@@ -1,7 +1,8 @@
 resource "aws_key_pair" "mykeypair" {
-  key_name = "mykeypair"
-  public_key = "${file("${var.PATH_TO_PUBLIC_KEY}")}"
+  key_name   = "mykeypair"
+  public_key = file(var.PATH_TO_PUBLIC_KEY)
   lifecycle {
-    ignore_changes = ["public_key"]
+    ignore_changes = [public_key]
   }
 }
+

jenkins-packer-demo/output.tf

@@ -1,6 +1,8 @@
 output "jenkins-ip" {
-  value = ["${aws_instance.jenkins-instance.*.public_ip}"]
+  value = [aws_instance.jenkins-instance.*.public_ip]
 }
+
 output "app-ip" {
-  value = ["${aws_instance.app-instance.*.public_ip}"]
+  value = [aws_instance.app-instance.*.public_ip]
 }
+

jenkins-packer-demo/provider.tf

@@ -1,3 +1,4 @@
-provider "aws" { 
-    region = "${var.AWS_REGION}"
+provider "aws" {
+  region = var.AWS_REGION
 }
+

jenkins-packer-demo/s3.tf

@@ -1,8 +1,9 @@
 resource "aws_s3_bucket" "terraform-state" {
-    bucket = "terraform-state-a2b621f"
-    acl = "private"
+  bucket = "terraform-state-a2b621f"
+  acl    = "private"
 
-    tags {
-        Name = "Terraform state"
-    }
+  tags = {
+    Name = "Terraform state"
+  }
 }
+

jenkins-packer-demo/securitygroup.tf

@@ -1,54 +1,56 @@
 resource "aws_security_group" "jenkins-securitygroup" {
-  vpc_id = "${aws_vpc.main.id}"
-  name = "jenkins-securitygroup"
+  vpc_id      = aws_vpc.main.id
+  name        = "jenkins-securitygroup"
   description = "security group that allows ssh and all egress traffic"
   egress {
-      from_port = 0
-      to_port = 0
-      protocol = "-1"
-      cidr_blocks = ["0.0.0.0/0"]
+    from_port   = 0
+    to_port     = 0
+    protocol    = "-1"
+    cidr_blocks = ["0.0.0.0/0"]
   }
 
   ingress {
-      from_port = 22
-      to_port = 22
-      protocol = "tcp"
-      cidr_blocks = ["0.0.0.0/0"]
-  } 
+    from_port   = 22
+    to_port     = 22
+    protocol    = "tcp"
+    cidr_blocks = ["0.0.0.0/0"]
+  }
   ingress {
-      from_port = 8080
-      to_port = 8080
-      protocol = "tcp"
-      cidr_blocks = ["0.0.0.0/0"]
-  } 
-tags {
+    from_port   = 8080
+    to_port     = 8080
+    protocol    = "tcp"
+    cidr_blocks = ["0.0.0.0/0"]
+  }
+  tags = {
     Name = "jenkins-securitygroup"
   }
 }
+
 resource "aws_security_group" "app-securitygroup" {
-  vpc_id = "${aws_vpc.main.id}"
-  name = "app-securitygroup"
+  vpc_id      = aws_vpc.main.id
+  name        = "app-securitygroup"
   description = "security group that allows ssh and all egress traffic"
   egress {
-      from_port = 0
-      to_port = 0
-      protocol = "-1"
-      cidr_blocks = ["0.0.0.0/0"]
+    from_port   = 0
+    to_port     = 0
+    protocol    = "-1"
+    cidr_blocks = ["0.0.0.0/0"]
   }
 
   ingress {
-      from_port = 22
-      to_port = 22
-      protocol = "tcp"
-      cidr_blocks = ["0.0.0.0/0"]
-  } 
+    from_port   = 22
+    to_port     = 22
+    protocol    = "tcp"
+    cidr_blocks = ["0.0.0.0/0"]
+  }
   ingress {
-      from_port = 80
-      to_port = 80
-      protocol = "tcp"
-      cidr_blocks = ["0.0.0.0/0"]
-  } 
-tags {
+    from_port   = 80
+    to_port     = 80
+    protocol    = "tcp"
+    cidr_blocks = ["0.0.0.0/0"]
+  }
+  tags = {
     Name = "app-securitygroup"
   }
 }
+

jenkins-packer-demo/vars.tf

@@ -1,26 +1,32 @@
 variable "AWS_REGION" {
   default = "eu-west-1"
 }
+
 variable "PATH_TO_PRIVATE_KEY" {
   default = "mykey"
 }
+
 variable "PATH_TO_PUBLIC_KEY" {
   default = "mykey.pub"
 }
+
 variable "AMIS" {
-  type = "map"
+  type = map(string)
   default = {
     us-east-1 = "ami-13be557e"
     us-west-2 = "ami-06b94666"
     eu-west-1 = "ami-844e0bf7"
   }
 }
+
 variable "INSTANCE_DEVICE_NAME" {
   default = "/dev/xvdh"
 }
+
 variable "JENKINS_VERSION" {
   default = "2.121.2"
 }
+
 variable "TERRAFORM_VERSION" {
   default = "0.11.7"
 }
@@ -28,3 +34,4 @@ variable "TERRAFORM_VERSION" {
 variable "APP_INSTANCE_COUNT" {
   default = "0"
 }
+

jenkins-packer-demo/versions.tf

@@ -0,0 +1,4 @@
+
+terraform {
+  required_version = ">= 0.12"
+}

jenkins-packer-demo/vpc.tf

@@ -1,110 +1,117 @@
 # Internet VPC
 resource "aws_vpc" "main" {
-    cidr_block = "10.0.0.0/16"
-    instance_tenancy = "default"
-    enable_dns_support = "true"
-    enable_dns_hostnames = "true"
-    enable_classiclink = "false"
-    tags {
-        Name = "main"
-    }
+  cidr_block           = "10.0.0.0/16"
+  instance_tenancy     = "default"
+  enable_dns_support   = "true"
+  enable_dns_hostnames = "true"
+  enable_classiclink   = "false"
+  tags = {
+    Name = "main"
+  }
 }
 
-
 # Subnets
 resource "aws_subnet" "main-public-1" {
-    vpc_id = "${aws_vpc.main.id}"
-    cidr_block = "10.0.1.0/24"
-    map_public_ip_on_launch = "true"
-    availability_zone = "eu-west-1a"
+  vpc_id                  = aws_vpc.main.id
+  cidr_block              = "10.0.1.0/24"
+  map_public_ip_on_launch = "true"
+  availability_zone       = "eu-west-1a"
 
-    tags {
-        Name = "main-public-1"
-    }
+  tags = {
+    Name = "main-public-1"
+  }
 }
+
 resource "aws_subnet" "main-public-2" {
-    vpc_id = "${aws_vpc.main.id}"
-    cidr_block = "10.0.2.0/24"
-    map_public_ip_on_launch = "true"
-    availability_zone = "eu-west-1b"
+  vpc_id                  = aws_vpc.main.id
+  cidr_block              = "10.0.2.0/24"
+  map_public_ip_on_launch = "true"
+  availability_zone       = "eu-west-1b"
 
-    tags {
-        Name = "main-public-2"
-    }
+  tags = {
+    Name = "main-public-2"
+  }
 }
+
 resource "aws_subnet" "main-public-3" {
-    vpc_id = "${aws_vpc.main.id}"
-    cidr_block = "10.0.3.0/24"
-    map_public_ip_on_launch = "true"
-    availability_zone = "eu-west-1c"
+  vpc_id                  = aws_vpc.main.id
+  cidr_block              = "10.0.3.0/24"
+  map_public_ip_on_launch = "true"
+  availability_zone       = "eu-west-1c"
 
-    tags {
-        Name = "main-public-3"
-    }
+  tags = {
+    Name = "main-public-3"
+  }
 }
+
 resource "aws_subnet" "main-private-1" {
-    vpc_id = "${aws_vpc.main.id}"
-    cidr_block = "10.0.4.0/24"
-    map_public_ip_on_launch = "false"
-    availability_zone = "eu-west-1a"
+  vpc_id                  = aws_vpc.main.id
+  cidr_block              = "10.0.4.0/24"
+  map_public_ip_on_launch = "false"
+  availability_zone       = "eu-west-1a"
 
-    tags {
-        Name = "main-private-1"
-    }
+  tags = {
+    Name = "main-private-1"
+  }
 }
+
 resource "aws_subnet" "main-private-2" {
-    vpc_id = "${aws_vpc.main.id}"
-    cidr_block = "10.0.5.0/24"
-    map_public_ip_on_launch = "false"
-    availability_zone = "eu-west-1b"
+  vpc_id                  = aws_vpc.main.id
+  cidr_block              = "10.0.5.0/24"
+  map_public_ip_on_launch = "false"
+  availability_zone       = "eu-west-1b"
 
-    tags {
-        Name = "main-private-2"
-    }
+  tags = {
+    Name = "main-private-2"
+  }
 }
-resource "aws_subnet" "main-private-3" {
-    vpc_id = "${aws_vpc.main.id}"
-    cidr_block = "10.0.6.0/24"
-    map_public_ip_on_launch = "false"
-    availability_zone = "eu-west-1c"
 
-    tags {
-        Name = "main-private-3"
-    }
+resource "aws_subnet" "main-private-3" {
+  vpc_id                  = aws_vpc.main.id
+  cidr_block              = "10.0.6.0/24"
+  map_public_ip_on_launch = "false"
+  availability_zone       = "eu-west-1c"
+
+  tags = {
+    Name = "main-private-3"
+  }
 }
 
 # Internet GW
 resource "aws_internet_gateway" "main-gw" {
-    vpc_id = "${aws_vpc.main.id}"
+  vpc_id = aws_vpc.main.id
 
-    tags {
-        Name = "main"
-    }
+  tags = {
+    Name = "main"
+  }
 }
 
 # route tables
 resource "aws_route_table" "main-public" {
-    vpc_id = "${aws_vpc.main.id}"
-    route {
-        cidr_block = "0.0.0.0/0"
-        gateway_id = "${aws_internet_gateway.main-gw.id}"
-    }
+  vpc_id = aws_vpc.main.id
+  route {
+    cidr_block = "0.0.0.0/0"
+    gateway_id = aws_internet_gateway.main-gw.id
+  }
 
-    tags {
-        Name = "main-public-1"
-    }
+  tags = {
+    Name = "main-public-1"
+  }
 }
 
 # route associations public
 resource "aws_route_table_association" "main-public-1-a" {
-    subnet_id = "${aws_subnet.main-public-1.id}"
-    route_table_id = "${aws_route_table.main-public.id}"
+  subnet_id      = aws_subnet.main-public-1.id
+  route_table_id = aws_route_table.main-public.id
 }
+
 resource "aws_route_table_association" "main-public-2-a" {
-    subnet_id = "${aws_subnet.main-public-2.id}"
-    route_table_id = "${aws_route_table.main-public.id}"
+  subnet_id      = aws_subnet.main-public-2.id
+  route_table_id = aws_route_table.main-public.id
 }
+
 resource "aws_route_table_association" "main-public-3-a" {
-    subnet_id = "${aws_subnet.main-public-3.id}"
-    route_table_id = "${aws_route_table.main-public.id}"
+  subnet_id      = aws_subnet.main-public-3.id
+  route_table_id = aws_route_table.main-public.id
 }
+