alpha: plugin list and update, app deployment info

Author: 23doors

.chglog/CHANGELOG.tpl.md

@@ -0,0 +1,40 @@
+# {{ .Info.Title }}
+{{ range .Versions }}
+## {{ if .Tag.Previous }}[{{ .Tag.Name }}]({{ $.Info.RepositoryURL }}/compare/{{ .Tag.Previous.Name }}...{{ .Tag.Name }}){{ else }}{{ .Tag.Name }}{{ end }}
+
+> {{ ternary now .Tag.Date (eq (.Tag.Date | datetime "2006") "0001") | datetime "2006-01-02" }}
+
+{{ range .CommitGroups -}}
+### {{ .Title }}
+
+{{ range .Commits -}}
+* [[{{ .Hash.Short }}]({{ $.Info.RepositoryURL }}/commit/{{ .Hash.Long }})] {{ if .Scope }}**{{ .Scope }}:** {{ end }}{{ .Subject }}
+{{ end }}
+{{ end -}}
+
+{{- if .RevertCommits -}}
+### Reverts
+
+{{ range .RevertCommits -}}
+* {{ .Revert.Header }}
+{{ end }}
+{{ end -}}
+
+{{- if .MergeCommits -}}
+### Pull Requests
+
+{{ range .MergeCommits -}}
+* {{ .Header }}
+{{ end }}
+{{ end -}}
+
+{{- if .NoteGroups -}}
+{{ range .NoteGroups -}}
+### {{ .Title }}
+
+{{ range .Notes }}
+{{ .Body }}
+{{ end }}
+{{ end -}}
+{{ end -}}
+{{ end -}}

.gitignore

@@ -1,5 +1,5 @@
 bin/
 vendor/
 outblocks-cli
-example/
+example*/
 .outblocks

.semverbot.toml

@@ -12,5 +12,5 @@ mode = "auto"
 
 [semver.detection]
 patch = ["fix/", "[fix]", "fix:"]
-minor = ["feature/", "[feature]", "feat:"]
+minor = ["feature/", "[feature]", "feat:", "feat/"]
 major = ["release/", "[release]", "release:"]

cmd/deploy.go

@@ -28,6 +28,7 @@ func (e *Executor) newDeployCmd() *cobra.Command {
 
 	f := cmd.Flags()
 	f.BoolVar(&opts.Verify, "verify", false, "verify existing resources")
+	f.BoolVar(&opts.Destroy, "destroy", false, "destroy all existing resources")
 
 	return cmd
 }

cmd/executor_config.go

@@ -46,7 +46,7 @@ func (e *Executor) loadPlugins(ctx context.Context, cfg *config.Project) error {
 	pluginsToDownload := make(map[int]*config.Plugin)
 
 	for i, plug := range cfg.Plugins {
-		plugin, err := e.loader.LoadPlugin(plug.Name, plug.Source, plug.VerRange(), cfg.PluginLock(plug))
+		plugin, err := e.loader.LoadPlugin(ctx, plug.Name, plug.Source, plug.VerRange(), cfg.PluginLock(plug))
 		if err != nil {
 			if err != plugins.ErrPluginNotFound {
 				return err
@@ -58,22 +58,26 @@ func (e *Executor) loadPlugins(ctx context.Context, cfg *config.Project) error {
 		}
 
 		plugs[i] = plugin
+
+		plug.SetLoaded(plugin)
 	}
 
 	if len(pluginsToDownload) != 0 {
-		prog, _ := e.log.ProgressBar().WithTotal(len(pluginsToDownload)).WithTitle("Downloading plugins").Start()
+		prog, _ := e.log.ProgressBar().WithTotal(len(pluginsToDownload)).WithTitle("Downloading plugins...").Start()
 
 		for i, plug := range pluginsToDownload {
-			prog.Title = fmt.Sprintf("Downloading plugin '%s'", plug.Name)
+			title := fmt.Sprintf("Downloading plugin '%s'", plug.Name)
 			if plug.Version != "" {
-				prog.Title += fmt.Sprintf(" with version: %s", plug.Version)
+				title += fmt.Sprintf(" with version: %s", plug.Version)
 			}
 
-			prog.Add(0) // force title update
+			prog.UpdateTitle(title)
 
 			plugin, err := e.loader.DownloadPlugin(ctx, plug.Name, plug.VerRange(), plug.Source, cfg.PluginLock(plug))
 			plugs[i] = plugin
 
+			plug.SetLoaded(plugin)
+
 			if err != nil {
 				_, _ = prog.Stop()
 
@@ -83,8 +87,6 @@ func (e *Executor) loadPlugins(ctx context.Context, cfg *config.Project) error {
 			prog.Increment()
 			pterm.Success.Printf("Downloaded plugin '%s' at version: %s\n", plug.Name, plugin.Version)
 		}
-
-		_, _ = prog.Stop()
 	}
 
 	// Normalize and start plugins.
@@ -104,7 +106,7 @@ func (e *Executor) loadPlugins(ctx context.Context, cfg *config.Project) error {
 		}
 	}
 
-	cfg.SetPlugins(plugs)
+	cfg.SetLoadedPlugins(plugs)
 
 	return nil
 }

cmd/plugins.go

@@ -0,0 +1,60 @@
+package cmd
+
+import (
+	"github.com/outblocks/outblocks-cli/pkg/actions"
+	"github.com/outblocks/outblocks-cli/pkg/config"
+	"github.com/spf13/cobra"
+)
+
+func (e *Executor) newPluginsCmd() *cobra.Command {
+	cmd := &cobra.Command{
+		Use:     "plugins",
+		Aliases: []string{"plugin"},
+		Short:   "Plugin management",
+		Long:    `Plugin management - list, update, add or remove.`,
+		Annotations: map[string]string{
+			cmdGroupAnnotation: cmdGroupMain,
+		},
+	}
+
+	list := &cobra.Command{
+		Use:   "list",
+		Short: "List plugins",
+		Long:  `List installed plugins.`,
+		Annotations: map[string]string{
+			cmdGroupAnnotation: cmdGroupMain,
+		},
+		SilenceUsage: true,
+		RunE: func(cmd *cobra.Command, args []string) error {
+			if e.cfg == nil {
+				return config.ErrProjectConfigNotFound
+			}
+
+			return actions.NewPluginList(e.Log(), e.loader).Run(cmd.Context(), e.cfg)
+		},
+	}
+
+	update := &cobra.Command{
+		Use:   "update",
+		Short: "Update plugins",
+		Long:  `Update installed plugins to matching versions from config.`,
+		Annotations: map[string]string{
+			cmdGroupAnnotation: cmdGroupMain,
+		},
+		SilenceUsage: true,
+		RunE: func(cmd *cobra.Command, args []string) error {
+			if e.cfg == nil {
+				return config.ErrProjectConfigNotFound
+			}
+
+			return actions.NewPluginUpdate(e.Log(), e.loader).Run(cmd.Context(), e.cfg)
+		},
+	}
+
+	cmd.AddCommand(
+		list,
+		update,
+	)
+
+	return cmd
+}

cmd/root.go

@@ -269,6 +269,9 @@ func (e *Executor) newRoot() *cobra.Command {
 				return err
 			}
 
+			return nil
+		},
+		PersistentPostRunE: func(cmd *cobra.Command, args []string) error {
 			if e.cfg != nil {
 				if err := e.saveLockfile(); err != nil {
 					_ = e.cleanupProject()
@@ -294,6 +297,7 @@ func (e *Executor) newRoot() *cobra.Command {
 		e.newCompletionCmd(),
 		e.newRunCmd(),
 		e.newDeployCmd(),
+		e.newPluginsCmd(),
 		e.newForceUnlockCmd(),
 	)
 

go.mod

@@ -18,7 +18,7 @@ require (
 	github.com/mitchellh/go-homedir v1.1.0
 	github.com/mitchellh/mapstructure v1.4.1 // indirect
 	github.com/otiai10/copy v1.6.0
-	github.com/outblocks/outblocks-plugin-go v0.0.0-20210705152117-95220fb1419c
+	github.com/outblocks/outblocks-plugin-go v0.0.0-20210708180736-d828c58a8710
 	github.com/pelletier/go-toml v1.9.1 // indirect
 	github.com/pterm/pterm v0.12.22
 	github.com/spf13/afero v1.6.0 // indirect

go.sum

@@ -280,6 +280,8 @@ github.com/outblocks/outblocks-plugin-go v0.0.0-20210630200127-298dfde78363 h1:V
 github.com/outblocks/outblocks-plugin-go v0.0.0-20210630200127-298dfde78363/go.mod h1:vAn4Vv7fXTyrjNEvAVcKtKJ2Bwaqk3Oy63lqnBRIct4=
 github.com/outblocks/outblocks-plugin-go v0.0.0-20210705152117-95220fb1419c h1:cyHK1LsYbaCS0lNG2J+fjZu2Ja8hu6Qod20Q9nrj4UQ=
 github.com/outblocks/outblocks-plugin-go v0.0.0-20210705152117-95220fb1419c/go.mod h1:vAn4Vv7fXTyrjNEvAVcKtKJ2Bwaqk3Oy63lqnBRIct4=
+github.com/outblocks/outblocks-plugin-go v0.0.0-20210708180736-d828c58a8710 h1:ToXKorA7tnQaJSdc/XrexdWuiwOHSiCE4g7VvzIfQuw=
+github.com/outblocks/outblocks-plugin-go v0.0.0-20210708180736-d828c58a8710/go.mod h1:vAn4Vv7fXTyrjNEvAVcKtKJ2Bwaqk3Oy63lqnBRIct4=
 github.com/pascaldekloe/goe v0.0.0-20180627143212-57f6aae5913c/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144TG7ZOy1lc=
 github.com/pelletier/go-toml v1.2.0/go.mod h1:5z9KED0ma1S8pY6P1sdut58dfprrGBbd/94hg7ilaic=
 github.com/pelletier/go-toml v1.9.1 h1:a6qW1EVNZWH9WGI6CsYdD8WAylkoXBS5yv0XHlh17Tc=

main.go

@@ -21,6 +21,8 @@ func main() {
 
 	go func() {
 		<-ch
+
+		exec.Log().Warnln("Canceling execution... Please wait for all pending tasks to finish...")
 		cancel()
 	}()
 
@@ -33,7 +35,6 @@ func main() {
 	err := exec.Execute(ctx)
 
 	cancel()
-	close(ch)
 
 	if err != nil {
 		exec.Log().Errorln(err)