From b6ef4f393ac469595dcc59634d68998842a0decb Mon Sep 17 00:00:00 2001 From: Umputun Date: Sat, 4 Apr 2020 01:47:02 -0500 Subject: [PATCH] switch to go 1.14 #636 --- .github/workflows/ci-test-backend.yml | 2 +- backend/_example/memory_store/go.mod | 2 +- backend/app/notify/telegram_test.go | 4 +- backend/go.mod | 2 +- backend/vendor/modules.txt | 76 +++++++++++++++++++++++++++ 5 files changed, 82 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci-test-backend.yml b/.github/workflows/ci-test-backend.yml index 04d0aef8..a9efb1dc 100644 --- a/.github/workflows/ci-test-backend.yml +++ b/.github/workflows/ci-test-backend.yml @@ -35,7 +35,7 @@ jobs: - name: install go uses: actions/setup-go@v1 with: - go-version: 1.13 + go-version: 1.14 - name: test backend run: | diff --git a/backend/_example/memory_store/go.mod b/backend/_example/memory_store/go.mod index 466edd4d..44afc769 100644 --- a/backend/_example/memory_store/go.mod +++ b/backend/_example/memory_store/go.mod @@ -1,6 +1,6 @@ module github.com/umputun/remark/memory_store -go 1.12 +go 1.14 require ( github.com/go-pkgz/jrpc v0.1.0 diff --git a/backend/app/notify/telegram_test.go b/backend/app/notify/telegram_test.go index f29a22a4..7532b5ed 100644 --- a/backend/app/notify/telegram_test.go +++ b/backend/app/notify/telegram_test.go @@ -37,7 +37,9 @@ func TestTelegram_New(t *testing.T) { assert.EqualError(t, err, "unexpected telegram status code 404") _, err = NewTelegram("no-such-thing", "remark_test", 2*time.Second, "http://127.0.0.1:4321/") - assert.EqualError(t, err, "can't initialize telegram notifications: Get http://127.0.0.1:4321/no-such-thing/getMe: dial tcp 127.0.0.1:4321: connect: connection refused") + require.Error(t, err) + assert.Contains(t, err.Error(), "can't initialize telegram notifications") + assert.Contains(t, err.Error(), "dial tcp 127.0.0.1:4321: connect: connection refused") _, err = NewTelegram("good-token", "remark_test", 2*time.Second, "") assert.Error(t, err, "empty api url not allowed") diff --git a/backend/go.mod b/backend/go.mod index 85f047b1..dfe89f22 100644 --- a/backend/go.mod +++ b/backend/go.mod @@ -1,6 +1,6 @@ module github.com/umputun/remark/backend -go 1.13 +go 1.14 require ( cloud.google.com/go v0.47.0 // indirect diff --git a/backend/vendor/modules.txt b/backend/vendor/modules.txt index 3fd39085..1aa66b6b 100644 --- a/backend/vendor/modules.txt +++ b/backend/vendor/modules.txt @@ -1,10 +1,16 @@ # cloud.google.com/go v0.47.0 +## explicit cloud.google.com/go/compute/metadata # github.com/Depado/bfchroma v1.2.0 +## explicit github.com/Depado/bfchroma # github.com/PuerkitoBio/goquery v1.5.0 +## explicit github.com/PuerkitoBio/goquery +# github.com/ajg/form v1.5.1 +## explicit # github.com/alecthomas/chroma v0.6.0 +## explicit github.com/alecthomas/chroma github.com/alecthomas/chroma/formatters/html github.com/alecthomas/chroma/lexers @@ -36,8 +42,10 @@ github.com/alecthomas/chroma/lexers/x github.com/alecthomas/chroma/lexers/y github.com/alecthomas/chroma/styles # github.com/andybalholm/cascadia v1.1.0 +## explicit github.com/andybalholm/cascadia # github.com/coreos/bbolt v1.3.3 +## explicit github.com/coreos/bbolt # github.com/danwakefield/fnmatch v0.0.0-20160403171240-cbb64ac3d964 github.com/danwakefield/fnmatch @@ -47,25 +55,36 @@ github.com/davecgh/go-spew/spew github.com/dghubble/oauth1 github.com/dghubble/oauth1/twitter # github.com/dgrijalva/jwt-go v3.2.0+incompatible +## explicit github.com/dgrijalva/jwt-go # github.com/didip/tollbooth v4.0.2+incompatible +## explicit github.com/didip/tollbooth github.com/didip/tollbooth/errors github.com/didip/tollbooth/libstring github.com/didip/tollbooth/limiter # github.com/didip/tollbooth_chi v0.0.0-20170928041846-6ab5f3083f3d +## explicit github.com/didip/tollbooth_chi # github.com/dlclark/regexp2 v1.1.6 github.com/dlclark/regexp2 github.com/dlclark/regexp2/syntax +# github.com/fasthttp-contrib/websocket v0.0.0-20160511215533-1f3b11f56072 +## explicit +# github.com/gavv/httpexpect v2.0.0+incompatible +## explicit # github.com/go-chi/chi v4.0.2+incompatible +## explicit github.com/go-chi/chi github.com/go-chi/chi/middleware # github.com/go-chi/cors v1.0.0 +## explicit github.com/go-chi/cors # github.com/go-chi/render v1.0.1 +## explicit github.com/go-chi/render # github.com/go-pkgz/auth v0.9.0 +## explicit github.com/go-pkgz/auth github.com/go-pkgz/auth/avatar github.com/go-pkgz/auth/logger @@ -74,18 +93,24 @@ github.com/go-pkgz/auth/provider github.com/go-pkgz/auth/provider/sender github.com/go-pkgz/auth/token # github.com/go-pkgz/jrpc v0.1.0 +## explicit github.com/go-pkgz/jrpc # github.com/go-pkgz/lcw v0.5.0 +## explicit github.com/go-pkgz/lcw # github.com/go-pkgz/lgr v0.6.3 +## explicit github.com/go-pkgz/lgr # github.com/go-pkgz/repeater v1.1.3 +## explicit github.com/go-pkgz/repeater github.com/go-pkgz/repeater/strategy # github.com/go-pkgz/rest v1.4.1 +## explicit github.com/go-pkgz/rest github.com/go-pkgz/rest/logger # github.com/go-pkgz/syncs v1.1.1 +## explicit github.com/go-pkgz/syncs # github.com/go-redis/redis/v7 v7.0.0-beta.4 github.com/go-redis/redis/v7 @@ -102,49 +127,91 @@ github.com/golang/protobuf/proto # github.com/golang/snappy v0.0.1 github.com/golang/snappy # github.com/google/uuid v1.1.1 +## explicit github.com/google/uuid +# github.com/gopherjs/gopherjs v0.0.0-20190812055157-5d271430af9f +## explicit # github.com/gorilla/feeds v1.1.1 +## explicit github.com/gorilla/feeds +# github.com/gorilla/websocket v1.4.0 +## explicit # github.com/hashicorp/errwrap v1.0.0 github.com/hashicorp/errwrap # github.com/hashicorp/go-multierror v1.0.0 +## explicit github.com/hashicorp/go-multierror # github.com/hashicorp/golang-lru v0.5.3 github.com/hashicorp/golang-lru github.com/hashicorp/golang-lru/simplelru # github.com/jessevdk/go-flags v0.0.0-20180331124232-1c38ed7ad0cc +## explicit github.com/jessevdk/go-flags +# github.com/klauspost/compress v1.7.6 +## explicit +# github.com/klauspost/cpuid v1.2.1 +## explicit # github.com/kyokomi/emoji v2.1.0+incompatible +## explicit github.com/kyokomi/emoji +# github.com/mattn/go-colorable v0.1.2 +## explicit +# github.com/mattn/go-isatty v0.0.9 +## explicit # github.com/microcosm-cc/bluemonday v1.0.2 +## explicit github.com/microcosm-cc/bluemonday # github.com/nullrocks/identicon v0.0.0-20180626043057-7875f45b0022 github.com/nullrocks/identicon +# github.com/onsi/ginkgo v1.9.0 +## explicit +# github.com/onsi/gomega v1.6.0 +## explicit # github.com/patrickmn/go-cache v2.1.0+incompatible +## explicit github.com/patrickmn/go-cache # github.com/pkg/errors v0.8.1 +## explicit github.com/pkg/errors # github.com/pmezard/go-difflib v1.0.0 github.com/pmezard/go-difflib/difflib # github.com/rakyll/statik v0.1.6 +## explicit github.com/rakyll/statik/fs # github.com/rs/xid v1.2.1 +## explicit github.com/rs/xid # github.com/russross/blackfriday/v2 v2.0.1 +## explicit github.com/russross/blackfriday/v2 # github.com/shurcooL/sanitized_anchor_name v1.0.0 github.com/shurcooL/sanitized_anchor_name +# github.com/smartystreets/assertions v1.0.1 +## explicit # github.com/stretchr/objx v0.2.0 +## explicit github.com/stretchr/objx # github.com/stretchr/testify v1.4.0 +## explicit github.com/stretchr/testify/assert github.com/stretchr/testify/mock github.com/stretchr/testify/require +# github.com/tidwall/buntdb v1.1.0 +## explicit +# github.com/tidwall/gjson v1.3.2 +## explicit +# github.com/valyala/fasthttp v1.4.0 +## explicit # github.com/xdg/scram v0.0.0-20180814205039-7eeb5667e42c github.com/xdg/scram # github.com/xdg/stringprep v1.0.0 github.com/xdg/stringprep +# github.com/xeipuuv/gojsonpointer v0.0.0-20190809123943-df4f5c81cb3b +## explicit +# github.com/xeipuuv/gojsonschema v1.1.0 +## explicit # go.mongodb.org/mongo-driver v1.1.2 +## explicit go.mongodb.org/mongo-driver/bson go.mongodb.org/mongo-driver/bson/bsoncodec go.mongodb.org/mongo-driver/bson/bsonrw @@ -175,13 +242,16 @@ go.mongodb.org/mongo-driver/x/mongo/driver/topology go.mongodb.org/mongo-driver/x/mongo/driver/uuid go.mongodb.org/mongo-driver/x/mongo/driver/wiremessage # golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550 +## explicit golang.org/x/crypto/acme golang.org/x/crypto/acme/autocert golang.org/x/crypto/pbkdf2 # golang.org/x/image v0.0.0-20191009234506-e7c1f5e7dbb8 +## explicit golang.org/x/image/draw golang.org/x/image/math/f64 # golang.org/x/net v0.0.0-20191027093000-83d349e8ac1a +## explicit golang.org/x/net/context golang.org/x/net/context/ctxhttp golang.org/x/net/html @@ -197,8 +267,10 @@ golang.org/x/oauth2/jws golang.org/x/oauth2/jwt golang.org/x/oauth2/yandex # golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e +## explicit golang.org/x/sync/semaphore # golang.org/x/sys v0.0.0-20191026070338-33540a1f6037 +## explicit golang.org/x/sys/unix # golang.org/x/text v0.3.2 golang.org/x/text/secure/bidirule @@ -206,8 +278,10 @@ golang.org/x/text/transform golang.org/x/text/unicode/bidi golang.org/x/text/unicode/norm # golang.org/x/time v0.0.0-20191024005414-555d28b269f0 +## explicit golang.org/x/time/rate # google.golang.org/appengine v1.6.5 +## explicit google.golang.org/appengine google.golang.org/appengine/internal google.golang.org/appengine/internal/app_identity @@ -219,8 +293,10 @@ google.golang.org/appengine/internal/remote_api google.golang.org/appengine/internal/urlfetch google.golang.org/appengine/urlfetch # gopkg.in/oauth2.v3 v3.11.0 +## explicit gopkg.in/oauth2.v3 gopkg.in/oauth2.v3/errors gopkg.in/oauth2.v3/server # gopkg.in/yaml.v2 v2.2.4 +## explicit gopkg.in/yaml.v2