chore: Update to golangci-lint v2.3.1 (#999)

Author: hessjcg

.github/workflows/lint.yaml

@@ -33,11 +33,7 @@ jobs:
         uses: actions/setup-go@d35c59abb061a4a6fb18e82ac0862c26744d6ab5 # v5.5.0
         with:
           go-version: "1.24"
-      - name: go mod tidy
+      - name: lint
         run: |
-          go mod tidy && git diff --exit-code
-      - name: golangci-lint
-        uses: golangci/golangci-lint-action@55c2c1448f86e01eaae002a5a3a9624417608d84 # v6.5.2
-        with:
-          version: latest
-          args: --timeout 3m
+          ./build.sh lint_ci
+

.golangci.yml

@@ -1,4 +1,4 @@
-# Copyright 2022 Google LLC.
+# Copyright 2022 Google LLC
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -11,40 +11,53 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-# .golangci.yml
+
+version: "2"
 linters:
-  disable-all: true
+  default: none
   enable:
-    - goimports
     - revive
-issues:
-  exclude-use-default: false
-linters-settings:
-  revive:
-    rules:
-      - name: blank-imports
-      - name: context-as-argument
-      - name: context-keys-type
-      - name: dot-imports
-      - name: error-return
-      - name: error-strings
-      - name: error-naming
-      - name: exported
-      - name: if-return
-      - name: increment-decrement
-      - name: var-naming
-      - name: var-declaration
-      - name: range
-      - name: receiver-naming
-      - name: time-naming
-      - name: unexported-return
-      - name: indent-error-flow
-      - name: errorf
-      - name: empty-block
-      - name: superfluous-else
-      - name: unused-parameter
-      - name: unreachable-code
-      - name: redefines-builtin-id
-      - name: range-val-in-closure
-      - name: range-val-address
-      - name: import-shadowing
+  settings:
+    revive:
+      rules:
+        - name: blank-imports
+        - name: context-as-argument
+        - name: context-keys-type
+        - name: dot-imports
+        - name: error-return
+        - name: error-strings
+        - name: error-naming
+        - name: exported
+        - name: if-return
+        - name: increment-decrement
+        - name: var-naming
+        - name: var-declaration
+        - name: range
+        - name: receiver-naming
+        - name: time-naming
+        - name: unexported-return
+        - name: indent-error-flow
+        - name: errorf
+        - name: empty-block
+        - name: superfluous-else
+        - name: unused-parameter
+        - name: unreachable-code
+        - name: redefines-builtin-id
+        - name: range-val-in-closure
+        - name: range-val-address
+        - name: import-shadowing
+  exclusions:
+    generated: lax
+    paths:
+      - third_party$
+      - builtin$
+      - examples$
+formatters:
+  enable:
+    - goimports
+  exclusions:
+    generated: lax
+    paths:
+      - third_party$
+      - builtin$
+      - examples$

build.sh

@@ -50,24 +50,47 @@ function e2e() {
   e2e_ci
 }
 
+# e2e_ci - Run end-to-end integration tests in the CI system.
+#   This assumes that the secrets in the env vars are already set.
 function e2e_ci() {
   go test -v -race -cover ./e2e_mysql_test.go ./e2e_postgres_test.go ./e2e_sqlserver_test.go | tee test_results.txt
 }
 
+# Download a tool using `go install`
+function get_golang_tool() {
+  name="$1"
+  github_repo="$2"
+  package=$3
+
+  # Download goimports tool
+  version=$(curl -s "https://api.github.com/repos/$github_repo/tags" | jq -r '.[].name' | head -n 1)
+  mkdir -p "$SCRIPT_DIR/.tools"
+  cmd="$SCRIPT_DIR/.tools/$name"
+  versioned_cmd="$SCRIPT_DIR/.tools/$name-$version"
+  if [[ ! -f "$versioned_cmd" ]] ; then
+    GOBIN="$SCRIPT_DIR/.tools" go install "$package@$version"
+    mv "$cmd" "$versioned_cmd"
+    if [[ -f "$cmd" ]] ; then
+      unlink "$cmd"
+    fi
+    ln -s "$versioned_cmd" "$cmd"
+  fi
+}
+
 ## fix - Fixes code format.
 function fix() {
+  # run code formatting
+  get_golang_tool 'goimports' 'golang/tools' 'golang.org/x/tools/cmd/goimports'
+  ".tools/goimports" -w .
   go mod tidy
   go fmt ./...
 }
 
 ## lint - runs the linters
 function lint() {
-  # run golangci-lint
-  mkdir -p "$SCRIPT_DIR/.tools"
-  if [[ ! -f "$SCRIPT_DIR/.tools/golangci-lint" ]] ; then
-    GOBIN="$SCRIPT_DIR/.tools" go install github.com/golangci/golangci-lint/cmd/[email protected]
-  fi
-  "$SCRIPT_DIR/.tools/golangci-lint" run --timeout 3m
+  # run lint checks
+  get_golang_tool 'golangci-lint' 'golangci/golangci-lint' 'github.com/golangci/golangci-lint/v2/cmd/golangci-lint'
+  ".tools/golangci-lint" run --timeout 3m
 
   # Check the commit includes a go.mod that is fully
   # up to date.
@@ -77,10 +100,15 @@ function lint() {
   fi
 }
 
+# lint_ci runs lint in the CI build job
+function lint_ci() {
+  fix # run code format cleanup
+  git diff --exit-code # fail if anything changed
+  lint # run lint
+}
 
 # write_e2e_env - Loads secrets from the gcloud project and writes
 #     them to target/e2e.env to run e2e tests.
-#
 function write_e2e_env(){
   # All secrets used by the e2e tests in the form <env_name>=<secret_name>
   secret_vars=(