un-gzip if content encoding header present

api/allocations_test.go

@@ -297,7 +297,8 @@ func TestAllocations_ExecErrors(t *testing.T) {
 	// make a request that will result in an error
 	// ensure the error is what we expect
 	_, err := a.Exec(context.Background(), alloc, "bar", false, []string{"command"}, os.Stdin, os.Stdout, os.Stderr, sizeCh, nil)
-	require.Equal(t, err.Error(), "Unexpected response code: 301")
+	require.Contains(t, err.Error(), "Unexpected response code: 301")
+	require.Contains(t, err.Error(), "Moved Permanently")
 }
 
 func TestAllocations_ShouldMigrate(t *testing.T) {

api/api.go

@@ -741,8 +741,20 @@ func (c *Client) websocket(endpoint string, q *QueryOptions) (*websocket.Conn, *
 
 	// check resp status code, as it's more informative than handshake error we get from ws library
 	if resp != nil && resp.StatusCode != 101 {
+		var buf bytes.Buffer
+
+		if resp.Header.Get("Content-Encoding") == "gzip" {
+			greader, err := gzip.NewReader(resp.Body)
+			if err != nil {
+				return nil, nil, fmt.Errorf("Unexpected response code: %d", resp.StatusCode)
+			}
+			io.Copy(&buf, greader)
+		} else {
+			io.Copy(&buf, resp.Body)
+		}
 		resp.Body.Close()
-		return nil, nil, fmt.Errorf("Unexpected response code: %d", resp.StatusCode)
+
+		return nil, nil, fmt.Errorf("Unexpected response code: %d (%s)", resp.StatusCode, buf.Bytes())
 	}
 
 	return conn, resp, err