[CLD-7373] Always overwrite CloudSettings based on service environmen…

…t when in production (#26581) (#26582) Automatic Merge
mattermost · Mar 25, 2024 · baf02ba · baf02ba
1 parent f6d3200
commit baf02ba
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/server/public/model/config.go b/server/public/model/config.go
@@ -3029,16 +3029,18 @@ type CloudSettings struct {
 }
 
 func (s *CloudSettings) SetDefaults() {
-	if s.CWSURL == nil {
-		switch GetServiceEnvironment() {
+	serviceEnvironment := GetServiceEnvironment()
+	if s.CWSURL == nil || serviceEnvironment == ServiceEnvironmentProduction {
+		switch serviceEnvironment {
 		case ServiceEnvironmentProduction:
 			s.CWSURL = NewString(CloudSettingsDefaultCwsURL)
 		case ServiceEnvironmentTest, ServiceEnvironmentDev:
 			s.CWSURL = NewString(CloudSettingsDefaultCwsURLTest)
 		}
 	}
+
 	if s.CWSAPIURL == nil {
-		switch GetServiceEnvironment() {
+		switch serviceEnvironment {
 		case ServiceEnvironmentProduction:
 			s.CWSAPIURL = NewString(CloudSettingsDefaultCwsAPIURL)
 		case ServiceEnvironmentTest, ServiceEnvironmentDev: