dfec976e84
internal/test/cli.go:175:14: fmt.Errorf can be replaced with errors.New (perfsprint)
return nil, fmt.Errorf("no notary client available unless defined")
^
cli/command/cli.go:318:29: fmt.Errorf can be replaced with errors.New (perfsprint)
return docker.Endpoint{}, fmt.Errorf("no context store initialized")
^
cli/command/container/attach.go:161:11: fmt.Errorf can be replaced with errors.New (perfsprint)
return fmt.Errorf(result.Error.Message)
^
cli/command/container/opts.go:577:16: fmt.Errorf can be replaced with errors.New (perfsprint)
return nil, fmt.Errorf("--health-start-period cannot be negative")
^
cli/command/container/opts.go:580:16: fmt.Errorf can be replaced with errors.New (perfsprint)
return nil, fmt.Errorf("--health-start-interval cannot be negative")
^
cli/command/container/stats.go:221:11: fmt.Errorf can be replaced with errors.New (perfsprint)
return fmt.Errorf("filtering is not supported when specifying a list of containers")
^
cli/command/container/attach_test.go:82:17: fmt.Errorf can be replaced with errors.New (perfsprint)
expectedErr = fmt.Errorf("unexpected error")
^
cli/command/container/create_test.go:234:40: fmt.Errorf can be replaced with errors.New (perfsprint)
return container.CreateResponse{}, fmt.Errorf("shouldn't try to pull image")
^
cli/command/container/list_test.go:150:17: fmt.Errorf can be replaced with errors.New (perfsprint)
return nil, fmt.Errorf("error listing containers")
^
cli/command/container/rm_test.go:40:31: fmt.Errorf can be replaced with errors.New (perfsprint)
return errdefs.NotFound(fmt.Errorf("Error: no such container: " + container))
^
cli/command/container/run_test.go:138:40: fmt.Errorf can be replaced with errors.New (perfsprint)
return container.CreateResponse{}, fmt.Errorf("shouldn't try to pull image")
^
cli/command/image/pull_test.go:115:49: fmt.Errorf can be replaced with errors.New (perfsprint)
return io.NopCloser(strings.NewReader("")), fmt.Errorf("shouldn't try to pull image")
^
cli/command/network/connect.go:88:16: fmt.Errorf can be replaced with errors.New (perfsprint)
return nil, fmt.Errorf("invalid key/value pair format in driver options")
^
cli/command/plugin/create_test.go:96:11: fmt.Errorf can be replaced with errors.New (perfsprint)
return fmt.Errorf("Error creating plugin")
^
cli/command/plugin/disable_test.go:32:12: fmt.Errorf can be replaced with errors.New (perfsprint)
return fmt.Errorf("Error disabling plugin")
^
cli/command/plugin/enable_test.go:32:12: fmt.Errorf can be replaced with errors.New (perfsprint)
return fmt.Errorf("failed to enable plugin")
^
cli/command/plugin/inspect_test.go:55:22: fmt.Errorf can be replaced with errors.New (perfsprint)
return nil, nil, fmt.Errorf("error inspecting plugin")
^
cli/command/plugin/install_test.go:43:17: fmt.Errorf can be replaced with errors.New (perfsprint)
return nil, fmt.Errorf("Error installing plugin")
^
cli/command/plugin/install_test.go:51:17: fmt.Errorf can be replaced with errors.New (perfsprint)
return nil, fmt.Errorf("(image) when fetching")
^
cli/command/plugin/install_test.go:95:17: fmt.Errorf can be replaced with errors.New (perfsprint)
return nil, fmt.Errorf("should not try to install plugin")
^
cli/command/plugin/list_test.go:35:41: fmt.Errorf can be replaced with errors.New (perfsprint)
return types.PluginsListResponse{}, fmt.Errorf("error listing plugins")
^
cli/command/plugin/remove_test.go:27:12: fmt.Errorf can be replaced with errors.New (perfsprint)
return fmt.Errorf("Error removing plugin")
^
cli/command/registry/login_test.go:36:46: fmt.Errorf can be replaced with errors.New (perfsprint)
return registrytypes.AuthenticateOKBody{}, fmt.Errorf("Invalid Username or Password")
^
cli/command/registry/login_test.go:44:46: fmt.Errorf can be replaced with errors.New (perfsprint)
return registrytypes.AuthenticateOKBody{}, fmt.Errorf(errUnknownUser)
^
cli/command/system/info.go:190:10: fmt.Errorf can be replaced with errors.New (perfsprint)
return fmt.Errorf("errors pretty printing info")
^
cli/command/system/prune.go:77:10: fmt.Errorf can be replaced with errors.New (perfsprint)
return fmt.Errorf(`ERROR: The "until" filter is not supported with "--volumes"`)
^
cli/command/system/version_test.go:19:28: fmt.Errorf can be replaced with errors.New (perfsprint)
return types.Version{}, fmt.Errorf("no server")
^
cli/command/trust/key_load.go:112:22: fmt.Errorf can be replaced with errors.New (perfsprint)
return []byte{}, fmt.Errorf("could not decrypt key")
^
cli/command/trust/revoke.go:44:10: fmt.Errorf can be replaced with errors.New (perfsprint)
return fmt.Errorf("cannot use a digest reference for IMAGE:TAG")
^
cli/command/trust/revoke.go:105:10: fmt.Errorf can be replaced with errors.New (perfsprint)
return fmt.Errorf("no signed tags to remove")
^
cli/command/trust/signer_add.go:56:10: fmt.Errorf can be replaced with errors.New (perfsprint)
return fmt.Errorf("releases is a reserved keyword, please use a different signer name")
^
cli/command/trust/signer_add.go:60:10: fmt.Errorf can be replaced with errors.New (perfsprint)
return fmt.Errorf("path to a public key must be provided using the `--key` flag")
^
opts/config.go:71:10: fmt.Errorf can be replaced with errors.New (perfsprint)
return fmt.Errorf("source is required")
^
opts/mount.go:168:10: fmt.Errorf can be replaced with errors.New (perfsprint)
return fmt.Errorf("type is required")
^
opts/mount.go:172:10: fmt.Errorf can be replaced with errors.New (perfsprint)
return fmt.Errorf("target is required")
^
opts/network.go:90:11: fmt.Errorf can be replaced with errors.New (perfsprint)
return fmt.Errorf("network name/id is not specified")
^
opts/network.go:129:18: fmt.Errorf can be replaced with errors.New (perfsprint)
return "", "", fmt.Errorf("invalid key value pair format in driver options")
^
opts/opts.go:404:13: fmt.Errorf can be replaced with errors.New (perfsprint)
return 0, fmt.Errorf("value is too precise")
^
opts/opts.go:412:18: fmt.Errorf can be replaced with errors.New (perfsprint)
return "", "", fmt.Errorf("empty string specified for links")
^
opts/parse.go:84:37: fmt.Errorf can be replaced with errors.New (perfsprint)
return container.RestartPolicy{}, fmt.Errorf("invalid restart policy format: no policy provided before colon")
^
opts/parse.go:89:38: fmt.Errorf can be replaced with errors.New (perfsprint)
return container.RestartPolicy{}, fmt.Errorf("invalid restart policy format: maximum retry count must be an integer")
^
opts/port.go:105:13: fmt.Errorf can be replaced with errors.New (perfsprint)
return fmt.Errorf("hostip is not supported")
^
opts/secret.go:70:10: fmt.Errorf can be replaced with errors.New (perfsprint)
return fmt.Errorf("source is required")
^
opts/env_test.go:57:11: fmt.Errorf can be replaced with errors.New (perfsprint)
err: fmt.Errorf("invalid environment variable: =a"),
^
opts/env_test.go:93:11: fmt.Errorf can be replaced with errors.New (perfsprint)
err: fmt.Errorf("invalid environment variable: ="),
^
cli-plugins/manager/error_test.go:16:11: fmt.Errorf can be replaced with errors.New (perfsprint)
inner := fmt.Errorf("testing")
^
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
136 lines
3.4 KiB
Go
136 lines
3.4 KiB
Go
package opts
|
|
|
|
import (
|
|
"encoding/csv"
|
|
"errors"
|
|
"fmt"
|
|
"regexp"
|
|
"strings"
|
|
)
|
|
|
|
const (
|
|
networkOptName = "name"
|
|
networkOptAlias = "alias"
|
|
networkOptIPv4Address = "ip"
|
|
networkOptIPv6Address = "ip6"
|
|
networkOptMacAddress = "mac-address"
|
|
networkOptLinkLocalIP = "link-local-ip"
|
|
driverOpt = "driver-opt"
|
|
)
|
|
|
|
// NetworkAttachmentOpts represents the network options for endpoint creation
|
|
type NetworkAttachmentOpts struct {
|
|
Target string
|
|
Aliases []string
|
|
DriverOpts map[string]string
|
|
Links []string // TODO add support for links in the csv notation of `--network`
|
|
IPv4Address string
|
|
IPv6Address string
|
|
LinkLocalIPs []string
|
|
MacAddress string
|
|
}
|
|
|
|
// NetworkOpt represents a network config in swarm mode.
|
|
type NetworkOpt struct {
|
|
options []NetworkAttachmentOpts
|
|
}
|
|
|
|
// Set networkopts value
|
|
func (n *NetworkOpt) Set(value string) error { //nolint:gocyclo
|
|
longSyntax, err := regexp.MatchString(`\w+=\w+(,\w+=\w+)*`, value)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
|
|
var netOpt NetworkAttachmentOpts
|
|
if longSyntax {
|
|
csvReader := csv.NewReader(strings.NewReader(value))
|
|
fields, err := csvReader.Read()
|
|
if err != nil {
|
|
return err
|
|
}
|
|
|
|
netOpt.Aliases = []string{}
|
|
for _, field := range fields {
|
|
// TODO(thaJeztah): these options should not be case-insensitive.
|
|
key, val, ok := strings.Cut(strings.ToLower(field), "=")
|
|
if !ok || key == "" {
|
|
return fmt.Errorf("invalid field %s", field)
|
|
}
|
|
|
|
key = strings.TrimSpace(key)
|
|
val = strings.TrimSpace(val)
|
|
|
|
switch key {
|
|
case networkOptName:
|
|
netOpt.Target = val
|
|
case networkOptAlias:
|
|
netOpt.Aliases = append(netOpt.Aliases, val)
|
|
case networkOptIPv4Address:
|
|
netOpt.IPv4Address = val
|
|
case networkOptIPv6Address:
|
|
netOpt.IPv6Address = val
|
|
case networkOptMacAddress:
|
|
netOpt.MacAddress = val
|
|
case networkOptLinkLocalIP:
|
|
netOpt.LinkLocalIPs = append(netOpt.LinkLocalIPs, val)
|
|
case driverOpt:
|
|
key, val, err = parseDriverOpt(val)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
if netOpt.DriverOpts == nil {
|
|
netOpt.DriverOpts = make(map[string]string)
|
|
}
|
|
netOpt.DriverOpts[key] = val
|
|
default:
|
|
return errors.New("invalid field key " + key)
|
|
}
|
|
}
|
|
if len(netOpt.Target) == 0 {
|
|
return errors.New("network name/id is not specified")
|
|
}
|
|
} else {
|
|
netOpt.Target = value
|
|
}
|
|
n.options = append(n.options, netOpt)
|
|
return nil
|
|
}
|
|
|
|
// Type returns the type of this option
|
|
func (n *NetworkOpt) Type() string {
|
|
return "network"
|
|
}
|
|
|
|
// Value returns the networkopts
|
|
func (n *NetworkOpt) Value() []NetworkAttachmentOpts {
|
|
return n.options
|
|
}
|
|
|
|
// String returns the network opts as a string
|
|
func (n *NetworkOpt) String() string {
|
|
return ""
|
|
}
|
|
|
|
// NetworkMode return the network mode for the network option
|
|
func (n *NetworkOpt) NetworkMode() string {
|
|
networkIDOrName := "default"
|
|
netOptVal := n.Value()
|
|
if len(netOptVal) > 0 {
|
|
networkIDOrName = netOptVal[0].Target
|
|
}
|
|
return networkIDOrName
|
|
}
|
|
|
|
func parseDriverOpt(driverOpt string) (string, string, error) {
|
|
// TODO(thaJeztah): these options should not be case-insensitive.
|
|
// TODO(thaJeztah): should value be converted to lowercase as well, or only the key?
|
|
key, value, ok := strings.Cut(strings.ToLower(driverOpt), "=")
|
|
if !ok || key == "" {
|
|
return "", "", errors.New("invalid key value pair format in driver options")
|
|
}
|
|
key = strings.TrimSpace(key)
|
|
value = strings.TrimSpace(value)
|
|
return key, value, nil
|
|
}
|