chore(ci): Updates to latest golangci-lint (#901)

Author: dmihalcik-virtru

.github/workflows/checks.yaml

@@ -94,7 +94,7 @@ jobs:
       - name: golangci-lint
         uses: golangci/golangci-lint-action@9d1e0624a798bb64f6c3cea93db47765312263dc
         with:
-          version: v1.57
+          version: v1.58
           working-directory: ${{ matrix.directory }}
           skip-cache: true
           args: --out-format=colored-line-number

.golangci.yaml

@@ -9,6 +9,8 @@ linters-settings:
     # Such cases aren't reported by default.
     # Default: false
     check-type-assertions: true
+    # https://github.com/golangci/golangci-lint/issues/4743
+    ignore: ''
 
   exhaustive:
     # Program elements to check for exhaustiveness.
@@ -31,7 +33,7 @@ linters-settings:
         # Default: true
         skipRecvDeref: false
 
-  gomnd:
+  mnd:
     # List of function patterns to exclude from analysis.
     # Values always ignored: `time.Date`,
     # `strconv.FormatInt`, `strconv.FormatUint`, `strconv.FormatFloat`,
@@ -131,7 +133,6 @@ linters:
     - durationcheck # checks for two durations multiplied together
     - errname # checks that sentinel errors are prefixed with the Err and error types are suffixed with the Error
     - errorlint # finds code that will cause problems with the error wrapping scheme introduced in Go 1.13
-    - execinquery # checks query string in Query function which reads your Go src files and warning it finds
     - exhaustive # checks exhaustiveness of enum switch statements
     - exportloopref # checks for pointers to enclosing loop variables
     - forbidigo # forbids identifiers
@@ -141,12 +142,12 @@ linters:
     - gocritic # provides diagnostics that check for bugs, performance and style issues
     - gofmt # checks whether code was gofmt-ed
     - goimports # in addition to fixing imports, goimports also formats your code in the same style as gofmt
-    - gomnd # detects magic numbers
     - gomodguard # allow and block lists linter for direct Go module dependencies. This is different from depguard where there are different block types for example version constraints and module recommendations
     - goprintffuncname # checks that printf-like functions are named with f at the end
     - gosec # inspects source code for security problems
     - loggercheck # checks key value pairs for common logger libraries (kitlog,klog,logr,zap)
     - makezero # finds slice declarations with non-zero initial length
+    - mnd # detects magic numbers
     - musttag # enforces field tags in (un)marshaled structs
     - nakedret # finds naked returns in functions greater than a specified function length
     - nestif # reports deeply nested if statements

Makefile

@@ -17,7 +17,7 @@ all: toolcheck clean build lint license test
 toolcheck:
 	@echo "Checking for required tools..."
 	@which buf > /dev/null || (echo "buf not found, please install it from https://docs.buf.build/installation" && exit 1)
-	@which golangci-lint > /dev/null || (echo "golangci-lint not found, run  'go install github.com/golangci/golangci-lint/cmd/golangci-lint@v1.57.2'" && exit 1)
+	@which golangci-lint > /dev/null || (echo "golangci-lint not found, run  'go install github.com/golangci/golangci-lint/cmd/golangci-lint@v1.58.1'" && exit 1)
 	@which protoc-gen-doc > /dev/null || (echo "protoc-gen-doc not found, run 'go install github.com/pseudomuto/protoc-gen-doc/cmd/protoc-gen-doc@v1.5.1'" && exit 1)
 	@golangci-lint --version | grep "version v\?1.5[678]" > /dev/null || (echo "golangci-lint version must be v1.56 or later [$$(golangci-lint --version)]" && exit 1)
 	@which goimports >/dev/null || (echo "goimports not found, run 'go install golang.org/x/tools/cmd/goimports@latest'")

lib/fixtures/keycloak.go

@@ -466,8 +466,17 @@ func createRealm(ctx context.Context, kcConnectParams KeycloakConnectParams, rea
 
 	// Create realm
 	r, err := client.GetRealm(ctx, token.AccessToken, *realm.Realm)
-	if err != nil {
-		kcErr := err.(*gocloak.APIError) //nolint:errcheck,errorlint,forcetypeassert // kc error checked below
+	var kcErr *gocloak.APIError
+	if errors.As(err, &kcErr) {
+		switch kcErr.Code {
+		case http.StatusNotFound:
+			// yes
+		case http.StatusConflict:
+			slog.Info(fmt.Sprintf("⏭️ %s realm already exists, skipping create", *realm.Realm))
+		default:
+			return err
+		}
+	} else if err != nil {
 		if kcErr.Code == http.StatusConflict {
 			slog.Info(fmt.Sprintf("⏭️ %s realm already exists, skipping create", *realm.Realm))
 		} else if kcErr.Code != http.StatusNotFound {

sdk/internal/archive/writer.go

@@ -1,4 +1,4 @@
-//nolint:gomnd // pkzip magics and lengths are inlined for clarity
+//nolint:mnd // pkzip magics and lengths are inlined for clarity
 package archive
 
 import (

sdk/nanotdf.go

@@ -26,14 +26,14 @@ import (
 
 // / Constants
 const (
-	kMaxTDFSize = ((16 * 1024 * 1024) - 3 - 32) //nolint:gomnd // 16 mb - 3(iv) - 32(max auth tag)
+	kMaxTDFSize = ((16 * 1024 * 1024) - 3 - 32) //nolint:mnd // 16 mb - 3(iv) - 32(max auth tag)
 	// kDatasetMaxMBBytes = 2097152                       // 2mb
 
 	// Max size of the encrypted tdfs
 	//  16mb payload
 	// ~67kb of policy
 	// 133 of signature
-	// kMaxEncryptedNTDFSize = (16 * 1024 * 1024) + (68 * 1024) + 133 //nolint:gomnd // See comment block above
+	// kMaxEncryptedNTDFSize = (16 * 1024 * 1024) + (68 * 1024) + 133 //nolint:mnd // See comment block above
 
 	kIvPadding                    = 9
 	kNanoTDFIvSize                = 3
@@ -217,11 +217,11 @@ const (
 func deserializeBindingCfg(b byte) bindingConfig {
 	cfg := bindingConfig{}
 	// Shift to low nybble test low bit
-	cfg.useEcdsaBinding = (b >> 7 & 0b00000001) == 1 //nolint:gomnd // better readability as literal
+	cfg.useEcdsaBinding = (b >> 7 & 0b00000001) == 1 //nolint:mnd // better readability as literal
 	// ignore padding
 	cfg.padding = 0
 	// shift to low nybble and use low 3 bits
-	cfg.eccMode = ocrypto.ECCMode((b >> 4) & 0b00000111) //nolint:gomnd // better readability as literal
+	cfg.eccMode = ocrypto.ECCMode((b >> 4) & 0b00000111) //nolint:mnd // better readability as literal
 
 	return cfg
 }
@@ -235,7 +235,7 @@ func serializeBindingCfg(bindCfg bindingConfig) byte {
 		bindSerial |= 0b10000000
 	}
 	// Mask value to low 3 bytes and shift to high nybble
-	bindSerial |= (byte(bindCfg.eccMode) & 0b00000111) << 4 //nolint:gomnd // better readability as literal
+	bindSerial |= (byte(bindCfg.eccMode) & 0b00000111) << 4 //nolint:mnd // better readability as literal
 
 	return bindSerial
 }
@@ -254,11 +254,11 @@ func serializeBindingCfg(bindCfg bindingConfig) byte {
 func deserializeSignatureCfg(b byte) signatureConfig {
 	cfg := signatureConfig{}
 	// Shift high bit down and mask to test for value
-	cfg.hasSignature = (b >> 7 & 0b000000001) == 1 //nolint:gomnd // better readability as literal
+	cfg.hasSignature = (b >> 7 & 0b000000001) == 1 //nolint:mnd // better readability as literal
 	// Shift high nybble down and mask for eccmode value
-	cfg.signatureMode = ocrypto.ECCMode((b >> 4) & 0b00000111) //nolint:gomnd // better readability as literal
+	cfg.signatureMode = ocrypto.ECCMode((b >> 4) & 0b00000111) //nolint:mnd // better readability as literal
 	// Mask low nybble for cipher value
-	cfg.cipher = CipherMode(b & 0b00001111) //nolint:gomnd // better readability as literal
+	cfg.cipher = CipherMode(b & 0b00001111) //nolint:mnd // better readability as literal
 
 	return cfg
 }
@@ -272,9 +272,9 @@ func serializeSignatureCfg(sigCfg signatureConfig) byte {
 		sigSerial |= 0b10000000
 	}
 	// Mask low 3 bits of mode and shift to high nybble
-	sigSerial |= byte((sigCfg.signatureMode)&0b00000111) << 4 //nolint:gomnd // better readability as literal
+	sigSerial |= byte((sigCfg.signatureMode)&0b00000111) << 4 //nolint:mnd // better readability as literal
 	// Mask low nybble of cipher
-	sigSerial |= byte((sigCfg.cipher) & 0b00001111) //nolint:gomnd // better readability as literal
+	sigSerial |= byte((sigCfg.cipher) & 0b00001111) //nolint:mnd // better readability as literal
 
 	return sigSerial
 }

sdk/sdk.go

@@ -152,7 +152,7 @@ func buildIDPTokenSource(c *config) (auth.AccessTokenSource, error) {
 	// any just return a KAS client that can only get public keys
 	if c.clientCredentials == nil {
 		slog.Info("no client credentials provided. GRPC requests to KAS and services will not be authenticated.")
-		return nil, nil // not having credentials is not an error
+		return nil, nil //nolint:nilnil // not having credentials is not an error
 	}
 
 	if c.certExchange != nil && c.tokenExchange != nil {

service/internal/opa/opa.go

@@ -104,7 +104,7 @@ func (l *AdapterSlogger) GetLevel() opalog.Level {
 
 // getFields returns additional fields of this logger.
 func (l *AdapterSlogger) getFieldsKV() []interface{} {
-	kv := make([]interface{}, len(l.fields)*2) //nolint:gomnd // key and value is added so double the length
+	kv := make([]interface{}, len(l.fields)*2) //nolint:mnd // key and value is added so double the length
 	i := 0
 	for k, v := range l.fields {
 		kv[i] = k