Lint issue

Author: cx-sumit-morchhale

internal/commands/scan.go

@@ -3292,7 +3292,7 @@ func getGitignorePatterns(directoryPath, zipFilePath string) ([]string, error) {
 	for _, line := range lines {
 		line = strings.TrimSpace(line)
 
-		//This condition skips lines that are empty, comments.
+		// This condition skips lines that are empty, comments.
 		// Excluding the lines that contain negotiation characters like !, which are used to negate patterns
 		if line == "" || strings.HasPrefix(line, "#") || strings.HasPrefix(line, "!") {
 			continue
@@ -3336,20 +3336,28 @@ func readGitIgnoreFromZip(zipPath string) ([]byte, error) {
 	expectedGitignorePath := rootFolder + "/.gitignore"
 
 	for _, f := range r.File {
-		if f.Name == expectedGitignorePath {
-			rc, err := f.Open()
-			if err != nil {
-				return []byte(""), fmt.Errorf("failed to open .gitignore inside zip: %w", err)
-			}
-			defer rc.Close()
+		if f.Name != expectedGitignorePath {
+			continue
+		}
+		rc, err := f.Open()
+		if err != nil {
+			return []byte(""), fmt.Errorf("failed to open .gitignore inside zip: %w", err)
+		}
 
-			// Read file content
-			data, err := io.ReadAll(rc)
+		// Read file content
+		data, err := io.ReadAll(rc)
+		if err != nil {
+			err := rc.Close()
 			if err != nil {
-				return []byte(""), fmt.Errorf("failed to read .gitignore content inside zip : %w", err)
+				return nil, err
 			}
-			return data, nil
+			return []byte(""), fmt.Errorf("failed to read .gitignore content inside zip : %w", err)
+		}
+		// Close with error handling
+		if err := rc.Close(); err != nil {
+			logger.PrintfIfVerbose("Error closing .gitignore reader: %v", err)
 		}
+		return data, nil
 	}
 	return []byte(""), fmt.Errorf(".gitignore not found in zip: %s", zipPath)
 }

internal/commands/scan_test.go

@@ -2579,9 +2579,8 @@ func TestGetGitignorePatterns_ZipPath_GitIgnore_EmptyPatternList(t *testing.T) {
 		return
 	}
 
-	gitIgnoreFilter, err := getGitignorePatterns("", zipPath)
+	gitIgnoreFilter, _ := getGitignorePatterns("", zipPath)
 	assert.Assert(t, len(gitIgnoreFilter) == 0, "Expected no patterns from empty .gitignore file")
-
 }
 
 func TestGetGitignorePatterns_ZipPath_GitIgnore_PatternList(t *testing.T) {
@@ -2631,9 +2630,8 @@ a*cation-jira.yml`
 		return
 	}
 
-	gitIgnoreFilter, err := getGitignorePatterns("", zipPath)
+	gitIgnoreFilter, _ := getGitignorePatterns("", zipPath)
 	assert.Assert(t, len(gitIgnoreFilter) > 0, "Expected patterns from .gitignore file")
-
 }
 
 func TestGetGitignorePatterns_ZipPath_GitIgnore_PermissionDenied(t *testing.T) {

internal/params/flags.go

@@ -169,8 +169,8 @@ const (
 	LogFileUsage                 = "Saves logs to the specified file path only"
 	LogFileConsoleFlag           = "log-file-console"
 	LogFileConsoleUsage          = "Saves logs to the specified file path as well as to the console"
-	GitIgnoreFileFilterFlag      = "gitignore-file-filter"
-	GitIgnoreFileFilterUsage     = "Exclude files and directories listed in the .gitignore file"
+	GitIgnoreFileFilterFlag      = "use-gitignore"
+	GitIgnoreFileFilterUsage     = "Exclude files and directories from the scan based on the patterns defined in the directory's .gitignore file"
 	// INDIVIDUAL FILTER FLAGS
 	SastFilterFlag  = "sast-filter"
 	SastFilterUsage = "SAST filter"