From 50ea842e17f1ea57f1dff5bd0400df42394bfefa Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Mon, 15 Sep 2025 09:55:36 +0200 Subject: [PATCH] client: separate exec methods to ExecAPIClient interface Signed-off-by: Sebastiaan van Stijn --- client/client_interfaces.go | 14 +++++++++----- .../moby/moby/client/client_interfaces.go | 14 +++++++++----- 2 files changed, 18 insertions(+), 10 deletions(-) diff --git a/client/client_interfaces.go b/client/client_interfaces.go index dbfe8cbcb7..ae6e529cc8 100644 --- a/client/client_interfaces.go +++ b/client/client_interfaces.go @@ -69,11 +69,7 @@ type ContainerAPIClient interface { ContainerCommit(ctx context.Context, container string, options ContainerCommitOptions) (container.CommitResponse, error) ContainerCreate(ctx context.Context, config *container.Config, hostConfig *container.HostConfig, networkingConfig *network.NetworkingConfig, platform *ocispec.Platform, containerName string) (container.CreateResponse, error) ContainerDiff(ctx context.Context, container string) ([]container.FilesystemChange, error) - ContainerExecAttach(ctx context.Context, execID string, options ExecAttachOptions) (HijackedResponse, error) - ContainerExecCreate(ctx context.Context, container string, options ExecCreateOptions) (container.ExecCreateResponse, error) - ContainerExecInspect(ctx context.Context, execID string) (ExecInspect, error) - ContainerExecResize(ctx context.Context, execID string, options ContainerResizeOptions) error - ContainerExecStart(ctx context.Context, execID string, options ExecStartOptions) error + ExecAPIClient ContainerExport(ctx context.Context, container string) (io.ReadCloser, error) ContainerInspect(ctx context.Context, container string) (container.InspectResponse, error) ContainerInspectWithRaw(ctx context.Context, container string, getSize bool) (container.InspectResponse, []byte, error) @@ -99,6 +95,14 @@ type ContainerAPIClient interface { ContainersPrune(ctx context.Context, pruneFilters filters.Args) (container.PruneReport, error) } +type ExecAPIClient interface { + ContainerExecCreate(ctx context.Context, container string, options ExecCreateOptions) (container.ExecCreateResponse, error) + ContainerExecStart(ctx context.Context, execID string, options ExecStartOptions) error + ContainerExecAttach(ctx context.Context, execID string, options ExecAttachOptions) (HijackedResponse, error) + ContainerExecInspect(ctx context.Context, execID string) (ExecInspect, error) + ContainerExecResize(ctx context.Context, execID string, options ContainerResizeOptions) error +} + // DistributionAPIClient defines API client methods for the registry type DistributionAPIClient interface { DistributionInspect(ctx context.Context, image, encodedRegistryAuth string) (registry.DistributionInspect, error) diff --git a/vendor/github.com/moby/moby/client/client_interfaces.go b/vendor/github.com/moby/moby/client/client_interfaces.go index dbfe8cbcb7..ae6e529cc8 100644 --- a/vendor/github.com/moby/moby/client/client_interfaces.go +++ b/vendor/github.com/moby/moby/client/client_interfaces.go @@ -69,11 +69,7 @@ type ContainerAPIClient interface { ContainerCommit(ctx context.Context, container string, options ContainerCommitOptions) (container.CommitResponse, error) ContainerCreate(ctx context.Context, config *container.Config, hostConfig *container.HostConfig, networkingConfig *network.NetworkingConfig, platform *ocispec.Platform, containerName string) (container.CreateResponse, error) ContainerDiff(ctx context.Context, container string) ([]container.FilesystemChange, error) - ContainerExecAttach(ctx context.Context, execID string, options ExecAttachOptions) (HijackedResponse, error) - ContainerExecCreate(ctx context.Context, container string, options ExecCreateOptions) (container.ExecCreateResponse, error) - ContainerExecInspect(ctx context.Context, execID string) (ExecInspect, error) - ContainerExecResize(ctx context.Context, execID string, options ContainerResizeOptions) error - ContainerExecStart(ctx context.Context, execID string, options ExecStartOptions) error + ExecAPIClient ContainerExport(ctx context.Context, container string) (io.ReadCloser, error) ContainerInspect(ctx context.Context, container string) (container.InspectResponse, error) ContainerInspectWithRaw(ctx context.Context, container string, getSize bool) (container.InspectResponse, []byte, error) @@ -99,6 +95,14 @@ type ContainerAPIClient interface { ContainersPrune(ctx context.Context, pruneFilters filters.Args) (container.PruneReport, error) } +type ExecAPIClient interface { + ContainerExecCreate(ctx context.Context, container string, options ExecCreateOptions) (container.ExecCreateResponse, error) + ContainerExecStart(ctx context.Context, execID string, options ExecStartOptions) error + ContainerExecAttach(ctx context.Context, execID string, options ExecAttachOptions) (HijackedResponse, error) + ContainerExecInspect(ctx context.Context, execID string) (ExecInspect, error) + ContainerExecResize(ctx context.Context, execID string, options ContainerResizeOptions) error +} + // DistributionAPIClient defines API client methods for the registry type DistributionAPIClient interface { DistributionInspect(ctx context.Context, image, encodedRegistryAuth string) (registry.DistributionInspect, error)