more improvements using the tool config file

Author: DMarinhoCodacy

.codacy/codacy.yaml

@@ -13,4 +13,4 @@ tools:
     - [email protected]
     - [email protected]
     - [email protected]
-    - [email protected] 
+    - [email protected]

cmd/analyze.go

@@ -312,7 +312,6 @@ func checkIfConfigExistsAndIsNeeded(toolName string, cliLocalMode bool) error {
 	// Use the configuration system to get the tools config directory
 	toolsConfigDir := config.Config.ToolsConfigDirectory()
 	toolConfigPath := filepath.Join(toolsConfigDir, configFileName)
-
 	// Check if the config file exists
 	if _, err := os.Stat(toolConfigPath); os.IsNotExist(err) {
 		// Config file does not exist - create it if we have the means to do so
@@ -347,14 +346,10 @@ func checkIfConfigExistsAndIsNeeded(toolName string, cliLocalMode bool) error {
 }
 
 func runToolByName(toolName string, workDirectory string, pathsToCheck []string, autoFix bool, outputFile string, outputFormat string, tool *plugins.ToolInfo, runtime *plugins.RuntimeInfo, cliLocalMode bool) error {
-	err := checkIfConfigExistsAndIsNeeded(toolName, cliLocalMode)
-	if err != nil {
-		return err
-	}
-
 	var t *domain.Tool
 	var usesConfigurationFile = false
 
+	//Check if the user is using the repository configuration file
 	// If the user doesn't provide init flags, we skip fetching repository tools
 	if initFlags != (domain.InitFlags{}) {
 		// Get the tool name with the right version e.g. ESLint9, PMD7, etc.
@@ -364,7 +359,6 @@ func runToolByName(toolName string, workDirectory string, pathsToCheck []string,
 		repositoryTools, _ := codacyclient.GetRepositoryTools(initFlags)
 
 		// Find the matching tool in repositoryTools
-
 		for i, tool := range repositoryTools {
 			if tool.Name == toolRightVersion {
 				t = &repositoryTools[i]
@@ -374,6 +368,14 @@ func runToolByName(toolName string, workDirectory string, pathsToCheck []string,
 		}
 	}
 
+	// If the user is not using configuration file from repository, we check if there's a local one
+	if !usesConfigurationFile {
+		err := checkIfConfigExistsAndIsNeeded(toolName, cliLocalMode)
+		if err != nil {
+			return err
+		}
+	}
+
 	switch toolName {
 	case "eslint":
 		binaryPath := runtime.Binaries[tool.Runtime]

cmd/configsetup/repository_config.go

@@ -91,9 +91,9 @@ func createToolConfigurationFiles(tools []domain.Tool, flags domain.InitFlags) e
 }
 
 // CreateToolConfigurationFile creates a configuration file for a single tool
-// CreateToolConfigurationFile generates a configuration file for a single tool.
 func CreateToolConfigurationFile(toolName string, flags domain.InitFlags) error {
 	// Find the tool UUID by tool name
+	fmt.Printf("Creating configuration file for tool %s\n", toolName)
 	toolUUID := getToolUUIDByName(toolName)
 	if toolUUID == "" {
 		return fmt.Errorf("tool '%s' not found in supported tools", toolName)

tools/runnerUtils.go

@@ -21,10 +21,10 @@ func ConfigFileExists(conf config.ConfigType, fileNames ...string) (string, bool
 		generatedConfigFile := filepath.Join(conf.ToolsConfigDirectory(), fileName)
 		existingConfigFile := filepath.Join(conf.RepositoryDirectory(), fileName)
 
-		if _, err := os.Stat(existingConfigFile); err == nil {
-			return existingConfigFile, true
-		} else if _, err := os.Stat(generatedConfigFile); err == nil {
+		if _, err := os.Stat(generatedConfigFile); err == nil {
 			return generatedConfigFile, true
+		} else if _, err := os.Stat(existingConfigFile); err == nil {
+			return existingConfigFile, true
 		}
 	}