9c846b2fcc
Unlike a plain `net/http/client.Do()`, requests made through client/request use the `sendRequest` function, which parses the server response, and may convert non-transport errors into errors (through `cli.checkResponseErr()`). This means that we cannot assume that no reader was opened if an error is returned. This patch changes various locations where `ensureReaderClosed` was only called in the non-error situation, and uses a `defer` to make sure it's always called. `ensureReaderClosed` itself already checks if the response's body was set, so in situations where the error was due to a transport error, calling `ensureReaderClosed` should be a no-op. Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
37 lines
1.1 KiB
Go
37 lines
1.1 KiB
Go
package client // import "github.com/docker/docker/client"
|
|
|
|
import (
|
|
"bytes"
|
|
"context"
|
|
"encoding/json"
|
|
"fmt"
|
|
"io/ioutil"
|
|
"net/url"
|
|
|
|
"github.com/docker/docker/api/types"
|
|
"github.com/docker/docker/api/types/swarm"
|
|
)
|
|
|
|
// ServiceInspectWithRaw returns the service information and the raw data.
|
|
func (cli *Client) ServiceInspectWithRaw(ctx context.Context, serviceID string, opts types.ServiceInspectOptions) (swarm.Service, []byte, error) {
|
|
if serviceID == "" {
|
|
return swarm.Service{}, nil, objectNotFoundError{object: "service", id: serviceID}
|
|
}
|
|
query := url.Values{}
|
|
query.Set("insertDefaults", fmt.Sprintf("%v", opts.InsertDefaults))
|
|
serverResp, err := cli.get(ctx, "/services/"+serviceID, query, nil)
|
|
defer ensureReaderClosed(serverResp)
|
|
if err != nil {
|
|
return swarm.Service{}, nil, wrapResponseError(err, serverResp, "service", serviceID)
|
|
}
|
|
|
|
body, err := ioutil.ReadAll(serverResp.body)
|
|
if err != nil {
|
|
return swarm.Service{}, nil, err
|
|
}
|
|
|
|
var response swarm.Service
|
|
rdr := bytes.NewReader(body)
|
|
err = json.NewDecoder(rdr).Decode(&response)
|
|
return response, body, err
|
|
}
|