From 75a913eb0aff5479d7b5e5cea56dcb2a5a838e69 Mon Sep 17 00:00:00 2001
From: Tim Gross <tgross@hashicorp.com>
Date: Fri, 4 Sep 2020 08:51:22 -0400
Subject: [PATCH] e2e: minor rename and cleanup (#8824)

---
 e2e/framework/provisioning/deploy.go          |  8 ++++----
 .../linux/{install-nomad => provision.sh}     |  2 +-
 e2e/terraform/packer/linux/setup.sh           |  6 +++---
 e2e/terraform/packer/packer-windows.json      | 19 ++++++-------------
 .../packer/windows/install-consul.ps1         |  5 ++---
 .../packer/windows/install-vault.ps1          |  4 ++--
 .../{install-nomad.ps1 => provision.ps1}      |  2 +-
 7 files changed, 19 insertions(+), 27 deletions(-)
 rename e2e/terraform/packer/linux/{install-nomad => provision.sh} (98%)
 rename e2e/terraform/packer/windows/{install-nomad.ps1 => provision.ps1} (99%)

diff --git a/e2e/framework/provisioning/deploy.go b/e2e/framework/provisioning/deploy.go
index 479e4ad7d..c9029536a 100644
--- a/e2e/framework/provisioning/deploy.go
+++ b/e2e/framework/provisioning/deploy.go
@@ -38,14 +38,14 @@ func deployLinux(t *testing.T, target *ProvisioningTarget) error {
 		}
 	} else if deployment.NomadSha != "" {
 		script := fmt.Sprintf(
-			`/opt/install-nomad --nomad_sha %s --nostart`, deployment.NomadSha)
+			`/opt/provision.sh --nomad_sha %s --nostart`, deployment.NomadSha)
 		err = runner.Run(script)
 		if err != nil {
 			return err
 		}
 	} else if deployment.NomadVersion != "" {
 		script := fmt.Sprintf(
-			`/opt/install-nomad --nomad_version %s --nostart`, deployment.NomadVersion)
+			`/opt/provision.sh --nomad_version %s --nostart`, deployment.NomadVersion)
 		err = runner.Run(script)
 		if err != nil {
 			return err
@@ -96,14 +96,14 @@ func deployWindows(t *testing.T, target *ProvisioningTarget) error {
 		}
 	} else if deployment.NomadSha != "" {
 		script := fmt.Sprintf(
-			`C:/opt/install-nomad.ps1 -nomad_sha %s -nostart`, deployment.NomadSha)
+			`C:/opt/provision.ps1 -nomad_sha %s -nostart`, deployment.NomadSha)
 		err = runner.Run(script)
 		if err != nil {
 			return err
 		}
 	} else if deployment.NomadVersion != "" {
 		script := fmt.Sprintf(
-			`C:/opt/install-nomad.ps1 -nomad_version %s -nostart`, deployment.NomadVersion)
+			`C:/opt/provision.ps1 -nomad_version %s -nostart`, deployment.NomadVersion)
 		err = runner.Run(script)
 		if err != nil {
 			return err
diff --git a/e2e/terraform/packer/linux/install-nomad b/e2e/terraform/packer/linux/provision.sh
similarity index 98%
rename from e2e/terraform/packer/linux/install-nomad
rename to e2e/terraform/packer/linux/provision.sh
index 9671c6c00..a85ced98e 100755
--- a/e2e/terraform/packer/linux/install-nomad
+++ b/e2e/terraform/packer/linux/provision.sh
@@ -6,7 +6,7 @@ set +x
 
 usage() {
     cat <<EOF
-Usage: install-nomad [options...]
+Usage: provision.sh [options...]
 Options (use one of the following):
  --nomad_sha SHA          full git sha to install from S3
  --nomad_version VERSION  release version number (ex. 0.12.3+ent)
diff --git a/e2e/terraform/packer/linux/setup.sh b/e2e/terraform/packer/linux/setup.sh
index 6c040f0ae..a55923302 100755
--- a/e2e/terraform/packer/linux/setup.sh
+++ b/e2e/terraform/packer/linux/setup.sh
@@ -72,9 +72,9 @@ mkdir_for_root $NOMAD_PLUGIN_DIR
 sudo mv /tmp/linux/nomad.service /etc/systemd/system/nomad.service
 
 echo "Install Nomad"
-sudo mv /tmp/linux/install-nomad /opt/install-nomad
-sudo chmod +x /opt/install-nomad
-/opt/install-nomad --nomad_version $NOMADVERSION --nostart
+sudo mv /tmp/linux/provision.sh /opt/provision.sh
+sudo chmod +x /opt/provision.sh
+/opt/provision.sh --nomad_version $NOMADVERSION --nostart
 
 echo "Installing third-party apt repositories"
 
diff --git a/e2e/terraform/packer/packer-windows.json b/e2e/terraform/packer/packer-windows.json
index c8d2c5a78..047c97f1f 100644
--- a/e2e/terraform/packer/packer-windows.json
+++ b/e2e/terraform/packer/packer-windows.json
@@ -38,7 +38,9 @@
         "windows/install-tools.ps1",
         "windows/install-docker.ps1",
         "windows/setup-directories.ps1",
-        "windows/install-openssh.ps1"
+        "windows/install-openssh.ps1",
+        "windows/install-consul.ps1",
+        "windows/install-vault.ps1"
       ]
     },
     {
@@ -46,23 +48,14 @@
     },
     {
       "type": "file",
-      "source": "./windows/install-nomad.ps1",
-      "destination": "/opt/install-nomad.ps1"
+      "source": "./windows/provision.ps1",
+      "destination": "/opt/provision.ps1"
     },
     {
       "type": "powershell",
       "elevated_user": "Administrator",
       "elevated_password": "{{.WinRMPassword}}",
-      "inline": ["/opt/install-nomad.ps1 -nomad_version 0.9.6 -nostart"]
-    },
-    {
-      "type": "powershell",
-      "elevated_user": "Administrator",
-      "elevated_password": "{{.WinRMPassword}}",
-      "scripts": [
-        "windows/install-consul.ps1",
-        "windows/install-vault.ps1"
-      ]
+      "inline": ["/opt/provision.ps1 -nomad_version 0.9.6 -nostart"]
     },
     {
       "type": "powershell",
diff --git a/e2e/terraform/packer/windows/install-consul.ps1 b/e2e/terraform/packer/windows/install-consul.ps1
index 06ae7ef4a..03578866e 100755
--- a/e2e/terraform/packer/windows/install-consul.ps1
+++ b/e2e/terraform/packer/windows/install-consul.ps1
@@ -11,9 +11,8 @@ Try {
     $version = "1.7.3"
     $url = "${releases}/consul/${version}/consul_${version}_windows_amd64.zip"
 
-    $configDir = "C:\opt\consul.d"
-    md $configDir
-    md C:\opt\consul
+    New-Item -ItemType Directory -Force -Path C:\opt\consul
+    New-Item -ItemType Directory -Force -Path C:\opt\consul.d
 
     # TODO: check sha!
     Write-Output "Downloading Consul from: $url"
diff --git a/e2e/terraform/packer/windows/install-vault.ps1 b/e2e/terraform/packer/windows/install-vault.ps1
index 82498ea08..a2c48f61a 100755
--- a/e2e/terraform/packer/windows/install-vault.ps1
+++ b/e2e/terraform/packer/windows/install-vault.ps1
@@ -11,8 +11,8 @@ Try {
     $version = "1.2.3"
     $url = "${releases}/vault/${version}/vault_${version}_windows_amd64.zip"
 
-    $configDir = "C:\opt\vault.d"
-    md $configDir
+    New-Item -ItemType Directory -Force -Path C:\opt\vault
+    New-Item -ItemType Directory -Force -Path C:\opt\vault.d
 
     # TODO: check sha!
     Write-Output "Downloading Vault from: $url"
diff --git a/e2e/terraform/packer/windows/install-nomad.ps1 b/e2e/terraform/packer/windows/provision.ps1
similarity index 99%
rename from e2e/terraform/packer/windows/install-nomad.ps1
rename to e2e/terraform/packer/windows/provision.ps1
index d79da76e1..df023f659 100755
--- a/e2e/terraform/packer/windows/install-nomad.ps1
+++ b/e2e/terraform/packer/windows/provision.ps1
@@ -11,7 +11,7 @@ $ErrorActionPreference = "Stop"
 
 
 $usage = @"
-Usage: install-nomad [options...]
+Usage: provision.ps1 [options...]
 Options (use one of the following):
  --nomad_sha SHA          full git sha to install from S3
  --nomad_version VERSION  release version number (ex. 0.12.3+ent)