fix(cli): handle CLI config file not found error (#1345) (#1347)

Signed-off-by: Sunghoon Kang <[email protected]> Co-authored-by: Sunghoon Kang <[email protected]>
akuity · Jan 2, 2024 · 42f2d38 · 42f2d38
1 parent 882617b
commit 42f2d38
Show file tree

Hide file tree

Showing 16 changed files with 38 additions and 16 deletions.
diff --git a/cmd/cli/main.go b/cmd/cli/main.go
@@ -15,8 +15,11 @@ func main() {
 	ctx := context.Background()
 	cfg, err := config.LoadCLIConfig()
 	if err != nil {
-		fmt.Fprintln(os.Stderr, errors.Wrap(err, "load config"))
-		os.Exit(1)
+		if !config.IsConfigNotFoundErr(err) {
+			fmt.Fprintln(os.Stderr, errors.Wrap(err, "load config"))
+			os.Exit(1)
+		}
+		cfg = config.NewDefaultCLIConfig()
 	}
 	cmd, err := NewRootCommand(option.NewOption(cfg), &rootState{})
 	if err != nil {

diff --git a/internal/cli/client/client.go b/internal/cli/client/client.go
@@ -26,7 +26,12 @@ func GetClientFromConfig(ctx context.Context, opt *option.Option) (
 	}
 	cfg, err := config.LoadCLIConfig()
 	if err != nil {
-		return nil, err
+		return nil, errors.Wrap(err, "load cli config")
+	}
+	if cfg.APIAddress == "" || cfg.BearerToken == "" {
+		return nil, errors.New(
+			"seems like you are not logged in; please use `kargo login` to authenticate",
+		)
 	}
 	skipTLSVerify := opt.InsecureTLS || cfg.InsecureSkipTLSVerify
 	if cfg, err =

diff --git a/internal/cli/cmd/config/set.go b/internal/cli/cmd/config/set.go
@@ -22,7 +22,7 @@ kargo config set project my-project
 		RunE: func(cmd *cobra.Command, args []string) error {
 			cfg, err := config.LoadCLIConfig()
 			if err != nil {
-				return errors.Wrap(err, "load cli config")
+				return errors.Wrap(err, "ensure cli config")
 			}
 
 			key := strings.ToLower(args[0])

diff --git a/internal/cli/cmd/config/unset.go b/internal/cli/cmd/config/unset.go
@@ -22,7 +22,7 @@ kargo config unset project my-project
 		RunE: func(cmd *cobra.Command, args []string) error {
 			cfg, err := config.LoadCLIConfig()
 			if err != nil {
-				return errors.Wrap(err, "load cli config")
+				return errors.Wrap(err, "ensure cli config")
 			}
 
 			key := strings.ToLower(args[0])

diff --git a/internal/cli/cmd/create/project.go b/internal/cli/cmd/create/project.go
@@ -36,7 +36,7 @@ kargo create project my-project
 
 			kargoSvcCli, err := client.GetClientFromConfig(ctx, opt)
 			if err != nil {
-				return errors.New("get client from config")
+				return errors.Wrap(err, "get client from config")
 			}
 			resp, err := kargoSvcCli.CreateProject(ctx,
 				connect.NewRequest(&kargosvcapi.CreateProjectRequest{

diff --git a/internal/cli/cmd/delete/project.go b/internal/cli/cmd/delete/project.go
@@ -27,7 +27,7 @@ kargo delete project my-project
 			ctx := cmd.Context()
 			kargoSvcCli, err := client.GetClientFromConfig(ctx, opt)
 			if err != nil {
-				return errors.New("get client from config")
+				return errors.Wrap(err, "get client from config")
 			}
 
 			var resErr error

diff --git a/internal/cli/cmd/delete/stage.go b/internal/cli/cmd/delete/stage.go
@@ -27,7 +27,7 @@ kargo delete stage --project=my-project my-stage
 			ctx := cmd.Context()
 			kargoSvcCli, err := client.GetClientFromConfig(ctx, opt)
 			if err != nil {
-				return errors.New("get client from config")
+				return errors.Wrap(err, "get client from config")
 			}
 
 			project := opt.Project

diff --git a/internal/cli/cmd/delete/warehouse.go b/internal/cli/cmd/delete/warehouse.go
@@ -27,7 +27,7 @@ kargo delete warehouse --project=my-project my-warehouse
 			ctx := cmd.Context()
 			kargoSvcCli, err := client.GetClientFromConfig(ctx, opt)
 			if err != nil {
-				return errors.New("get client from config")
+				return errors.Wrap(err, "get client from config")
 			}
 
 			project := opt.Project

diff --git a/internal/cli/cmd/get/freight.go b/internal/cli/cmd/get/freight.go
@@ -42,7 +42,7 @@ kargo get freight --project=my-project my-freight
 
 			kargoSvcCli, err := client.GetClientFromConfig(ctx, opt)
 			if err != nil {
-				return errors.New("get client from config")
+				return errors.Wrap(err, "get client from config")
 			}
 			resp, err := kargoSvcCli.QueryFreight(ctx, connect.NewRequest(&v1alpha1.QueryFreightRequest{
 				Project: project,

diff --git a/internal/cli/cmd/get/projects.go b/internal/cli/cmd/get/projects.go
@@ -32,7 +32,7 @@ kargo get projects -o json
 
 			kargoSvcCli, err := client.GetClientFromConfig(ctx, opt)
 			if err != nil {
-				return errors.New("get client from config")
+				return errors.Wrap(err, "get client from config")
 			}
 			resp, err := kargoSvcCli.ListProjects(ctx, connect.NewRequest(&v1alpha1.ListProjectsRequest{}))
 			if err != nil {

diff --git a/internal/cli/cmd/get/promotions.go b/internal/cli/cmd/get/promotions.go
@@ -60,7 +60,7 @@ kargo get promotions --project=my-project some-promotion
 
 			kargoSvcCli, err := client.GetClientFromConfig(ctx, opt)
 			if err != nil {
-				return errors.New("get client from config")
+				return errors.Wrap(err, "get client from config")
 			}
 			resp, err := kargoSvcCli.ListPromotions(ctx, connect.NewRequest(req))
 			if err != nil {

diff --git a/internal/cli/cmd/get/stages.go b/internal/cli/cmd/get/stages.go
@@ -43,7 +43,7 @@ kargo get stages --project=my-project my-stage
 
 			kargoSvcCli, err := client.GetClientFromConfig(ctx, opt)
 			if err != nil {
-				return errors.New("get client from config")
+				return errors.Wrap(err, "get client from config")
 			}
 			resp, err := kargoSvcCli.ListStages(ctx, connect.NewRequest(&v1alpha1.ListStagesRequest{
 				Project: project,

diff --git a/internal/cli/cmd/get/warehouse.go b/internal/cli/cmd/get/warehouse.go
@@ -40,7 +40,7 @@ kargo get warehouses --project=my-project my-warehouse
 
 			kargoSvcCli, err := client.GetClientFromConfig(ctx, opt)
 			if err != nil {
-				return errors.New("get client from config")
+				return errors.Wrap(err, "get client from config")
 			}
 			resp, err := kargoSvcCli.ListWarehouses(
 				ctx,

diff --git a/internal/cli/cmd/update/freight-alias.go b/internal/cli/cmd/update/freight-alias.go
@@ -26,7 +26,7 @@ func newUpdateFreightAliasCommand(opt *option.Option) *cobra.Command {
 
 			kargoSvcCli, err := client.GetClientFromConfig(ctx, opt)
 			if err != nil {
-				return errors.New("get client from config")
+				return errors.Wrap(err, "get client from config")
 			}
 
 			if _, err = kargoSvcCli.UpdateFreightAlias(

diff --git a/internal/cli/config/config.go b/internal/cli/config/config.go
@@ -63,6 +63,11 @@ type CLIConfig struct {
 	Project string `json:"project,omitempty"`
 }
 
+// NewDefaultCLIConfig returns a new default CLI configuration.
+func NewDefaultCLIConfig() CLIConfig {
+	return CLIConfig{}
+}
+
 // LoadCLIConfig loads Kargo CLI configuration from a file in the Kargo home
 // directory.
 func LoadCLIConfig() (CLIConfig, error) {

diff --git a/internal/cli/config/errors.go b/internal/cli/config/errors.go
@@ -1,11 +1,20 @@
 package config
 
-import "fmt"
+import (
+	"fmt"
+
+	"github.com/pkg/errors"
+)
 
 type ErrConfigNotFound struct {
 	Path string
 }
 
+func IsConfigNotFoundErr(target error) bool {
+	var err *ErrConfigNotFound
+	return errors.As(target, &err)
+}
+
 func NewConfigNotFoundErr(path string) error {
 	return &ErrConfigNotFound{Path: path}
 }