chore: linter updates and such

scrapli · Jun 1, 2024 · 7a34c42 · 7a34c42
1 parent 824e107
commit 7a34c42
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 10 deletions.
diff --git a/.github/workflows/commit.yaml b/.github/workflows/commit.yaml
@@ -40,9 +40,9 @@ jobs:
           go-version: ${{ matrix.go-version }}
 
       - name: lint
-        uses: golangci/golangci-lint-action@v5
+        uses: golangci/golangci-lint-action@v6
         with:
-          version: v1.57
+          version: v1.59
           args: --timeout 5m
           # caching issues, see: https://github.com/golangci/golangci-lint-action/issues/244#issuecomment-1052190775
           skip-pkg-cache: true

diff --git a/.golangci.yaml b/.golangci.yaml
@@ -31,6 +31,7 @@ linters:
     - dupl
     - dupword
     - durationcheck
+    - err113
     - errcheck
     - errchkjson
     - errname
@@ -48,11 +49,9 @@ linters:
     - gocyclo
     - godot
     - godox
-    - goerr113
     - gofmt
     - gofumpt
     - goimports
-    - gomnd
     - goprintffuncname
     - gosec
     - gosimple
@@ -64,6 +63,7 @@ linters:
     - maintidx
     - makezero
     - misspell
+    - mnd
     - nakedret
     - nestif
     - nilerr
@@ -117,10 +117,10 @@ issues:
       text: "package-comments"
 
 run:
-  go: '1.21'
+  go: '1.22'
 
 output:
   uniq-by-line: false
 
 service:
-  golangci-lint-version: 1.57.x
+  golangci-lint-version: 1.59.x
diff --git a/driver/netconf/open_test.go b/driver/netconf/open_test.go
@@ -26,7 +26,7 @@ func testOpen(testName string, testCase *util.PayloadTestCase) func(t *testing.T
 				options.WithTransportType(transport.FileTransport),
 				options.WithFileTransportFile(resolveFile(t, testCase.PayloadFile)),
 				options.WithReadDelay(0),
-				options.WithTimeoutOps(1*time.Second),
+				options.WithTimeoutOps(2*time.Second),
 			)
 			if err != nil {
 				errChan <- err

diff --git a/driver/netconf/rpc.go b/driver/netconf/rpc.go
@@ -84,7 +84,7 @@ func (d *Driver) sendRPC(
 				break
 			}
 
-			time.Sleep(5 * time.Microsecond) //nolint: gomnd
+			time.Sleep(5 * time.Microsecond) //nolint: mnd
 		}
 
 		done <- data

diff --git a/transport/telnet.go b/transport/telnet.go
@@ -47,7 +47,7 @@ func (t *Telnet) handleControlCharResponse(ctrlBuf []byte, c byte) ([]byte, erro
 		}
 	} else if len(ctrlBuf) == 1 && util.ByteIsAny(c, []byte{do, dont, will, wont}) {
 		ctrlBuf = append(ctrlBuf, c)
-	} else if len(ctrlBuf) == 2 { //nolint:gomnd
+	} else if len(ctrlBuf) == 2 { //nolint:mnd
 		cmd := ctrlBuf[1:2][0]
 		ctrlBuf = make([]byte, 0)
 
@@ -85,7 +85,7 @@ func (t *Telnet) handleControlChars(a *Args) error {
 		}
 
 		// speed up timeout after initial Read
-		d = a.TimeoutSocket / controlCharSocketTimeoutDivisor * 2 //nolint:gomnd
+		d = a.TimeoutSocket / controlCharSocketTimeoutDivisor * 2 //nolint:mnd
 
 		charBuf := make([]byte, 1)
-Original file line number
+Diff line change
@@ Expand Up / @@ -84,7 +84,7 @@ func (d *Driver) sendRPC( @@
     				break
     			}
-    			time.Sleep(5 * time.Microsecond) //nolint: gomnd
+    			time.Sleep(5 * time.Microsecond) //nolint: mnd
     		}
     		done <- data
@@ Expand Down @@