codacy issues fix commit

Author: franciscoovazevedo

.codacy/codacy.yaml

@@ -1,15 +1,15 @@
 runtimes:
+    - dart@3.7.2
     - go@1.22.3
     - java@17.0.10
     - node@22.2.0
     - python@3.11.11
-    - flutter@3.7.2
 tools:
-    - eslint@9.38.0
+    - dartanalyzer@3.7.2
+    - eslint@8.57.0
     - lizard@1.17.31
-    - pmd@6.55.0
-    - pylint@3.3.9
-    - revive@1.12.0
+    - pmd@7.11.0
+    - pylint@3.3.6
+    - revive@1.7.0
     - semgrep@1.78.0
     - trivy@0.66.0
-    - dartanalyzer@3.7.2

cmd/container_scan.go

@@ -145,7 +145,7 @@ func handleTrivyResult(err error, imageName string) {
 	os.Exit(1)
 }
 
-func runContainerScan(cmd *cobra.Command, args []string) {
+func runContainerScan(_ *cobra.Command, args []string) {
 	var images []string
 
 	if len(args) > 0 {
@@ -217,62 +217,69 @@ func handleScanError(err error, imageName string) {
 	color.Red("❌ Error scanning %s: %v", imageName, err)
 }
 
+// printFoundImages displays the found images to the user
+func printFoundImages(source string, images []string) {
+	color.Cyan("📄 Found images in %s:", source)
+	for _, img := range images {
+		fmt.Printf("   • %s\n", img)
+	}
+	fmt.Println()
+}
+
 // detectImages auto-detects images from Dockerfile or docker-compose.yml
 func detectImages() []string {
 	// Priority 0: Check explicit --dockerfile flag
 	if dockerfileFlag != "" {
-		if images := parseDockerfile(dockerfileFlag); len(images) > 0 {
-			color.Cyan("📄 Found images in %s:", dockerfileFlag)
-			for _, img := range images {
-				fmt.Printf("   • %s\n", img)
-			}
-			fmt.Println()
-			return images
-		}
-		color.Yellow("⚠️  No FROM instructions found in %s", dockerfileFlag)
-		return nil
+		return detectFromDockerfile(dockerfileFlag, true)
 	}
 
 	// Priority 0: Check explicit --compose-file flag
 	if composeFileFlag != "" {
-		if images := parseDockerCompose(composeFileFlag); len(images) > 0 {
-			color.Cyan("📄 Found images in %s:", composeFileFlag)
-			for _, img := range images {
-				fmt.Printf("   • %s\n", img)
-			}
-			fmt.Println()
-			return images
-		}
-		color.Yellow("⚠️  No images found in %s", composeFileFlag)
-		return nil
+		return detectFromCompose(composeFileFlag, true)
 	}
 
 	// Priority 1: Auto-detect Dockerfile in current directory
-	if images := parseDockerfile("Dockerfile"); len(images) > 0 {
-		color.Cyan("📄 Found images in Dockerfile:")
-		for _, img := range images {
-			fmt.Printf("   • %s\n", img)
-		}
-		fmt.Println()
+	if images := detectFromDockerfile("Dockerfile", false); images != nil {
 		return images
 	}
 
 	// Priority 2: Auto-detect docker-compose files
 	composeFiles := []string{"docker-compose.yml", "docker-compose.yaml", "compose.yml", "compose.yaml"}
 	for _, composeFile := range composeFiles {
-		if images := parseDockerCompose(composeFile); len(images) > 0 {
-			color.Cyan("📄 Found images in %s:", composeFile)
-			for _, img := range images {
-				fmt.Printf("   • %s\n", img)
-			}
-			fmt.Println()
+		if images := detectFromCompose(composeFile, false); images != nil {
 			return images
 		}
 	}
 
 	return nil
 }
 
+// detectFromDockerfile tries to detect images from a Dockerfile
+func detectFromDockerfile(path string, showWarning bool) []string {
+	images := parseDockerfile(path)
+	if len(images) > 0 {
+		printFoundImages(path, images)
+		return images
+	}
+	if showWarning {
+		color.Yellow("⚠️  No FROM instructions found in %s", path)
+	}
+	return nil
+}
+
+// detectFromCompose tries to detect images from a docker-compose file
+func detectFromCompose(path string, showWarning bool) []string {
+	images := parseDockerCompose(path)
+	if len(images) > 0 {
+		printFoundImages(path, images)
+		return images
+	}
+	if showWarning {
+		color.Yellow("⚠️  No images found in %s", path)
+	}
+	return nil
+}
+
 // parseDockerfile extracts FROM images from a Dockerfile
 func parseDockerfile(path string) []string {
 	file, err := os.Open(path)
@@ -330,41 +337,60 @@ func parseDockerCompose(path string) []string {
 	seen := make(map[string]bool)
 
 	for serviceName, service := range config.Services {
-		// If service has an image defined, use it
-		if service.Image != "" && !seen[service.Image] {
-			seen[service.Image] = true
-			images = append(images, service.Image)
-		}
+		images = processServiceImage(service.Image, images, seen)
+		images = processServiceBuild(serviceName, service.Build, images, seen)
+	}
 
-		// If service has a build context with Dockerfile, parse it
-		if service.Build != nil {
-			dockerfilePath := "Dockerfile"
-			if service.Build.Dockerfile != "" {
-				dockerfilePath = service.Build.Dockerfile
-			}
-			if service.Build.Context != "" {
-				dockerfilePath = filepath.Join(service.Build.Context, dockerfilePath)
-			}
+	return images
+}
 
-			if dockerfileImages := parseDockerfile(dockerfilePath); len(dockerfileImages) > 0 {
-				for _, img := range dockerfileImages {
-					if !seen[img] {
-						seen[img] = true
-						images = append(images, img)
-						logger.Info("Found base image from Dockerfile", logrus.Fields{
-							"service":    serviceName,
-							"dockerfile": dockerfilePath,
-							"image":      img,
-						})
-					}
-				}
-			}
-		}
+// processServiceImage adds a service's image to the list if not already seen
+func processServiceImage(image string, images []string, seen map[string]bool) []string {
+	if image != "" && !seen[image] {
+		seen[image] = true
+		images = append(images, image)
+	}
+	return images
+}
+
+// processServiceBuild extracts images from a service's build context Dockerfile
+func processServiceBuild(serviceName string, build *struct {
+	Context    string `yaml:"context"`
+	Dockerfile string `yaml:"dockerfile"`
+}, images []string, seen map[string]bool) []string {
+	if build == nil {
+		return images
 	}
 
+	dockerfilePath := resolveDockerfilePath(build.Context, build.Dockerfile)
+	dockerfileImages := parseDockerfile(dockerfilePath)
+
+	for _, img := range dockerfileImages {
+		if !seen[img] {
+			seen[img] = true
+			images = append(images, img)
+			logger.Info("Found base image from Dockerfile", logrus.Fields{
+				"service":    serviceName,
+				"dockerfile": dockerfilePath,
+				"image":      img,
+			})
+		}
+	}
 	return images
 }
 
+// resolveDockerfilePath constructs the full path to a Dockerfile
+func resolveDockerfilePath(context, dockerfile string) string {
+	path := "Dockerfile"
+	if dockerfile != "" {
+		path = dockerfile
+	}
+	if context != "" {
+		path = filepath.Join(context, path)
+	}
+	return path
+}
+
 // buildTrivyArgs constructs the Trivy command arguments based on flags
 func buildTrivyArgs(imageName string) []string {
 	args := []string{