From fecca575078a21dedb0cab213dde7fd97161c0fa Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 18 Jan 2022 20:19:12 +0100
Subject: Bump github.com/mattermost/mattermost-server/v5 from 5.39.0 to 5.39.3
 (#1682)

Bumps [github.com/mattermost/mattermost-server/v5](https://github.com/mattermost/mattermost-server) from 5.39.0 to 5.39.3.
- [Release notes](https://github.com/mattermost/mattermost-server/releases)
- [Changelog](https://github.com/mattermost/mattermost-server/blob/master/CHANGELOG.md)
- [Commits](https://github.com/mattermost/mattermost-server/compare/v5.39.0...v5.39.3)

---
updated-dependencies:
- dependency-name: github.com/mattermost/mattermost-server/v5
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .../mattermost-server/v5/model/config.go           | 29 ++++++++++++++++------
 .../mattermost-server/v5/model/version.go          |  3 +++
 2 files changed, 24 insertions(+), 8 deletions(-)

(limited to 'vendor/github.com')

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",
-- 
cgit v1.2.3