mirror of
https://github.com/moby/moby.git
synced 2026-01-11 18:51:37 +00:00
9fc12daf80
The `force` option on volume remove was added in [moby@6c5c34d] (docker 1.13.0-rc1, API v1.25), but did not gate the feature to API version, so effectively introduced it to all existing API versions. After this, [moby@e98e4a7] enabled experimental features by default, and added API version gates, but only did so on the client side, so the daemon / API server would continue to accept the `force` option on any API version. Let's remove this code, given that: - API v1.24 is the oldest API version we still handle, and only as fallback. - This code silently discards the user's option (no warning / error) - Every current version of the daemon handles the option, regardless of API version (only a 9+ year old daemon wouldn't handle it). [moby@6c5c34d]:6c5c34d50d[moby@e98e4a7]:e98e4a7111Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
65 lines
2.0 KiB
Go
65 lines
2.0 KiB
Go
package client
|
|
|
|
import (
|
|
"bytes"
|
|
"context"
|
|
"fmt"
|
|
"io"
|
|
"net/http"
|
|
"testing"
|
|
|
|
cerrdefs "github.com/containerd/errdefs"
|
|
"gotest.tools/v3/assert"
|
|
is "gotest.tools/v3/assert/cmp"
|
|
)
|
|
|
|
func TestVolumeRemoveError(t *testing.T) {
|
|
client, err := NewClientWithOpts(WithMockClient(errorMock(http.StatusInternalServerError, "Server error")))
|
|
assert.NilError(t, err)
|
|
|
|
err = client.VolumeRemove(context.Background(), "volume_id", false)
|
|
assert.Check(t, is.ErrorType(err, cerrdefs.IsInternal))
|
|
|
|
err = client.VolumeRemove(context.Background(), "", false)
|
|
assert.Check(t, is.ErrorType(err, cerrdefs.IsInvalidArgument))
|
|
assert.Check(t, is.ErrorContains(err, "value is empty"))
|
|
|
|
err = client.VolumeRemove(context.Background(), " ", false)
|
|
assert.Check(t, is.ErrorType(err, cerrdefs.IsInvalidArgument))
|
|
assert.Check(t, is.ErrorContains(err, "value is empty"))
|
|
}
|
|
|
|
// TestVolumeRemoveConnectionError verifies that connection errors occurring
|
|
// during API-version negotiation are not shadowed by API-version errors.
|
|
//
|
|
// Regression test for https://github.com/docker/cli/issues/4890
|
|
func TestVolumeRemoveConnectionError(t *testing.T) {
|
|
client, err := NewClientWithOpts(WithAPIVersionNegotiation(), WithHost("tcp://no-such-host.invalid"))
|
|
assert.NilError(t, err)
|
|
|
|
err = client.VolumeRemove(context.Background(), "volume_id", false)
|
|
assert.Check(t, is.ErrorType(err, IsErrConnectionFailed))
|
|
}
|
|
|
|
func TestVolumeRemove(t *testing.T) {
|
|
const expectedURL = "/volumes/volume_id"
|
|
|
|
client, err := NewClientWithOpts(WithMockClient(func(req *http.Request) (*http.Response, error) {
|
|
if err := assertRequest(req, http.MethodDelete, expectedURL); err != nil {
|
|
return nil, err
|
|
}
|
|
if v := req.URL.Query().Get("force"); v != "1" {
|
|
return nil, fmt.Errorf("expected force=1, got %s", v)
|
|
}
|
|
|
|
return &http.Response{
|
|
StatusCode: http.StatusOK,
|
|
Body: io.NopCloser(bytes.NewReader([]byte("body"))),
|
|
}, nil
|
|
}))
|
|
assert.NilError(t, err)
|
|
|
|
err = client.VolumeRemove(context.Background(), "volume_id", true)
|
|
assert.NilError(t, err)
|
|
}
|