Merge pull request #65 from go-kivik/errors-v3

Remove use of kivik/errors package

Author: flimzy

bindings/errors.go

@@ -7,7 +7,7 @@ import (
 	"github.com/gopherjs/gopherjs/js"
 	"github.com/gopherjs/jsbuiltin"
 
-	"github.com/go-kivik/kivik/v3/errors"
+	"github.com/go-kivik/kivik/v3"
 )
 
 type pouchError struct {
@@ -35,7 +35,7 @@ func NewPouchError(o *js.Object) error {
 		msg = o.Get("message").String()
 	default:
 		if jsbuiltin.InstanceOf(o, js.Global.Get("Error")) {
-			return errors.Status(status, o.Get("message").String())
+			return &kivik.Error{HTTPStatus: status, Message: o.Get("message").String()}
 		}
 	}
 	switch {

bindings/pouchdb.go

@@ -6,14 +6,15 @@ import (
 	"bytes"
 	"context"
 	"encoding/json"
+	"errors"
 	"io"
 	"net/http"
 	"time"
 
 	"github.com/gopherjs/gopherjs/js"
 	"github.com/gopherjs/jsbuiltin"
 
-	"github.com/go-kivik/kivik/v3/errors"
+	"github.com/go-kivik/kivik/v3"
 )
 
 // DB is a PouchDB database object.
@@ -189,7 +190,7 @@ func (db *DB) Query(ctx context.Context, ddoc, view string, options map[string]i
 	return callBack(ctx, db, "query", ddoc+"/"+view, o)
 }
 
-var findPluginNotLoaded = errors.Status(http.StatusNotImplemented, "kivik: pouchdb-find plugin not loaded")
+var findPluginNotLoaded = &kivik.Error{HTTPStatus: http.StatusNotImplemented, Message: "kivik: pouchdb-find plugin not loaded"}
 
 // Find executes a MongoDB-style find query with the pouchdb-find plugin, if it
 // is installed. If the plugin is not installed, a NotImplemented error will be
@@ -223,7 +224,10 @@ func Objectify(i interface{}) (interface{}, error) {
 	}
 	var x interface{}
 	err := json.Unmarshal(buf, &x)
-	return x, errors.WrapStatus(http.StatusBadRequest, err)
+	if err != nil {
+		err = &kivik.Error{HTTPStatus: http.StatusBadRequest, Err: err}
+	}
+	return x, err
 }
 
 // Compact compacts the database, and waits for it to complete. This may take

bulk.go

@@ -7,8 +7,8 @@ import (
 
 	"github.com/gopherjs/gopherjs/js"
 
+	kivik "github.com/go-kivik/kivik/v3"
 	"github.com/go-kivik/kivik/v3/driver"
-	"github.com/go-kivik/kivik/v3/errors"
 )
 
 type bulkResult struct {
@@ -47,7 +47,7 @@ func (r *bulkResults) Next(update *driver.BulkResult) (err error) {
 	update.Rev = result.ID
 	update.Error = nil
 	if result.IsError {
-		update.Error = errors.Status(result.StatusCode, result.Reason)
+		update.Error = &kivik.Error{HTTPStatus: result.StatusCode, Message: result.Reason}
 	}
 	return nil
 }

db.go

@@ -12,7 +12,6 @@ import (
 
 	kivik "github.com/go-kivik/kivik/v3"
 	"github.com/go-kivik/kivik/v3/driver"
-	"github.com/go-kivik/kivik/v3/errors"
 	"github.com/go-kivik/pouchdb/v3/bindings"
 )
 
@@ -79,7 +78,7 @@ func (d *db) Put(ctx context.Context, docID string, doc interface{}, options map
 	jsDoc := js.Global.Get("JSON").Call("parse", string(jsonDoc))
 	if id := jsDoc.Get("_id"); id != js.Undefined {
 		if id.String() != docID {
-			return "", errors.Status(http.StatusBadRequest, "id argument must match _id field in document")
+			return "", &kivik.Error{HTTPStatus: http.StatusBadRequest, Message: "id argument must match _id field in document"}
 		}
 	}
 	jsDoc.Set("_id", docID)
@@ -102,7 +101,7 @@ func (d *db) Stats(ctx context.Context) (*driver.DBStats, error) {
 
 func (d *db) Compact(_ context.Context) error {
 	if atomic.LoadUint32(&d.compacting) == 1 {
-		return &kivik.Error{HTTPStatus: http.StatusTooManyRequests, Err: errors.New("kivik: compaction already running")}
+		return &kivik.Error{HTTPStatus: http.StatusTooManyRequests, Message: "kivik: compaction already running"}
 	}
 	atomic.StoreUint32(&d.compacting, 1)
 	defer atomic.StoreUint32(&d.compacting, 0)
@@ -116,14 +115,14 @@ func (d *db) CompactView(_ context.Context, _ string) error {
 
 func (d *db) ViewCleanup(_ context.Context) error {
 	if atomic.LoadUint32(&d.viewCleanup) == 1 {
-		return &kivik.Error{HTTPStatus: http.StatusTooManyRequests, Err: errors.New("kivik: view cleanup already running")}
+		return &kivik.Error{HTTPStatus: http.StatusTooManyRequests, Message: "kivik: view cleanup already running"}
 	}
 	atomic.StoreUint32(&d.viewCleanup, 1)
 	defer atomic.StoreUint32(&d.viewCleanup, 0)
 	return d.db.ViewCleanup()
 }
 
-var securityNotImplemented = errors.Status(http.StatusNotImplemented, "kivik: security interface not supported by PouchDB")
+var securityNotImplemented = &kivik.Error{HTTPStatus: http.StatusNotImplemented, Message: "kivik: security interface not supported by PouchDB"}
 
 func (d *db) Security(ctx context.Context) (*driver.Security, error) {
 	return nil, securityNotImplemented

find.go

@@ -9,8 +9,8 @@ import (
 
 	"github.com/gopherjs/gopherjs/js"
 
+	kivik "github.com/go-kivik/kivik/v3"
 	"github.com/go-kivik/kivik/v3/driver"
-	"github.com/go-kivik/kivik/v3/errors"
 	"github.com/go-kivik/pouchdb/v3/bindings"
 )
 
@@ -76,7 +76,7 @@ func (d *db) findIndex(ctx context.Context, ddoc, name string) (interface{}, err
 			}, nil
 		}
 	}
-	return nil, errors.Status(http.StatusNotFound, "index does not exist")
+	return nil, &kivik.Error{HTTPStatus: http.StatusNotFound, Message: "index does not exist"}
 }
 
 func (d *db) DeleteIndex(ctx context.Context, ddoc, name string) error {

pouchdb.go

@@ -3,6 +3,7 @@ package pouchdb
 import (
 	"context"
 	"encoding/json"
+	"errors"
 	"fmt"
 	"net/http"
 	"net/url"
@@ -11,7 +12,6 @@ import (
 
 	kivik "github.com/go-kivik/kivik/v3"
 	"github.com/go-kivik/kivik/v3/driver"
-	"github.com/go-kivik/kivik/v3/errors"
 	"github.com/go-kivik/pouchdb/v3/bindings"
 )
 
@@ -137,7 +137,7 @@ func (c *client) DBExists(ctx context.Context, dbName string, options map[string
 func (c *client) CreateDB(ctx context.Context, dbName string, options map[string]interface{}) error {
 	if c.isRemote() {
 		if exists, _ := c.DBExists(ctx, dbName, options); exists {
-			return errors.Status(http.StatusPreconditionFailed, "database exists")
+			return &kivik.Error{HTTPStatus: http.StatusPreconditionFailed, Message: "database exists"}
 		}
 	}
 	opts := c.options(options)
@@ -153,7 +153,7 @@ func (c *client) DestroyDB(ctx context.Context, dbName string, options map[strin
 	}
 	if !exists {
 		// This will only ever do anything for a remote database
-		return errors.Status(http.StatusNotFound, "database does not exist")
+		return &kivik.Error{HTTPStatus: http.StatusNotFound, Message: "database does not exist"}
 	}
 	return c.pouch.New(c.dbURL(dbName), opts).Destroy(ctx, nil)
 }
@@ -165,7 +165,7 @@ func (c *client) DB(ctx context.Context, dbName string, options map[string]inter
 		return nil, err
 	}
 	if !exists {
-		return nil, errors.Status(http.StatusNotFound, "database does not exist")
+		return nil, &kivik.Error{HTTPStatus: http.StatusNotFound, Message: "database does not exist"}
 	}
 	return &db{
 		db:     c.pouch.New(c.dbURL(dbName), opts),

replication.go

@@ -10,7 +10,6 @@ import (
 
 	kivik "github.com/go-kivik/kivik/v3"
 	"github.com/go-kivik/kivik/v3/driver"
-	"github.com/go-kivik/kivik/v3/errors"
 	"github.com/go-kivik/pouchdb/v3/bindings"
 )
 
@@ -105,7 +104,7 @@ func (r *replication) Delete(ctx context.Context) (err error) {
 			return nil
 		}
 	}
-	return errors.Status(http.StatusNotFound, "replication not found")
+	return &kivik.Error{HTTPStatus: http.StatusNotFound, Message: "replication not found"}
 }
 
 func replicationEndpoint(dsn string, object interface{}) (name string, obj interface{}, err error) {
@@ -148,7 +147,7 @@ func (c *client) Replicate(_ context.Context, targetDSN, sourceDSN string, optio
 
 func (c *client) GetReplications(_ context.Context, options map[string]interface{}) ([]driver.Replication, error) {
 	for range options {
-		return nil, errors.Status(http.StatusBadRequest, "options not yet supported")
+		return nil, &kivik.Error{HTTPStatus: http.StatusBadRequest, Message: "options not yet supported"}
 	}
 	c.replicationsMU.RLock()
 	defer c.replicationsMU.RUnlock()