Please the linters in preparation of updating golangci-lint;
- remove dot-imports
- add some checks for unhandled errors
- replace some fixed-value variables for consts
cli/command/image/build/context.go:238:17: G107: Potential HTTP request made with variable url (gosec)
if resp, err = http.Get(url); err != nil {
^
cli/command/idresolver/idresolver_test.go:7:2: dot-imports: should not use dot imports (revive)
. "github.com/docker/cli/internal/test/builders" // Import builders to get the builder function as package function
^
cli/command/registry_test.go:7:2: dot-imports: should not use dot imports (revive)
. "github.com/docker/cli/cli/command" // Prevents a circular import with "github.com/docker/cli/internal/test"
^
cli/command/task/print_test.go:11:2: dot-imports: should not use dot imports (revive)
. "github.com/docker/cli/internal/test/builders" // Import builders to get the builder function as package function
^
cli/command/swarm/update_test.go:10:2: dot-imports: should not use dot imports (revive)
. "github.com/docker/cli/internal/test/builders" // Import builders to get the builder function as package function
^
cli/command/swarm/unlock_key_test.go:9:2: dot-imports: should not use dot imports (revive)
. "github.com/docker/cli/internal/test/builders" // Import builders to get the builder function as package function
^
cli/command/swarm/join_token_test.go:9:2: dot-imports: should not use dot imports (revive)
. "github.com/docker/cli/internal/test/builders" // Import builders to get the builder function as package function
^
cli/command/node/list_test.go:9:2: dot-imports: should not use dot imports (revive)
. "github.com/docker/cli/internal/test/builders" // Import builders to get the builder function as package function
^
cli/command/node/promote_test.go:8:2: dot-imports: should not use dot imports (revive)
. "github.com/docker/cli/internal/test/builders" // Import builders to get the builder function as package function
^
cli/command/node/demote_test.go:8:2: dot-imports: should not use dot imports (revive)
. "github.com/docker/cli/internal/test/builders" // Import builders to get the builder function as package functions
^
cli/command/node/ps_test.go:11:2: dot-imports: should not use dot imports (revive)
. "github.com/docker/cli/internal/test/builders" // Import builders to get the builder function as package function
^
cli/command/node/update_test.go:8:2: dot-imports: should not use dot imports (revive)
. "github.com/docker/cli/internal/test/builders" // Import builders to get the builder function as package function
^
cli/command/node/inspect_test.go:9:2: dot-imports: should not use dot imports (revive)
. "github.com/docker/cli/internal/test/builders" // Import builders to get the builder function as package functions
^
cli/command/secret/ls_test.go:11:2: dot-imports: should not use dot imports (revive)
. "github.com/docker/cli/internal/test/builders" // Import builders to get the builder function as package function
^
cli/command/secret/inspect_test.go:11:2: dot-imports: should not use dot imports (revive)
. "github.com/docker/cli/internal/test/builders" // Import builders to get the builder function as package function
^
cli/command/volume/inspect_test.go:9:2: dot-imports: should not use dot imports (revive)
. "github.com/docker/cli/internal/test/builders" // Import builders to get the builder function as package function
^
cli/command/volume/list_test.go:9:2: dot-imports: should not use dot imports (revive)
. "github.com/docker/cli/internal/test/builders" // Import builders to get the builder function as package function
^
cli/command/config/inspect_test.go:11:2: dot-imports: should not use dot imports (revive)
. "github.com/docker/cli/internal/test/builders" // Import builders to get the builder function as package function
^
cli/command/config/ls_test.go:11:2: dot-imports: should not use dot imports (revive)
. "github.com/docker/cli/internal/test/builders" // Import builders to get the builder function as package function
^
cli/command/network/list_test.go:9:2: dot-imports: should not use dot imports (revive)
. "github.com/docker/cli/internal/test/builders"
^
cli/command/container/list_test.go:10:2: dot-imports: should not use dot imports (revive)
. "github.com/docker/cli/internal/test/builders" // Import builders to get the builder function as package function
^
cli/command/service/list_test.go:12:2: dot-imports: should not use dot imports (revive)
. "github.com/docker/cli/internal/test/builders"
^
cli/command/service/client_test.go:6:2: dot-imports: should not use dot imports (revive)
. "github.com/docker/cli/internal/test/builders" // Import builders to get the builder function as package function
^
cli/command/stack/list_test.go:8:2: dot-imports: should not use dot imports (revive)
. "github.com/docker/cli/internal/test/builders" // Import builders to get the builder function as package function
^
cli/command/stack/services_test.go:9:2: dot-imports: should not use dot imports (revive)
. "github.com/docker/cli/internal/test/builders" // Import builders to get the builder function as package function
^
cli/command/stack/ps_test.go:10:2: dot-imports: should not use dot imports (revive)
. "github.com/docker/cli/internal/test/builders" // Import builders to get the builder function as package function
^
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
145 lines
3.7 KiB
Go
145 lines
3.7 KiB
Go
package idresolver
|
|
|
|
import (
|
|
"context"
|
|
"testing"
|
|
|
|
"github.com/docker/cli/internal/test/builders"
|
|
"github.com/docker/docker/api/types/swarm"
|
|
"github.com/pkg/errors"
|
|
"gotest.tools/v3/assert"
|
|
is "gotest.tools/v3/assert/cmp"
|
|
)
|
|
|
|
func TestResolveError(t *testing.T) {
|
|
cli := &fakeClient{
|
|
nodeInspectFunc: func(nodeID string) (swarm.Node, []byte, error) {
|
|
return swarm.Node{}, []byte{}, errors.Errorf("error inspecting node")
|
|
},
|
|
}
|
|
|
|
idResolver := New(cli, false)
|
|
_, err := idResolver.Resolve(context.Background(), struct{}{}, "nodeID")
|
|
|
|
assert.Error(t, err, "unsupported type")
|
|
}
|
|
|
|
func TestResolveWithNoResolveOption(t *testing.T) {
|
|
resolved := false
|
|
cli := &fakeClient{
|
|
nodeInspectFunc: func(nodeID string) (swarm.Node, []byte, error) {
|
|
resolved = true
|
|
return swarm.Node{}, []byte{}, nil
|
|
},
|
|
serviceInspectFunc: func(serviceID string) (swarm.Service, []byte, error) {
|
|
resolved = true
|
|
return swarm.Service{}, []byte{}, nil
|
|
},
|
|
}
|
|
|
|
idResolver := New(cli, true)
|
|
id, err := idResolver.Resolve(context.Background(), swarm.Node{}, "nodeID")
|
|
|
|
assert.NilError(t, err)
|
|
assert.Check(t, is.Equal("nodeID", id))
|
|
assert.Check(t, !resolved)
|
|
}
|
|
|
|
func TestResolveWithCache(t *testing.T) {
|
|
inspectCounter := 0
|
|
cli := &fakeClient{
|
|
nodeInspectFunc: func(nodeID string) (swarm.Node, []byte, error) {
|
|
inspectCounter++
|
|
return *builders.Node(builders.NodeName("node-foo")), []byte{}, nil
|
|
},
|
|
}
|
|
|
|
idResolver := New(cli, false)
|
|
|
|
ctx := context.Background()
|
|
for i := 0; i < 2; i++ {
|
|
id, err := idResolver.Resolve(ctx, swarm.Node{}, "nodeID")
|
|
assert.NilError(t, err)
|
|
assert.Check(t, is.Equal("node-foo", id))
|
|
}
|
|
|
|
assert.Check(t, is.Equal(1, inspectCounter))
|
|
}
|
|
|
|
func TestResolveNode(t *testing.T) {
|
|
testCases := []struct {
|
|
nodeID string
|
|
nodeInspectFunc func(string) (swarm.Node, []byte, error)
|
|
expectedID string
|
|
}{
|
|
{
|
|
nodeID: "nodeID",
|
|
nodeInspectFunc: func(string) (swarm.Node, []byte, error) {
|
|
return swarm.Node{}, []byte{}, errors.Errorf("error inspecting node")
|
|
},
|
|
expectedID: "nodeID",
|
|
},
|
|
{
|
|
nodeID: "nodeID",
|
|
nodeInspectFunc: func(string) (swarm.Node, []byte, error) {
|
|
return *builders.Node(builders.NodeName("node-foo")), []byte{}, nil
|
|
},
|
|
expectedID: "node-foo",
|
|
},
|
|
{
|
|
nodeID: "nodeID",
|
|
nodeInspectFunc: func(string) (swarm.Node, []byte, error) {
|
|
return *builders.Node(builders.NodeName(""), builders.Hostname("node-hostname")), []byte{}, nil
|
|
},
|
|
expectedID: "node-hostname",
|
|
},
|
|
}
|
|
|
|
ctx := context.Background()
|
|
for _, tc := range testCases {
|
|
cli := &fakeClient{
|
|
nodeInspectFunc: tc.nodeInspectFunc,
|
|
}
|
|
idResolver := New(cli, false)
|
|
id, err := idResolver.Resolve(ctx, swarm.Node{}, tc.nodeID)
|
|
|
|
assert.NilError(t, err)
|
|
assert.Check(t, is.Equal(tc.expectedID, id))
|
|
}
|
|
}
|
|
|
|
func TestResolveService(t *testing.T) {
|
|
testCases := []struct {
|
|
serviceID string
|
|
serviceInspectFunc func(string) (swarm.Service, []byte, error)
|
|
expectedID string
|
|
}{
|
|
{
|
|
serviceID: "serviceID",
|
|
serviceInspectFunc: func(string) (swarm.Service, []byte, error) {
|
|
return swarm.Service{}, []byte{}, errors.Errorf("error inspecting service")
|
|
},
|
|
expectedID: "serviceID",
|
|
},
|
|
{
|
|
serviceID: "serviceID",
|
|
serviceInspectFunc: func(string) (swarm.Service, []byte, error) {
|
|
return *builders.Service(builders.ServiceName("service-foo")), []byte{}, nil
|
|
},
|
|
expectedID: "service-foo",
|
|
},
|
|
}
|
|
|
|
ctx := context.Background()
|
|
for _, tc := range testCases {
|
|
cli := &fakeClient{
|
|
serviceInspectFunc: tc.serviceInspectFunc,
|
|
}
|
|
idResolver := New(cli, false)
|
|
id, err := idResolver.Resolve(ctx, swarm.Service{}, tc.serviceID)
|
|
|
|
assert.NilError(t, err)
|
|
assert.Check(t, is.Equal(tc.expectedID, id))
|
|
}
|
|
}
|