refactor getToolName method

Author: DMarinhoCodacy

cmd/analyze.go

@@ -259,28 +259,41 @@ func loadsToolAndPatterns(toolName string, onlyEnabledPatterns bool) (domain.Too
 	return tool, patterns
 }
 
+var versionedToolNames = map[string]map[int]string{
+	"eslint": {
+		7: "ESLint (deprecated)",
+		8: "ESLint",
+		9: "ESLint9",
+	},
+	"pmd": {
+		6: "PMD",
+		7: "PMD7",
+	},
+}
+
+var simpleToolAliases = map[string]string{
+	"lizard":  "Lizard",
+	"semgrep": "Semgrep",
+	"pylint":  "pylintpython3",
+	"trivy":   "Trivy",
+}
+
 func getToolName(toolName string, version string) string {
 	majorVersion := getMajorVersion(version)
-	if toolName == "eslint" {
-		switch majorVersion {
-		case 7:
-			return "ESLint (deprecated)"
-		case 8:
-			return "ESLint"
-		case 9:
-			return "ESLint9"
-		}
-	} else {
-		if toolName == "pmd" {
-			switch majorVersion {
-			case 6:
-				return "PMD"
-			case 7:
-				return "PMD7"
-			}
+
+	// Check for version-specific tool name: for eslint and pmd
+	if versions, ok := versionedToolNames[toolName]; ok {
+		if name, ok := versions[majorVersion]; ok {
+			return name
 		}
 	}
 
+	// Check for non-versioned tool name alias
+	if codacyToolName, ok := simpleToolAliases[toolName]; ok {
+		return codacyToolName
+	}
+
+	// 3. Default: Return the original tool name if no map or version matches
 	return toolName
 }
 

cmd/upload.go

@@ -136,6 +136,8 @@ func processSarif(sarif Sarif, tools map[string]*plugins.ToolInfo) [][]map[strin
 	}
 
 	for _, run := range sarif.Runs {
+		//getToolName will take care of mapping sarif tool names to codacy tool names
+		//especially for eslint and pmd that have multiple versions
 		var toolName = getToolName(strings.ToLower(run.Tool.Driver.Name), run.Tool.Driver.Version)
 		tool, patterns := loadsToolAndPatterns(toolName, false)