diff options
Diffstat (limited to 'vendor')
| -rw-r--r-- | vendor/github.com/mattermost/mattermost-server/v5/model/config.go | 29 | ||||
| -rw-r--r-- | vendor/github.com/mattermost/mattermost-server/v5/model/version.go | 3 | ||||
| -rw-r--r-- | vendor/modules.txt | 2 |
3 files changed, 25 insertions, 9 deletions
diff --git a/vendor/github.com/mattermost/mattermost-server/v5/model/config.go b/vendor/github.com/mattermost/mattermost-server/v5/model/config.go index 548a266e..52722161 100644 --- a/vendor/github.com/mattermost/mattermost-server/v5/model/config.go +++ b/vendor/github.com/mattermost/mattermost-server/v5/model/config.go @@ -3870,9 +3870,11 @@ func (o *Config) Sanitize() { *o.LdapSettings.BindPassword = FAKE_SETTING } - *o.FileSettings.PublicLinkSalt = FAKE_SETTING + if o.FileSettings.PublicLinkSalt != nil { + *o.FileSettings.PublicLinkSalt = FAKE_SETTING + } - if *o.FileSettings.AmazonS3SecretAccessKey != "" { + if o.FileSettings.AmazonS3SecretAccessKey != nil && *o.FileSettings.AmazonS3SecretAccessKey != "" { *o.FileSettings.AmazonS3SecretAccessKey = FAKE_SETTING } @@ -3880,7 +3882,7 @@ func (o *Config) Sanitize() { *o.EmailSettings.SMTPPassword = FAKE_SETTING } - if *o.GitLabSettings.Secret != "" { + if o.GitLabSettings.Secret != nil && *o.GitLabSettings.Secret != "" { *o.GitLabSettings.Secret = FAKE_SETTING } @@ -3896,10 +3898,17 @@ func (o *Config) Sanitize() { *o.OpenIdSettings.Secret = FAKE_SETTING } - *o.SqlSettings.DataSource = FAKE_SETTING - *o.SqlSettings.AtRestEncryptKey = FAKE_SETTING + if o.SqlSettings.DataSource != nil { + *o.SqlSettings.DataSource = FAKE_SETTING + } + + if o.SqlSettings.AtRestEncryptKey != nil { + *o.SqlSettings.AtRestEncryptKey = FAKE_SETTING + } - *o.ElasticsearchSettings.Password = FAKE_SETTING + if o.ElasticsearchSettings.Password != nil { + *o.ElasticsearchSettings.Password = FAKE_SETTING + } for i := range o.SqlSettings.DataSourceReplicas { o.SqlSettings.DataSourceReplicas[i] = FAKE_SETTING @@ -3909,7 +3918,9 @@ func (o *Config) Sanitize() { o.SqlSettings.DataSourceSearchReplicas[i] = FAKE_SETTING } - if o.MessageExportSettings.GlobalRelaySettings.SmtpPassword != nil && *o.MessageExportSettings.GlobalRelaySettings.SmtpPassword != "" { + if o.MessageExportSettings.GlobalRelaySettings != nil && + o.MessageExportSettings.GlobalRelaySettings.SmtpPassword != nil && + *o.MessageExportSettings.GlobalRelaySettings.SmtpPassword != "" { *o.MessageExportSettings.GlobalRelaySettings.SmtpPassword = FAKE_SETTING } @@ -3917,7 +3928,9 @@ func (o *Config) Sanitize() { *o.ServiceSettings.GfycatApiSecret = FAKE_SETTING } - *o.ServiceSettings.SplitKey = FAKE_SETTING + if o.ServiceSettings.SplitKey != nil { + *o.ServiceSettings.SplitKey = FAKE_SETTING + } } // structToMapFilteredByTag converts a struct into a map removing those fields that has the tag passed diff --git a/vendor/github.com/mattermost/mattermost-server/v5/model/version.go b/vendor/github.com/mattermost/mattermost-server/v5/model/version.go index 36acddf2..28904965 100644 --- a/vendor/github.com/mattermost/mattermost-server/v5/model/version.go +++ b/vendor/github.com/mattermost/mattermost-server/v5/model/version.go @@ -13,6 +13,9 @@ import ( // It should be maintained in chronological order with most current // release at the front of the list. var versions = []string{ + "5.39.3", + "5.39.2", + "5.39.1", "5.39.0", "5.38.2", "5.38.1", diff --git a/vendor/modules.txt b/vendor/modules.txt index 3be7583c..873ab3ea 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -220,7 +220,7 @@ github.com/mattermost/logr/v2 github.com/mattermost/logr/v2/config github.com/mattermost/logr/v2/formatters github.com/mattermost/logr/v2/targets -# github.com/mattermost/mattermost-server/v5 v5.39.0 +# github.com/mattermost/mattermost-server/v5 v5.39.3 ## explicit; go 1.15 github.com/mattermost/mattermost-server/v5/model github.com/mattermost/mattermost-server/v5/services/timezones |