Merge pull request #176 from weaveworks/terraform-0.12.0

Update terraform to 0.12.0

Author: bboreham

build/golang/Dockerfile

@@ -22,9 +22,9 @@ RUN curl -fsSLo shfmt https://github.com/mvdan/sh/releases/download/v1.3.0/shfmt
 	echo "b1925c2c405458811f0c227266402cf1868b4de529f114722c2e3a5af4ac7bb2  shfmt" | sha256sum -c && \
 	chmod +x shfmt && \
 	mv shfmt /usr/bin
-ENV TERRAFORM_VERSION=0.11.14
+ENV TERRAFORM_VERSION=0.12.0
 RUN curl -fsSLo /tmp/terraform_${TERRAFORM_VERSION}_linux_amd64.zip https://releases.hashicorp.com/terraform/${TERRAFORM_VERSION}/terraform_${TERRAFORM_VERSION}_linux_amd64.zip &&  \
-	echo "9b9a4492738c69077b079e595f5b2a9ef1bc4e8fb5596610f69a6f322a8af8dd /tmp/terraform_${TERRAFORM_VERSION}_linux_amd64.zip" | sha256sum -c && \ 
+	echo "42ffd2db97853d5249621d071f4babeed8f5fdba40e3685e6c1013b9b7b25830 /tmp/terraform_${TERRAFORM_VERSION}_linux_amd64.zip" | sha256sum -c && \ 
     unzip /tmp/terraform_${TERRAFORM_VERSION}_linux_amd64.zip -d /usr/bin && \
 	rm /tmp/terraform_${TERRAFORM_VERSION}_linux_amd64.zip
 RUN go clean -i net && \

provisioning/aws/outputs.tf

@@ -7,34 +7,34 @@ output "public_ips" {
 }
 
 output "hostnames" {
-  value = "${join("\n", 
-    "${formatlist("%v.%v.%v", 
-      aws_instance.tf_test_vm.*.tags.Name, 
-      aws_instance.tf_test_vm.*.availability_zone, 
+  value = "${join("\n",
+    "${formatlist("%v.%v.%v",
+      aws_instance.tf_test_vm.*.tags.Name,
+      aws_instance.tf_test_vm.*.availability_zone,
       var.app
     )}"
   )}"
 }
 
 # /etc/hosts file for the Droplets:
 output "private_etc_hosts" {
-  value = "${join("\n", 
-    "${formatlist("%v %v.%v.%v", 
-      aws_instance.tf_test_vm.*.private_ip, 
-      aws_instance.tf_test_vm.*.tags.Name, 
-      aws_instance.tf_test_vm.*.availability_zone, 
+  value = "${join("\n",
+    "${formatlist("%v %v.%v.%v",
+      aws_instance.tf_test_vm.*.private_ip,
+      aws_instance.tf_test_vm.*.tags.Name,
+      aws_instance.tf_test_vm.*.availability_zone,
       var.app
     )}"
   )}"
 }
 
 # /etc/hosts file for the client:
 output "public_etc_hosts" {
-  value = "${join("\n", 
-    "${formatlist("%v %v.%v.%v", 
-      aws_instance.tf_test_vm.*.public_ip, 
-      aws_instance.tf_test_vm.*.tags.Name, 
-      aws_instance.tf_test_vm.*.availability_zone, 
+  value = "${join("\n",
+    "${formatlist("%v %v.%v.%v",
+      aws_instance.tf_test_vm.*.public_ip,
+      aws_instance.tf_test_vm.*.tags.Name,
+      aws_instance.tf_test_vm.*.availability_zone,
       var.app
     )}"
   )}"

provisioning/aws/variables.tf

@@ -64,5 +64,5 @@ variable "aws_usernames" {
 
 variable "aws_size" {
   description = "AWS' selected machine size"
-  default     = "t2.medium"                  # Instance with 2 cores & 4 GB memory
+  default     = "t2.medium" # Instance with 2 cores & 4 GB memory
 }

provisioning/do/outputs.tf

@@ -7,10 +7,10 @@ output "public_ips" {
 }
 
 output "hostnames" {
-  value = "${join("\n", 
-    "${formatlist("%v.%v.%v", 
-      digitalocean_droplet.tf_test_vm.*.name, 
-      digitalocean_droplet.tf_test_vm.*.region, 
+  value = "${join("\n",
+    "${formatlist("%v.%v.%v",
+      digitalocean_droplet.tf_test_vm.*.name,
+      digitalocean_droplet.tf_test_vm.*.region,
       var.app
     )}"
   )}"
@@ -21,23 +21,23 @@ output "hostnames" {
 # be consistent with other providers' recipes, we provide an output to generate
 # an /etc/hosts file on the Droplets, even though it is using public IPs only.
 output "private_etc_hosts" {
-  value = "${join("\n", 
-    "${formatlist("%v %v.%v.%v", 
-      digitalocean_droplet.tf_test_vm.*.ipv4_address, 
-      digitalocean_droplet.tf_test_vm.*.name, 
-      digitalocean_droplet.tf_test_vm.*.region, 
+  value = "${join("\n",
+    "${formatlist("%v %v.%v.%v",
+      digitalocean_droplet.tf_test_vm.*.ipv4_address,
+      digitalocean_droplet.tf_test_vm.*.name,
+      digitalocean_droplet.tf_test_vm.*.region,
       var.app
     )}"
   )}"
 }
 
 # /etc/hosts file for the client:
 output "public_etc_hosts" {
-  value = "${join("\n", 
-    "${formatlist("%v %v.%v.%v", 
-      digitalocean_droplet.tf_test_vm.*.ipv4_address, 
-      digitalocean_droplet.tf_test_vm.*.name, 
-      digitalocean_droplet.tf_test_vm.*.region, 
+  value = "${join("\n",
+    "${formatlist("%v %v.%v.%v",
+      digitalocean_droplet.tf_test_vm.*.ipv4_address,
+      digitalocean_droplet.tf_test_vm.*.name,
+      digitalocean_droplet.tf_test_vm.*.region,
       var.app
     )}"
   )}"

provisioning/gcp/outputs.tf

@@ -11,34 +11,34 @@ output "private_ips" {
 }
 
 output "hostnames" {
-  value = "${join("\n", 
-    "${formatlist("%v.%v.%v", 
-      google_compute_instance.tf_test_vm.*.name, 
-      google_compute_instance.tf_test_vm.*.zone, 
+  value = "${join("\n",
+    "${formatlist("%v.%v.%v",
+      google_compute_instance.tf_test_vm.*.name,
+      google_compute_instance.tf_test_vm.*.zone,
       var.app
     )}"
   )}"
 }
 
 # /etc/hosts file for the Compute Engine instances:
 output "private_etc_hosts" {
-  value = "${join("\n", 
-    "${formatlist("%v %v.%v.%v", 
+  value = "${join("\n",
+    "${formatlist("%v %v.%v.%v",
       google_compute_instance.tf_test_vm.*.network_interface.0.network_ip,
-      google_compute_instance.tf_test_vm.*.name, 
-      google_compute_instance.tf_test_vm.*.zone, 
+      google_compute_instance.tf_test_vm.*.name,
+      google_compute_instance.tf_test_vm.*.zone,
       var.app
     )}"
   )}"
 }
 
 # /etc/hosts file for the client:
 output "public_etc_hosts" {
-  value = "${join("\n", 
-    "${formatlist("%v %v.%v.%v", 
+  value = "${join("\n",
+    "${formatlist("%v %v.%v.%v",
       google_compute_instance.tf_test_vm.*.network_interface.0.access_config.0.nat_ip,
-      google_compute_instance.tf_test_vm.*.name, 
-      google_compute_instance.tf_test_vm.*.zone, 
+      google_compute_instance.tf_test_vm.*.name,
+      google_compute_instance.tf_test_vm.*.zone,
       var.app
     )}"
   )}"