add support for yaml output

docs/configuration-reference.md

@@ -119,8 +119,8 @@ The default value for `no_color` is `false`
 #### default_output
 
 Sets the default output format for commands.  Currently, the application
-supports two output formats `human` and `json`.   Use this configuration to
-define the default output format for all commands.
+supports three output formats `human`,`json` and `yaml`.   Use this
+configuration to define the default output format for all commands.
 
 This setting can be override for any command using `--output <format>`
 

internal/handlers/runner.go

@@ -128,37 +128,10 @@ func NewCommand(c *CommandRunner) *cobra.Command {
 			checkError(err, c.Runtime)
 
 			if c.Runtime.Config.TerminalDefaultOutput == "json" {
-				if resp.Json != nil {
-					terminal.Display(string(resp.Json))
-				} else {
-					terminal.Display(resp.String())
-				}
-				terminal.Display("")
-
-			} else if c.Runtime.Config.TerminalDefaultOutput == "url" && resp.Url != "" {
-				profile, _ := c.Runtime.Config.ActiveProfile()
-
-				var u string
-
-				if profile.UseTLS {
-					u = "https://"
-				} else {
-					u = "http://"
-				}
-
-				u += profile.Host
-
-				if profile.Port != 0 {
-					u += fmt.Sprintf(":%v", profile.Port)
-				}
-
-				if strings.HasPrefix(resp.Url, "/") {
-					u += resp.Url
-				} else {
-					u += fmt.Sprintf("/%s", resp.Url)
-				}
+				checkError(terminal.DisplayJson(resp.Object), c.Runtime)
 
-				terminal.Display(u)
+			} else if c.Runtime.Config.TerminalDefaultOutput == "yaml" {
+				checkError(terminal.DisplayYaml(resp.Object), c.Runtime)
 
 			} else if len(resp.Lines) > 0 {
 				if c.Runtime.Config.TerminalPager {
@@ -170,8 +143,6 @@ func NewCommand(c *CommandRunner) *cobra.Command {
 			} else {
 				if resp.Text != "" {
 					terminal.Display(resp.String())
-				} else if resp.Json != nil {
-					terminal.Display(string(resp.Json))
 				} else {
 					terminal.Display("unable to display response")
 				}

internal/runners/accounts.go

@@ -45,7 +45,7 @@ func (r *AccountRunner) Get(in Request) (*Response, error) {
 	return NewResponse(
 		"",
 		WithTable(display),
-		WithJson(accounts),
+		WithObject(accounts),
 	), nil
 }
 
@@ -75,6 +75,6 @@ func (r *AccountRunner) Describe(in Request) (*Response, error) {
 
 	return NewResponse(
 		"",
-		WithJson(account),
+		WithObject(account),
 	), nil
 }

internal/runners/accounts_test.go

@@ -30,7 +30,6 @@ func TestGet(t *testing.T) {
 	assert.NotNil(t, res)
 	assert.Empty(t, res.Text)
 	assert.NotEmpty(t, res.Lines)
-	assert.NotEmpty(t, res.Json)
 }
 
 func TestDescribe(t *testing.T) {
@@ -47,5 +46,4 @@ func TestDescribe(t *testing.T) {
 	assert.NotNil(t, res)
 	assert.Empty(t, res.Text)
 	assert.NotEmpty(t, res.Lines)
-	assert.NotEmpty(t, res.Json)
 }

internal/runners/adapter_models.go

@@ -40,7 +40,7 @@ func (r *AdapterModelRunner) Get(in Request) (*Response, error) {
 	return NewResponse(
 		"",
 		WithTable(display),
-		WithJson(res),
+		WithObject(res),
 	), nil
 
 }

internal/runners/adapters.go

@@ -57,7 +57,7 @@ func (r *AdapterRunner) Get(in Request) (*Response, error) {
 	return NewResponse(
 		"",
 		WithTable(display),
-		WithJson(adapters),
+		WithObject(adapters),
 	), nil
 }
 
@@ -77,7 +77,7 @@ func (r *AdapterRunner) Describe(in Request) (*Response, error) {
 
 	return NewResponse(
 		string(b),
-		WithJson(res),
+		WithObject(res),
 	), nil
 }
 
@@ -362,7 +362,7 @@ func (r *AdapterRunner) Inspect(in Request) (*Response, error) {
 	return NewResponse(
 		"",
 		WithTable(display),
-		WithJson(adapters),
+		WithObject(adapters),
 	), nil
 }
 

internal/runners/analytic_templates.go

@@ -57,7 +57,7 @@ func (r *AnalyticTemplateRunner) Get(in Request) (*Response, error) {
 	return NewResponse(
 		"",
 		WithTable(display),
-		WithJson(templates),
+		WithObject(templates),
 	), nil
 
 }
@@ -75,7 +75,7 @@ func (r *AnalyticTemplateRunner) Describe(in Request) (*Response, error) {
 
 	return NewResponse(
 		fmt.Sprintf("Name: %s", template.Name),
-		WithJson(template),
+		WithObject(template),
 	), nil
 }
 
@@ -112,7 +112,7 @@ func (r *AnalyticTemplateRunner) Create(in Request) (*Response, error) {
 
 	return NewResponse(
 		fmt.Sprintf("Successfully created analytic template `%s`", name),
-		WithJson(res),
+		WithObject(res),
 	), nil
 }
 

internal/runners/api.go

@@ -81,7 +81,7 @@ func (r *ApiRunner) Get(in Request) (*Response, error) {
 
 	return NewResponse(
 		res,
-		WithJson(jsonRes),
+		WithObject(jsonRes),
 	), nil
 }
 
@@ -103,7 +103,7 @@ func (r *ApiRunner) Delete(in Request) (*Response, error) {
 
 	return NewResponse(
 		res,
-		WithJson(jsonRes),
+		WithObject(jsonRes),
 	), nil
 }
 
@@ -130,7 +130,7 @@ func (r *ApiRunner) Post(in Request) (*Response, error) {
 
 	return NewResponse(
 		res,
-		WithJson(jsonRes),
+		WithObject(jsonRes),
 	), nil
 }
 
@@ -157,7 +157,7 @@ func (r *ApiRunner) Put(in Request) (*Response, error) {
 
 	return NewResponse(
 		res,
-		WithJson(jsonRes),
+		WithObject(jsonRes),
 	), nil
 }
 
@@ -184,6 +184,6 @@ func (r *ApiRunner) Patch(in Request) (*Response, error) {
 
 	return NewResponse(
 		res,
-		WithJson(jsonRes),
+		WithObject(jsonRes),
 	), nil
 }

internal/runners/applications.go

@@ -50,7 +50,7 @@ func (r *ApplicationRunner) Get(in Request) (*Response, error) {
 	return NewResponse(
 		"",
 		WithTable(display),
-		WithJson(res),
+		WithObject(res),
 	), nil
 
 }
@@ -71,7 +71,7 @@ func (r *ApplicationRunner) Describe(in Request) (*Response, error) {
 
 	return NewResponse(
 		string(b),
-		WithJson(res),
+		WithObject(res),
 	), nil
 }
 
@@ -137,6 +137,6 @@ func (r *ApplicationRunner) Inspect(in Request) (*Response, error) {
 	return NewResponse(
 		"",
 		WithTable(display),
-		WithJson(res),
+		WithObject(res),
 	), nil
 }

internal/runners/automations.go

@@ -59,7 +59,7 @@ func (r *AutomationRunner) Get(in Request) (*Response, error) {
 	return NewResponse(
 		"",
 		WithTable(display),
-		WithJson(automations),
+		WithObject(automations),
 	), nil
 }
 
@@ -75,7 +75,7 @@ func (r *AutomationRunner) Describe(in Request) (*Response, error) {
 
 	return NewResponse(
 		"",
-		WithJson(res),
+		WithObject(res),
 	), nil
 }
 
@@ -112,7 +112,7 @@ func (r *AutomationRunner) Create(in Request) (*Response, error) {
 
 	return NewResponse(
 		fmt.Sprintf("Successfully created automation `%s`", res.Name),
-		WithJson(res),
+		WithObject(res),
 	), nil
 }
 

internal/runners/command_templates.go

@@ -57,7 +57,7 @@ func (r *CommandTemplateRunner) Get(in Request) (*Response, error) {
 	return NewResponse(
 		"",
 		WithTable(display),
-		WithJson(templates),
+		WithObject(templates),
 	), nil
 
 }
@@ -79,7 +79,7 @@ func (r *CommandTemplateRunner) Describe(in Request) (*Response, error) {
 
 	return NewResponse(
 		strings.Join(output, "\n"),
-		WithJson(res),
+		WithObject(res),
 	), nil
 }
 
@@ -99,7 +99,7 @@ func (r *CommandTemplateRunner) Create(in Request) (*Response, error) {
 
 	return NewResponse(
 		fmt.Sprintf("Successfully created command template `%s` (%s)", res.Name, res.Id),
-		WithJson(res),
+		WithObject(res),
 	), nil
 }
 

internal/runners/config_parsers.go

@@ -43,7 +43,7 @@ func (r *ConfigurationParserRunner) Get(in Request) (*Response, error) {
 	return NewResponse(
 		"",
 		WithTable(display),
-		WithJson(devices),
+		WithObject(devices),
 	), nil
 
 }
@@ -63,7 +63,7 @@ func (r *ConfigurationParserRunner) Describe(in Request) (*Response, error) {
 		return NewResponse(
 			fmt.Sprintf("Name: %s", res.Name),
 			WithUrl(fmt.Sprintf("/configuration_manager/#/devices/%s", res.Name)),
-			WithJson(res),
+			WithObject(res),
 		), nil
 	*/
 }

internal/runners/devicegroups.go

@@ -44,7 +44,7 @@ func (r *DeviceGroupRunner) Get(in Request) (*Response, error) {
 	return NewResponse(
 		"",
 		WithTable(display),
-		WithJson(devices),
+		WithObject(devices),
 	), nil
 
 }
@@ -61,7 +61,6 @@ func (r *DeviceGroupRunner) Describe(in Request) (*Response, error) {
 
 	return NewResponse(
 		fmt.Sprintf("Name: %s", res.Name),
-		WithUrl(fmt.Sprintf("/configuration_manager/#/devices/%s", res.Name)),
-		WithJson(res),
+		WithObject(res),
 	), nil
 }

internal/runners/devices.go

@@ -44,7 +44,7 @@ func (r *DeviceRunner) Get(in Request) (*Response, error) {
 	return NewResponse(
 		"",
 		WithTable(display),
-		WithJson(devices),
+		WithObject(devices),
 	), nil
 
 }
@@ -61,7 +61,6 @@ func (r *DeviceRunner) Describe(in Request) (*Response, error) {
 
 	return NewResponse(
 		fmt.Sprintf("Name: %s", res.Name),
-		WithUrl(fmt.Sprintf("/configuration_manager/#/devices/%s", res.Name)),
-		WithJson(res),
+		WithObject(res),
 	), nil
 }

internal/runners/gctrees.go

@@ -45,7 +45,7 @@ func (r *GoldenConfigRunner) Get(in Request) (*Response, error) {
 
 	return NewResponse(
 		strings.Join(display, "\n"),
-		WithJson(trees),
+		WithObject(trees),
 	), nil
 }
 
@@ -70,7 +70,7 @@ func (r *GoldenConfigRunner) Create(in Request) (*Response, error) {
 
 	return NewResponse(
 		"Successfully create new golden configuration",
-		WithJson(gc),
+		WithObject(gc),
 	), nil
 }
 

internal/runners/groups.go

@@ -49,7 +49,7 @@ func (r *GroupRunner) Get(in Request) (*Response, error) {
 	return NewResponse(
 		"",
 		WithTable(display),
-		WithJson(groups),
+		WithObject(groups),
 	), nil
 
 }
@@ -81,7 +81,7 @@ func (r *GroupRunner) Describe(in Request) (*Response, error) {
 
 	return NewResponse(
 		"",
-		WithJson(grp),
+		WithObject(grp),
 	), nil
 }
 
@@ -104,7 +104,7 @@ func (r *GroupRunner) Create(in Request) (*Response, error) {
 
 	return NewResponse(
 		fmt.Sprintf("Successfully created group `%s`", in.Args[0]),
-		WithJson(res),
+		WithObject(res),
 	), nil
 }
 

internal/runners/integration_models.go

@@ -44,7 +44,7 @@ func (r *IntegrationModelRunner) Get(in Request) (*Response, error) {
 	return NewResponse(
 		"",
 		WithTable(display),
-		WithJson(res),
+		WithObject(res),
 	), nil
 
 }
@@ -62,7 +62,7 @@ func (r *IntegrationModelRunner) Describe(in Request) (*Response, error) {
 
 	return NewResponse(
 		fmt.Sprintf("Name: %s", res.Model),
-		WithJson(res),
+		WithObject(res),
 	), nil
 }