lints cleanly

Author: DoctorVin

.github/workflows/push-pr-lint.yaml

@@ -17,7 +17,7 @@ jobs:
       uses: golangci/golangci-lint-action@v3
       with:
         args: --config .golangci.yml --timeout 2m
-        version: v1.56.2
+        version: v1.61.0
 
     - name: Test
       run: go test ./...

.golangci.yml

@@ -6,16 +6,14 @@ service:
 linters-settings:
   govet:
     auto-fix: true
-    check-shadowing: true
+    shadow: true
     settings:
       printf:
         funcs:
           - (github.com/golangci/golangci-lint/pkg/logutils.Log).Infof
           - (github.com/golangci/golangci-lint/pkg/logutils.Log).Warnf
           - (github.com/golangci/golangci-lint/pkg/logutils.Log).Errorf
           - (github.com/golangci/golangci-lint/pkg/logutils.Log).Fatalf
-  revive:
-    min-confidence: 0
   gocyclo:
     min-complexity: 15
   dupl:
@@ -62,9 +60,8 @@ linters:
     # additional linters
     - bodyclose
     - gocritic
-    - goerr113
+    - err113
     - goimports
-    - revive
     - misspell
     - noctx
     - stylecheck
@@ -77,19 +74,15 @@ linters:
     - nilerr
     - reassign
     - whitespace
-    - exportloopref
 
   enable-all: false
   disable-all: true
 
-run:
-  #  build-tags:
-  skip-dirs:
+issues:
+  exclude-dirs:
     - internal/fixtures
-  skip-files:
+  exclude-files:
     - "(.*/)*.*_test.go"
-
-issues:
   exclude-rules:
     - linters:
         - gosec

cmd/bios/bios.go

@@ -1,3 +1,4 @@
+//nolint:gocritic,err113 // the commented code and dynamic error are intentional
 package bios
 
 import (

cmd/common.go

@@ -117,7 +117,7 @@ func (e *ErrUnexpectedResponse) Error() string {
 		s += " response message: " + e.message
 	}
 
-	return fmt.Sprintf("Unexpected response from Conditions API " + s)
+	return fmt.Sprintf("Unexpected response from Conditions API: %s", s)
 }
 
 func newErrUnexpectedResponse(statusCode int, message string) error {

cmd/create/firmware_set.go

@@ -89,7 +89,7 @@ func createFWSetsFromFile(ctx context.Context, client *fleetdbapi.Client, flgs *
 				continue
 			}
 
-			log.Printf("Adding firmware object: " + fw.UUID.String())
+			log.Printf("Adding firmware object: %s", fw.UUID.String())
 			_, _, err = client.CreateServerComponentFirmware(ctx, fw)
 			if err != nil {
 				log.Fatal("error adding firmware object: ", err)
@@ -98,7 +98,7 @@ func createFWSetsFromFile(ctx context.Context, client *fleetdbapi.Client, flgs *
 			firmwareAdded[fw.UUID.String()] = true
 		}
 
-		log.Printf("Adding firmware-set object: " + set.UUID.String())
+		log.Printf("Adding firmware-set object: %s", set.UUID.String())
 		req := fleetdbapi.ComponentFirmwareSetRequest{
 			ID:                     set.UUID,
 			Attributes:             set.Attributes,

cmd/validate_firmware.go

@@ -16,7 +16,7 @@ type validationFlags struct {
 
 var (
 	// incoming command line parameters
-	fwv_flags = &validationFlags{}
+	fwvFlags = &validationFlags{}
 )
 
 var validateFirmwareCmd = &cobra.Command{
@@ -30,12 +30,12 @@ var validateFirmwareCmd = &cobra.Command{
 			log.Fatalf("creating app structure: %s", err.Error())
 		}
 
-		srvID, err := uuid.Parse(fwv_flags.srvIDStr)
+		srvID, err := uuid.Parse(fwvFlags.srvIDStr)
 		if err != nil {
 			log.Fatalf("parsing server id: %s", err.Error())
 		}
 
-		fwSetID, err := uuid.Parse(fwv_flags.fwSetIDStr)
+		fwSetID, err := uuid.Parse(fwvFlags.fwSetIDStr)
 		if err != nil {
 			log.Fatalf("parsing firmware set id: %s", err.Error())
 		}
@@ -50,16 +50,16 @@ var validateFirmwareCmd = &cobra.Command{
 			log.Fatalf("making validate firmware call: %s", err.Error())
 		}
 
-		PrintResults(fwv_flags.output, resp)
+		PrintResults(fwvFlags.output, resp)
 	},
 }
 
 func init() {
 	RootCmd.AddCommand(validateFirmwareCmd)
 
-	AddOutputFlag(validateFirmwareCmd, &fwv_flags.output)
-	AddFirmwareSetFlag(validateFirmwareCmd, &fwv_flags.fwSetIDStr)
-	AddServerFlag(validateFirmwareCmd, &fwv_flags.srvIDStr)
+	AddOutputFlag(validateFirmwareCmd, &fwvFlags.output)
+	AddFirmwareSetFlag(validateFirmwareCmd, &fwvFlags.fwSetIDStr)
+	AddServerFlag(validateFirmwareCmd, &fwvFlags.srvIDStr)
 	RequireFlag(validateFirmwareCmd, ServerFlag)
 	RequireFlag(validateFirmwareCmd, FirmwareSetFlag)
 }