From 835dd2635af46e3c8604fae8c9d383a80535c29e Mon Sep 17 00:00:00 2001 From: Wim Date: Sat, 30 Oct 2021 15:17:50 +0200 Subject: [PATCH] Update dependencies (#1628) --- go.mod | 10 ++-- go.sum | 18 +++--- vendor/github.com/google/gops/agent/agent.go | 2 +- .../{sockopt_unix.go => sockopt_reuseport.go} | 8 +-- .../google/gops/agent/sockopt_unsupported.go | 6 +- .../mattermost/go-i18n/i18n/bundle/bundle.go | 7 ++- .../mattermost-server/v6/model/auditconv.go | 59 +++++++++++++++++++ .../mattermost-server/v6/model/version.go | 2 + vendor/modules.txt | 10 ++-- 9 files changed, 93 insertions(+), 29 deletions(-) rename vendor/github.com/google/gops/agent/{sockopt_unix.go => sockopt_reuseport.go} (78%) diff --git a/go.mod b/go.mod index 43d84e37..6b3112e1 100644 --- a/go.mod +++ b/go.mod @@ -12,7 +12,7 @@ require ( github.com/fsnotify/fsnotify v1.5.1 github.com/go-telegram-bot-api/telegram-bot-api v1.0.1-0.20200524105306-7434b0456e81 github.com/gomarkdown/markdown v0.0.0-20210918233619-6c1113f12c4a - github.com/google/gops v0.3.21 + github.com/google/gops v0.3.22 github.com/gorilla/schema v1.2.0 github.com/gorilla/websocket v1.4.2 github.com/hashicorp/golang-lru v0.5.4 @@ -29,7 +29,7 @@ require ( github.com/matterbridge/logrus-prefixed-formatter v0.5.3-0.20200523233437-d971309a77ba github.com/matterbridge/matterclient v0.0.0-20211024214211-22e762684b4a github.com/mattermost/mattermost-server/v5 v5.39.0 - github.com/mattermost/mattermost-server/v6 v6.0.0 + github.com/mattermost/mattermost-server/v6 v6.0.2 github.com/mattn/godown v0.0.1 github.com/missdeer/golib v1.0.4 github.com/nelsonken/gomf v0.0.0-20180504123937-a9dd2f9deae9 @@ -46,8 +46,8 @@ require ( github.com/writeas/go-strip-markdown v2.0.1+incompatible github.com/yaegashi/msgraph.go v0.1.4 github.com/zfjagann/golang-ring v0.0.0-20210116075443-7c86fdb43134 - golang.org/x/image v0.0.0-20210628002857-a66eb6448b8d - golang.org/x/oauth2 v0.0.0-20211005180243-6b3c2da341f1 + golang.org/x/image v0.0.0-20211028202545-6944b10bf410 + golang.org/x/oauth2 v0.0.0-20211028175245-ba495a64dcb5 gomod.garykim.dev/nc-talk v0.3.0 gopkg.in/olahol/melody.v1 v1.0.0-20170518105555-d52139073376 layeh.com/gumble v0.0.0-20200818122324-146f9205029b @@ -75,7 +75,7 @@ require ( github.com/klauspost/cpuid/v2 v2.0.6 // indirect github.com/labstack/gommon v0.3.0 // indirect github.com/magiconair/properties v1.8.5 // indirect - github.com/mattermost/go-i18n v1.11.0 // indirect + github.com/mattermost/go-i18n v1.11.1-0.20211013152124-5c415071e404 // indirect github.com/mattermost/ldap v0.0.0-20201202150706-ee0e6284187d // indirect github.com/mattermost/logr v1.0.13 // indirect github.com/mattermost/logr/v2 v2.0.10 // indirect diff --git a/go.sum b/go.sum index bf995f77..a2a08848 100644 --- a/go.sum +++ b/go.sum @@ -400,8 +400,8 @@ github.com/google/go-cmp v0.5.6/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/ github.com/google/go-github v17.0.0+incompatible/go.mod h1:zLgOLi98H3fifZn+44m+umXrS52loVEgC2AApnigrVQ= github.com/google/go-querystring v1.0.0/go.mod h1:odCYkC5MyYFN7vkCjXpyrEuKhc/BUO6wN/zVPAxq5ck= github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= -github.com/google/gops v0.3.21 h1:SmULDdFdSLaPZHR3FgPJfNFfrrohoHUgC9DenFuGrUE= -github.com/google/gops v0.3.21/go.mod h1:7diIdLsqpCihPSX3fQagksT/Ku/y4RL9LHTlKyEUDl8= +github.com/google/gops v0.3.22 h1:lyvhDxfPLHAOR2xIYwjPhN387qHxyU21Sk9sz/GhmhQ= +github.com/google/gops v0.3.22/go.mod h1:7diIdLsqpCihPSX3fQagksT/Ku/y4RL9LHTlKyEUDl8= github.com/google/martian v2.1.0+incompatible/go.mod h1:9I4somxYTbIHy5NJKHRl3wXiIaQGbYVAs8BPL6v8lEs= github.com/google/martian/v3 v3.0.0/go.mod h1:y5Zk1BBys9G+gd6Jrk0W3cC1+ELVxBWuIGO+w/tUAp0= github.com/google/martian/v3 v3.1.0/go.mod h1:y5Zk1BBys9G+gd6Jrk0W3cC1+ELVxBWuIGO+w/tUAp0= @@ -667,8 +667,9 @@ github.com/matterbridge/logrus-prefixed-formatter v0.5.3-0.20200523233437-d97130 github.com/matterbridge/logrus-prefixed-formatter v0.5.3-0.20200523233437-d971309a77ba/go.mod h1:iXGEotOvwI1R1SjLxRc+BF5rUORTMtE0iMZBT2lxqAU= github.com/matterbridge/matterclient v0.0.0-20211024214211-22e762684b4a h1:j5/5gEHtACfrG/Exygfjqj0ip/zRgsa8KaAyuvO2c5Y= github.com/matterbridge/matterclient v0.0.0-20211024214211-22e762684b4a/go.mod h1:Gh3tFUjkcPIBBeEkfXBbGio4ONMMKNmlmGECvXLY0TE= -github.com/mattermost/go-i18n v1.11.0 h1:1hLKqn/ZvhZ80OekjVPGYcCrBfMz+YxNNgqS+beL7zE= github.com/mattermost/go-i18n v1.11.0/go.mod h1:RyS7FDNQlzF1PsjbJWHRI35exqaKGSO9qD4iv8QjE34= +github.com/mattermost/go-i18n v1.11.1-0.20211013152124-5c415071e404 h1:Khvh6waxG1cHc4Cz5ef9n3XVCxRWpAKUtqg9PJl5+y8= +github.com/mattermost/go-i18n v1.11.1-0.20211013152124-5c415071e404/go.mod h1:RyS7FDNQlzF1PsjbJWHRI35exqaKGSO9qD4iv8QjE34= github.com/mattermost/gorp v1.6.2-0.20210419141818-0904a6a388d3/go.mod h1:QCQ3U0M9T/BlAdjKFJo0I1oe/YAgbyjNdhU8bpOLafk= github.com/mattermost/gorp v1.6.2-0.20210714143452-8b50f5209a7f/go.mod h1:QCQ3U0M9T/BlAdjKFJo0I1oe/YAgbyjNdhU8bpOLafk= github.com/mattermost/gosaml2 v0.3.3/go.mod h1:Z429EIOiEi9kbq6yHoApfzlcXpa6dzRDc6pO+Vy2Ksk= @@ -681,8 +682,9 @@ github.com/mattermost/logr/v2 v2.0.10 h1:i6rJbuX/EkBM9maM8M0eJ3rxB+fsBKNslPvzSlA github.com/mattermost/logr/v2 v2.0.10/go.mod h1:mpPp935r5dIkFDo2y9Q87cQWhFR/4xXpNh0k/y8Hmwg= github.com/mattermost/mattermost-server/v5 v5.39.0 h1:Y67Z7HIP8DGmztXfZvfqS2ChD3klulQLlntFq41D33Y= github.com/mattermost/mattermost-server/v5 v5.39.0/go.mod h1:MDmVSmsSsqwNkuZ7rQ0osuXVCzrR1IUqGR7I0QU91sY= -github.com/mattermost/mattermost-server/v6 v6.0.0 h1:iSe5XGow5sKUBe9eKXRLoPoLJaiMYXzQ/uNED4lXLIA= github.com/mattermost/mattermost-server/v6 v6.0.0/go.mod h1:+S8CsNEPv1FOl1usaPBQ6Gu9+Sm1Cc9YdU/Qh1YMGVI= +github.com/mattermost/mattermost-server/v6 v6.0.2 h1:LSwaWjPFlundI+b+r51Qv1zOkqEwvRR6M/Trr/D/Tb8= +github.com/mattermost/mattermost-server/v6 v6.0.2/go.mod h1:I7hgNyInWiVaIcGjYMDoJufO1E4SbK3Zj+3OEIk417g= github.com/mattermost/rsc v0.0.0-20160330161541-bbaefb05eaa0/go.mod h1:nV5bfVpT//+B1RPD2JvRnxbkLmJEYXmRaaVl15fsXjs= github.com/mattn/go-colorable v0.0.9/go.mod h1:9vuHe8Xs5qXnSaW/c/ABM9alt+Vo+STaOChaDxuIBZU= github.com/mattn/go-colorable v0.1.1/go.mod h1:FuOcm+DKB9mbwrcAfNl7/TZVBZ6rcnceauSikq3lYCQ= @@ -1204,8 +1206,8 @@ golang.org/x/image v0.0.0-20190321063152-3fc05d484e9f/go.mod h1:kZ7UVZpmo3dzQBMx golang.org/x/image v0.0.0-20190802002840-cff245a6509b/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0= golang.org/x/image v0.0.0-20191009234506-e7c1f5e7dbb8/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0= golang.org/x/image v0.0.0-20210622092929-e6eecd499c2c/go.mod h1:023OzeP/+EPmXeapQh35lcL3II3LrY8Ic+EFFKVhULM= -golang.org/x/image v0.0.0-20210628002857-a66eb6448b8d h1:RNPAfi2nHY7C2srAV8A49jpsYr0ADedCk1wq6fTMTvs= -golang.org/x/image v0.0.0-20210628002857-a66eb6448b8d/go.mod h1:023OzeP/+EPmXeapQh35lcL3II3LrY8Ic+EFFKVhULM= +golang.org/x/image v0.0.0-20211028202545-6944b10bf410 h1:hTftEOvwiOq2+O8k2D5/Q7COC7k5Qcrgc2TFURJYnvQ= +golang.org/x/image v0.0.0-20211028202545-6944b10bf410/go.mod h1:023OzeP/+EPmXeapQh35lcL3II3LrY8Ic+EFFKVhULM= golang.org/x/lint v0.0.0-20180702182130-06c8688daad7/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= golang.org/x/lint v0.0.0-20181217174547-8f45f776aaf1/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= @@ -1315,8 +1317,8 @@ golang.org/x/oauth2 v0.0.0-20210514164344-f6687ab2804c/go.mod h1:KelEdhl1UZF7XfJ golang.org/x/oauth2 v0.0.0-20210628180205-a41e5a781914/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= golang.org/x/oauth2 v0.0.0-20210805134026-6f1e6394065a/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= golang.org/x/oauth2 v0.0.0-20210819190943-2bc19b11175f/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= -golang.org/x/oauth2 v0.0.0-20211005180243-6b3c2da341f1 h1:B333XXssMuKQeBwiNODx4TupZy7bf4sxFZnN2ZOcvUE= -golang.org/x/oauth2 v0.0.0-20211005180243-6b3c2da341f1/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= +golang.org/x/oauth2 v0.0.0-20211028175245-ba495a64dcb5 h1:v79phzBz03tsVCUTbvTBmmC3CUXF5mKYt7DA4ZVldpM= +golang.org/x/oauth2 v0.0.0-20211028175245-ba495a64dcb5/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= golang.org/x/perf v0.0.0-20180704124530-6e6d33e29852/go.mod h1:JLpeXjPJfIyPr5TlbXLkXWLhP8nz10XfvxElABhCtcw= golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= diff --git a/vendor/github.com/google/gops/agent/agent.go b/vendor/github.com/google/gops/agent/agent.go index 5fde1fd1..2af03e5a 100644 --- a/vendor/github.com/google/gops/agent/agent.go +++ b/vendor/github.com/google/gops/agent/agent.go @@ -107,7 +107,7 @@ func Listen(opts Options) error { } var lc net.ListenConfig if opts.ReuseSocketAddrAndPort { - lc.Control = setsockoptReuseAddrAndPort + lc.Control = setReuseAddrAndPortSockopts } listener, err = lc.Listen(context.Background(), "tcp", addr) if err != nil { diff --git a/vendor/github.com/google/gops/agent/sockopt_unix.go b/vendor/github.com/google/gops/agent/sockopt_reuseport.go similarity index 78% rename from vendor/github.com/google/gops/agent/sockopt_unix.go rename to vendor/github.com/google/gops/agent/sockopt_reuseport.go index 8c472c64..8311fe39 100644 --- a/vendor/github.com/google/gops/agent/sockopt_unix.go +++ b/vendor/github.com/google/gops/agent/sockopt_reuseport.go @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style // license that can be found in the LICENSE file. -//go:build !js && !plan9 && !windows -// +build !js,!plan9,!windows +//go:build !js && !plan9 && !solaris && !windows +// +build !js,!plan9,!solaris,!windows package agent @@ -13,10 +13,10 @@ import ( "golang.org/x/sys/unix" ) -// setsockoptReuseAddrAndPort sets the SO_REUSEADDR and SO_REUSEPORT socket +// setReuseAddrAndPortSockopts sets the SO_REUSEADDR and SO_REUSEPORT socket // options on c's underlying socket in order to increase the chance to re-bind() // to the same address and port upon agent restart. -func setsockoptReuseAddrAndPort(network, address string, c syscall.RawConn) error { +func setReuseAddrAndPortSockopts(network, address string, c syscall.RawConn) error { var soerr error if err := c.Control(func(su uintptr) { sock := int(su) diff --git a/vendor/github.com/google/gops/agent/sockopt_unsupported.go b/vendor/github.com/google/gops/agent/sockopt_unsupported.go index ca079c69..2493e8ca 100644 --- a/vendor/github.com/google/gops/agent/sockopt_unsupported.go +++ b/vendor/github.com/google/gops/agent/sockopt_unsupported.go @@ -2,13 +2,13 @@ // Use of this source code is governed by a BSD-style // license that can be found in the LICENSE file. -//go:build (js && wasm) || plan9 || windows -// +build js,wasm plan9 windows +//go:build (js && wasm) || plan9 || solaris || windows +// +build js,wasm plan9 solaris windows package agent import "syscall" -func setsockoptReuseAddrAndPort(network, address string, c syscall.RawConn) error { +func setReuseAddrAndPortSockopts(network, address string, c syscall.RawConn) error { return nil } diff --git a/vendor/github.com/mattermost/go-i18n/i18n/bundle/bundle.go b/vendor/github.com/mattermost/go-i18n/i18n/bundle/bundle.go index c80512d7..9c572c07 100644 --- a/vendor/github.com/mattermost/go-i18n/i18n/bundle/bundle.go +++ b/vendor/github.com/mattermost/go-i18n/i18n/bundle/bundle.go @@ -386,12 +386,13 @@ func (b *Bundle) translate(lang *language.Language, translationID string, args . countInt, ok := count.(int) if ok && countInt > 1 { template = translation.Template(language.Other) - if template == nil { - return translationID - } } } + if template == nil { + return translationID + } + s := template.Execute(data) if s == "" { return translationID diff --git a/vendor/github.com/mattermost/mattermost-server/v6/model/auditconv.go b/vendor/github.com/mattermost/mattermost-server/v6/model/auditconv.go index 38b4381e..8de21124 100644 --- a/vendor/github.com/mattermost/mattermost-server/v6/model/auditconv.go +++ b/vendor/github.com/mattermost/mattermost-server/v6/model/auditconv.go @@ -15,44 +15,88 @@ func AuditModelTypeConv(val interface{}) (newVal interface{}, converted bool) { switch v := val.(type) { case *Channel: return newAuditChannel(v), true + case Channel: + return newAuditChannel(&v), true case *Team: return newAuditTeam(v), true + case Team: + return newAuditTeam(&v), true case *User: return newAuditUser(v), true + case User: + return newAuditUser(&v), true + case *UserPatch: + return newAuditUserPatch(v), true + case UserPatch: + return newAuditUserPatch(&v), true case *Command: return newAuditCommand(v), true + case Command: + return newAuditCommand(&v), true case *CommandArgs: return newAuditCommandArgs(v), true + case CommandArgs: + return newAuditCommandArgs(&v), true case *Bot: return newAuditBot(v), true + case Bot: + return newAuditBot(&v), true case *ChannelModerationPatch: return newAuditChannelModerationPatch(v), true + case ChannelModerationPatch: + return newAuditChannelModerationPatch(&v), true case *Emoji: return newAuditEmoji(v), true + case Emoji: + return newAuditEmoji(&v), true case *FileInfo: return newAuditFileInfo(v), true + case FileInfo: + return newAuditFileInfo(&v), true case *Group: return newAuditGroup(v), true + case Group: + return newAuditGroup(&v), true case *Job: return newAuditJob(v), true + case Job: + return newAuditJob(&v), true case *OAuthApp: return newAuditOAuthApp(v), true + case OAuthApp: + return newAuditOAuthApp(&v), true case *Post: return newAuditPost(v), true + case Post: + return newAuditPost(&v), true case *Role: return newAuditRole(v), true + case Role: + return newAuditRole(&v), true case *Scheme: return newAuditScheme(v), true + case Scheme: + return newAuditScheme(&v), true case *SchemeRoles: return newAuditSchemeRoles(v), true + case SchemeRoles: + return newAuditSchemeRoles(&v), true case *Session: return newAuditSession(v), true + case Session: + return newAuditSession(&v), true case *IncomingWebhook: return newAuditIncomingWebhook(v), true + case IncomingWebhook: + return newAuditIncomingWebhook(&v), true case *OutgoingWebhook: return newAuditOutgoingWebhook(v), true + case OutgoingWebhook: + return newAuditOutgoingWebhook(&v), true case *RemoteCluster: return newRemoteCluster(v), true + case RemoteCluster: + return newRemoteCluster(&v), true } return val, false } @@ -128,6 +172,21 @@ func newAuditUser(u *User) auditUser { return user } +type auditUserPatch struct { + Name string +} + +// newAuditUserPatch creates a simplified representation of UserPatch for output to audit log. +func newAuditUserPatch(up *UserPatch) auditUserPatch { + var userPatch auditUserPatch + if up != nil { + if up.Username != nil { + userPatch.Name = *up.Username + } + } + return userPatch +} + func (u auditUser) MarshalJSONObject(enc *gojay.Encoder) { enc.StringKey("id", u.ID) enc.StringKey("name", u.Name) diff --git a/vendor/github.com/mattermost/mattermost-server/v6/model/version.go b/vendor/github.com/mattermost/mattermost-server/v6/model/version.go index b75a4e9c..13170dc5 100644 --- a/vendor/github.com/mattermost/mattermost-server/v6/model/version.go +++ b/vendor/github.com/mattermost/mattermost-server/v6/model/version.go @@ -13,6 +13,8 @@ import ( // It should be maintained in chronological order with most current // release at the front of the list. var versions = []string{ + "6.0.2", + "6.0.1", "6.0.0", "5.39.0", "5.38.0", diff --git a/vendor/modules.txt b/vendor/modules.txt index d588ed36..27feaead 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -92,7 +92,7 @@ github.com/gomarkdown/markdown github.com/gomarkdown/markdown/ast github.com/gomarkdown/markdown/html github.com/gomarkdown/markdown/parser -# github.com/google/gops v0.3.21 +# github.com/google/gops v0.3.22 ## explicit; go 1.12 github.com/google/gops/agent github.com/google/gops/internal @@ -192,7 +192,7 @@ github.com/matterbridge/logrus-prefixed-formatter # github.com/matterbridge/matterclient v0.0.0-20211024214211-22e762684b4a ## explicit; go 1.16 github.com/matterbridge/matterclient -# github.com/mattermost/go-i18n v1.11.0 +# github.com/mattermost/go-i18n v1.11.1-0.20211013152124-5c415071e404 ## explicit github.com/mattermost/go-i18n/i18n github.com/mattermost/go-i18n/i18n/bundle @@ -221,7 +221,7 @@ github.com/mattermost/mattermost-server/v5/shared/i18n github.com/mattermost/mattermost-server/v5/shared/markdown github.com/mattermost/mattermost-server/v5/shared/mlog github.com/mattermost/mattermost-server/v5/utils/jsonutils -# github.com/mattermost/mattermost-server/v6 v6.0.0 +# github.com/mattermost/mattermost-server/v6 v6.0.2 ## explicit; go 1.15 github.com/mattermost/mattermost-server/v6/model github.com/mattermost/mattermost-server/v6/services/timezones @@ -458,7 +458,7 @@ golang.org/x/crypto/scrypt golang.org/x/crypto/ssh golang.org/x/crypto/ssh/internal/bcrypt_pbkdf golang.org/x/crypto/ssh/terminal -# golang.org/x/image v0.0.0-20210628002857-a66eb6448b8d +# golang.org/x/image v0.0.0-20211028202545-6944b10bf410 ## explicit; go 1.12 golang.org/x/image/riff golang.org/x/image/vp8 @@ -477,7 +477,7 @@ golang.org/x/net/http2/hpack golang.org/x/net/idna golang.org/x/net/publicsuffix golang.org/x/net/websocket -# golang.org/x/oauth2 v0.0.0-20211005180243-6b3c2da341f1 +# golang.org/x/oauth2 v0.0.0-20211028175245-ba495a64dcb5 ## explicit; go 1.11 golang.org/x/oauth2 golang.org/x/oauth2/clientcredentials