Tidy apply and delete process

Author: nicholasjackson

cmd/apply.go

@@ -14,6 +14,7 @@ import (
 	"context"
 
 	getter "github.com/hashicorp/go-getter"
+	"github.com/hashicorp/go-hclog"
 	"github.com/shipyard-run/shipyard/pkg/shipyard"
 	"github.com/spf13/cobra"
 )
@@ -36,63 +37,86 @@ var applyCmd = &cobra.Command{
 		var err error
 		dst := args[0]
 
+		fmt.Println("Applying configuration from: ", dst)
+		fmt.Println("")
+
+		// create a logger
+		log := hclog.New(&hclog.LoggerOptions{Level: hclog.Debug, Color: hclog.AutoColor})
+
 		if !IsLocalFolder(dst) {
 			// fetch the remote server from github
 			dst, err = pullRemoteBlueprint(dst)
 			if err != nil {
-				panic(err)
+				log.Error("Unable to retrieve blueprint", "error", err)
+				return
 			}
 		}
 
 		// Load the files
-		e, err := shipyard.NewWithFolder(dst)
+		e, err := shipyard.NewWithFolder(dst, log)
 		if err != nil {
-			panic(err)
+			log.Error("Unable to load blueprint", "error", err)
+			return
 		}
 
 		// if we have a blueprint show the header
 		if e.Blueprint() != nil {
 			fmt.Println("Title", e.Blueprint().Title)
 			fmt.Println("Author", e.Blueprint().Author)
 			fmt.Println("")
-			fmt.Println(e.Blueprint().Intro)
-			fmt.Println("")
 		}
 
+		fmt.Printf("Creating %d resources\n\n", e.ResourceCount())
+
 		err = e.Apply()
 		if err != nil {
-			panic(err)
+			log.Error("Unable to apply blueprint", "error", err)
+
+			log.Info("Attempting to roll back state")
+			err := e.Destroy()
+			if err != nil {
+				log.Error("Unable to roll back state, you may need to manually remove Docker containers and networks", "error", err)
+			}
+
+			return
 		}
 
 		// copy the blueprints to our state folder
 		// this is temporary
 		err = copy.Copy(dst, StateDir())
 		if err != nil {
-			panic(err)
+			log.Error("Unable to copy blueprint to state folder", "error", err)
+			return
 		}
 
-		// apply any env vars
-		if e.Blueprint() != nil && len(e.Blueprint().Environment) > 0 {
-			fmt.Println("")
-			fmt.Println("Setting environment variables:")
-			fmt.Println("")
-			ef, err := NewEnv(fmt.Sprintf("%s/env.var", StateDir()))
-			if err != nil {
-				panic(err)
-			}
-			defer ef.Close()
+		fmt.Println("")
+		fmt.Println(e.Blueprint().Intro)
+		fmt.Println("")
 
-			for _, e := range e.Blueprint().Environment {
-				fmt.Printf("export %s=%s\n", e.Key, e.Value)
-				err := ef.Set(e.Key, e.Value)
+		// apply any env vars
+		/*
+			if e.Blueprint() != nil && len(e.Blueprint().Environment) > 0 {
+				fmt.Println("")
+				fmt.Println("Setting environment variables:")
+				fmt.Println("")
+				ef, err := NewEnv(fmt.Sprintf("%s/env.var", StateDir()))
 				if err != nil {
 					panic(err)
 				}
-			}
+				defer ef.Close()
+
+				for _, e := range e.Blueprint().Environment {
+					fmt.Printf("export %s=%s\n", e.Key, e.Value)
+					err := ef.Set(e.Key, e.Value)
+					if err != nil {
+						panic(err)
+					}
+				}
 
-			fmt.Println("")
-			fmt.Println("environment variables will be restored to previous values when using the `yard delete` command")
-		}
+				fmt.Println("")
+				fmt.Println("environment variables will be restored to previous values when using the `yard delete` command")
+			}
+		*/
 
 		// open any browser windows
 		if e.Blueprint() != nil {

cmd/delete.go

@@ -4,6 +4,7 @@ import (
 	"fmt"
 	"os"
 
+	"github.com/hashicorp/go-hclog"
 	"github.com/shipyard-run/shipyard/pkg/shipyard"
 	"github.com/spf13/cobra"
 )
@@ -14,38 +15,48 @@ var deleteCmd = &cobra.Command{
 	Long:    `Delete the current stack`,
 	Example: `yard delete my-stack`,
 	Run: func(cmd *cobra.Command, args []string) {
+
+		log := hclog.New(&hclog.LoggerOptions{Level: hclog.Debug, Color: hclog.AutoColor})
+
 		// When destroying a stack all the config
 		// which is created with apply is copied
 		// to the state folder
-		e, err := shipyard.NewWithFolder(StateDir())
+		e, err := shipyard.NewWithFolder(StateDir(), log)
 		if err != nil {
-			panic(err)
+			log.Error("Unable to load state", "error", err)
+			return
 		}
 
+		fmt.Printf("Deleting %d resources\n\n", e.ResourceCount())
+
 		err = e.Destroy()
 		if err != nil {
-			panic(err)
+			log.Error("Unable to delete stack", "error", err)
+			return
 		}
 
-		// remove the environment varibles
-		if e.Blueprint() != nil && len(e.Blueprint().Environment) > 0 {
-			fmt.Println("restoring environment variables")
-			ef, err := NewEnv(fmt.Sprintf("%s/env.var", StateDir()))
-			if err != nil {
-				panic(err)
-			}
-			defer ef.Close()
+		/*
+			// remove the environment varibles
+			if e.Blueprint() != nil && len(e.Blueprint().Environment) > 0 {
+				fmt.Println("restoring environment variables")
+				ef, err := NewEnv(fmt.Sprintf("%s/env.var", StateDir()))
+				if err != nil {
+					panic(err)
+				}
+				defer ef.Close()
 
-			err = ef.Clear()
-			if err != nil {
-				panic(err)
+				err = ef.Clear()
+				if err != nil {
+					panic(err)
+				}
 			}
-		}
+		*/
 
 		// delete the contents of the state folder
 		err = os.RemoveAll(StateDir())
 		if err != nil {
-			panic(err)
+			log.Error("Unable to delete state", "error", err)
+			return
 		}
 	},
 }

pkg/config/config.go

@@ -28,3 +28,23 @@ func New() (*Config, error) {
 
 	return c, nil
 }
+
+// ResourceCount defines the number of resources in a config
+func (c *Config) ResourceCount() int {
+	// start at 1 as we always have a wan
+	co := 1
+
+	if c.Docs != nil {
+		co++
+	}
+
+	co += len(c.Clusters)
+	co += len(c.Containers)
+	co += len(c.Containers)
+	co += len(c.HelmCharts)
+	co += len(c.K8sConfig)
+	co += len(c.Ingresses)
+	co += len(c.Execs)
+
+	return co
+}

pkg/config/config_test.go

@@ -0,0 +1,21 @@
+package config
+
+import (
+	"testing"
+
+	"github.com/stretchr/testify/assert"
+)
+
+func TestResourceCount(t *testing.T) {
+	c, _ := New()
+	c.Docs = &Docs{}
+	c.Clusters = []*Cluster{&Cluster{}}
+	c.Containers = []*Container{&Container{}}
+	c.Networks = []*Network{&Network{}}
+	c.HelmCharts = []*Helm{&Helm{}}
+	c.K8sConfig = []*K8sConfig{&K8sConfig{}}
+	c.Ingresses = []*Ingress{&Ingress{}}
+	c.Execs = []*Exec{&Exec{}}
+
+	assert.Equal(t, 9, c.ResourceCount())
+}

pkg/providers/container_util.go

@@ -223,8 +223,6 @@ func execCommand(c clients.Docker, container string, command []string) error {
 			return xerrors.Errorf("unable to determine status of exec process: %w", err)
 		}
 
-		fmt.Println(i)
-
 		if !i.Running {
 			if i.ExitCode == 0 {
 				return nil

pkg/shipyard/engine.go

@@ -42,8 +42,7 @@ func GenerateClients(l hclog.Logger) (*Clients, error) {
 }
 
 // NewWithFolder creates a new shipyard engine with a given configuration folder
-func NewWithFolder(folder string) (*Engine, error) {
-	l := hclog.New(&hclog.LoggerOptions{Level: hclog.Debug, Color: hclog.AutoColor})
+func NewWithFolder(folder string, l hclog.Logger) (*Engine, error) {
 	var err error
 
 	cc, err := config.New()
@@ -110,6 +109,11 @@ func (e *Engine) Destroy() error {
 	return nil
 }
 
+// ResourceCount defines the number of resources in a plan
+func (e *Engine) ResourceCount() int {
+	return e.config.ResourceCount()
+}
+
 // Blueprint returns the blueprint for the current config
 func (e *Engine) Blueprint() *config.Blueprint {
 	return e.config.Blueprint