review improvements

Author: andrzej-janczak

.codacy/codacy.yaml

@@ -1,9 +1,7 @@
 runtimes:
     - [email protected]
-    - [email protected]
 tools:
     - [email protected]
     - [email protected]
-    - [email protected]
     - [email protected]
     - [email protected]

tools/runnerUtils.go

@@ -6,24 +6,26 @@ import (
 	"path/filepath"
 )
 
-// ConfigFileExists checks if a specific configuration file exists in the .codacy/tools-configs/
+// ConfigFileExists checks if any of the specified configuration files exist in the .codacy/tools-configs/
 // or on the root of the repository directory.
 //
 // Parameters:
 //   - conf: The configuration object containing the tools config directory
-//   - fileName: The configuration file name to check for
+//   - fileNames: A list of configuration file names to check for
 //
 // Returns:
-//   - string: The relative path to the configuration file (for cmd args)
-//   - bool: True if the file exists, false otherwise
-func ConfigFileExists(conf config.ConfigType, fileName string) (string, bool) {
-	generatedConfigFile := filepath.Join(conf.ToolsConfigDirectory(), fileName)
-	existingConfigFile := filepath.Join(conf.RepositoryDirectory(), fileName)
+//   - string: The relative path to the first configuration file found (for cmd args)
+//   - bool: True if any file exists, false otherwise
+func ConfigFileExists(conf config.ConfigType, fileNames ...string) (string, bool) {
+	for _, fileName := range fileNames {
+		generatedConfigFile := filepath.Join(conf.ToolsConfigDirectory(), fileName)
+		existingConfigFile := filepath.Join(conf.RepositoryDirectory(), fileName)
 
-	if _, err := os.Stat(generatedConfigFile); err == nil {
-		return generatedConfigFile, true
-	} else if _, err := os.Stat(existingConfigFile); err == nil {
-		return existingConfigFile, true
+		if _, err := os.Stat(generatedConfigFile); err == nil {
+			return generatedConfigFile, true
+		} else if _, err := os.Stat(existingConfigFile); err == nil {
+			return existingConfigFile, true
+		}
 	}
 
 	return "", false

tools/semgrepRunner.go

@@ -19,8 +19,11 @@ func RunSemgrep(workDirectory string, toolInfo *plugins.ToolInfo, files []string
 		cmdArgs = append(cmdArgs, "--sarif")
 	}
 
+	// Define possible Semgrep config file names
+	semgrepConfigFiles := []string{".semgrep.yml", ".semgrep.yaml", ".semgrep/semgrep.yml"}
+
 	// Check if a config file exists in the expected location and use it if present
-	if configFile, exists := ConfigFileExists(config.Config, ".semgrep.yml"); exists {
+	if configFile, exists := ConfigFileExists(config.Config, semgrepConfigFiles...); exists {
 		cmdArgs = append(cmdArgs, "--config", configFile)
 	} else {
 		// add --config auto only if no config file exists