Fix the golangci-lint path checks

mszostok · Nov 1, 2019 · c2ba39c · c2ba39c
1 parent 0560dac
commit c2ba39c
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 11 deletions.
diff --git a/hack/ci/run-lint.sh b/hack/ci/run-lint.sh
@@ -30,7 +30,7 @@ golangci::run_checks() {
 
   ENABLE=$(sed 's/ /,/g' <<< "${LINTS[@]}")
 
-  golangci-lint --disable-all --enable="${ENABLE}" run ./pkg/... ./cmd/... .
+  golangci-lint --disable-all --enable="${ENABLE}" run
 
   echo -e "${GREEN}√ run golangci-lint${NC}"
 }

diff --git a/internal/check/valid_owner.go b/internal/check/valid_owner.go
@@ -105,11 +105,11 @@ func (v *ValidOwnerChecker) validateTeam(ctx context.Context, name string) *vali
 			if err.Response.StatusCode == http.StatusUnauthorized {
 				return &validateError{fmt.Sprintf("Team %q could not be check. Requires GitHub authorization.", name), Warning, false}
 			}
-			return &validateError{fmt.Sprintf("HTTP error occured while calling GitHub: %v", err), Error, false}
+			return &validateError{fmt.Sprintf("HTTP error occurred while calling GitHub: %v", err), Error, false}
 		case *github.RateLimitError:
 			return &validateError{fmt.Sprintf("GitHub rate limit reached: %v", err.Message), Warning, true}
 		default:
-			return &validateError{fmt.Sprintf("Unknown error occured while calling GitHub: %v", err), Error, false}
+			return &validateError{fmt.Sprintf("Unknown error occurred while calling GitHub: %v", err), Error, false}
 		}
 	}
 
@@ -144,11 +144,11 @@ func (v *ValidOwnerChecker) validateGithubUser(ctx context.Context, name string)
 			if err.Response.StatusCode == http.StatusNotFound {
 				return &validateError{fmt.Sprintf("User %q does not have github account", name), Error, false}
 			}
-			return &validateError{fmt.Sprintf("HTTP error occured while calling GitHub: %v", err), Error, false}
+			return &validateError{fmt.Sprintf("HTTP error occurred while calling GitHub: %v", err), Error, false}
 		case *github.RateLimitError:
 			return &validateError{fmt.Sprintf("GitHub rate limit reached: %v", err.Message), Warning, true}
 		default:
-			return &validateError{fmt.Sprintf("Unknown error occured while calling GitHub: %v", err), Error, false}
+			return &validateError{fmt.Sprintf("Unknown error occurred while calling GitHub: %v", err), Error, false}
 		}
 	}
 

diff --git a/internal/runner/runner_worker.go b/internal/runner/runner_worker.go
@@ -92,16 +92,12 @@ func (r *CheckRunner) ShouldExitWithCheckFailure() bool {
 		}
 	}
 
-	if higherOccurredIssue <= r.treatedAsFailure {
-		return true
-	}
-
-	return false
+	return higherOccurredIssue <= r.treatedAsFailure
 }
 
 func (r *CheckRunner) collectMetrics(checkOut check.Output) {
 	for _, i := range checkOut.Issues {
-		r.allFoundIssues[i.Severity] += 1
+		r.allFoundIssues[i.Severity]++
 	}
 
 	if len(checkOut.Issues) > 0 {