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

Replace fmt.Errorf() with errors.Errorf() in the cli

Browse Source 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
This commit is contained in:
Daniel Nephin
2017-03-09 13:23:45 -05:00
parent c1b2fad9aa
commit e9d6193dfd
99 changed files with 370 additions and 337 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
command/node/demote_test.go
View File

@ -2,12 +2,12 @@ package node
import (
"bytes"
"fmt"
"io/ioutil"
"testing"
"github.com/docker/docker/api/types/swarm"
"github.com/docker/docker/cli/internal/test"
"github.com/pkg/errors"
// Import builders to get the builder function as package function
. "github.com/docker/docker/cli/internal/test/builders"
"github.com/docker/docker/pkg/testutil/assert"
@ -26,14 +26,14 @@ func TestNodeDemoteErrors(t *testing.T) {
{
args: []string{"nodeID"},
nodeInspectFunc: func() (swarm.Node, []byte, error) {
return swarm.Node{}, []byte{}, fmt.Errorf("error inspecting the node")
return swarm.Node{}, []byte{}, errors.Errorf("error inspecting the node")
},
expectedError: "error inspecting the node",
},
{
args: []string{"nodeID"},
nodeUpdateFunc: func(nodeID string, version swarm.Version, node swarm.NodeSpec) error {
return fmt.Errorf("error updating the node")
return errors.Errorf("error updating the node")
},
expectedError: "error updating the node",
},
@ -60,7 +60,7 @@ func TestNodeDemoteNoChange(t *testing.T) {
},
nodeUpdateFunc: func(nodeID string, version swarm.Version, node swarm.NodeSpec) error {
if node.Role != swarm.NodeRoleWorker {
return fmt.Errorf("expected role worker, got %s", node.Role)
return errors.Errorf("expected role worker, got %s", node.Role)
}
return nil
},
@ -78,7 +78,7 @@ func TestNodeDemoteMultipleNode(t *testing.T) {
},
nodeUpdateFunc: func(nodeID string, version swarm.Version, node swarm.NodeSpec) error {
if node.Role != swarm.NodeRoleWorker {
return fmt.Errorf("expected role worker, got %s", node.Role)
return errors.Errorf("expected role worker, got %s", node.Role)
}
return nil
},

11
command/node/inspect_test.go
View File

@ -9,6 +9,7 @@ import (
"github.com/docker/docker/api/types"
"github.com/docker/docker/api/types/swarm"
"github.com/docker/docker/cli/internal/test"
"github.com/pkg/errors"
// Import builders to get the builder function as package function
. "github.com/docker/docker/cli/internal/test/builders"
"github.com/docker/docker/pkg/testutil/assert"
@ -29,24 +30,24 @@ func TestNodeInspectErrors(t *testing.T) {
{
args: []string{"self"},
infoFunc: func() (types.Info, error) {
return types.Info{}, fmt.Errorf("error asking for node info")
return types.Info{}, errors.Errorf("error asking for node info")
},
expectedError: "error asking for node info",
},
{
args: []string{"nodeID"},
nodeInspectFunc: func() (swarm.Node, []byte, error) {
return swarm.Node{}, []byte{}, fmt.Errorf("error inspecting the node")
return swarm.Node{}, []byte{}, errors.Errorf("error inspecting the node")
},
infoFunc: func() (types.Info, error) {
return types.Info{}, fmt.Errorf("error asking for node info")
return types.Info{}, errors.Errorf("error asking for node info")
},
expectedError: "error inspecting the node",
},
{
args: []string{"self"},
nodeInspectFunc: func() (swarm.Node, []byte, error) {
return swarm.Node{}, []byte{}, fmt.Errorf("error inspecting the node")
return swarm.Node{}, []byte{}, errors.Errorf("error inspecting the node")
},
infoFunc: func() (types.Info, error) {
return types.Info{}, nil
@ -59,7 +60,7 @@ func TestNodeInspectErrors(t *testing.T) {
"pretty": "true",
},
infoFunc: func() (types.Info, error) {
return types.Info{}, fmt.Errorf("error asking for node info")
return types.Info{}, errors.Errorf("error asking for node info")
},
expectedError: "error asking for node info",
},

6
command/node/list_test.go
View File

@ -2,13 +2,13 @@ package node
import (
"bytes"
"fmt"
"io/ioutil"
"testing"
"github.com/docker/docker/api/types"
"github.com/docker/docker/api/types/swarm"
"github.com/docker/docker/cli/internal/test"
"github.com/pkg/errors"
// Import builders to get the builder function as package function
. "github.com/docker/docker/cli/internal/test/builders"
"github.com/docker/docker/pkg/testutil/assert"
@ -22,7 +22,7 @@ func TestNodeListErrorOnAPIFailure(t *testing.T) {
}{
{
nodeListFunc: func() ([]swarm.Node, error) {
return []swarm.Node{}, fmt.Errorf("error listing nodes")
return []swarm.Node{}, errors.Errorf("error listing nodes")
},
expectedError: "error listing nodes",
},
@ -35,7 +35,7 @@ func TestNodeListErrorOnAPIFailure(t *testing.T) {
}, nil
},
infoFunc: func() (types.Info, error) {
return types.Info{}, fmt.Errorf("error asking for node info")
return types.Info{}, errors.Errorf("error asking for node info")
},
expectedError: "error asking for node info",
},

10
command/node/promote_test.go
View File

@ -2,12 +2,12 @@ package node
import (
"bytes"
"fmt"
"io/ioutil"
"testing"
"github.com/docker/docker/api/types/swarm"
"github.com/docker/docker/cli/internal/test"
"github.com/pkg/errors"
// Import builders to get the builder function as package function
. "github.com/docker/docker/cli/internal/test/builders"
"github.com/docker/docker/pkg/testutil/assert"
@ -26,14 +26,14 @@ func TestNodePromoteErrors(t *testing.T) {
{
args: []string{"nodeID"},
nodeInspectFunc: func() (swarm.Node, []byte, error) {
return swarm.Node{}, []byte{}, fmt.Errorf("error inspecting the node")
return swarm.Node{}, []byte{}, errors.Errorf("error inspecting the node")
},
expectedError: "error inspecting the node",
},
{
args: []string{"nodeID"},
nodeUpdateFunc: func(nodeID string, version swarm.Version, node swarm.NodeSpec) error {
return fmt.Errorf("error updating the node")
return errors.Errorf("error updating the node")
},
expectedError: "error updating the node",
},
@ -60,7 +60,7 @@ func TestNodePromoteNoChange(t *testing.T) {
},
nodeUpdateFunc: func(nodeID string, version swarm.Version, node swarm.NodeSpec) error {
if node.Role != swarm.NodeRoleManager {
return fmt.Errorf("expected role manager, got %s", node.Role)
return errors.Errorf("expected role manager, got %s", node.Role)
}
return nil
},
@ -78,7 +78,7 @@ func TestNodePromoteMultipleNode(t *testing.T) {
},
nodeUpdateFunc: func(nodeID string, version swarm.Version, node swarm.NodeSpec) error {
if node.Role != swarm.NodeRoleManager {
return fmt.Errorf("expected role manager, got %s", node.Role)
return errors.Errorf("expected role manager, got %s", node.Role)
}
return nil
},

4
command/node/ps.go
View File

@ -1,7 +1,6 @@
package node
import (
"fmt"
"strings"
"github.com/docker/docker/api/types"
@ -12,6 +11,7 @@ import (
"github.com/docker/docker/cli/command/idresolver"
"github.com/docker/docker/cli/command/task"
"github.com/docker/docker/opts"
"github.com/pkg/errors"
"github.com/spf13/cobra"
"golang.org/x/net/context"
)
@ -100,7 +100,7 @@ func runPs(dockerCli command.Cli, opts psOptions) error {
}
if len(errs) > 0 {
return fmt.Errorf("%s", strings.Join(errs, "\n"))
return errors.Errorf("%s", strings.Join(errs, "\n"))
}
return nil

7
command/node/ps_test.go
View File

@ -10,6 +10,7 @@ import (
"github.com/docker/docker/api/types"
"github.com/docker/docker/api/types/swarm"
"github.com/docker/docker/cli/internal/test"
"github.com/pkg/errors"
// Import builders to get the builder function as package function
. "github.com/docker/docker/cli/internal/test/builders"
"github.com/docker/docker/pkg/testutil/assert"
@ -28,21 +29,21 @@ func TestNodePsErrors(t *testing.T) {
}{
{
infoFunc: func() (types.Info, error) {
return types.Info{}, fmt.Errorf("error asking for node info")
return types.Info{}, errors.Errorf("error asking for node info")
},
expectedError: "error asking for node info",
},
{
args: []string{"nodeID"},
nodeInspectFunc: func() (swarm.Node, []byte, error) {
return swarm.Node{}, []byte{}, fmt.Errorf("error inspecting the node")
return swarm.Node{}, []byte{}, errors.Errorf("error inspecting the node")
},
expectedError: "error inspecting the node",
},
{
args: []string{"nodeID"},
taskListFunc: func(options types.TaskListOptions) ([]swarm.Task, error) {
return []swarm.Task{}, fmt.Errorf("error returning the task list")
return []swarm.Task{}, errors.Errorf("error returning the task list")
},
expectedError: "error returning the task list",
},

3
command/node/remove.go
View File

@ -9,6 +9,7 @@ import (
"github.com/docker/docker/api/types"
"github.com/docker/docker/cli"
"github.com/docker/docker/cli/command"
"github.com/pkg/errors"
"github.com/spf13/cobra"
)
@ -49,7 +50,7 @@ func runRemove(dockerCli command.Cli, args []string, opts removeOptions) error {
}
if len(errs) > 0 {
return fmt.Errorf("%s", strings.Join(errs, "\n"))
return errors.Errorf("%s", strings.Join(errs, "\n"))
}
return nil

4
command/node/remove_test.go
View File

@ -2,12 +2,12 @@ package node
import (
"bytes"
"fmt"
"io/ioutil"
"testing"
"github.com/docker/docker/cli/internal/test"
"github.com/docker/docker/pkg/testutil/assert"
"github.com/pkg/errors"
)
func TestNodeRemoveErrors(t *testing.T) {
@ -22,7 +22,7 @@ func TestNodeRemoveErrors(t *testing.T) {
{
args: []string{"nodeID"},
nodeRemoveFunc: func() error {
return fmt.Errorf("error removing the node")
return errors.Errorf("error removing the node")
},
expectedError: "error removing the node",
},

4
command/node/update.go
View File

@ -1,7 +1,6 @@
package node
import (
"errors"
"fmt"
"github.com/docker/docker/api/types/swarm"
@ -9,6 +8,7 @@ import (
"github.com/docker/docker/cli/command"
"github.com/docker/docker/opts"
runconfigopts "github.com/docker/docker/runconfig/opts"
"github.com/pkg/errors"
"github.com/spf13/cobra"
"github.com/spf13/pflag"
"golang.org/x/net/context"
@ -104,7 +104,7 @@ func mergeNodeUpdate(flags *pflag.FlagSet) func(*swarm.Node) error {
for _, k := range keys {
// if a key doesn't exist, fail the command explicitly
if _, exists := spec.Annotations.Labels[k]; !exists {
return fmt.Errorf("key %s doesn't exist in node's labels", k)
return errors.Errorf("key %s doesn't exist in node's labels", k)
}
delete(spec.Annotations.Labels, k)
}

16
command/node/update_test.go
View File

@ -2,12 +2,12 @@ package node
import (
"bytes"
"fmt"
"io/ioutil"
"testing"
"github.com/docker/docker/api/types/swarm"
"github.com/docker/docker/cli/internal/test"
"github.com/pkg/errors"
// Import builders to get the builder function as package function
. "github.com/docker/docker/cli/internal/test/builders"
"github.com/docker/docker/pkg/testutil/assert"
@ -31,14 +31,14 @@ func TestNodeUpdateErrors(t *testing.T) {
{
args: []string{"nodeID"},
nodeInspectFunc: func() (swarm.Node, []byte, error) {
return swarm.Node{}, []byte{}, fmt.Errorf("error inspecting the node")
return swarm.Node{}, []byte{}, errors.Errorf("error inspecting the node")
},
expectedError: "error inspecting the node",
},
{
args: []string{"nodeID"},
nodeUpdateFunc: func(nodeID string, version swarm.Version, node swarm.NodeSpec) error {
return fmt.Errorf("error updating the node")
return errors.Errorf("error updating the node")
},
expectedError: "error updating the node",
},
@ -88,7 +88,7 @@ func TestNodeUpdate(t *testing.T) {
},
nodeUpdateFunc: func(nodeID string, version swarm.Version, node swarm.NodeSpec) error {
if node.Role != swarm.NodeRoleManager {
return fmt.Errorf("expected role manager, got %s", node.Role)
return errors.Errorf("expected role manager, got %s", node.Role)
}
return nil
},
@ -103,7 +103,7 @@ func TestNodeUpdate(t *testing.T) {
},
nodeUpdateFunc: func(nodeID string, version swarm.Version, node swarm.NodeSpec) error {
if node.Availability != swarm.NodeAvailabilityDrain {
return fmt.Errorf("expected drain availability, got %s", node.Availability)
return errors.Errorf("expected drain availability, got %s", node.Availability)
}
return nil
},
@ -118,7 +118,7 @@ func TestNodeUpdate(t *testing.T) {
},
nodeUpdateFunc: func(nodeID string, version swarm.Version, node swarm.NodeSpec) error {
if _, present := node.Annotations.Labels["lbl"]; !present {
return fmt.Errorf("expected 'lbl' label, got %v", node.Annotations.Labels)
return errors.Errorf("expected 'lbl' label, got %v", node.Annotations.Labels)
}
return nil
},
@ -133,7 +133,7 @@ func TestNodeUpdate(t *testing.T) {
},
nodeUpdateFunc: func(nodeID string, version swarm.Version, node swarm.NodeSpec) error {
if value, present := node.Annotations.Labels["key"]; !present || value != "value" {
return fmt.Errorf("expected 'key' label to be 'value', got %v", node.Annotations.Labels)
return errors.Errorf("expected 'key' label to be 'value', got %v", node.Annotations.Labels)
}
return nil
},
@ -150,7 +150,7 @@ func TestNodeUpdate(t *testing.T) {
},
nodeUpdateFunc: func(nodeID string, version swarm.Version, node swarm.NodeSpec) error {
if len(node.Annotations.Labels) > 0 {
return fmt.Errorf("expected no labels, got %v", node.Annotations.Labels)
return errors.Errorf("expected no labels, got %v", node.Annotations.Labels)
}
return nil
},