From 12f73171e64b639dc7c4050042281a14b49aab23 Mon Sep 17 00:00:00 2001
From: Kevin Buchs <kevin.buchs@newcontext.com>
Date: Wed, 7 Aug 2019 14:17:13 -0500
Subject: [PATCH] discovered that one case of Terraform 12 code that works with
 Terraform 11, so remove variation, comments, etc related to that potential
 migration issue

---
 README.md                   | 1 -
 bin/example-setup-ubuntu.sh | 2 +-
 main.tf                     | 3 ---
 3 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/README.md b/README.md
index 1233e3b..da28923 100644
--- a/README.md
+++ b/README.md
@@ -132,7 +132,6 @@ Here are **some** of the things necessary to migrate.
 1. Edit Gemfile to change version requirements to be this:
    - gem 'inspec', '~> 4.0'
    - gem 'kitchen-terraform', '>= 4.0.0'
-1. Edit main.tf to change syntax of metadata, at the bottom. See the comment.
 1. Testing (verify stage) does not pass - there seem to be problems with the inspec plugins. 
 
 ## Authors
diff --git a/bin/example-setup-ubuntu.sh b/bin/example-setup-ubuntu.sh
index 0d9a036..b2dabd7 100644
--- a/bin/example-setup-ubuntu.sh
+++ b/bin/example-setup-ubuntu.sh
@@ -7,7 +7,7 @@
 # Modify these to your liking
 TF_BIN_LOCATION=/usr/local/bin
 GCLOUD_REGION="us-west1"
-GCLOUD_ZONE="${GCLOUD_REGION}a"
+GCLOUD_ZONE="${GCLOUD_REGION}-a"
 GOOGLE_CREDS="$(pwd)/credentials.json"
 
 UBUN_VERSION=$(grep '^VERSION=' /etc/os-release|  \
diff --git a/main.tf b/main.tf
index d6c754d..6a0ad95 100644
--- a/main.tf
+++ b/main.tf
@@ -22,10 +22,7 @@ resource "google_compute_instance" "database" {
     }
   }
 
-
-  # uncomment this next code line and comment the following to enable Terraform 0.12+ functionality
   metadata = {
-  # metadata {
     sshKeys = "ubuntu:${file(var.ssh_public_key_filepath)}"
   }