chore: upgrade salt package

ravisuhag · ravisuhag · commit 24461c0c27a5 · 2025-03-18T20:02:13.000+05:30
diff --git a/cmd/check.go b/cmd/check.go
@@ -7,8 +7,7 @@ import (
 	"os"
 
 	"github.com/MakeNowJust/heredoc"
-	"github.com/raystack/salt/printer"
-	"github.com/raystack/salt/term"
+	"github.com/raystack/salt/cli/printer"
 	stencilv1beta1 "github.com/raystack/stencil/proto/raystack/stencil/v1beta1"
 	"github.com/spf13/cobra"
 	"google.golang.org/grpc/status"
@@ -57,7 +56,7 @@ func checkSchemaCmd(cdk *CDK) *cobra.Command {
 			}
 
 			spinner.Stop()
-			fmt.Printf("\n%s Schema is compatible.\n", term.Green(term.SuccessIcon()))
+			fmt.Printf("\n%s Schema is compatible.\n", printer.Green(printer.Icon("success")))
 			return nil
 		},
 	}
diff --git a/cmd/client.go b/cmd/client.go
@@ -2,10 +2,8 @@ package cmd
 
 import (
 	"context"
-	"errors"
 	"time"
 
-	"github.com/raystack/salt/cmdx"
 	"github.com/raystack/salt/config"
 	stencilv1beta1 "github.com/raystack/stencil/proto/raystack/stencil/v1beta1"
 	"github.com/spf13/cobra"
@@ -54,16 +52,14 @@ func createClient(cmd *cobra.Command, cdk *CDK) (stencilv1beta1.StencilServiceCl
 	return client, cancel, nil
 }
 
-func loadClientConfig(cmd *cobra.Command, cmdxConfig *cmdx.Config) (*ClientConfig, error) {
+func loadClientConfig(cmd *cobra.Command, cmdxConfig *config.Loader) (*ClientConfig, error) {
 	var clientConfig ClientConfig
 
 	if err := cmdxConfig.Load(
 		&clientConfig,
-		cmdx.WithFlags(cmd.Flags()),
 	); err != nil {
-		if !errors.Is(err, new(config.ConfigFileNotFoundError)) {
-			return nil, ErrClientConfigNotFound
-		}
+			return nil, err
+		
 	}
 
 	return &clientConfig, nil
diff --git a/cmd/config.go b/cmd/config.go
@@ -32,7 +32,7 @@ func configInitCommand(cdk *CDK) *cobra.Command {
 				return err
 			}
 
-			fmt.Printf("Config created: %v\n", cdk.Config.File())
+			fmt.Printf("Config created\n")
 			return nil
 		},
 	}
@@ -49,7 +49,7 @@ func configListCommand(cdk *CDK) *cobra.Command {
 			"group": "core",
 		},
 		RunE: func(cmd *cobra.Command, args []string) error {
-			data, err := cdk.Config.Read()
+			data, err := cdk.Config.View()
 			if err != nil {
 				return ErrClientConfigNotFound
 			}
diff --git a/cmd/create.go b/cmd/create.go
@@ -7,8 +7,7 @@ import (
 	"os"
 
 	"github.com/MakeNowJust/heredoc"
-	"github.com/raystack/salt/printer"
-	"github.com/raystack/salt/term"
+	"github.com/raystack/salt/cli/printer"
 	stencilv1beta1 "github.com/raystack/stencil/proto/raystack/stencil/v1beta1"
 	"github.com/spf13/cobra"
 	"google.golang.org/grpc/codes"
@@ -52,7 +51,7 @@ func createSchemaCmd(cdk *CDK) *cobra.Command {
 			if err != nil {
 				errStatus := status.Convert(err)
 				if codes.AlreadyExists == errStatus.Code() {
-					fmt.Printf("\n%s Schema with id '%s' already exist.\n", term.FailureIcon(), args[0])
+					fmt.Printf("\n%s Schema with id '%s' already exist.\n", printer.Icon("failure"), args[0])
 					return nil
 				}
 				return errors.New(errStatus.Message())
@@ -61,7 +60,7 @@ func createSchemaCmd(cdk *CDK) *cobra.Command {
 			id := res.GetId()
 
 			spinner.Stop()
-			fmt.Printf("\n%s Created schema with id %s.\n", term.Green(term.SuccessIcon()), term.Cyan(id))
+			fmt.Printf("\n%s Created schema with id %s.\n", printer.Green(printer.Icon("success")), printer.Cyan(id))
 			return nil
 		},
 	}
diff --git a/cmd/delete.go b/cmd/delete.go
@@ -5,7 +5,7 @@ import (
 	"fmt"
 
 	"github.com/MakeNowJust/heredoc"
-	"github.com/raystack/salt/printer"
+	"github.com/raystack/salt/cli/printer"
 	stencilv1beta1 "github.com/raystack/stencil/proto/raystack/stencil/v1beta1"
 	"github.com/spf13/cobra"
 )
diff --git a/cmd/diff.go b/cmd/diff.go
@@ -6,7 +6,7 @@ import (
 	"fmt"
 
 	"github.com/MakeNowJust/heredoc"
-	"github.com/raystack/salt/printer"
+	"github.com/raystack/salt/cli/printer"
 	stencilv1beta1 "github.com/raystack/stencil/proto/raystack/stencil/v1beta1"
 	"github.com/spf13/cobra"
 	"github.com/yudai/gojsondiff"
diff --git a/cmd/download.go b/cmd/download.go
@@ -5,8 +5,7 @@ import (
 	"os"
 
 	"github.com/MakeNowJust/heredoc"
-	"github.com/raystack/salt/printer"
-	"github.com/raystack/salt/term"
+	"github.com/raystack/salt/cli/printer"
 	"github.com/spf13/cobra"
 )
 
@@ -42,7 +41,7 @@ func downloadSchemaCmd(cdk *CDK) *cobra.Command {
 				return err
 			}
 
-			fmt.Printf("%s Schema successfully written to %s\n", term.Green(term.SuccessIcon()), output)
+			fmt.Printf("%s Schema successfully written to %s\n", printer.Green(printer.Icon("success")), output)
 			return nil
 		},
 	}
diff --git a/cmd/edit.go b/cmd/edit.go
@@ -5,7 +5,7 @@ import (
 	"fmt"
 
 	"github.com/MakeNowJust/heredoc"
-	"github.com/raystack/salt/printer"
+	"github.com/raystack/salt/cli/printer"
 	stencilv1beta1 "github.com/raystack/stencil/proto/raystack/stencil/v1beta1"
 	"github.com/spf13/cobra"
 )
diff --git a/cmd/info.go b/cmd/info.go
@@ -7,8 +7,7 @@ import (
 	"strconv"
 
 	"github.com/MakeNowJust/heredoc"
-	"github.com/raystack/salt/printer"
-	"github.com/raystack/salt/term"
+	"github.com/raystack/salt/cli/printer"
 	stencilv1beta1 "github.com/raystack/stencil/proto/raystack/stencil/v1beta1"
 	"github.com/spf13/cobra"
 	"google.golang.org/grpc/codes"
@@ -44,18 +43,18 @@ func infoSchemaCmd(cdk *CDK) *cobra.Command {
 			if err != nil {
 				errStatus, _ := status.FromError(err)
 				if codes.NotFound == errStatus.Code() {
-					fmt.Printf("%s Schema with id '%s' not found.\n", term.Red(term.FailureIcon()), args[0])
+					fmt.Printf("%s Schema with id '%s' not found.\n", printer.Red(printer.Icon("failure")), args[0])
 					return nil
 				}
 				return err
 			}
 
-			fmt.Printf("\n%s\n", term.Blue(args[0]))
-			fmt.Printf("\n%s\n\n", term.Grey("No description provided"))
-			fmt.Printf("%s \t %s \n", term.Grey("Namespace:"), namespace)
-			fmt.Printf("%s \t %s \n", term.Grey("Format:"), dict[info.GetFormat().String()])
-			fmt.Printf("%s \t %s \n", term.Grey("Compatibility:"), dict[info.GetCompatibility().String()])
-			fmt.Printf("%s \t %s \n\n", term.Grey("Authority:"), dict[info.GetAuthority()])
+			fmt.Printf("\n%s\n", printer.Blue(args[0]))
+			fmt.Printf("\n%s\n\n", printer.Grey("No description provided"))
+			fmt.Printf("%s \t %s \n", printer.Grey("Namespace:"), namespace)
+			fmt.Printf("%s \t %s \n", printer.Grey("Format:"), dict[info.GetFormat().String()])
+			fmt.Printf("%s \t %s \n", printer.Grey("Compatibility:"), dict[info.GetCompatibility().String()])
+			fmt.Printf("%s \t %s \n\n", printer.Grey("Authority:"), dict[info.GetAuthority()])
 			return nil
 		},
 	}
@@ -109,7 +108,7 @@ func versionSchemaCmd(cdk *CDK) *cobra.Command {
 
 			for _, v := range versions {
 				report = append(report, []string{
-					term.Greenf("#%v", strconv.FormatInt(int64(v), 10)),
+					printer.Greenf("#%v", strconv.FormatInt(int64(v), 10)),
 					"-",
 					"-",
 				})
diff --git a/cmd/list.go b/cmd/list.go
@@ -6,8 +6,7 @@ import (
 	"os"
 
 	"github.com/MakeNowJust/heredoc"
-	"github.com/raystack/salt/printer"
-	"github.com/raystack/salt/term"
+	"github.com/raystack/salt/cli/printer"
 	stencilv1beta1 "github.com/raystack/stencil/proto/raystack/stencil/v1beta1"
 	"github.com/spf13/cobra"
 )
@@ -53,11 +52,11 @@ func listSchemaCmd(cdk *CDK) *cobra.Command {
 			report := [][]string{}
 			index := 1
 			report = append(report, []string{
-				term.Bold("INDEX"),
-				term.Bold("NAME"),
-				term.Bold("FORMAT"),
-				term.Bold("COMPATIBILITY"),
-				term.Bold("AUTHORITY"),
+				printer.Bold("INDEX"),
+				printer.Bold("NAME"),
+				printer.Bold("FORMAT"),
+				printer.Bold("COMPATIBILITY"),
+				printer.Bold("AUTHORITY"),
 			})
 			for _, s := range schemas {
 				c := s.GetCompatibility().String()
@@ -67,7 +66,7 @@ func listSchemaCmd(cdk *CDK) *cobra.Command {
 				if a == "" {
 					a = "-"
 				}
-				report = append(report, []string{term.Greenf("#%d", index), s.GetName(), dict[f], dict[c], a})
+				report = append(report, []string{printer.Greenf("#%d", index), s.GetName(), dict[f], dict[c], a})
 				index++
 			}
 
diff --git a/cmd/namespace.go b/cmd/namespace.go
@@ -7,9 +7,8 @@ import (
 
 	"github.com/MakeNowJust/heredoc"
 	"github.com/dustin/go-humanize"
-	"github.com/raystack/salt/printer"
-	"github.com/raystack/salt/prompt"
-	"github.com/raystack/salt/term"
+	"github.com/raystack/salt/cli/printer"
+	"github.com/raystack/salt/cli/prompter"
 	stencilv1beta1 "github.com/raystack/stencil/proto/raystack/stencil/v1beta1"
 	"github.com/spf13/cobra"
 	"google.golang.org/grpc/codes"
@@ -76,14 +75,14 @@ func listNamespaceCmd(cdk *CDK) *cobra.Command {
 			report := [][]string{}
 			index := 1
 			report = append(report, []string{
-				term.Bold("INDEX"),
-				term.Bold("NAMESPACE"),
-				term.Bold("FORMAT"),
-				term.Bold("COMPATIBILITY"),
+				printer.Bold("INDEX"),
+				printer.Bold("NAMESPACE"),
+				printer.Bold("FORMAT"),
+				printer.Bold("COMPATIBILITY"),
 			})
 			for _, n := range namespaces {
 				report = append(report,
-					[]string{term.Greenf("#%d", index),
+					[]string{printer.Greenf("#%d", index),
 						n.Id,
 						dict[n.GetFormat().String()],
 						dict[n.GetCompatibility().String()],
@@ -111,7 +110,7 @@ func createNamespaceCmd(cdk *CDK) *cobra.Command {
 			$ stencil namespace create -n=raystack -f=FORMAT_PROTOBUF -c=COMPATIBILITY_BACKWARD -d="Event schemas"
 		`),
 		RunE: func(cmd *cobra.Command, args []string) error {
-			prompter := prompt.New()
+			prompter := prompter.New()
 			if id == "" {
 				id, _ = prompter.Input("What is the namespace id?", "")
 			}
@@ -151,14 +150,14 @@ func createNamespaceCmd(cdk *CDK) *cobra.Command {
 			if err != nil {
 				errStatus, _ := status.FromError(err)
 				if codes.AlreadyExists == errStatus.Code() {
-					fmt.Printf("\n%s Namespace with id '%s' already exist.\n", term.FailureIcon(), id)
+					fmt.Printf("\n%s Namespace with id '%s' already exist.\n", printer.Icon("failure"), id)
 					return nil
 				}
 				return err
 			}
 
 			namespace := res.GetNamespace()
-			fmt.Printf("\n%s Created namespace with id %s.\n", term.Green(term.SuccessIcon()), term.Bold(term.Blue(namespace.GetId())))
+			fmt.Printf("\n%s Created namespace with id %s.\n", printer.Green(printer.Icon("success")), printer.Bold(printer.Blue(namespace.GetId())))
 			return nil
 		},
 	}
@@ -206,15 +205,15 @@ func editNamespaceCmd(cdk *CDK) *cobra.Command {
 			if err != nil {
 				errStatus, _ := status.FromError(err)
 				if codes.NotFound == errStatus.Code() {
-					fmt.Printf("%s Namespace with id '%s' does not exist.\n", term.FailureIcon(), id)
+					fmt.Printf("%s Namespace with id '%s' does not exist.\n", printer.Icon("failure"), id)
 					return nil
 				}
 				return err
 			}
 
 			namespace := res.Namespace
 
-			fmt.Printf("%s Updated namespace with id %s.\n", term.Green(term.SuccessIcon()), term.Bold(term.Blue(namespace.GetId())))
+			fmt.Printf("%s Updated namespace with id %s.\n", printer.Green(printer.Icon("success")), printer.Bold(printer.Blue(namespace.GetId())))
 			return nil
 		},
 	}
@@ -261,7 +260,7 @@ func viewNamespaceCmd(cdk *CDK) *cobra.Command {
 			if err != nil {
 				errStatus, _ := status.FromError(err)
 				if codes.NotFound == errStatus.Code() {
-					fmt.Printf("%s Namespace with id %s does not exist.\n", term.FailureIcon(), term.Bold(term.Blue(id)))
+					fmt.Printf("%s Namespace with id %s does not exist.\n", printer.Icon("failure"), printer.Bold(printer.Blue(id)))
 					return nil
 				}
 				return err
@@ -291,10 +290,10 @@ func deleteNamespaceCmd(cdk *CDK) *cobra.Command {
 		RunE: func(cmd *cobra.Command, args []string) error {
 			id := args[0]
 
-			prompter := prompt.New()
+			prompter := prompter.New()
 			confirm, _ := prompter.Input(fmt.Sprintf("Deleting namespace `%s`. To confirm, type the namespace id:", id), "")
 			if id != confirm {
-				fmt.Printf("\n%s Namespace id '%s' did not match.\n", term.WarningIcon(), confirm)
+				fmt.Printf("\n%s Namespace id '%s' did not match.\n", printer.Icon("warning"), confirm)
 				return nil
 			}
 
@@ -316,13 +315,13 @@ func deleteNamespaceCmd(cdk *CDK) *cobra.Command {
 			if err != nil {
 				errStatus, _ := status.FromError(err)
 				if codes.NotFound == errStatus.Code() {
-					fmt.Printf("\n%s Namespace with id '%s' does not exist.\n", term.FailureIcon(), id)
+					fmt.Printf("\n%s Namespace with id '%s' does not exist.\n", printer.Icon("failure"), id)
 					return nil
 				}
 				return err
 			}
 
-			fmt.Printf("\n%s Deleted namespace with id %s.\n", term.Red(term.SuccessIcon()), term.Bold(term.Blue(id)))
+			fmt.Printf("\n%s Deleted namespace with id %s.\n", printer.Red(printer.Icon("success")), printer.Bold(printer.Blue(id)))
 
 			return nil
 		},
@@ -337,10 +336,10 @@ func printNamespace(namespace *stencilv1beta1.Namespace) {
 		desc = "No description provided"
 	}
 
-	fmt.Printf("\n%s\n", term.Blue(namespace.GetId()))
-	fmt.Printf("\n%s.\n\n", term.Grey(desc))
-	fmt.Printf("%s \t %s \n", term.Grey("Format:"), namespace.GetFormat().String())
-	fmt.Printf("%s \t %s \n", term.Grey("Compatibility:"), namespace.GetCompatibility().String())
-	fmt.Printf("\n%s %s, ", term.Grey("Created"), humanize.Time(namespace.GetCreatedAt().AsTime()))
-	fmt.Printf("%s %s \n\n", term.Grey("last updated"), humanize.Time(namespace.GetUpdatedAt().AsTime()))
+	fmt.Printf("\n%s\n", printer.Blue(namespace.GetId()))
+	fmt.Printf("\n%s.\n\n", printer.Grey(desc))
+	fmt.Printf("%s \t %s \n", printer.Grey("Format:"), namespace.GetFormat().String())
+	fmt.Printf("%s \t %s \n", printer.Grey("Compatibility:"), namespace.GetCompatibility().String())
+	fmt.Printf("\n%s %s, ", printer.Grey("Created"), humanize.Time(namespace.GetCreatedAt().AsTime()))
+	fmt.Printf("%s %s \n\n", printer.Grey("last updated"), humanize.Time(namespace.GetUpdatedAt().AsTime()))
 }
diff --git a/cmd/print.go b/cmd/print.go
@@ -8,8 +8,8 @@ import (
 	"github.com/alecthomas/chroma/quick"
 	"github.com/jhump/protoreflect/desc"
 	"github.com/jhump/protoreflect/desc/protoprint"
-	"github.com/raystack/salt/printer"
-	"github.com/raystack/salt/term"
+	"github.com/raystack/salt/cli/printer"
+	"github.com/raystack/salt/cli/terminator"
 	stencilv1beta1 "github.com/raystack/stencil/proto/raystack/stencil/v1beta1"
 	"github.com/spf13/cobra"
 	"google.golang.org/protobuf/proto"
@@ -57,7 +57,7 @@ func printSchemaCmd(cdk *CDK) *cobra.Command {
 			case "FORMAT_PROTOBUF":
 				printProtoSchema(data, filter)
 			default:
-				fmt.Printf("%s Unknown schema format: %s\n", term.Red(term.FailureIcon()), format)
+				fmt.Printf("%s Unknown schema format: %s\n", printer.Red(printer.Icon("failure")), format)
 			}
 			return nil
 		},
@@ -73,7 +73,7 @@ func printSchemaCmd(cdk *CDK) *cobra.Command {
 }
 
 func printSchema(data []byte) error {
-	page := term.NewPager()
+	page := terminator.NewPager()
 	page.Start()
 	defer page.Stop()
 
@@ -113,7 +113,7 @@ func printProtoSchema(data []byte, filter string) error {
 		schema = schema + fmt.Sprintf("\n//Schema file:: %s\n\n%s", fd.GetName(), protoAsString)
 	}
 
-	page := term.NewPager()
+	page := terminator.NewPager()
 	page.Start()
 	defer page.Stop()
 
diff --git a/cmd/root.go b/cmd/root.go
diff --git a/cmd/search.go b/cmd/search.go
diff --git a/config/load.go b/config/load.go
diff --git a/go.mod b/go.mod
diff --git a/go.sum b/go.sum
diff --git a/internal/server/server.go b/internal/server/server.go

Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,7 @@ func configInitCommand(cdk CDK) cobra.Command {`
`32`	`32`	`return err`
`33`	`33`	`}`
`34`	`34`
`35`		`- fmt.Printf("Config created: %v\n", cdk.Config.File())`
	`35`	`+ fmt.Printf("Config created\n")`
`36`	`36`	`return nil`
`37`	`37`	`},`
`38`	`38`	`}`
`@@ -49,7 +49,7 @@ func configListCommand(cdk CDK) cobra.Command {`
`49`	`49`	`"group": "core",`
`50`	`50`	`},`
`51`	`51`	`RunE: func(cmd *cobra.Command, args []string) error {`
`52`		`- data, err := cdk.Config.Read()`
	`52`	`+ data, err := cdk.Config.View()`
`53`	`53`	`if err != nil {`
`54`	`54`	`return ErrClientConfigNotFound`
`55`	`55`	`}`
Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@ import (`
`5`	`5`	`"fmt"`
`6`	`6`
`7`	`7`	`"github.com/MakeNowJust/heredoc"`
`8`		`- "github.com/raystack/salt/printer"`
	`8`	`+ "github.com/raystack/salt/cli/printer"`
`9`	`9`	`stencilv1beta1 "github.com/raystack/stencil/proto/raystack/stencil/v1beta1"`
`10`	`10`	`"github.com/spf13/cobra"`
`11`	`11`	`)`
Original file line number	Diff line number	Diff line change
`@@ -5,8 +5,7 @@ import (`
`5`	`5`	`"os"`
`6`	`6`
`7`	`7`	`"github.com/MakeNowJust/heredoc"`
`8`		`- "github.com/raystack/salt/printer"`
`9`		`- "github.com/raystack/salt/term"`
	`8`	`+ "github.com/raystack/salt/cli/printer"`
`10`	`9`	`"github.com/spf13/cobra"`
`11`	`10`	`)`
`12`	`11`
`@@ -42,7 +41,7 @@ func downloadSchemaCmd(cdk CDK) cobra.Command {`
`42`	`41`	`return err`
`43`	`42`	`}`
`44`	`43`
`45`		`- fmt.Printf("%s Schema successfully written to %s\n", term.Green(term.SuccessIcon()), output)`
	`44`	`+ fmt.Printf("%s Schema successfully written to %s\n", printer.Green(printer.Icon("success")), output)`
`46`	`45`	`return nil`
`47`	`46`	`},`
`48`	`47`	`}`