From 7b286c105840648b8207a01f80734ac94e274299 Mon Sep 17 00:00:00 2001 From: Kichiyaki Date: Sun, 22 Aug 2021 16:30:45 +0200 Subject: [PATCH] bump go version --- go.mod | 44 ++++++++++++++++++++++++++++++++++++++++---- go.sum | 11 +++++++++-- main.go | 6 +++--- 3 files changed, 52 insertions(+), 9 deletions(-) diff --git a/go.mod b/go.mod index 26d233f..c843213 100644 --- a/go.mod +++ b/go.mod @@ -1,13 +1,13 @@ module github.com/tribalwarshelp/api -go 1.16 +go 1.17 require ( github.com/99designs/gqlgen v0.13.0 github.com/Kichiyaki/appmode v1.0.0 github.com/Kichiyaki/gin-logrus v0.0.0-20210428175948-4f47ab6231a6 - github.com/Kichiyaki/go-pg-logrus-query-logger/v10 v10.0.0-20210428180109-fb97298564d9 - github.com/Kichiyaki/gopgutil/v10 v10.0.0-20210521204542-cc672e361b3d + github.com/Kichiyaki/go-pg-logrus-query-logger/v10 v10.0.0-20210822140425-1724064d6e5c + github.com/Kichiyaki/gopgutil/v10 v10.0.0-20210822140115-69ad4084d89f github.com/Kichiyaki/goutil v0.1.0 github.com/agnivade/levenshtein v1.1.0 // indirect github.com/gin-contrib/cors v1.3.1 @@ -20,8 +20,44 @@ require ( github.com/pkg/errors v0.9.1 github.com/sirupsen/logrus v1.8.1 github.com/tribalwarshelp/map-generator v0.0.0-20210723120929-87acb40a7a24 - github.com/tribalwarshelp/shared v0.0.0-20210723104616-9fe0aafafeb6 + github.com/tribalwarshelp/shared v0.0.0-20210822141120-6c7e460daed8 github.com/vektah/gqlparser/v2 v2.1.0 golang.org/x/sync v0.0.0-20210220032951-036812b2e83c golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 // indirect ) + +require ( + github.com/Kichiyaki/ginlogrus v0.1.0 // indirect + github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d // indirect + github.com/disintegration/imaging v1.6.2 // indirect + github.com/gin-contrib/sse v0.1.0 // indirect + github.com/go-pg/zerochecker v0.2.0 // indirect + github.com/go-playground/locales v0.13.0 // indirect + github.com/go-playground/universal-translator v0.17.0 // indirect + github.com/go-playground/validator/v10 v10.5.0 // indirect + github.com/golang/protobuf v1.5.2 // indirect + github.com/gorilla/websocket v1.4.2 // indirect + github.com/jinzhu/inflection v1.0.0 // indirect + github.com/json-iterator/go v1.1.10 // indirect + github.com/leodido/go-urn v1.2.1 // indirect + github.com/mattn/go-isatty v0.0.12 // indirect + github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect + github.com/modern-go/reflect2 v1.0.1 // indirect + github.com/russross/blackfriday/v2 v2.0.1 // indirect + github.com/shurcooL/sanitized_anchor_name v1.0.0 // indirect + github.com/tmthrgd/go-hex v0.0.0-20190904060850-447a3041c3bc // indirect + github.com/ugorji/go/codec v1.2.5 // indirect + github.com/urfave/cli/v2 v2.1.1 // indirect + github.com/vmihailenco/bufpool v0.1.11 // indirect + github.com/vmihailenco/msgpack/v5 v5.3.4 // indirect + github.com/vmihailenco/tagparser v0.1.2 // indirect + github.com/vmihailenco/tagparser/v2 v2.0.0 // indirect + golang.org/x/crypto v0.0.0-20210421170649-83a5a9bb288b // indirect + golang.org/x/image v0.0.0-20210628002857-a66eb6448b8d // indirect + golang.org/x/sys v0.0.0-20210423185535-09eb48e85fd7 // indirect + golang.org/x/text v0.3.6 // indirect + golang.org/x/tools v0.0.0-20200114235610-7ae403b6b589 // indirect + google.golang.org/protobuf v1.26.0 // indirect + gopkg.in/yaml.v2 v2.4.0 // indirect + mellium.im/sasl v0.2.1 // indirect +) diff --git a/go.sum b/go.sum index 0ad97df..bf8f181 100644 --- a/go.sum +++ b/go.sum @@ -6,15 +6,18 @@ github.com/Kichiyaki/appmode v1.0.0 h1:Kgk+pi45/wqIcrWmnloACUsm8HbOGd6UumSRCsm48 github.com/Kichiyaki/appmode v1.0.0/go.mod h1:FDT0lWIX9MBiyiUt4b/xo6BQQyV7aebsi+x5fcljMjk= github.com/Kichiyaki/gin-logrus v0.0.0-20210428175948-4f47ab6231a6 h1:abarqFzXWxx4VElTTVWJch1u01Kf6T/zLip+Uv2yUf4= github.com/Kichiyaki/gin-logrus v0.0.0-20210428175948-4f47ab6231a6/go.mod h1:6ieK3YHhyNxjkbBUR3B1IsfXi+A+LeS0SEPV10iH/cg= +github.com/Kichiyaki/ginlogrus v0.1.0 h1:4guX3EAwVycU7x3U1mRPcta5ifIh4sZo7D9T13W8l3U= +github.com/Kichiyaki/ginlogrus v0.1.0/go.mod h1:5TPtmzKNj7anHQfaj2suLNF8/XBfwHDPRm58oMMJE3k= github.com/Kichiyaki/go-pg-logrus-query-logger/v10 v10.0.0-20210428180109-fb97298564d9 h1:S/08K0AD4bXYeSPJKei8ZbumDy1JNARZsgYbNZgr9Tk= github.com/Kichiyaki/go-pg-logrus-query-logger/v10 v10.0.0-20210428180109-fb97298564d9/go.mod h1:ADHVWnGlWcRn1aGthuh7I1Lrn6zzsjkVJju151dXyDw= +github.com/Kichiyaki/go-pg-logrus-query-logger/v10 v10.0.0-20210822140425-1724064d6e5c h1:ZpL24SEaHeCdqT3V5AZCClN/POvi9iefV2f0izD4sqI= +github.com/Kichiyaki/go-pg-logrus-query-logger/v10 v10.0.0-20210822140425-1724064d6e5c/go.mod h1:7oE1ZOK5nqdkItxsLX7F5Bh0voNHniJScxwwFYZWSSA= github.com/Kichiyaki/go-php-serialize v0.0.0-20200601110855-47b6982acf83/go.mod h1:+iGkf5HfOVeRVd9K7qQDucIl+/Kt3MyenMa90b/O/c4= github.com/Kichiyaki/gopgutil/v10 v10.0.0-20210521204542-cc672e361b3d h1:7ZJVfFgAR0zNf5fNc6M9v2PZbXvTgGgDjQo4/+NIezQ= github.com/Kichiyaki/gopgutil/v10 v10.0.0-20210521204542-cc672e361b3d/go.mod h1:MSAEhr8oeK+Rhjhqyl31/8/AI88thYky80OyD8mheDA= +github.com/Kichiyaki/gopgutil/v10 v10.0.0-20210822140115-69ad4084d89f/go.mod h1:l0230tV4NHOKrz9unST9LC9ymduCZN1kRonIhGPZYJg= github.com/Kichiyaki/goutil v0.0.0-20210502095630-318d17091eab/go.mod h1:+HhI932Xb0xrCodNcCv5GPiCjLYhDxWhCtlEqMIJhB4= github.com/Kichiyaki/goutil v0.0.0-20210504132659-3d843a787db7/go.mod h1:+HhI932Xb0xrCodNcCv5GPiCjLYhDxWhCtlEqMIJhB4= -github.com/Kichiyaki/goutil v0.0.0-20210727060523-b40a549d5a72 h1:KVFjB2eyaiLm/fWQPvHrHSoWB2PNAnGROnqLnLAhpoU= -github.com/Kichiyaki/goutil v0.0.0-20210727060523-b40a549d5a72/go.mod h1:+HhI932Xb0xrCodNcCv5GPiCjLYhDxWhCtlEqMIJhB4= github.com/Kichiyaki/goutil v0.1.0 h1:FxcESWhmwOuhwK2H14oDzo6kZ+J8TDOjdIulgzP/rXs= github.com/Kichiyaki/goutil v0.1.0/go.mod h1:c1d+I8M8Hjdb9Brn3S5cYfMQk9Nf/9mYumATyVCF3io= github.com/agnivade/levenshtein v1.0.1/go.mod h1:CURSv5d9Uaml+FovSIICkLbAUZ9S4RqaHDIsdSBg7lM= @@ -178,6 +181,8 @@ github.com/tribalwarshelp/map-generator v0.0.0-20210723120929-87acb40a7a24 h1:+H github.com/tribalwarshelp/map-generator v0.0.0-20210723120929-87acb40a7a24/go.mod h1:IIyndPxBlvL/rrCtYK0p8+PLgEw0Im7G8r9j03HVIj4= github.com/tribalwarshelp/shared v0.0.0-20210723104616-9fe0aafafeb6 h1:QkMH4eQXHs8Q4fT1hXgEAun4F679c4rErBWvhD0pGTM= github.com/tribalwarshelp/shared v0.0.0-20210723104616-9fe0aafafeb6/go.mod h1:J3UEkw7lgTWFxOIp+fqCImeQBOyyXMFAfXYSHhEILys= +github.com/tribalwarshelp/shared v0.0.0-20210822141120-6c7e460daed8 h1:D/aJEuikcllnWnBPb9745412Kv5ihrisVHaHkU+dVTI= +github.com/tribalwarshelp/shared v0.0.0-20210822141120-6c7e460daed8/go.mod h1:ka8BzXm+IPv/ZemsMu/YmcwlqIDNgV3y3e4MfmIem0U= github.com/ugorji/go v1.1.7/go.mod h1:kZn38zHttfInRq0xu/PH0az30d+z6vm202qpg1oXVMw= github.com/ugorji/go v1.2.5 h1:NozRHfUeEta89taVkyfsDVSy2f7v89Frft4pjnWuGuc= github.com/ugorji/go v1.2.5/go.mod h1:gat2tIT8KJG8TVI8yv77nEO/KYT6dV7JE1gfUa8Xuls= @@ -194,6 +199,8 @@ github.com/vmihailenco/bufpool v0.1.11/go.mod h1:AFf/MOy3l2CFTKbxwt0mp2MwnqjNEs5 github.com/vmihailenco/msgpack/v5 v5.3.0/go.mod h1:7xyJ9e+0+9SaZT0Wt1RGleJXzli6Q/V5KbhBonMG9jc= github.com/vmihailenco/msgpack/v5 v5.3.1 h1:0i85a4dsZh8mC//wmyyTEzidDLPQfQAxZIOLtafGbFY= github.com/vmihailenco/msgpack/v5 v5.3.1/go.mod h1:7xyJ9e+0+9SaZT0Wt1RGleJXzli6Q/V5KbhBonMG9jc= +github.com/vmihailenco/msgpack/v5 v5.3.4 h1:qMKAwOV+meBw2Y8k9cVwAy7qErtYCwBzZ2ellBfvnqc= +github.com/vmihailenco/msgpack/v5 v5.3.4/go.mod h1:7xyJ9e+0+9SaZT0Wt1RGleJXzli6Q/V5KbhBonMG9jc= github.com/vmihailenco/tagparser v0.1.2 h1:gnjoVuB/kljJ5wICEEOpx98oXMWPLj22G67Vbd1qPqc= github.com/vmihailenco/tagparser v0.1.2/go.mod h1:OeAg3pn3UbLjkWt+rN9oFYB6u/cQgqMEUPoW2WPyhdI= github.com/vmihailenco/tagparser/v2 v2.0.0 h1:y09buUbR+b5aycVFQs/g70pqKVZNBmxwAhO7/IwNM9g= diff --git a/main.go b/main.go index da087cb..6d622d5 100644 --- a/main.go +++ b/main.go @@ -50,8 +50,8 @@ import ( "github.com/go-pg/pg/v10" "github.com/joho/godotenv" - ginlogrus "github.com/Kichiyaki/gin-logrus" - gopglogrusquerylogger "github.com/Kichiyaki/go-pg-logrus-query-logger/v10" + "github.com/Kichiyaki/ginlogrus" + "github.com/Kichiyaki/go-pg-logrus-query-logger/v10" "github.com/gin-gonic/gin" ) @@ -79,7 +79,7 @@ func main() { } }() if strings.ToUpper(os.Getenv("LOG_DB_QUERIES")) == "TRUE" { - db.AddQueryHook(gopglogrusquerylogger.QueryLogger{ + db.AddQueryHook(querylogger.Logger{ Log: logrus.NewEntry(logrus.StandardLogger()), MaxQueryLength: 5000, })