0adaf6be3b
This replaces the visitAll recursive function with a test that verifies that the option is set for all commands and subcommands, so that it doesn't have to be modified at runtime. We currently still have to loop over all functions for the setValidateArgs call, but that can be looked at separately. Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
96 lines
3.1 KiB
Go
96 lines
3.1 KiB
Go
package network
|
|
|
|
import (
|
|
"context"
|
|
"errors"
|
|
"strings"
|
|
|
|
"github.com/docker/cli/cli"
|
|
"github.com/docker/cli/cli/command"
|
|
"github.com/docker/cli/cli/command/completion"
|
|
"github.com/docker/cli/opts"
|
|
"github.com/moby/moby/api/types/network"
|
|
"github.com/moby/moby/client"
|
|
"github.com/spf13/cobra"
|
|
)
|
|
|
|
type connectOptions struct {
|
|
network string
|
|
container string
|
|
ipaddress string
|
|
ipv6address string
|
|
links opts.ListOpts
|
|
aliases []string
|
|
linklocalips []string
|
|
driverOpts []string
|
|
gwPriority int
|
|
}
|
|
|
|
func newConnectCommand(dockerCLI command.Cli) *cobra.Command {
|
|
options := connectOptions{
|
|
links: opts.NewListOpts(opts.ValidateLink),
|
|
}
|
|
|
|
cmd := &cobra.Command{
|
|
Use: "connect [OPTIONS] NETWORK CONTAINER",
|
|
Short: "Connect a container to a network",
|
|
Args: cli.ExactArgs(2),
|
|
RunE: func(cmd *cobra.Command, args []string) error {
|
|
options.network = args[0]
|
|
options.container = args[1]
|
|
return runConnect(cmd.Context(), dockerCLI.Client(), options)
|
|
},
|
|
ValidArgsFunction: func(cmd *cobra.Command, args []string, toComplete string) ([]string, cobra.ShellCompDirective) {
|
|
if len(args) == 0 {
|
|
return completion.NetworkNames(dockerCLI)(cmd, args, toComplete)
|
|
}
|
|
nw := args[0]
|
|
return completion.ContainerNames(dockerCLI, true, not(isConnected(nw)))(cmd, args, toComplete)
|
|
},
|
|
DisableFlagsInUseLine: true,
|
|
}
|
|
|
|
flags := cmd.Flags()
|
|
flags.StringVar(&options.ipaddress, "ip", "", `IPv4 address (e.g., "172.30.100.104")`)
|
|
flags.StringVar(&options.ipv6address, "ip6", "", `IPv6 address (e.g., "2001:db8::33")`)
|
|
flags.Var(&options.links, "link", "Add link to another container")
|
|
flags.StringSliceVar(&options.aliases, "alias", []string{}, "Add network-scoped alias for the container")
|
|
flags.StringSliceVar(&options.linklocalips, "link-local-ip", []string{}, "Add a link-local address for the container")
|
|
flags.StringSliceVar(&options.driverOpts, "driver-opt", []string{}, "driver options for the network")
|
|
flags.IntVar(&options.gwPriority, "gw-priority", 0, "Highest gw-priority provides the default gateway. Accepts positive and negative values.")
|
|
return cmd
|
|
}
|
|
|
|
func runConnect(ctx context.Context, apiClient client.NetworkAPIClient, options connectOptions) error {
|
|
driverOpts, err := convertDriverOpt(options.driverOpts)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
|
|
return apiClient.NetworkConnect(ctx, options.network, options.container, &network.EndpointSettings{
|
|
IPAMConfig: &network.EndpointIPAMConfig{
|
|
IPv4Address: options.ipaddress,
|
|
IPv6Address: options.ipv6address,
|
|
LinkLocalIPs: options.linklocalips,
|
|
},
|
|
Links: options.links.GetSlice(),
|
|
Aliases: options.aliases,
|
|
DriverOpts: driverOpts,
|
|
GwPriority: options.gwPriority,
|
|
})
|
|
}
|
|
|
|
func convertDriverOpt(options []string) (map[string]string, error) {
|
|
driverOpt := make(map[string]string)
|
|
for _, opt := range options {
|
|
k, v, ok := strings.Cut(opt, "=")
|
|
// TODO(thaJeztah): we should probably not accept whitespace here (both for key and value).
|
|
k = strings.TrimSpace(k)
|
|
if !ok || k == "" {
|
|
return nil, errors.New("invalid key/value pair format in driver options")
|
|
}
|
|
driverOpt[k] = strings.TrimSpace(v)
|
|
}
|
|
return driverOpt, nil
|
|
}
|