From 1da27f18e6d0cf0c6ba54d8ff8289687e263397d Mon Sep 17 00:00:00 2001
From: jamesbeedy <jamesbeedy@gmail.com>
Date: Thu, 1 Feb 2024 18:19:32 +0000
Subject: [PATCH] remove sudo and register cleanup function

Register the cleanup function so that it is always called
on script exit signal, whatever that may be. This ensures we dont
end up exiting in error before we have a chance to clean up the
file with secrets in it.

Remove multipass install in favour of informing the user to
install multipass so that we may remove usage of sudo from script.
---
 public-scripts/deploy-democluster.sh | 38 ++++++++--------------------
 1 file changed, 10 insertions(+), 28 deletions(-)

diff --git a/public-scripts/deploy-democluster.sh b/public-scripts/deploy-democluster.sh
index 706e0b7..b690275 100644
--- a/public-scripts/deploy-democluster.sh
+++ b/public-scripts/deploy-democluster.sh
@@ -52,31 +52,6 @@ download_cloud_image () {
   fi
 }
 
-wait_for_multipass () {
-  # Wait for Multipass to be usable.
-
-  # Do some logic to print something prettier
-  first_iteration=true
-
-  while true; do
-    # Run "multipass list" and redirect both stdout and stderr to /dev/null
-    multipass list > /dev/null 2>&1
-
-    # Check the exit status
-    if [ $? -eq 2 ]; then
-      if [ "$first_iteration" = true ]; then
-          echo "Waiting until multipass properly starts..."
-          first_iteration=false
-      else
-          echo -n "."  # Append a "." without a newline
-      fi
-      sleep 1
-    else
-      break  # Exit the loop if the exit status is 0
-    fi
-  done
-}
-
 launch_instance () {
   # Check whether to install from remote URL or local file. If $1, then installs from file.
   if [ -z $1 ]; then
@@ -135,12 +110,19 @@ EOF
 
 # Check if multipass is installed
 if [ -z $(snap list | grep multipass | awk '{ print $1 }') ]; then
-  echo "Multipass is required but not installed. Installing the latest stable revision..."
-  sudo snap install multipass --channel latest/stable
+  echo "Multipass is required but not installed. Please install multipass on the system."
+  exit 1
 else
   echo "Multipass is installed. Proceeding..."
 fi
 
-wait_for_multipass
+# deletes the temp directory
+cleanup () {
+  rm -f /tmp/cloud-init.yaml
+}
 
+# Launch democluster.
 launch_instance
+
+# register the cleanup function to be called on the EXIT signal
+trap cleanup EXIT