golangci-lint: add mirror+nolintlint linters + fixes (#18863)

Signed-off-by: Tim Vaillancourt <[email protected]>

Author: timvaillancourt

.github/workflows/static_checks_etc.yml

@@ -188,7 +188,7 @@ jobs:
 
       - name: Install golangci-lint
         if: steps.changes.outputs.go_files == 'true'
-        run: go install github.com/golangci/golangci-lint/v2/cmd/golangci-lint@v2.0.2
+        run: go install github.com/golangci/golangci-lint/v2/cmd/golangci-lint@v2.1.6
 
       - name: Clean Env
         if: steps.changes.outputs.go_files == 'true'

.golangci.yml

@@ -10,6 +10,8 @@ linters:
     - errcheck
     - govet
     - ineffassign
+    - mirror
+    - nolintlint
     - perfsprint
     - sqlclosecheck
     - staticcheck
@@ -139,9 +141,6 @@ linters:
       - linters:
           - errcheck
         path: ^go/mysql/
-      - linters:
-          - revive
-        path: ^go/mysql/collations
       - linters:
           - errcheck
         path: ^go/pools/.*_test.go

go/cmd/vtclient/cli/vtclient_test.go

@@ -79,7 +79,7 @@ func TestVtclient(t *testing.T) {
 	if err := cluster.Setup(); err != nil {
 		t.Fatalf("InitSchemas failed: %v", err)
 	}
-	defer cluster.TearDown() // nolint:errcheck
+	defer cluster.TearDown()
 
 	vtgateAddr := fmt.Sprintf("localhost:%v", cluster.Env.PortForProtocol("vtcombo", "grpc"))
 	queries := []struct {

go/cmd/vtctl/vtctl_unix.go

@@ -26,7 +26,7 @@ import (
 
 func logSyslog(msg string) {
 	if syslogger, err := syslog.New(syslog.LOG_INFO, "vtctl "); err == nil {
-		syslogger.Info(msg) // nolint:errcheck
+		syslogger.Info(msg) //nolint:errcheck
 	} else {
 		log.Warningf("cannot connect to syslog: %v", err)
 	}

go/cmd/vtctldclient/command/schema.go

@@ -150,7 +150,7 @@ func commandApplySchema(cmd *cobra.Command, args []string) error {
 	var allSQL string
 	if applySchemaOptions.SQLFile != "" {
 		if len(applySchemaOptions.SQL) != 0 {
-			return errors.New("Exactly one of --sql and --sql-file must be specified, not both.") // nolint
+			return errors.New("Exactly one of --sql and --sql-file must be specified, not both.")
 		}
 
 		data, err := os.ReadFile(applySchemaOptions.SQLFile)

go/cmd/vtctldclient/command/shards.go

@@ -547,7 +547,7 @@ func commandSourceShardAdd(cmd *cobra.Command, args []string) error {
 
 	uid, err := strconv.ParseInt(cmd.Flags().Arg(1), 10, 32)
 	if err != nil {
-		return fmt.Errorf("Failed to parse SourceShard uid: %w", err) // nolint
+		return fmt.Errorf("Failed to parse SourceShard uid: %w", err)
 	}
 
 	sks, sshard, err := topoproto.ParseKeyspaceShard(cmd.Flags().Arg(2))
@@ -601,7 +601,7 @@ func commandSourceShardDelete(cmd *cobra.Command, args []string) error {
 
 	uid, err := strconv.ParseInt(cmd.Flags().Arg(1), 10, 32)
 	if err != nil {
-		return fmt.Errorf("Failed to parse SourceShard uid: %w", err) // nolint
+		return fmt.Errorf("Failed to parse SourceShard uid: %w", err)
 	}
 
 	cli.FinishedParsing(cmd)

go/mysql/collations/tools/makecolldata/contractions.go

@@ -61,7 +61,7 @@ func printContraction1(g *codegen.Generator, wa *weightarray, incont []uca.Contr
 			trie[r] = append(trie[r], cont)
 		}
 		if depth == len(cont.Path) {
-			leaf = &cont // nolint:exportloopref
+			leaf = &cont
 		}
 	}
 

go/mysql/replication.go

@@ -93,14 +93,14 @@ func (c *Conn) WriteComBinlogDumpGTID(serverID uint32, binlogFilename string, bi
 		4 + // data-size
 		len(sidBlock) // data
 	data, pos := c.startEphemeralPacketWithHeader(length)
-	pos = writeByte(data, pos, ComBinlogDumpGTID)             // nolint
-	pos = writeUint16(data, pos, flags)                       // nolint
-	pos = writeUint32(data, pos, serverID)                    // nolint
-	pos = writeUint32(data, pos, uint32(len(binlogFilename))) // nolint
-	pos = writeEOFString(data, pos, binlogFilename)           // nolint
-	pos = writeUint64(data, pos, binlogPos)                   // nolint
-	pos = writeUint32(data, pos, uint32(len(sidBlock)))       // nolint
-	pos += copy(data[pos:], sidBlock)                         // nolint
+	pos = writeByte(data, pos, ComBinlogDumpGTID)
+	pos = writeUint16(data, pos, flags)
+	pos = writeUint32(data, pos, serverID)
+	pos = writeUint32(data, pos, uint32(len(binlogFilename)))
+	pos = writeEOFString(data, pos, binlogFilename)
+	pos = writeUint64(data, pos, binlogPos)
+	pos = writeUint32(data, pos, uint32(len(sidBlock)))
+	pos += copy(data[pos:], sidBlock) //nolint
 	if err := c.writeEphemeralPacket(); err != nil {
 		return sqlerror.NewSQLErrorf(sqlerror.CRServerGone, sqlerror.SSUnknownSQLState, "%v", err)
 	}

go/mysql/sqlerror/sql_error.go

@@ -367,14 +367,14 @@ func convertToMysqlError(err error) error {
 	if !ok {
 		return err
 	}
-	return NewSQLError(mysqlCode.num, mysqlCode.state, err.Error()) //nolint:govet
+	return NewSQLError(mysqlCode.num, mysqlCode.state, err.Error())
 }
 
 var isGRPCOverflowRE = regexp.MustCompile(`.*?grpc: (received|trying to send) message larger than max \(\d+ vs. \d+\)`)
 
 func demuxResourceExhaustedErrors(msg string) ErrorCode {
 	switch {
-	case isGRPCOverflowRE.Match([]byte(msg)):
+	case isGRPCOverflowRE.MatchString(msg):
 		return ERNetPacketTooLarge
 	case strings.Contains(msg, "Transaction throttled"):
 		return EROutOfResources

go/sqltypes/value.go

@@ -831,7 +831,7 @@ func encodeBinarySQLBytes2(val []byte, buf *bytes2.Buffer) {
 }
 
 func encodeBinarySQLStringBuilder(val []byte, buf *strings.Builder) {
-	buf.Write([]byte("_binary"))
+	buf.WriteString("_binary")
 	encodeBytesSQLStringBuilder(val, buf)
 }