From 33419b6def99696198b3dfde0ad5503a0d6f9842 Mon Sep 17 00:00:00 2001
From: Arman Keyoumarsi <arman@keyoumarsi.com>
Date: Sat, 5 Jun 2021 22:22:29 +0200
Subject: [PATCH] Added Output to sanity and cleaned up README

---
 README.md                        |  4 ++--
 tests/sanity/.terraform.lock.hcl | 25 +++++++++++++------------
 tests/sanity/apply.sh            |  4 ++++
 tests/sanity/cleanup.sh          |  3 +++
 tests/sanity/main.tf             | 11 +++++++++++
 tests/smoke/main.tf              |  2 --
 6 files changed, 33 insertions(+), 16 deletions(-)
 create mode 100644 tests/sanity/apply.sh
 create mode 100644 tests/sanity/cleanup.sh

diff --git a/README.md b/README.md
index 7debcd8..3b1015c 100644
--- a/README.md
+++ b/README.md
@@ -125,11 +125,11 @@ module "example-server-windowsvm-advanced" {
 }
 
 output "vmnames" {
-  value = "${module.example-server-windowsvm-advanced.Windows-VM}"
+  value = module.example-server-windowsvm-advanced.VM
 }
 
 output "vmnameswip" {
-  value = "${module.example-server-windowsvm-advanced.Windows-ip}"
+  value = module.example-server-windowsvm-advanced.ip
 }
 ```
 
diff --git a/tests/sanity/.terraform.lock.hcl b/tests/sanity/.terraform.lock.hcl
index 276c930..907da84 100755
--- a/tests/sanity/.terraform.lock.hcl
+++ b/tests/sanity/.terraform.lock.hcl
@@ -2,18 +2,19 @@
 # Manual edits may be lost in future updates.
 
 provider "registry.terraform.io/hashicorp/vsphere" {
-  version = "1.24.2"
+  version = "2.0.0"
   hashes = [
-    "h1:BEf8p0h+NYK0hu4dG8NloZtNaSw5nbMKsqwIZWdsIPk=",
-    "zh:01d8e13dac110466f946da1f14294f64b747f1fa6f2d107f7bc0f8db40624497",
-    "zh:06670e7baa2c2083afbe01b617aa72bcd2950830ecb66f01e743e361105e7b47",
-    "zh:17220222bdeeeb7575a51ebd556377e9f2157258eec945710e95ec1a597f8ec7",
-    "zh:2dfd808800c21a483e7401254d6dd817ec3f7d323525cd7a6d3919c81e30e686",
-    "zh:671befb1f724ffbc68c117d06619989eb4b62246896ad168384540d1acc7a0b6",
-    "zh:7d29d02d1c2f82a1c71e38aaa9daa23d4cccfc5d00c0c9ea1e2c36d98343e855",
-    "zh:98a8acafe6e38f7ad214b53826b2a9dc1f036cfb3833ba67c517eae2e4ea56c0",
-    "zh:a74fc725844da35ab73105e62b97efe717fb5c5f21554ee656d434e9803f20ad",
-    "zh:a7ab1a04902254e63dc2dc489e69343c2a53999e987114c932259884594da1ec",
-    "zh:df0beaef2d925771724cbf19747787f618c595c0712dc210b5581041691310e6",
+    "h1:kF5EuJgqGrd6fElgIGSk7NpipRAo7bUcBygIFOQmLz0=",
+    "zh:0c173a821b4e73b54474911b340220081c1ace68e02f58c076700ae0c6ec97cf",
+    "zh:0cf8b72fc5747591a23ffa72a667a14bbf1b1138f430b863b2b3724f45c10462",
+    "zh:262d2cc5510e18271022a650d537d09ab3037fe40812407b3dc31730d4c8159e",
+    "zh:2f1184a1a29b5b0b31baafb63314139842305894d2d235200562af474d69763f",
+    "zh:482f3e59a71d4ca8dcd3524459f09f0c14c5ef61990bd273e4dd4cfb930cb7ee",
+    "zh:4a7c1b37fcd7342d333b8970263fe89d813d0502b687cd1e2733cbb3e4ad4c97",
+    "zh:687b37b885b22bd7114b271fa999d483f993e120d0b8322cad7f907159b64c3a",
+    "zh:6dd70d4f7542f11449cb8fbfbd186d9da233243bee5f8005c804dc6afb418e84",
+    "zh:ab241bb083e077d40096e8ffe701dfbdf510cf6adb329af9c8c5231a48416b8f",
+    "zh:b53de1995cc493683c75f416b072069919e2ef3d297384412d9d8f8c7ac8de90",
+    "zh:e9b78cf4c133a7c9a05cec410cf468475c1c397c0a8b3ab5685c61e24ad02f68",
   ]
 }
diff --git a/tests/sanity/apply.sh b/tests/sanity/apply.sh
new file mode 100644
index 0000000..5e66bfa
--- /dev/null
+++ b/tests/sanity/apply.sh
@@ -0,0 +1,4 @@
+terraform init
+terraform fmt
+terraform validate
+terraform apply -var-file="private.tfvars"
diff --git a/tests/sanity/cleanup.sh b/tests/sanity/cleanup.sh
new file mode 100644
index 0000000..5df2c53
--- /dev/null
+++ b/tests/sanity/cleanup.sh
@@ -0,0 +1,3 @@
+terraform destroy -var-file=private.tfvars
+rm terraform.tfstate terraform.tfstate.backup .terraform.lock.hcl
+rm -rf .terraform
diff --git a/tests/sanity/main.tf b/tests/sanity/main.tf
index e49599f..3832daa 100644
--- a/tests/sanity/main.tf
+++ b/tests/sanity/main.tf
@@ -56,3 +56,14 @@ module "example-server-basic" {
   data_disk        = each.value.data_disk
 }
 
+output "DC_ID" {
+  value = tomap({
+    for k, i in module.example-server-basic : k => i.DC_ID
+  })
+}
+
+output "VM" {
+  value = tomap({
+    for k, i in module.example-server-basic : k => i.VM
+  })
+}
diff --git a/tests/smoke/main.tf b/tests/smoke/main.tf
index a65ba3a..ae072bd 100644
--- a/tests/smoke/main.tf
+++ b/tests/smoke/main.tf
@@ -12,7 +12,6 @@ variable "vm" {
     network          = map(list(string))
     vmgateway        = string
     dns_servers      = list(string)
-    data_disk        = map(map(string))
   }))
 }
 
@@ -30,5 +29,4 @@ module "example-server-basic" {
   vmgateway        = each.value.vmgateway
   dc               = each.value.dc
   datastore        = each.value.datastore #Either
-  data_disk        = each.value.data_disk
 }