From ac024a4d8b9ab74322abe50136ae4fdf3acb8ccc Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Thu, 30 Mar 2023 16:00:06 +0200 Subject: [PATCH] internal/test/network: FakeClient: embed interface to remove boilerplating Only a single method of the FakeClient was actually implemented (and used). This patch embeds the interface it must implement to reduce the boilerplating for not yet implemented methods. Calling any of the unimplemented methods will result in a panic, which will make it clear when they must be implemented :) This also fixes various linting errors; internal/test/network/client.go:17:37: unused-parameter: parameter 'ctx' seems to be unused, consider removing or renaming it as _ (revive) func (c *FakeClient) NetworkConnect(ctx context.Context, networkID, container string, config *network.EndpointSettings) error { ^ internal/test/network/client.go:22:65: unused-parameter: parameter 'options' seems to be unused, consider removing or renaming it as _ (revive) func (c *FakeClient) NetworkCreate(_ context.Context, _ string, options types.NetworkCreate) (types.NetworkCreateResponse, error) { ^ internal/test/network/client.go:27:40: unused-parameter: parameter 'ctx' seems to be unused, consider removing or renaming it as _ (revive) func (c *FakeClient) NetworkDisconnect(ctx context.Context, networkID, container string, force bool) error { ^ internal/test/network/client.go:45:53: unused-parameter: parameter 'options' seems to be unused, consider removing or renaming it as _ (revive) func (c *FakeClient) NetworkList(_ context.Context, options types.NetworkListOptions) ([]types.NetworkResource, error) { ^ internal/test/network/client.go:50:36: unused-parameter: parameter 'ctx' seems to be unused, consider removing or renaming it as _ (revive) func (c *FakeClient) NetworkRemove(ctx context.Context, networkID string) error { ^ internal/test/network/client.go:55:55: unused-parameter: parameter 'pruneFilter' seems to be unused, consider removing or renaming it as _ (revive) func (c *FakeClient) NetworksPrune(_ context.Context, pruneFilter filters.Args) (types.NetworksPruneReport, error) { ^ Signed-off-by: Sebastiaan van Stijn --- internal/test/network/client.go | 39 ++------------------------------- 1 file changed, 2 insertions(+), 37 deletions(-) diff --git a/internal/test/network/client.go b/internal/test/network/client.go index 5a65dcb5ed..20bfa5906e 100644 --- a/internal/test/network/client.go +++ b/internal/test/network/client.go @@ -4,30 +4,15 @@ import ( "context" "github.com/docker/docker/api/types" - "github.com/docker/docker/api/types/filters" - "github.com/docker/docker/api/types/network" + "github.com/docker/docker/client" ) // FakeClient is a fake NetworkAPIClient type FakeClient struct { + client.NetworkAPIClient NetworkInspectFunc func(ctx context.Context, networkID string, options types.NetworkInspectOptions) (types.NetworkResource, error) } -// NetworkConnect fakes connecting to a network -func (c *FakeClient) NetworkConnect(ctx context.Context, networkID, container string, config *network.EndpointSettings) error { - return nil -} - -// NetworkCreate fakes creating a network -func (c *FakeClient) NetworkCreate(_ context.Context, _ string, options types.NetworkCreate) (types.NetworkCreateResponse, error) { - return types.NetworkCreateResponse{}, nil -} - -// NetworkDisconnect fakes disconnecting from a network -func (c *FakeClient) NetworkDisconnect(ctx context.Context, networkID, container string, force bool) error { - return nil -} - // NetworkInspect fakes inspecting a network func (c *FakeClient) NetworkInspect(ctx context.Context, networkID string, options types.NetworkInspectOptions) (types.NetworkResource, error) { if c.NetworkInspectFunc != nil { @@ -35,23 +20,3 @@ func (c *FakeClient) NetworkInspect(ctx context.Context, networkID string, optio } return types.NetworkResource{}, nil } - -// NetworkInspectWithRaw fakes inspecting a network with a raw response -func (c *FakeClient) NetworkInspectWithRaw(_ context.Context, _ string, _ types.NetworkInspectOptions) (types.NetworkResource, []byte, error) { - return types.NetworkResource{}, nil, nil -} - -// NetworkList fakes listing networks -func (c *FakeClient) NetworkList(_ context.Context, options types.NetworkListOptions) ([]types.NetworkResource, error) { - return nil, nil -} - -// NetworkRemove fakes removing networks -func (c *FakeClient) NetworkRemove(ctx context.Context, networkID string) error { - return nil -} - -// NetworksPrune fakes pruning networks -func (c *FakeClient) NetworksPrune(_ context.Context, pruneFilter filters.Args) (types.NetworksPruneReport, error) { - return types.NetworksPruneReport{}, nil -}