diff --git a/client/checkpoint_delete.go b/client/checkpoint_delete.go deleted file mode 100644 index df1a44ce50..0000000000 --- a/client/checkpoint_delete.go +++ /dev/null @@ -1,29 +0,0 @@ -package client - -import ( - "context" - "net/url" -) - -// CheckpointDeleteOptions holds parameters to delete a checkpoint from a container. -type CheckpointDeleteOptions struct { - CheckpointID string - CheckpointDir string -} - -// CheckpointDelete deletes the checkpoint with the given name from the given container. -func (cli *Client) CheckpointDelete(ctx context.Context, containerID string, options CheckpointDeleteOptions) error { - containerID, err := trimID("container", containerID) - if err != nil { - return err - } - - query := url.Values{} - if options.CheckpointDir != "" { - query.Set("dir", options.CheckpointDir) - } - - resp, err := cli.delete(ctx, "/containers/"+containerID+"/checkpoints/"+options.CheckpointID, query, nil) - defer ensureReaderClosed(resp) - return err -} diff --git a/client/checkpoint_remove.go b/client/checkpoint_remove.go new file mode 100644 index 0000000000..8042c50882 --- /dev/null +++ b/client/checkpoint_remove.go @@ -0,0 +1,34 @@ +package client + +import ( + "context" + "net/url" +) + +// CheckpointRemoveOptions holds parameters to delete a checkpoint from a container. +type CheckpointRemoveOptions struct { + CheckpointID string + CheckpointDir string +} + +// CheckpointRemoveResult represents the result of [Client.CheckpointRemove]. +type CheckpointRemoveResult struct { + // No fields currently; placeholder for future use. +} + +// CheckpointRemove deletes the checkpoint with the given name from the given container. +func (cli *Client) CheckpointRemove(ctx context.Context, containerID string, options CheckpointRemoveOptions) (CheckpointRemoveResult, error) { + containerID, err := trimID("container", containerID) + if err != nil { + return CheckpointRemoveResult{}, err + } + + query := url.Values{} + if options.CheckpointDir != "" { + query.Set("dir", options.CheckpointDir) + } + + resp, err := cli.delete(ctx, "/containers/"+containerID+"/checkpoints/"+options.CheckpointID, query, nil) + defer ensureReaderClosed(resp) + return CheckpointRemoveResult{}, err +} diff --git a/client/checkpoint_delete_test.go b/client/checkpoint_remove_test.go similarity index 75% rename from client/checkpoint_delete_test.go rename to client/checkpoint_remove_test.go index f038932a29..f67f37eb03 100644 --- a/client/checkpoint_delete_test.go +++ b/client/checkpoint_remove_test.go @@ -1,7 +1,6 @@ package client import ( - "context" "net/http" "testing" @@ -16,17 +15,17 @@ func TestCheckpointDeleteError(t *testing.T) { ) assert.NilError(t, err) - err = client.CheckpointDelete(context.Background(), "container_id", CheckpointDeleteOptions{ + _, err = client.CheckpointRemove(t.Context(), "container_id", CheckpointRemoveOptions{ CheckpointID: "checkpoint_id", }) assert.Check(t, is.ErrorType(err, cerrdefs.IsInternal)) - err = client.CheckpointDelete(context.Background(), "", CheckpointDeleteOptions{}) + _, err = client.CheckpointRemove(t.Context(), "", CheckpointRemoveOptions{}) assert.Check(t, is.ErrorType(err, cerrdefs.IsInvalidArgument)) assert.Check(t, is.ErrorContains(err, "value is empty")) - err = client.CheckpointDelete(context.Background(), " ", CheckpointDeleteOptions{}) + _, err = client.CheckpointRemove(t.Context(), " ", CheckpointRemoveOptions{}) assert.Check(t, is.ErrorType(err, cerrdefs.IsInvalidArgument)) assert.Check(t, is.ErrorContains(err, "value is empty")) } @@ -44,7 +43,7 @@ func TestCheckpointDelete(t *testing.T) { ) assert.NilError(t, err) - err = client.CheckpointDelete(context.Background(), "container_id", CheckpointDeleteOptions{ + _, err = client.CheckpointRemove(t.Context(), "container_id", CheckpointRemoveOptions{ CheckpointID: "checkpoint_id", }) assert.NilError(t, err) diff --git a/client/client_interfaces.go b/client/client_interfaces.go index 718127df50..4bbd45a6e5 100644 --- a/client/client_interfaces.go +++ b/client/client_interfaces.go @@ -56,7 +56,7 @@ type HijackDialer interface { // enabled. type CheckpointAPIClient interface { CheckpointCreate(ctx context.Context, container string, options CheckpointCreateOptions) (CheckpointCreateResult, error) - CheckpointDelete(ctx context.Context, container string, options CheckpointDeleteOptions) error + CheckpointRemove(ctx context.Context, container string, options CheckpointRemoveOptions) (CheckpointRemoveResult, error) CheckpointList(ctx context.Context, container string, options CheckpointListOptions) (CheckpointListResult, error) } diff --git a/integration/container/checkpoint_test.go b/integration/container/checkpoint_test.go index b9c81f395e..5a9c02a723 100644 --- a/integration/container/checkpoint_test.go +++ b/integration/container/checkpoint_test.go @@ -132,7 +132,7 @@ func TestCheckpoint(t *testing.T) { r.AssertSuccess(t) for _, id := range []string{"test", "test2"} { - err = apiClient.CheckpointDelete(ctx, cID, client.CheckpointDeleteOptions{ + _, err = apiClient.CheckpointRemove(ctx, cID, client.CheckpointRemoveOptions{ CheckpointID: id, }) assert.NilError(t, err) diff --git a/vendor/github.com/moby/moby/client/checkpoint_delete.go b/vendor/github.com/moby/moby/client/checkpoint_delete.go deleted file mode 100644 index df1a44ce50..0000000000 --- a/vendor/github.com/moby/moby/client/checkpoint_delete.go +++ /dev/null @@ -1,29 +0,0 @@ -package client - -import ( - "context" - "net/url" -) - -// CheckpointDeleteOptions holds parameters to delete a checkpoint from a container. -type CheckpointDeleteOptions struct { - CheckpointID string - CheckpointDir string -} - -// CheckpointDelete deletes the checkpoint with the given name from the given container. -func (cli *Client) CheckpointDelete(ctx context.Context, containerID string, options CheckpointDeleteOptions) error { - containerID, err := trimID("container", containerID) - if err != nil { - return err - } - - query := url.Values{} - if options.CheckpointDir != "" { - query.Set("dir", options.CheckpointDir) - } - - resp, err := cli.delete(ctx, "/containers/"+containerID+"/checkpoints/"+options.CheckpointID, query, nil) - defer ensureReaderClosed(resp) - return err -} diff --git a/vendor/github.com/moby/moby/client/checkpoint_remove.go b/vendor/github.com/moby/moby/client/checkpoint_remove.go new file mode 100644 index 0000000000..8042c50882 --- /dev/null +++ b/vendor/github.com/moby/moby/client/checkpoint_remove.go @@ -0,0 +1,34 @@ +package client + +import ( + "context" + "net/url" +) + +// CheckpointRemoveOptions holds parameters to delete a checkpoint from a container. +type CheckpointRemoveOptions struct { + CheckpointID string + CheckpointDir string +} + +// CheckpointRemoveResult represents the result of [Client.CheckpointRemove]. +type CheckpointRemoveResult struct { + // No fields currently; placeholder for future use. +} + +// CheckpointRemove deletes the checkpoint with the given name from the given container. +func (cli *Client) CheckpointRemove(ctx context.Context, containerID string, options CheckpointRemoveOptions) (CheckpointRemoveResult, error) { + containerID, err := trimID("container", containerID) + if err != nil { + return CheckpointRemoveResult{}, err + } + + query := url.Values{} + if options.CheckpointDir != "" { + query.Set("dir", options.CheckpointDir) + } + + resp, err := cli.delete(ctx, "/containers/"+containerID+"/checkpoints/"+options.CheckpointID, query, nil) + defer ensureReaderClosed(resp) + return CheckpointRemoveResult{}, err +} diff --git a/vendor/github.com/moby/moby/client/client_interfaces.go b/vendor/github.com/moby/moby/client/client_interfaces.go index 718127df50..4bbd45a6e5 100644 --- a/vendor/github.com/moby/moby/client/client_interfaces.go +++ b/vendor/github.com/moby/moby/client/client_interfaces.go @@ -56,7 +56,7 @@ type HijackDialer interface { // enabled. type CheckpointAPIClient interface { CheckpointCreate(ctx context.Context, container string, options CheckpointCreateOptions) (CheckpointCreateResult, error) - CheckpointDelete(ctx context.Context, container string, options CheckpointDeleteOptions) error + CheckpointRemove(ctx context.Context, container string, options CheckpointRemoveOptions) (CheckpointRemoveResult, error) CheckpointList(ctx context.Context, container string, options CheckpointListOptions) (CheckpointListResult, error) }