Merge pull request #3769 from ActiveState/mitchell/cp-1171

Merge v48 into master

Author: mitchell-as

.golangci.yaml

@@ -1,53 +1,57 @@
-issues:
-  exclude-dirs:
-    - vendor
-  exclude-rules:
-    - linters:
-        - staticcheck
-      text: "SA9004"
-
-linters-settings:
-  errcheck:
-    exclude-functions:
-      - fmt.Fprintln
-      - (*github.com/ActiveState/termtest.TermTest).Expect
-      - (*github.com/ActiveState/termtest.TermTest).ExpectExitCode
-      - (*github.com/ActiveState/termtest.TermTest).ExpectNotExitCode
-      - (*github.com/ActiveState/termtest.TermTest).ExpectRe
-      - (*github.com/ActiveState/termtest.TermTest).Expect
-      - (*github.com/ActiveState/termtest.TermTest).WaitForInput
-      - (*github.com/ActiveState/termtest.TermTest).SendLine
-      - (*github.com/ActiveState/termtest.TermTest).ExpectInput
-      - (*github.com/ActiveState/termtest.TermTest).ExpectExit
-      - (*github.com/ActiveState/termtest.TermTest).Wait
-      - (*github.com/ActiveState/logging.fileHandler).Printf
-      - (*github.com/ActiveState/logging.standardHandler).Printf
-      - (*github.com/ActiveState/cli/internal/testhelpers/e2e.Session).Close
-      - (*github.com/ActiveState/cli/internal/testhelpers/e2e.SpawnedCmd).ExpectInput
-      - (*github.com/ActiveState/cli/internal/testhelpers/e2e.SpawnedCmd).Send
-      - (*github.com/ActiveState/cli/internal/testhelpers/e2e.SpawnedCmd).SendLine
-      - (*github.com/ActiveState/cli/internal/testhelpers/e2e.SpawnedCmd).SendEnter
-      - (*github.com/ActiveState/cli/internal/testhelpers/e2e.SpawnedCmd).SendKeyDown
-      - (*github.com/ActiveState/cli/internal/testhelpers/e2e.SpawnedCmd).ExpectRe
-      - (*github.com/ActiveState/cli/internal/testhelpers/e2e.SpawnedCmd).Wait
-      - (*github.com/ActiveState/cli/internal/testhelpers/e2e.Session).ClearCache
-      - (*github.com/ActiveState/cli/internal/testhelpers/e2e.Dirs).Close
-      - github.com/ActiveState/cli/internal/testhelpers/osutil.RemoveConfigFile
-      - (*github.com/ActiveState/cli/internal/logging.standardHandler).Emit
-      - (*github.com/ActiveState/cli/internal/logging.fileHandler).Emit
-  govet:
-    disable:
-      - composites
-
-# When issues occur with linting us the snippet below to help with debugging
-# linters:
-#   # Disable all and re-enable the default linters as a starting point.
-#   disable-all: true
-#   enable:
-#     - errcheck
-#     - gosimple
-#     - govet
-#     - ineffassign
-#     - staticcheck
-#     - typecheck
-#     - unused
+version: "2"
+linters:
+  settings:
+    errcheck:
+      exclude-functions:
+        - fmt.Fprintln
+        - (*github.com/ActiveState/termtest.TermTest).Expect
+        - (*github.com/ActiveState/termtest.TermTest).ExpectExitCode
+        - (*github.com/ActiveState/termtest.TermTest).ExpectNotExitCode
+        - (*github.com/ActiveState/termtest.TermTest).ExpectRe
+        - (*github.com/ActiveState/termtest.TermTest).Expect
+        - (*github.com/ActiveState/termtest.TermTest).WaitForInput
+        - (*github.com/ActiveState/termtest.TermTest).SendLine
+        - (*github.com/ActiveState/termtest.TermTest).ExpectInput
+        - (*github.com/ActiveState/termtest.TermTest).ExpectExit
+        - (*github.com/ActiveState/termtest.TermTest).Wait
+        - (*github.com/ActiveState/logging.fileHandler).Printf
+        - (*github.com/ActiveState/logging.standardHandler).Printf
+        - (*github.com/ActiveState/cli/internal/testhelpers/e2e.Session).Close
+        - (*github.com/ActiveState/cli/internal/testhelpers/e2e.SpawnedCmd).ExpectInput
+        - (*github.com/ActiveState/cli/internal/testhelpers/e2e.SpawnedCmd).Send
+        - (*github.com/ActiveState/cli/internal/testhelpers/e2e.SpawnedCmd).SendLine
+        - (*github.com/ActiveState/cli/internal/testhelpers/e2e.SpawnedCmd).SendEnter
+        - (*github.com/ActiveState/cli/internal/testhelpers/e2e.SpawnedCmd).SendKeyDown
+        - (*github.com/ActiveState/cli/internal/testhelpers/e2e.SpawnedCmd).ExpectRe
+        - (*github.com/ActiveState/cli/internal/testhelpers/e2e.SpawnedCmd).Wait
+        - (*github.com/ActiveState/cli/internal/testhelpers/e2e.Session).ClearCache
+        - (*github.com/ActiveState/cli/internal/testhelpers/e2e.Dirs).Close
+        - github.com/ActiveState/cli/internal/testhelpers/osutil.RemoveConfigFile
+        - (*github.com/ActiveState/cli/internal/logging.standardHandler).Emit
+        - (*github.com/ActiveState/cli/internal/logging.fileHandler).Emit
+    govet:
+      disable:
+        - composites
+  exclusions:
+    generated: lax
+    presets:
+      - comments
+      - common-false-positives
+      - legacy
+      - std-error-handling
+    rules:
+      - linters:
+          - staticcheck
+        text: SA9004
+    paths:
+      - vendor
+      - third_party$
+      - builtin$
+      - examples$
+formatters:
+  exclusions:
+    generated: lax
+    paths:
+      - third_party$
+      - builtin$
+      - examples$

activestate.yaml

@@ -55,12 +55,12 @@ scripts:
     if: ne .Shell "cmd"
     value: |
       if ! type "go" &> /dev/null; then
-        echo "go is not installed. Please install Go version 1.23 or above."
+        echo "go is not installed. Please install Go version 1.24 or above."
         exit 1
       fi
       if ! type "golangci-lint" &> /dev/null; then
         echo "golangci-lint was not found on your PATH. Installing .."
-        go install github.com/golangci/golangci-lint/cmd/golangci-lint@v1.59.1
+        go install github.com/golangci/golangci-lint/cmd/golangci-lint@v2.6.2
       fi
       git config core.hooksPath .githooks
       if ! type "swagger" &> /dev/null; then