From 7c13985fa1ba6e459e5b44979fecf202ad7268a5 Mon Sep 17 00:00:00 2001 From: Albin Kerouanton Date: Mon, 31 Jul 2023 11:10:28 +0200 Subject: [PATCH] libnet/d/bridge: Inline InvalidIPTablesCfgError This error can only be reached because of an error in our code, so it's not a "bad user request". As it's never type asserted, no need to keep it around. Signed-off-by: Albin Kerouanton --- libnetwork/drivers/bridge/errors.go | 10 ---------- libnetwork/drivers/bridge/link.go | 2 +- 2 files changed, 1 insertion(+), 11 deletions(-) diff --git a/libnetwork/drivers/bridge/errors.go b/libnetwork/drivers/bridge/errors.go index d34e20e24d..8757add165 100644 --- a/libnetwork/drivers/bridge/errors.go +++ b/libnetwork/drivers/bridge/errors.go @@ -209,16 +209,6 @@ func (fcv6 *FixedCIDRv6Error) Error() string { // InternalError denotes the type of this error func (fcv6 *FixedCIDRv6Error) InternalError() {} -// InvalidIPTablesCfgError is returned when an invalid ip tables configuration is entered -type InvalidIPTablesCfgError string - -func (action InvalidIPTablesCfgError) Error() string { - return fmt.Sprintf("Invalid IPTables action '%s'", string(action)) -} - -// Internal denotes the type of this error -func (action InvalidIPTablesCfgError) Internal() {} - // IPv4AddrAddError is returned when IPv4 address could not be added to the bridge. type IPv4AddrAddError struct { IP *net.IPNet diff --git a/libnetwork/drivers/bridge/link.go b/libnetwork/drivers/bridge/link.go index 9849afbe7e..1670e750fb 100644 --- a/libnetwork/drivers/bridge/link.go +++ b/libnetwork/drivers/bridge/link.go @@ -63,7 +63,7 @@ func linkContainers(action, parentIP, childIP string, ports []types.TransportPor case "-D": nfAction = iptables.Delete default: - return InvalidIPTablesCfgError(action) + return fmt.Errorf("invalid iptables action: %s", action) } ip1 := net.ParseIP(parentIP)