ci: update actions and golangci-lint, and fix linting

.github/workflows/ci.yml

@@ -14,18 +14,18 @@ jobs:
     runs-on: windows-2022
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
         with:
           show-progress: false
 
       - name: Install go
-        uses: actions/setup-go@v5
+        uses: actions/setup-go@v6
         with:
           go-version: ${{ env.GO_VERSION }}
           cache: false
 
       - name: Run golangci-lint
-        uses: golangci/golangci-lint-action@v4
+        uses: golangci/golangci-lint-action@v9
         with:
           version: ${{ env.GOLANGCILINT_VERSION }}
           args: >-
@@ -41,12 +41,12 @@ jobs:
     runs-on: windows-2022
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
         with:
           show-progress: false
 
       - name: Install go
-        uses: actions/setup-go@v5
+        uses: actions/setup-go@v6
         with:
           go-version: ${{ env.GO_VERSION }}
           # don't really need to cache Go packages, since go generate doesn't require much.
@@ -87,12 +87,12 @@ jobs:
         os: [windows-2019, windows-2022, ubuntu-latest]
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
         with:
           show-progress: false
 
       - name: Install go
-        uses: actions/setup-go@v5
+        uses: actions/setup-go@v6
         with:
           go-version: ${{ env.GO_VERSION }}
 
@@ -131,12 +131,12 @@ jobs:
     runs-on: "windows-2022"
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
         with:
           show-progress: false
 
       - name: Install go
-        uses: actions/setup-go@v5
+        uses: actions/setup-go@v6
         with:
           go-version: ${{ env.GO_VERSION }}
 

.golangci.yml

@@ -1,3 +1,7 @@
+version: "2"
+formatters:
+  enable:
+    - gofmt # files are gofmt'ed
 linters:
   enable:
     # style
@@ -13,139 +17,146 @@ linters:
     - contextcheck # function uses a non-inherited context
     - errorlint # errors not wrapped for 1.13
     - exhaustive # check exhaustiveness of enum switch statements
-    - gofmt # files are gofmt'ed
     - gosec # security
     - nilerr # returns nil even with non-nil error
     - thelper #  test helpers without t.Helper()
     - unparam # unused function params
 
-issues:
-  exclude-dirs:
-    - pkg/etw/sample
-
-  exclude-rules:
-    # err is very often shadowed in nested scopes
-    - linters:
-        - govet
-      text: '^shadow: declaration of "err" shadows declaration'
-
-    # ignore long lines for skip autogen directives
-    - linters:
-        - revive
-      text: "^line-length-limit: "
-      source: "^//(go:generate|sys) "
+  exclusions:
+    paths:
+      - pkg/etw/sample
+    presets:
+      - comments
+      - common-false-positives
+      - legacy
+      - std-error-handling
+    rules:
+      # err is very often shadowed in nested scopes
+      - linters:
+          - govet
+        text: '^shadow: declaration of "err" shadows declaration'
 
-    #TODO: remove after upgrading to go1.18
-    # ignore comment spacing for nolint and sys directives
-    - linters:
-        - revive
-      text: "^comment-spacings: no space between comment delimiter and comment text"
-      source: "//(cspell:|nolint:|sys |todo)"
+      # ignore long lines for skip autogen directives
+      - linters:
+          - revive
+        text: "^line-length-limit: "
+        source: "^//(go:generate|sys) "
 
-    # not on go 1.18 yet, so no any
-    - linters:
-        - revive
-      text: "^use-any: since GO 1.18 'interface{}' can be replaced by 'any'"
+      # ignore comment spacing for sys directives
+      - linters:
+          - revive
+        text: "^comment-spacings: no space between comment delimiter and comment text"
+        source: "//(cspell:|sys )"
 
-    # allow unjustified ignores of error checks in defer statements
-    - linters:
-        - nolintlint
-      text: "^directive `//nolint:errcheck` should provide explanation"
-      source: '^\s*defer '
+      # allow unjustified ignores of error checks in defer statements
+      - linters:
+          - nolintlint
+        text: "^directive `//nolint:errcheck` should provide explanation"
+        source: '^\s*defer '
 
-    # allow unjustified ignores of error lints for io.EOF
-    - linters:
-        - nolintlint
-      text: "^directive `//nolint:errorlint` should provide explanation"
-      source: '[=|!]= io.EOF'
+      # allow unjustified ignores of error lints for io.EOF
+      - linters:
+          - nolintlint
+        text: "^directive `//nolint:errorlint` should provide explanation"
+        source: '[=|!]= io.EOF'
 
-    - linters:
-        - gosec
-      text: "^G115: integer overflow conversion"
+      - linters:
+          - gosec
+        text: "^G115: integer overflow conversion"
 
 
-linters-settings:
-  exhaustive:
-    default-signifies-exhaustive: true
-  govet:
-    enable-all: true
-    disable:
-      # struct order is often for Win32 compat
-      # also, ignore pointer bytes/GC issues for now until performance becomes an issue
-      - fieldalignment
-  nolintlint:
-    require-explanation: true
-    require-specific: true
-  revive:
-    # revive is more configurable than static check, so likely the preferred alternative to static-check
-    # (once the perf issue is solved: https://github.com/golangci/golangci-lint/issues/2997)
-    enable-all-rules:
-      true
+  settings:
+    exhaustive:
+      default-signifies-exhaustive: true
+    govet:
+      enable-all: true
+      disable:
+        # struct order is often for Win32 compat
+        # also, ignore pointer bytes/GC issues for now until performance becomes an issue
+        - fieldalignment
+    nolintlint:
+      require-explanation: true
+      require-specific: true
+    revive:
+      # revive is more configurable than static check, so likely the preferred alternative to static-check
+      # (once the perf issue is solved: https://github.com/golangci/golangci-lint/issues/2997)
+      enable-all-rules:
+        true
       # https://github.com/mgechev/revive/blob/master/RULES_DESCRIPTIONS.md
-    rules:
-      # rules with required arguments
-      - name: argument-limit
-        disabled: true
-      - name: banned-characters
-        disabled: true
-      - name: cognitive-complexity
-        disabled: true
-      - name: cyclomatic
-        disabled: true
-      - name: file-header
-        disabled: true
-      - name: function-length
-        disabled: true
-      - name: function-result-limit
-        disabled: true
-      - name: max-public-structs
-        disabled: true
-      # geneally annoying rules
-      - name: add-constant # complains about any and all strings and integers
-        disabled: true
-      - name: confusing-naming # we frequently use "Foo()" and "foo()" together
-        disabled: true
-      - name: flag-parameter # excessive, and a common idiom we use
-        disabled: true
-      - name: unhandled-error # warns over common fmt.Print* and io.Close; rely on errcheck instead
-        disabled: true
-      # general config
-      - name: line-length-limit
-        arguments:
-          - 140
-      - name: var-naming
-        arguments:
-          - []
-          - - CID
-            - CRI
-            - CTRD
-            - DACL
-            - DLL
-            - DOS
-            - ETW
-            - FSCTL
-            - GCS
-            - GMSA
-            - HCS
-            - HV
-            - IO
-            - LCOW
-            - LDAP
-            - LPAC
-            - LTSC
-            - MMIO
-            - NT
-            - OCI
-            - PMEM
-            - PWSH
-            - RX
-            - SACl
-            - SID
-            - SMB
-            - TX
-            - VHD
-            - VHDX
-            - VMID
-            - VPCI
-            - WCOW
-            - WIM
+      rules:
+        # rules with required arguments
+        - name: argument-limit
+          disabled: true
+        - name: banned-characters
+          disabled: true
+        - name: cognitive-complexity
+          disabled: true
+        - name: cyclomatic
+          disabled: true
+        # covered by "exhaustive" linter
+        - name: enforce-switch-style
+          disabled: true
+        - name: file-header
+          disabled: true
+        - name: function-length
+          disabled: true
+        - name: function-result-limit
+          disabled: true
+        - name: max-public-structs
+          disabled: true
+        # geneally annoying rules
+        - name: add-constant # complains about any and all strings and integers
+          disabled: true
+        - name: confusing-naming # we frequently use "Foo()" and "foo()" together
+          disabled: true
+        - name: flag-parameter # excessive, and a common idiom we use
+          disabled: true
+        - name: unhandled-error # warns over common fmt.Print* and io.Close; rely on errcheck instead
+          disabled: true
+        # general config
+        - name: line-length-limit
+          arguments:
+            - 140
+        - name: var-naming
+          arguments:
+            - []
+            - - CID
+              - CRI
+              - CTRD
+              - DACL
+              - DLL
+              - DOS
+              - ETW
+              - FSCTL
+              - GCS
+              - GMSA
+              - HCS
+              - HV
+              - IO
+              - LCOW
+              - LDAP
+              - LPAC
+              - LTSC
+              - MMIO
+              - NT
+              - OCI
+              - PMEM
+              - PWSH
+              - RX
+              - SACl
+              - SID
+              - SMB
+              - TX
+              - VHD
+              - VHDX
+              - VMID
+              - VPCI
+              - WCOW
+              - WIM
+    staticcheck:
+      # Enable all options, with some exceptions.
+      # For defaults, see https://golangci-lint.run/usage/linters/#staticcheck
+      checks:
+        - all
+        - -QF1008     # Omit embedded fields from selector expression; https://staticcheck.dev/docs/checks/#QF1008
+        - -ST1003     # Poorly chosen identifier; https://staticcheck.dev/docs/checks/#ST1003

backup_test.go

@@ -20,7 +20,7 @@ func TestMain(m *testing.M) {
 	testFileName = f.Name()
 	f.Close()
 	defer os.Remove(testFileName)
-	os.Exit(m.Run())
+	m.Run()
 }
 
 func makeTestFile(makeADS bool) error {

backuptar/strconv.go

@@ -22,8 +22,8 @@ func parsePAXTime(s string) (time.Time, error) {
 
 	// Split string into seconds and sub-seconds parts.
 	ss, sn := s, ""
-	if pos := strings.IndexByte(s, '.'); pos >= 0 {
-		ss, sn = s[:pos], s[pos+1:]
+	if before, after, ok := strings.Cut(s, "."); ok {
+		ss, sn = before, after
 	}
 
 	// Parse the seconds.

file.go

@@ -234,12 +234,17 @@ func (f *win32File) Read(b []byte) (int, error) {
 	runtime.KeepAlive(b)
 
 	// Handle EOF conditions.
-	if err == nil && n == 0 && len(b) != 0 {
-		return 0, io.EOF
-	} else if err == windows.ERROR_BROKEN_PIPE { //nolint:errorlint // err is Errno
+	switch err {
+	case windows.ERROR_BROKEN_PIPE: //nolint:errorlint // err is Errno
 		return 0, io.EOF
+	case nil:
+		if n == 0 && len(b) != 0 {
+			return 0, io.EOF
+		}
+		return n, nil
+	default:
+		return n, err
 	}
-	return n, err
 }
 
 // Write writes to a file handle.