From 2f42aa0e264c9bb446364b802bb862a3bd353462 Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Tue, 28 Jan 2025 13:26:55 +0100 Subject: [PATCH] libnetwork/drivers/bridge: remove IPv4AddrNoMatchError It's a generic error, doesn't implement an errdefs type, and not used as sentinel error anywhere. Signed-off-by: Sebastiaan van Stijn --- libnetwork/drivers/bridge/errors.go | 11 ----------- libnetwork/drivers/bridge/setup_verify_linux.go | 2 +- 2 files changed, 1 insertion(+), 12 deletions(-) diff --git a/libnetwork/drivers/bridge/errors.go b/libnetwork/drivers/bridge/errors.go index aa969121e6..54ee551143 100644 --- a/libnetwork/drivers/bridge/errors.go +++ b/libnetwork/drivers/bridge/errors.go @@ -4,7 +4,6 @@ package bridge import ( "fmt" - "net" ) // ErrInvalidGateway is returned when the user provided default gateway (v4/v6) is not valid. @@ -70,13 +69,3 @@ func (ndbee NonDefaultBridgeExistError) Error() string { // Forbidden denotes the type of this error func (ndbee NonDefaultBridgeExistError) Forbidden() {} - -// IPv4AddrNoMatchError is returned when the bridge's IPv4 address does not match configured. -type IPv4AddrNoMatchError struct { - IP net.IP - CfgIP net.IP -} - -func (ipv4 *IPv4AddrNoMatchError) Error() string { - return fmt.Sprintf("bridge IPv4 (%s) does not match requested configuration %s", ipv4.IP, ipv4.CfgIP) -} diff --git a/libnetwork/drivers/bridge/setup_verify_linux.go b/libnetwork/drivers/bridge/setup_verify_linux.go index 301612cc86..2f4587dce5 100644 --- a/libnetwork/drivers/bridge/setup_verify_linux.go +++ b/libnetwork/drivers/bridge/setup_verify_linux.go @@ -27,7 +27,7 @@ func setupVerifyAndReconcileIPv4(config *networkConfiguration, i *bridgeInterfac // Verify that the bridge IPv4 address matches the requested configuration. if config.AddressIPv4 != nil && !addrv4.IP.Equal(config.AddressIPv4.IP) { - return &IPv4AddrNoMatchError{IP: addrv4.IP, CfgIP: config.AddressIPv4.IP} + return fmt.Errorf("bridge IPv4 (%s) does not match requested configuration %s", addrv4.IP, config.AddressIPv4.IP) } return nil