fix linter issues with # Run golangci-lint linter

/usr/local/google/home/sschrock/scorecard/tools/bin/golangci-lint run -c .golangci.yml --fix
0 issues.

Signed-off-by: Spencer Schrock <[email protected]>

Author: spencerschrock

clients/azuredevopsrepo/search.go

@@ -85,7 +85,7 @@ func (s *searchHandler) buildFilters(request clients.SearchRequest) (map[string]
 		filters["Path"] = []string{request.Path}
 	}
 	if request.Filename != "" {
-		query.WriteString(fmt.Sprintf("file:%s", request.Filename))
+		fmt.Fprintf(&query, "file:%s", request.Filename)
 	}
 
 	return filters, query.String(), nil

clients/githubrepo/contributors_test.go

@@ -82,7 +82,7 @@ func Test_mapCodeOwners(t *testing.T) {
 		var sb strings.Builder
 		sb.WriteRune('*')
 		for i := range tooManyCodeowners {
-			sb.WriteString(fmt.Sprintf(" @user%d", i))
+			fmt.Fprintf(&sb, " @user%d", i)
 		}
 		sb.WriteString("\n")
 		codeowners := io.NopCloser(strings.NewReader(sb.String()))

clients/githubrepo/search.go

@@ -60,24 +60,22 @@ func (handler *searchHandler) buildQuery(request clients.SearchRequest) (string,
 		return "", fmt.Errorf("%w", errEmptyQuery)
 	}
 	var queryBuilder strings.Builder
-	if _, err := queryBuilder.WriteString(
+	if _, err := fmt.Fprintf(&queryBuilder, "%s repo:%s/%s",
 		// The fuzzing check searches for GitHub URI, e.g. `github.com/org/repo`. The forward slash is one special character
 		// that should be replaced with a space.
 		// See https://docs.github.com/en/search-github/searching-on-github/searching-code#considerations-for-code-search
 		// for reference.
-		fmt.Sprintf("%s repo:%s/%s",
-			strings.ReplaceAll(request.Query, "/", " "),
-			handler.repourl.owner, handler.repourl.repo)); err != nil {
+		strings.ReplaceAll(request.Query, "/", " "),
+		handler.repourl.owner, handler.repourl.repo); err != nil {
 		return "", fmt.Errorf("WriteString: %w", err)
 	}
 	if request.Filename != "" {
-		if _, err := queryBuilder.WriteString(
-			fmt.Sprintf(" in:file filename:%s", request.Filename)); err != nil {
+		if _, err := fmt.Fprintf(&queryBuilder, " in:file filename:%s", request.Filename); err != nil {
 			return "", fmt.Errorf("WriteString: %w", err)
 		}
 	}
 	if request.Path != "" {
-		if _, err := queryBuilder.WriteString(fmt.Sprintf(" path:%s", request.Path)); err != nil {
+		if _, err := fmt.Fprintf(&queryBuilder, " path:%s", request.Path); err != nil {
 			return "", fmt.Errorf("WriteString: %w", err)
 		}
 	}

clients/githubrepo/searchCommits.go

@@ -60,10 +60,9 @@ func (handler *searchCommitsHandler) buildQuery(request clients.SearchCommitsOpt
 		return "", fmt.Errorf("%w", errEmptyQuery)
 	}
 	var queryBuilder strings.Builder
-	if _, err := queryBuilder.WriteString(
-		fmt.Sprintf("repo:%s/%s author:%s",
-			handler.repourl.owner, handler.repourl.repo,
-			request.Author)); err != nil {
+	if _, err := fmt.Fprintf(&queryBuilder, "repo:%s/%s author:%s",
+		handler.repourl.owner, handler.repourl.repo,
+		request.Author); err != nil {
 		return "", fmt.Errorf("WriteString: %w", err)
 	}
 

clients/gitlabrepo/search.go

@@ -57,20 +57,18 @@ func (handler *searchHandler) buildQuery(request clients.SearchRequest) (string,
 		return "", fmt.Errorf("%w", errEmptyQuery)
 	}
 	var queryBuilder strings.Builder
-	if _, err := queryBuilder.WriteString(
-		fmt.Sprintf("%s project:%s/%s",
-			strings.ReplaceAll(request.Query, "/", " "),
-			handler.repourl.owner, handler.repourl.projectID)); err != nil {
+	if _, err := fmt.Fprintf(&queryBuilder, "%s project:%s/%s",
+		strings.ReplaceAll(request.Query, "/", " "),
+		handler.repourl.owner, handler.repourl.projectID); err != nil {
 		return "", fmt.Errorf("WriteString: %w", err)
 	}
 	if request.Filename != "" {
-		if _, err := queryBuilder.WriteString(
-			fmt.Sprintf(" in:file filename:%s", request.Filename)); err != nil {
+		if _, err := fmt.Fprintf(&queryBuilder, " in:file filename:%s", request.Filename); err != nil {
 			return "", fmt.Errorf("WriteString: %w", err)
 		}
 	}
 	if request.Path != "" {
-		if _, err := queryBuilder.WriteString(fmt.Sprintf(" path:%s", request.Path)); err != nil {
+		if _, err := fmt.Fprintf(&queryBuilder, " path:%s", request.Path); err != nil {
 			return "", fmt.Errorf("WriteString: %w", err)
 		}
 	}

clients/gitlabrepo/searchCommits.go

@@ -73,10 +73,9 @@ func (handler *searchCommitsHandler) buildQuery(request clients.SearchCommitsOpt
 		return "", fmt.Errorf("%w", errEmptyQuery)
 	}
 	var queryBuilder strings.Builder
-	if _, err := queryBuilder.WriteString(
-		fmt.Sprintf("project:%s/%s author:%s",
-			handler.repourl.owner, handler.repourl.projectID,
-			request.Author)); err != nil {
+	if _, err := fmt.Fprintf(&queryBuilder, "project:%s/%s author:%s",
+		handler.repourl.owner, handler.repourl.projectID,
+		request.Author); err != nil {
 		return "", fmt.Errorf("writestring: %w", err)
 	}
 

pkg/scorecard/common.go

@@ -28,20 +28,20 @@ func textToMarkdown(s string) string {
 
 func nonStructuredResultString(d *checker.CheckDetail) string {
 	var sb strings.Builder
-	sb.WriteString(fmt.Sprintf("%s: %s", typeToString(d.Type), d.Msg.Text))
+	fmt.Fprintf(&sb, "%s: %s", typeToString(d.Type), d.Msg.Text)
 
 	if d.Msg.Path != "" {
-		sb.WriteString(fmt.Sprintf(": %s", d.Msg.Path))
+		fmt.Fprintf(&sb, ": %s", d.Msg.Path)
 		if d.Msg.Offset != 0 {
-			sb.WriteString(fmt.Sprintf(":%d", d.Msg.Offset))
+			fmt.Fprintf(&sb, ":%d", d.Msg.Offset)
 		}
 		if d.Msg.EndOffset != 0 && d.Msg.Offset < d.Msg.EndOffset {
-			sb.WriteString(fmt.Sprintf("-%d", d.Msg.EndOffset))
+			fmt.Fprintf(&sb, "-%d", d.Msg.EndOffset)
 		}
 	}
 
 	if d.Msg.Remediation != nil {
-		sb.WriteString(fmt.Sprintf(": %s", d.Msg.Remediation.Text))
+		fmt.Fprintf(&sb, ": %s", d.Msg.Remediation.Text)
 	}
 
 	return sb.String()
@@ -50,15 +50,15 @@ func nonStructuredResultString(d *checker.CheckDetail) string {
 func structuredResultString(d *checker.CheckDetail) string {
 	var sb strings.Builder
 	f := d.Msg.Finding
-	sb.WriteString(fmt.Sprintf("%s: %s", typeToString(d.Type), f.Message))
+	fmt.Fprintf(&sb, "%s: %s", typeToString(d.Type), f.Message)
 
 	if f.Location != nil {
-		sb.WriteString(fmt.Sprintf(": %s", f.Location.Path))
+		fmt.Fprintf(&sb, ": %s", f.Location.Path)
 		if f.Location.LineStart != nil {
-			sb.WriteString(fmt.Sprintf(":%d", *f.Location.LineStart))
+			fmt.Fprintf(&sb, ":%d", *f.Location.LineStart)
 		}
 		if f.Location.LineEnd != nil && *f.Location.LineStart < *f.Location.LineEnd {
-			sb.WriteString(fmt.Sprintf("-%d", *f.Location.LineEnd))
+			fmt.Fprintf(&sb, "-%d", *f.Location.LineEnd)
 		}
 	}