feat: pretty logs

foomo · Sep 25, 2024 · 67cc967 · 67cc967
1 parent aa0ec28
commit 67cc967
Show file tree

Hide file tree

Showing 19 changed files with 239 additions and 129 deletions.
diff --git a/cmd/actions/build.go b/cmd/actions/build.go
@@ -22,12 +22,12 @@ var buildCmd = &cobra.Command{
 	RunE: func(cmd *cobra.Command, args []string) error {
 		sq := squadron.New(cwd, "", flagFiles)
 
-		if err := sq.MergeConfigFiles(); err != nil {
+		if err := sq.MergeConfigFiles(cmd.Context()); err != nil {
 			return errors.Wrap(err, "failed to merge config files")
 		}
 
 		squadronName, unitNames := parseSquadronAndUnitNames(args)
-		if err := sq.FilterConfig(squadronName, unitNames, flagTags); err != nil {
+		if err := sq.FilterConfig(cmd.Context(), squadronName, unitNames, flagTags); err != nil {
 			return errors.Wrap(err, "failed to filter config")
 		}
 

diff --git a/cmd/actions/config.go b/cmd/actions/config.go
@@ -22,12 +22,12 @@ var configCmd = &cobra.Command{
 	RunE: func(cmd *cobra.Command, args []string) error {
 		sq := squadron.New(cwd, "", flagFiles)
 
-		if err := sq.MergeConfigFiles(); err != nil {
+		if err := sq.MergeConfigFiles(cmd.Context()); err != nil {
 			return errors.Wrap(err, "failed to merge config files")
 		}
 
 		squadronName, unitNames := parseSquadronAndUnitNames(args)
-		if err := sq.FilterConfig(squadronName, unitNames, flagTags); err != nil {
+		if err := sq.FilterConfig(cmd.Context(), squadronName, unitNames, flagTags); err != nil {
 			return errors.Wrap(err, "failed to filter config")
 		}
 

diff --git a/cmd/actions/diff.go b/cmd/actions/diff.go
@@ -19,14 +19,14 @@ var diffCmd = &cobra.Command{
 	RunE: func(cmd *cobra.Command, args []string) error {
 		sq := squadron.New(cwd, flagNamespace, flagFiles)
 
-		if err := sq.MergeConfigFiles(); err != nil {
+		if err := sq.MergeConfigFiles(cmd.Context()); err != nil {
 			return errors.Wrap(err, "failed to merge config files")
 		}
 
 		args, helmArgs := parseExtraArgs(args)
 
 		squadronName, unitNames := parseSquadronAndUnitNames(args)
-		if err := sq.FilterConfig(squadronName, unitNames, flagTags); err != nil {
+		if err := sq.FilterConfig(cmd.Context(), squadronName, unitNames, flagTags); err != nil {
 			return errors.Wrap(err, "failed to filter config")
 		}
 

diff --git a/cmd/actions/down.go b/cmd/actions/down.go
@@ -21,14 +21,14 @@ var downCmd = &cobra.Command{
 	RunE: func(cmd *cobra.Command, args []string) error {
 		sq := squadron.New(cwd, flagNamespace, flagFiles)
 
-		if err := sq.MergeConfigFiles(); err != nil {
+		if err := sq.MergeConfigFiles(cmd.Context()); err != nil {
 			return errors.Wrap(err, "failed to merge config files")
 		}
 
 		args, helmArgs := parseExtraArgs(args)
 
 		squadronName, unitNames := parseSquadronAndUnitNames(args)
-		if err := sq.FilterConfig(squadronName, unitNames, flagTags); err != nil {
+		if err := sq.FilterConfig(cmd.Context(), squadronName, unitNames, flagTags); err != nil {
 			return errors.Wrap(err, "failed to filter config")
 		}
 

diff --git a/cmd/actions/list.go b/cmd/actions/list.go
@@ -1,6 +1,8 @@
 package actions
 
 import (
+	"context"
+
 	"github.com/foomo/squadron"
 	"github.com/foomo/squadron/internal/config"
 	"github.com/pkg/errors"
@@ -30,21 +32,21 @@ var listCmd = &cobra.Command{
 	RunE: func(cmd *cobra.Command, args []string) error {
 		sq := squadron.New(cwd, "", flagFiles)
 
-		if err := sq.MergeConfigFiles(); err != nil {
+		if err := sq.MergeConfigFiles(cmd.Context()); err != nil {
 			return errors.Wrap(err, "failed to merge config files")
 		}
 
 		squadronName, unitNames := parseSquadronAndUnitNames(args)
-		if err := sq.FilterConfig(squadronName, unitNames, flagTags); err != nil {
+		if err := sq.FilterConfig(cmd.Context(), squadronName, unitNames, flagTags); err != nil {
 			return errors.Wrap(err, "failed to filter config")
 		}
 
 		var list pterm.LeveledList
 
 		// List squadrons
-		_ = sq.Config().Squadrons.Iterate(func(key string, value config.Map[*config.Unit]) error {
+		_ = sq.Config().Squadrons.Iterate(cmd.Context(), func(ctx context.Context, key string, value config.Map[*config.Unit]) error {
 			list = append(list, pterm.LeveledListItem{Level: 0, Text: key})
-			return value.Iterate(func(k string, v *config.Unit) error {
+			return value.Iterate(ctx, func(ctx context.Context, k string, v *config.Unit) error {
 				list = append(list, pterm.LeveledListItem{Level: 1, Text: k})
 				if flagWithTags && len(v.Tags) > 0 {
 					list = append(list, pterm.LeveledListItem{Level: 2, Text: "🔖: " + v.Tags.SortedString()})

diff --git a/cmd/actions/push.go b/cmd/actions/push.go
@@ -22,12 +22,12 @@ var pushCmd = &cobra.Command{
 	RunE: func(cmd *cobra.Command, args []string) error {
 		sq := squadron.New(cwd, flagNamespace, flagFiles)
 
-		if err := sq.MergeConfigFiles(); err != nil {
+		if err := sq.MergeConfigFiles(cmd.Context()); err != nil {
 			return errors.Wrap(err, "failed to merge config files")
 		}
 
 		squadronName, unitNames := parseSquadronAndUnitNames(args)
-		if err := sq.FilterConfig(squadronName, unitNames, flagTags); err != nil {
+		if err := sq.FilterConfig(cmd.Context(), squadronName, unitNames, flagTags); err != nil {
 			return errors.Wrap(err, "failed to filter config")
 		}
 

diff --git a/cmd/actions/rollback.go b/cmd/actions/rollback.go
@@ -21,14 +21,14 @@ var rollbackCmd = &cobra.Command{
 	RunE: func(cmd *cobra.Command, args []string) error {
 		sq := squadron.New(cwd, flagNamespace, flagFiles)
 
-		if err := sq.MergeConfigFiles(); err != nil {
+		if err := sq.MergeConfigFiles(cmd.Context()); err != nil {
 			return errors.Wrap(err, "failed to merge config files")
 		}
 
 		args, helmArgs := parseExtraArgs(args)
 
 		squadronName, unitNames := parseSquadronAndUnitNames(args)
-		if err := sq.FilterConfig(squadronName, unitNames, flagTags); err != nil {
+		if err := sq.FilterConfig(cmd.Context(), squadronName, unitNames, flagTags); err != nil {
 			return errors.Wrap(err, "failed to filter config")
 		}
 

diff --git a/cmd/actions/root.go b/cmd/actions/root.go
@@ -58,9 +58,12 @@ func init() {
 
 	rootCmd.AddCommand(upCmd, diffCmd, downCmd, buildCmd, pushCmd, listCmd, rollbackCmd, statusCmd, configCmd, versionCmd, completionCmd, templateCmd, postRendererCmd)
 
-	pterm.Info = *pterm.Info.WithPrefix(pterm.Prefix{Text: "INFO", Style: pterm.Info.Prefix.Style})
-	pterm.Error = *pterm.Info.WithPrefix(pterm.Prefix{Text: "ERROR", Style: pterm.Error.Prefix.Style})
-	pterm.Warning = *pterm.Info.WithPrefix(pterm.Prefix{Text: "WARNING", Style: pterm.Warning.Prefix.Style})
+	pterm.Info = *pterm.Info.WithPrefix(pterm.Prefix{Text: "⎈", Style: pterm.Info.Prefix.Style})
+	pterm.Debug = *pterm.Debug.WithPrefix(pterm.Prefix{Text: "⚒︎", Style: pterm.Debug.Prefix.Style})
+	pterm.Fatal = *pterm.Fatal.WithPrefix(pterm.Prefix{Text: "💀", Style: pterm.Fatal.Prefix.Style})
+	pterm.Error = *pterm.Error.WithPrefix(pterm.Prefix{Text: "⛌", Style: pterm.Error.Prefix.Style})
+	pterm.Warning = *pterm.Info.WithPrefix(pterm.Prefix{Text: "⚠", Style: pterm.Warning.Prefix.Style})
+	pterm.Success = *pterm.Success.WithPrefix(pterm.Prefix{Text: "✓", Style: pterm.Success.Prefix.Style})
 }
 
 func Execute() {

diff --git a/cmd/actions/status.go b/cmd/actions/status.go
@@ -20,14 +20,14 @@ var statusCmd = &cobra.Command{
 	RunE: func(cmd *cobra.Command, args []string) error {
 		sq := squadron.New(cwd, flagNamespace, flagFiles)
 
-		if err := sq.MergeConfigFiles(); err != nil {
+		if err := sq.MergeConfigFiles(cmd.Context()); err != nil {
 			return errors.Wrap(err, "failed to merge config files")
 		}
 
 		args, helmArgs := parseExtraArgs(args)
 
 		squadronName, unitNames := parseSquadronAndUnitNames(args)
-		if err := sq.FilterConfig(squadronName, unitNames, flagTags); err != nil {
+		if err := sq.FilterConfig(cmd.Context(), squadronName, unitNames, flagTags); err != nil {
 			return errors.Wrap(err, "failed to filter config")
 		}
 

diff --git a/cmd/actions/template.go b/cmd/actions/template.go
@@ -23,14 +23,14 @@ var templateCmd = &cobra.Command{
 	RunE: func(cmd *cobra.Command, args []string) error {
 		sq := squadron.New(cwd, flagNamespace, flagFiles)
 
-		if err := sq.MergeConfigFiles(); err != nil {
+		if err := sq.MergeConfigFiles(cmd.Context()); err != nil {
 			return errors.Wrap(err, "failed to merge config files")
 		}
 
 		args, helmArgs := parseExtraArgs(args)
 
 		squadronName, unitNames := parseSquadronAndUnitNames(args)
-		if err := sq.FilterConfig(squadronName, unitNames, flagTags); err != nil {
+		if err := sq.FilterConfig(cmd.Context(), squadronName, unitNames, flagTags); err != nil {
 			return errors.Wrap(err, "failed to filter config")
 		}
 

diff --git a/cmd/actions/up.go b/cmd/actions/up.go
@@ -27,14 +27,14 @@ var upCmd = &cobra.Command{
 	RunE: func(cmd *cobra.Command, args []string) error {
 		sq := squadron.New(cwd, flagNamespace, flagFiles)
 
-		if err := sq.MergeConfigFiles(); err != nil {
+		if err := sq.MergeConfigFiles(cmd.Context()); err != nil {
 			return errors.Wrap(err, "failed to merge config files")
 		}
 
 		args, helmArgs := parseExtraArgs(args)
 
 		squadronName, unitNames := parseSquadronAndUnitNames(args)
-		if err := sq.FilterConfig(squadronName, unitNames, flagTags); err != nil {
+		if err := sq.FilterConfig(cmd.Context(), squadronName, unitNames, flagTags); err != nil {
 			return errors.Wrap(err, "failed to filter config")
 		}
 

diff --git a/internal/config/config.go b/internal/config/config.go
@@ -1,6 +1,7 @@
 package config
 
 import (
+	"context"
 	"fmt"
 
 	"github.com/pkg/errors"
@@ -21,10 +22,10 @@ type Config struct {
 }
 
 // BuildDependencies returns a map of requested build dependencies
-func (c *Config) BuildDependencies() map[string]Build {
+func (c *Config) BuildDependencies(ctx context.Context) map[string]Build {
 	ret := map[string]Build{}
-	_ = c.Squadrons.Iterate(func(key string, value Map[*Unit]) error {
-		return value.Iterate(func(k string, v *Unit) error {
+	_ = c.Squadrons.Iterate(ctx, func(ctx context.Context, key string, value Map[*Unit]) error {
+		return value.Iterate(ctx, func(ctx context.Context, k string, v *Unit) error {
 			for _, build := range v.Builds {
 				for _, dependency := range build.Dependencies {
 					b, ok := c.Builds[dependency]
@@ -44,8 +45,8 @@ func (c *Config) BuildDependencies() map[string]Build {
 }
 
 // Trim delete empty squadron recursively
-func (c *Config) Trim() {
-	_ = c.Squadrons.Iterate(func(key string, value Map[*Unit]) error {
+func (c *Config) Trim(ctx context.Context) {
+	_ = c.Squadrons.Iterate(ctx, func(ctx context.Context, key string, value Map[*Unit]) error {
 		value.Trim()
 		return nil
 	})

diff --git a/internal/config/map.go b/internal/config/map.go
@@ -1,6 +1,7 @@
 package config
 
 import (
+	"context"
 	"reflect"
 	"slices"
 	"sort"
@@ -89,12 +90,15 @@ func (m Map[T]) FilterFn(handler func(key string, value T) bool) error {
 	return nil
 }
 
-func (m Map[T]) Iterate(handler func(key string, value T) error) error {
+func (m Map[T]) Iterate(ctx context.Context, handler func(ctx context.Context, key string, value T) error) error {
 	if len(m) == 0 {
 		return nil
 	}
 	for _, key := range m.Keys() {
-		if err := handler(key, m[key]); err != nil {
+		if err := ctx.Err(); err != nil {
+			return err
+		}
+		if err := handler(ctx, key, m[key]); err != nil {
 			return err
 		}
 	}

diff --git a/internal/config/unit.go b/internal/config/unit.go
@@ -5,12 +5,12 @@ import (
 	"context"
 	"fmt"
 	"path"
+	"sort"
 	"strings"
 
 	"github.com/foomo/squadron/internal/helm"
 	"github.com/foomo/squadron/internal/util"
 	"github.com/pkg/errors"
-	"github.com/pterm/pterm"
 	yamlv2 "gopkg.in/yaml.v2"
 )
 
@@ -44,34 +44,13 @@ func (u *Unit) ValuesYAML(global, vars map[string]any) ([]byte, error) {
 	return yamlv2.Marshal(values)
 }
 
-func (u *Unit) Build(ctx context.Context, squadron, unit string, args []string) (string, error) {
-	var i int
-	for _, build := range u.Builds {
-		i++
-		pterm.Info.Printfln("[%d/%d] Building %s/%s", i, len(u.Builds), squadron, unit)
-		pterm.FgGray.Printfln("└ %s:%s", build.Image, build.Tag)
-		if out, err := build.Build(ctx, args); err != nil {
-			pterm.Error.Printfln("[%d/%d] Failed to build squadron unit %s/%s", i, len(u.Builds), squadron, unit)
-			pterm.FgGray.Printfln("└ %s:%s", build.Image, build.Tag)
-			return out, err
-		}
-	}
-	return "", nil
-}
-
-func (u *Unit) Push(ctx context.Context, squadron, unit string, args []string) (string, error) {
-	var i int
-	for _, build := range u.Builds {
-		i++
-		pterm.Info.Printfln("[%d/%d] Pushing %s/%s", i, len(u.Builds), squadron, unit)
-		pterm.FgGray.Printfln("└ %s:%s", build.Image, build.Tag)
-		if out, err := build.Push(ctx, args); err != nil {
-			pterm.Error.Printfln("[%d/%d] Failed to push %s/%s", i, len(u.Builds), squadron, unit)
-			pterm.FgGray.Printfln("└ %s:%s", build.Image, build.Tag)
-			return out, err
-		}
+func (u *Unit) BuildNames() []string {
+	ret := make([]string, 0, len(u.Builds))
+	for name := range u.Builds {
+		ret = append(ret, name)
 	}
-	return "", nil
+	sort.Strings(ret)
+	return ret
 }
 
 func (u *Unit) Template(ctx context.Context, name, squadron, unit, namespace string, global, vars map[string]any, helmArgs []string) ([]byte, error) {

diff --git a/internal/template/format.go b/internal/template/format.go
@@ -1,9 +1,30 @@
 package template
 
 import (
+	"fmt"
 	"strings"
 )
 
+func quote(str ...any) string {
+	out := make([]string, 0, len(str))
+	for _, s := range str {
+		if s != nil {
+			out = append(out, fmt.Sprintf("%v", s))
+		}
+	}
+	return "'" + strings.Join(out, " ") + "'"
+}
+
+func quoteAll(str ...any) string {
+	out := make([]string, 0, len(str))
+	for _, s := range str {
+		if s != nil {
+			out = append(out, fmt.Sprintf("'%v'", s))
+		}
+	}
+	return strings.Join(out, " ")
+}
+
 func indent(spaces int, v string) string {
 	pad := strings.Repeat("  ", spaces)
 	return strings.ReplaceAll(v, "\n", "\n"+pad)

diff --git a/internal/template/template.go b/internal/template/template.go
@@ -14,6 +14,8 @@ func ExecuteFileTemplate(ctx context.Context, text string, templateVars any, err
 	delete(funcMap, "expandenv")
 
 	funcMap["env"] = env
+	funcMap["quote"] = quote
+	funcMap["quoteAll"] = quoteAll
 	funcMap["envDefault"] = envDefault
 
 	// deprecated