Commit f29f4c65 authored by Stelios Milidonis's avatar Stelios Milidonis
Browse files

removing secret fake setting that was rewritting password for phabricator in conf with *****

parent c08db366
Pipeline #6988 failed with stage
in 0 seconds
...@@ -38,9 +38,9 @@ func TestGetConfig(t *testing.T) { ...@@ -38,9 +38,9 @@ func TestGetConfig(t *testing.T) {
if *cfg.GitLabSettings.Secret != model.FAKE_SETTING && len(*cfg.GitLabSettings.Secret) != 0 { if *cfg.GitLabSettings.Secret != model.FAKE_SETTING && len(*cfg.GitLabSettings.Secret) != 0 {
require.FailNow(t, "did not sanitize properly") require.FailNow(t, "did not sanitize properly")
} }
if *cfg.PhabricatorSettings.Secret != model.FAKE_SETTING && len(*cfg.PhabricatorSettings.Secret) != 0 { // if *cfg.PhabricatorSettings.Secret != model.FAKE_SETTING && len(*cfg.PhabricatorSettings.Secret) != 0 {
t.Fatal("did not sanitize properly") // require.FailNow(t, "did not sanitize properly")
} // }
require.Equal(t, model.FAKE_SETTING, *cfg.SqlSettings.DataSource, "did not sanitize properly") require.Equal(t, model.FAKE_SETTING, *cfg.SqlSettings.DataSource, "did not sanitize properly")
require.Equal(t, model.FAKE_SETTING, *cfg.SqlSettings.AtRestEncryptKey, "did not sanitize properly") require.Equal(t, model.FAKE_SETTING, *cfg.SqlSettings.AtRestEncryptKey, "did not sanitize properly")
if !strings.Contains(strings.Join(cfg.SqlSettings.DataSourceReplicas, " "), model.FAKE_SETTING) && len(cfg.SqlSettings.DataSourceReplicas) != 0 { if !strings.Contains(strings.Join(cfg.SqlSettings.DataSourceReplicas, " "), model.FAKE_SETTING) && len(cfg.SqlSettings.DataSourceReplicas) != 0 {
......
...@@ -3132,9 +3132,9 @@ func (o *Config) Sanitize() { ...@@ -3132,9 +3132,9 @@ func (o *Config) Sanitize() {
*o.GitLabSettings.Secret = FAKE_SETTING *o.GitLabSettings.Secret = FAKE_SETTING
} }
if len(*o.PhabricatorSettings.Secret) > 0 { // if len(*o.PhabricatorSettings.Secret) > 0 {
*o.PhabricatorSettings.Secret = FAKE_SETTING // *o.PhabricatorSettings.Secret = FAKE_SETTING
} // }
*o.SqlSettings.DataSource = FAKE_SETTING *o.SqlSettings.DataSource = FAKE_SETTING
*o.SqlSettings.AtRestEncryptKey = FAKE_SETTING *o.SqlSettings.AtRestEncryptKey = FAKE_SETTING
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment