Fix golangci-lint issues

r0mdau · naveensrinivasan · commit 33f80c93dc79 · 2022-02-19T15:56:34.000-06:00
diff --git a/.golangci.yml b/.golangci.yml
@@ -80,7 +80,10 @@ linters-settings:
       - FIXME
       - HACK
   gci:
-    local-prefixes: github.com/ossf/scorecard
+    sections:
+      - standard
+      - default
+      - prefix(github.com/ossf/scorecard)
   gocritic:
     enabled-checks:
       # Diagnostic
diff --git a/clients/cii_blob_client.go b/clients/cii_blob_client.go
@@ -19,7 +19,6 @@ import (
 	"fmt"
 
 	"gocloud.dev/blob"
-
 	// Needed to link GCP drivers.
 	_ "gocloud.dev/blob/gcsblob"
 )
diff --git a/cron/config/config.go b/cron/config/config.go
@@ -16,7 +16,6 @@
 package config
 
 import (
-
 	// Used to embed config.yaml.
 	_ "embed"
 	"errors"
diff --git a/cron/data/blob.go b/cron/data/blob.go
@@ -23,7 +23,6 @@ import (
 	"time"
 
 	"gocloud.dev/blob"
-
 	// Needed to link in GCP drivers.
 	_ "gocloud.dev/blob/gcsblob"
 
diff --git a/cron/data/metadata.pb.go b/cron/data/metadata.pb.go
diff --git a/cron/data/request.pb.go b/cron/data/request.pb.go
diff --git a/cron/format/json.go b/cron/format/json.go
@@ -18,9 +18,7 @@ import (
 	"encoding/json"
 	"fmt"
 	"io"
-
-	// nolint:gosec
-	_ "net/http/pprof"
+	_ "net/http/pprof" // nolint:gosec
 
 	docs "github.com/ossf/scorecard/v4/docs/checks"
 	sce "github.com/ossf/scorecard/v4/errors"
diff --git a/cron/pubsub/publisher.go b/cron/pubsub/publisher.go
@@ -24,7 +24,6 @@ import (
 	"sync/atomic"
 
 	"gocloud.dev/pubsub"
-
 	// Needed to link in GCP drivers.
 	_ "gocloud.dev/pubsub/gcppubsub"
 	"google.golang.org/protobuf/encoding/protojson"
diff --git a/cron/pubsub/subscriber_gocloud.go b/cron/pubsub/subscriber_gocloud.go
@@ -20,7 +20,6 @@ import (
 	"log"
 
 	"gocloud.dev/pubsub"
-
 	// Needed to link in GCP drivers.
 	_ "gocloud.dev/pubsub/gcppubsub"
 
diff --git a/cron/worker/main.go b/cron/worker/main.go
@@ -22,9 +22,7 @@ import (
 	"flag"
 	"fmt"
 	"net/http"
-
-	// nolint:gosec
-	_ "net/http/pprof"
+	_ "net/http/pprof" // nolint:gosec
 
 	"go.opencensus.io/stats/view"
 
diff --git a/docs/checks/internal/reader.go b/docs/checks/internal/reader.go
@@ -16,7 +16,6 @@
 package internal
 
 import (
-
 	// Used to embed `checks.yaml` file.
 	_ "embed"
 	"fmt"
diff --git a/policy/policy.pb.go b/policy/policy.pb.go
diff --git a/tools/go.mod b/tools/go.mod
@@ -4,7 +4,7 @@ go 1.17
 
 require (
 	github.com/golang/mock v1.6.0
-	github.com/golangci/golangci-lint v1.44.0
+	github.com/golangci/golangci-lint v1.44.2
 	github.com/google/addlicense v1.0.0
 	github.com/google/ko v0.10.0
 	github.com/goreleaser/goreleaser v1.5.0
@@ -74,11 +74,11 @@ require (
 	github.com/beorn7/perks v1.0.1 // indirect
 	github.com/bkielbasa/cyclop v1.2.0 // indirect
 	github.com/blakesmith/ar v0.0.0-20190502131153-809d4375e1fb // indirect
-	github.com/blizzy78/varnamelen v0.5.0 // indirect
+	github.com/blizzy78/varnamelen v0.6.0 // indirect
 	github.com/bmatcuk/doublestar/v4 v4.0.2 // indirect
 	github.com/bombsimon/wsl/v3 v3.3.0 // indirect
-	github.com/breml/bidichk v0.2.1 // indirect
-	github.com/breml/errchkjson v0.2.1 // indirect
+	github.com/breml/bidichk v0.2.2 // indirect
+	github.com/breml/errchkjson v0.2.3 // indirect
 	github.com/butuzov/ireturn v0.1.1 // indirect
 	github.com/caarlos0/ctrlc v1.0.0 // indirect
 	github.com/caarlos0/env/v6 v6.9.1 // indirect
@@ -96,7 +96,7 @@ require (
 	github.com/containerd/containerd v1.5.9 // indirect
 	github.com/containerd/stargz-snapshotter/estargz v0.11.0 // indirect
 	github.com/cpuguy83/go-md2man/v2 v2.0.1 // indirect
-	github.com/daixiang0/gci v0.2.9 // indirect
+	github.com/daixiang0/gci v0.3.1 // indirect
 	github.com/davecgh/go-spew v1.1.1 // indirect
 	github.com/denis-tingajkin/go-header v0.4.2 // indirect
 	github.com/dghubble/go-twitter v0.0.0-20211115160449-93a8679adecb // indirect
@@ -188,11 +188,11 @@ require (
 	github.com/kisielk/errcheck v1.6.0 // indirect
 	github.com/kisielk/gotool v1.0.0 // indirect
 	github.com/klauspost/compress v1.14.2 // indirect
-	github.com/kulti/thelper v0.5.0 // indirect
+	github.com/kulti/thelper v0.5.1 // indirect
 	github.com/kunwardeep/paralleltest v1.0.3 // indirect
 	github.com/kyoh86/exportloopref v0.1.8 // indirect
 	github.com/ldez/gomoddirectives v0.2.2 // indirect
-	github.com/ldez/tagliatelle v0.3.0 // indirect
+	github.com/ldez/tagliatelle v0.3.1 // indirect
 	github.com/leonklingele/grouper v1.1.0 // indirect
 	github.com/magiconair/properties v1.8.5 // indirect
 	github.com/maratori/testpackage v1.0.1 // indirect
@@ -205,7 +205,7 @@ require (
 	github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369 // indirect
 	github.com/mbilski/exhaustivestruct v1.2.0 // indirect
 	github.com/mgechev/dots v0.0.0-20210922191527-e955255bf517 // indirect
-	github.com/mgechev/revive v1.1.3 // indirect
+	github.com/mgechev/revive v1.1.4 // indirect
 	github.com/mitchellh/copystructure v1.2.0 // indirect
 	github.com/mitchellh/go-homedir v1.1.0 // indirect
 	github.com/mitchellh/mapstructure v1.4.3 // indirect
@@ -272,7 +272,7 @@ require (
 	github.com/tommy-muehle/go-mnd/v2 v2.5.0 // indirect
 	github.com/ulikunitz/xz v0.5.10 // indirect
 	github.com/ultraware/funlen v0.0.3 // indirect
-	github.com/ultraware/whitespace v0.0.4 // indirect
+	github.com/ultraware/whitespace v0.0.5 // indirect
 	github.com/uudashr/gocognit v1.0.5 // indirect
 	github.com/vbatts/tar-split v0.11.2 // indirect
 	github.com/xanzy/go-gitlab v0.55.1 // indirect
diff --git a/tools/go.sum b/tools/go.sum

Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,6 @@ import (`
`19`	`19`	`"fmt"`
`20`	`20`
`21`	`21`	`"gocloud.dev/blob"`
`22`		`-`
`23`	`22`	`// Needed to link GCP drivers.`
`24`	`23`	`_ "gocloud.dev/blob/gcsblob"`
`25`	`24`	`)`