From bce44de8e085bc28a14f2b1387326d034df3d2c0 Mon Sep 17 00:00:00 2001
From: Susmitha Girumala <susmitha@hashicorp.com>
Date: Fri, 3 Sep 2021 16:00:08 -0400
Subject: [PATCH] chore: Move vagrant scripts to root level

---
 ui/desktop/.gitignore                                    | 3 +++
 ui/desktop/electron-app/.gitignore                       | 3 ---
 .../tests => }/environments/ubuntu-focal64/Vagrantfile   | 9 +++++----
 3 files changed, 8 insertions(+), 7 deletions(-)
 rename ui/desktop/{electron-app/tests => }/environments/ubuntu-focal64/Vagrantfile (93%)

diff --git a/ui/desktop/.gitignore b/ui/desktop/.gitignore
index 7e0f7ddce..f414c569a 100644
--- a/ui/desktop/.gitignore
+++ b/ui/desktop/.gitignore
@@ -24,3 +24,6 @@
 /.node_modules.ember-try/
 /bower.json.ember-try
 /package.json.ember-try
+
+# Vagrant
+.vagrant/
diff --git a/ui/desktop/electron-app/.gitignore b/ui/desktop/electron-app/.gitignore
index 3236c0e01..3aca4c453 100644
--- a/ui/desktop/electron-app/.gitignore
+++ b/ui/desktop/electron-app/.gitignore
@@ -100,6 +100,3 @@ ember-test/
 
 # Autoupdate
 nextVersion/
-
-# Vagrant
-.vagrant/
diff --git a/ui/desktop/electron-app/tests/environments/ubuntu-focal64/Vagrantfile b/ui/desktop/environments/ubuntu-focal64/Vagrantfile
similarity index 93%
rename from ui/desktop/electron-app/tests/environments/ubuntu-focal64/Vagrantfile
rename to ui/desktop/environments/ubuntu-focal64/Vagrantfile
index 85fd11cb3..5b145380d 100644
--- a/ui/desktop/electron-app/tests/environments/ubuntu-focal64/Vagrantfile
+++ b/ui/desktop/environments/ubuntu-focal64/Vagrantfile
@@ -26,10 +26,12 @@ For using locally built debian artifacts:
 
 ## Provision types
 User --provision-with option to setup machine for either cli or development
-To setup a machine for testing:
+Setup for testing:
    vagrant up --provision-with setup,cli
-To setup a machine for developing desktop client:
+Setup for developing desktop client:
    vagrant up --provision-with setup,development
+Setup for staged desktop release:
+  vagrant up --provision-with setup,cli,staged-desktop
 To destroy machine:
    vagrant destroy -f
 =end
@@ -98,8 +100,7 @@ Vagrant.configure("2") do |config|
 
   config.vm.provision "staged-desktop", type: "shell", inline: <<-SHELL
     sudo cp -r /media/sf_vagrant-desktop-staged-app/. /home/vagrant/Desktop
-    chown -R vagrant:vagrant /home/vagrant/Desktop
   SHELL
 
-  config.vm.post_up_message = "Login using username/password: vagrant/vagrant.\nBoundary Desktop Artifacts: /media/sf_vagrant-boundary-desktop-app.\nBoundary CLI: /home/vagrant/Desktop/boundary."
+  config.vm.post_up_message = "Login using username/password: vagrant/vagrant.\nArtifacts: /home/vagrant/Desktop"
 end