upstream/mattermost
1
0
Fork 0
mirror of https://github.com/mattermost/mattermost.git synced 2026-05-28 04:35:04 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

[CLD-7373] Always overwrite CloudSettings based on service environment when in production (#26581)

Browse source 
* Always overwrite CloudSettings based on service environment

* Only override the CWSURL, leave CWSAPIURL

* Update to allow tests to pass

* Undo unintentional changes
This commit is contained in:
Nick Misasi 2024-03-25 15:43:26 -04:00 committed by GitHub
parent 00d48b04ed
commit 408608d494
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
server/public/model/config.go
View file

@ -3015,16 +3015,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: