chore: update Trivy version and refactor plugin configuration handling

- Updated Trivy version from 0.49.1 to 0.50.0 in codacy.yaml
- Refactored Trivy plugin configuration loading by introducing a new plugins package
- Removed deprecated types and functions related to Trivy plugin configuration
- Improved error handling in the plugin configuration loading process

Author: andrzej-janczak

.codacy/codacy.yaml

@@ -2,4 +2,4 @@ runtimes:
     - [email protected]
 tools:
     - [email protected]
-    - trivy@0.49.1
+    - trivy@0.50.0

config/trivy-utils.go

@@ -1,6 +1,7 @@
 package config
 
 import (
+	"codacy/cli-v2/plugins"
 	"fmt"
 	"io"
 	"log"
@@ -9,39 +10,8 @@ import (
 	"path/filepath"
 	"runtime"
 	"strings"
-
-	"gopkg.in/yaml.v3"
 )
 
-// TrivyPluginConfig represents the structure of the trivy plugin.yaml file
-type TrivyPluginConfig struct {
-	Name        string                `yaml:"name"`
-	Description string                `yaml:"description"`
-	Downloads   []TrivyDownloadConfig `yaml:"downloads"`
-	ArchMapping map[string]string     `yaml:"arch_mapping"`
-	Binaries    []TrivyBinaryConfig   `yaml:"binaries"`
-}
-
-// TrivyDownloadConfig represents the download configuration in plugin.yaml
-type TrivyDownloadConfig struct {
-	OS               []string             `yaml:"os"`
-	URLTemplate      string               `yaml:"url_template"`
-	FileNameTemplate string               `yaml:"file_name_template"`
-	Extension        TrivyExtensionConfig `yaml:"extension"`
-}
-
-// TrivyExtensionConfig defines the file extension based on OS
-type TrivyExtensionConfig struct {
-	Windows string `yaml:"windows"`
-	Default string `yaml:"default"`
-}
-
-// TrivyBinaryConfig represents a binary executable
-type TrivyBinaryConfig struct {
-	Name string `yaml:"name"`
-	Path string `yaml:"path"`
-}
-
 /*
  * This installs Trivy based on the plugin.yaml configuration
  */
@@ -60,13 +30,13 @@ func InstallTrivy(trivyConfig *Runtime, registry string) error {
 
 	// Load the plugin configuration
 	pluginPath := filepath.Join("plugins", "tools", "trivy", "plugin.yaml")
-	pluginConfig, err := loadTrivyPluginConfig(pluginPath)
+	pluginConfig, err := plugins.LoadPluginConfig(pluginPath)
 	if err != nil {
 		return fmt.Errorf("failed to load Trivy plugin configuration: %w", err)
 	}
 
 	// Find the download configuration for the current OS
-	var downloadConfig *TrivyDownloadConfig
+	var downloadConfig *plugins.DownloadConfig
 	currentOS := runtime.GOOS
 	if currentOS == "darwin" {
 		currentOS = "macos"
@@ -162,7 +132,7 @@ func InstallTrivy(trivyConfig *Runtime, registry string) error {
 	log.Printf("Extracted Trivy to: %s\n", extractDir)
 
 	// Find the binary from the plugin configuration
-	var binaryConfig *TrivyBinaryConfig
+	var binaryConfig *plugins.BinaryConfig
 	if len(pluginConfig.Binaries) > 0 {
 		binaryConfig = &pluginConfig.Binaries[0]
 	} else {
@@ -222,22 +192,6 @@ func InstallTrivy(trivyConfig *Runtime, registry string) error {
 	return nil
 }
 
-// loadTrivyPluginConfig loads the Trivy plugin configuration from the plugin.yaml file
-func loadTrivyPluginConfig(path string) (*TrivyPluginConfig, error) {
-	data, err := os.ReadFile(path)
-	if err != nil {
-		return nil, fmt.Errorf("error reading plugin config file: %w", err)
-	}
-
-	var config TrivyPluginConfig
-	err = yaml.Unmarshal(data, &config)
-	if err != nil {
-		return nil, fmt.Errorf("error parsing plugin config file: %w", err)
-	}
-
-	return &config, nil
-}
-
 // isTrivyInstalled checks if Trivy is already installed
 func isTrivyInstalled(trivyConfig *Runtime) bool {
 	trivyFolder := fmt.Sprintf("%s@%s", trivyConfig.Name(), trivyConfig.Version())

plugins/plugin-config.go

@@ -0,0 +1,53 @@
+package plugins
+
+import (
+	"fmt"
+	"os"
+
+	"gopkg.in/yaml.v3"
+)
+
+// PluginConfig represents the structure of plugin.yaml files
+type PluginConfig struct {
+	Name        string            `yaml:"name"`
+	Description string            `yaml:"description"`
+	Downloads   []DownloadConfig  `yaml:"downloads"`
+	ArchMapping map[string]string `yaml:"arch_mapping"`
+	Binaries    []BinaryConfig    `yaml:"binaries"`
+}
+
+// DownloadConfig represents the download configuration in plugin.yaml
+type DownloadConfig struct {
+	OS               []string        `yaml:"os"`
+	URLTemplate      string          `yaml:"url_template"`
+	FileNameTemplate string          `yaml:"file_name_template"`
+	Extension        ExtensionConfig `yaml:"extension"`
+}
+
+// ExtensionConfig defines the file extension based on OS
+type ExtensionConfig struct {
+	Windows string `yaml:"windows"`
+	Default string `yaml:"default"`
+}
+
+// BinaryConfig represents a binary executable
+type BinaryConfig struct {
+	Name string `yaml:"name"`
+	Path string `yaml:"path"`
+}
+
+// LoadPluginConfig loads a plugin configuration from the given path
+func LoadPluginConfig(path string) (*PluginConfig, error) {
+	data, err := os.ReadFile(path)
+	if err != nil {
+		return nil, fmt.Errorf("error reading plugin config file: %w", err)
+	}
+
+	var config PluginConfig
+	err = yaml.Unmarshal(data, &config)
+	if err != nil {
+		return nil, fmt.Errorf("error parsing plugin config file: %w", err)
+	}
+
+	return &config, nil
+}