Merge pull request #173 from dexhorthy/app-management

add app management capabilities

Author: dexhorthy

cli/cmd/app_create.go

@@ -0,0 +1,51 @@
+package cmd
+
+import (
+	"github.com/pkg/errors"
+	"github.com/replicatedhq/replicated/cli/print"
+	"github.com/replicatedhq/replicated/pkg/kotsclient"
+	"github.com/replicatedhq/replicated/pkg/types"
+	"github.com/spf13/cobra"
+)
+
+func (r *runners) InitAppCreate(parent *cobra.Command) *cobra.Command {
+	cmd := &cobra.Command{
+		Use:          "create NAME",
+		Short:        "create kots apps",
+		Long:         `create kots apps`,
+		RunE:         r.createApp,
+		SilenceUsage: true,
+	}
+	parent.AddCommand(cmd)
+
+	return cmd
+}
+
+func (r *runners) createApp(_ *cobra.Command, args []string) error {
+	if len(args) != 1 {
+		return errors.New("missing app name")
+	}
+	appName := args[0]
+
+	kotsRestClient := kotsclient.VendorV3Client{HTTPClient: *r.platformAPI}
+
+
+	app, err := kotsRestClient.CreateKOTSApp(appName)
+
+	if err != nil {
+		return errors.Wrap(err, "list apps")
+	}
+
+	apps := []types.AppAndChannels{
+		{
+			App: &types.App{
+				ID: app.ID,
+				Name: app.Name,
+				Slug: app.Slug,
+				Scheduler: "kots",
+			},
+		},
+	}
+
+	return print.Apps(r.w, apps)
+}

cli/cmd/app_delete.go

@@ -0,0 +1,103 @@
+package cmd
+
+import (
+	"github.com/manifoldco/promptui"
+	"github.com/pkg/errors"
+	"github.com/replicatedhq/replicated/cli/print"
+	"github.com/replicatedhq/replicated/pkg/types"
+	"github.com/spf13/cobra"
+)
+
+func (r *runners) InitAppDelete(parent *cobra.Command) *cobra.Command {
+	cmd := &cobra.Command{
+		Use:          "delete NAME",
+		Short:        "delete kots apps",
+		Long:         `Delete a kots app. There is no undo for this operation, use with caution.`,
+		RunE:         r.deleteApp,
+		SilenceUsage: true,
+	}
+	parent.AddCommand(cmd)
+	cmd.Flags().BoolVarP(&r.args.deleteAppForceYes, "force", "f", false, "Skip confirmation prompt. There is no undo for this action.")
+
+	return cmd
+}
+
+func (r *runners) deleteApp(_ *cobra.Command, args []string) error {
+	log := print.NewLogger(r.w)
+	if len(args) != 1 {
+		return errors.New("missing app slug or id")
+	}
+	appName := args[0]
+
+	log.ActionWithSpinner("Fetching App")
+	app, err := r.kotsAPI.GetApp(appName)
+	if err != nil {
+		log.FinishSpinnerWithError()
+		return errors.Wrap(err, "list apps")
+	}
+	log.FinishSpinner()
+
+	apps := []types.AppAndChannels{{ App: app}}
+
+	err = print.Apps(r.w, apps)
+	if err != nil {
+		return errors.Wrap(err, "print app")
+	}
+
+	if !r.args.deleteAppForceYes {
+		answer, err := promptConfirmDelete()
+		if err != nil {
+			return errors.Wrap(err, "confirm deletion")
+		}
+
+		if answer != "yes" {
+			return errors.New("prompt declined")
+		}
+	}
+
+
+	log.ActionWithSpinner("Deleting App")
+	err = r.kotsAPI.DeleteKOTSApp(app.ID)
+	if err != nil {
+		log.FinishSpinnerWithError()
+		return errors.Wrap(err, "delete app")
+	}
+	log.FinishSpinner()
+
+	return nil
+}
+
+var templates = &promptui.PromptTemplates{
+	Prompt:  "{{ . | bold }} ",
+	Valid:   "{{ . | green }} ",
+	Invalid: "{{ . | red }} ",
+	Success: "{{ . | bold }} ",
+}
+
+func promptConfirmDelete() (string, error) {
+
+	prompt := promptui.Prompt{
+		Label:     "Delete the above listed application? There is no undo:",
+		Templates: templates,
+		Default:   "",
+		Validate: func(input string) error {
+			// "no" will exit with a "prompt declined" error, just in case they don't think to ctrl+c
+			if input == "no" || input == "yes" {
+				return nil
+			}
+			return errors.New(`only "yes" will be accepted`)
+		},
+	}
+
+	for {
+		result, err := prompt.Run()
+		if err != nil {
+			if err == promptui.ErrInterrupt {
+				return "", errors.New("interrupted")
+			}
+			continue
+		}
+
+		return result, nil
+	}
+}

cli/cmd/app_ls.go

@@ -0,0 +1,43 @@
+package cmd
+
+import (
+	"github.com/pkg/errors"
+	"github.com/replicatedhq/replicated/cli/print"
+	"github.com/replicatedhq/replicated/pkg/types"
+	"github.com/spf13/cobra"
+	"strings"
+)
+
+func (r *runners) InitAppList(parent *cobra.Command) *cobra.Command {
+	cmd := &cobra.Command{
+		Use:          "ls [NAME]",
+		Short:        "list kots apps",
+		Long:         `list kots apps, or a single app by name`,
+		RunE:         r.listApps,
+		SilenceUsage: true,
+	}
+	parent.AddCommand(cmd)
+
+	return cmd
+}
+
+func (r *runners) listApps(_ *cobra.Command, args []string) error {
+
+	kotsApps, err := r.kotsAPI.ListApps()
+	if err != nil {
+		return errors.Wrap(err, "list apps")
+	}
+
+	if len(args) == 0 {
+		return print.Apps(r.w, kotsApps)
+	}
+
+	appSearch := args[0]
+	var apps []types.AppAndChannels
+	for _, app := range kotsApps {
+		if strings.Contains(app.App.ID, appSearch) || strings.Contains(app.App.Slug, appSearch) {
+			apps = append(apps, app)
+		}
+	}
+	return print.Apps(r.w, apps)
+}

cli/cmd/apps.go

@@ -0,0 +1,16 @@
+package cmd
+
+import (
+	"github.com/spf13/cobra"
+)
+
+func (r *runners) InitAppCommand(parent *cobra.Command) *cobra.Command {
+	cmd := &cobra.Command{
+		Use:   "app",
+		Short: "Manage apps",
+		Long:  `app can be used to list apps and create new apps`,
+	}
+	parent.AddCommand(cmd)
+
+	return cmd
+}

cli/cmd/release_create.go

@@ -409,13 +409,6 @@ func readYAMLDir(yamlDir string) (string, error) {
 
 func promptForConfirm() (string, error) {
 
-	templates := &promptui.PromptTemplates{
-		Prompt:  "{{ . | bold }} ",
-		Valid:   "{{ . | green }} ",
-		Invalid: "{{ . | red }} ",
-		Success: "{{ . | bold }} ",
-	}
-
 	prompt := promptui.Prompt{
 		Label:     "Create with these properties? (default Yes) [Y/n]",
 		Templates: templates,
@@ -433,7 +426,7 @@ func promptForConfirm() (string, error) {
 		result, err := prompt.Run()
 		if err != nil {
 			if err == promptui.ErrInterrupt {
-				os.Exit(-1)
+				return "", errors.New("interrupted")
 			}
 			continue
 		}

cli/cmd/root.go

@@ -192,9 +192,14 @@ func Execute(rootCmd *cobra.Command, stdin io.Reader, stdout io.Writer, stderr i
 	runCmds.InitEnterpriseInstallerRM(enterpriseInstallerCmd)
 	runCmds.InitEnterpriseInstallerAssign(enterpriseInstallerCmd)
 
+	appCmd := runCmds.InitAppCommand(runCmds.rootCmd)
+	runCmds.InitAppList(appCmd)
+	runCmds.InitAppCreate(appCmd)
+	runCmds.InitAppDelete(appCmd)
+
 	runCmds.rootCmd.SetUsageTemplate(rootCmdUsageTmpl)
 
-	prerunCommand := func(cmd *cobra.Command, args []string) error {
+	preRunSetupAPIs := func(_ *cobra.Command, _ []string) error {
 		if apiToken == "" {
 			apiToken = os.Getenv("REPLICATED_API_TOKEN")
 			if apiToken == "" {
@@ -218,33 +223,40 @@ func Execute(rootCmd *cobra.Command, stdin io.Reader, stdout io.Writer, stderr i
 
 		commonAPI := client.NewClient(platformOrigin, graphqlOrigin, apiToken, kurlDotSHOrigin)
 		runCmds.api = commonAPI
+		return nil
+	}
+
+	prerunCommand := func(cmd *cobra.Command, args []string) error {
+		if err := preRunSetupAPIs(cmd, args); err != nil {
+			return errors.Wrap(err, "set up APIs")
+		}
 
 		if appSlugOrID == "" {
 			appSlugOrID = os.Getenv("REPLICATED_APP")
 		}
 
-		appType, err := commonAPI.GetAppType(appSlugOrID)
+		appType, err := runCmds.api.GetAppType(appSlugOrID)
 		if err != nil {
 			return err
 		}
 		runCmds.appType = appType
 
 		if appType == "platform" {
-			app, err := platformAPI.GetApp(appSlugOrID)
+			app, err := runCmds.platformAPI.GetApp(appSlugOrID)
 			if err != nil {
 				return err
 			}
 			runCmds.appID = app.Id
 			runCmds.appSlug = app.Slug
 		} else if appType == "ship" {
-			app, err := shipAPI.GetApp(appSlugOrID)
+			app, err := runCmds.shipAPI.GetApp(appSlugOrID)
 			if err != nil {
 				return err
 			}
 			runCmds.appID = app.ID
 			runCmds.appSlug = app.Slug
 		} else if appType == "kots" {
-			app, err := kotsAPI.GetApp(appSlugOrID)
+			app, err := runCmds.kotsAPI.GetApp(appSlugOrID)
 			if err != nil {
 				return err
 			}
@@ -255,12 +267,14 @@ func Execute(rootCmd *cobra.Command, stdin io.Reader, stdout io.Writer, stderr i
 		return nil
 	}
 
+
 	channelCmd.PersistentPreRunE = prerunCommand
 	releaseCmd.PersistentPreRunE = prerunCommand
 	collectorsCmd.PersistentPreRunE = prerunCommand
 	entitlementsCmd.PersistentPreRunE = prerunCommand
 	customersCmd.PersistentPreRunE = prerunCommand
 	installerCmd.PersistentPreRunE = prerunCommand
+	appCmd.PersistentPreRunE = preRunSetupAPIs
 
 	runCmds.rootCmd.AddCommand(Version())
 

cli/cmd/runner.go

@@ -61,15 +61,15 @@ type runnerArgs struct {
 	createReleasePromoteVersion       string
 	createReleasePromoteEnsureChannel bool
 	// Add Create Release Lint
-	createReleaseLint			      bool
-	lintReleaseYamlDir                string
-	lintReleaseFailOn                 string
-	releaseOptional                   bool
-	releaseNotes                      string
-	releaseVersion                    string
-	updateReleaseYaml                 string
-	updateReleaseYamlDir              string
-	updateReleaseYamlFile             string
+	createReleaseLint     bool
+	lintReleaseYamlDir    string
+	lintReleaseFailOn     string
+	releaseOptional       bool
+	releaseNotes          string
+	releaseVersion        string
+	updateReleaseYaml     string
+	updateReleaseYamlDir  string
+	updateReleaseYamlFile string
 
 	entitlementsAPIServer                string
 	entitlementsVerbose                  bool
@@ -144,4 +144,5 @@ type runnerArgs struct {
 	releaseDownloadDest               string
 	createInstallerAutoDefaults       bool
 	createInstallerAutoDefaultsAccept bool
+	deleteAppForceYes                 bool
 }

cli/print/apps.go

@@ -4,25 +4,21 @@ import (
 	"text/tabwriter"
 	"text/template"
 
-	apps "github.com/replicatedhq/replicated/gen/go/v1"
+	"github.com/replicatedhq/replicated/pkg/types"
 )
 
-var appsTmplSrc = `ID	NAME	SCHEDULER
+var appsTmplSrc = `ID	NAME	SLUG	SCHEDULER
 {{ range . -}}
-{{ .ID }}	{{ .Name }}	{{ .Scheduler }}
+{{ .ID }}	{{ .Name }}	{{ .Slug}}	{{ .Scheduler }}
 {{ end }}`
 
 var appsTmpl = template.Must(template.New("apps").Funcs(funcs).Parse(appsTmplSrc))
 
-func Apps(w *tabwriter.Writer, apps []apps.AppAndChannels) error {
-	as := make([]map[string]interface{}, len(apps))
+func Apps(w *tabwriter.Writer, apps []types.AppAndChannels) error {
+	var as []*types.App
 
-	for i, a := range apps {
-		as[i] = map[string]interface{}{
-			"ID":        a.App.Id,
-			"Name":      a.App.Name,
-			"Scheduler": a.App.Scheduler,
-		}
+	for _, a := range apps {
+		as = append(as, a.App)
 	}
 
 	if err := appsTmpl.Execute(w, as); err != nil {