From 5cc1e5f800c86e90b4ffff940cf666721280f7d1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pawe=C5=82=20Gronowski?= Date: Mon, 20 Oct 2025 20:14:49 +0200 Subject: [PATCH] client/build_cancel: Wrap options and result MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Paweł Gronowski --- client/build_cancel.go | 6 ++++-- client/client_interfaces.go | 2 +- vendor/github.com/moby/moby/client/build_cancel.go | 6 ++++-- vendor/github.com/moby/moby/client/client_interfaces.go | 2 +- 4 files changed, 10 insertions(+), 6 deletions(-) diff --git a/client/build_cancel.go b/client/build_cancel.go index c9bea9d006..f6cfc6bc91 100644 --- a/client/build_cancel.go +++ b/client/build_cancel.go @@ -7,13 +7,15 @@ import ( type BuildCancelOptions struct{} +type BuildCancelResult struct{} + // BuildCancel requests the daemon to cancel the ongoing build request // with the given id. -func (cli *Client) BuildCancel(ctx context.Context, id string, _ BuildCancelOptions) error { +func (cli *Client) BuildCancel(ctx context.Context, id string, _ BuildCancelOptions) (BuildCancelResult, error) { query := url.Values{} query.Set("id", id) resp, err := cli.post(ctx, "/build/cancel", query, nil, nil) defer ensureReaderClosed(resp) - return err + return BuildCancelResult{}, err } diff --git a/client/client_interfaces.go b/client/client_interfaces.go index 7a562502aa..3d4a9209fd 100644 --- a/client/client_interfaces.go +++ b/client/client_interfaces.go @@ -107,7 +107,7 @@ type DistributionAPIClient interface { type ImageAPIClient interface { ImageBuild(ctx context.Context, context io.Reader, options ImageBuildOptions) (ImageBuildResult, error) BuildCachePrune(ctx context.Context, opts BuildCachePruneOptions) (BuildCachePruneResult, error) - BuildCancel(ctx context.Context, id string, opts BuildCancelOptions) error + BuildCancel(ctx context.Context, id string, opts BuildCancelOptions) (BuildCancelResult, error) ImageCreate(ctx context.Context, parentReference string, options ImageCreateOptions) (io.ReadCloser, error) ImageImport(ctx context.Context, source ImageImportSource, ref string, options ImageImportOptions) (io.ReadCloser, error) diff --git a/vendor/github.com/moby/moby/client/build_cancel.go b/vendor/github.com/moby/moby/client/build_cancel.go index c9bea9d006..f6cfc6bc91 100644 --- a/vendor/github.com/moby/moby/client/build_cancel.go +++ b/vendor/github.com/moby/moby/client/build_cancel.go @@ -7,13 +7,15 @@ import ( type BuildCancelOptions struct{} +type BuildCancelResult struct{} + // BuildCancel requests the daemon to cancel the ongoing build request // with the given id. -func (cli *Client) BuildCancel(ctx context.Context, id string, _ BuildCancelOptions) error { +func (cli *Client) BuildCancel(ctx context.Context, id string, _ BuildCancelOptions) (BuildCancelResult, error) { query := url.Values{} query.Set("id", id) resp, err := cli.post(ctx, "/build/cancel", query, nil, nil) defer ensureReaderClosed(resp) - return err + return BuildCancelResult{}, err } diff --git a/vendor/github.com/moby/moby/client/client_interfaces.go b/vendor/github.com/moby/moby/client/client_interfaces.go index 7a562502aa..3d4a9209fd 100644 --- a/vendor/github.com/moby/moby/client/client_interfaces.go +++ b/vendor/github.com/moby/moby/client/client_interfaces.go @@ -107,7 +107,7 @@ type DistributionAPIClient interface { type ImageAPIClient interface { ImageBuild(ctx context.Context, context io.Reader, options ImageBuildOptions) (ImageBuildResult, error) BuildCachePrune(ctx context.Context, opts BuildCachePruneOptions) (BuildCachePruneResult, error) - BuildCancel(ctx context.Context, id string, opts BuildCancelOptions) error + BuildCancel(ctx context.Context, id string, opts BuildCancelOptions) (BuildCancelResult, error) ImageCreate(ctx context.Context, parentReference string, options ImageCreateOptions) (io.ReadCloser, error) ImageImport(ctx context.Context, source ImageImportSource, ref string, options ImageImportOptions) (io.ReadCloser, error)