Merge pull request #314 from ubclaunchpad/client/#260-inertia-remove

inertia [remote] remove

client/client.go

@@ -156,6 +156,21 @@ func (c *Client) DaemonDown() error {
 	return nil
 }
 
+// InertiaDown removes the inertia/ directory on the remote instance
+func (c *Client) InertiaDown() error {
+	scriptBytes, err := internal.Asset("client/scripts/inertia-down.sh")
+	if err != nil {
+		return err
+	}
+
+	_, stderr, err := c.sshRunner.Run(string(scriptBytes))
+	if err != nil {
+		return fmt.Errorf("Inertia down failed: %s: %s", err.Error(), stderr.String())
+	}
+
+	return nil
+}
+
 // installDocker installs docker on a remote vps.
 func (c *Client) installDocker(session SSHSession) error {
 	installDockerSh, err := internal.Asset("client/scripts/docker.sh")

client/scripts/daemon-down.sh

@@ -8,4 +8,6 @@ DAEMON_NAME=inertia-daemon
 
 # Get daemon container and take it down if it is running.
 ALREADY_RUNNING=`sudo docker ps -q --filter "name=$DAEMON_NAME"`
-sudo docker rm -f $ALREADY_RUNNING
+if [ ! -z "$ALREADY_RUNNING" ]; then
+    sudo docker rm -f $ALREADY_RUNNING
+fi;

client/scripts/inertia-down.sh

@@ -0,0 +1,8 @@
+#!/bin/sh
+
+# Basic script for bringing down Inertia.
+
+set -e
+
+# Remove Inertia from VPS
+rm -rf ~/inertia/

cmd/config.go

@@ -108,7 +108,7 @@ var cmdSetConfigProperty = &cobra.Command{
 	Use:   "set [PROPERTY] [VALUE]",
 	Short: "Set configuration property of the project",
 	Long:  `Set configuration property of the project. This will modify local toml file.`,
-	Args:  cobra.MinimumNArgs(2),
+	Args:  cobra.ExactArgs(2),
 	Run: func(cmd *cobra.Command, args []string) {
 		// Ensure project initialized.
 		config, path, err := local.GetProjectConfigFromDisk(configFilePath)

cmd/deploy.go

@@ -115,6 +115,9 @@ Run 'inertia [REMOTE] init' to gather this information.`,
 		reset := deepCopy(cmdDeploymentReset)
 		cmd.AddCommand(reset)
 
+		remove := deepCopy(cmdDeploymentRemove)
+		cmd.AddCommand(remove)
+
 		// Attach a "short" option on all commands
 		cmd.PersistentFlags().BoolP(
 			"short", "s", false,
@@ -362,7 +365,7 @@ var cmdDeploymentSendFile = &cobra.Command{
 	Short: "Send a file to your Inertia deployment",
 	Long: `Send a file, such as a configuration or .env file, to your Inertia
 deployment. Provide a relative path to your file.`,
-	Args: cobra.MinimumNArgs(1),
+	Args: cobra.ExactArgs(1),
 	Run: func(cmd *cobra.Command, args []string) {
 		remoteName := strings.Split(cmd.Parent().Use, " ")[0]
 		deployment, _, err := local.GetClient(remoteName, configFilePath, cmd)
@@ -474,3 +477,38 @@ running 'inertia [REMOTE] init'`,
 		}
 	},
 }
+
+var cmdDeploymentRemove = &cobra.Command{
+	Use:   "remove",
+	Short: "Remove Inertia and shutdown the daemon in the remote VPS",
+	Long: `Remove Inertia directory (~/inertia) and takes down the
+	daemon image from the VPS.`,
+	Run: func(cmd *cobra.Command, args []string) {
+		println("WARNING: This will remove Inertia from the remote")
+		println("as well as take the daemon and is irreversible. Continue? (y/n)")
+		var response string
+		_, err := fmt.Scanln(&response)
+		if err != nil || response != "y" {
+			log.Fatal("aborting")
+		}
+
+		// Daemon down
+		remoteName := strings.Split(cmd.Parent().Use, " ")[0]
+		deployment, _, err := local.GetClient(remoteName, configFilePath, cmd)
+		if err != nil {
+			log.Fatal(err)
+		}
+		println("Stopping daemon...")
+		err = deployment.DaemonDown()
+		if err != nil {
+			log.Fatal(err)
+		}
+		println("Removing Inertia directories...")
+		err = deployment.InertiaDown()
+		if err != nil {
+			log.Fatal(err)
+		}
+
+		println("Inertia and related daemon removed.")
+	},
+}

cmd/env.go

@@ -20,7 +20,7 @@ var cmdDeploymentEnvSet = &cobra.Command{
 	Short: "Set an environment variable on your remote",
 	Long: `Set a persistent environment variable on your remote. Set environment
 variables are applied to all deployed containers.`,
-	Args: cobra.MinimumNArgs(2),
+	Args: cobra.ExactArgs(2),
 	Run: func(cmd *cobra.Command, args []string) {
 		remoteName := strings.Split(cmd.Parent().Parent().Use, " ")[0]
 		deployment, _, err := local.GetClient(remoteName, configFilePath, cmd)
@@ -52,7 +52,7 @@ var cmdDeploymentEnvRemove = &cobra.Command{
 	Short: "Remove an environment variable from your remote",
 	Long: `Remove the specified environment variable from deployed containers
 and persistent environment storage.`,
-	Args: cobra.MinimumNArgs(1),
+	Args: cobra.ExactArgs(1),
 	Run: func(cmd *cobra.Command, args []string) {
 		remoteName := strings.Split(cmd.Parent().Parent().Use, " ")[0]
 		deployment, _, err := local.GetClient(remoteName, configFilePath, cmd)

cmd/provision.go

@@ -41,7 +41,7 @@ var cmdProvisionECS = &cobra.Command{
 	Long: `[BETA] Provision a new Amazon EC2 instance and set it up for continuous deployment
 	with Inertia. Make sure you run this command with the '-p' flag to indicate what ports
 	your project uses, since they must be exposed on your new instance.`,
-	Args: cobra.MinimumNArgs(1),
+	Args: cobra.ExactArgs(1),
 	Run: func(cmd *cobra.Command, args []string) {
 		// Ensure project initialized.
 		config, path, err := local.GetProjectConfigFromDisk(configFilePath)
@@ -67,11 +67,14 @@ var cmdProvisionECS = &cobra.Command{
 				log.Fatal(err)
 			}
 			prov, err = provision.NewEC2Provisioner(id, key, os.Stdout)
+			if err != nil {
+				log.Fatal(err)
+			}
 		} else {
 			prov, err = provision.NewEC2ProvisionerFromEnv(os.Stdout)
-		}
-		if err != nil {
-			log.Fatal(err)
+			if err != nil {
+				log.Fatal(err)
+			}
 		}
 
 		// Report connected user

cmd/remote.go

@@ -46,7 +46,7 @@ var cmdAddRemote = &cobra.Command{
 	Long: `Add a reference to a remote VPS instance. Requires 
 information about the VPS including IP address, user and a PEM
 file. Specify a VPS name.`,
-	Args: cobra.MinimumNArgs(1),
+	Args: cobra.ExactArgs(1),
 	Run: func(cmd *cobra.Command, args []string) {
 		// Ensure project initialized.
 		config, path, err := local.GetProjectConfigFromDisk(configFilePath)
@@ -107,7 +107,7 @@ var cmdRemoveRemote = &cobra.Command{
 	Use:   "rm [REMOTE]",
 	Short: "Remove a remote.",
 	Long:  `Remove a remote from Inertia's configuration file.`,
-	Args:  cobra.MinimumNArgs(1),
+	Args:  cobra.ExactArgs(1),
 	Run: func(cmd *cobra.Command, args []string) {
 		config, path, err := local.GetProjectConfigFromDisk(configFilePath)
 		if err != nil {
@@ -132,7 +132,7 @@ var cmdShowRemote = &cobra.Command{
 	Use:   "show [REMOTE]",
 	Short: "Show details about remote.",
 	Long:  `Show details about the given remote.`,
-	Args:  cobra.MinimumNArgs(1),
+	Args:  cobra.ExactArgs(1),
 	Run: func(cmd *cobra.Command, args []string) {
 		// Ensure project initialized.
 		config, _, err := local.GetProjectConfigFromDisk(configFilePath)
@@ -153,7 +153,7 @@ var cmdSetRemoteProperty = &cobra.Command{
 	Use:   "set [REMOTE] [PROPERTY] [VALUE]",
 	Short: "Set details about remote.",
 	Long:  `Set details about the given remote.`,
-	Args:  cobra.MinimumNArgs(3),
+	Args:  cobra.ExactArgs(3),
 	Run: func(cmd *cobra.Command, args []string) {
 		// Ensure project initialized.
 		config, path, err := local.GetProjectConfigFromDisk(configFilePath)

cmd/users.go

@@ -28,7 +28,7 @@ This user will be able to log in and view or configure the
 deployment from the web app.
 
 Use the --admin flag to create an admin user.`,
-	Args: cobra.MinimumNArgs(1),
+	Args: cobra.ExactArgs(1),
 	Run: func(cmd *cobra.Command, args []string) {
 		remoteName := strings.Split(cmd.Parent().Parent().Use, " ")[0]
 		deployment, _, err := local.GetClient(remoteName, configFilePath, cmd)
@@ -77,7 +77,7 @@ var cmdDeploymentRemoveUser = &cobra.Command{
 
 This user will no longer be able to log in and view or configure the
 deployment from the web app.`,
-	Args: cobra.MinimumNArgs(1),
+	Args: cobra.ExactArgs(1),
 	Run: func(cmd *cobra.Command, args []string) {
 		remoteName := strings.Split(cmd.Parent().Parent().Use, " ")[0]
 		deployment, _, err := local.GetClient(remoteName, configFilePath, cmd)
@@ -114,7 +114,6 @@ var cmdDeploymentResetUsers = &cobra.Command{
 	Long: `Removes all users credentials on your remote. All users will
 no longer be able to log in and view or configure the deployment 
 from the web app.`,
-	Args: cobra.MinimumNArgs(1),
 	Run: func(cmd *cobra.Command, args []string) {
 		remoteName := strings.Split(cmd.Parent().Parent().Use, " ")[0]
 		deployment, _, err := local.GetClient(remoteName, configFilePath, cmd)