From 40022c5537636f1f7c5c6f45f7973a4b6577fe2e Mon Sep 17 00:00:00 2001
From: Victor Lyuboslavsky <2685025+getvictor@users.noreply.github.com>
Date: Mon, 8 Dec 2025 09:06:05 -0600
Subject: [PATCH] Add incremental lint run, with modernize as the linter.
 (#36711)

<!-- Add the related story/sub-task/bug number, like Resolves #123, or
remove if NA -->
**Related issue:** Resolves #32999

The `modernize` linter was discussed some time ago in the backend sync.
We wanted to add it but it was not possible.

Now that it has been added to golangci-lint, we are adding it.

golangci-lint has incremental mode, where only changes vs the base
branch are linted. This is nice when adding new linters without needing
to fix the whole codebase. That said, it would be nice to `modernize`
the whole codebase.
---
 .github/workflows/golangci-lint.yml | 51 +++++++++++++++++++++++++++--
 .golangci-incremental.yml           | 16 +++++++++
 Makefile                            |  3 ++
 3 files changed, 67 insertions(+), 3 deletions(-)
 create mode 100644 .golangci-incremental.yml

diff --git a/.github/workflows/golangci-lint.yml b/.github/workflows/golangci-lint.yml
index ea89d73231..7871f3ed50 100644
--- a/.github/workflows/golangci-lint.yml
+++ b/.github/workflows/golangci-lint.yml
@@ -8,10 +8,15 @@ on:
       - prepare-*
     paths:
       - '**.go'
+      - '.github/workflows/golangci-lint.yml'
+      - '.golangci.yml'
+      - '.golangci-incremental.yml'
   pull_request:
     paths:
       - '**.go'
       - '.github/workflows/golangci-lint.yml'
+      - '.golangci.yml'
+      - '.golangci-incremental.yml'
   workflow_dispatch: # Manual
 
 # This allows a subsequently queued workflow run to interrupt previous runs
@@ -65,11 +70,51 @@ jobs:
       - name: Run go lint
         run: |
           # Don't forget to update
-          # docs/Contributing/Testing-and-local-development.md when this
-          # version changes
+          # docs/Contributing/Testing-and-local-development.md when this version changes
           go install github.com/golangci/golangci-lint/v2/cmd/golangci-lint@a4b55ebc3471c9fbb763fd56eefede8050f99887 # v2.7.1
-          make lint-go
+          SKIP_INCREMENTAL=1 make lint-go
 
       - name: Run cloner-check tool
         run: |
           go run ./tools/cloner-check/main.go -check
+
+  golangci-incremental:
+    # Only run on pull requests (needs base branch for incremental comparison)
+    if: github.event_name == 'pull_request'
+    permissions:
+      contents: read
+      pull-requests: read
+    name: lint-incremental
+    strategy:
+      fail-fast: false
+      matrix:
+        os: [ubuntu-latest, macos-latest, windows-latest]
+    runs-on: ${{ matrix.os }}
+    steps:
+      - name: Harden Runner
+        uses: step-security/harden-runner@63c24ba6bd7ba022e95695ff85de572c04a18142 # v2.7.0
+        with:
+          egress-policy: audit
+
+      - name: Checkout code
+        uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3.5.3
+        with:
+          fetch-depth: 0  # Fetch full history for accurate diff
+
+      - name: Install Go
+        uses: actions/setup-go@93397bea11091df50f3d7e59dc26a7711a8bcfbe # v4.1.0
+        with:
+          go-version-file: 'go.mod'
+
+      - name: Install dependencies (Linux)
+        if: matrix.os == 'ubuntu-latest'
+        run: |
+          # The following packages are needed to build Fleet Desktop on Ubuntu.
+          sudo apt update -y && sudo apt install -y gcc libgtk-3-dev libayatana-appindicator3-dev
+
+      - name: Run incremental go lint
+        run: |
+          # Don't forget to update
+          # docs/Contributing/Testing-and-local-development.md when this version changes
+          go install github.com/golangci/golangci-lint/v2/cmd/golangci-lint@a4b55ebc3471c9fbb763fd56eefede8050f99887 # v2.7.1
+          golangci-lint run -c .golangci-incremental.yml --new-from-rev=origin/${{ github.base_ref }} --timeout 15m ./...
diff --git a/.golangci-incremental.yml b/.golangci-incremental.yml
new file mode 100644
index 0000000000..51e71f9a2b
--- /dev/null
+++ b/.golangci-incremental.yml
@@ -0,0 +1,16 @@
+# This configuration is for incremental linting of new/experimental linters.
+# It is used with --new-from-rev to only lint changed code.
+# See .golangci.yml for the main linter configuration.
+version: "2"
+
+issues:
+  max-issues-per-linter: 0 # show all issues
+  max-same-issues: 0 # show all issues
+
+linters:
+  default: none
+  enable:
+    - modernize
+
+exclusions:
+  generated: strict
diff --git a/Makefile b/Makefile
index 7ccb428f9c..676a89e6a7 100644
--- a/Makefile
+++ b/Makefile
@@ -211,6 +211,9 @@ lint-js:
 	@echo "Run the Go linters"
 lint-go:
 	golangci-lint run --timeout 15m
+ifndef SKIP_INCREMENTAL
+	golangci-lint run -c .golangci-incremental.yml --new-from-merge-base=origin/main --timeout 15m ./...
+endif
 
 .help-short--lint:
 	@echo "Run linters"