From dc52ecb1d0495cd50f3c0ee6419cd5f23c6502b3 Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Tue, 28 Jan 2025 13:21:27 +0100 Subject: [PATCH] libnetwork/drivers/bridge: remove ErrNoIPAddr 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 | 7 ------- libnetwork/drivers/bridge/setup_verify_linux.go | 3 ++- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/libnetwork/drivers/bridge/errors.go b/libnetwork/drivers/bridge/errors.go index dfee32c0e1..f68c89e61d 100644 --- a/libnetwork/drivers/bridge/errors.go +++ b/libnetwork/drivers/bridge/errors.go @@ -7,13 +7,6 @@ import ( "net" ) -// ErrNoIPAddr error is returned when bridge has no IPv4 address configured. -type ErrNoIPAddr struct{} - -func (enip *ErrNoIPAddr) Error() string { - return "bridge has no IPv4 address configured" -} - // ErrInvalidGateway is returned when the user provided default gateway (v4/v6) is not valid. type ErrInvalidGateway struct{} diff --git a/libnetwork/drivers/bridge/setup_verify_linux.go b/libnetwork/drivers/bridge/setup_verify_linux.go index 5d8a6760ff..301612cc86 100644 --- a/libnetwork/drivers/bridge/setup_verify_linux.go +++ b/libnetwork/drivers/bridge/setup_verify_linux.go @@ -1,6 +1,7 @@ package bridge import ( + "errors" "fmt" "strings" @@ -21,7 +22,7 @@ func setupVerifyAndReconcileIPv4(config *networkConfiguration, i *bridgeInterfac // Verify that the bridge has an IPv4 address. if addrv4.IPNet == nil { - return &ErrNoIPAddr{} + return errors.New("bridge has no IPv4 address configured") } // Verify that the bridge IPv4 address matches the requested configuration.