Skip to content

Commit

Permalink
client: improve error messaging on crash
Browse files Browse the repository at this point in the history
Before this change, you would see an error message like:

```
error waiting for container: invalid character 's' looking for beginning of value
```

here's an example:

docker/for-mac#6575 (comment)

After this change, you get an error message like:

```
error waiting for container: copying response body from Docker: unexpected EOF
```

which is a bit more explieict.

Signed-off-by: Nick Santos <[email protected]>
  • Loading branch information
nicks committed Dec 22, 2022
1 parent 3330fc2 commit 94a123e
Show file tree
Hide file tree
Showing 2 changed files with 46 additions and 2 deletions.
21 changes: 19 additions & 2 deletions client/container_wait.go
Original file line number Diff line number Diff line change
@@ -1,12 +1,15 @@
package client // import "github.com/docker/docker/client"

import (
"bytes"
"context"
"encoding/json"
"io"
"net/url"

"github.com/docker/docker/api/types/container"
"github.com/docker/docker/api/types/versions"
"github.com/pkg/errors"
)

// ContainerWait waits until the specified container is in a certain state
Expand Down Expand Up @@ -46,9 +49,23 @@ func (cli *Client) ContainerWait(ctx context.Context, containerID string, condit

go func() {
defer ensureReaderClosed(resp)

body := resp.body
responseText := bytes.NewBuffer(nil)
stream := io.TeeReader(body, responseText)

var res container.WaitResponse
if err := json.NewDecoder(resp.body).Decode(&res); err != nil {
errC <- err
if err := json.NewDecoder(stream).Decode(&res); err != nil {
// NOTE(nicks): The /wait API does not work well with HTTP proxies.
// At any time, the proxy could cut off the response stream.
//
// But because the HTTP status has already been written, the proxy's
// only option is to write a plaintext error message.
//
// If there's a JSON parsing error, read the real error message
// off the body and send it to the client.
_, _ = io.ReadAll(stream)
errC <- errors.New(responseText.String())
return
}

Expand Down
27 changes: 27 additions & 0 deletions client/container_wait_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,33 @@ func TestContainerWait(t *testing.T) {
}
}

func TestContainerWaitProxyInterrupt(t *testing.T) {
expectedURL := "/v1.30/containers/container_id/wait"
msg := "copying response body from Docker: unexpected EOF"
client := &Client{
version: "1.30",
client: newMockClient(func(req *http.Request) (*http.Response, error) {
if !strings.HasPrefix(req.URL.Path, expectedURL) {
return nil, fmt.Errorf("Expected URL '%s', got '%s'", expectedURL, req.URL)
}
return &http.Response{
StatusCode: http.StatusOK,
Body: io.NopCloser(strings.NewReader(msg)),
}, nil
}),
}

resultC, errC := client.ContainerWait(context.Background(), "container_id", "")
select {
case err := <-errC:
if !strings.Contains(err.Error(), msg) {
t.Fatalf("Expected: %s, Actual: %s", msg, err.Error())
}
case result := <-resultC:
t.Fatalf("Unexpected result: %v", result)
}
}

func ExampleClient_ContainerWait_withTimeout() {
ctx, cancel := context.WithTimeout(context.Background(), 5*time.Second)
defer cancel()
Expand Down

0 comments on commit 94a123e

Please sign in to comment.