Merge branch 'main' of https://github.com/uselagoon/lagoon-cli into r…

…efactor_get_project

cmd/list.go

@@ -286,17 +286,10 @@ var listVariablesCmd = &cobra.Command{
 			env = append(env, returnNonEmptyString(fmt.Sprintf("%v", envvar.Scope)))
 			env = append(env, returnNonEmptyString(fmt.Sprintf("%v", envvar.Name)))
 			if reveal {
-				env = append(env, returnNonEmptyString(fmt.Sprintf("%v", envvar.Value)))
+				env = append(env, fmt.Sprintf("%v", envvar.Value))
 			}
 			data = append(data, env)
 		}
-		if len(data) == 0 {
-			if cmdProjectEnvironment != "" {
-				return fmt.Errorf("There are no variables for environment '%s' in project '%s'", cmdProjectEnvironment, cmdProjectName)
-			} else {
-				return fmt.Errorf("There are no variables for project '%s'", cmdProjectName)
-			}
-		}
 		header := []string{
 			"ID",
 			"Project",
@@ -309,6 +302,13 @@ var listVariablesCmd = &cobra.Command{
 		if reveal {
 			header = append(header, "Value")
 		}
+		if len(data) == 0 {
+			if cmdProjectEnvironment != "" {
+				outputOptions.Error = fmt.Sprintf("There are no variables for environment '%s' in project '%s'", cmdProjectEnvironment, cmdProjectName)
+			} else {
+				outputOptions.Error = fmt.Sprintf("There are no variables for project '%s'\n", cmdProjectName)
+			}
+		}
 		output.RenderOutput(output.Table{
 			Header: header,
 			Data:   data,

pkg/output/main.go

@@ -26,6 +26,7 @@ type Options struct {
 	JSON   bool
 	Pretty bool
 	Debug  bool
+	Error  string
 }
 
 // Result .
@@ -125,6 +126,9 @@ func RenderOutput(data Table, opts Options) {
 		RenderJSON(returnedData, opts)
 	} else {
 		// otherwise render a table
+		if opts.Error != "" {
+			os.Stderr.WriteString(opts.Error)
+		}
 		table := tablewriter.NewWriter(os.Stdout)
 		opts.Header = !opts.Header
 		if opts.Header {