Merge pull request #98 from foomo/fix-status

Fix status

Author: franklinkim

.github/workflows/pr.yml

@@ -25,7 +25,7 @@ jobs:
         with:
           token: ${{ secrets.GITHUB_TOKEN }}
 
-      - uses: golangci/golangci-lint-action@v7
+      - uses: golangci/golangci-lint-action@v8
         with:
           version: latest
 

.golangci.yml

@@ -1,8 +1,7 @@
 version: "2"
 run:
   go: 1.24.1
-  build-tags:
-    - safe
+  build-tags: [safe]
   modules-download-mode: readonly
 linters:
   default: none
@@ -121,7 +120,8 @@ linters:
     exhaustive:
       default-signifies-exhaustive: true
     goconst:
-      ignore-strings: '!!.+'
+      ignore-string-values:
+        - '!!.+'
     gocritic:
       disabled-checks:
         - ifElseChain

.goreleaser.yml

@@ -24,6 +24,7 @@ builds:
       - '7'
     flags:
       - -trimpath
+      - -tags=safe
     ldflags:
       - -s -w -X github.com/foomo/squadron/cmd/actions.version={{.Version}}
 
@@ -44,4 +45,4 @@ brews:
     homepage: "https://github.com/foomo/squadron"
     description: "CLI utility manage infrastructure as code with helm"
     test: |
-      system "#{bin}/squadron --version"
+      system "#{bin}/squadron version"

CODE_OF_CONDUCT.md

@@ -28,8 +28,8 @@ doc:
 ## Run tests
 test:
 	# see https://github.com/pterm/pterm/issues/482
-	#GO_TEST_TAGS=-skip go test -coverprofile=coverage.out -race -json ./... | gotestfmt
-	@GO_TEST_TAGS=-skip go test -coverprofile=coverage.out -json ./... | gotestfmt
+	@GO_TEST_TAGS=-skip go test -tags=safe -coverprofile=coverage.out -json ./... | gotestfmt
+	#GO_TEST_TAGS=-skip go test -tags=safe -coverprofile=coverage.out -race -json ./... | gotestfmt
 
 .PHONY: lint
 ## Run linter
@@ -51,14 +51,16 @@ tidy:
 outdated:
 	@go list -u -m -json all | go-mod-outdated -update -direct
 
+.PHONY: install
 ## Install binary
 install:
-	@go build -o ${GOPATH}/bin/squadron cmd/main.go
+	@go build -tags=safe -o ${GOPATH}/bin/squadron cmd/main.go
 
+.PHONY: build
 ## Build binary
 build:
 	@mkdir -p bin
-	@go build -o bin/squadron cmd/main.go
+	@go build -tags=safe -o bin/squadron cmd/main.go
 
 ## === Utils ===
 

Makefile

@@ -33,7 +33,11 @@ func NewConfig(c *viper.Viper) *cobra.Command {
 				}
 			}
 
-			pterm.Println(util.Highlight(sq.ConfigYAML()))
+			out := sq.ConfigYAML()
+			if !c.GetBool("raw") {
+				out = util.Highlight(out)
+			}
+			pterm.Println(out)
 
 			return nil
 		},
@@ -46,5 +50,8 @@ func NewConfig(c *viper.Viper) *cobra.Command {
 	flags.StringSlice("tags", nil, "list of tags to include or exclude (can specify multiple or separate values with commas: tag1,tag2,-tag3)")
 	_ = c.BindPFlag("tags", flags.Lookup("tags"))
 
+	flags.Bool("raw", false, "print raw output without highlighting")
+	_ = c.BindPFlag("raw", flags.Lookup("raw"))
+
 	return cmd
 }

cmd/actions/config.go

@@ -41,7 +41,10 @@ func NewDiff(c *viper.Viper) *cobra.Command {
 				return err
 			}
 
-			pterm.Println(util.Highlight(out))
+			if !c.GetBool("raw") {
+				out = util.Highlight(out)
+			}
+			pterm.Println(out)
 
 			return nil
 		},
@@ -57,5 +60,8 @@ func NewDiff(c *viper.Viper) *cobra.Command {
 	flags.StringSlice("tags", nil, "list of tags to include or exclude (can specify multiple or separate values with commas: tag1,tag2,-tag3)")
 	_ = c.BindPFlag("tags", flags.Lookup("tags"))
 
+	flags.Bool("raw", false, "print raw output without highlighting")
+	_ = c.BindPFlag("raw", flags.Lookup("raw"))
+
 	return cmd
 }

cmd/actions/diff.go

@@ -2,6 +2,7 @@ package actions
 
 import (
 	"context"
+	"fmt"
 
 	"github.com/foomo/squadron"
 	"github.com/foomo/squadron/internal/config"
@@ -38,11 +39,14 @@ func NewList(c *viper.Viper) *cobra.Command {
 				return value.Iterate(ctx, func(ctx context.Context, k string, v *config.Unit) error {
 					list = append(list, pterm.LeveledListItem{Level: 1, Text: k})
 					if c.GetBool("with-tags") && len(v.Tags) > 0 {
-						list = append(list, pterm.LeveledListItem{Level: 2, Text: "🔖: " + v.Tags.SortedString()})
+						list = append(list, pterm.LeveledListItem{Level: 2, Text: "🏷️: " + v.Tags.SortedString()})
 					}
 					if c.GetBool("with-charts") && len(v.Chart.String()) > 0 {
 						list = append(list, pterm.LeveledListItem{Level: 2, Text: "📑: " + v.Chart.String()})
 					}
+					if c.GetBool("with-priority") && len(v.Chart.String()) > 0 {
+						list = append(list, pterm.LeveledListItem{Level: 2, Text: fmt.Sprintf("☝️: %d", v.Priority)})
+					}
 					if c.GetBool("with-builds") && len(v.Builds) > 0 {
 						for name, build := range v.Builds {
 							list = append(list, pterm.LeveledListItem{Level: 2, Text: "📦: " + name})
@@ -76,6 +80,9 @@ func NewList(c *viper.Viper) *cobra.Command {
 	flags.Bool("with-charts", false, "include charts")
 	_ = c.BindPFlag("with-charts", flags.Lookup("with-charts"))
 
+	flags.Bool("with-priority", false, "include priority")
+	_ = c.BindPFlag("with-priority", flags.Lookup("with-priority"))
+
 	flags.Bool("with-builds", false, "include builds")
 	_ = c.BindPFlag("with-builds", flags.Lookup("with-builds"))
 

cmd/actions/list.go

@@ -29,20 +29,24 @@ func NewSchema(c *viper.Viper) *cobra.Command {
 				return errors.Wrap(err, "failed to filter config")
 			}
 
-			js, err := sq.RenderSchema(cmd.Context(), c.GetString("base-schema"))
+			out, err := sq.RenderSchema(cmd.Context(), c.GetString("base-schema"))
 			if err != nil {
 				return errors.Wrap(err, "failed to render schema")
 			}
 
 			if output := c.GetString("output"); output != "" {
 				pterm.Info.Printfln("Writing JSON schema to %s", output)
-				if err := os.WriteFile(output, []byte(js), 0600); err != nil {
+				if err := os.WriteFile(output, []byte(out), 0600); err != nil {
 					return errors.Wrap(err, "failed to write schema")
 				}
-			} else {
-				pterm.Println(util.Highlight(js))
+				return nil
 			}
 
+			if !c.GetBool("raw") {
+				out = util.Highlight(out)
+			}
+			pterm.Println(out)
+
 			return nil
 		},
 	}
@@ -57,5 +61,8 @@ func NewSchema(c *viper.Viper) *cobra.Command {
 	flags.StringSlice("tags", nil, "list of tags to include or exclude (can specify multiple or separate values with commas: tag1,tag2,-tag3)")
 	_ = c.BindPFlag("tags", flags.Lookup("tags"))
 
+	flags.Bool("raw", false, "print raw output without highlighting")
+	_ = c.BindPFlag("raw", flags.Lookup("raw"))
+
 	return cmd
 }

cmd/actions/schema.go

@@ -42,7 +42,10 @@ func NewTemplate(c *viper.Viper) *cobra.Command {
 				return errors.Wrap(err, "failed to render template")
 			}
 
-			pterm.Println(util.Highlight(out))
+			if !c.GetBool("raw") {
+				out = util.Highlight(out)
+			}
+			pterm.Println(out)
 
 			return nil
 		},
@@ -58,5 +61,8 @@ func NewTemplate(c *viper.Viper) *cobra.Command {
 	flags.StringSlice("tags", nil, "list of tags to include or exclude (can specify multiple or separate values with commas: tag1,tag2,-tag3)")
 	_ = c.BindPFlag("tags", flags.Lookup("tags"))
 
+	flags.Bool("raw", false, "print raw output without highlighting")
+	_ = c.BindPFlag("raw", flags.Lookup("raw"))
+
 	return cmd
 }