Revert "revert flag-type changes"

This reverts commit 4303d6b.

Signed-off-by: Sebastiaan van Stijn <[email protected]>

Author: thaJeztah

cli/command/network/connect.go

@@ -19,11 +19,11 @@ import (
 type connectOptions struct {
 	network      string
 	container    string
-	ipaddress    string // TODO(thaJeztah): we need a flag-type to handle netip.Addr directly
-	ipv6address  string // TODO(thaJeztah): we need a flag-type to handle netip.Addr directly
+	ipaddress    net.IP // TODO(thaJeztah): we need a flag-type to handle netip.Addr directly
+	ipv6address  net.IP // TODO(thaJeztah): we need a flag-type to handle netip.Addr directly
 	links        opts.ListOpts
 	aliases      []string
-	linklocalips []string // TODO(thaJeztah): we need a flag-type to handle []netip.Addr directly
+	linklocalips []net.IP // TODO(thaJeztah): we need a flag-type to handle []netip.Addr directly
 	driverOpts   []string
 	gwPriority   int
 }
@@ -53,11 +53,11 @@ func newConnectCommand(dockerCLI command.Cli) *cobra.Command {
 	}
 
 	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.IPVar(&options.ipaddress, "ip", nil, `IPv4 address (e.g., "172.30.100.104")`)
+	flags.IPVar(&options.ipv6address, "ip6", nil, `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.IPSliceVar(&options.linklocalips, "link-local-ip", nil, "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
@@ -71,8 +71,8 @@ func runConnect(ctx context.Context, apiClient client.NetworkAPIClient, options
 
 	return apiClient.NetworkConnect(ctx, options.network, options.container, &network.EndpointSettings{
 		IPAMConfig: &network.EndpointIPAMConfig{
-			IPv4Address:  tryParseAddr(options.ipaddress),
-			IPv6Address:  tryParseAddr(options.ipv6address),
+			IPv4Address:  toNetipAddr(options.ipaddress),
+			IPv6Address:  toNetipAddr(options.ipv6address),
 			LinkLocalIPs: toNetipAddrSlice(options.linklocalips),
 		},
 		Links:      options.links.GetSlice(),
@@ -96,17 +96,27 @@ func convertDriverOpt(options []string) (map[string]string, error) {
 	return driverOpt, nil
 }
 
-func toNetipAddrSlice(ips []string) []netip.Addr {
-	netIPs := make([]netip.Addr, 0, len(ips))
+func toNetipAddrSlice(ips []net.IP) []netip.Addr {
+	netips := make([]netip.Addr, 0, len(ips))
 	for _, ip := range ips {
-		netIPs = append(netIPs, tryParseAddr(ip))
+		netips = append(netips, toNetipAddr(ip))
 	}
-	return netIPs
+	return netips
 }
 
-func tryParseAddr(ip string) netip.Addr {
-	addr, _ := netip.ParseAddr(ip)
-	return addr
+func toNetipAddr(ip net.IP) netip.Addr {
+	if len(ip) == 0 {
+		return netip.Addr{}
+	}
+	if ip4 := ip.To4(); ip4 != nil {
+		a, _ := netip.AddrFromSlice(ip4)
+		return a
+	}
+	if ip16 := ip.To16(); ip16 != nil {
+		a, _ := netip.AddrFromSlice(ip16)
+		return a
+	}
+	return netip.Addr{}
 }
 
 func ipNetToPrefix(n net.IPNet) netip.Prefix {

cli/command/network/connect_test.go

@@ -48,9 +48,9 @@ func TestNetworkConnectErrors(t *testing.T) {
 func TestNetworkConnectWithFlags(t *testing.T) {
 	expectedConfig := &network.EndpointSettings{
 		IPAMConfig: &network.EndpointIPAMConfig{
-			IPv4Address:  netip.MustParseAddr("192.168.4.1").Unmap(),
+			IPv4Address:  netip.MustParseAddr("192.168.4.1"),
 			IPv6Address:  netip.MustParseAddr("fdef:f401:8da0:1234::5678"),
-			LinkLocalIPs: []netip.Addr{netip.MustParseAddr("169.254.42.42").Unmap()},
+			LinkLocalIPs: []netip.Addr{netip.MustParseAddr("169.254.42.42")},
 		},
 		Links:   []string{"otherctr"},
 		Aliases: []string{"poor-yorick"},

cli/command/network/create.go

@@ -37,7 +37,7 @@ type ipamOptions struct {
 	driver       string
 	subnets      []string    // TODO(thaJeztah): change to []net.IPNet? This won't accept a bare address (without "/xxx"); we need a flag-type to handle []netip.Prefix directly
 	ipRanges     []net.IPNet // TODO(thaJeztah): we need a flag-type to handle []netip.Prefix directly
-	gateways     []string    // TODO(thaJeztah): we need a flag-type to handle []netip.Addr directly
+	gateways     []net.IP    // TODO(thaJeztah): we need a flag-type to handle []netip.Addr directly
 	auxAddresses opts.MapOpts
 	driverOpts   opts.MapOpts
 }
@@ -94,7 +94,7 @@ func newCreateCommand(dockerCLI command.Cli) *cobra.Command {
 	flags.StringVar(&options.ipam.driver, "ipam-driver", "default", "IP Address Management Driver")
 	flags.StringSliceVar(&options.ipam.subnets, "subnet", []string{}, "Subnet in CIDR format that represents a network segment")
 	flags.IPNetSliceVar(&options.ipam.ipRanges, "ip-range", nil, "Allocate container ip from a sub-range")
-	flags.StringSliceVar(&options.ipam.gateways, "gateway", []string{}, "IPv4 or IPv6 Gateway for the master subnet")
+	flags.IPSliceVar(&options.ipam.gateways, "gateway", nil, "IPv4 or IPv6 Gateway for the master subnet")
 
 	flags.Var(&options.ipam.auxAddresses, "aux-address", "Auxiliary IPv4 or IPv6 addresses used by Network driver")
 	flags.Var(&options.ipam.driverOpts, "ipam-opt", "Set IPAM driver specific options")
@@ -202,7 +202,7 @@ func createIPAMConfig(options ipamOptions) (*network.IPAM, error) {
 		match := false
 		for _, s := range options.subnets {
 			// TODO(thaJeztah): is all this validation needed on the CLI-side?
-			ok, err := subnetMatches(s, g)
+			ok, err := subnetMatches(s, g.String())
 			if err != nil {
 				return nil, err
 			}
@@ -213,7 +213,7 @@ func createIPAMConfig(options ipamOptions) (*network.IPAM, error) {
 				return nil, fmt.Errorf("cannot configure multiple gateways (%s, %s) for the same subnet (%s)", g, iData[s].Gateway, s)
 			}
 			d := iData[s]
-			d.Gateway = tryParseAddr(g)
+			d.Gateway = toNetipAddr(g)
 			match = true
 		}
 		if !match {