Merge pull request nsqio#1427 from mreiferson/cleanup

*: staticcheck linting cleanup

Author: mreiferson

.github/workflows/test.yml

@@ -11,55 +11,44 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        imgtag:
-          - "golang:1.14-buster"
-          - "golang:1.15-buster"
-          - "golang:1.16-bullseye"
-          - "golang:1.17-bullseye"
-        goarch:
-          - "amd64"
-          - "386"
+        go:   ["1.17.x", "1.18.x", "1.19.x"]
+        arch: ["amd64", "386"]
 
-    container: "${{matrix.imgtag}}"
     env:
-      GOPATH: "${{github.workspace}}/go"
-      GOARCH: "${{matrix.goarch}}"
-      SRCDIR: "go/src/github.com/nsqio/nsq"
+      GOARCH: "${{matrix.arch}}"
 
     steps:
       - uses: actions/checkout@v2
+
+      - uses: WillAbides/[email protected]
         with:
-          path: ${{env.SRCDIR}}
+          go-version: ${{matrix.go}}
 
       - name: build
-        run: |
-          cd $SRCDIR
-          make all
+        run: make all
 
       - name: test
-        run: |
-          cd $SRCDIR
-          ./test.sh
+        run: ./test.sh
 
-  send-coverage:
+  staticcheck:
     runs-on: ubuntu-20.04
-    timeout-minutes: 30
-    container: "golang:1.16-bullseye"
-    env:
-      GOPATH: "${{github.workspace}}/go"
-      SRCDIR: "go/src/github.com/nsqio/nsq"
-
     steps:
       - uses: actions/checkout@v2
+
+      - uses: dominikh/[email protected]
         with:
-          path: ${{env.SRCDIR}}
+          version: "2022.1.3"
+          install-go: false
+
+  code-coverage:
+    runs-on: ubuntu-20.04
+    steps:
+      - uses: actions/checkout@v2
 
-      - name: Install goveralls
+      - name: install goveralls
         run: go install github.com/mattn/goveralls@latest
 
-      - name: Send coverage
+      - name: send coverage
         env:
           COVERALLS_TOKEN: ${{secrets.GITHUB_TOKEN}}
-        run: |
-          cd $SRCDIR
-          ./coverage.sh --coveralls
+        run: ./coverage.sh --coveralls

apps/nsq_tail/nsq_tail.go

@@ -106,7 +106,7 @@ func main() {
 	cfg.MaxInFlight = *maxInFlight
 
 	consumers := []*nsq.Consumer{}
-	for i := 0; i < len(topics); i += 1 {
+	for i := 0; i < len(topics); i++ {
 		log.Printf("Adding consumer for topic: %s\n", topics[i])
 
 		consumer, err := nsq.NewConsumer(topics[i], *channel, cfg)

apps/nsq_to_file/file_logger.go

@@ -403,7 +403,7 @@ func computeFilenameFormat(opts *Options, topic string) (string, error) {
 
 	cff := opts.FilenameFormat
 	if opts.GZIP || opts.RotateSize > 0 || opts.RotateInterval > 0 || opts.WorkDir != opts.OutputDir {
-		if strings.Index(cff, "<REV>") == -1 {
+		if !strings.Contains(cff, "<REV>") {
 			return "", errors.New("missing <REV> in --filename-format when gzip, rotation, or work dir enabled")
 		}
 	} else {

apps/nsq_to_file/nsq_to_file.go

@@ -18,16 +18,6 @@ import (
 	"github.com/nsqio/nsq/internal/version"
 )
 
-func hasArg(s string) bool {
-	argExist := false
-	flag.Visit(func(f *flag.Flag) {
-		if f.Name == s {
-			argExist = true
-		}
-	})
-	return argExist
-}
-
 func flagSet() *flag.FlagSet {
 	fs := flag.NewFlagSet("nsqd", flag.ExitOnError)
 

apps/nsq_to_http/nsq_to_http.go

@@ -8,7 +8,6 @@ import (
 	"flag"
 	"fmt"
 	"io"
-	"io/ioutil"
 	"log"
 	"math/rand"
 	"net/http"
@@ -130,7 +129,7 @@ func (p *PostPublisher) Publish(addr string, msg []byte) error {
 	if err != nil {
 		return err
 	}
-	io.Copy(ioutil.Discard, resp.Body)
+	io.Copy(io.Discard, resp.Body)
 	resp.Body.Close()
 
 	if resp.StatusCode < 200 || resp.StatusCode >= 300 {
@@ -147,7 +146,7 @@ func (p *GetPublisher) Publish(addr string, msg []byte) error {
 	if err != nil {
 		return err
 	}
-	io.Copy(ioutil.Discard, resp.Body)
+	io.Copy(io.Discard, resp.Body)
 	resp.Body.Close()
 
 	if resp.StatusCode != 200 {
@@ -156,16 +155,6 @@ func (p *GetPublisher) Publish(addr string, msg []byte) error {
 	return nil
 }
 
-func hasArg(s string) bool {
-	argExist := false
-	flag.Visit(func(f *flag.Flag) {
-		if f.Name == s {
-			argExist = true
-		}
-	})
-	return argExist
-}
-
 func main() {
 	var publisher Publisher
 	var addresses app.StringArray
@@ -306,12 +295,12 @@ func parseCustomHeaders(strs []string) (map[string]string, error) {
 	for _, s := range strs {
 		sp := strings.SplitN(s, ":", 2)
 		if len(sp) != 2 {
-			return nil, fmt.Errorf("Invalid headers: %q", s)
+			return nil, fmt.Errorf("invalid header: %q", s)
 		}
 		key := strings.TrimSpace(sp[0])
 		val := strings.TrimSpace(sp[1])
 		if key == "" || val == "" {
-			return nil, fmt.Errorf("Invalid headers: %q", s)
+			return nil, fmt.Errorf("invalid header: %q", s)
 		}
 		parsedHeaders[key] = val
 

apps/nsq_to_nsq/nsq_to_nsq.go

@@ -254,16 +254,6 @@ func (ph *PublishHandler) HandleMessage(m *nsq.Message, destinationTopic string)
 	return nil
 }
 
-func hasArg(s string) bool {
-	argExist := false
-	flag.Visit(func(f *flag.Flag) {
-		if f.Name == s {
-			argExist = true
-		}
-	})
-	return argExist
-}
-
 func main() {
 	var selectedMode int
 

apps/nsqadmin/main.go

@@ -51,7 +51,7 @@ func nsqadminFlagSet(opts *nsqadmin.Options) *flag.FlagSet {
 	flagSet.String("http-client-tls-key", "", "path to key file for the HTTP client")
 
 	flagSet.String("allow-config-from-cidr", opts.AllowConfigFromCIDR, "A CIDR from which to allow HTTP requests to the /config endpoint")
-	flagSet.String("acl-http-header", opts.AclHttpHeader, "HTTP header to check for authenticated admin users")
+	flagSet.String("acl-http-header", opts.ACLHTTPHeader, "HTTP header to check for authenticated admin users")
 
 	nsqlookupdHTTPAddresses := app.StringArray{}
 	flagSet.Var(&nsqlookupdHTTPAddresses, "lookupd-http-address", "lookupd HTTP address (may be given multiple times)")

apps/nsqd/options.go

@@ -43,7 +43,6 @@ var tlsVersionTable = []struct {
 	val uint16
 	str string
 }{
-	{tls.VersionSSL30, "ssl3.0"},
 	{tls.VersionTLS10, "tls1.0"},
 	{tls.VersionTLS11, "tls1.1"},
 	{tls.VersionTLS12, "tls1.2"},

apps/to_nsq/to_nsq.go

@@ -79,7 +79,7 @@ func main() {
 		}
 		log.Printf("Throttling messages rate to max:%d/second", *rate)
 		// every tick increase the number of messages we can send
-		for _ = range time.Tick(interval) {
+		for range time.Tick(interval) {
 			n := atomic.AddInt64(&balance, 1)
 			// if we build up more than 1s of capacity just bound to that
 			if n > int64(*rate) {

bench/bench_reader/bench_reader.go

@@ -50,7 +50,7 @@ func main() {
 		if err != nil {
 			log.Fatal(err)
 		}
-		d := t.Sub(time.Now())
+		d := time.Until(t)
 		log.Printf("sleeping until %s (%s)", t, d)
 		time.Sleep(d)
 	}