review improvements

Author: andrzej-janczak

config/config.go

@@ -43,6 +43,10 @@ func (c *ConfigType) LocalCodacyDirectory() string {
 	return c.localCodacyDirectory
 }
 
+func (c *ConfigType) ToolsConfigsDirectory() string {
+	return c.toolsConfigDirectory
+}
+
 func (c *ConfigType) ProjectConfigFile() string {
 	return c.projectConfigFile
 }

tools/eslintRunner.go

@@ -1,6 +1,7 @@
 package tools
 
 import (
+	"codacy/cli-v2/config"
 	"os"
 	"os/exec"
 	"path/filepath"
@@ -20,7 +21,7 @@ func RunEslint(repositoryToAnalyseDirectory string, eslintInstallationDirectory
 	cmd.Env = append(cmd.Env, "ESLINT_USE_FLAT_CONFIG=true")
 
 	// Add config file from tools-configs directory
-	configFile := filepath.Join(".codacy", "tools-configs", "eslint.config.mjs")
+	configFile := filepath.Join(config.Config.ToolsConfigDirectory(), "eslint.config.mjs")
 	cmd.Args = append(cmd.Args, "-c", configFile)
 
 	if autoFix {
@@ -48,9 +49,9 @@ func RunEslint(repositoryToAnalyseDirectory string, eslintInstallationDirectory
 	nodePathEnv := "NODE_PATH=" + eslintInstallationNodeModules
 	cmd.Env = append(cmd.Env, nodePathEnv)
 
-	//DEBUG
-	//fmt.Println(cmd.Env)
-	//fmt.Println(cmd)
+	// DEBUG
+	// fmt.Println(cmd.Env)
+	// fmt.Println(cmd)
 
 	// TODO eslint returns 1 when it finds errors, so we're not propagating it
 	cmd.Run()

tools/pmdRunner.go

@@ -1,6 +1,7 @@
 package tools
 
 import (
+	"codacy/cli-v2/config"
 	"os"
 	"os/exec"
 	"path/filepath"
@@ -24,7 +25,7 @@ func RunPmd(repositoryToAnalyseDirectory string, pmdBinary string, pathsToCheck
 
 	// Add config file from tools-configs directory if not specified
 	if rulesetFile == "" {
-		configFile := filepath.Join(".codacy", "tools-configs", "pmd-ruleset.xml")
+		configFile := filepath.Join(config.Config.ToolsConfigDirectory(), "pmd-ruleset.xml")
 		cmd.Args = append(cmd.Args, "-R", configFile)
 	} else {
 		cmd.Args = append(cmd.Args, "-R", rulesetFile)

tools/trivyRunner.go

@@ -1,6 +1,7 @@
 package tools
 
 import (
+	"codacy/cli-v2/config"
 	"os"
 	"os/exec"
 	"path/filepath"
@@ -11,7 +12,7 @@ func RunTrivy(repositoryToAnalyseDirectory string, trivyBinary string, pathsToCh
 	cmd := exec.Command(trivyBinary, "fs")
 
 	// Add config file from tools-configs directory
-	configFile := filepath.Join(".codacy", "tools-configs", "trivy.yaml")
+	configFile := filepath.Join(config.Config.ToolsConfigDirectory(), "trivy.yaml")
 	cmd.Args = append(cmd.Args, "--config", configFile)
 
 	// Add format options