Merge pull request #219 from cloudflare/fix-ci

Correctly report line numbers
cloudflare · Apr 6, 2022 · 5d3783e · 5d3783e
2 parents 6bdd36c + db62066
commit 5d3783e
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 20 deletions.
diff --git a/cmd/pint/scan.go b/cmd/pint/scan.go
@@ -32,20 +32,6 @@ func tryDecodingYamlError(e string) (int, string) {
 	return 1, e
 }
 
-func scanProblem(path, owner string, err error) reporter.Report {
-	line, e := tryDecodingYamlError(err.Error())
-	return reporter.Report{
-		Path:  path,
-		Owner: owner,
-		Problem: checks.Problem{
-			Lines:    []int{line},
-			Reporter: yamlParseReporter,
-			Text:     e,
-			Severity: checks.Fatal,
-		},
-	}
-}
-
 func checkRules(ctx context.Context, workers int, cfg config.Config, entries []discovery.Entry) (summary reporter.Summary) {
 	jobs := make(chan scanJob, workers*5)
 	results := make(chan reporter.Report, workers*5)
@@ -128,7 +114,18 @@ func scanWorker(ctx context.Context, jobs <-chan scanJob, results chan<- reporte
 			return
 		default:
 			if job.entry.PathError != nil {
-				results <- scanProblem(job.entry.Path, job.entry.Owner, job.entry.PathError)
+				line, e := tryDecodingYamlError(job.entry.PathError.Error())
+				results <- reporter.Report{
+					Path:          job.entry.Path,
+					ModifiedLines: job.entry.ModifiedLines,
+					Problem: checks.Problem{
+						Lines:    []int{line},
+						Reporter: yamlParseReporter,
+						Text:     e,
+						Severity: checks.Fatal,
+					},
+					Owner: job.entry.Owner,
+				}
 			} else if job.entry.Rule.Error.Err != nil {
 				results <- reporter.Report{
 					Path:          job.entry.Path,

diff --git a/cmd/pint/tests/0070_bitbucket_string.txt b/cmd/pint/tests/0070_bitbucket_string.txt
@@ -22,6 +22,7 @@ env BITBUCKET_AUTH_TOKEN="12345"
 pint.error -l debug --no-color ci
 ! stdout .
 stderr 'result\\":\\"FAIL\\"'
+stderr ',\\"line\\":1,'
 stderr 'level=debug msg="Sending a request to BitBucket" method=PUT'
 stderr 'level=debug msg="BitBucket request completed" status=200'
 stderr 'level=debug msg="Sending a request to BitBucket" method=DELETE'

diff --git a/docs/changelog.md b/docs/changelog.md
@@ -1,5 +1,11 @@
 # Changelog
 
+## v0.17.3
+
+### Fixed
+
+- File parse errors didn't report correct line numbers when running `pint ci`.
+
 ## v0.17.2
 
 ### Fixed

diff --git a/internal/discovery/git_branch.go b/internal/discovery/git_branch.go
@@ -112,13 +112,13 @@ func (f GitBranchFinder) Find() (entries []Entry, err error) {
 			return nil, fmt.Errorf("failed to run git blame for %s: %w", path, err)
 		}
 
-		alloweLines := []int{}
+		allowedLines := []int{}
 		for _, lb := range lbs {
 			// skip commits that are not part of our diff
 			if _, ok := commits[lb.Commit]; !ok {
 				continue
 			}
-			alloweLines = append(alloweLines, lb.Line)
+			allowedLines = append(allowedLines, lb.Line)
 		}
 
 		els, err := readFile(path, !matchesAny(f.relaxed, path))
@@ -127,11 +127,11 @@ func (f GitBranchFinder) Find() (entries []Entry, err error) {
 		}
 		for _, e := range els {
 			if len(e.ModifiedLines) == 0 {
-				e.ModifiedLines = alloweLines
-				if isOverlap(alloweLines, e.Rule.Lines()) {
+				e.ModifiedLines = allowedLines
+				if isOverlap(allowedLines, e.Rule.Lines()) {
 					entries = append(entries, e)
 				}
-			} else if isOverlap(alloweLines, e.ModifiedLines) {
+			} else if isOverlap(allowedLines, e.ModifiedLines) {
 				entries = append(entries, e)
 			}
 		}