From 0a6b96cb40d9dd5acca7e366df9cd14fa4eff6a7 Mon Sep 17 00:00:00 2001 From: Harrison Healey Date: Mon, 9 Apr 2018 12:16:11 -0400 Subject: MM-9849 Added tracking of which settings are set through environment variables (#8586) * MM-9849 Added tracking of which settings are set through environment variables * Removed old version of viper * Added forked version of viper * Fixed unit tests * Fixed more unit tests * Removed copy from App.GetEnvironmentConfig --- cmd/commands/config_flag_test.go | 2 +- cmd/commands/message_export_test.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'cmd') diff --git a/cmd/commands/config_flag_test.go b/cmd/commands/config_flag_test.go index 7ea0d5153..f31c989d8 100644 --- a/cmd/commands/config_flag_test.go +++ b/cmd/commands/config_flag_test.go @@ -22,7 +22,7 @@ func TestConfigFlag(t *testing.T) { defer os.RemoveAll(dir) utils.TranslationsPreInit() - config, _, err := utils.LoadConfig("config.json") + config, _, _, err := utils.LoadConfig("config.json") require.Nil(t, err) configPath := filepath.Join(dir, "foo.json") require.NoError(t, ioutil.WriteFile(configPath, []byte(config.ToJson()), 0600)) diff --git a/cmd/commands/message_export_test.go b/cmd/commands/message_export_test.go index 5170b77af..bd0e049d6 100644 --- a/cmd/commands/message_export_test.go +++ b/cmd/commands/message_export_test.go @@ -57,7 +57,7 @@ func writeTempConfig(t *testing.T, isMessageExportEnabled bool) string { require.NoError(t, err) utils.TranslationsPreInit() - config, _, appErr := utils.LoadConfig("config.json") + config, _, _, appErr := utils.LoadConfig("config.json") require.Nil(t, appErr) config.MessageExportSettings.EnableExport = model.NewBool(isMessageExportEnabled) configPath := filepath.Join(dir, "foo.json") -- cgit v1.2.3-1-g7c22