Terraform 0.12 (#20)

* Terraform 0.12

demo-6/default_vpc.tf

@@ -4,30 +4,33 @@
 
 # default VPC
 resource "aws_default_vpc" "default" {
-    tags {
-        Name = "Default VPC"
-    }
+  tags = {
+    Name = "Default VPC"
+  }
 }
 
 # default subnets
 resource "aws_default_subnet" "default_az1" {
   availability_zone = "${var.AWS_REGION}a"
 
-    tags {
-        Name = "Default subnet for ${var.AWS_REGION}a"
-    }
+  tags = {
+    Name = "Default subnet for ${var.AWS_REGION}a"
+  }
 }
+
 resource "aws_default_subnet" "default_az2" {
   availability_zone = "${var.AWS_REGION}b"
 
-    tags {
-        Name = "Default subnet for ${var.AWS_REGION}b"
-    }
+  tags = {
+    Name = "Default subnet for ${var.AWS_REGION}b"
+  }
 }
+
 resource "aws_default_subnet" "default_az3" {
   availability_zone = "${var.AWS_REGION}c"
 
-    tags {
-        Name = "Default subnet for ${var.AWS_REGION}c"
-    }
+  tags = {
+    Name = "Default subnet for ${var.AWS_REGION}c"
+  }
 }
+

demo-6/key.tf

@@ -1,4 +1,5 @@
 resource "aws_key_pair" "mykey" {
-  key_name = "mykey"
-  public_key = "${file("${var.PATH_TO_PUBLIC_KEY}")}"
+  key_name   = "mykey"
+  public_key = file(var.PATH_TO_PUBLIC_KEY)
 }
+

demo-6/modules.tf

@@ -1,15 +1,17 @@
 module "consul" {
-  source = "github.com/wardviaene/terraform-consul-module.git"
-  key_name = "${aws_key_pair.mykey.key_name}"
-  key_path = "${var.PATH_TO_PRIVATE_KEY}"
-  region = "${var.AWS_REGION}"
-  vpc_id = "${aws_default_vpc.default.id}"
-  subnets {
-    "0" = "${aws_default_subnet.default_az1.id}"
-    "1" = "${aws_default_subnet.default_az2.id}"
-    "2" = "${aws_default_subnet.default_az3.id}"
+  source   = "github.com/wardviaene/terraform-consul-module.git?ref=terraform-0.12"
+  key_name = aws_key_pair.mykey.key_name
+  key_path = var.PATH_TO_PRIVATE_KEY
+  region   = var.AWS_REGION
+  vpc_id   = aws_default_vpc.default.id
+  subnets = {
+    "0" = aws_default_subnet.default_az1.id
+    "1" = aws_default_subnet.default_az2.id
+    "2" = aws_default_subnet.default_az3.id
   }
 }
+
 output "consul-output" {
-  value = "${module.consul.server_address}"
+  value = module.consul.server_address
 }
+

demo-6/provider.tf

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

demo-6/vars.tf

@@ -1,9 +1,12 @@
 variable "AWS_REGION" {
   default = "eu-west-1"
 }
+
 variable "PATH_TO_PRIVATE_KEY" {
   default = "mykey"
 }
+
 variable "PATH_TO_PUBLIC_KEY" {
   default = "mykey.pub"
 }
+

demo-6/versions.tf

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