refactor: Simplify tool installation logic by removing temporary extraction directory

- Changed installation process to extract files directly to the installation directory.
- Removed unnecessary creation and cleanup of a temporary extraction directory.
- Added logic to ensure all binaries are executable after installation.
- Updated error messages for clarity.

Author: andrzej-janczak

config/tools-installer.go

@@ -5,7 +5,6 @@ import (
 	"codacy/cli-v2/plugins"
 	"codacy/cli-v2/utils"
 	"fmt"
-	"io"
 	"log"
 	"os"
 	"os/exec"
@@ -130,99 +129,32 @@ func installDownloadBasedTool(toolInfo *plugins.ToolInfo) error {
 	}
 	defer file.Close()
 
-	// Create a temporary extraction directory
-	tempExtractDir := filepath.Join(Config.ToolsDirectory(), fmt.Sprintf("%s-%s-temp", toolInfo.Name, toolInfo.Version))
-
-	// Clean up any previous extraction attempt
-	os.RemoveAll(tempExtractDir)
-
-	// Create the temporary extraction directory
-	err = os.MkdirAll(tempExtractDir, 0755)
+	// Create the installation directory
+	err = os.MkdirAll(toolInfo.InstallDir, 0755)
 	if err != nil {
-		return fmt.Errorf("failed to create temporary extraction directory: %w", err)
+		return fmt.Errorf("failed to create installation directory: %w", err)
 	}
 
-	// Extract to the temporary directory first
+	// Extract directly to the installation directory
 	log.Printf("Extracting %s v%s...\n", toolInfo.Name, toolInfo.Version)
 	if strings.HasSuffix(fileName, ".zip") {
-		err = utils.ExtractZip(file.Name(), tempExtractDir)
+		err = utils.ExtractZip(file.Name(), toolInfo.InstallDir)
 	} else {
-		err = utils.ExtractTarGz(file, tempExtractDir)
+		err = utils.ExtractTarGz(file, toolInfo.InstallDir)
 	}
 
 	if err != nil {
 		return fmt.Errorf("failed to extract tool: %w", err)
 	}
 
-	// Create the final installation directory
-	err = os.MkdirAll(toolInfo.InstallDir, 0755)
-	if err != nil {
-		return fmt.Errorf("failed to create installation directory: %w", err)
-	}
-
-	// Find and copy the tool binaries
-	for binName, binPath := range toolInfo.Binaries {
-		// Get the base name of the binary (without the path)
-		binBaseName := filepath.Base(binPath)
-
-		// Try to find the binary in the extracted files
-		foundPath := ""
-
-		// First check if it's at the expected location directly
-		expectedPath := filepath.Join(tempExtractDir, binBaseName)
-		if _, err := os.Stat(expectedPath); err == nil {
-			foundPath = expectedPath
-		} else {
-			// Look for the binary anywhere in the extracted directory
-			err := filepath.Walk(tempExtractDir, func(path string, info os.FileInfo, err error) error {
-				if err != nil {
-					return err
-				}
-				if !info.IsDir() && filepath.Base(path) == binBaseName {
-					foundPath = path
-					return io.EOF // Stop the walk
-				}
-				return nil
-			})
-
-			// io.EOF is expected when we find the file and stop the walk
-			if err != nil && err != io.EOF {
-				return fmt.Errorf("error searching for %s binary: %w", binName, err)
-			}
-		}
-
-		if foundPath == "" {
-			return fmt.Errorf("could not find %s binary in extracted files", binName)
-		}
-
-		// Make sure the destination directory exists
-		err = os.MkdirAll(filepath.Dir(binPath), 0755)
-		if err != nil {
-			return fmt.Errorf("failed to create directory for binary: %w", err)
-		}
-
-		// Copy the binary to the installation directory
-		input, err := os.Open(foundPath)
-		if err != nil {
-			return fmt.Errorf("failed to open %s binary: %w", binName, err)
-		}
-		defer input.Close()
-
-		output, err := os.OpenFile(binPath, os.O_RDWR|os.O_CREATE|os.O_TRUNC, 0755)
-		if err != nil {
-			return fmt.Errorf("failed to create destination file for %s: %w", binName, err)
-		}
-		defer output.Close()
-
-		_, err = io.Copy(output, input)
-		if err != nil {
-			return fmt.Errorf("failed to copy %s binary: %w", binName, err)
+	// Make sure all binaries are executable
+	for _, binaryPath := range toolInfo.Binaries {
+		err = os.Chmod(filepath.Join(toolInfo.InstallDir, filepath.Base(binaryPath)), 0755)
+		if err != nil && !os.IsNotExist(err) {
+			return fmt.Errorf("failed to make binary executable: %w", err)
 		}
 	}
 
-	// Clean up the temporary directory
-	os.RemoveAll(tempExtractDir)
-
 	log.Printf("Successfully installed %s v%s\n", toolInfo.Name, toolInfo.Version)
 	return nil
 }

plugins/tools/trivy/plugin.yaml

@@ -19,3 +19,10 @@ download:
 binaries:
   - name: trivy
     path: "trivy"
+formatters:
+  - name: sarif
+    flag: "--format sarif"
+output_options:
+  file_flag: "-o"
+analysis_options:
+  default_path: "."