[MM-42] Fix CI error: implicit memory aliasing (#429)

mattermost · Dec 20, 2023 · 98fdf4f · 98fdf4f
1 parent 8130d66
commit 98fdf4f
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 10 deletions.
diff --git a/server/command_test.go b/server/command_test.go
@@ -380,7 +380,7 @@ func TestAddWebhookCommand(t *testing.T) {
 			p.GitlabClient = mockedClient
 
 			conf := &model.Config{}
-			conf.ServiceSettings.SiteURL = &test.siteURL
+			conf.ServiceSettings.SiteURL = model.NewString(test.siteURL)
 
 			encryptedToken, _ := encrypt([]byte(testEncryptionKey), testGitlabToken)
 

diff --git a/server/configuration_test.go b/server/configuration_test.go
@@ -66,15 +66,15 @@ func TestSetDefaults(t *testing.T) {
 	for _, testCase := range []struct {
 		description string
 		isCloud     bool
-		config      configuration
+		config      *configuration
 
 		shouldChange bool
 		outputCheck  func(*testing.T, *configuration)
 		errMsg       string
 	}{
 		{
 			description: "noop",
-			config: configuration{
+			config: &configuration{
 				EncryptionKey: "abcd",
 				WebhookSecret: "efgh",
 			},
@@ -85,7 +85,7 @@ func TestSetDefaults(t *testing.T) {
 			},
 		}, {
 			description: "set encryption key",
-			config: configuration{
+			config: &configuration{
 				EncryptionKey: "",
 			},
 			shouldChange: true,
@@ -94,7 +94,7 @@ func TestSetDefaults(t *testing.T) {
 			},
 		}, {
 			description: "set webhook key",
-			config: configuration{
+			config: &configuration{
 				WebhookSecret: "",
 			},
 			shouldChange: true,
@@ -103,7 +103,7 @@ func TestSetDefaults(t *testing.T) {
 			},
 		}, {
 			description: "set webhook and encryption key",
-			config: configuration{
+			config: &configuration{
 				EncryptionKey: "",
 				WebhookSecret: "",
 			},
@@ -115,7 +115,7 @@ func TestSetDefaults(t *testing.T) {
 		}, {
 			description: "Should not set UsePreregisteredApplication in on-prem",
 			isCloud:     false,
-			config: configuration{
+			config: &configuration{
 				EncryptionKey:               "abcd",
 				WebhookSecret:               "efgh",
 				UsePreregisteredApplication: false,
@@ -128,7 +128,7 @@ func TestSetDefaults(t *testing.T) {
 		}, {
 			description: "Should set UsePreregisteredApplication in cloud if no OAuth secret is configured",
 			isCloud:     true,
-			config: configuration{
+			config: &configuration{
 				EncryptionKey:               "abcd",
 				WebhookSecret:               "efgh",
 				UsePreregisteredApplication: false,
@@ -143,7 +143,7 @@ func TestSetDefaults(t *testing.T) {
 		}, {
 			description: "Should set not UsePreregisteredApplication in cloud if OAuth secret is configured",
 			isCloud:     true,
-			config: configuration{
+			config: &configuration{
 				EncryptionKey:               "abcd",
 				WebhookSecret:               "efgh",
 				UsePreregisteredApplication: false,
@@ -163,7 +163,7 @@ func TestSetDefaults(t *testing.T) {
 			changed, err := testCase.config.setDefaults(testCase.isCloud)
 
 			assert.Equal(t, testCase.shouldChange, changed)
-			testCase.outputCheck(t, &testCase.config)
+			testCase.outputCheck(t, testCase.config)
 
 			if testCase.errMsg != "" {
 				require.Error(t, err)