refactor: fix tests

newrelic · Jul 7, 2021 · 930a22d · 930a22d
1 parent 9c4165a
commit 930a22d
Show file tree

Hide file tree

Showing 7 changed files with 23 additions and 176 deletions.
diff --git a/cmd/newrelic/command_integration_test.go b/cmd/newrelic/command_integration_test.go
diff --git a/internal/configuration/config.go b/internal/configuration/config.go
@@ -37,6 +37,11 @@ var (
 )
 
 func init() {
+	Init(configBasePath())
+}
+
+func Init(basePath string) {
+	BasePath = basePath
 	initializeConfigProvider()
 	initializeCredentialsProvider()
 }
@@ -98,7 +103,7 @@ func initializeConfigProvider() {
 			FieldDefinition{
 				Key:     PluginDir,
 				EnvVar:  "NEW_RELIC_CLI_PLUGIN_DIR",
-				Default: filepath.Join(configBasePath(), pluginDir),
+				Default: filepath.Join(BasePath, pluginDir),
 			},
 			FieldDefinition{
 				Key:               PreReleaseFeatures,

diff --git a/internal/configuration/config_integration_test.go b/internal/configuration/config_integration_test.go
@@ -15,7 +15,7 @@ func TestConfigSetLogLevel(t *testing.T) {
 	assert.NoError(t, err)
 	defer os.RemoveAll(f)
 
-	BasePath = f
+	Init(f)
 
 	// Set the valid log levels
 	for _, l := range []string{
@@ -41,7 +41,7 @@ func TestConfigSetSendUsageData(t *testing.T) {
 	assert.NoError(t, err)
 	defer os.RemoveAll(f)
 
-	BasePath = f
+	Init(f)
 
 	// Set the valid sendUsageData values
 	for _, l := range []Ternary{
@@ -63,7 +63,7 @@ func TestConfigSetPreReleaseFeatures(t *testing.T) {
 	assert.NoError(t, err)
 	defer os.RemoveAll(f)
 
-	BasePath = f
+	Init(f)
 
 	// Set the valid pre-release feature values
 	for _, l := range []Ternary{
@@ -85,7 +85,7 @@ func TestConfigSetPluginDir(t *testing.T) {
 	assert.NoError(t, err)
 	defer os.RemoveAll(f)
 
-	BasePath = f
+	Init(f)
 
 	err = SetConfigString(PluginDir, "test")
 	assert.NoError(t, err)

diff --git a/internal/configuration/config_provider.go b/internal/configuration/config_provider.go
@@ -243,10 +243,12 @@ func (p *ConfigProvider) SetWithScope(scope string, key ConfigKey, value interfa
 		return fmt.Errorf("key '%s' is not valid, valid keys are: %v", key, p.getConfigValueKeys())
 	}
 
+	cfg := p.getConfig()
+
 	p.mu.Lock()
 	defer p.mu.Unlock()
 
-	cfg, err := sjson.Set(p.getConfig(), escapeWildcards(p.getPath(scope, key)), value)
+	cfg, err := sjson.Set(cfg, escapeWildcards(p.getPath(scope, key)), value)
 	if err != nil {
 		return err
 	}

diff --git a/internal/configuration/config_provider_test.go b/internal/configuration/config_provider_test.go
@@ -1,4 +1,4 @@
-//build +integration
+//+build integration
 
 package configuration
 

diff --git a/internal/configuration/config_test.go b/internal/configuration/config_test.go
@@ -36,7 +36,7 @@ func TestGetActiveProfileValues(t *testing.T) {
 	require.NoError(t, err)
 	defer os.RemoveAll(dir)
 
-	BasePath = dir
+	Init(dir)
 
 	err = ioutil.WriteFile(filepath.Join(dir, credentialsFileName), []byte(testCredentials), 0644)
 	require.NoError(t, err)
@@ -61,7 +61,7 @@ func TestGetActiveProfileValues_EnvVarOverride(t *testing.T) {
 	require.NoError(t, err)
 	defer os.RemoveAll(dir)
 
-	BasePath = dir
+	Init(dir)
 
 	err = ioutil.WriteFile(filepath.Join(dir, credentialsFileName), []byte(testCredentials), 0644)
 	require.NoError(t, err)
@@ -86,7 +86,7 @@ func TestGetConfigValues(t *testing.T) {
 	require.NoError(t, err)
 	defer os.RemoveAll(dir)
 
-	BasePath = dir
+	Init(dir)
 
 	err = ioutil.WriteFile(filepath.Join(dir, configFileName), []byte(testConfig), 0644)
 	require.NoError(t, err)
@@ -109,7 +109,7 @@ func TestGetConfigValues_EnvVarOverride(t *testing.T) {
 	require.NoError(t, err)
 	defer os.RemoveAll(dir)
 
-	BasePath = dir
+	Init(dir)
 
 	err = ioutil.WriteFile(filepath.Join(dir, credentialsFileName), []byte(testConfig), 0644)
 	require.NoError(t, err)
@@ -132,7 +132,7 @@ func TestGetConfigValues_DefaultValues(t *testing.T) {
 	require.NoError(t, err)
 	defer os.RemoveAll(dir)
 
-	BasePath = dir
+	Init(dir)
 
 	os.Unsetenv("NEW_RELIC_CLI_LOG_LEVEL")
 	os.Unsetenv("NEW_RELIC_CLI_PLUGIN_DIR")
@@ -142,7 +142,7 @@ func TestGetConfigValues_DefaultValues(t *testing.T) {
 	initializeConfigProvider()
 
 	require.Equal(t, "info", GetConfigString("loglevel"))
-	require.Equal(t, filepath.Join(configBasePath(), pluginDir), GetConfigString("plugindir"))
+	require.Equal(t, filepath.Join(dir, pluginDir), GetConfigString("plugindir"))
 	require.Equal(t, "NOT_ASKED", GetConfigString("prereleasefeatures"))
 	require.Equal(t, "NOT_ASKED", GetConfigString("sendusagedata"))
 }
@@ -152,7 +152,7 @@ func TestRemoveProfile(t *testing.T) {
 	require.NoError(t, err)
 	defer os.RemoveAll(dir)
 
-	BasePath = dir
+	Init(dir)
 
 	filename := filepath.Join(dir, credentialsFileName)
 	err = ioutil.WriteFile(filename, []byte(testCredentials), 0644)

diff --git a/internal/install/recipes/local_recipe_fetcher_test.go b/internal/install/recipes/local_recipe_fetcher_test.go
@@ -19,7 +19,7 @@ func TestLocalRecipeFetcher_FetchRecipes_EmptyManifest(t *testing.T) {
 	defer os.RemoveAll(tmp)
 	require.NoError(t, err)
 
-	configuration.BasePath = tmp
+	configuration.Init(tmp)
 
 	path := filepath.Join(tmp, "recipes")
 	err = os.MkdirAll(path, 0750)
@@ -40,7 +40,7 @@ func TestLocalRecipeFetcher_FetchRecipes(t *testing.T) {
 	defer os.RemoveAll(tmp)
 	require.NoError(t, err)
 
-	configuration.BasePath = tmp
+	configuration.Init(tmp)
 
 	path := filepath.Join(tmp, "recipes")