Add purge command, fix bugs

Author: nicholasjackson

ChangeLog.md

@@ -28,6 +28,11 @@ sidecar "consul" {
 ### Helm charts
 * Added ability to set the namespace
 
+### Purge Command
+* Added `shipyard purge` command to remove all cached images, blueprints, and helm charts
+
+### Bugfixes
+* Remote exec now correctly pulls a container
 
 ## version 0.0.18
 

cmd/exec.go

@@ -33,6 +33,7 @@ func newExecCmd(dt clients.ContainerTasks) *cobra.Command {
 		`,
 		Args:               cobra.MinimumNArgs(1),
 		DisableFlagParsing: true,
+		SilenceUsage:       true,
 		RunE: func(cmd *cobra.Command, args []string) error {
 			parameters, command := parseParameters(args)
 

cmd/get.go

@@ -23,7 +23,8 @@ func newGetCmd(bp clients.Getter) *cobra.Command {
   # Fetch a blueprint from GitHub
   yard get github.com/shipyard-run/blueprints//vault-k8s
 	`,
-		Args: cobra.ArbitraryArgs,
+		Args:         cobra.ArbitraryArgs,
+		SilenceUsage: true,
 		RunE: func(cmd *cobra.Command, args []string) error {
 			// create the shipyard home
 			os.MkdirAll(utils.ShipyardHome(), os.FileMode(0755))

cmd/purge.go

@@ -0,0 +1,62 @@
+package cmd
+
+import (
+	"context"
+	"fmt"
+	"os"
+	"path/filepath"
+
+	"github.com/docker/docker/api/types"
+	"github.com/hashicorp/go-hclog"
+	"github.com/shipyard-run/shipyard/pkg/clients"
+	"github.com/shipyard-run/shipyard/pkg/utils"
+	"github.com/spf13/cobra"
+)
+
+func newPurgeCmd(dt clients.Docker, il clients.ImageLog, l hclog.Logger) *cobra.Command {
+	purgeCmd := &cobra.Command{
+		Use:   "purge",
+		Short: "Purges Docker images, Helm charts, and Blueprints downloaded by Shipyard",
+		Long:  "Purges Docker images, Helm charts, and Blueprints downloaded by Shipyard",
+		Example: `
+  shipyard purge
+	`,
+		Args:         cobra.ArbitraryArgs,
+		RunE:         newPurgeCmdFunc(dt, il, l),
+		SilenceUsage: true,
+	}
+
+	return purgeCmd
+}
+
+func newPurgeCmdFunc(dt clients.Docker, il clients.ImageLog, l hclog.Logger) func(cmd *cobra.Command, args []string) error {
+	return func(cmd *cobra.Command, args []string) error {
+		images, _ := il.Read(clients.ImageTypeDocker)
+
+		for _, i := range images {
+			l.Info("Removing image", "image", i)
+
+			_, err := dt.ImageRemove(context.Background(), i, types.ImageRemoveOptions{Force: true, PruneChildren: true})
+			if err != nil {
+				return fmt.Errorf("Unable to delete image: %s, error: %s", i, err)
+			}
+		}
+		il.Clear()
+
+		hcp := filepath.Join(utils.ShipyardHome(), "helm_charts")
+		l.Info("Removing Helm charts", "path", hcp)
+		err := os.RemoveAll(hcp)
+		if err != nil {
+			return fmt.Errorf("Unable to remove cached Helm charts: %s", err)
+		}
+
+		bcp := filepath.Join(utils.ShipyardHome(), "helm_charts")
+		l.Info("Removing Blueprints", "path", bcp)
+		err = os.RemoveAll(bcp)
+		if err != nil {
+			return fmt.Errorf("Unable to remove cached Blueprints: %s", err)
+		}
+
+		return nil
+	}
+}

cmd/push.go

@@ -21,6 +21,7 @@ func newPushCmd(ct clients.ContainerTasks, kc clients.Kubernetes, ht clients.HTT
 		Example:               `yard push nicholasjackson/fake-service:v0.1.3 k8s_cluster.k3s`,
 		DisableFlagsInUseLine: true,
 		Args:                  cobra.MaximumNArgs(3),
+		SilenceUsage:          true,
 		RunE: func(cmd *cobra.Command, args []string) error {
 			if len(args) < 2 {
 				return xerrors.Errorf("Push requires two arguments [image] [cluster]")

cmd/root.go

@@ -48,6 +48,7 @@ func init() {
 	rootCmd.AddCommand(newGetCmd(engineClients.Getter))
 	rootCmd.AddCommand(destroyCmd)
 	rootCmd.AddCommand(statusCmd)
+	rootCmd.AddCommand(newPurgeCmd(engineClients.Docker, engineClients.ImageLog, logger))
 	rootCmd.AddCommand(taintCmd)
 	rootCmd.AddCommand(newExecCmd(engineClients.ContainerTasks))
 	rootCmd.AddCommand(versionCmd)

cmd/run.go

@@ -62,7 +62,7 @@ func newRunCmdFunc(e shipyard.Engine, bp clients.Getter, hc clients.HTTP, bc cli
 		}
 
 		// check the shipyard version
-		text, ok := utils.CheckVersion(version)
+		text, ok := bc.CheckVersion(version)
 		if !ok {
 			fmt.Println("")
 			fmt.Println(text)

cmd/run_test.go

@@ -28,6 +28,7 @@ func setupRun(t *testing.T) (*cobra.Command, *mocks.Engine, *clientmocks.Getter,
 	mockBrowser := &clientmocks.System{}
 	mockBrowser.On("OpenBrowser", mock.Anything).Return(nil)
 	mockBrowser.On("Preflight").Return(nil)
+	mockBrowser.On("CheckVersion", mock.Anything).Return("", false)
 
 	mockTasks := &clientmocks.MockContainerTasks{}
 	mockTasks.On("SetForcePull", mock.Anything)

functional_tests/main_test.go

@@ -79,6 +79,12 @@ func FeatureContext(s *godog.Suite) {
 		cmd.Stdout = os.Stdout
 		cmd.Stderr = os.Stderr
 		cmd.Run()
+
+		// purge the cache
+		cmd = exec.Command("yard-dev", []string{"purge"}...)
+		cmd.Stdout = os.Stdout
+		cmd.Stderr = os.Stderr
+		cmd.Run()
 	})
 }
 

go.mod

@@ -20,6 +20,7 @@ require (
 	github.com/mattn/go-isatty v0.0.12 // indirect
 	github.com/mitchellh/go-homedir v1.1.0
 	github.com/mitchellh/mapstructure v1.1.2
+	github.com/opencontainers/runtime-tools v0.0.0-20181011054405-1d69bd0f9c39
 	github.com/prometheus/common v0.7.0 // indirect
 	github.com/spf13/cobra v0.0.5
 	github.com/spf13/viper v1.5.0