Merge pull request #39 from tavisto/error_message_imporovements

Added response body output whenever marathon throws back an error.
shoenig · Jul 22, 2017 · ebb6c40 · ebb6c40
2 parents ed575eb + b07c5e9
commit ebb6c40
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 9 deletions.
diff --git a/app.go b/app.go
@@ -237,7 +237,7 @@ func (a AppUpdate) update(id string, body io.ReadCloser) {
 	Check(e == nil, "failed to get response", e)
 	defer response.Body.Close()
 	sc := response.StatusCode
-	Check(sc == 200, "bad status code", sc)
+	Check(sc == 200, "bad status code", sc, a.format.Format(response.Body, a.Humanize))
 	fmt.Println(a.format.Format(response.Body, a.Humanize))
 }
 
@@ -289,7 +289,7 @@ func (a AppDestroy) Apply(args []string) {
 	Check(e == nil, "destroy app failed", e)
 	c := response.StatusCode
 	// documentation says this is 204, wtf
-	Check(c == 200, "destroy app bad status", c)
+	Check(c == 200, "destroy app bad status", c, a.format.Format(response.Body, a.Humanize))
 	defer response.Body.Close()
 	fmt.Println(a.format.Format(response.Body, a.Humanize))
 }

diff --git a/client.go b/client.go
@@ -77,7 +77,7 @@ func getTransportConfig(insecure bool) *http.Transport {
 	cfg := &tls.Config{}
 	cfg.InsecureSkipVerify = insecure
 	return &http.Transport{
-		Proxy: http.ProxyFromEnvironment,
+		Proxy:              http.ProxyFromEnvironment,
 		TLSClientConfig:    cfg,
 		DisableCompression: true,
 	}

diff --git a/group.go b/group.go
@@ -113,7 +113,7 @@ func (g GroupDestroy) Apply(args []string) {
 	defer response.Body.Close()
 	c := response.StatusCode
 	Check(c != 404, "unknown group")
-	Check(c == 200, "destroy group bad status", c)
+	Check(c == 200, "destroy group bad status", c, g.format.Format(response.Body, g.Humanize))
 
 	fmt.Println(g.format.Format(response.Body, g.Humanize))
 }
@@ -145,7 +145,7 @@ func (g GroupUpdate) Apply(args []string) {
 	defer response.Body.Close()
 
 	sc := response.StatusCode
-	Check(sc == 200, "bad status code", sc)
+	Check(sc == 200, "bad status code", sc, g.format.Format(response.Body, g.Humanize))
 
 	fmt.Println(g.format.Format(response.Body, g.Humanize))
 }

diff --git a/marathon.go b/marathon.go
@@ -81,7 +81,7 @@ func (l MarathonLeader) Apply(args []string) {
 	response, e := l.client.Do(request)
 	Check(e == nil, "get leader failed", e)
 	c := response.StatusCode
-	Check(c == 200, "get leader bad status", c)
+	Check(c == 200, "get leader bad status", c, l.format.Format(response.Body, l.Humanize))
 	defer response.Body.Close()
 	fmt.Println(l.format.Format(response.Body, l.Humanize))
 }
@@ -106,7 +106,7 @@ func (a MarathonAbdicate) Apply(args []string) {
 	response, e := a.client.Do(request)
 	Check(e == nil, "abdicate request failed", e)
 	c := response.StatusCode
-	Check(c == 200, "abdicate bad status", c)
+	Check(c == 200, "abdicate bad status", c, a.format.Format(response.Body, a.Humanize))
 	defer response.Body.Close()
 	fmt.Println(a.format.Format(response.Body, a.Humanize))
 }

diff --git a/task.go b/task.go
@@ -114,7 +114,7 @@ func (t TaskKill) killAll(id string) {
 
 	sc := response.StatusCode
 	Check(sc != 404, "unknown id")
-	Check(sc == 200, "failed with status code", sc)
+	Check(sc == 200, "failed with status code", sc, t.format.Format(response.Body, t.Humanize))
 	t.format.Format(response.Body, t.Humanize)
 }
 
@@ -128,7 +128,7 @@ func (t TaskKill) killOnly(id, taskid string) {
 	defer response.Body.Close()
 	sc := response.StatusCode
 	Check(sc != 404, "unknown appid or taskid")
-	Check(sc == 200, "failed with status code", sc)
+	Check(sc == 200, "failed with status code", sc, t.format.Format(response.Body, t.Humanize))
 	t.format.Format(response.Body, t.Humanize)
 }