command: selectable output formats (JSON/YAML)

README.md

@@ -28,7 +28,25 @@ Example of config file:
 authtoken: fooBar
 ```
 
+#### Output formats
+
+YAML and JSON output formats are supported. The default is YAML.
+
+The key `outputformat` can be set in `.pd.yml`:
+
+```yaml
+authtoken: yourtokenhere
+outputformat: json
+```
+
+Alternatively, the `--outputformat` command line flag can be used:
+
+```
+pd incident list --outputformat=json
+```
+
 #### Commands
+
 `pd` command provides a single entrypoint for all the API endpoints, with individual
 API represented by their own sub commands. For an exhaustive list of sub-commands, try:
 ```

command/addon_install.go

@@ -6,8 +6,8 @@ import (
 	"os"
 	"strings"
 
-	"github.com/mitchellh/cli"
 	"github.com/PagerDuty/go-pagerduty"
+	"github.com/mitchellh/cli"
 	log "github.com/sirupsen/logrus"
 )
 

command/addon_list.go

@@ -2,11 +2,11 @@ package main
 
 import (
 	"fmt"
+	"strings"
+
 	"github.com/PagerDuty/go-pagerduty"
-	log "github.com/sirupsen/logrus"
 	"github.com/mitchellh/cli"
-	"gopkg.in/yaml.v2"
-	"strings"
+	log "github.com/sirupsen/logrus"
 )
 
 type AddonList struct {
@@ -62,9 +62,8 @@ func (c *AddonList) Run(args []string) int {
 		log.Error(err)
 		return -1
 	} else {
-		for i, addon := range addonList.Addons {
-			fmt.Println("Entry: ", i)
-			data, err := yaml.Marshal(addon)
+		for _, addon := range addonList.Addons {
+			data, err := c.Marshaler(addon)
 			if err != nil {
 				log.Error(err)
 				return -1

command/addon_show.go

@@ -4,7 +4,6 @@ import (
 	"fmt"
 	log "github.com/sirupsen/logrus"
 	"github.com/mitchellh/cli"
-	"gopkg.in/yaml.v2"
 	"strings"
 )
 
@@ -48,7 +47,7 @@ func (c *AddonShow) Run(args []string) int {
 		log.Error(err)
 		return -1
 	}
-	data, err := yaml.Marshal(a)
+	data, err := c.Marshaler(a)
 	if err != nil {
 		log.Error(err)
 		return -1

command/addon_update.go

@@ -3,10 +3,11 @@ package main
 import (
 	"encoding/json"
 	"fmt"
+	"strings"
+
 	"github.com/PagerDuty/go-pagerduty"
-	log "github.com/sirupsen/logrus"
 	"github.com/mitchellh/cli"
-	"strings"
+	log "github.com/sirupsen/logrus"
 )
 
 type AddonUpdate struct {

command/analytics_incident_show.go

@@ -2,7 +2,6 @@ package main
 
 import (
 	"context"
-	"encoding/json"
 	"fmt"
 	"strings"
 	"time"
@@ -99,7 +98,7 @@ func (c *AnalyticsShow) Run(args []string) int {
 		return -1
 	}
 
-	aggregatedIncidentDataBytes, err := json.Marshal(aggregatedIncidentData)
+	aggregatedIncidentDataBytes, err := c.Marshaler(aggregatedIncidentData)
 	if err != nil {
 		log.Error(err)
 		return -1

command/analytics_service_show.go

@@ -2,7 +2,6 @@ package main
 
 import (
 	"context"
-	"encoding/json"
 	"fmt"
 	"strings"
 	"time"
@@ -97,7 +96,7 @@ func (c *AnalyticsServiceShow) Run(args []string) int {
 		return -1
 	}
 
-	aggregatedServiceDataBytes, err := json.Marshal(aggregatedServiceData)
+	aggregatedServiceDataBytes, err := c.Marshaler(aggregatedServiceData)
 	if err != nil {
 		log.Error(err)
 		return -1

command/analytics_team_show.go

@@ -2,7 +2,6 @@ package main
 
 import (
 	"context"
-	"encoding/json"
 	"fmt"
 	"strings"
 	"time"
@@ -97,7 +96,7 @@ func (c *AnalyticsTeamShow) Run(args []string) int {
 		return -1
 	}
 
-	aggregatedTeamDataBytes, err := json.Marshal(aggregatedTeamData)
+	aggregatedTeamDataBytes, err := c.Marshaler(aggregatedTeamData)
 	if err != nil {
 		log.Error(err)
 		return -1

command/escalation_policy_create.go

@@ -3,11 +3,12 @@ package main
 import (
 	"encoding/json"
 	"fmt"
-	"github.com/PagerDuty/go-pagerduty"
-	log "github.com/sirupsen/logrus"
-	"github.com/mitchellh/cli"
 	"os"
 	"strings"
+
+	"github.com/PagerDuty/go-pagerduty"
+	"github.com/mitchellh/cli"
+	log "github.com/sirupsen/logrus"
 )
 
 type EscalationPolicyCreate struct {

command/escalation_policy_list.go

@@ -2,11 +2,11 @@ package main
 
 import (
 	"fmt"
+	"strings"
+
 	"github.com/PagerDuty/go-pagerduty"
-	log "github.com/sirupsen/logrus"
 	"github.com/mitchellh/cli"
-	"gopkg.in/yaml.v2"
-	"strings"
+	log "github.com/sirupsen/logrus"
 )
 
 type EscalationPolicyList struct {
@@ -72,9 +72,8 @@ func (c *EscalationPolicyList) Run(args []string) int {
 		log.Error(err)
 		return -1
 	} else {
-		for i, p := range eps.EscalationPolicies {
-			fmt.Println("Entry: ", i)
-			data, err := yaml.Marshal(p)
+		for _, p := range eps.EscalationPolicies {
+			data, err := c.Marshaler(p)
 			if err != nil {
 				log.Error(err)
 				return -1

command/escalation_policy_show.go

@@ -5,7 +5,6 @@ import (
 	"github.com/PagerDuty/go-pagerduty"
 	log "github.com/sirupsen/logrus"
 	"github.com/mitchellh/cli"
-	"gopkg.in/yaml.v2"
 	"strings"
 )
 
@@ -62,7 +61,7 @@ func (c *EscalationPolicyShow) Run(args []string) int {
 		log.Error(err)
 		return -1
 	}
-	data, err := yaml.Marshal(ep)
+	data, err := c.Marshaler(ep)
 	if err != nil {
 		log.Error(err)
 		return -1

command/event_orchestration_list.go

@@ -8,7 +8,6 @@ import (
 	"github.com/PagerDuty/go-pagerduty"
 	"github.com/mitchellh/cli"
 	log "github.com/sirupsen/logrus"
-	"gopkg.in/yaml.v2"
 )
 
 type EventOrchestrationList struct {
@@ -62,7 +61,7 @@ func (c *EventOrchestrationList) Run(args []string) int {
 			if i > 0 {
 				fmt.Println("---")
 			}
-			data, err := yaml.Marshal(p)
+			data, err := c.Marshaler(p)
 			if err != nil {
 				log.Error(err)
 				return -1

command/event_orchestration_show.go

@@ -8,7 +8,6 @@ import (
 	"github.com/PagerDuty/go-pagerduty"
 	"github.com/mitchellh/cli"
 	log "github.com/sirupsen/logrus"
-	"gopkg.in/yaml.v2"
 )
 
 type EventOrchestrationShow struct {
@@ -59,7 +58,7 @@ func (c *EventOrchestrationShow) Run(args []string) int {
 		log.Error(err)
 		return -1
 	}
-	data, err := yaml.Marshal(ep)
+	data, err := c.Marshaler(ep)
 	if err != nil {
 		log.Error(err)
 		return -1
@@ -73,7 +72,7 @@ func (c *EventOrchestrationShow) Run(args []string) int {
 		log.Error(err)
 		return -1
 	}
-	data, err = yaml.Marshal(rules)
+	data, err = c.Marshaler(rules)
 	if err != nil {
 		log.Error(err)
 		return -1

command/event_v2_manage.go

@@ -7,8 +7,8 @@ import (
 	"strings"
 
 	pagerduty "github.com/PagerDuty/go-pagerduty"
-	log "github.com/sirupsen/logrus"
 	"github.com/mitchellh/cli"
+	log "github.com/sirupsen/logrus"
 )
 
 type EventV2Manage struct {

command/incident_list.go

@@ -2,11 +2,11 @@ package main
 
 import (
 	"fmt"
+	"strings"
+
 	"github.com/PagerDuty/go-pagerduty"
-	log "github.com/sirupsen/logrus"
 	"github.com/mitchellh/cli"
-	"gopkg.in/yaml.v2"
-	"strings"
+	log "github.com/sirupsen/logrus"
 )
 
 type IncidentList struct {
@@ -60,9 +60,8 @@ func (c *IncidentList) Run(args []string) int {
 		log.Error(err)
 		return -1
 	} else {
-		for i, incident := range incidentList.Incidents {
-			fmt.Println("Entry: ", i+1)
-			data, err := yaml.Marshal(incident)
+		for _, incident := range incidentList.Incidents {
+			data, err := c.Marshaler(incident)
 			if err != nil {
 				log.Error(err)
 				return -1

command/maintenance_window_create.go

@@ -3,11 +3,12 @@ package main
 import (
 	"encoding/json"
 	"fmt"
-	"github.com/PagerDuty/go-pagerduty"
-	log "github.com/sirupsen/logrus"
-	"github.com/mitchellh/cli"
 	"os"
 	"strings"
+
+	"github.com/PagerDuty/go-pagerduty"
+	"github.com/mitchellh/cli"
+	log "github.com/sirupsen/logrus"
 )
 
 type MaintenanceWindowCreate struct {

command/maintenance_window_list.go

@@ -8,7 +8,6 @@ import (
 	"github.com/PagerDuty/go-pagerduty"
 	"github.com/mitchellh/cli"
 	log "github.com/sirupsen/logrus"
-	"gopkg.in/yaml.v2"
 )
 
 type MaintenanceWindowList struct {
@@ -73,9 +72,8 @@ func (c *MaintenanceWindowList) Run(args []string) int {
 		return -1
 	}
 
-	for i, mw := range mws.MaintenanceWindows {
-		fmt.Println("Entry: ", i)
-		data, err := yaml.Marshal(mw)
+	for _, mw := range mws.MaintenanceWindows {
+		data, err := c.Marshaler(mw)
 		if err != nil {
 			log.Error(err)
 			return -1

command/maintenance_window_show.go

@@ -8,7 +8,6 @@ import (
 	"github.com/PagerDuty/go-pagerduty"
 	"github.com/mitchellh/cli"
 	log "github.com/sirupsen/logrus"
-	"gopkg.in/yaml.v2"
 )
 
 type MaintenanceWindowShow struct {
@@ -68,7 +67,7 @@ func (c *MaintenanceWindowShow) Run(args []string) int {
 		return -1
 	}
 
-	data, err := yaml.Marshal(mw)
+	data, err := c.Marshaler(mw)
 	if err != nil {
 		log.Error(err)
 		return -1