From 5c1fe287fcf3bceaf033acbb108b8b3165ffdcde Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Wed, 22 Jan 2025 23:15:30 +0100 Subject: [PATCH] libnetwork: remove UnknownNetworkError It was only returned in 2 places, and not used any different than a "notfound" error, so let's use a standard errdefs.NotFound Signed-off-by: Sebastiaan van Stijn --- libnetwork/error.go | 14 -------------- libnetwork/errors_test.go | 2 +- libnetwork/network.go | 5 +++-- 3 files changed, 4 insertions(+), 17 deletions(-) diff --git a/libnetwork/error.go b/libnetwork/error.go index 1f33103b6d..9dc031d93e 100644 --- a/libnetwork/error.go +++ b/libnetwork/error.go @@ -56,20 +56,6 @@ func (nnr NetworkNameError) Error() string { // Conflict denotes the type of this error func (nnr NetworkNameError) Conflict() {} -// UnknownNetworkError is returned when libnetwork could not find in its database -// a network with the same name and id. -type UnknownNetworkError struct { - name string - id string -} - -func (une *UnknownNetworkError) Error() string { - return fmt.Sprintf("unknown network %s id %s", une.name, une.id) -} - -// NotFound denotes the type of this error -func (une *UnknownNetworkError) NotFound() {} - // ActiveEndpointsError is returned when a network is deleted which has active // endpoints in it. type ActiveEndpointsError struct { diff --git a/libnetwork/errors_test.go b/libnetwork/errors_test.go index dc7ef52a5b..65a075bc2c 100644 --- a/libnetwork/errors_test.go +++ b/libnetwork/errors_test.go @@ -24,7 +24,7 @@ func TestErrorInterfaces(t *testing.T) { } } - notFoundErrorList := []error{&UnknownNetworkError{}, ErrNoSuchNetwork(""), ErrNoSuchEndpoint("")} + notFoundErrorList := []error{ErrNoSuchNetwork(""), ErrNoSuchEndpoint("")} for _, err := range notFoundErrorList { assert.Check(t, is.ErrorType(err, errdefs.IsNotFound)) } diff --git a/libnetwork/network.go b/libnetwork/network.go index fbcdd720dd..a38707bd6b 100644 --- a/libnetwork/network.go +++ b/libnetwork/network.go @@ -16,6 +16,7 @@ import ( "time" "github.com/containerd/log" + "github.com/docker/docker/errdefs" "github.com/docker/docker/libnetwork/datastore" "github.com/docker/docker/libnetwork/driverapi" "github.com/docker/docker/libnetwork/internal/netiputil" @@ -1021,7 +1022,7 @@ func (n *Network) delete(force bool, rmLBEndpoint bool) error { n, err := c.getNetworkFromStore(id) if err != nil { - return &UnknownNetworkError{name: name, id: id} + return errdefs.NotFound(fmt.Errorf("unknown network %s id %s", name, id)) } // Only remove ingress on force removal or explicit LB endpoint removal @@ -1054,7 +1055,7 @@ func (n *Network) delete(force bool, rmLBEndpoint bool) error { // Reload the network from the store to update the epcnt. n, err = c.getNetworkFromStore(id) if err != nil { - return &UnknownNetworkError{name: name, id: id} + return errdefs.NotFound(fmt.Errorf("unknown network %s id %s", name, id)) } }