Merge pull request awslabs#15 from austinvazquez/remove-errors

chore: remove dependency on errors package

Author: austinvazquez

cmd/tc-redirect-tap/main.go

@@ -15,6 +15,8 @@ package main
 
 import (
 	"encoding/json"
+	"errors"
+	"fmt"
 	"os"
 	"strconv"
 	"strings"
@@ -26,7 +28,6 @@ import (
 	"github.com/containernetworking/plugins/pkg/ns"
 	"github.com/containernetworking/plugins/pkg/utils/buildversion"
 	"github.com/hashicorp/go-multierror"
-	"github.com/pkg/errors"
 
 	pluginargs "github.com/awslabs/tc-redirect-tap/cmd/tc-redirect-tap/args"
 	"github.com/awslabs/tc-redirect-tap/internal"
@@ -47,7 +48,7 @@ func add(args *skel.CmdArgs) error {
 	}
 
 	if p.netNS == nil {
-		return errors.Errorf("netns path %q does not exist", args.Netns)
+		return fmt.Errorf("netns path %q does not exist", args.Netns)
 	}
 
 	if p.currentResult == nil {
@@ -84,7 +85,7 @@ func check(args *skel.CmdArgs) error {
 	}
 
 	if p.netNS == nil {
-		return errors.Errorf("netns path %q does not exist", args.Netns)
+		return fmt.Errorf("netns path %q does not exist", args.Netns)
 	}
 
 	if p.currentResult == nil {
@@ -107,7 +108,7 @@ func newPlugin(args *skel.CmdArgs) (*plugin, error) {
 		case ns.NSPathNotExistErr:
 			netNS = nil
 		default:
-			return nil, errors.Wrapf(err, "failed to open netns at path %q", args.Netns)
+			return nil, fmt.Errorf("failed to open netns at path %q: %w", args.Netns, err)
 		}
 	}
 
@@ -117,7 +118,7 @@ func newPlugin(args *skel.CmdArgs) (*plugin, error) {
 		case *NoPreviousResultError:
 			currentResult = nil
 		default:
-			return nil, errors.Wrapf(err, "failure parsing previous CNI result")
+			return nil, fmt.Errorf("failure parsing previous CNI result: %w", err)
 		}
 	}
 
@@ -147,15 +148,15 @@ func newPlugin(args *skel.CmdArgs) (*plugin, error) {
 	if tapUIDVal, wasDefined := parsedArgs[pluginargs.TCRedirectTapUID]; wasDefined {
 		tapUID, err := strconv.Atoi(tapUIDVal)
 		if err != nil {
-			return nil, errors.Wrapf(err, "tapUID should be numeric convertible, got %q", tapUIDVal)
+			return nil, fmt.Errorf("tapUID should be numeric convertible, got %q: %w", tapUIDVal, err)
 		}
 		plugin.tapUID = tapUID
 	}
 
 	if tapGIDVal, wasDefined := parsedArgs[pluginargs.TCRedirectTapGID]; wasDefined {
 		tapGID, err := strconv.Atoi(tapGIDVal)
 		if err != nil {
-			return nil, errors.Wrapf(err, "tapGID should be numeric convertible, got %q", tapGIDVal)
+			return nil, fmt.Errorf("tapGID should be numeric convertible, got %q: %w", tapGIDVal, err)
 		}
 		plugin.tapGID = tapGID
 	}
@@ -168,12 +169,12 @@ func getCurrentResult(args *skel.CmdArgs) (*current.Result, error) {
 	cniConf := types.NetConf{}
 	err := json.Unmarshal(args.StdinData, &cniConf)
 	if err != nil {
-		return nil, errors.Wrap(err, "failure checking for previous result output")
+		return nil, fmt.Errorf("failure checking for previous result output: %w", err)
 	}
 
 	err = version.ParsePrevResult(&cniConf)
 	if err != nil {
-		return nil, errors.Wrap(err, "failed to parse previous CNI result")
+		return nil, fmt.Errorf("failed to parse previous CNI result: %w", err)
 	}
 
 	if cniConf.PrevResult == nil {
@@ -182,8 +183,7 @@ func getCurrentResult(args *skel.CmdArgs) (*current.Result, error) {
 
 	currentResult, err := current.NewResultFromResult(cniConf.PrevResult)
 	if err != nil {
-		return nil, errors.Wrap(err,
-			"failed to generate current result from previous CNI result")
+		return nil, fmt.Errorf("failed to generate current result from previous CNI result: %w", err)
 	}
 
 	return currentResult, nil
@@ -225,8 +225,7 @@ func (p plugin) add() error {
 	return p.netNS.Do(func(_ ns.NetNS) error {
 		redirectLink, err := p.GetLink(p.redirectInterfaceName)
 		if err != nil {
-			return errors.Wrapf(err,
-				"failed to find redirect interface %q", p.redirectInterfaceName)
+			return fmt.Errorf("failed to find redirect interface %q: %w", p.redirectInterfaceName, err)
 		}
 
 		redirectIPs := internal.InterfaceIPs(
@@ -308,16 +307,18 @@ func (p plugin) del() error {
 			case nil, *internal.QdiscNotFoundError:
 				// we removed successfully or there already wasn't a qdisc, nothing to do
 			default:
-				multiErr = multierror.Append(multiErr, errors.Wrapf(err,
-					"failed to remove ingress qdisc from %q", redirectLink.Attrs().Name))
+				multiErr = multierror.Append(multiErr,
+					fmt.Errorf("failed to remove ingres qdisc from %q: %w", redirectLink.Attrs().Name, err),
+				)
 			}
 
 		case *internal.LinkNotFoundError:
 			// if the link doesn't exist, there's nothing to do
 
 		default:
 			multiErr = multierror.Append(multiErr,
-				errors.Wrapf(err, "failure finding device %q", p.redirectInterfaceName))
+				fmt.Errorf("failure finding device %q: %w", p.redirectInterfaceName, err),
+			)
 		}
 
 		// if there was no previous result, we can't find the vm-tap pair, so we are done here
@@ -335,8 +336,9 @@ func (p plugin) del() error {
 			case nil, *internal.LinkNotFoundError:
 				// we removed successfully or someone else beat us to removing it first
 			default:
-				multiErr = multierror.Append(multiErr, errors.Wrapf(err,
-					"failure removing device %q", tapIface.Name))
+				multiErr = multierror.Append(multiErr,
+					fmt.Errorf("failure removing device %q: %w", tapIface.Name, err),
+				)
 			}
 
 		case *internal.LinkNotFoundError:
@@ -406,7 +408,7 @@ func extractArgs(args string) (map[string]string, error) {
 		for _, pairStr := range argumentsPairs {
 			pair := strings.SplitN(pairStr, "=", 2)
 			if len(pair) < 2 {
-				return result, errors.Errorf("Invalid cni arguments format, %q", pairStr)
+				return result, fmt.Errorf("Invalid cni arguments format, %q", pairStr)
 			}
 			result[pair[0]] = pair[1]
 		}

cmd/tc-redirect-tap/main_test.go

@@ -15,14 +15,14 @@ package main
 
 import (
 	"encoding/json"
+	"errors"
 	"net"
 	"testing"
 
 	"github.com/containernetworking/cni/pkg/skel"
 	"github.com/containernetworking/cni/pkg/types"
 	current "github.com/containernetworking/cni/pkg/types/100"
 	"github.com/containernetworking/cni/pkg/version"
-	"github.com/pkg/errors"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 	"github.com/vishvananda/netlink"

go.mod

@@ -6,7 +6,6 @@ require (
 	github.com/containernetworking/cni v1.0.1
 	github.com/containernetworking/plugins v1.0.1
 	github.com/hashicorp/go-multierror v1.1.0
-	github.com/pkg/errors v0.9.1
 	github.com/stretchr/testify v1.6.1
 	github.com/vishvananda/netlink v1.1.1-0.20210330154013-f5de75959ad5
 	golang.org/x/sys v0.0.0-20210809222454-d867a43fc93e

go.sum

@@ -473,7 +473,6 @@ github.com/peterbourgon/diskv v2.0.1+incompatible/go.mod h1:uqqh8zWWbv1HBMNONnaR
 github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
 github.com/pkg/errors v0.8.1-0.20171018195549-f15c970de5b7/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
 github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
-github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
 github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=

internal/cniutil.go

@@ -17,7 +17,6 @@ import (
 	"fmt"
 
 	current "github.com/containernetworking/cni/pkg/types/100"
-	"github.com/pkg/errors"
 )
 
 // InterfaceIPs returns the IPs associated with the interface possessing the provided name and
@@ -78,7 +77,7 @@ func VMTapPair(
 ) {
 	vmIfaces, otherIfaces := FilterBySandbox(vmID, result.Interfaces...)
 	if len(vmIfaces) > 1 {
-		return nil, nil, errors.Errorf(
+		return nil, nil, fmt.Errorf(
 			"expected to find at most 1 interface in sandbox %q, but instead found %d",
 			vmID, len(vmIfaces))
 	} else if len(vmIfaces) == 0 {
@@ -94,7 +93,7 @@ func VMTapPair(
 
 	tapIfaces := IfacesWithName(tapName, otherIfaces...)
 	if len(tapIfaces) > 1 {
-		return nil, nil, errors.Errorf(
+		return nil, nil, fmt.Errorf(
 			"expected to find at most 1 interface with name %q, but instead found %d",
 			tapName, len(tapIfaces))
 	} else if len(tapIfaces) == 0 {

internal/netlink.go

@@ -14,9 +14,9 @@
 package internal
 
 import (
+	"errors"
 	"fmt"
 
-	"github.com/pkg/errors"
 	"github.com/vishvananda/netlink"
 	"golang.org/x/sys/unix"
 )
@@ -83,10 +83,10 @@ var _ NetlinkOps = &defaultNetlinkOps{}
 func (ops defaultNetlinkOps) AddIngressQdisc(link netlink.Link) error {
 	err := netlink.QdiscAdd(ops.ingressQdisc(link))
 	if err != nil {
-		err = errors.Wrapf(err, "failed to add ingress qdisc to device %q", link.Attrs().Name)
+		return fmt.Errorf("failed to add ingress qdisc to device %q: %w", link.Attrs().Name, err)
 	}
 
-	return err
+	return nil
 }
 
 func (ops defaultNetlinkOps) RemoveIngressQdisc(link netlink.Link) error {
@@ -97,7 +97,7 @@ func (ops defaultNetlinkOps) RemoveIngressQdisc(link netlink.Link) error {
 
 	err = netlink.QdiscDel(qdisc)
 	if err != nil {
-		return errors.Wrapf(err, "failed to remove ingress qdisc from device %q", link.Attrs().Name)
+		return fmt.Errorf("failed to remove ingress qdisc from device %q: %w", link.Attrs().Name, err)
 	}
 
 	return nil
@@ -106,7 +106,7 @@ func (ops defaultNetlinkOps) RemoveIngressQdisc(link netlink.Link) error {
 func (ops defaultNetlinkOps) GetIngressQdisc(link netlink.Link) (netlink.Qdisc, error) {
 	qdiscs, err := netlink.QdiscList(link)
 	if err != nil {
-		return nil, errors.Wrapf(err, "failed to list qdiscs for link %q", link.Attrs().Name)
+		return nil, fmt.Errorf("failed to list qdiscs for link %q: %w", link.Attrs().Name, err)
 	}
 
 	expectedQdisc := ops.ingressQdisc(link)
@@ -146,9 +146,10 @@ func (ops defaultNetlinkOps) AddRedirectFilter(sourceLink netlink.Link, targetLi
 		},
 	})
 	if err != nil {
-		err = errors.Wrapf(err,
+		err = fmt.Errorf(
 			"failed to add u32 filter redirecting from device %q to device %q, does %q exist and have a qdisc attached to its ingress?",
-			sourceLink.Attrs().Name, targetLink.Attrs().Name, sourceLink.Attrs().Name)
+			sourceLink.Attrs().Name, targetLink.Attrs().Name, sourceLink.Attrs().Name,
+		)
 	}
 
 	return err
@@ -157,7 +158,7 @@ func (ops defaultNetlinkOps) AddRedirectFilter(sourceLink netlink.Link, targetLi
 func (ops defaultNetlinkOps) GetRedirectFilter(sourceLink netlink.Link, targetLink netlink.Link) (netlink.Filter, error) {
 	filters, err := netlink.FilterList(sourceLink, RootFilterHandle())
 	if err != nil {
-		return nil, errors.Wrapf(err, "failed to list filters for device %q", sourceLink.Attrs().Name)
+		return nil, fmt.Errorf("failed to list filters for device %q: %w", sourceLink.Attrs().Name, err)
 	}
 
 	for _, filter := range filters {
@@ -214,31 +215,29 @@ func (defaultNetlinkOps) CreateTap(name string, mtu int, ownerUID, ownerGID int)
 
 	err := netlink.LinkAdd(tapLink)
 	if err != nil {
-		return nil, errors.Wrap(err, "failed to create tap device")
+		return nil, fmt.Errorf("failed to create tap device: %w", err)
 	}
 
 	for _, tapFd := range tapLink.Fds {
 		err = unix.IoctlSetInt(int(tapFd.Fd()), unix.TUNSETOWNER, ownerUID)
 		if err != nil {
-			return nil, errors.Wrapf(err, "failed to set tap %s owner to uid %d",
-				name, ownerUID)
+			return nil, fmt.Errorf("failed to set tap %s owner to uid %d: %w", name, ownerUID, err)
 		}
 
 		err = unix.IoctlSetInt(int(tapFd.Fd()), unix.TUNSETGROUP, ownerGID)
 		if err != nil {
-			return nil, errors.Wrapf(err, "failed to set tap %s group to gid %d",
-				name, ownerGID)
+			return nil, fmt.Errorf("failed to set tap %s group to gid %d: %w", name, ownerGID, err)
 		}
 	}
 
 	err = netlink.LinkSetMTU(tapLink, mtu)
 	if err != nil {
-		return nil, errors.Wrapf(err, "failed to set tap device MTU to %d", mtu)
+		return nil, fmt.Errorf("failed to set tap device MTU to %d: %w", mtu, err)
 	}
 
 	err = netlink.LinkSetUp(tapLink)
 	if err != nil {
-		return nil, errors.Wrap(err, "failed to set tap up")
+		return nil, errors.New("failed to set tap up")
 	}
 
 	return tapLink, nil

vmconf/vmconf.go

@@ -35,7 +35,6 @@ import (
 	"github.com/containernetworking/cni/pkg/types"
 	current "github.com/containernetworking/cni/pkg/types/100"
 	"github.com/containernetworking/plugins/pkg/ns"
-	"github.com/pkg/errors"
 
 	"github.com/awslabs/tc-redirect-tap/internal"
 )
@@ -153,7 +152,7 @@ func (c StaticNetworkConf) IPBootParam() string {
 func StaticNetworkConfFrom(result types.Result, containerID string) (*StaticNetworkConf, error) {
 	currentResult, err := current.NewResultFromResult(result)
 	if err != nil {
-		return nil, errors.Wrap(err, "failed to parse cni result")
+		return nil, fmt.Errorf("failed to parse cni result: %w", err)
 	}
 
 	// As specified in the vmconf package docstring, we are looking for an interface who's
@@ -170,14 +169,14 @@ func StaticNetworkConfFrom(result types.Result, containerID string) (*StaticNetw
 	// find the IP associated with the VM iface
 	vmIPs := internal.InterfaceIPs(currentResult, vmIface.Name, vmIface.Sandbox)
 	if len(vmIPs) != 1 {
-		return nil, errors.Errorf("expected to find 1 IP for vm interface %q, but instead found %+v",
+		return nil, fmt.Errorf("expected to find 1 IP for vm interface %q, but instead found %+v",
 			vmIface.Name, vmIPs)
 	}
 	vmIP := vmIPs[0]
 
 	netNS, err := ns.GetNS(tapIface.Sandbox)
 	if err != nil {
-		return nil, errors.Wrapf(err, "failed to find netns at path %q", tapIface.Sandbox)
+		return nil, fmt.Errorf("failed to find netns at path %q: %w", tapIface.Sandbox, err)
 	}
 
 	tapMTU, err := mtuOf(tapIface.Name, netNS, internal.DefaultNetlinkOps())
@@ -204,15 +203,14 @@ func mtuOf(ifaceName string, netNS ns.NetNS, netlinkOps internal.NetlinkOps) (in
 	err := netNS.Do(func(_ ns.NetNS) error {
 		link, err := netlinkOps.GetLink(ifaceName)
 		if err != nil {
-			return errors.Wrapf(err, "failed to find device %q in netns %q",
-				ifaceName, netNS.Path())
+			return fmt.Errorf("failed to find device %q in netns %q: %w", ifaceName, netNS.Path(), err)
 		}
 		mtu = link.Attrs().MTU
 
 		return nil
 	})
 	if err != nil {
-		return 0, errors.Wrap(err, "failed to find MTU")
+		return 0, fmt.Errorf("failed to find MTU: %w", err)
 	}
 
 	return mtu, nil