From e90cfb64c75ca4e8f5127843339f9cde38b78cd6 Mon Sep 17 00:00:00 2001 From: Ranjib Dey Date: Wed, 3 Aug 2016 13:53:26 -0700 Subject: [PATCH] Decode event API response. Update readme to reflect subdomain is not needed for usage --- README.md | 3 +-- event.go | 17 +++++++++++------ 2 files changed, 12 insertions(+), 8 deletions(-) diff --git a/README.md b/README.md index 7b80b4ee..997c9542 100644 --- a/README.md +++ b/README.md @@ -23,12 +23,11 @@ import ( "github.com/PagerDuty/go-pagerduty" ) -var subdomain = "" // Set your account name here var authtoken = "" // Set your auth token here func main() { var opts pagerduty.ListEscalationPoliciesOptions - client := pagerduty.NewClient(subdomain, authtoken) + client := pagerduty.NewClient(authtoken) if eps, err := client.ListEscalationPolicies(opts); err != nil { panic(err) } else { diff --git a/event.go b/event.go index 8c6ca167..0b0c71b6 100644 --- a/event.go +++ b/event.go @@ -22,12 +22,12 @@ type Event struct { } type EventResponse struct { - Status string - Message string - IncidentKey string + Status string `json:"status"` + Message string `json:"message"` + IncidentKey string `json:"incident_key"` } -func CreateEvent(e Event) (*http.Response, error) { +func CreateEvent(e Event) (*EventResponse, error) { log.Debugln("Endpoint:", EventEndPoint) data, err := json.Marshal(e) if err != nil { @@ -41,7 +41,12 @@ func CreateEvent(e Event) (*http.Response, error) { return nil, err } if resp.StatusCode != http.StatusOK { - return resp, fmt.Errorf("HTTP Status Code: %d", resp.StatusCode) + return nil, fmt.Errorf("HTTP Status Code: %d", resp.StatusCode) } - return resp, nil + var eventResponse EventResponse + defer resp.Body.Close() + if err := json.NewDecoder(resp.Body).Decode(&eventResponse); err != nil { + return nil, err + } + return &eventResponse, nil }