fix off by one line number for --no-git

bryancowan · Dec 8, 2021 · 6f6ebd4 · 6f6ebd4
1 parent ce42947
commit 6f6ebd4
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 4 deletions.
diff --git a/.goreleaser.yml b/.goreleaser.yml
@@ -9,6 +9,12 @@ builds:
       - windows
     goarch:
       - amd64
+      - "386"
+      - arm
+      - arm64
+    goarm:
+      - "6"
+      - "7"
     ldflags:
       - -s -w -X=github.com/zricethezav/gitleaks/v8/cmd.Version={{.Version}}
 archives:

diff --git a/detect/files.go b/detect/files.go
@@ -51,6 +51,10 @@ func FromFiles(source string, cfg config.Config, outputOptions Options) ([]repor
 			}
 			fis := DetectFindings(cfg, b, p, "")
 			for _, fi := range fis {
+				// need to add 1 since line counting starts at 1
+				fi.StartLine++
+				fi.EndLine++
+
 				if outputOptions.Redact {
 					fi.Redact()
 				}

diff --git a/detect/files_test.go b/detect/files_test.go
@@ -25,8 +25,8 @@ func TestFromFiles(t *testing.T) {
 			expectedFindings: []report.Finding{
 				{
 					Description: "AWS Access Key",
-					StartLine:   19,
-					EndLine:     19,
+					StartLine:   20,
+					EndLine:     20,
 					StartColumn: 16,
 					EndColumn:   35,
 					Match:       "AKIALALEMEL33243OLIA",
@@ -43,8 +43,8 @@ func TestFromFiles(t *testing.T) {
 			expectedFindings: []report.Finding{
 				{
 					Description: "AWS Access Key",
-					StartLine:   19,
-					EndLine:     19,
+					StartLine:   20,
+					EndLine:     20,
 					StartColumn: 16,
 					EndColumn:   35,
 					Match:       "AKIALALEMEL33243OLIA",
-Original file line number
+Diff line change
@@ Expand Up / @@ -9,6 +9,12 @@ builds: @@
           - windows
         goarch:
           - amd64
+          - "386"
+          - arm
+          - arm64
+        goarm:
+          - "6"
+          - "7"
         ldflags:
           - -s -w -X=github.com/zricethezav/gitleaks/v8/cmd.Version={{.Version}}
     archives:
@@ Expand Down @@