From 65a92d64a421dac2f25ac14b525771c88a05a68b Mon Sep 17 00:00:00 2001
From: Will Roden <will@roden.cc>
Date: Mon, 15 May 2023 14:54:27 -0500
Subject: [PATCH] remove //nolint

---
 .golangci.yml                       | 4 ++++
 cmd/benchdiff/internal/benchdiff.go | 4 +---
 cmd/benchdiff/internal/gitrunner.go | 2 +-
 pkg/benchstatter/benchstat.go       | 2 +-
 pkg/benchstatter/markdown.go        | 2 +-
 5 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/.golangci.yml b/.golangci.yml
index 14579de..d05aa30 100644
--- a/.golangci.yml
+++ b/.golangci.yml
@@ -8,6 +8,10 @@ issues:
         - dupl
         - gosec
         - goconst
+  exclude:
+    - "G302: Expect file permissions to be 0600 or less"
+    - "G304: Potential file inclusion via variable"
+    - "G204: Subprocess launched with a potential tainted input or cmd arguments"
 linters:
   enable:
     - gosec
diff --git a/cmd/benchdiff/internal/benchdiff.go b/cmd/benchdiff/internal/benchdiff.go
index 5915ee2..d3d21e8 100644
--- a/cmd/benchdiff/internal/benchdiff.go
+++ b/cmd/benchdiff/internal/benchdiff.go
@@ -101,7 +101,7 @@ stderr: %s`, cmd.String(), exitErr.ExitCode(), bufStderr.String())
 }
 
 func (c *Benchdiff) runBenchmark(ref, filename, extraArgs string, pause time.Duration, force bool) (errOut error) {
-	cmd := exec.Command(c.BenchCmd, strings.Fields(c.BenchArgs+" "+extraArgs)...) //nolint:gosec // this is fine
+	cmd := exec.Command(c.BenchCmd, strings.Fields(c.BenchArgs+" "+extraArgs)...)
 
 	stdlib := false
 	if rootPath, err := runGitCmd(c.debug(), c.gitCmd(), c.Path, "rev-parse", "--show-toplevel"); err == nil {
@@ -123,7 +123,6 @@ func (c *Benchdiff) runBenchmark(ref, filename, extraArgs string, pause time.Dur
 				return nil
 			}
 		}
-		//nolint:gosec // user provides filename
 		file, err := os.Create(filename)
 		if err != nil {
 			return err
@@ -146,7 +145,6 @@ func (c *Benchdiff) runBenchmark(ref, filename, extraArgs string, pause time.Dur
 			time.Sleep(pause)
 		}
 		if stdlib {
-			//nolint:gosec // workPath is a temp dir
 			makeCmd := exec.Command(filepath.Join(workPath, "src", "make.bash"))
 			makeCmd.Dir = filepath.Join(workPath, "src")
 			runErr = runCmd(makeCmd, c.debug())
diff --git a/cmd/benchdiff/internal/gitrunner.go b/cmd/benchdiff/internal/gitrunner.go
index 4e61eac..c6c353c 100644
--- a/cmd/benchdiff/internal/gitrunner.go
+++ b/cmd/benchdiff/internal/gitrunner.go
@@ -10,7 +10,7 @@ import (
 
 func runGitCmd(debug *log.Logger, gitCmd, repoPath string, args ...string) ([]byte, error) {
 	var stdout bytes.Buffer
-	cmd := exec.Command(gitCmd, args...) //nolint:gosec // this is fine
+	cmd := exec.Command(gitCmd, args...)
 	cmd.Stdout = &stdout
 	cmd.Dir = repoPath
 	err := runCmd(cmd, debug)
diff --git a/pkg/benchstatter/benchstat.go b/pkg/benchstatter/benchstat.go
index c6f1aec..03c7ee4 100644
--- a/pkg/benchstatter/benchstat.go
+++ b/pkg/benchstatter/benchstat.go
@@ -80,7 +80,7 @@ func (b *Benchstat) OutputTables(writer io.Writer, tables []*benchstat.Table) er
 // AddCollectionFiles adds files to a collection
 func AddCollectionFiles(c *benchstat.Collection, files ...string) error {
 	for _, file := range files {
-		f, err := os.Open(file) //nolint:gosec // this is fine
+		f, err := os.Open(file)
 		if err != nil {
 			return err
 		}
diff --git a/pkg/benchstatter/markdown.go b/pkg/benchstatter/markdown.go
index f8a1255..2a8d96d 100644
--- a/pkg/benchstatter/markdown.go
+++ b/pkg/benchstatter/markdown.go
@@ -203,7 +203,7 @@ func writeGroupMarkdown(w io.Writer, tables []*benchstat.Table, groupIdx int, gr
 }
 
 // MarkdownFormatter return a markdown OutputFormatter
-func MarkdownFormatter(opts *MarkdownFormatterOptions) OutputFormatter { //nolint:gocyclo // punt this to later
+func MarkdownFormatter(opts *MarkdownFormatterOptions) OutputFormatter {
 	return func(w io.Writer, tables []*benchstat.Table) error {
 		return FormatMarkdown(w, tables, opts)
 	}