Migrate from dep to go module

Signed-off-by: Madhu Rajanna <madhupr007@gmail.com>

vendor/github.com/evanphx/json-patch/patch.go

@@ -6,8 +6,6 @@ import (
 	"fmt"
 	"strconv"
 	"strings"
-
-	"github.com/pkg/errors"
 )
 
 const (
@@ -26,14 +24,6 @@ var (
 	AccumulatedCopySizeLimit int64 = 0
 )
 
-var (
-	ErrTestFailed   = errors.New("test failed")
-	ErrMissing      = errors.New("missing value")
-	ErrUnknownType  = errors.New("unknown object type")
-	ErrInvalid      = errors.New("invalid state detected")
-	ErrInvalidIndex = errors.New("invalid index referenced")
-)
-
 type lazyNode struct {
 	raw   *json.RawMessage
 	doc   partialDoc
@@ -41,11 +31,10 @@ type lazyNode struct {
 	which int
 }
 
-// Operation is a single JSON-Patch step, such as a single 'add' operation.
-type Operation map[string]*json.RawMessage
+type operation map[string]*json.RawMessage
 
-// Patch is an ordered collection of Operations.
-type Patch []Operation
+// Patch is an ordered collection of operations.
+type Patch []operation
 
 type partialDoc map[string]*lazyNode
 type partialArray []*lazyNode
@@ -70,7 +59,7 @@ func (n *lazyNode) MarshalJSON() ([]byte, error) {
 	case eAry:
 		return json.Marshal(n.ary)
 	default:
-		return nil, ErrUnknownType
+		return nil, fmt.Errorf("Unknown type")
 	}
 }
 
@@ -102,7 +91,7 @@ func (n *lazyNode) intoDoc() (*partialDoc, error) {
 	}
 
 	if n.raw == nil {
-		return nil, ErrInvalid
+		return nil, fmt.Errorf("Unable to unmarshal nil pointer as partial document")
 	}
 
 	err := json.Unmarshal(*n.raw, &n.doc)
@@ -121,7 +110,7 @@ func (n *lazyNode) intoAry() (*partialArray, error) {
 	}
 
 	if n.raw == nil {
-		return nil, ErrInvalid
+		return nil, fmt.Errorf("Unable to unmarshal nil pointer as partial array")
 	}
 
 	err := json.Unmarshal(*n.raw, &n.ary)
@@ -202,10 +191,6 @@ func (n *lazyNode) equal(o *lazyNode) bool {
 			return false
 		}
 
-		if len(n.doc) != len(o.doc) {
-			return false
-		}
-
 		for k, v := range n.doc {
 			ov, ok := o.doc[k]
 
@@ -242,8 +227,7 @@ func (n *lazyNode) equal(o *lazyNode) bool {
 	return true
 }
 
-// Kind reads the "op" field of the Operation.
-func (o Operation) Kind() string {
+func (o operation) kind() string {
 	if obj, ok := o["op"]; ok && obj != nil {
 		var op string
 
@@ -259,41 +243,39 @@ func (o Operation) Kind() string {
 	return "unknown"
 }
 
-// Path reads the "path" field of the Operation.
-func (o Operation) Path() (string, error) {
+func (o operation) path() string {
 	if obj, ok := o["path"]; ok && obj != nil {
 		var op string
 
 		err := json.Unmarshal(*obj, &op)
 
 		if err != nil {
-			return "unknown", err
+			return "unknown"
 		}
 
-		return op, nil
+		return op
 	}
 
-	return "unknown", errors.Wrapf(ErrMissing, "operation missing path field")
+	return "unknown"
 }
 
-// From reads the "from" field of the Operation.
-func (o Operation) From() (string, error) {
+func (o operation) from() string {
 	if obj, ok := o["from"]; ok && obj != nil {
 		var op string
 
 		err := json.Unmarshal(*obj, &op)
 
 		if err != nil {
-			return "unknown", err
+			return "unknown"
 		}
 
-		return op, nil
+		return op
 	}
 
-	return "unknown", errors.Wrapf(ErrMissing, "operation, missing from field")
+	return "unknown"
 }
 
-func (o Operation) value() *lazyNode {
+func (o operation) value() *lazyNode {
 	if obj, ok := o["value"]; ok {
 		return newLazyNode(obj)
 	}
@@ -301,23 +283,6 @@ func (o Operation) value() *lazyNode {
 	return nil
 }
 
-// ValueInterface decodes the operation value into an interface.
-func (o Operation) ValueInterface() (interface{}, error) {
-	if obj, ok := o["value"]; ok && obj != nil {
-		var v interface{}
-
-		err := json.Unmarshal(*obj, &v)
-
-		if err != nil {
-			return nil, err
-		}
-
-		return v, nil
-	}
-
-	return nil, errors.Wrapf(ErrMissing, "operation, missing value field")
-}
-
 func isArray(buf []byte) bool {
 Loop:
 	for _, c := range buf {
@@ -388,17 +353,13 @@ func (d *partialDoc) add(key string, val *lazyNode) error {
 }
 
 func (d *partialDoc) get(key string) (*lazyNode, error) {
-	v, ok := (*d)[key]
-	if !ok {
-		return v, errors.Wrapf(ErrMissing, "unable to get nonexistent key: %s", key)
-	}
-	return v, nil
+	return (*d)[key], nil
 }
 
 func (d *partialDoc) remove(key string) error {
 	_, ok := (*d)[key]
 	if !ok {
-		return errors.Wrapf(ErrMissing, "unable to remove nonexistent key: %s", key)
+		return fmt.Errorf("Unable to remove nonexistent key: %s", key)
 	}
 
 	delete(*d, key)
@@ -424,7 +385,7 @@ func (d *partialArray) add(key string, val *lazyNode) error {
 
 	idx, err := strconv.Atoi(key)
 	if err != nil {
-		return errors.Wrapf(err, "value was not a proper array index: '%s'", key)
+		return err
 	}
 
 	sz := len(*d) + 1
@@ -434,17 +395,17 @@ func (d *partialArray) add(key string, val *lazyNode) error {
 	cur := *d
 
 	if idx >= len(ary) {
-		return errors.Wrapf(ErrInvalidIndex, "Unable to access invalid index: %d", idx)
+		return fmt.Errorf("Unable to access invalid index: %d", idx)
 	}
 
-	if idx < 0 {
-		if !SupportNegativeIndices {
-			return errors.Wrapf(ErrInvalidIndex, "Unable to access invalid index: %d", idx)
-		}
+	if SupportNegativeIndices {
 		if idx < -len(ary) {
-			return errors.Wrapf(ErrInvalidIndex, "Unable to access invalid index: %d", idx)
+			return fmt.Errorf("Unable to access invalid index: %d", idx)
+		}
+
+		if idx < 0 {
+			idx += len(ary)
 		}
-		idx += len(ary)
 	}
 
 	copy(ary[0:idx], cur[0:idx])
@@ -463,7 +424,7 @@ func (d *partialArray) get(key string) (*lazyNode, error) {
 	}
 
 	if idx >= len(*d) {
-		return nil, errors.Wrapf(ErrInvalidIndex, "Unable to access invalid index: %d", idx)
+		return nil, fmt.Errorf("Unable to access invalid index: %d", idx)
 	}
 
 	return (*d)[idx], nil
@@ -478,17 +439,17 @@ func (d *partialArray) remove(key string) error {
 	cur := *d
 
 	if idx >= len(cur) {
-		return errors.Wrapf(ErrInvalidIndex, "Unable to access invalid index: %d", idx)
+		return fmt.Errorf("Unable to access invalid index: %d", idx)
 	}
 
-	if idx < 0 {
-		if !SupportNegativeIndices {
-			return errors.Wrapf(ErrInvalidIndex, "Unable to access invalid index: %d", idx)
-		}
+	if SupportNegativeIndices {
 		if idx < -len(cur) {
-			return errors.Wrapf(ErrInvalidIndex, "Unable to access invalid index: %d", idx)
+			return fmt.Errorf("Unable to access invalid index: %d", idx)
+		}
+
+		if idx < 0 {
+			idx += len(cur)
 		}
-		idx += len(cur)
 	}
 
 	ary := make([]*lazyNode, len(cur)-1)
@@ -501,189 +462,140 @@ func (d *partialArray) remove(key string) error {
 
 }
 
-func (p Patch) add(doc *container, op Operation) error {
-	path, err := op.Path()
-	if err != nil {
-		return errors.Wrapf(ErrMissing, "add operation failed to decode path")
-	}
+func (p Patch) add(doc *container, op operation) error {
+	path := op.path()
 
 	con, key := findObject(doc, path)
 
 	if con == nil {
-		return errors.Wrapf(ErrMissing, "add operation does not apply: doc is missing path: \"%s\"", path)
+		return fmt.Errorf("jsonpatch add operation does not apply: doc is missing path: \"%s\"", path)
 	}
 
-	err = con.add(key, op.value())
-	if err != nil {
-		return errors.Wrapf(err, "error in add for path: '%s'", path)
-	}
-
-	return nil
+	return con.add(key, op.value())
 }
 
-func (p Patch) remove(doc *container, op Operation) error {
-	path, err := op.Path()
-	if err != nil {
-		return errors.Wrapf(ErrMissing, "remove operation failed to decode path")
-	}
+func (p Patch) remove(doc *container, op operation) error {
+	path := op.path()
 
 	con, key := findObject(doc, path)
 
 	if con == nil {
-		return errors.Wrapf(ErrMissing, "remove operation does not apply: doc is missing path: \"%s\"", path)
+		return fmt.Errorf("jsonpatch remove operation does not apply: doc is missing path: \"%s\"", path)
 	}
 
-	err = con.remove(key)
-	if err != nil {
-		return errors.Wrapf(err, "error in remove for path: '%s'", path)
-	}
-
-	return nil
+	return con.remove(key)
 }
 
-func (p Patch) replace(doc *container, op Operation) error {
-	path, err := op.Path()
-	if err != nil {
-		return errors.Wrapf(err, "replace operation failed to decode path")
-	}
+func (p Patch) replace(doc *container, op operation) error {
+	path := op.path()
 
 	con, key := findObject(doc, path)
 
 	if con == nil {
-		return errors.Wrapf(ErrMissing, "replace operation does not apply: doc is missing path: %s", path)
+		return fmt.Errorf("jsonpatch replace operation does not apply: doc is missing path: %s", path)
 	}
 
 	_, ok := con.get(key)
 	if ok != nil {
-		return errors.Wrapf(ErrMissing, "replace operation does not apply: doc is missing key: %s", path)
+		return fmt.Errorf("jsonpatch replace operation does not apply: doc is missing key: %s", path)
 	}
 
-	err = con.set(key, op.value())
-	if err != nil {
-		return errors.Wrapf(err, "error in remove for path: '%s'", path)
-	}
-
-	return nil
+	return con.set(key, op.value())
 }
 
-func (p Patch) move(doc *container, op Operation) error {
-	from, err := op.From()
-	if err != nil {
-		return errors.Wrapf(err, "move operation failed to decode from")
-	}
+func (p Patch) move(doc *container, op operation) error {
+	from := op.from()
 
 	con, key := findObject(doc, from)
 
 	if con == nil {
-		return errors.Wrapf(ErrMissing, "move operation does not apply: doc is missing from path: %s", from)
+		return fmt.Errorf("jsonpatch move operation does not apply: doc is missing from path: %s", from)
 	}
 
 	val, err := con.get(key)
 	if err != nil {
-		return errors.Wrapf(err, "error in move for path: '%s'", key)
+		return err
 	}
 
 	err = con.remove(key)
 	if err != nil {
-		return errors.Wrapf(err, "error in move for path: '%s'", key)
+		return err
 	}
 
-	path, err := op.Path()
-	if err != nil {
-		return errors.Wrapf(err, "move operation failed to decode path")
-	}
+	path := op.path()
 
 	con, key = findObject(doc, path)
 
 	if con == nil {
-		return errors.Wrapf(ErrMissing, "move operation does not apply: doc is missing destination path: %s", path)
+		return fmt.Errorf("jsonpatch move operation does not apply: doc is missing destination path: %s", path)
 	}
 
-	err = con.add(key, val)
-	if err != nil {
-		return errors.Wrapf(err, "error in move for path: '%s'", path)
-	}
-
-	return nil
+	return con.add(key, val)
 }
 
-func (p Patch) test(doc *container, op Operation) error {
-	path, err := op.Path()
-	if err != nil {
-		return errors.Wrapf(err, "test operation failed to decode path")
-	}
+func (p Patch) test(doc *container, op operation) error {
+	path := op.path()
 
 	con, key := findObject(doc, path)
 
 	if con == nil {
-		return errors.Wrapf(ErrMissing, "test operation does not apply: is missing path: %s", path)
+		return fmt.Errorf("jsonpatch test operation does not apply: is missing path: %s", path)
 	}
 
 	val, err := con.get(key)
-	if err != nil && errors.Cause(err) != ErrMissing {
-		return errors.Wrapf(err, "error in test for path: '%s'", path)
+
+	if err != nil {
+		return err
 	}
 
 	if val == nil {
 		if op.value().raw == nil {
 			return nil
 		}
-		return errors.Wrapf(ErrTestFailed, "testing value %s failed", path)
+		return fmt.Errorf("Testing value %s failed", path)
 	} else if op.value() == nil {
-		return errors.Wrapf(ErrTestFailed, "testing value %s failed", path)
+		return fmt.Errorf("Testing value %s failed", path)
 	}
 
 	if val.equal(op.value()) {
 		return nil
 	}
 
-	return errors.Wrapf(ErrTestFailed, "testing value %s failed", path)
+	return fmt.Errorf("Testing value %s failed", path)
 }
 
-func (p Patch) copy(doc *container, op Operation, accumulatedCopySize *int64) error {
-	from, err := op.From()
-	if err != nil {
-		return errors.Wrapf(err, "copy operation failed to decode from")
-	}
+func (p Patch) copy(doc *container, op operation, accumulatedCopySize *int64) error {
+	from := op.from()
 
 	con, key := findObject(doc, from)
 
 	if con == nil {
-		return errors.Wrapf(ErrMissing, "copy operation does not apply: doc is missing from path: %s", from)
+		return fmt.Errorf("jsonpatch copy operation does not apply: doc is missing from path: %s", from)
 	}
 
 	val, err := con.get(key)
 	if err != nil {
-		return errors.Wrapf(err, "error in copy for from: '%s'", from)
+		return err
 	}
 
-	path, err := op.Path()
-	if err != nil {
-		return errors.Wrapf(ErrMissing, "copy operation failed to decode path")
-	}
+	path := op.path()
 
 	con, key = findObject(doc, path)
 
 	if con == nil {
-		return errors.Wrapf(ErrMissing, "copy operation does not apply: doc is missing destination path: %s", path)
+		return fmt.Errorf("jsonpatch copy operation does not apply: doc is missing destination path: %s", path)
 	}
 
 	valCopy, sz, err := deepCopy(val)
 	if err != nil {
-		return errors.Wrapf(err, "error while performing deep copy")
+		return err
 	}
-
 	(*accumulatedCopySize) += int64(sz)
 	if AccumulatedCopySizeLimit > 0 && *accumulatedCopySize > AccumulatedCopySizeLimit {
 		return NewAccumulatedCopySizeError(AccumulatedCopySizeLimit, *accumulatedCopySize)
 	}
 
-	err = con.add(key, valCopy)
-	if err != nil {
-		return errors.Wrapf(err, "error while adding value during copy")
-	}
-
-	return nil
+	return con.add(key, valCopy)
 }
 
 // Equal indicates if 2 JSON documents have the same structural equality.
@@ -739,7 +651,7 @@ func (p Patch) ApplyIndent(doc []byte, indent string) ([]byte, error) {
 	var accumulatedCopySize int64
 
 	for _, op := range p {
-		switch op.Kind() {
+		switch op.kind() {
 		case "add":
 			err = p.add(&pd, op)
 		case "remove":
@@ -753,7 +665,7 @@ func (p Patch) ApplyIndent(doc []byte, indent string) ([]byte, error) {
 		case "copy":
 			err = p.copy(&pd, op, &accumulatedCopySize)
 		default:
-			err = fmt.Errorf("Unexpected kind: %s", op.Kind())
+			err = fmt.Errorf("Unexpected kind: %s", op.kind())
 		}
 
 		if err != nil {