Merge pull request #145 from vdemeester/cli-refactoring

cli: refactoring

Author: silvin-lubecki

Makefile

@@ -56,11 +56,11 @@ check_go_env:
 
 bin: check_go_env
 	@echo "Building _build/$(BIN_NAME)$(EXEC_EXT)..."
-	$(GO_BUILD) -ldflags=$(LDFLAGS) -o _build/$(BIN_NAME)$(EXEC_EXT)
+	$(GO_BUILD) -ldflags=$(LDFLAGS) -o _build/$(BIN_NAME)$(EXEC_EXT) ./cmd/docker-app
 
 bin-all: check_go_env
 	@echo "Building for all platforms..."
-	$(foreach OS, $(OS_LIST), GOOS=$(OS) $(GO_BUILD) -ldflags=$(LDFLAGS) -o _build/$(BIN_NAME)-$(OS)$(if $(filter windows, $(OS)),.exe,) || exit 1;)
+	$(foreach OS, $(OS_LIST), GOOS=$(OS) $(GO_BUILD) -ldflags=$(LDFLAGS) -o _build/$(BIN_NAME)-$(OS)$(if $(filter windows, $(OS)),.exe,) ./cmd/docker-app || exit 1;)
 
 e2e-all: check_go_env
 	@echo "Building for all platforms..."

cmd/build.go

@@ -0,0 +1,17 @@
+package main
+
+import (
+	log "github.com/sirupsen/logrus"
+	"github.com/spf13/cobra"
+)
+
+// buildCmd represents the build command
+func buildCmd() *cobra.Command {
+	return &cobra.Command{
+		Use:   "build <app-name>",
+		Short: "Compile an app package from locally available data",
+		Run: func(cmd *cobra.Command, args []string) {
+			log.Info("build called")
+		},
+	}
+}

cmd/deploy.go

@@ -0,0 +1,55 @@
+package main
+
+import (
+	"fmt"
+	"os"
+
+	"github.com/docker/cli/cli"
+	"github.com/docker/lunchbox/internal"
+	"github.com/docker/lunchbox/renderer"
+	"github.com/spf13/cobra"
+)
+
+var (
+	deployComposeFiles  []string
+	deploySettingsFiles []string
+	deployEnv           []string
+	deployOrchestrator  string
+	deployKubeConfig    string
+	deployNamespace     string
+	deployStackName     string
+)
+
+// deployCmd represents the deploy command
+func deployCmd() *cobra.Command {
+	cmd := &cobra.Command{
+		Use:   "deploy [<app-name>]",
+		Short: "Deploy or update an application",
+		Long:  `Deploy the application on either Swarm or Kubernetes.`,
+		Args:  cli.RequiresMaxArgs(1),
+		RunE: func(cmd *cobra.Command, args []string) error {
+			if do, ok := os.LookupEnv("DOCKER_ORCHESTRATOR"); ok {
+				deployOrchestrator = do
+			}
+			if deployOrchestrator != "swarm" && deployOrchestrator != "kubernetes" {
+				return fmt.Errorf("orchestrator must be either 'swarm' or 'kubernetes'")
+			}
+			d, err := parseSettings(deployEnv)
+			if err != nil {
+				return err
+			}
+			return renderer.Deploy(firstOrEmpty(args), deployComposeFiles, deploySettingsFiles, d, deployStackName, deployOrchestrator, deployKubeConfig, deployNamespace)
+		},
+	}
+
+	cmd.Flags().StringArrayVarP(&deploySettingsFiles, "settings-files", "f", []string{}, "Override settings files")
+	cmd.Flags().StringArrayVarP(&deployEnv, "set", "s", []string{}, "Override settings values")
+	cmd.Flags().StringVarP(&deployOrchestrator, "orchestrator", "o", "swarm", "Orchestrator to deploy on (swarm, kubernetes)")
+	cmd.Flags().StringVarP(&deployKubeConfig, "kubeconfig", "k", "", "kubeconfig file to use")
+	cmd.Flags().StringVarP(&deployNamespace, "namespace", "n", "default", "namespace to deploy into")
+	cmd.Flags().StringVarP(&deployStackName, "name", "d", "", "stack name (default: app name)")
+	if internal.Experimental == "on" {
+		cmd.Flags().StringArrayVarP(&deployComposeFiles, "compose-files", "c", []string{}, "Override Compose files")
+	}
+	return cmd
+}

cmd/docker-app/build.go

@@ -0,0 +1,41 @@
+package main
+
+import (
+	"github.com/docker/cli/cli"
+	"github.com/docker/lunchbox/internal"
+	"github.com/docker/lunchbox/renderer"
+	"github.com/spf13/cobra"
+)
+
+var (
+	helmComposeFiles []string
+	helmSettingsFile []string
+	helmEnv          []string
+	helmRender       bool
+)
+
+func helmCmd() *cobra.Command {
+	cmd := &cobra.Command{
+		Use:   "helm [<app-name>] [-s key=value...] [-f settings-file...]",
+		Short: "Generate a Helm chart",
+		Long:  `Generate a Helm chart for the application.`,
+		Args:  cli.RequiresMaxArgs(1),
+		RunE: func(cmd *cobra.Command, args []string) error {
+			d, err := parseSettings(helmEnv)
+			if err != nil {
+				return err
+			}
+			return renderer.Helm(firstOrEmpty(args), helmComposeFiles, helmSettingsFile, d, helmRender)
+		},
+	}
+	if internal.Experimental == "on" {
+		cmd.Flags().StringArrayVarP(&helmComposeFiles, "compose-files", "c", []string{}, "Override Compose files")
+		cmd.Use += " [-c <compose-files>...]"
+		cmd.Flags().BoolVarP(&helmRender, "render", "r", false, "Render the template instead of exporting it")
+		cmd.Long += ` If the --render option is used, the docker-compose.yml will
+be rendered instead of exported as a template.`
+	}
+	cmd.Flags().StringArrayVarP(&helmSettingsFile, "settings-files", "f", []string{}, "Override settings files")
+	cmd.Flags().StringArrayVarP(&helmEnv, "set", "s", []string{}, "Override settings values")
+	return cmd
+}

cmd/docker-app/deploy.go

@@ -0,0 +1,44 @@
+package main
+
+import (
+	"fmt"
+	"strings"
+
+	"github.com/docker/lunchbox/image"
+	"github.com/docker/lunchbox/internal"
+	"github.com/spf13/cobra"
+)
+
+var (
+	imageAddComposeFiles []string
+	imageAddSettingsFile []string
+	imageAddEnv          []string
+)
+
+func imageAddCmd() *cobra.Command {
+	cmd := &cobra.Command{
+		Use:   "image-add <app-name> [services...]",
+		Short: "Add images for given services (default: all) to the app package",
+		Long: `This command renders the app's docker-compose.yml file, looks for the
+images it uses, and saves them from the local docker daemon to the images/
+subdirectory.`,
+		Args: cobra.MinimumNArgs(1),
+		RunE: func(cmd *cobra.Command, args []string) error {
+			d := make(map[string]string)
+			for _, v := range imageAddEnv {
+				kv := strings.SplitN(v, "=", 2)
+				if len(kv) != 2 {
+					return fmt.Errorf("Malformed env input: '%s'", v)
+				}
+				d[kv[0]] = kv[1]
+			}
+			return image.Add(args[0], args[1:], imageAddComposeFiles, imageAddSettingsFile, d)
+		},
+	}
+	if internal.Experimental == "on" {
+		cmd.Flags().StringArrayVarP(&imageAddComposeFiles, "compose-files", "c", []string{}, "Override Compose files")
+		cmd.Flags().StringArrayVarP(&imageAddSettingsFile, "settings-files", "s", []string{}, "Override settings files")
+		cmd.Flags().StringArrayVarP(&imageAddEnv, "env", "e", []string{}, "Override environment values")
+	}
+	return cmd
+}

cmd/docker-app/helm.go

@@ -0,0 +1,17 @@
+package main
+
+import (
+	"github.com/docker/lunchbox/image"
+	"github.com/spf13/cobra"
+)
+
+func imageLoadCmd() *cobra.Command {
+	return &cobra.Command{
+		Use:   "image-load <app-name> [services...]",
+		Short: "Load stored images for given services (default: all) to the local docker daemon",
+		Args:  cobra.MinimumNArgs(1),
+		RunE: func(cmd *cobra.Command, args []string) error {
+			return image.Load(args[0], args[1:])
+		},
+	}
+}

cmd/docker-app/image-add.go

@@ -0,0 +1,32 @@
+package main
+
+import (
+	"github.com/docker/cli/cli"
+	"github.com/docker/lunchbox/packager"
+	"github.com/spf13/cobra"
+)
+
+var (
+	initComposeFile string
+	initDescription string
+	initMaintainers []string
+	initSingleFile  bool
+)
+
+// initCmd represents the init command
+func initCmd() *cobra.Command {
+	cmd := &cobra.Command{
+		Use:   "init <app-name> [-c <compose-file>] [-d <description>] [-m name:email ...]",
+		Short: "Start building a Docker application",
+		Long:  `Start building a Docker application. Will automatically detect a docker-compose.yml file in the current directory.`,
+		Args:  cli.ExactArgs(1),
+		RunE: func(cmd *cobra.Command, args []string) error {
+			return packager.Init(args[0], initComposeFile, initDescription, initMaintainers, initSingleFile)
+		},
+	}
+	cmd.Flags().StringVarP(&initComposeFile, "compose-file", "c", "", "Initial Compose file (optional)")
+	cmd.Flags().StringVarP(&initDescription, "description", "d", "", "Initial description (optional)")
+	cmd.Flags().StringArrayVarP(&initMaintainers, "maintainer", "m", []string{}, "Maintainer (name:email) (optional)")
+	cmd.Flags().BoolVarP(&initSingleFile, "single-file", "s", false, "Create a single-file application")
+	return cmd
+}

cmd/docker-app/image-load.go

@@ -0,0 +1,19 @@
+package main
+
+import (
+	"github.com/docker/cli/cli"
+	"github.com/docker/lunchbox/renderer"
+	"github.com/spf13/cobra"
+)
+
+// inspectCmd represents the inspect command
+func inspectCmd() *cobra.Command {
+	return &cobra.Command{
+		Use:   "inspect [<app-name>]",
+		Short: "Shows metadata and settings for a given application",
+		Args:  cli.RequiresMaxArgs(1),
+		RunE: func(cmd *cobra.Command, args []string) error {
+			return renderer.Inspect(firstOrEmpty(args))
+		},
+	}
+}