util: Port all code to new errwrap package

This should keep things more uniform.

etcd/client.go

@@ -20,8 +20,9 @@ package etcd
 import (
 	"time"
 
+	"github.com/purpleidea/mgmt/util/errwrap"
+
 	etcd "github.com/coreos/etcd/clientv3" // "clientv3"
-	errwrap "github.com/pkg/errors"
 	context "golang.org/x/net/context"
 )
 

etcd/deploy.go

@@ -22,8 +22,9 @@ import (
 	"strconv"
 	"strings"
 
+	"github.com/purpleidea/mgmt/util/errwrap"
+
 	etcd "github.com/coreos/etcd/clientv3"
-	errwrap "github.com/pkg/errors"
 )
 
 const (

etcd/fs/file.go

@@ -29,8 +29,9 @@ import (
 	"syscall"
 	"time"
 
+	"github.com/purpleidea/mgmt/util/errwrap"
+
 	etcd "github.com/coreos/etcd/clientv3" // "clientv3"
-	errwrap "github.com/pkg/errors"
 )
 
 func init() {

etcd/fs/fs.go

@@ -34,9 +34,10 @@ import (
 	"syscall"
 	"time"
 
+	"github.com/purpleidea/mgmt/util/errwrap"
+
 	etcd "github.com/coreos/etcd/clientv3" // "clientv3"
 	rpctypes "github.com/coreos/etcd/etcdserver/api/v3rpc/rpctypes"
-	errwrap "github.com/pkg/errors"
 	"github.com/spf13/afero"
 	context "golang.org/x/net/context"
 )

etcd/fs/fs_test.go

@@ -30,8 +30,8 @@ import (
 	etcdfs "github.com/purpleidea/mgmt/etcd/fs"
 	"github.com/purpleidea/mgmt/integration"
 	"github.com/purpleidea/mgmt/util"
+	"github.com/purpleidea/mgmt/util/errwrap"
 
-	errwrap "github.com/pkg/errors"
 	"github.com/spf13/afero"
 )
 

etcd/scheduler/scheduler.go

@@ -26,9 +26,10 @@ import (
 	"strings"
 	"sync"
 
+	"github.com/purpleidea/mgmt/util/errwrap"
+
 	etcd "github.com/coreos/etcd/clientv3"
 	"github.com/coreos/etcd/clientv3/concurrency"
-	errwrap "github.com/pkg/errors"
 )
 
 const (

etcd/str.go

@@ -21,8 +21,9 @@ import (
 	"errors"
 	"fmt"
 
+	"github.com/purpleidea/mgmt/util/errwrap"
+
 	etcd "github.com/coreos/etcd/clientv3"
-	errwrap "github.com/pkg/errors"
 )
 
 // ErrNotExist is returned when GetStr can not find the requested key.

etcd/strmap.go

@@ -22,9 +22,9 @@ import (
 	"strings"
 
 	"github.com/purpleidea/mgmt/util"
+	"github.com/purpleidea/mgmt/util/errwrap"
 
 	etcd "github.com/coreos/etcd/clientv3"
-	errwrap "github.com/pkg/errors"
 )
 
 // WatchStrMap returns a channel which spits out events on key activity.