chore: Update lint to use golangci-lint v2.3.1

Author: hessjcg

.github/workflows/lint.yaml

@@ -29,14 +29,7 @@ jobs:
         with:
           go-version: "1.24"
       - name: Checkout code
-        uses: actions/checkout@08eba0b27e820071cde6df949e0beb9ba4906955 # v4.3.0
-      - name: >
-          Verify go mod tidy. If you're reading this and the check has
-          failed, run `goimports -w . && go mod tidy && golangci-lint run`
+        uses: actions/checkout@08eba0b27e820071cde6df949e0beb9ba4906955 # v4.2.2
+      - 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

.gitignore

@@ -12,3 +12,4 @@
 /key.json
 /logs/
 .tools
+test_results.txt

.golangci.yml

@@ -12,47 +12,56 @@
 # 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:
-    # From https://golangci-lint.run/usage/linters/
-    # This is a minor deviation from the default linters
-    - goimports
-    - gosimple
     - govet
     - ineffassign
     - revive
     - staticcheck
     - unused
-issues:
-  exclude-use-default: false
-linters-settings:
-  revive:
-    rules:
-      # From https://revive.run/docs#recommended-configuration
-      - name: blank-imports
-      - name: context-as-argument
-      - name: context-keys-type
-      - name: dot-imports
-      - name: empty-block
-      - name: errorf
-      - name: error-naming
-      - name: error-return
-      - name: error-strings
-      - name: exported
-      - name: if-return
-      - name: import-shadowing
-      - name: increment-decrement
-      - name: indent-error-flow
-      - name: range
-      - name: range-val-address
-      - name: range-val-in-closure
-      - name: receiver-naming
-      - name: redefines-builtin-id
-      - name: superfluous-else
-      - name: time-naming
-      - name: unexported-return
-      - name: unreachable-code
-      - name: unused-parameter
-      - name: var-declaration
-      - name: var-naming
+  settings:
+    revive:
+      rules:
+        - name: blank-imports
+        - name: context-as-argument
+        - name: context-keys-type
+        - name: dot-imports
+        - name: empty-block
+        - name: errorf
+        - name: error-naming
+        - name: error-return
+        - name: error-strings
+        - name: exported
+        - name: if-return
+        - name: import-shadowing
+        - name: increment-decrement
+        - name: indent-error-flow
+        - name: range
+        - name: range-val-address
+        - name: range-val-in-closure
+        - name: receiver-naming
+        - name: redefines-builtin-id
+        - name: superfluous-else
+        - name: time-naming
+        - name: unexported-return
+        - name: unreachable-code
+        - name: unused-parameter
+        - name: var-declaration
+        - name: var-naming
+  exclusions:
+    generated: lax
+    paths:
+      - third_party$
+      - builtin$
+      - examples$
+formatters:
+  enable:
+    - goimports
+  exclusions:
+    generated: lax
+    paths:
+      - third_party$
+      - builtin$
+      - examples$

build.sh

@@ -206,6 +206,8 @@ function write_e2e_env(){
     exit 1
   fi
 
+  local_user=$(gcloud auth list --format 'value(account)' | tr -d '\n')
+
   echo "Getting test secrets from $TEST_PROJECT into $1"
   {
   for env_name in "${secret_vars[@]}" ; do
@@ -215,6 +217,10 @@ function write_e2e_env(){
     val=$(gcloud secrets versions access latest --project "$TEST_PROJECT" --secret="$secret_name")
     echo "export $env_var_name='$val'"
   done
+
+  # Set IAM User env vars to the local gcloud user
+  echo "export MYSQL_IAM_USER='${local_user%%@*}'"
+  echo "export POSTGRES_USER_IAM='$local_user'"
   } > "$1"
 
 }

cmd/gendocs/gen_cloud-sql-proxy_docs.go

@@ -46,6 +46,6 @@ func main() {
 
 	cloudSQLProxy := cmd.NewCommand()
 	cloudSQLProxy.Execute()
-	cloudSQLProxy.Command.DisableAutoGenTag = true
+	cloudSQLProxy.DisableAutoGenTag = true
 	doc.GenMarkdownTree(cloudSQLProxy.Command, outDir)
 }

internal/proxy/fuse_darwin.go

@@ -34,7 +34,7 @@ func SupportsFUSE() error {
 	if _, err := os.Stat(macfusePath); err != nil {
 		// if that fails, check for osxfuse next
 		if _, err := os.Stat(osxfusePath); err != nil {
-			return errors.New("failed to find osxfuse or macfuse: verify FUSE installation and try again (see https://osxfuse.github.io).")
+			return errors.New("failed to find osxfuse or macfuse: verify FUSE installation and try again (see https://osxfuse.github.io)")
 		}
 	}
 	return nil

internal/proxy/proxy_test.go

@@ -52,18 +52,6 @@ func (f *fakeDialer) dialAttempts() int {
 	return f.dialCount
 }
 
-func (f *fakeDialer) engineVersionAttempts() int {
-	f.mu.Lock()
-	defer f.mu.Unlock()
-	return f.engineVersionCount
-}
-
-func (f *fakeDialer) dialedInstances() []string {
-	f.mu.Lock()
-	defer f.mu.Unlock()
-	return append([]string{}, f.instances...)
-}
-
 func (f *fakeDialer) Dial(_ context.Context, inst string, _ ...cloudsqlconn.DialOption) (net.Conn, error) {
 	f.mu.Lock()
 	defer f.mu.Unlock()