Updates for terraform 0.12.0 (#17)

* Add support for terraform 0.12.0
* Replaces TypeMap in TypeMap with TypeString
  TypeMaps with Elem TypeMap is no longer supported by terraform 12.
* Updates to readme, docs, and examples to support terraform 12

Signed-off-by: skylerto <skylerclayne@gmail.com>

Author: skylerto

README.md

@@ -97,13 +97,13 @@ resource "vra7_deployment" "example_machine1" {
   reasons      = "I have some"
   description  = "deployment via terraform"
    resource_configuration = {
-         Linux.cpu = "1"
-         Windows2008R2SP1.cpu =  "2"
-         Windows2012.cpu =  "4"
-         Windows2016.cpu =  "2"
+         "Linux.cpu" = "1"
+         "Windows2008R2SP1.cpu" =  "2"
+         "Windows2012.cpu" =  "4"
+         "Windows2016.cpu" =  "2"
      }
      deployment_configuration = {
-         _leaseDays = "5"
+         "_leaseDays" = "5"
      }
      count = 3
 }
@@ -114,10 +114,10 @@ resource "vra7_deployment" "example_machine1" {
 resource "vra7_deployment" "example_machine2" {
   catalog_item_id = "e5dd4fba7f96239286be45ed"
    resource_configuration = {
-         Linux.cpu = "1"
-         Windows2008.cpu =  "2"
-         Windows2012.cpu =  "4"
-         Windows2016.cpu =  "2"
+         "Linux.cpu" = "1"
+         "Windows2008.cpu" =  "2"
+         "Windows2012.cpu" =  "4"
+         "Windows2016.cpu" =  "2"
      }
      count = 4
 }

example/depends_on/main.tf

@@ -1,17 +1,18 @@
-provider  "vra7" {
-    username = "${var.username}"
-    password  = "${var.password}"
-    tenant = "${var.tenant}"
-    host = "${var.host}"
+provider "vra7" {
+  username = var.username
+  password = var.password
+  tenant   = var.tenant
+  host     = var.host
 }
 
 resource "vra7_deployment" "machine1" {
-  count            = 1
+  count             = 1
   catalog_item_name = "CentOS 7.0 x64"
 }
 
 resource "vra7_deployment" "machine2" {
-  count            = 1
+  count             = 1
   catalog_item_name = "CentOS 7.0 x64"
-  depends_on = ["vra7_deployment.machine1"]
+  depends_on        = [vra7_deployment.machine1]
 }
+

example/depends_on/variables.tf

@@ -1,4 +1,12 @@
-variable username {}
-variable password {}
-variable tenant {}
-variable host {}
+variable "username" {
+}
+
+variable "password" {
+}
+
+variable "tenant" {
+}
+
+variable "host" {
+}
+

example/depends_on/versions.tf

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

example/multi-machine/main.tf

@@ -1,18 +1,19 @@
-provider  "vra7" {
-  username = "${var.username}"
-  password  = "${var.password}"
-  tenant = "${var.tenant}"
-  host = "${var.host}"
+provider "vra7" {
+  username = var.username
+  password = var.password
+  tenant   = var.tenant
+  host     = var.host
 }
 
 # Catalog "multi_machine_catalog" contains Linux, Windows and http (apache) designs.
 resource "vra7_deployment" "resource_1" {
-  count            = 1
+  count             = 1
   catalog_item_name = "multi_machine_catalog"
   resource_configuration = {
-    Windows.cpu = "2"                //Windows Machine CPU
-    Linux.cpu = "2"                  //Linux Machine CPU
-    http.hostname = "xyz.com"        //HTTP (apache) hostname
-    http.network_mode = "bridge"     //HTTP (apache) network mode
+    "Windows.cpu"       = "2"       //Windows Machine CPU
+    "Linux.cpu"         = "2"       //Linux Machine CPU
+    "http.hostname"     = "xyz.com" //HTTP (apache) hostname
+    "http.network_mode" = "bridge"  //HTTP (apache) network mode
   }
-}
+}
+

example/multi-machine/variables.tf

@@ -1,4 +1,12 @@
-variable username {}
-variable password {}
-variable tenant {}
-variable host {}
+variable "username" {
+}
+
+variable "password" {
+}
+
+variable "tenant" {
+}
+
+variable "host" {
+}
+

example/multi-machine/versions.tf

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

example/remote-execute/main.tf

@@ -1,38 +1,39 @@
 provider "vra7" {
-  username = "${var.username}"
-  password = "${var.password}"
-  tenant   = "${var.tenant}"
-  host     = "${var.host}"
+  username = var.username
+  password = var.password
+  tenant   = var.tenant
+  host     = var.host
 }
 
 resource "vra7_deployment" "vm" {
-  catalog_item_name = "${var.catalog_item_name}"
-  reasons     = "${var.description}"
-  description = "${var.description}"
+  catalog_item_name = var.catalog_item_name
+  reasons           = var.description
+  description       = var.description
 
-  count = "${var.count}"
+  count = var.count
 
   deployment_configuration = {
-    VirtualMachine.Disk1.Size = "${var.extra_disk}"
+    VirtualMachine.Disk1.Size = var.extra_disk
   }
 
-  resource_configuration {
-    Machine.description = "${var.description}"
-    Machine.cpu         = "${var.cpu}"
-    Machine.memory      = "${var.ram}"
-
-    Machine.ip_address = ""
+  resource_configuration = {
+    "Machine.description" = var.description
+    "Machine.cpu"         = var.cpu
+    "Machine.memory"      = var.ram
+    "Machine.ip_address"  = ""
   }
 
-  wait_timeout = "${var.wait_timeout}"
+  wait_timeout = var.wait_timeout
 
+  // Connection settings
   // Connection settings
   connection {
-    host     = "${self.resource_configuration.Machine.ip_address}"
-    user     = "${var.ssh_user}"
-    password = "${var.ssh_password}"
+    host     = self.resource_configuration.Machine.ip_address
+    user     = var.ssh_user
+    password = var.ssh_password
   }
 
+  // Extend volume to second disk
   // Extend volume to second disk
   provisioner "remote-exec" {
     inline = [
@@ -43,3 +44,4 @@ resource "vra7_deployment" "vm" {
     ]
   }
 }
+

example/remote-execute/variables.tf

@@ -1,10 +1,20 @@
-variable username {}
-variable password {}
-variable tenant {}
-variable host {}
+variable "username" {
+}
+
+variable "password" {
+}
+
+variable "tenant" {
+}
+
+variable "host" {
+}
+
+variable "catalog_item_name" {
+}
 
-variable "catalog_item_name" {}
-variable "count" {}
+variable "count" {
+}
 
 variable "cpu" {
   default = 1
@@ -14,13 +24,19 @@ variable "ram" {
   default = 512
 }
 
-variable "extra_disk" {}
+variable "extra_disk" {
+}
+
+variable "description" {
+}
 
-variable "description" {}
+variable "ssh_user" {
+}
 
-variable "ssh_user" {}
-variable "ssh_password" {}
+variable "ssh_password" {
+}
 
 variable "wait_timeout" {
   default = 30
 }
+

example/remote-execute/versions.tf

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