diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 01afe77..e34ef3f 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -22,7 +22,7 @@ variables: lint: stage: test - image: golangci/golangci-lint:v1.24 + image: golangci/golangci-lint:v1.28 script: - go mod download - golangci-lint run ./... diff --git a/.golangci.toml b/.golangci.toml index d3c929a..f210c43 100644 --- a/.golangci.toml +++ b/.golangci.toml @@ -5,5 +5,5 @@ format = "colored-line-number" enable = [ "gocyclo", "unconvert", "goimports", "unused", "varcheck", "vetshadow", "misspell", "nakedret", "errcheck", "golint", "ineffassign", - "deadcode", "goconst", "vet", "unparam", "gofmt" + "deadcode", "goconst", "vet", "unparam", "gofumpt" ] diff --git a/cmd/kouch-replicate/cmd/testdata/TestConnect_valid_http____url b/cmd/kouch-replicate/cmd/testdata/TestConnect_valid_http____url index 5dc5c79..0e94cd9 100644 --- a/cmd/kouch-replicate/cmd/testdata/TestConnect_valid_http____url +++ b/cmd/kouch-replicate/cmd/testdata/TestConnect_valid_http____url @@ -5,8 +5,8 @@ driverClient: (*couchdb.client)({ Client: (*chttp.Client)({ UserAgents: ([]string) (len=2) { - (string) (len=11) "Kivik/3.0.0", - (string) (len=37) "Kivik CouchDB driver/2.0.0-prerelease" + (string) (len=11) "Kivik/3.1.0", + (string) (len=26) "Kivik CouchDB driver/3.1.0" }, Client: (*http.Client)({ Transport: (http.RoundTripper) , @@ -44,8 +44,8 @@ client: (*couchdb.client)({ Client: (*chttp.Client)({ UserAgents: ([]string) (len=2) { - (string) (len=11) "Kivik/3.0.0", - (string) (len=37) "Kivik CouchDB driver/2.0.0-prerelease" + (string) (len=11) "Kivik/3.1.0", + (string) (len=26) "Kivik CouchDB driver/3.1.0" }, Client: (*http.Client)({ Transport: (http.RoundTripper) , diff --git a/cmd/kouch-replicate/cmd/testdata/TestConnect_valid_https____url b/cmd/kouch-replicate/cmd/testdata/TestConnect_valid_https____url index ac97297..579a819 100644 --- a/cmd/kouch-replicate/cmd/testdata/TestConnect_valid_https____url +++ b/cmd/kouch-replicate/cmd/testdata/TestConnect_valid_https____url @@ -5,8 +5,8 @@ driverClient: (*couchdb.client)({ Client: (*chttp.Client)({ UserAgents: ([]string) (len=2) { - (string) (len=11) "Kivik/3.0.0", - (string) (len=37) "Kivik CouchDB driver/2.0.0-prerelease" + (string) (len=11) "Kivik/3.1.0", + (string) (len=26) "Kivik CouchDB driver/3.1.0" }, Client: (*http.Client)({ Transport: (http.RoundTripper) , @@ -44,8 +44,8 @@ client: (*couchdb.client)({ Client: (*chttp.Client)({ UserAgents: ([]string) (len=2) { - (string) (len=11) "Kivik/3.0.0", - (string) (len=37) "Kivik CouchDB driver/2.0.0-prerelease" + (string) (len=11) "Kivik/3.1.0", + (string) (len=26) "Kivik CouchDB driver/3.1.0" }, Client: (*http.Client)({ Transport: (http.RoundTripper) , diff --git a/document_test.go b/document_test.go index 2956b09..cfbd285 100644 --- a/document_test.go +++ b/document_test.go @@ -20,7 +20,6 @@ func TestDocumentMarshalJSON(t *testing.T) { }, }) tests.Add("attachment", func(t *testing.T) interface{} { - f, err := os.Open("testdata/foo.txt") if err != nil { t.Fatal(err) diff --git a/go.mod b/go.mod index 928ff60..43c8d02 100644 --- a/go.mod +++ b/go.mod @@ -3,11 +3,11 @@ module github.com/go-kivik/xkivik/v3 go 1.13 require ( - github.com/go-kivik/couchdb/v3 v3.0.0 + github.com/go-kivik/couchdb/v3 v3.1.0 github.com/go-kivik/fsdb/v3 v3.0.0 - github.com/go-kivik/kivik/v3 v3.0.2 + github.com/go-kivik/kivik/v3 v3.1.2 github.com/go-kivik/kivikmock/v3 v3.0.0 - github.com/go-kivik/kiviktest/v3 v3.0.1 + github.com/go-kivik/kiviktest/v3 v3.0.2 github.com/mitchellh/go-homedir v1.1.0 github.com/pelletier/go-toml v1.4.0 // indirect github.com/spf13/afero v1.2.2 // indirect diff --git a/go.sum b/go.sum index b33242e..98f67ad 100644 --- a/go.sum +++ b/go.sum @@ -35,16 +35,25 @@ github.com/go-chi/chi v4.1.0+incompatible/go.mod h1:eB3wogJHnLi3x/kFX2A+IbTBlXxm github.com/go-kit/kit v0.8.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as= github.com/go-kivik/couchdb/v3 v3.0.0 h1:HBDO5gD2FxXECKqb1HMBK+pitv4E+p88RvlaJQZwFcs= github.com/go-kivik/couchdb/v3 v3.0.0/go.mod h1:eTGmiw9fnA30gdqQCgH3vNrW+glhl+48RbvZga8/wLk= +github.com/go-kivik/couchdb/v3 v3.1.0 h1:6GTn44kb2UcLFxH2GjlspRkhiY+oK/yCwVZf66RNEcc= +github.com/go-kivik/couchdb/v3 v3.1.0/go.mod h1:K6KDJAjqcgnCMvDbWWwYzWU+d71p+kbvLK934qAvJdk= github.com/go-kivik/fsdb/v3 v3.0.0 h1:bKaHr7aSwcnttS5iJTbIaTN/AKkJewN2tsYI3o+DR9U= github.com/go-kivik/fsdb/v3 v3.0.0/go.mod h1:uO9LhO78EQpPa3VYVlvT4dVH29HT6zGrODaY5MzF/c8= github.com/go-kivik/kivik/v3 v3.0.0/go.mod h1:7tmQDvkta/pcijpUjLMsQ9HJUELiKD5zm6jQ3Gb9cxE= +github.com/go-kivik/kivik/v3 v3.0.1/go.mod h1:7tmQDvkta/pcijpUjLMsQ9HJUELiKD5zm6jQ3Gb9cxE= github.com/go-kivik/kivik/v3 v3.0.2 h1:+tKWFJTAGlUjK1DQhn2rEGQvroYLTUCAO6/Kk8K4uQQ= github.com/go-kivik/kivik/v3 v3.0.2/go.mod h1:chqVuHKAU9j2C7qL0cAH2FCO26oL+0B4aIBeCRMnLa8= +github.com/go-kivik/kivik/v3 v3.1.1 h1:Rz111JKpj+4hIcQyn2dZvASJWoPQNT2wpSsbN2muwk4= +github.com/go-kivik/kivik/v3 v3.1.1/go.mod h1:chqVuHKAU9j2C7qL0cAH2FCO26oL+0B4aIBeCRMnLa8= +github.com/go-kivik/kivik/v3 v3.1.2 h1:c9+Xc+YXWcjWaGvqeDuD2JhVL7YNF57J8Ta1A8ZVyhQ= +github.com/go-kivik/kivik/v3 v3.1.2/go.mod h1:chqVuHKAU9j2C7qL0cAH2FCO26oL+0B4aIBeCRMnLa8= github.com/go-kivik/kivikmock/v3 v3.0.0 h1:k4L/LPgvyAP4xi+MZ676tsDSqOJfWNymTbZWpQfb630= github.com/go-kivik/kivikmock/v3 v3.0.0/go.mod h1:P6g9RBT2clg6CCDkVeQ8I0MlIB6wX0mGhL9P2ZgcKAE= github.com/go-kivik/kiviktest/v3 v3.0.0/go.mod h1:pLjkg/F61+X4Ks1BpbrTgbChjdPcINX2HysR8i7AfBM= github.com/go-kivik/kiviktest/v3 v3.0.1 h1:cL1XvG0DZ0oEAsrWa3Tgi8sa/0eNyHYJatFfble3x+4= github.com/go-kivik/kiviktest/v3 v3.0.1/go.mod h1:pLjkg/F61+X4Ks1BpbrTgbChjdPcINX2HysR8i7AfBM= +github.com/go-kivik/kiviktest/v3 v3.0.2 h1:+n90Nopbrzf/tqoXu4xqAMXk1+191vLrvakBdiz7r3Y= +github.com/go-kivik/kiviktest/v3 v3.0.2/go.mod h1:sqsz3M2sJxTxAUdOj+2SU21y4phcpYc0FJIn+hbf1D0= github.com/go-logfmt/logfmt v0.3.0/go.mod h1:Qt1PoO58o5twSAckw1HlFXLmHsOX5/0LbT9GBnD5lWE= github.com/go-logfmt/logfmt v0.4.0/go.mod h1:3RMwSq7FuexP4Kalkev3ejPJsZTpXXBr9+V4qmtdjCk= github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY=