Misc CLI improvements

Author: deliahu

cli/cmd/env.go

@@ -122,6 +122,10 @@ var _envListCmd = &cobra.Command{
 		}
 
 		if _flagOutput == flags.JSONOutputType {
+			if len(cliConfig.Environments) == 0 {
+				fmt.Print("[]")
+				return
+			}
 			bytes, err := libjson.Marshal(cliConfig.Environments)
 			if err != nil {
 				exit.Error(err)
@@ -130,6 +134,11 @@ var _envListCmd = &cobra.Command{
 			return
 		}
 
+		if len(cliConfig.Environments) == 0 {
+			fmt.Println("no environments are configured")
+			return
+		}
+
 		defaultEnv, err := getDefaultEnv()
 		if err != nil {
 			exit.Error(err)

cli/cmd/errors.go

@@ -87,7 +87,7 @@ func ErrorInvalidProvider(providerStr string) error {
 func ErrorInvalidLegacyProvider(providerStr, cliConfigPath string) error {
 	return errors.WithStack(&errors.Error{
 		Kind:    ErrInvalidLegacyProvider,
-		Message: fmt.Sprintf("the %s provider is no longer supported on cortex v%s; remove the environment(s) which use the %s provider from %s or delete %s entirely (it will be recreated on subsequent CLI commands)", providerStr, consts.CortexVersionMinor, providerStr, cliConfigPath, cliConfigPath),
+		Message: fmt.Sprintf("the %s provider is no longer supported on cortex v%s; remove the environment(s) which use the %s provider from %s, or delete %s (it will be recreated on subsequent CLI commands)", providerStr, consts.CortexVersionMinor, providerStr, cliConfigPath, cliConfigPath),
 	})
 }
 

cli/types/cliconfig/cli_config.go

@@ -42,5 +42,11 @@ func (cliConfig *CLIConfig) Validate() error {
 		}
 	}
 
+	// Backwards compatibility: ignore local default env
+	defaultEnv := cliConfig.DefaultEnvironment
+	if defaultEnv != nil && *defaultEnv == "local" && !envNames.Has(*defaultEnv) {
+		cliConfig.DefaultEnvironment = nil
+	}
+
 	return nil
 }