GODRIVER-3293 Upgrade golangci-lint to 1.59.1 and fix lint errors.

Author: matthewdale

.golangci.yml

@@ -1,12 +1,5 @@
 run:
   timeout: 5m
-  skip-dirs-use-default: false
-  skip-dirs:
-    - (^|/)vendor($|/)
-    - (^|/)testdata($|/)
-    - (^|/)etc($|/)
-    # Disable all linters for "golang.org/x/exp/rand" package in internal/rand.
-    - internal/rand
 
 linters:
   disable-all: true
@@ -35,11 +28,7 @@ linters:
 
 linters-settings:
   errcheck:
-    exclude: .errcheck-excludes
-  gocritic:
-    enabled-checks:
-      # Detects suspicious append result assignments. E.g. "b := append(a, 1, 2, 3)"
-      - appendAssign
+    exclude-functions: .errcheck-excludes
   govet:
     disable:
       - cgocall
@@ -55,6 +44,14 @@ linters-settings:
     ]
 
 issues:
+  exclude-dirs-use-default: false
+  exclude-dirs:
+    - (^|/)testdata($|/)
+    - (^|/)etc($|/)
+    # Disable all linters for copied third-party code.
+    - internal/rand
+    - internal/aws
+    - internal/assert
   exclude-use-default: false
   exclude:
     # Add all default excluded issues except issues related to exported types/functions not having

Makefile

@@ -67,7 +67,7 @@ fmt:
 
 .PHONY: install-golangci-lint
 install-golangci-lint:
-	go install github.com/golangci/golangci-lint/cmd/golangci-lint@v1.52.2
+	go install github.com/golangci/golangci-lint/cmd/golangci-lint@v1.59.1
 
 # Lint with various GOOS and GOARCH targets to catch static analysis failures that may only affect
 # specific operating systems or architectures. For example, staticcheck will only check for 64-bit

bson/bsoncodec_test.go

@@ -23,7 +23,7 @@ func ExampleValueEncoder() {
 }
 
 func ExampleValueDecoder() {
-	var _ ValueDecoderFunc = func(dc DecodeContext, vr ValueReader, val reflect.Value) error {
+	var _ ValueDecoderFunc = func(_ DecodeContext, vr ValueReader, val reflect.Value) error {
 		if !val.CanSet() || val.Kind() != reflect.String {
 			return ValueDecoderError{Name: "StringDecodeValue", Kinds: []reflect.Kind{reflect.String}, Received: val}
 		}

bson/decimal.go

@@ -75,13 +75,12 @@ func (d Decimal128) BigInt() (*big.Int, int, error) {
 		// Bits: 1*sign 2*ignored 14*exponent 111*significand.
 		// Implicit 0b100 prefix in significand.
 		exp = int(high >> 47 & (1<<14 - 1))
-		//high = 4<<47 | d.h&(1<<47-1)
 		// Spec says all of these values are out of range.
 		high, low = 0, 0
 	} else {
 		// Bits: 1*sign 14*exponent 113*significand
 		exp = int(high >> 49 & (1<<14 - 1))
-		high = high & (1<<49 - 1)
+		high &= (1<<49 - 1)
 	}
 	exp += MinDecimal128Exp
 
@@ -258,7 +257,7 @@ var (
 
 // ParseDecimal128FromBigInt attempts to parse the given significand and exponent into a valid Decimal128 value.
 func ParseDecimal128FromBigInt(bi *big.Int, exp int) (Decimal128, bool) {
-	//copy
+	// copy
 	bi = new(big.Int).Set(bi)
 
 	q := new(big.Int)

bson/decoder_test.go

@@ -508,7 +508,7 @@ func TestDecoderConfiguration(t *testing.T) {
 		// independent of the top-level Go value type.
 		{
 			description: "DocumentD nested by default",
-			configure:   func(dec *Decoder) {},
+			configure:   func(_ *Decoder) {},
 			input: bsoncore.NewDocumentBuilder().
 				AppendDocument("myDocument", bsoncore.NewDocumentBuilder().
 					AppendString("myString", "test value").

bson/default_value_decoders.go

@@ -1286,7 +1286,8 @@ func decodeDefault(dc DecodeContext, vr ValueReader, val reflect.Value) ([]refle
 		var elem reflect.Value
 		if vDecoder == nil {
 			elem = val.Index(idx).Elem()
-			if elem.Kind() != reflect.Ptr || elem.IsNil() {
+			switch {
+			case elem.Kind() != reflect.Ptr || elem.IsNil():
 				valueDecoder, err := dc.LookupDecoder(elem.Type())
 				if err != nil {
 					return nil, err
@@ -1295,12 +1296,12 @@ func decodeDefault(dc DecodeContext, vr ValueReader, val reflect.Value) ([]refle
 				if err != nil {
 					return nil, newDecodeError(strconv.Itoa(idx), err)
 				}
-			} else if vr.Type() == TypeNull {
+			case vr.Type() == TypeNull:
 				if err = vr.ReadNull(); err != nil {
 					return nil, err
 				}
 				elem = reflect.Zero(val.Index(idx).Type())
-			} else {
+			default:
 				e := elem.Elem()
 				valueDecoder, err := dc.LookupDecoder(e.Type())
 				if err != nil {

bson/default_value_encoders_test.go

@@ -1075,7 +1075,7 @@ func TestDefaultValueEncoders(t *testing.T) {
 				},
 				{
 					"WriteArrayElement Error",
-					bsoncore.Array(buildDocumentArray(func(doc []byte) []byte {
+					bsoncore.Array(buildDocumentArray(func([]byte) []byte {
 						return bsoncore.AppendNullElement(nil, "foo")
 					})),
 					nil,
@@ -1085,7 +1085,7 @@ func TestDefaultValueEncoders(t *testing.T) {
 				},
 				{
 					"encodeValue error",
-					bsoncore.Array(buildDocumentArray(func(doc []byte) []byte {
+					bsoncore.Array(buildDocumentArray(func([]byte) []byte {
 						return bsoncore.AppendNullElement(nil, "foo")
 					})),
 					nil,

bson/extjson_parser.go

@@ -303,7 +303,7 @@ func (ejp *extJSONParser) readValue(t Type) (*extJSONValue, error) {
 				}
 
 				// remove hyphens
-				uuidNoHyphens := strings.Replace(uuid, "-", "", -1)
+				uuidNoHyphens := strings.ReplaceAll(uuid, "-", "")
 				if len(uuidNoHyphens) != 32 {
 					return nil, fmt.Errorf("$uuid value does not follow RFC 4122 format regarding length and hyphens")
 				}

bson/extjson_writer.go

@@ -567,13 +567,14 @@ func (ejvw *extJSONValueWriter) WriteArrayEnd() error {
 
 func formatDouble(f float64) string {
 	var s string
-	if math.IsInf(f, 1) {
+	switch {
+	case math.IsInf(f, 1):
 		s = "Infinity"
-	} else if math.IsInf(f, -1) {
+	case math.IsInf(f, -1):
 		s = "-Infinity"
-	} else if math.IsNaN(f) {
+	case math.IsNaN(f):
 		s = "NaN"
-	} else {
+	default:
 		// Print exactly one decimalType place for integers; otherwise, print as many are necessary to
 		// perfectly represent it.
 		s = strconv.FormatFloat(f, 'G', -1, 64)
@@ -678,9 +679,7 @@ func (ss sortableString) Less(i, j int) bool {
 }
 
 func (ss sortableString) Swap(i, j int) {
-	oldI := ss[i]
-	ss[i] = ss[j]
-	ss[j] = oldI
+	ss[i], ss[j] = ss[j], ss[i]
 }
 
 func sortStringAlphebeticAscending(s string) string {

bson/json_scanner.go

@@ -82,12 +82,13 @@ func (js *jsonScanner) nextToken() (*jsonToken, error) {
 		return js.scanString()
 	default:
 		// check if it's a number
-		if c == '-' || isDigit(c) {
+		switch {
+		case c == '-' || isDigit(c):
 			return js.scanNumber(c)
-		} else if c == 't' || c == 'f' || c == 'n' {
+		case c == 't' || c == 'f' || c == 'n':
 			// maybe a literal
 			return js.scanLiteral(c)
-		} else {
+		default:
 			return nil, fmt.Errorf("invalid JSON input. Position: %d. Character: %c", js.pos-1, c)
 		}
 	}
@@ -174,7 +175,7 @@ func getu4(s []byte) rune {
 	for _, c := range s[:4] {
 		switch {
 		case '0' <= c && c <= '9':
-			c = c - '0'
+			c -= '0'
 		case 'a' <= c && c <= 'f':
 			c = c - 'a' + 10
 		case 'A' <= c && c <= 'F':
@@ -325,13 +326,14 @@ func (js *jsonScanner) scanLiteral(first byte) (*jsonToken, error) {
 
 	c5, err := js.readNextByte()
 
-	if bytes.Equal([]byte("true"), lit) && (isValueTerminator(c5) || errors.Is(err, io.EOF)) {
+	switch {
+	case bytes.Equal([]byte("true"), lit) && (isValueTerminator(c5) || errors.Is(err, io.EOF)):
 		js.pos = int(math.Max(0, float64(js.pos-1)))
 		return &jsonToken{t: jttBool, v: true, p: p}, nil
-	} else if bytes.Equal([]byte("null"), lit) && (isValueTerminator(c5) || errors.Is(err, io.EOF)) {
+	case bytes.Equal([]byte("null"), lit) && (isValueTerminator(c5) || errors.Is(err, io.EOF)):
 		js.pos = int(math.Max(0, float64(js.pos-1)))
 		return &jsonToken{t: jttNull, v: nil, p: p}, nil
-	} else if bytes.Equal([]byte("fals"), lit) {
+	case bytes.Equal([]byte("fals"), lit):
 		if c5 == 'e' {
 			c5, err = js.readNextByte()
 
@@ -430,12 +432,13 @@ func (js *jsonScanner) scanNumber(first byte) (*jsonToken, error) {
 			case '}', ']', ',':
 				s = nssDone
 			default:
-				if isWhiteSpace(c) || errors.Is(err, io.EOF) {
+				switch {
+				case isWhiteSpace(c) || errors.Is(err, io.EOF):
 					s = nssDone
-				} else if isDigit(c) {
+				case isDigit(c):
 					s = nssSawIntegerDigits
 					b.WriteByte(c)
-				} else {
+				default:
 					s = nssInvalid
 				}
 			}
@@ -455,12 +458,13 @@ func (js *jsonScanner) scanNumber(first byte) (*jsonToken, error) {
 			case '}', ']', ',':
 				s = nssDone
 			default:
-				if isWhiteSpace(c) || errors.Is(err, io.EOF) {
+				switch {
+				case isWhiteSpace(c) || errors.Is(err, io.EOF):
 					s = nssDone
-				} else if isDigit(c) {
+				case isDigit(c):
 					s = nssSawFractionDigits
 					b.WriteByte(c)
-				} else {
+				default:
 					s = nssInvalid
 				}
 			}
@@ -490,12 +494,13 @@ func (js *jsonScanner) scanNumber(first byte) (*jsonToken, error) {
 			case '}', ']', ',':
 				s = nssDone
 			default:
-				if isWhiteSpace(c) || errors.Is(err, io.EOF) {
+				switch {
+				case isWhiteSpace(c) || errors.Is(err, io.EOF):
 					s = nssDone
-				} else if isDigit(c) {
+				case isDigit(c):
 					s = nssSawExponentDigits
 					b.WriteByte(c)
-				} else {
+				default:
 					s = nssInvalid
 				}
 			}