Move terminal colors to global constants (#913)

* added new theme

* change pkg to use theme colors

* revert merge

* revert logger

* cmd utils update theme colors

* list_components update theme colors

* list_stacks update theme colors

* terraform_clean update theme colors

* atmos update theme colors

* tui update theme colors

* exec update theme colors

* stacks update theme colors

* update pkgs for new theme colors

* Revert "update pkgs for new theme colors"

This reverts commit 7c63ea3.

* hex colors

* update internal/exec/atmos.go for new theme colors

---------

Co-authored-by: Andriy Knysh <[email protected]>

cmd/cmd_utils.go

@@ -9,13 +9,13 @@ import (
 	"strings"
 	"time"
 
-	"github.com/fatih/color"
 	"github.com/spf13/cobra"
 
 	e "github.com/cloudposse/atmos/internal/exec"
 	tuiUtils "github.com/cloudposse/atmos/internal/tui/utils"
 	cfg "github.com/cloudposse/atmos/pkg/config"
 	"github.com/cloudposse/atmos/pkg/schema"
+	"github.com/cloudposse/atmos/pkg/ui/theme"
 	u "github.com/cloudposse/atmos/pkg/utils"
 	"github.com/cloudposse/atmos/pkg/version"
 )
@@ -448,8 +448,8 @@ func checkAtmosConfig(opts ...AtmosValidateOption) {
 
 // printMessageForMissingAtmosConfig prints Atmos logo and instructions on how to configure and start using Atmos
 func printMessageForMissingAtmosConfig(atmosConfig schema.AtmosConfiguration) {
-	c1 := color.New(color.FgCyan)
-	c2 := color.New(color.FgGreen)
+	c1 := theme.Colors.Info
+	c2 := theme.Colors.Success
 
 	fmt.Println()
 	err := tuiUtils.PrintStyledText("ATMOS")

cmd/list_components.go

@@ -10,6 +10,7 @@ import (
 	"github.com/cloudposse/atmos/pkg/config"
 	l "github.com/cloudposse/atmos/pkg/list"
 	"github.com/cloudposse/atmos/pkg/schema"
+	"github.com/cloudposse/atmos/pkg/ui/theme"
 	u "github.com/cloudposse/atmos/pkg/utils"
 )
 
@@ -35,23 +36,23 @@ var listComponentsCmd = &cobra.Command{
 		configAndStacksInfo := schema.ConfigAndStacksInfo{}
 		atmosConfig, err := config.InitCliConfig(configAndStacksInfo, true)
 		if err != nil {
-			u.PrintMessageInColor(fmt.Sprintf("Error initializing CLI config: %v", err), color.New(color.FgRed))
+			u.PrintMessageInColor(fmt.Sprintf("Error initializing CLI config: %v", err), theme.Colors.Error)
 			return
 		}
 
 		stacksMap, err := e.ExecuteDescribeStacks(atmosConfig, "", nil, nil, nil, false, false, false)
 		if err != nil {
-			u.PrintMessageInColor(fmt.Sprintf("Error describing stacks: %v", err), color.New(color.FgRed))
+			u.PrintMessageInColor(fmt.Sprintf("Error describing stacks: %v", err), theme.Colors.Error)
 			return
 		}
 
 		output, err := l.FilterAndListComponents(stackFlag, stacksMap)
 		if err != nil {
-			u.PrintMessageInColor(fmt.Sprintf("Error: %v"+"\n", err), color.New(color.FgYellow))
+			u.PrintMessageInColor(fmt.Sprintf("Error: %v"+"\n", err), theme.Colors.Warning)
 			return
 		}
 
-		u.PrintMessageInColor(output, color.New(color.FgGreen))
+		u.PrintMessageInColor(output, theme.Colors.Success)
 	},
 }
 

cmd/list_stacks.go

@@ -3,13 +3,13 @@ package cmd
 import (
 	"fmt"
 
-	"github.com/fatih/color"
 	"github.com/spf13/cobra"
 
 	e "github.com/cloudposse/atmos/internal/exec"
 	"github.com/cloudposse/atmos/pkg/config"
 	l "github.com/cloudposse/atmos/pkg/list"
 	"github.com/cloudposse/atmos/pkg/schema"
+	"github.com/cloudposse/atmos/pkg/ui/theme"
 	u "github.com/cloudposse/atmos/pkg/utils"
 )
 
@@ -30,22 +30,22 @@ var listStacksCmd = &cobra.Command{
 		configAndStacksInfo := schema.ConfigAndStacksInfo{}
 		atmosConfig, err := config.InitCliConfig(configAndStacksInfo, true)
 		if err != nil {
-			u.PrintMessageInColor(fmt.Sprintf("Error initializing CLI config: %v", err), color.New(color.FgRed))
+			u.PrintMessageInColor(fmt.Sprintf("Error initializing CLI config: %v", err), theme.Colors.Error)
 			return
 		}
 
 		stacksMap, err := e.ExecuteDescribeStacks(atmosConfig, "", nil, nil, nil, false, false, false)
 		if err != nil {
-			u.PrintMessageInColor(fmt.Sprintf("Error describing stacks: %v", err), color.New(color.FgRed))
+			u.PrintMessageInColor(fmt.Sprintf("Error describing stacks: %v", err), theme.Colors.Error)
 			return
 		}
 
 		output, err := l.FilterAndListStacks(stacksMap, componentFlag)
 		if err != nil {
-			u.PrintMessageInColor(fmt.Sprintf("Error filtering stacks: %v", err), color.New(color.FgRed))
+			u.PrintMessageInColor(fmt.Sprintf("Error filtering stacks: %v", err), theme.Colors.Error)
 			return
 		}
-		u.PrintMessageInColor(output, color.New(color.FgGreen))
+		u.PrintMessageInColor(output, theme.Colors.Success)
 	},
 }
 

cmd/validate_component.go

@@ -3,11 +3,11 @@ package cmd
 import (
 	"fmt"
 
-	"github.com/fatih/color"
 	"github.com/spf13/cobra"
 
 	e "github.com/cloudposse/atmos/internal/exec"
 	"github.com/cloudposse/atmos/pkg/schema"
+	"github.com/cloudposse/atmos/pkg/ui/theme"
 	u "github.com/cloudposse/atmos/pkg/utils"
 )
 
@@ -30,7 +30,7 @@ var validateComponentCmd = &cobra.Command{
 		}
 
 		m := fmt.Sprintf("component '%s' in stack '%s' validated successfully\n", component, stack)
-		u.PrintMessageInColor(m, color.New(color.FgGreen))
+		u.PrintMessageInColor(m, theme.Colors.Success)
 	},
 }
 

cmd/validate_stacks.go

@@ -1,11 +1,11 @@
 package cmd
 
 import (
-	"github.com/fatih/color"
 	"github.com/spf13/cobra"
 
 	e "github.com/cloudposse/atmos/internal/exec"
 	"github.com/cloudposse/atmos/pkg/schema"
+	"github.com/cloudposse/atmos/pkg/ui/theme"
 	u "github.com/cloudposse/atmos/pkg/utils"
 )
 
@@ -25,7 +25,7 @@ var ValidateStacksCmd = &cobra.Command{
 			u.LogErrorAndExit(schema.AtmosConfiguration{}, err)
 		}
 
-		u.PrintMessageInColor("all stacks validated successfully\n", color.New(color.FgGreen))
+		u.PrintMessageInColor("all stacks validated successfully\n", theme.Colors.Success)
 	},
 }
 

internal/exec/atmos.go

@@ -5,12 +5,12 @@ import (
 	"os"
 	"strings"
 
-	"github.com/fatih/color"
 	"github.com/samber/lo"
 
 	tui "github.com/cloudposse/atmos/internal/tui/atmos"
 	cfg "github.com/cloudposse/atmos/pkg/config"
 	"github.com/cloudposse/atmos/pkg/schema"
+	"github.com/cloudposse/atmos/pkg/ui/theme"
 	u "github.com/cloudposse/atmos/pkg/utils"
 )
 
@@ -99,7 +99,7 @@ func ExecuteAtmosCmd() error {
 	fmt.Println()
 	u.PrintMessageInColor(fmt.Sprintf(
 		"Executing command:\n"+os.Args[0]+" %s %s --stack %s\n", selectedCommand, selectedComponent, selectedStack),
-		color.New(color.FgCyan),
+		theme.Colors.Info,
 	)
 	fmt.Println()
 
@@ -134,7 +134,7 @@ func ExecuteAtmosCmd() error {
 		}
 
 		m := fmt.Sprintf("component '%s' in stack '%s' validated successfully\n", selectedComponent, selectedStack)
-		u.PrintMessageInColor(m, color.New(color.FgGreen))
+		u.PrintMessageInColor(m, theme.Colors.Success)
 		return nil
 	}
 

internal/exec/terraform_clean.go

@@ -9,6 +9,7 @@ import (
 	"github.com/charmbracelet/huh"
 	"github.com/charmbracelet/lipgloss"
 	"github.com/cloudposse/atmos/pkg/schema"
+	"github.com/cloudposse/atmos/pkg/ui/theme"
 	u "github.com/cloudposse/atmos/pkg/utils"
 )
 
@@ -256,7 +257,7 @@ func confirmDeleteTerraformLocal(message string) (confirm bool, err error) {
 func DeletePathTerraform(fullPath string, objectName string) error {
 	fileInfo, err := os.Lstat(fullPath)
 	if os.IsNotExist(err) {
-		xMark := lipgloss.NewStyle().Foreground(lipgloss.Color("9")).SetString("x")
+		xMark := theme.Styles.XMark
 		fmt.Printf("%s Cannot delete %s: path does not exist", xMark, objectName)
 		fmt.Println()
 		return err
@@ -267,12 +268,12 @@ func DeletePathTerraform(fullPath string, objectName string) error {
 	// Proceed with deletion
 	err = os.RemoveAll(fullPath)
 	if err != nil {
-		xMark := lipgloss.NewStyle().Foreground(lipgloss.Color("9")).SetString("x")
+		xMark := theme.Styles.XMark
 		fmt.Printf("%s Error deleting %s", xMark, objectName)
 		fmt.Println()
 		return err
 	}
-	checkMark := lipgloss.NewStyle().Foreground(lipgloss.Color("42")).SetString("✓")
+	checkMark := theme.Styles.Checkmark
 	fmt.Printf("%s Deleted %s", checkMark, objectName)
 	fmt.Println()
 	return nil

internal/exec/vendor_model.go

@@ -14,6 +14,7 @@ import (
 	tea "github.com/charmbracelet/bubbletea"
 	"github.com/charmbracelet/lipgloss"
 	"github.com/cloudposse/atmos/pkg/schema"
+	"github.com/cloudposse/atmos/pkg/ui/theme"
 	u "github.com/cloudposse/atmos/pkg/utils"
 	"github.com/hashicorp/go-getter"
 	cp "github.com/otiai10/copy"
@@ -67,11 +68,11 @@ type modelVendor struct {
 }
 
 var (
-	currentPkgNameStyle = lipgloss.NewStyle().Foreground(lipgloss.Color("211"))
+	currentPkgNameStyle = theme.Styles.PackageName
 	doneStyle           = lipgloss.NewStyle().Margin(1, 2)
-	checkMark           = lipgloss.NewStyle().Foreground(lipgloss.Color("42")).SetString("✓")
-	xMark               = lipgloss.NewStyle().Foreground(lipgloss.Color("9")).SetString("x")
-	grayColor           = lipgloss.NewStyle().Foreground(lipgloss.Color("241"))
+	checkMark           = theme.Styles.Checkmark
+	xMark               = theme.Styles.XMark
+	grayColor           = theme.Styles.GrayText
 )
 
 func newModelAtmosVendorInternal(pkgs []pkgAtmosVendor, dryRun bool, atmosConfig schema.AtmosConfiguration) (modelVendor, error) {
@@ -81,7 +82,7 @@ func newModelAtmosVendorInternal(pkgs []pkgAtmosVendor, dryRun bool, atmosConfig
 		progress.WithoutPercentage(),
 	)
 	s := spinner.New()
-	s.Style = lipgloss.NewStyle().Foreground(lipgloss.Color("63"))
+	s.Style = theme.Styles.Link
 	if len(pkgs) == 0 {
 		return modelVendor{done: true}, nil
 	}

internal/exec/vendor_model_component.go

@@ -11,8 +11,8 @@ import (
 	"github.com/charmbracelet/bubbles/progress"
 	"github.com/charmbracelet/bubbles/spinner"
 	tea "github.com/charmbracelet/bubbletea"
-	"github.com/charmbracelet/lipgloss"
 	"github.com/cloudposse/atmos/pkg/schema"
+	"github.com/cloudposse/atmos/pkg/ui/theme"
 	"github.com/hashicorp/go-getter"
 	cp "github.com/otiai10/copy"
 )
@@ -37,7 +37,7 @@ func newModelComponentVendorInternal(pkgs []pkgComponentVendor, dryRun bool, atm
 		progress.WithoutPercentage(),
 	)
 	s := spinner.New()
-	s.Style = lipgloss.NewStyle().Foreground(lipgloss.Color("63"))
+	s.Style = theme.Styles.Link
 	if len(pkgs) == 0 {
 		return modelVendor{done: true}, nil
 	}

internal/exec/workflow_utils.go

@@ -7,12 +7,12 @@ import (
 	"sort"
 	"strings"
 
-	"github.com/fatih/color"
 	"github.com/pkg/errors"
 	"github.com/samber/lo"
 
 	w "github.com/cloudposse/atmos/internal/tui/workflow"
 	"github.com/cloudposse/atmos/pkg/schema"
+	"github.com/cloudposse/atmos/pkg/ui/theme"
 	u "github.com/cloudposse/atmos/pkg/utils"
 )
 
@@ -109,12 +109,12 @@ func ExecuteWorkflow(
 			workflowFileName := filepath.Base(workflowPath)
 			workflowFileName = strings.TrimSuffix(workflowFileName, filepath.Ext(workflowFileName))
 
-			failedMsg := color.New(color.FgRed).Sprintf("\nStep '%s' failed!", step.Name)
+			failedMsg := theme.Colors.Error.Sprintf("\nStep '%s' failed!", step.Name)
 
 			u.LogDebug(atmosConfig, fmt.Sprintf("\nCommand failed: %s", command))
 			u.LogDebug(atmosConfig, fmt.Sprintf("Error: %v", err))
 
-			resumeMsg := color.New(color.FgGreen).Sprintf(
+			resumeMsg := theme.Colors.Success.Sprintf(
 				"\nTo resume the workflow from this step, run:\natmos workflow %s -f %s --from-step %s",
 				workflow,
 				workflowFileName,
@@ -256,7 +256,7 @@ func ExecuteWorkflowUI(atmosConfig schema.AtmosConfiguration) (string, string, s
 	fmt.Println()
 	u.PrintMessageInColor(fmt.Sprintf(
 		"Executing command:\n"+os.Args[0]+" workflow %s --file %s --from-step \"%s\"\n", selectedWorkflow, selectedWorkflowFile, selectedWorkflowStep),
-		color.New(color.FgCyan),
+		theme.Colors.Info,
 	)
 	fmt.Println()
 

internal/tui/atmos/column.go

@@ -4,6 +4,7 @@ import (
 	"github.com/charmbracelet/bubbles/list"
 	tea "github.com/charmbracelet/bubbletea"
 	"github.com/charmbracelet/lipgloss"
+	"github.com/cloudposse/atmos/pkg/ui/theme"
 	mouseZone "github.com/lrstanley/bubblezone"
 )
 
@@ -72,7 +73,7 @@ func (c *columnView) getStyle() lipgloss.Style {
 	s := lipgloss.NewStyle().Padding(1, 2).Height(c.height).Width(c.width)
 
 	if c.Focused() {
-		s = s.Border(lipgloss.RoundedBorder()).BorderForeground(lipgloss.Color("62"))
+		s = s.Border(lipgloss.RoundedBorder()).BorderForeground(lipgloss.Color(theme.ColorBorder))
 	} else {
 		s = s.Border(lipgloss.HiddenBorder())
 	}

internal/tui/atmos/list_item.go

@@ -8,11 +8,12 @@ import (
 	"github.com/charmbracelet/bubbles/list"
 	tea "github.com/charmbracelet/bubbletea"
 	"github.com/charmbracelet/lipgloss"
+	"github.com/cloudposse/atmos/pkg/ui/theme"
 )
 
 var (
 	itemStyle         = lipgloss.NewStyle().PaddingLeft(4)
-	selectedItemStyle = lipgloss.NewStyle().PaddingLeft(2).Foreground(lipgloss.Color("#10ff10"))
+	selectedItemStyle = theme.Styles.SelectedItem
 )
 
 type listItem string

internal/tui/templates/templater.go

@@ -7,6 +7,7 @@ import (
 	"strings"
 
 	"github.com/charmbracelet/lipgloss"
+	"github.com/cloudposse/atmos/pkg/ui/theme"
 	"github.com/spf13/cobra"
 	"github.com/spf13/pflag"
 	"golang.org/x/term"
@@ -19,18 +20,14 @@ type Templater struct {
 
 // commandStyle defines the styles for command formatting
 var (
-	commandNameStyle = lipgloss.NewStyle().
-				Foreground(lipgloss.Color("2")). // Green color for command name
-				Bold(true)
+	commandNameStyle = theme.Styles.CommandName
+	commandDescStyle = theme.Styles.Description
 
-	commandDescStyle = lipgloss.NewStyle().
-				Foreground(lipgloss.Color("7")) // White color for description
-
-	commandUnsupportedNameStyle = lipgloss.NewStyle().
-					Foreground(lipgloss.Color("8")).
+	commandUnsupportedNameStyle = theme.Styles.CommandName.
+					Foreground(lipgloss.Color(theme.ColorGray)).
 					Bold(true)
-	commandUnsupportedDescStyle = lipgloss.NewStyle().
-					Foreground(lipgloss.Color("8"))
+	commandUnsupportedDescStyle = theme.Styles.Description.
+					Foreground(lipgloss.Color(theme.ColorGray))
 )
 
 // formatCommand returns a styled string for a command and its description

internal/tui/workflow/column.go

@@ -4,9 +4,9 @@ import (
 	"github.com/charmbracelet/bubbles/list"
 	tea "github.com/charmbracelet/bubbletea"
 	"github.com/charmbracelet/lipgloss"
-	mouseZone "github.com/lrstanley/bubblezone"
-
 	codeview "github.com/cloudposse/atmos/internal/tui/components/code_view"
+	"github.com/cloudposse/atmos/pkg/ui/theme"
+	mouseZone "github.com/lrstanley/bubblezone"
 )
 
 const (
@@ -142,7 +142,7 @@ func (c *columnView) getStyle() lipgloss.Style {
 	s := lipgloss.NewStyle().Padding(0).Margin(2).Height(c.height).Width(c.width)
 
 	if c.Focused() {
-		s = s.Border(lipgloss.RoundedBorder()).BorderForeground(lipgloss.Color("62"))
+		s = s.Border(lipgloss.RoundedBorder()).BorderForeground(lipgloss.Color(theme.ColorBorder))
 	} else {
 		s = s.Border(lipgloss.HiddenBorder())
 	}