dilim/moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2026-08-08 09:01:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

libnetwork/drivers/bridge: internalize ErrInvalidGateway

Browse Source 
It's a generic errdefs.ErrInvalidParameter, and the type itself is not
used as sentinel error anywhere.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
This commit is contained in:
Sebastiaan van Stijn
2025-01-28 13:48:42 +01:00
parent 3a9f4e0146
commit 47f6d4e1bc
4 changed files with 9 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
libnetwork/drivers/bridge/bridge_linux.go
View File

@@ -246,7 +246,7 @@ func (c *networkConfiguration) Validate() error {
// If default gw is specified, it must be part of bridge subnet
if c.DefaultGatewayIPv4 != nil {
if !c.AddressIPv4.Contains(c.DefaultGatewayIPv4) {
return &ErrInvalidGateway{}
return errInvalidGateway
}
}
}
@@ -266,7 +266,7 @@ func (c *networkConfiguration) Validate() error {
}
// If a default gw is specified, it must belong to AddressIPv6's subnet
if c.DefaultGatewayIPv6 != nil && !c.AddressIPv6.Contains(c.DefaultGatewayIPv6) {
return &ErrInvalidGateway{}
return errInvalidGateway
}
}

14
libnetwork/drivers/bridge/errors.go
View File

@@ -3,18 +3,14 @@
package bridge
import (
"errors"
"fmt"
"github.com/docker/docker/errdefs"
)
// ErrInvalidGateway is returned when the user provided default gateway (v4/v6) is not valid.
type ErrInvalidGateway struct{}
func (eig *ErrInvalidGateway) Error() string {
return "default gateway ip must be part of the network"
}
// InvalidParameter denotes the type of this error
func (eig *ErrInvalidGateway) InvalidParameter() {}
// errInvalidGateway is returned when the user provided default gateway (v4/v6) is not valid.
var errInvalidGateway = errdefs.InvalidParameter(errors.New("default gateway ip must be part of the network"))
// InvalidNetworkIDError is returned when the passed
// network id for an existing network is not a known id.

2
libnetwork/drivers/bridge/setup_ipv4_linux.go
View File

@@ -63,7 +63,7 @@ func setupBridgeIPv4(config *networkConfiguration, i *bridgeInterface) error {
func setupGatewayIPv4(config *networkConfiguration, i *bridgeInterface) error {
if !i.bridgeIPv4.Contains(config.DefaultGatewayIPv4) {
return &ErrInvalidGateway{}
return errInvalidGateway
}
if config.Internal {
return types.InvalidParameterErrorf("no gateway can be set on an internal bridge network")

2
libnetwork/drivers/bridge/setup_ipv6_linux.go
View File

@@ -32,7 +32,7 @@ func setupBridgeIPv6(config *networkConfiguration, i *bridgeInterface) error {
func setupGatewayIPv6(config *networkConfiguration, i *bridgeInterface) error {
if !config.AddressIPv6.Contains(config.DefaultGatewayIPv6) {
return &ErrInvalidGateway{}
return errInvalidGateway
}
// Store requested default gateway