From 9dd012aa5df1c7b076f53d6cd2c328de0ea3b0f4 Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Thu, 30 Mar 2023 16:22:06 +0200 Subject: [PATCH] cli/command/secret: fakeClient: include context in fake client (revive) I could either remove the name for these contexts, or make the fake functions more accurately reflect the actual implementation (decided to go for the latter one) cli/command/secret/client_test.go:19:35: unused-parameter: parameter 'ctx' seems to be unused, consider removing or renaming it as _ (revive) func (c *fakeClient) SecretCreate(ctx context.Context, spec swarm.SecretSpec) (types.SecretCreateResponse, error) { ^ cli/command/secret/client_test.go:26:43: unused-parameter: parameter 'ctx' seems to be unused, consider removing or renaming it as _ (revive) func (c *fakeClient) SecretInspectWithRaw(ctx context.Context, id string) (swarm.Secret, []byte, error) { ^ cli/command/secret/client_test.go:33:33: unused-parameter: parameter 'ctx' seems to be unused, consider removing or renaming it as _ (revive) func (c *fakeClient) SecretList(ctx context.Context, options types.SecretListOptions) ([]swarm.Secret, error) { ^ cli/command/secret/client_test.go:40:35: unused-parameter: parameter 'ctx' seems to be unused, consider removing or renaming it as _ (revive) func (c *fakeClient) SecretRemove(ctx context.Context, name string) error { ^ Signed-off-by: Sebastiaan van Stijn --- cli/command/secret/client_test.go | 16 ++++++++-------- cli/command/secret/create_test.go | 13 +++++++------ cli/command/secret/inspect_test.go | 21 +++++++++++---------- cli/command/secret/ls_test.go | 15 ++++++++------- cli/command/secret/remove_test.go | 9 +++++---- 5 files changed, 39 insertions(+), 35 deletions(-) diff --git a/cli/command/secret/client_test.go b/cli/command/secret/client_test.go index ea672fa473..efcbccfeba 100644 --- a/cli/command/secret/client_test.go +++ b/cli/command/secret/client_test.go @@ -10,36 +10,36 @@ import ( type fakeClient struct { client.Client - secretCreateFunc func(swarm.SecretSpec) (types.SecretCreateResponse, error) - secretInspectFunc func(string) (swarm.Secret, []byte, error) - secretListFunc func(types.SecretListOptions) ([]swarm.Secret, error) - secretRemoveFunc func(string) error + secretCreateFunc func(context.Context, swarm.SecretSpec) (types.SecretCreateResponse, error) + secretInspectFunc func(context.Context, string) (swarm.Secret, []byte, error) + secretListFunc func(context.Context, types.SecretListOptions) ([]swarm.Secret, error) + secretRemoveFunc func(context.Context, string) error } func (c *fakeClient) SecretCreate(ctx context.Context, spec swarm.SecretSpec) (types.SecretCreateResponse, error) { if c.secretCreateFunc != nil { - return c.secretCreateFunc(spec) + return c.secretCreateFunc(ctx, spec) } return types.SecretCreateResponse{}, nil } func (c *fakeClient) SecretInspectWithRaw(ctx context.Context, id string) (swarm.Secret, []byte, error) { if c.secretInspectFunc != nil { - return c.secretInspectFunc(id) + return c.secretInspectFunc(ctx, id) } return swarm.Secret{}, nil, nil } func (c *fakeClient) SecretList(ctx context.Context, options types.SecretListOptions) ([]swarm.Secret, error) { if c.secretListFunc != nil { - return c.secretListFunc(options) + return c.secretListFunc(ctx, options) } return []swarm.Secret{}, nil } func (c *fakeClient) SecretRemove(ctx context.Context, name string) error { if c.secretRemoveFunc != nil { - return c.secretRemoveFunc(name) + return c.secretRemoveFunc(ctx, name) } return nil } diff --git a/cli/command/secret/create_test.go b/cli/command/secret/create_test.go index 2dd65edace..6af3aa97f4 100644 --- a/cli/command/secret/create_test.go +++ b/cli/command/secret/create_test.go @@ -1,6 +1,7 @@ package secret import ( + "context" "io" "os" "path/filepath" @@ -21,7 +22,7 @@ const secretDataFile = "secret-create-with-name.golden" func TestSecretCreateErrors(t *testing.T) { testCases := []struct { args []string - secretCreateFunc func(swarm.SecretSpec) (types.SecretCreateResponse, error) + secretCreateFunc func(context.Context, swarm.SecretSpec) (types.SecretCreateResponse, error) expectedError string }{ { @@ -34,7 +35,7 @@ func TestSecretCreateErrors(t *testing.T) { }, { args: []string{"name", filepath.Join("testdata", secretDataFile)}, - secretCreateFunc: func(secretSpec swarm.SecretSpec) (types.SecretCreateResponse, error) { + secretCreateFunc: func(_ context.Context, secretSpec swarm.SecretSpec) (types.SecretCreateResponse, error) { return types.SecretCreateResponse{}, errors.Errorf("error creating secret") }, expectedError: "error creating secret", @@ -66,7 +67,7 @@ func TestSecretCreateWithName(t *testing.T) { } cli := test.NewFakeCli(&fakeClient{ - secretCreateFunc: func(spec swarm.SecretSpec) (types.SecretCreateResponse, error) { + secretCreateFunc: func(_ context.Context, spec swarm.SecretSpec) (types.SecretCreateResponse, error) { if !reflect.DeepEqual(spec, expected) { return types.SecretCreateResponse{}, errors.Errorf("expected %+v, got %+v", expected, spec) } @@ -89,7 +90,7 @@ func TestSecretCreateWithDriver(t *testing.T) { name := "foo" cli := test.NewFakeCli(&fakeClient{ - secretCreateFunc: func(spec swarm.SecretSpec) (types.SecretCreateResponse, error) { + secretCreateFunc: func(_ context.Context, spec swarm.SecretSpec) (types.SecretCreateResponse, error) { if spec.Name != name { return types.SecretCreateResponse{}, errors.Errorf("expected name %q, got %q", name, spec.Name) } @@ -118,7 +119,7 @@ func TestSecretCreateWithTemplatingDriver(t *testing.T) { name := "foo" cli := test.NewFakeCli(&fakeClient{ - secretCreateFunc: func(spec swarm.SecretSpec) (types.SecretCreateResponse, error) { + secretCreateFunc: func(_ context.Context, spec swarm.SecretSpec) (types.SecretCreateResponse, error) { if spec.Name != name { return types.SecretCreateResponse{}, errors.Errorf("expected name %q, got %q", name, spec.Name) } @@ -148,7 +149,7 @@ func TestSecretCreateWithLabels(t *testing.T) { name := "foo" cli := test.NewFakeCli(&fakeClient{ - secretCreateFunc: func(spec swarm.SecretSpec) (types.SecretCreateResponse, error) { + secretCreateFunc: func(_ context.Context, spec swarm.SecretSpec) (types.SecretCreateResponse, error) { if spec.Name != name { return types.SecretCreateResponse{}, errors.Errorf("expected name %q, got %q", name, spec.Name) } diff --git a/cli/command/secret/inspect_test.go b/cli/command/secret/inspect_test.go index e05311f2af..8f0f3e81ec 100644 --- a/cli/command/secret/inspect_test.go +++ b/cli/command/secret/inspect_test.go @@ -1,6 +1,7 @@ package secret import ( + "context" "fmt" "io" "testing" @@ -18,7 +19,7 @@ func TestSecretInspectErrors(t *testing.T) { testCases := []struct { args []string flags map[string]string - secretInspectFunc func(secretID string) (swarm.Secret, []byte, error) + secretInspectFunc func(ctx context.Context, secretID string) (swarm.Secret, []byte, error) expectedError string }{ { @@ -26,7 +27,7 @@ func TestSecretInspectErrors(t *testing.T) { }, { args: []string{"foo"}, - secretInspectFunc: func(secretID string) (swarm.Secret, []byte, error) { + secretInspectFunc: func(_ context.Context, secretID string) (swarm.Secret, []byte, error) { return swarm.Secret{}, nil, errors.Errorf("error while inspecting the secret") }, expectedError: "error while inspecting the secret", @@ -40,7 +41,7 @@ func TestSecretInspectErrors(t *testing.T) { }, { args: []string{"foo", "bar"}, - secretInspectFunc: func(secretID string) (swarm.Secret, []byte, error) { + secretInspectFunc: func(_ context.Context, secretID string) (swarm.Secret, []byte, error) { if secretID == "foo" { return *Secret(SecretName("foo")), nil, nil } @@ -68,12 +69,12 @@ func TestSecretInspectWithoutFormat(t *testing.T) { testCases := []struct { name string args []string - secretInspectFunc func(secretID string) (swarm.Secret, []byte, error) + secretInspectFunc func(ctx context.Context, secretID string) (swarm.Secret, []byte, error) }{ { name: "single-secret", args: []string{"foo"}, - secretInspectFunc: func(name string) (swarm.Secret, []byte, error) { + secretInspectFunc: func(_ context.Context, name string) (swarm.Secret, []byte, error) { if name != "foo" { return swarm.Secret{}, nil, errors.Errorf("Invalid name, expected %s, got %s", "foo", name) } @@ -83,7 +84,7 @@ func TestSecretInspectWithoutFormat(t *testing.T) { { name: "multiple-secrets-with-labels", args: []string{"foo", "bar"}, - secretInspectFunc: func(name string) (swarm.Secret, []byte, error) { + secretInspectFunc: func(_ context.Context, name string) (swarm.Secret, []byte, error) { return *Secret(SecretID("ID-"+name), SecretName(name), SecretLabels(map[string]string{ "label1": "label-foo", })), nil, nil @@ -102,7 +103,7 @@ func TestSecretInspectWithoutFormat(t *testing.T) { } func TestSecretInspectWithFormat(t *testing.T) { - secretInspectFunc := func(name string) (swarm.Secret, []byte, error) { + secretInspectFunc := func(_ context.Context, name string) (swarm.Secret, []byte, error) { return *Secret(SecretName("foo"), SecretLabels(map[string]string{ "label1": "label-foo", })), nil, nil @@ -111,7 +112,7 @@ func TestSecretInspectWithFormat(t *testing.T) { name string format string args []string - secretInspectFunc func(name string) (swarm.Secret, []byte, error) + secretInspectFunc func(_ context.Context, name string) (swarm.Secret, []byte, error) }{ { name: "simple-template", @@ -141,11 +142,11 @@ func TestSecretInspectWithFormat(t *testing.T) { func TestSecretInspectPretty(t *testing.T) { testCases := []struct { name string - secretInspectFunc func(string) (swarm.Secret, []byte, error) + secretInspectFunc func(context.Context, string) (swarm.Secret, []byte, error) }{ { name: "simple", - secretInspectFunc: func(id string) (swarm.Secret, []byte, error) { + secretInspectFunc: func(_ context.Context, id string) (swarm.Secret, []byte, error) { return *Secret( SecretLabels(map[string]string{ "lbl1": "value1", diff --git a/cli/command/secret/ls_test.go b/cli/command/secret/ls_test.go index 4c8b635fd1..c5ee26ee99 100644 --- a/cli/command/secret/ls_test.go +++ b/cli/command/secret/ls_test.go @@ -1,6 +1,7 @@ package secret import ( + "context" "io" "testing" "time" @@ -19,7 +20,7 @@ import ( func TestSecretListErrors(t *testing.T) { testCases := []struct { args []string - secretListFunc func(types.SecretListOptions) ([]swarm.Secret, error) + secretListFunc func(context.Context, types.SecretListOptions) ([]swarm.Secret, error) expectedError string }{ { @@ -27,7 +28,7 @@ func TestSecretListErrors(t *testing.T) { expectedError: "accepts no argument", }, { - secretListFunc: func(options types.SecretListOptions) ([]swarm.Secret, error) { + secretListFunc: func(_ context.Context, options types.SecretListOptions) ([]swarm.Secret, error) { return []swarm.Secret{}, errors.Errorf("error listing secrets") }, expectedError: "error listing secrets", @@ -47,7 +48,7 @@ func TestSecretListErrors(t *testing.T) { func TestSecretList(t *testing.T) { cli := test.NewFakeCli(&fakeClient{ - secretListFunc: func(options types.SecretListOptions) ([]swarm.Secret, error) { + secretListFunc: func(_ context.Context, options types.SecretListOptions) ([]swarm.Secret, error) { return []swarm.Secret{ *Secret(SecretID("ID-1-foo"), SecretName("1-foo"), @@ -79,7 +80,7 @@ func TestSecretList(t *testing.T) { func TestSecretListWithQuietOption(t *testing.T) { cli := test.NewFakeCli(&fakeClient{ - secretListFunc: func(options types.SecretListOptions) ([]swarm.Secret, error) { + secretListFunc: func(_ context.Context, options types.SecretListOptions) ([]swarm.Secret, error) { return []swarm.Secret{ *Secret(SecretID("ID-foo"), SecretName("foo")), *Secret(SecretID("ID-bar"), SecretName("bar"), SecretLabels(map[string]string{ @@ -96,7 +97,7 @@ func TestSecretListWithQuietOption(t *testing.T) { func TestSecretListWithConfigFormat(t *testing.T) { cli := test.NewFakeCli(&fakeClient{ - secretListFunc: func(options types.SecretListOptions) ([]swarm.Secret, error) { + secretListFunc: func(_ context.Context, options types.SecretListOptions) ([]swarm.Secret, error) { return []swarm.Secret{ *Secret(SecretID("ID-foo"), SecretName("foo")), *Secret(SecretID("ID-bar"), SecretName("bar"), SecretLabels(map[string]string{ @@ -115,7 +116,7 @@ func TestSecretListWithConfigFormat(t *testing.T) { func TestSecretListWithFormat(t *testing.T) { cli := test.NewFakeCli(&fakeClient{ - secretListFunc: func(options types.SecretListOptions) ([]swarm.Secret, error) { + secretListFunc: func(_ context.Context, options types.SecretListOptions) ([]swarm.Secret, error) { return []swarm.Secret{ *Secret(SecretID("ID-foo"), SecretName("foo")), *Secret(SecretID("ID-bar"), SecretName("bar"), SecretLabels(map[string]string{ @@ -132,7 +133,7 @@ func TestSecretListWithFormat(t *testing.T) { func TestSecretListWithFilter(t *testing.T) { cli := test.NewFakeCli(&fakeClient{ - secretListFunc: func(options types.SecretListOptions) ([]swarm.Secret, error) { + secretListFunc: func(_ context.Context, options types.SecretListOptions) ([]swarm.Secret, error) { assert.Check(t, is.Equal("foo", options.Filters.Get("name")[0]), "foo") assert.Check(t, is.Equal("lbl1=Label-bar", options.Filters.Get("label")[0])) return []swarm.Secret{ diff --git a/cli/command/secret/remove_test.go b/cli/command/secret/remove_test.go index c9f24dc22b..8600a98fd3 100644 --- a/cli/command/secret/remove_test.go +++ b/cli/command/secret/remove_test.go @@ -1,6 +1,7 @@ package secret import ( + "context" "io" "strings" "testing" @@ -14,7 +15,7 @@ import ( func TestSecretRemoveErrors(t *testing.T) { testCases := []struct { args []string - secretRemoveFunc func(string) error + secretRemoveFunc func(context.Context, string) error expectedError string }{ { @@ -23,7 +24,7 @@ func TestSecretRemoveErrors(t *testing.T) { }, { args: []string{"foo"}, - secretRemoveFunc: func(name string) error { + secretRemoveFunc: func(_ context.Context, name string) error { return errors.Errorf("error removing secret") }, expectedError: "error removing secret", @@ -45,7 +46,7 @@ func TestSecretRemoveWithName(t *testing.T) { names := []string{"foo", "bar"} var removedSecrets []string cli := test.NewFakeCli(&fakeClient{ - secretRemoveFunc: func(name string) error { + secretRemoveFunc: func(_ context.Context, name string) error { removedSecrets = append(removedSecrets, name) return nil }, @@ -62,7 +63,7 @@ func TestSecretRemoveContinueAfterError(t *testing.T) { var removedSecrets []string cli := test.NewFakeCli(&fakeClient{ - secretRemoveFunc: func(name string) error { + secretRemoveFunc: func(_ context.Context, name string) error { removedSecrets = append(removedSecrets, name) if name == "foo" { return errors.Errorf("error removing secret: %s", name)