Merge pull request #77 from go-kivik/membership-v3

Add Membership support

Author: flimzy

.gitlab-ci.yml

@@ -12,14 +12,14 @@ variables:
 
 linter:
     stage: test
-    image: golangci/golangci-lint:v1.26
+    image: golangci/golangci-lint:v1.28
     script:
         - go mod download
         - golangci-lint run ./...
 
 coverage:
     stage: test
-    image: golang:1.13
+    image: golang:1.14
     services: []
     before_script:
         - ''

.golangci.toml

@@ -3,7 +3,7 @@ format = "colored-line-number"
 
 [linters]
 enable = [
-    "interfacer", "gocyclo", "unconvert", "goimports", "unused", "varcheck",
+    "gocyclo", "unconvert", "goimports", "unused", "varcheck",
     "vetshadow", "misspell", "nakedret", "errcheck", "golint", "ineffassign",
     "deadcode", "goconst", "vet", "unparam", "gofmt"
 ]

client.go

@@ -13,14 +13,16 @@ type driverClient struct {
 	*Client
 }
 
-var _ driver.Client = &driverClient{}
-var _ driver.ClientCloser = &driverClient{}
-var _ driver.Authenticator = &driverClient{}
-var _ driver.Cluster = &driverClient{}
-var _ driver.DBsStatser = &driverClient{}
-var _ driver.Pinger = &driverClient{}
-var _ driver.Sessioner = &driverClient{}
-var _ driver.Configer = &driverClient{}
+var (
+	_ driver.Client        = &driverClient{}
+	_ driver.ClientCloser  = &driverClient{}
+	_ driver.Authenticator = &driverClient{}
+	_ driver.Cluster       = &driverClient{}
+	_ driver.DBsStatser    = &driverClient{}
+	_ driver.Pinger        = &driverClient{}
+	_ driver.Sessioner     = &driverClient{}
+	_ driver.Configer      = &driverClient{}
+)
 
 func (c *driverClient) Authenticate(ctx context.Context, authenticator interface{}) error {
 	expected := &ExpectedAuthenticate{

client_gen.go

@@ -238,6 +238,17 @@ func (c *driverClient) GetReplications(ctx context.Context, options map[string]i
 	return driverReplications(expected.ret0), expected.wait(ctx)
 }
 
+func (c *driverClient) Membership(ctx context.Context) (*driver.ClusterMembership, error) {
+	expected := &ExpectedMembership{}
+	if err := c.nextExpectation(expected); err != nil {
+		return nil, err
+	}
+	if expected.callback != nil {
+		return expected.callback(ctx)
+	}
+	return expected.ret0, expected.wait(ctx)
+}
+
 func (c *driverClient) Replicate(ctx context.Context, arg0 string, arg1 string, options map[string]interface{}) (driver.Replication, error) {
 	expected := &ExpectedReplicate{
 		arg0: arg0,

clientexpectations_gen.go

@@ -900,6 +900,50 @@ func (e *ExpectedGetReplications) method(v bool) string {
 	return fmt.Sprintf("GetReplications(ctx, %s)", options)
 }
 
+// ExpectedMembership represents an expectation for a call to Membership().
+type ExpectedMembership struct {
+	commonExpectation
+	callback func(ctx context.Context) (*driver.ClusterMembership, error)
+	ret0     *driver.ClusterMembership
+}
+
+// WillExecute sets a callback function to be called with any inputs to the
+// original function. Any values returned by the callback will be returned as
+// if generated by the driver.
+func (e *ExpectedMembership) WillExecute(cb func(ctx context.Context) (*driver.ClusterMembership, error)) *ExpectedMembership {
+	e.callback = cb
+	return e
+}
+
+// WillReturn sets the values that will be returned by the call to Membership().
+func (e *ExpectedMembership) WillReturn(ret0 *driver.ClusterMembership) *ExpectedMembership {
+	e.ret0 = ret0
+	return e
+}
+
+// WillReturnError sets the error value that will be returned by the call to Membership().
+func (e *ExpectedMembership) WillReturnError(err error) *ExpectedMembership {
+	e.err = err
+	return e
+}
+
+// WillDelay causes the call to Membership() to delay.
+func (e *ExpectedMembership) WillDelay(delay time.Duration) *ExpectedMembership {
+	e.delay = delay
+	return e
+}
+
+func (e *ExpectedMembership) met(_ expectation) bool {
+	return true
+}
+
+func (e *ExpectedMembership) method(v bool) string {
+	if !v {
+		return "Membership()"
+	}
+	return fmt.Sprintf("Membership(ctx)")
+}
+
 // ExpectedReplicate represents an expectation for a call to Replicate().
 type ExpectedReplicate struct {
 	commonExpectation

clientmock_gen.go

@@ -126,6 +126,13 @@ func (c *Client) ExpectGetReplications() *ExpectedGetReplications {
 	return e
 }
 
+// ExpectMembership queues an expectation that Membership will be called.
+func (c *Client) ExpectMembership() *ExpectedMembership {
+	e := &ExpectedMembership{}
+	c.expected = append(c.expected, e)
+	return e
+}
+
 // ExpectReplicate queues an expectation that Replicate will be called.
 func (c *Client) ExpectReplicate() *ExpectedReplicate {
 	e := &ExpectedReplicate{}

db.go

@@ -10,9 +10,11 @@ type driverDB struct {
 	*DB
 }
 
-var _ driver.DB = &driverDB{}
-var _ driver.BulkGetter = &driverDB{}
-var _ driver.OptsFinder = &driverDB{}
+var (
+	_ driver.DB         = &driverDB{}
+	_ driver.BulkGetter = &driverDB{}
+	_ driver.OptsFinder = &driverDB{}
+)
 
 func (db *driverDB) Close(ctx context.Context) error {
 	expected := &ExpectedDBClose{

expectations.go

@@ -111,6 +111,15 @@ func (e *ExpectedClusterStatus) String() string {
 		errorString(e.err)
 }
 
+func (e *ExpectedMembership) String() string {
+	extra := delayString(e.delay) + errorString(e.err)
+	msg := "call to Membership()"
+	if extra != "" {
+		msg += " which:" + extra
+	}
+	return msg
+}
+
 // WithAction specifies the action to be matched. Note that this expectation
 // is compared with the actual action's marshaled JSON output, so it is not
 // essential that the data types match exactly, in a Go sense.

gen/main.go

@@ -5,7 +5,7 @@ import (
 	"reflect"
 	"sort"
 
-	kivik "github.com/go-kivik/kivik/v3"
+	"github.com/go-kivik/kivik/v3"
 	"github.com/go-kivik/kivik/v3/driver"
 )
 
@@ -45,6 +45,7 @@ type fullClient interface {
 	driver.Pinger
 	driver.Sessioner
 	driver.Cluster
+	driver.Cluster2
 	driver.ClientCloser
 	driver.Authenticator
 	driver.ClientReplicator

go.mod

@@ -5,6 +5,6 @@ go 1.13
 require (
 	github.com/flimzy/diff v0.1.6
 	github.com/go-kivik/couchdb/v3 v3.0.0
-	github.com/go-kivik/kivik/v3 v3.1.1
+	github.com/go-kivik/kivik/v3 v3.2.0
 	gitlab.com/flimzy/testy v0.0.3
 )