chore: make deps

vendor/github.com/docker/cli/opts/swarmopts/config.go

@@ -8,7 +8,7 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/docker/docker/api/types/swarm"
+	"github.com/moby/moby/api/types/swarm"
 )
 
 // ConfigOpt is a Value type for parsing configs

vendor/github.com/docker/cli/opts/swarmopts/port.go

@@ -9,8 +9,9 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/docker/docker/api/types/swarm"
 	"github.com/docker/go-connections/nat"
+	"github.com/moby/moby/api/types/network"
+	"github.com/moby/moby/api/types/swarm"
 	"github.com/sirupsen/logrus"
 )
 
@@ -41,7 +42,10 @@ func (p *PortOpt) Set(value string) error {
 			return err
 		}
 
-		pConfig := swarm.PortConfig{}
+		pConfig := swarm.PortConfig{
+			Protocol:    network.TCP,
+			PublishMode: swarm.PortConfigPublishModeIngress,
+		}
 		for _, field := range fields {
 			// TODO(thaJeztah): these options should not be case-insensitive.
 			key, val, ok := strings.Cut(strings.ToLower(field), "=")
@@ -50,17 +54,19 @@ func (p *PortOpt) Set(value string) error {
 			}
 			switch key {
 			case portOptProtocol:
-				if val != string(swarm.PortConfigProtocolTCP) && val != string(swarm.PortConfigProtocolUDP) && val != string(swarm.PortConfigProtocolSCTP) {
+				switch proto := network.IPProtocol(val); proto {
+				case network.TCP, network.UDP, network.SCTP:
+					pConfig.Protocol = proto
+				default:
 					return fmt.Errorf("invalid protocol value '%s'", val)
 				}
-
-				pConfig.Protocol = swarm.PortConfigProtocol(val)
 			case portOptMode:
-				if val != string(swarm.PortConfigPublishModeIngress) && val != string(swarm.PortConfigPublishModeHost) {
+				switch swarm.PortConfigPublishMode(val) {
+				case swarm.PortConfigPublishModeIngress, swarm.PortConfigPublishModeHost:
+					pConfig.PublishMode = swarm.PortConfigPublishMode(val)
+				default:
 					return fmt.Errorf("invalid publish mode value (%s): must be either '%s' or '%s'", val, swarm.PortConfigPublishModeIngress, swarm.PortConfigPublishModeHost)
 				}
-
-				pConfig.PublishMode = swarm.PortConfigPublishMode(val)
 			case portOptTargetPort:
 				tPort, err := strconv.ParseUint(val, 10, 16)
 				if err != nil {
@@ -92,18 +98,9 @@ func (p *PortOpt) Set(value string) error {
 			return fmt.Errorf("missing mandatory field '%s'", portOptTargetPort)
 		}
 
-		if pConfig.PublishMode == "" {
-			pConfig.PublishMode = swarm.PortConfigPublishModeIngress
-		}
-
-		if pConfig.Protocol == "" {
-			pConfig.Protocol = swarm.PortConfigProtocolTCP
-		}
-
 		p.ports = append(p.ports, pConfig)
 	} else {
 		// short syntax
-		portConfigs := []swarm.PortConfig{}
 		ports, portBindingMap, err := nat.ParsePortSpecs([]string{value})
 		if err != nil {
 			return err
@@ -116,8 +113,13 @@ func (p *PortOpt) Set(value string) error {
 			}
 		}
 
+		var portConfigs []swarm.PortConfig
 		for port := range ports {
-			portConfig, err := ConvertPortToPortConfig(port, portBindingMap)
+			portProto, err := network.ParsePort(string(port))
+			if err != nil {
+				return err
+			}
+			portConfig, err := ConvertPortToPortConfig(portProto, portBindingMap)
 			if err != nil {
 				return err
 			}
@@ -135,7 +137,7 @@ func (*PortOpt) Type() string {
 
 // String returns a string repr of this option
 func (p *PortOpt) String() string {
-	ports := []string{}
+	ports := make([]string, 0, len(p.ports))
 	for _, port := range p.ports {
 		repr := fmt.Sprintf("%v:%v/%s/%s", port.PublishedPort, port.TargetPort, port.Protocol, port.PublishMode)
 		ports = append(ports, repr)
@@ -150,28 +152,27 @@ func (p *PortOpt) Value() []swarm.PortConfig {
 
 // ConvertPortToPortConfig converts ports to the swarm type
 func ConvertPortToPortConfig(
-	port nat.Port,
+	portProto network.Port,
 	portBindings map[nat.Port][]nat.PortBinding,
 ) ([]swarm.PortConfig, error) {
-	ports := []swarm.PortConfig{}
-
-	for _, binding := range portBindings[port] {
+	ports := make([]swarm.PortConfig, 0, len(portBindings))
+	for _, binding := range portBindings[nat.Port(portProto.String())] {
 		if p := net.ParseIP(binding.HostIP); p != nil && !p.IsUnspecified() {
 			// TODO(thaJeztah): use context-logger, so that this output can be suppressed (in tests).
-			logrus.Warnf("ignoring IP-address (%s:%s) service will listen on '0.0.0.0'", net.JoinHostPort(binding.HostIP, binding.HostPort), port)
+			logrus.Warnf("ignoring IP-address (%s:%s) service will listen on '0.0.0.0'", net.JoinHostPort(binding.HostIP, binding.HostPort), portProto.String())
 		}
 
 		startHostPort, endHostPort, err := nat.ParsePortRange(binding.HostPort)
 
 		if err != nil && binding.HostPort != "" {
-			return nil, fmt.Errorf("invalid hostport binding (%s) for port (%s)", binding.HostPort, port.Port())
+			return nil, fmt.Errorf("invalid hostport binding (%s) for port (%d)", binding.HostPort, portProto.Num())
 		}
 
 		for i := startHostPort; i <= endHostPort; i++ {
 			ports = append(ports, swarm.PortConfig{
 				// TODO Name: ?
-				Protocol:      swarm.PortConfigProtocol(strings.ToLower(port.Proto())),
-				TargetPort:    uint32(port.Int()),
+				Protocol:      portProto.Proto(),
+				TargetPort:    uint32(portProto.Num()),
 				PublishedPort: uint32(i),
 				PublishMode:   swarm.PortConfigPublishModeIngress,
 			})

vendor/github.com/docker/cli/opts/swarmopts/secret.go

@@ -8,7 +8,7 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/docker/docker/api/types/swarm"
+	"github.com/moby/moby/api/types/swarm"
 )
 
 // SecretOpt is a Value type for parsing secrets