docker/cli
1
0
Fork 0
mirror of https://github.com/docker/cli.git synced 2026-01-18 08:21:31 +03:00
Code 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

2
command/container/attach.go
View File

@@ -1,7 +1,7 @@
package container
import (
"errors"
"github.com/pkg/errors"
"io"
"net/http/httputil"

5
command/container/cp.go
View File

@@ -1,8 +1,6 @@
package container
import (
"errors"
"fmt"
"io"
"os"
"path/filepath"
@@ -13,6 +11,7 @@ import (
"github.com/docker/docker/cli/command"
"github.com/docker/docker/pkg/archive"
"github.com/docker/docker/pkg/system"
"github.com/pkg/errors"
"github.com/spf13/cobra"
"golang.org/x/net/context"
)
@@ -227,7 +226,7 @@ func copyToContainer(ctx context.Context, dockerCli *command.DockerCli, srcPath,
content = os.Stdin
resolvedDstPath = dstInfo.Path
if !dstInfo.IsDir {
return fmt.Errorf("destination \"%s:%s\" must be a directory", dstContainer, dstPath)
return errors.Errorf("destination \"%s:%s\" must be a directory", dstContainer, dstPath)
}
} else {
// Prepare source copy info.

9
command/container/create.go
View File

@@ -14,6 +14,7 @@ import (
apiclient "github.com/docker/docker/client"
"github.com/docker/docker/pkg/jsonmessage"
"github.com/docker/docker/registry"
"github.com/pkg/errors"
"github.com/spf13/cobra"
"github.com/spf13/pflag"
"golang.org/x/net/context"
@@ -118,7 +119,7 @@ func (cid *cidFile) Close() error {
return nil
}
if err := os.Remove(cid.path); err != nil {
return fmt.Errorf("failed to remove the CID file '%s': %s \n", cid.path, err)
return errors.Errorf("failed to remove the CID file '%s': %s \n", cid.path, err)
}
return nil
@@ -126,7 +127,7 @@ func (cid *cidFile) Close() error {
func (cid *cidFile) Write(id string) error {
if _, err := cid.file.Write([]byte(id)); err != nil {
return fmt.Errorf("Failed to write the container ID to the file: %s", err)
return errors.Errorf("Failed to write the container ID to the file: %s", err)
}
cid.written = true
return nil
@@ -134,12 +135,12 @@ func (cid *cidFile) Write(id string) error {
func newCIDFile(path string) (*cidFile, error) {
if _, err := os.Stat(path); err == nil {
return nil, fmt.Errorf("Container ID file found, make sure the other container isn't running or delete %s", path)
return nil, errors.Errorf("Container ID file found, make sure the other container isn't running or delete %s", path)
}
f, err := os.Create(path)
if err != nil {
return nil, fmt.Errorf("Failed to create the container ID file: %s", err)
return nil, errors.Errorf("Failed to create the container ID file: %s", err)
}
return &cidFile{path: path, file: f}, nil

2
command/container/diff.go
View File

@@ -1,8 +1,8 @@
package container
import (
"errors"
"fmt"
"github.com/pkg/errors"
"github.com/docker/docker/cli"
"github.com/docker/docker/cli/command"

2
command/container/export.go
View File

@@ -1,7 +1,7 @@
package container
import (
"errors"
"github.com/pkg/errors"
"io"
"github.com/docker/docker/cli"

2
command/container/kill.go
View File

@@ -1,8 +1,8 @@
package container
import (
"errors"
"fmt"
"github.com/pkg/errors"
"strings"
"github.com/docker/docker/cli"

51
command/container/opts.go
View File

@@ -18,6 +18,7 @@ import (
"github.com/docker/docker/pkg/signal"
runconfigopts "github.com/docker/docker/runconfig/opts"
"github.com/docker/go-connections/nat"
"github.com/pkg/errors"
"github.com/spf13/pflag"
)
@@ -304,7 +305,7 @@ func parse(flags *pflag.FlagSet, copts *containerOptions) (*containerConfig, err
// Validate the input mac address
if copts.macAddress != "" {
if _, err := opts.ValidateMACAddress(copts.macAddress); err != nil {
return nil, fmt.Errorf("%s is not a valid mac address", copts.macAddress)
return nil, errors.Errorf("%s is not a valid mac address", copts.macAddress)
}
}
if copts.stdin {
@@ -320,7 +321,7 @@ func parse(flags *pflag.FlagSet, copts *containerOptions) (*containerConfig, err
swappiness := copts.swappiness
if swappiness != -1 && (swappiness < 0 || swappiness > 100) {
return nil, fmt.Errorf("invalid value: %d. Valid memory swappiness range is 0-100", swappiness)
return nil, errors.Errorf("invalid value: %d. Valid memory swappiness range is 0-100", swappiness)
}
var binds []string
@@ -371,7 +372,7 @@ func parse(flags *pflag.FlagSet, copts *containerOptions) (*containerConfig, err
// Merge in exposed ports to the map of published ports
for _, e := range copts.expose.GetAll() {
if strings.Contains(e, ":") {
return nil, fmt.Errorf("invalid port format for --expose: %s", e)
return nil, errors.Errorf("invalid port format for --expose: %s", e)
}
//support two formats for expose, original format <portnum>/[<proto>] or <startport-endport>/[<proto>]
proto, port := nat.SplitProtoPort(e)
@@ -379,7 +380,7 @@ func parse(flags *pflag.FlagSet, copts *containerOptions) (*containerConfig, err
//if expose a port, the start and end port are the same
start, end, err := nat.ParsePortRange(port)
if err != nil {
return nil, fmt.Errorf("invalid range format for --expose: %s, error: %s", e, err)
return nil, errors.Errorf("invalid range format for --expose: %s, error: %s", e, err)
}
for i := start; i <= end; i++ {
p, err := nat.NewPort(proto, strconv.FormatUint(i, 10))
@@ -416,22 +417,22 @@ func parse(flags *pflag.FlagSet, copts *containerOptions) (*containerConfig, err
ipcMode := container.IpcMode(copts.ipcMode)
if !ipcMode.Valid() {
return nil, fmt.Errorf("--ipc: invalid IPC mode")
return nil, errors.Errorf("--ipc: invalid IPC mode")
}
pidMode := container.PidMode(copts.pidMode)
if !pidMode.Valid() {
return nil, fmt.Errorf("--pid: invalid PID mode")
return nil, errors.Errorf("--pid: invalid PID mode")
}
utsMode := container.UTSMode(copts.utsMode)
if !utsMode.Valid() {
return nil, fmt.Errorf("--uts: invalid UTS mode")
return nil, errors.Errorf("--uts: invalid UTS mode")
}
usernsMode := container.UsernsMode(copts.usernsMode)
if !usernsMode.Valid() {
return nil, fmt.Errorf("--userns: invalid USER mode")
return nil, errors.Errorf("--userns: invalid USER mode")
}
restartPolicy, err := runconfigopts.ParseRestartPolicy(copts.restartPolicy)
@@ -462,7 +463,7 @@ func parse(flags *pflag.FlagSet, copts *containerOptions) (*containerConfig, err
copts.healthRetries != 0
if copts.noHealthcheck {
if haveHealthSettings {
return nil, fmt.Errorf("--no-healthcheck conflicts with --health-* options")
return nil, errors.Errorf("--no-healthcheck conflicts with --health-* options")
}
test := strslice.StrSlice{"NONE"}
healthConfig = &container.HealthConfig{Test: test}
@@ -473,13 +474,13 @@ func parse(flags *pflag.FlagSet, copts *containerOptions) (*containerConfig, err
probe = strslice.StrSlice(args)
}
if copts.healthInterval < 0 {
return nil, fmt.Errorf("--health-interval cannot be negative")
return nil, errors.Errorf("--health-interval cannot be negative")
}
if copts.healthTimeout < 0 {
return nil, fmt.Errorf("--health-timeout cannot be negative")
return nil, errors.Errorf("--health-timeout cannot be negative")
}
if copts.healthRetries < 0 {
return nil, fmt.Errorf("--health-retries cannot be negative")
return nil, errors.Errorf("--health-retries cannot be negative")
}
healthConfig = &container.HealthConfig{
@@ -594,7 +595,7 @@ func parse(flags *pflag.FlagSet, copts *containerOptions) (*containerConfig, err
}
if copts.autoRemove && !hostConfig.RestartPolicy.IsNone() {
return nil, fmt.Errorf("Conflicting options: --restart and --rm")
return nil, errors.Errorf("Conflicting options: --restart and --rm")
}
// only set this value if the user provided the flag, else it should default to nil
@@ -656,7 +657,7 @@ func parse(flags *pflag.FlagSet, copts *containerOptions) (*containerConfig, err
func parseLoggingOpts(loggingDriver string, loggingOpts []string) (map[string]string, error) {
loggingOptsMap := runconfigopts.ConvertKVStringsToMap(loggingOpts)
if loggingDriver == "none" && len(loggingOpts) > 0 {
return map[string]string{}, fmt.Errorf("invalid logging opts for driver %s", loggingDriver)
return map[string]string{}, errors.Errorf("invalid logging opts for driver %s", loggingDriver)
}
return loggingOptsMap, nil
}
@@ -669,17 +670,17 @@ func parseSecurityOpts(securityOpts []string) ([]string, error) {
if strings.Contains(opt, ":") {
con = strings.SplitN(opt, ":", 2)
} else {
return securityOpts, fmt.Errorf("Invalid --security-opt: %q", opt)
return securityOpts, errors.Errorf("Invalid --security-opt: %q", opt)
}
}
if con[0] == "seccomp" && con[1] != "unconfined" {
f, err := ioutil.ReadFile(con[1])
if err != nil {
return securityOpts, fmt.Errorf("opening seccomp profile (%s) failed: %v", con[1], err)
return securityOpts, errors.Errorf("opening seccomp profile (%s) failed: %v", con[1], err)
}
b := bytes.NewBuffer(nil)
if err := json.Compact(b, f); err != nil {
return securityOpts, fmt.Errorf("compacting json for seccomp profile (%s) failed: %v", con[1], err)
return securityOpts, errors.Errorf("compacting json for seccomp profile (%s) failed: %v", con[1], err)
}
securityOpts[key] = fmt.Sprintf("seccomp=%s", b.Bytes())
}
@@ -696,7 +697,7 @@ func parseStorageOpts(storageOpts []string) (map[string]string, error) {
opt := strings.SplitN(option, "=", 2)
m[opt[0]] = opt[1]
} else {
return nil, fmt.Errorf("invalid storage option")
return nil, errors.Errorf("invalid storage option")
}
}
return m, nil
@@ -722,7 +723,7 @@ func parseDevice(device string) (container.DeviceMapping, error) {
case 1:
src = arr[0]
default:
return container.DeviceMapping{}, fmt.Errorf("invalid device specification: %s", device)
return container.DeviceMapping{}, errors.Errorf("invalid device specification: %s", device)
}
if dst == "" {
@@ -745,7 +746,7 @@ func validateDeviceCgroupRule(val string) (string, error) {
return val, nil
}
return val, fmt.Errorf("invalid device cgroup format '%s'", val)
return val, errors.Errorf("invalid device cgroup format '%s'", val)
}
// validDeviceMode checks if the mode for device is valid or not.
@@ -781,12 +782,12 @@ func validatePath(val string, validator func(string) bool) (string, error) {
var mode string
if strings.Count(val, ":") > 2 {
return val, fmt.Errorf("bad format for path: %s", val)
return val, errors.Errorf("bad format for path: %s", val)
}
split := strings.SplitN(val, ":", 3)
if split[0] == "" {
return val, fmt.Errorf("bad format for path: %s", val)
return val, errors.Errorf("bad format for path: %s", val)
}
switch len(split) {
case 1:
@@ -805,13 +806,13 @@ func validatePath(val string, validator func(string) bool) (string, error) {
containerPath = split[1]
mode = split[2]
if isValid := validator(split[2]); !isValid {
return val, fmt.Errorf("bad mode specified: %s", mode)
return val, errors.Errorf("bad mode specified: %s", mode)
}
val = fmt.Sprintf("%s:%s:%s", split[0], containerPath, mode)
}
if !path.IsAbs(containerPath) {
return val, fmt.Errorf("%s is not an absolute path", containerPath)
return val, errors.Errorf("%s is not an absolute path", containerPath)
}
return val, nil
}
@@ -885,5 +886,5 @@ func validateAttach(val string) (string, error) {
return s, nil
}
}
return val, fmt.Errorf("valid streams are STDIN, STDOUT and STDERR")
return val, errors.Errorf("valid streams are STDIN, STDOUT and STDERR")
}

9
command/container/opts_test.go
View File

@@ -16,6 +16,7 @@ import (
"github.com/docker/docker/pkg/testutil/assert"
"github.com/docker/docker/runconfig"
"github.com/docker/go-connections/nat"
"github.com/pkg/errors"
"github.com/spf13/pflag"
)
@@ -224,7 +225,7 @@ func compareRandomizedStrings(a, b, c, d string) error {
if a == d && b == c {
return nil
}
return fmt.Errorf("strings don't match")
return errors.Errorf("strings don't match")
}
// Simple parse with MacAddress validation
@@ -751,14 +752,14 @@ func callDecodeContainerConfig(volumes []string, binds []string) (*container.Con
w.Config.Volumes[v] = struct{}{}
}
if b, err = json.Marshal(w); err != nil {
return nil, nil, fmt.Errorf("Error on marshal %s", err.Error())
return nil, nil, errors.Errorf("Error on marshal %s", err.Error())
}
c, h, _, err = runconfig.DecodeContainerConfig(bytes.NewReader(b))
if err != nil {
return nil, nil, fmt.Errorf("Error parsing %s: %v", string(b), err)
return nil, nil, errors.Errorf("Error parsing %s: %v", string(b), err)
}
if c == nil || h == nil {
return nil, nil, fmt.Errorf("Empty config or hostconfig")
return nil, nil, errors.Errorf("Empty config or hostconfig")
}
return c, h, err

2
command/container/pause.go
View File

@@ -1,8 +1,8 @@
package container
import (
"errors"
"fmt"
"github.com/pkg/errors"
"strings"
"github.com/docker/docker/cli"

3
command/container/port.go
View File

@@ -7,6 +7,7 @@ import (
"github.com/docker/docker/cli"
"github.com/docker/docker/cli/command"
"github.com/docker/go-connections/nat"
"github.com/pkg/errors"
"github.com/spf13/cobra"
"golang.org/x/net/context"
)
@@ -64,7 +65,7 @@ func runPort(dockerCli *command.DockerCli, opts *portOptions) error {
}
return nil
}
return fmt.Errorf("Error: No public port '%s' published for %s", natPort, opts.container)
return errors.Errorf("Error: No public port '%s' published for %s", natPort, opts.container)
}
for from, frontends := range c.NetworkSettings.Ports {

4
command/container/rename.go
View File

@@ -1,12 +1,12 @@
package container
import (
"errors"
"fmt"
"strings"
"github.com/docker/docker/cli"
"github.com/docker/docker/cli/command"
"github.com/pkg/errors"
"github.com/spf13/cobra"
"golang.org/x/net/context"
)
@@ -45,7 +45,7 @@ func runRename(dockerCli *command.DockerCli, opts *renameOptions) error {
if err := dockerCli.Client().ContainerRename(ctx, oldName, newName); err != nil {
fmt.Fprintln(dockerCli.Err(), err)
return fmt.Errorf("Error: failed to rename container named %s", oldName)
return errors.Errorf("Error: failed to rename container named %s", oldName)
}
return nil
}

2
command/container/restart.go
View File

@@ -1,8 +1,8 @@
package container
import (
"errors"
"fmt"
"github.com/pkg/errors"
"strings"
"time"

2
command/container/rm.go
View File

@@ -1,8 +1,8 @@
package container
import (
"errors"
"fmt"
"github.com/pkg/errors"
"strings"
"github.com/docker/docker/api/types"

2
command/container/run.go
View File

@@ -1,8 +1,8 @@
package container
import (
"errors"
"fmt"
"github.com/pkg/errors"
"io"
"net/http/httputil"
"os"

4
command/container/start.go
View File

@@ -1,7 +1,6 @@
package container
import (
"errors"
"fmt"
"io"
"net/http/httputil"
@@ -12,6 +11,7 @@ import (
"github.com/docker/docker/cli/command"
"github.com/docker/docker/pkg/promise"
"github.com/docker/docker/pkg/signal"
"github.com/pkg/errors"
"github.com/spf13/cobra"
"golang.org/x/net/context"
)
@@ -173,7 +173,7 @@ func startContainersWithoutAttachments(ctx context.Context, dockerCli *command.D
}
if len(failedContainers) > 0 {
return fmt.Errorf("Error: failed to start containers: %s", strings.Join(failedContainers, ", "))
return errors.Errorf("Error: failed to start containers: %s", strings.Join(failedContainers, ", "))
}
return nil
}

2
command/container/stats.go
View File

@@ -1,8 +1,8 @@
package container
import (
"errors"
"fmt"
"github.com/pkg/errors"
"io"
"strings"
"sync"

2
command/container/stats_helpers.go
View File

@@ -2,7 +2,7 @@ package container
import (
"encoding/json"
"errors"
"github.com/pkg/errors"
"io"
"strings"
"sync"

2
command/container/stop.go
View File

@@ -1,8 +1,8 @@
package container
import (
"errors"
"fmt"
"github.com/pkg/errors"
"strings"
"time"

2
command/container/unpause.go
View File

@@ -1,8 +1,8 @@
package container
import (
"errors"
"fmt"
"github.com/pkg/errors"
"strings"
"github.com/docker/docker/cli"

2
command/container/update.go
View File

@@ -1,8 +1,8 @@
package container
import (
"errors"
"fmt"
"github.com/pkg/errors"
"strings"
containertypes "github.com/docker/docker/api/types/container"

2
command/container/wait.go
View File

@@ -1,8 +1,8 @@
package container
import (
"errors"
"fmt"
"github.com/pkg/errors"
"strings"
"github.com/docker/docker/cli"