diff options
Diffstat (limited to 'vendor/github.com')
| -rw-r--r-- | vendor/github.com/google/gops/agent/agent.go | 2 | ||||
| -rw-r--r-- | vendor/github.com/google/gops/agent/sockopt_reuseport.go (renamed from vendor/github.com/google/gops/agent/sockopt_unix.go) | 8 | ||||
| -rw-r--r-- | vendor/github.com/google/gops/agent/sockopt_unsupported.go | 6 | ||||
| -rw-r--r-- | vendor/github.com/mattermost/go-i18n/i18n/bundle/bundle.go | 7 | ||||
| -rw-r--r-- | vendor/github.com/mattermost/mattermost-server/v6/model/auditconv.go | 59 | ||||
| -rw-r--r-- | vendor/github.com/mattermost/mattermost-server/v6/model/version.go | 2 |
6 files changed, 73 insertions, 11 deletions
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 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", |