added tests and fixed bug with runtime installation

Author: franciscoovazevedo

cmd/analyze.go

@@ -320,11 +320,22 @@ func getToolName(toolName string, version string) string {
 func runEslintAnalysis(workDirectory string, pathsToCheck []string, autoFix bool, outputFile string, outputFormat string) error {
 	// Ensure ESLint tool is configured and installed
 	eslint := config.Config.Tools()["eslint"]
-	if eslint == nil || !config.Config.IsToolInstalled("eslint", eslint) {
+	isToolInstalled := config.Config.IsToolInstalled("eslint", eslint)
+
+	// Also check if the runtime is installed
+	var isRuntimeInstalled bool
+	if eslint != nil {
+		nodeRuntime := config.Config.Runtimes()["node"]
+		isRuntimeInstalled = nodeRuntime != nil && config.Config.IsRuntimeInstalled("node", nodeRuntime)
+	}
+
+	if eslint == nil || !isToolInstalled || !isRuntimeInstalled {
 		if eslint == nil {
 			fmt.Println("Eslint tool configuration not found, adding and installing...")
-		} else {
+		} else if !isToolInstalled {
 			fmt.Println("Eslint tool is not installed, installing...")
+		} else if !isRuntimeInstalled {
+			fmt.Println("Node.js runtime is not installed, installing eslint (which will install the runtime)...")
 		}
 
 		err := config.InstallTool("eslint", eslint, "")
@@ -359,10 +370,15 @@ func runEslintAnalysis(workDirectory string, pathsToCheck []string, autoFix bool
 func runTrivyAnalysis(workDirectory string, pathsToCheck []string, outputFile string, outputFormat string) error {
 	// Ensure Trivy tool is configured and installed
 	trivy := config.Config.Tools()["trivy"]
-	if trivy == nil || !config.Config.IsToolInstalled("trivy", trivy) {
+	isToolInstalled := config.Config.IsToolInstalled("trivy", trivy)
+
+	// Trivy is a download-based tool (no runtime dependency), so runtime is always "installed"
+	isRuntimeInstalled := true
+
+	if trivy == nil || !isToolInstalled || !isRuntimeInstalled {
 		if trivy == nil {
 			fmt.Println("Trivy tool configuration not found, adding and installing...")
-		} else {
+		} else if !isToolInstalled {
 			fmt.Println("Trivy tool is not installed, installing...")
 		}
 
@@ -392,11 +408,22 @@ func runTrivyAnalysis(workDirectory string, pathsToCheck []string, outputFile st
 func runPmdAnalysis(workDirectory string, pathsToCheck []string, outputFile string, outputFormat string) error {
 	// Ensure PMD tool is configured and installed
 	pmd := config.Config.Tools()["pmd"]
-	if pmd == nil || !config.Config.IsToolInstalled("pmd", pmd) {
+	isToolInstalled := config.Config.IsToolInstalled("pmd", pmd)
+
+	// Also check if the runtime is installed
+	var isRuntimeInstalled bool
+	if pmd != nil {
+		javaRuntime := config.Config.Runtimes()["java"]
+		isRuntimeInstalled = javaRuntime != nil && config.Config.IsRuntimeInstalled("java", javaRuntime)
+	}
+
+	if pmd == nil || !isToolInstalled || !isRuntimeInstalled {
 		if pmd == nil {
 			fmt.Println("PMD tool configuration not found, adding and installing...")
-		} else {
+		} else if !isToolInstalled {
 			fmt.Println("PMD tool is not installed, installing...")
+		} else if !isRuntimeInstalled {
+			fmt.Println("Java runtime is not installed, installing PMD (which will install the runtime)...")
 		}
 
 		err := config.InstallTool("pmd", pmd, "")
@@ -431,11 +458,22 @@ func runPmdAnalysis(workDirectory string, pathsToCheck []string, outputFile stri
 func runPylintAnalysis(workDirectory string, pathsToCheck []string, outputFile string, outputFormat string) error {
 	// Ensure Pylint tool is configured and installed
 	pylint := config.Config.Tools()["pylint"]
-	if pylint == nil || !config.Config.IsToolInstalled("pylint", pylint) {
+	isToolInstalled := config.Config.IsToolInstalled("pylint", pylint)
+
+	// Also check if the runtime is installed
+	var isRuntimeInstalled bool
+	if pylint != nil {
+		pythonRuntime := config.Config.Runtimes()["python"]
+		isRuntimeInstalled = pythonRuntime != nil && config.Config.IsRuntimeInstalled("python", pythonRuntime)
+	}
+
+	if pylint == nil || !isToolInstalled || !isRuntimeInstalled {
 		if pylint == nil {
 			fmt.Println("Pylint tool configuration not found, adding and installing...")
-		} else {
+		} else if !isToolInstalled {
 			fmt.Println("Pylint tool is not installed, installing...")
+		} else if !isRuntimeInstalled {
+			fmt.Println("Python runtime is not installed, installing Pylint (which will install the runtime)...")
 		}
 
 		err := config.InstallTool("pylint", pylint, "")
@@ -470,11 +508,22 @@ func runPylintAnalysis(workDirectory string, pathsToCheck []string, outputFile s
 func runDartAnalyzer(workDirectory string, pathsToCheck []string, outputFile string, outputFormat string) error {
 	// Ensure Dart Analyzer tool is configured and installed
 	dartanalyzer := config.Config.Tools()["dartanalyzer"]
-	if dartanalyzer == nil || !config.Config.IsToolInstalled("dartanalyzer", dartanalyzer) {
+	isToolInstalled := config.Config.IsToolInstalled("dartanalyzer", dartanalyzer)
+
+	// Also check if the runtime is installed
+	var isRuntimeInstalled bool
+	if dartanalyzer != nil {
+		dartRuntime := config.Config.Runtimes()["dart"]
+		isRuntimeInstalled = dartRuntime != nil && config.Config.IsRuntimeInstalled("dart", dartRuntime)
+	}
+
+	if dartanalyzer == nil || !isToolInstalled || !isRuntimeInstalled {
 		if dartanalyzer == nil {
 			fmt.Println("Dart analyzer tool configuration not found, adding and installing...")
-		} else {
+		} else if !isToolInstalled {
 			fmt.Println("Dart analyzer tool is not installed, installing...")
+		} else if !isRuntimeInstalled {
+			fmt.Println("Dart runtime is not installed, installing Dart Analyzer (which will install the runtime)...")
 		}
 
 		err := config.InstallTool("dartanalyzer", dartanalyzer, "")
@@ -508,11 +557,22 @@ func runDartAnalyzer(workDirectory string, pathsToCheck []string, outputFile str
 func runSemgrepAnalysis(workDirectory string, pathsToCheck []string, outputFile string, outputFormat string) error {
 	// Ensure Semgrep tool is configured and installed
 	semgrep := config.Config.Tools()["semgrep"]
-	if semgrep == nil || !config.Config.IsToolInstalled("semgrep", semgrep) {
+	isToolInstalled := config.Config.IsToolInstalled("semgrep", semgrep)
+
+	// Also check if the runtime is installed
+	var isRuntimeInstalled bool
+	if semgrep != nil {
+		pythonRuntime := config.Config.Runtimes()["python"]
+		isRuntimeInstalled = pythonRuntime != nil && config.Config.IsRuntimeInstalled("python", pythonRuntime)
+	}
+
+	if semgrep == nil || !isToolInstalled || !isRuntimeInstalled {
 		if semgrep == nil {
 			fmt.Println("Semgrep tool configuration not found, adding and installing...")
-		} else {
+		} else if !isToolInstalled {
 			fmt.Println("Semgrep tool is not installed, installing...")
+		} else if !isRuntimeInstalled {
+			fmt.Println("Python runtime is not installed, installing Semgrep (which will install the runtime)...")
 		}
 
 		err := config.InstallTool("semgrep", semgrep, "")
@@ -547,11 +607,22 @@ func runSemgrepAnalysis(workDirectory string, pathsToCheck []string, outputFile
 func runLizardAnalysis(workDirectory string, pathsToCheck []string, outputFile string, outputFormat string) error {
 	// Ensure Lizard tool is configured and installed
 	lizardTool := config.Config.Tools()["lizard"]
-	if lizardTool == nil || !config.Config.IsToolInstalled("lizard", lizardTool) {
+	isToolInstalled := config.Config.IsToolInstalled("lizard", lizardTool)
+
+	// Also check if the runtime is installed
+	var isRuntimeInstalled bool
+	if lizardTool != nil {
+		pythonRuntime := config.Config.Runtimes()["python"]
+		isRuntimeInstalled = pythonRuntime != nil && config.Config.IsRuntimeInstalled("python", pythonRuntime)
+	}
+
+	if lizardTool == nil || !isToolInstalled || !isRuntimeInstalled {
 		if lizardTool == nil {
 			fmt.Println("Lizard tool configuration not found, adding and installing...")
-		} else {
+		} else if !isToolInstalled {
 			fmt.Println("Lizard tool is not installed, installing...")
+		} else if !isRuntimeInstalled {
+			fmt.Println("Python runtime is not installed, installing Lizard (which will install the runtime)...")
 		}
 
 		err := config.InstallTool("lizard", lizardTool, "")
@@ -605,10 +676,15 @@ func runLizardAnalysis(workDirectory string, pathsToCheck []string, outputFile s
 func runEnigmaAnalysis(workDirectory string, pathsToCheck []string, outputFile string, outputFormat string) error {
 	// Ensure Enigma tool is configured and installed
 	enigma := config.Config.Tools()["codacy-enigma-cli"]
-	if enigma == nil || !config.Config.IsToolInstalled("codacy-enigma-cli", enigma) {
+	isToolInstalled := config.Config.IsToolInstalled("codacy-enigma-cli", enigma)
+
+	// Enigma is a download-based tool (no runtime dependency), so runtime is always "installed"
+	isRuntimeInstalled := true
+
+	if enigma == nil || !isToolInstalled || !isRuntimeInstalled {
 		if enigma == nil {
 			fmt.Println("Enigma tool configuration not found, adding and installing...")
-		} else {
+		} else if !isToolInstalled {
 			fmt.Println("Enigma tool is not installed, installing...")
 		}
 

cmd/analyze_test.go

@@ -1,7 +1,10 @@
 package cmd
 
 import (
+	"codacy/cli-v2/plugins"
 	"testing"
+
+	"github.com/stretchr/testify/assert"
 )
 
 func TestGetFileExtension(t *testing.T) {
@@ -130,3 +133,91 @@ func TestIsToolSupportedForFile(t *testing.T) {
 		})
 	}
 }
+
+func TestEslintInstallationValidationLogic(t *testing.T) {
+	// Test the logic that determines when ESLint installation should be triggered
+	// This tests the core logic from runEslintAnalysis without complex config setup
+
+	tests := []struct {
+		name                   string
+		eslint                 *plugins.ToolInfo
+		nodeRuntime            *plugins.RuntimeInfo
+		isToolInstalled        bool
+		expectInstallTriggered bool
+		description            string
+	}{
+		{
+			name:                   "tool_nil_should_trigger_install",
+			eslint:                 nil,
+			nodeRuntime:            nil,
+			isToolInstalled:        false,
+			expectInstallTriggered: true,
+			description:            "When ESLint tool is nil, installation should be triggered",
+		},
+		{
+			name: "tool_exists_runtime_nil_should_trigger_install",
+			eslint: &plugins.ToolInfo{
+				Name:    "eslint",
+				Version: "8.38.0",
+				Runtime: "node",
+			},
+			nodeRuntime:            nil,
+			isToolInstalled:        true,
+			expectInstallTriggered: true,
+			description:            "When ESLint tool exists but runtime is nil, installation should be triggered",
+		},
+		{
+			name: "tool_not_installed_runtime_exists_should_trigger_install",
+			eslint: &plugins.ToolInfo{
+				Name:    "eslint",
+				Version: "8.38.0",
+				Runtime: "node",
+			},
+			nodeRuntime: &plugins.RuntimeInfo{
+				Name:    "node",
+				Version: "22.2.0",
+			},
+			isToolInstalled:        false,
+			expectInstallTriggered: true,
+			description:            "When ESLint tool is not installed, installation should be triggered",
+		},
+		{
+			name: "both_tool_and_runtime_available_should_not_trigger_install",
+			eslint: &plugins.ToolInfo{
+				Name:    "eslint",
+				Version: "8.38.0",
+				Runtime: "node",
+			},
+			nodeRuntime: &plugins.RuntimeInfo{
+				Name:    "node",
+				Version: "22.2.0",
+			},
+			isToolInstalled:        true,
+			expectInstallTriggered: false,
+			description:            "When both ESLint tool and runtime are available and installed, installation should not be triggered",
+		},
+	}
+
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			// This mimics the logic from runEslintAnalysis
+
+			// Check if the runtime is installed
+			var isRuntimeInstalled bool
+			if tt.eslint != nil {
+				isRuntimeInstalled = tt.nodeRuntime != nil
+				// In the real code, this would also call Config.IsRuntimeInstalled,
+				// but for this test we simplify it to just checking if runtime exists
+			}
+
+			// Apply the installation trigger logic
+			shouldInstall := tt.eslint == nil || !tt.isToolInstalled || !isRuntimeInstalled
+
+			if tt.expectInstallTriggered {
+				assert.True(t, shouldInstall, tt.description)
+			} else {
+				assert.False(t, shouldInstall, tt.description)
+			}
+		})
+	}
+}

config-file/configFile.go

@@ -9,8 +9,8 @@ import (
 )
 
 type configFile struct {
-	RUNTIMES []string
-	TOOLS    []string
+	RUNTIMES []string `yaml:"runtimes"`
+	TOOLS    []string `yaml:"tools"`
 }
 
 func parseConfigFile(configContents []byte) error {

config/tools-installer.go

@@ -57,6 +57,7 @@ func InstallTools(config *ConfigType, registry string) error {
 
 // InstallTool installs a specific tool
 func InstallTool(name string, toolInfo *plugins.ToolInfo, registry string) error {
+
 	// If toolInfo is nil, it means the tool is not in the configuration
 	// Add it with the default version
 	if toolInfo == nil {
@@ -77,14 +78,26 @@ func InstallTool(name string, toolInfo *plugins.ToolInfo, registry string) error
 		}
 	}
 
-	// Check if the tool is already installed
-	if Config.IsToolInstalled(name, toolInfo) {
-		logger.Info("Tool already installed", logrus.Fields{
+	// Check if the tool is already installed AND its runtime is available
+	isToolInstalled := Config.IsToolInstalled(name, toolInfo)
+
+	// Also check if the required runtime is installed
+	var isRuntimeInstalled bool
+	if toolInfo.Runtime != "" {
+		runtimeInfo, exists := Config.Runtimes()[toolInfo.Runtime]
+		isRuntimeInstalled = exists && Config.IsRuntimeInstalled(toolInfo.Runtime, runtimeInfo)
+	} else {
+		// No runtime dependency
+		isRuntimeInstalled = true
+	}
+
+	if isToolInstalled && isRuntimeInstalled {
+		logger.Info("Tool and runtime already installed", logrus.Fields{
 			"tool":    name,
 			"version": toolInfo.Version,
 			"runtime": toolInfo.Runtime,
 		})
-		fmt.Printf("Tool %s v%s is already installed\n", name, toolInfo.Version)
+		fmt.Printf("Tool %s v%s and its runtime are already installed\n", name, toolInfo.Version)
 		return nil
 	}