some clean up

Author: hjrocha

.codacy/codacy.yaml

@@ -1,8 +1,10 @@
 runtimes:
     - [email protected]
     - [email protected]
+    - [email protected]
 tools:
     - [email protected]
     - [email protected]
     - [email protected]
     - [email protected]
+    - [email protected]

cmd/init.go

@@ -138,13 +138,14 @@ func configFileTemplate(tools []tools.Tool) string {
 	// Track needed runtimes
 	needsNode := false
 	needsPython := false
-
+	needsDart := false
 	// Default versions
 	defaultVersions := map[string]string{
-		ESLint: "9.3.0",
-		Trivy:  "0.59.1",
-		PyLint: "3.3.6",
-		PMD:    "6.55.0",
+		ESLint:       "9.3.0",
+		Trivy:        "0.59.1",
+		PyLint:       "3.3.6",
+		PMD:          "6.55.0",
+		DartAnalyzer: "3.7.2",
 	}
 
 	// Build map of enabled tools with their versions
@@ -161,6 +162,8 @@ func configFileTemplate(tools []tools.Tool) string {
 			needsNode = true
 		} else if tool.Uuid == PyLint {
 			needsPython = true
+		} else if tool.Uuid == DartAnalyzer {
+			needsDart = true
 		}
 	}
 
@@ -176,10 +179,14 @@ func configFileTemplate(tools []tools.Tool) string {
 		if needsPython {
 			sb.WriteString("    - [email protected]\n")
 		}
+		if needsDart {
+			sb.WriteString("    - [email protected]\n")
+		}
 	} else {
 		// In local mode with no tools specified, include all runtimes
 		sb.WriteString("    - [email protected]\n")
 		sb.WriteString("    - [email protected]\n")
+		sb.WriteString("    - [email protected]\n")
 	}
 
 	sb.WriteString("tools:\n")
@@ -188,10 +195,11 @@ func configFileTemplate(tools []tools.Tool) string {
 	if len(tools) > 0 {
 		// Add only the tools that are in the API response (enabled tools)
 		uuidToName := map[string]string{
-			ESLint: "eslint",
-			Trivy:  "trivy",
-			PyLint: "pylint",
-			PMD:    "pmd",
+			ESLint:       "eslint",
+			Trivy:        "trivy",
+			PyLint:       "pylint",
+			PMD:          "pmd",
+			DartAnalyzer: "dartanalyzer",
 		}
 
 		for uuid, name := range uuidToName {
@@ -205,6 +213,7 @@ func configFileTemplate(tools []tools.Tool) string {
 		sb.WriteString(fmt.Sprintf("    - trivy@%s\n", defaultVersions[Trivy]))
 		sb.WriteString(fmt.Sprintf("    - pylint@%s\n", defaultVersions[PyLint]))
 		sb.WriteString(fmt.Sprintf("    - pmd@%s\n", defaultVersions[PMD]))
+		sb.WriteString(fmt.Sprintf("    - dartanalyzer@%s\n", defaultVersions[DartAnalyzer]))
 	}
 
 	return sb.String()

domain/patternConfiguration.go

@@ -13,6 +13,5 @@ type PatternDefinition struct {
 
 type PatternConfiguration struct {
 	PatternDefinition PatternDefinition `json:"patternDefinition"`
-	Enabled           bool              `json:"enabled"`
 	Parameters        []ParameterConfiguration
 }

tools/dartanalyzerConfigCreator.go

@@ -2,9 +2,7 @@ package tools
 
 import (
 	"codacy/cli-v2/domain"
-	"fmt"
 	"slices"
-	"strconv"
 	"strings"
 
 	"gopkg.in/yaml.v3"
@@ -27,16 +25,10 @@ func CreateDartAnalyzerConfig(configuration []domain.PatternConfiguration) strin
 	errorsMap := config["analyzer"].(map[string]interface{})["errors"].(map[string]string)
 	lintsMap := config["linter"].(map[string]interface{})["rules"].(map[string]string)
 	for _, pattern := range configuration {
-		fmt.Println(pattern.PatternDefinition.Id, pattern.Enabled, pattern.PatternDefinition.Category)
 		if slices.Contains(errorPatterns, pattern.PatternDefinition.Category) {
-			if pattern.Enabled {
-				errorsMap[strings.TrimPrefix(pattern.PatternDefinition.Id, patternPrefix)] = strings.ToLower(pattern.PatternDefinition.Level)
-			} else {
-				errorsMap[strings.TrimPrefix(pattern.PatternDefinition.Id, patternPrefix)] = "ignore"
-			}
-
+			errorsMap[strings.TrimPrefix(pattern.PatternDefinition.Id, patternPrefix)] = strings.ToLower(pattern.PatternDefinition.Level)
 		} else {
-			lintsMap[strings.TrimPrefix(pattern.PatternDefinition.Id, patternPrefix)] = strconv.FormatBool(pattern.Enabled)
+			lintsMap[strings.TrimPrefix(pattern.PatternDefinition.Id, patternPrefix)] = "true"
 		}
 	}
 

tools/dartanalyzerRunner.go

@@ -6,16 +6,13 @@ import (
 	"codacy/cli-v2/plugins"
 	"encoding/json"
 	"fmt"
-	"net/http"
 	"os"
 	"os/exec"
 	"path/filepath"
 	"strconv"
 	"strings"
-	"time"
 )
 
-const CodacyApiBase = "https://app.codacy.com"
 const codacyToolName = "dartanalyzer"
 const patternPrefix = "dartanalyzer_"
 
@@ -138,114 +135,3 @@ func RunDartAnalyzer(workDirectory string, toolInfo *plugins.ToolInfo, files []s
 	}
 
 }
-
-func convertDartAnalyzerOutputToSarif(output string) (string, error) {
-	// Create base SARIF structure
-	sarif := map[string]interface{}{
-		"$schema": "https://raw.githubusercontent.com/oasis-tcs/sarif-spec/master/Schemata/sarif-schema-2.1.0.json",
-		"runs": []map[string]interface{}{
-			{
-				"results": []map[string]interface{}{},
-			},
-		},
-	}
-
-	// Split output into lines
-	lines := strings.Split(output, "\n")
-
-	// Process each line
-	for _, line := range lines {
-		if line == "" {
-			continue
-		}
-
-		// Split line into fields
-		fields := strings.Split(line, "|")
-		if len(fields) < 8 {
-			continue
-		}
-
-		// Extract fields
-		file := fields[3]
-		lineNum, _ := strconv.Atoi(fields[4])
-		message := fields[7]
-
-		// Create result object
-		result := map[string]interface{}{
-			"message": map[string]string{
-				"text": message,
-			},
-			"locations": []map[string]interface{}{
-				{
-					"physicalLocation": map[string]interface{}{
-						"artifactLocation": map[string]interface{}{
-							"uri": file,
-						},
-						"region": map[string]interface{}{
-							"startLine": lineNum,
-						},
-					},
-				},
-			},
-		}
-
-		// Add result to SARIF output
-		sarif["runs"].([]map[string]interface{})[0]["results"] = append(
-			sarif["runs"].([]map[string]interface{})[0]["results"].([]map[string]interface{}),
-			result,
-		)
-	}
-
-	// Convert to JSON
-	sarifJson, err := json.MarshalIndent(sarif, "", "  ")
-	if err != nil {
-		return "", fmt.Errorf("error marshaling SARIF: %v", err)
-	}
-
-	return string(sarifJson), nil
-}
-
-func getToolFromCodacy(apiToken string, provider string, owner string, repository string) (*Tool, error) {
-	url := fmt.Sprintf("%s/api/v3/analysis/organizations/%s/%s/repositories/%s/tools",
-		CodacyApiBase,
-		provider,
-		owner,
-		repository)
-
-	client := &http.Client{
-		Timeout: 10 * time.Second,
-	}
-
-	req, err := http.NewRequest("GET", url, nil)
-	if err != nil {
-		return nil, fmt.Errorf("error creating request: %v", err)
-	}
-
-	req.Header.Set("Accept", "application/json")
-	req.Header.Set("api-token", apiToken)
-
-	resp, err := client.Do(req)
-	if err != nil {
-		return nil, fmt.Errorf("error making request: %v", err)
-	}
-	defer resp.Body.Close()
-
-	if resp.StatusCode >= 400 {
-		return nil, fmt.Errorf("failed to get tools from Codacy API: %v", resp.Status)
-	}
-
-	var response struct {
-		Data []Tool `json:"data"`
-	}
-
-	if err := json.NewDecoder(resp.Body).Decode(&response); err != nil {
-		return nil, fmt.Errorf("error decoding response: %v", err)
-	}
-
-	for _, tool := range response.Data {
-		if tool.Name == codacyToolName {
-			return &tool, nil
-		}
-	}
-	return nil, fmt.Errorf("tool %s not found", codacyToolName)
-}

tools/dartanalyzerRunner_test.go

@@ -0,0 +1,8 @@
+package tools
+
+import (
+	"testing"
+)
+
+func TestRunDartAnalyzerToFile(t *testing.T) {
+}