JSON output for service list in experimental mode (#3186)

* JSON output for service list in experimental mode

* Changes to tests as per PR feedback

#3186 (review)

pkg/odo/cli/service/list.go

@@ -74,21 +74,26 @@ func (o *ServiceListOptions) Run() (err error) {
 			return err
 		}
 
-		w := tabwriter.NewWriter(os.Stdout, 5, 2, 3, ' ', tabwriter.TabIndent)
+		if len(list) == 0 {
+			return fmt.Errorf("No operator backed services found in the namesapce")
+		}
+
+		if log.IsJSON() {
+			machineoutput.OutputSuccess(list)
+			return
+		} else {
+			w := tabwriter.NewWriter(os.Stdout, 5, 2, 3, ' ', tabwriter.TabIndent)
 
-		if len(list) > 0 {
 			fmt.Fprintln(w, "NAME", "\t", "TYPE", "\t", "AGE")
 
 			for _, item := range list {
 				duration := time.Since(item.GetCreationTimestamp().Time).Truncate(time.Second).String()
 				fmt.Fprintln(w, item.GetName(), "\t", item.GetKind(), "\t", duration)
 			}
 
-		} else {
-			fmt.Fprintln(w, "No operator backed services found in the namesapce")
-		}
+			w.Flush()
 
-		w.Flush()
+		}
 
 		return err
 	}

tests/integration/operatorhub/cmd_service_test.go

@@ -207,14 +207,20 @@ spec:
 			Expect(stdOut).To(ContainSubstring("example"))
 			Expect(stdOut).To(ContainSubstring("EtcdCluster"))
 
+			// now check for json output
+			jsonOut := helper.CmdShouldPass("odo", "service", "list", "-o", "json")
+			helper.MatchAllInOutput(jsonOut, []string{"\"apiVersion\": \"etcd.database.coreos.com/v1beta2\"", "\"kind\": \"EtcdCluster\"", "\"name\": \"example3\""})
+
 			// Delete the pods created. This should idealy be done by `odo
 			// service delete` but that's not implemented for operator backed
 			// services yet.
 			helper.CmdShouldPass("oc", "delete", "EtcdCluster", "example3")
 
 			// Now let's check the output again to ensure expected behaviour
-			stdOut = helper.CmdShouldPass("odo", "service", "list")
+			stdOut = helper.CmdShouldFail("odo", "service", "list")
+			jsonOut = helper.CmdShouldFail("odo", "service", "list", "-o", "json")
 			Expect(stdOut).To(ContainSubstring("No operator backed services found in the namesapce"))
+			helper.MatchAllInOutput(jsonOut, []string{"No operator backed services found in the namesapce", "\"message\": \"No operator backed services found in the namesapce\""})
 		})
 	})
 })