Merge branch 'main' into add-tests

Author: nfcodacy

.github/workflows/go.yml

@@ -94,30 +94,31 @@ jobs:
       #     Write-Host "Attempting to run CLI..."
       #     .\cli-v2.exe install
 
-  release:
-    needs: [test, ittest]
-    if: github.ref == format('refs/heads/{0}', github.event.repository.default_branch) && github.event_name == 'push'
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v4
-        with:
-          fetch-depth: 0
-      - name: Set up Go
-        uses: actions/setup-go@v4
-      - name: "Git Version"
-        id: generate-version
-        uses: codacy/[email protected]
-      - name: "Tag version"
-        run: |
-          git tag ${{ steps.generate-version.outputs.version }}
-          git push --tags "https://codacy:${{ secrets.GITHUB_TOKEN }}@github.com/codacy/codacy-cli-v2"
-      - name: Run GoReleaser
-        uses: goreleaser/goreleaser-action@v5
-        with:
-          distribution: goreleaser
-          # 'latest', 'nightly', or a semver
-          version: "latest"
-          args: release --clean
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+## For now we are not releasing the CLI, as we are making some quicker iterations
+  # release:
+  #   needs: [test, ittest]
+  #   if: github.ref == format('refs/heads/{0}', github.event.repository.default_branch) && github.event_name == 'push'
+  #   runs-on: ubuntu-latest
+  #   steps:
+  #     - name: Checkout
+  #       uses: actions/checkout@v4
+  #       with:
+  #         fetch-depth: 0
+  #     - name: Set up Go
+  #       uses: actions/setup-go@v4
+  #     - name: "Git Version"
+  #       id: generate-version
+  #       uses: codacy/[email protected]
+  #     - name: "Tag version"
+  #       run: |
+  #         git tag ${{ steps.generate-version.outputs.version }}
+  #         git push --tags "https://codacy:${{ secrets.GITHUB_TOKEN }}@github.com/codacy/codacy-cli-v2"
+  #     - name: Run GoReleaser
+  #       uses: goreleaser/goreleaser-action@v5
+  #       with:
+  #         distribution: goreleaser
+  #         # 'latest', 'nightly', or a semver
+  #         version: "latest"
+  #         args: release --clean
+  #       env:
+  #         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.gitignore

@@ -22,5 +22,6 @@ go.work
 go.work.sum
 
 .idea/
+.vscode/
 
-cli-v2
+cli-v2

LICENSE

@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2025 Codacy
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

cmd/analyze.go

@@ -205,7 +205,7 @@ var analyzeCmd = &cobra.Command{
 		}
 
 		eslint := config.Config.Tools()["eslint"]
-		eslintInstallationDirectory := eslint.Info()["installDir"]
+		eslintInstallationDirectory := eslint.InstallDir
 		nodeRuntime := config.Config.Runtimes()["node"]
 		nodeBinary := nodeRuntime.Binaries["node"]
 
@@ -220,4 +220,4 @@ var analyzeCmd = &cobra.Command{
 
 		tools.RunEslint(workDirectory, eslintInstallationDirectory, nodeBinary, args, autoFix, outputFile, outputFormat)
 	},
-}
+}

cmd/install.go

@@ -2,7 +2,6 @@ package cmd
 
 import (
 	cfg "codacy/cli-v2/config"
-	"fmt"
 	"log"
 
 	"github.com/spf13/cobra"
@@ -33,18 +32,9 @@ func installRuntimes(config *cfg.ConfigType) {
 }
 
 func installTools(config *cfg.ConfigType) {
-	for _, tool := range config.Tools() {
-		switch tool.Name() {
-		case "eslint":
-			// eslint needs node runtime
-			nodeRuntime := config.Runtimes()["node"]
-			err := cfg.InstallEslint(nodeRuntime, tool, registry)
-			if err != nil {
-				fmt.Println(err.Error())
-				log.Fatal(err)
-			}
-		default:
-			log.Fatal("Unknown tool:", tool.Name())
-		}
+	// Use the new tools-installer instead of manual installation
+	err := cfg.InstallTools()
+	if err != nil {
+		log.Fatal(err)
 	}
-}
+}

config-file/configFile.go

@@ -36,12 +36,22 @@ func parseConfigFile(configContents []byte) error {
 		return err
 	}
 
+	// Convert the tool strings to ToolConfig objects
+	toolConfigs := make([]plugins.ToolConfig, 0, len(configFile.TOOLS))
 	for _, tl := range configFile.TOOLS {
 		ct, err := parseConfigTool(tl)
 		if err != nil {
 			return err
 		}
-		config.Config.AddTool(config.NewRuntime(ct.name, ct.version))
+		toolConfigs = append(toolConfigs, plugins.ToolConfig{
+			Name:    ct.name,
+			Version: ct.version,
+		})
+	}
+
+	// Add all tools at once
+	if err := config.Config.AddTools(toolConfigs); err != nil {
+		return err
 	}
 
 	return nil

config/config.go

@@ -17,7 +17,7 @@ type ConfigType struct {
 	projectConfigFile    string
 
 	runtimes map[string]*plugins.RuntimeInfo
-	tools    map[string]*Runtime
+	tools    map[string]*plugins.ToolInfo
 }
 
 func (c *ConfigType) HomePath() string {
@@ -63,13 +63,23 @@ func (c *ConfigType) AddRuntimes(configs []plugins.RuntimeConfig) error {
 	return nil
 }
 
-// TODO do inheritance with tool
-func (c *ConfigType) Tools() map[string]*Runtime {
+func (c *ConfigType) Tools() map[string]*plugins.ToolInfo {
 	return c.tools
 }
 
-func (c *ConfigType) AddTool(t *Runtime) {
-	c.tools[t.Name()] = t
+func (c *ConfigType) AddTools(configs []plugins.ToolConfig) error {
+	// Process the tool configurations using the plugins.ProcessTools function
+	toolInfoMap, err := plugins.ProcessTools(configs, c.toolsDirectory)
+	if err != nil {
+		return err
+	}
+
+	// Store the tool information in the config
+	for name, info := range toolInfoMap {
+		c.tools[name] = info
+	}
+
+	return nil
 }
 
 func (c *ConfigType) initCodacyDirs() {
@@ -117,7 +127,7 @@ func Init() {
 	Config.initCodacyDirs()
 
 	Config.runtimes = make(map[string]*plugins.RuntimeInfo)
-	Config.tools = make(map[string]*Runtime)
+	Config.tools = make(map[string]*plugins.ToolInfo)
 }
 
 // Global singleton config-file