enable --force flag in flyte demo start (#432)

Signed-off-by: Future Outlier <[email protected]>
Co-authored-by: Future Outlier <[email protected]>

cmd/config/subcommand/docker/docker_config.go

@@ -0,0 +1,13 @@
+package docker
+
+//go:generate pflags Config --default-var DefaultConfig --bind-default-var
+var (
+	DefaultConfig = &Config{
+		Force: false,
+	}
+)
+
+// Configs
+type Config struct {
+	Force bool `json:"force" pflag:",Optional. Forcefully delete existing sandbox cluster if it exists."`
+}

cmd/config/subcommand/sandbox/sandbox_config.go

@@ -34,6 +34,8 @@ type Config struct {
 	// It's used for development. Users are able to start flyte locally via single binary and save the data to the minio or postgres in the sandbox.
 	Dev    bool `json:"dev" pflag:",Optional. Only start minio and postgres in the sandbox."`
 	DryRun bool `json:"dryRun" pflag:",Optional. Only print the docker commands to bring up flyte sandbox/demo container.This will still call github api's to get the latest flyte release to use'"`
+
+	Force bool `json:"force" pflag:",Optional. Forcefully delete existing sandbox cluster if it exists."`
 }
 
 //go:generate pflags Config --default-var DefaultConfig --bind-default-var

pkg/docker/docker_config.go

@@ -0,0 +1,12 @@
+package docker
+
+// Config holds configuration flags for docker command.
+var (
+	DefaultConfig = &Config{
+		Force: false,
+	}
+)
+
+type Config struct {
+	Force bool `json:"force" pflag:",Optional. Forcefully delete existing sandbox cluster if it exists."`
+}

pkg/docker/docker_util.go

@@ -12,15 +12,15 @@ import (
 	"github.com/docker/docker/client"
 	"github.com/enescakir/emoji"
 
-	"github.com/flyteorg/flytectl/clierrors"
-
 	"github.com/docker/docker/api/types"
 	"github.com/docker/docker/api/types/container"
 	"github.com/docker/docker/api/types/filters"
 	"github.com/docker/docker/api/types/mount"
 	"github.com/docker/docker/api/types/volume"
 	"github.com/docker/docker/pkg/stdcopy"
 	"github.com/docker/go-connections/nat"
+	"github.com/flyteorg/flytectl/clierrors"
+	"github.com/flyteorg/flytectl/cmd/config/subcommand/docker"
 	cmdUtil "github.com/flyteorg/flytectl/pkg/commandutils"
 	f "github.com/flyteorg/flytectl/pkg/filesystemutils"
 )
@@ -93,8 +93,9 @@ func RemoveSandbox(ctx context.Context, cli Docker, reader io.Reader) error {
 	if err != nil {
 		return err
 	}
+
 	if c != nil {
-		if cmdUtil.AskForConfirmation("delete existing sandbox cluster", reader) {
+		if docker.DefaultConfig.Force || cmdUtil.AskForConfirmation("delete existing sandbox cluster", reader) {
 			err := cli.ContainerRemove(context.Background(), c.ID, types.ContainerRemoveOptions{
 				Force: true,
 			})

pkg/docker/docker_util_test.go

@@ -21,6 +21,7 @@ import (
 	"github.com/stretchr/testify/mock"
 
 	"github.com/docker/docker/api/types"
+	"github.com/flyteorg/flytectl/cmd/config/subcommand/docker"
 	"github.com/stretchr/testify/assert"
 )
 
@@ -88,6 +89,10 @@ func TestRemoveSandboxWithNoReply(t *testing.T) {
 		mockDocker.OnContainerRemove(ctx, mock.Anything, types.ContainerRemoveOptions{Force: true}).Return(nil)
 		err := RemoveSandbox(ctx, mockDocker, strings.NewReader("n"))
 		assert.NotNil(t, err)
+
+		docker.DefaultConfig.Force = true
+		err = RemoveSandbox(ctx, mockDocker, strings.NewReader(""))
+		assert.Nil(t, err)
 	})
 
 	t.Run("Successfully remove sandbox container with zero sandbox containers are running", func(t *testing.T) {

pkg/sandbox/start.go

@@ -14,6 +14,7 @@ import (
 	"github.com/docker/go-connections/nat"
 	"github.com/enescakir/emoji"
 	"github.com/flyteorg/flytectl/clierrors"
+	dockerCmdConfig "github.com/flyteorg/flytectl/cmd/config/subcommand/docker"
 	sandboxCmdConfig "github.com/flyteorg/flytectl/cmd/config/subcommand/sandbox"
 	"github.com/flyteorg/flytectl/pkg/configutil"
 	"github.com/flyteorg/flytectl/pkg/docker"
@@ -157,6 +158,7 @@ func startSandbox(ctx context.Context, cli docker.Docker, g github.GHRepoService
 	if sandboxConfig.DryRun {
 		docker.PrintRemoveContainer(docker.FlyteSandboxClusterName)
 	} else {
+		dockerCmdConfig.DefaultConfig.Force = sandboxConfig.Force
 		if err := docker.RemoveSandbox(ctx, cli, reader); err != nil {
 			if err.Error() != clierrors.ErrSandboxExists {
 				return nil, err