toolshed/docker-cli
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

cli/command/secret: remove uses of pkg/errors in tests

Browse Source 
While there may be reasons to keep pkg/errors in production code,
we don't need them for these tests.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
This commit is contained in:
Sebastiaan van Stijn
2025-02-01 14:43:58 +01:00
parent c50068f7e1
commit ec5ae0c2d0
4 changed files with 25 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
cli/command/secret/create_test.go
View File

@ -2,6 +2,8 @@ package secret
import (
"context"
"errors"
"fmt"
"io"
"os"
"path/filepath"
@ -12,7 +14,6 @@ import (
"github.com/docker/cli/internal/test"
"github.com/docker/docker/api/types"
"github.com/docker/docker/api/types/swarm"
"github.com/pkg/errors"
"gotest.tools/v3/assert"
is "gotest.tools/v3/assert/cmp"
)
@ -36,7 +37,7 @@ func TestSecretCreateErrors(t *testing.T) {
{
args: []string{"name", filepath.Join("testdata", secretDataFile)},
secretCreateFunc: func(_ context.Context, secretSpec swarm.SecretSpec) (types.SecretCreateResponse, error) {
return types.SecretCreateResponse{}, errors.Errorf("error creating secret")
return types.SecretCreateResponse{}, errors.New("error creating secret")
},
expectedError: "error creating secret",
},
@ -70,7 +71,7 @@ func TestSecretCreateWithName(t *testing.T) {
cli := test.NewFakeCli(&fakeClient{
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)
return types.SecretCreateResponse{}, fmt.Errorf("expected %+v, got %+v", expected, spec)
}
return types.SecretCreateResponse{
ID: "ID-" + spec.Name,
@ -93,11 +94,11 @@ func TestSecretCreateWithDriver(t *testing.T) {
cli := test.NewFakeCli(&fakeClient{
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)
return types.SecretCreateResponse{}, fmt.Errorf("expected name %q, got %q", name, spec.Name)
}
if spec.Driver.Name != expectedDriver.Name {
return types.SecretCreateResponse{}, errors.Errorf("expected driver %v, got %v", expectedDriver, spec.Labels)
return types.SecretCreateResponse{}, fmt.Errorf("expected driver %v, got %v", expectedDriver, spec.Labels)
}
return types.SecretCreateResponse{
@ -108,7 +109,7 @@ func TestSecretCreateWithDriver(t *testing.T) {
cmd := newSecretCreateCommand(cli)
cmd.SetArgs([]string{name})
cmd.Flags().Set("driver", expectedDriver.Name)
assert.Check(t, cmd.Flags().Set("driver", expectedDriver.Name))
assert.NilError(t, cmd.Execute())
assert.Check(t, is.Equal("ID-"+name, strings.TrimSpace(cli.OutBuffer().String())))
}
@ -117,16 +118,16 @@ func TestSecretCreateWithTemplatingDriver(t *testing.T) {
expectedDriver := &swarm.Driver{
Name: "template-driver",
}
name := "foo"
const name = "foo"
cli := test.NewFakeCli(&fakeClient{
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)
return types.SecretCreateResponse{}, fmt.Errorf("expected name %q, got %q", name, spec.Name)
}
if spec.Templating.Name != expectedDriver.Name {
return types.SecretCreateResponse{}, errors.Errorf("expected driver %v, got %v", expectedDriver, spec.Labels)
return types.SecretCreateResponse{}, fmt.Errorf("expected driver %v, got %v", expectedDriver, spec.Labels)
}
return types.SecretCreateResponse{
@ -137,7 +138,7 @@ func TestSecretCreateWithTemplatingDriver(t *testing.T) {
cmd := newSecretCreateCommand(cli)
cmd.SetArgs([]string{name})
cmd.Flags().Set("template-driver", expectedDriver.Name)
assert.Check(t, cmd.Flags().Set("template-driver", expectedDriver.Name))
assert.NilError(t, cmd.Execute())
assert.Check(t, is.Equal("ID-"+name, strings.TrimSpace(cli.OutBuffer().String())))
}
@ -147,16 +148,16 @@ func TestSecretCreateWithLabels(t *testing.T) {
"lbl1": "Label-foo",
"lbl2": "Label-bar",
}
name := "foo"
const name = "foo"
cli := test.NewFakeCli(&fakeClient{
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)
return types.SecretCreateResponse{}, fmt.Errorf("expected name %q, got %q", name, spec.Name)
}
if !reflect.DeepEqual(spec.Labels, expectedLabels) {
return types.SecretCreateResponse{}, errors.Errorf("expected labels %v, got %v", expectedLabels, spec.Labels)
return types.SecretCreateResponse{}, fmt.Errorf("expected labels %v, got %v", expectedLabels, spec.Labels)
}
return types.SecretCreateResponse{
@ -167,8 +168,8 @@ func TestSecretCreateWithLabels(t *testing.T) {
cmd := newSecretCreateCommand(cli)
cmd.SetArgs([]string{name, filepath.Join("testdata", secretDataFile)})
cmd.Flags().Set("label", "lbl1=Label-foo")
cmd.Flags().Set("label", "lbl2=Label-bar")
assert.Check(t, cmd.Flags().Set("label", "lbl1=Label-foo"))
assert.Check(t, cmd.Flags().Set("label", "lbl2=Label-bar"))
assert.NilError(t, cmd.Execute())
assert.Check(t, is.Equal("ID-"+name, strings.TrimSpace(cli.OutBuffer().String())))
}

8
cli/command/secret/inspect_test.go
View File

@ -2,6 +2,7 @@ package secret
import (
"context"
"errors"
"fmt"
"io"
"testing"
@ -10,7 +11,6 @@ import (
"github.com/docker/cli/internal/test"
"github.com/docker/cli/internal/test/builders"
"github.com/docker/docker/api/types/swarm"
"github.com/pkg/errors"
"gotest.tools/v3/assert"
"gotest.tools/v3/golden"
)
@ -28,7 +28,7 @@ func TestSecretInspectErrors(t *testing.T) {
{
args: []string{"foo"},
secretInspectFunc: func(_ context.Context, secretID string) (swarm.Secret, []byte, error) {
return swarm.Secret{}, nil, errors.Errorf("error while inspecting the secret")
return swarm.Secret{}, nil, errors.New("error while inspecting the secret")
},
expectedError: "error while inspecting the secret",
},
@ -45,7 +45,7 @@ func TestSecretInspectErrors(t *testing.T) {
if secretID == "foo" {
return *builders.Secret(builders.SecretName("foo")), nil, nil
}
return swarm.Secret{}, nil, errors.Errorf("error while inspecting the secret")
return swarm.Secret{}, nil, errors.New("error while inspecting the secret")
},
expectedError: "error while inspecting the secret",
},
@ -77,7 +77,7 @@ func TestSecretInspectWithoutFormat(t *testing.T) {
args: []string{"foo"},
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)
return swarm.Secret{}, nil, fmt.Errorf("invalid name, expected %s, got %s", "foo", name)
}
return *builders.Secret(builders.SecretID("ID-foo"), builders.SecretName("foo")), nil, nil
},

4
cli/command/secret/ls_test.go
View File

@ -2,6 +2,7 @@ package secret
import (
"context"
"errors"
"io"
"testing"
"time"
@ -11,7 +12,6 @@ import (
"github.com/docker/cli/internal/test/builders"
"github.com/docker/docker/api/types"
"github.com/docker/docker/api/types/swarm"
"github.com/pkg/errors"
"gotest.tools/v3/assert"
is "gotest.tools/v3/assert/cmp"
"gotest.tools/v3/golden"
@ -29,7 +29,7 @@ func TestSecretListErrors(t *testing.T) {
},
{
secretListFunc: func(_ context.Context, options types.SecretListOptions) ([]swarm.Secret, error) {
return []swarm.Secret{}, errors.Errorf("error listing secrets")
return []swarm.Secret{}, errors.New("error listing secrets")
},
expectedError: "error listing secrets",
},

6
cli/command/secret/remove_test.go
View File

@ -2,12 +2,12 @@ package secret
import (
"context"
"errors"
"io"
"strings"
"testing"
"github.com/docker/cli/internal/test"
"github.com/pkg/errors"
"gotest.tools/v3/assert"
is "gotest.tools/v3/assert/cmp"
)
@ -25,7 +25,7 @@ func TestSecretRemoveErrors(t *testing.T) {
{
args: []string{"foo"},
secretRemoveFunc: func(_ context.Context, name string) error {
return errors.Errorf("error removing secret")
return errors.New("error removing secret")
},
expectedError: "error removing secret",
},
@ -67,7 +67,7 @@ func TestSecretRemoveContinueAfterError(t *testing.T) {
secretRemoveFunc: func(_ context.Context, name string) error {
removedSecrets = append(removedSecrets, name)
if name == "foo" {
return errors.Errorf("error removing secret: %s", name)
return errors.New("error removing secret: " + name)
}
return nil
},