From ddf2f84d19bf7fb15148b39bd7d0b0e360a060c9 Mon Sep 17 00:00:00 2001
From: Anisur Rahman <anisur@appscode.com>
Date: Tue, 9 Dec 2025 11:51:36 +0600
Subject: [PATCH] Use golangci-lint 2.x

Signed-off-by: Anisur Rahman <anisur@appscode.com>
---
 .golangci.yml | 28 ++++++++++++++++++++++++++++
 Makefile      |  2 +-
 go.mod        |  4 +---
 lintconf.yaml | 43 -------------------------------------------
 pkg/utils.go  |  2 +-
 5 files changed, 31 insertions(+), 48 deletions(-)
 create mode 100644 .golangci.yml
 delete mode 100644 lintconf.yaml

diff --git a/.golangci.yml b/.golangci.yml
new file mode 100644
index 00000000..cdd2defc
--- /dev/null
+++ b/.golangci.yml
@@ -0,0 +1,28 @@
+version: "2"
+linters:
+  default: standard
+  enable:
+    - unparam
+
+formatters:
+  enable:
+    - gofmt
+    - goimports
+  settings:
+    gofmt:
+      rewrite-rules:
+        - pattern: 'interface{}'
+          replacement: 'any'
+
+issues:
+  max-same-issues: 100
+
+  exclude-files:
+    - generated.*\\.go
+
+  exclude-dirs:
+    - client
+    - vendor
+
+run:
+  timeout: 10m
diff --git a/Makefile b/Makefile
index f3a67fb3..0be9393c 100644
--- a/Makefile
+++ b/Makefile
@@ -281,7 +281,7 @@ lint: $(BUILD_DIRS)
 	    --env GO111MODULE=on                                    \
 	    --env GOFLAGS="-mod=vendor"                             \
 	    $(BUILD_IMAGE)                                          \
-	    golangci-lint run --enable $(ADDTL_LINTERS) --timeout=30m --exclude-files="generated.*\.go$\" --exclude-dirs-use-default --exclude-dirs=client,vendor
+	    golangci-lint run
 
 $(BUILD_DIRS):
 	@mkdir -p $@
diff --git a/go.mod b/go.mod
index 8132b1bd..68eaa18d 100644
--- a/go.mod
+++ b/go.mod
@@ -1,8 +1,6 @@
 module stash.appscode.dev/mariadb
 
-go 1.23.0
-
-toolchain go1.24.4
+go 1.25.5
 
 require (
 	github.com/spf13/cobra v1.8.0
diff --git a/lintconf.yaml b/lintconf.yaml
deleted file mode 100644
index 860d7cb9..00000000
--- a/lintconf.yaml
+++ /dev/null
@@ -1,43 +0,0 @@
-# adapted from: https://github.com/helm/chart-testing/raw/master/etc/lintconf.yaml
----
-rules:
-  braces:
-    min-spaces-inside: 0
-    max-spaces-inside: 0
-    min-spaces-inside-empty: -1
-    max-spaces-inside-empty: -1
-  brackets:
-    min-spaces-inside: 0
-    max-spaces-inside: 0
-    min-spaces-inside-empty: -1
-    max-spaces-inside-empty: -1
-  colons:
-    max-spaces-before: 0
-    max-spaces-after: 1
-  commas:
-    max-spaces-before: 0
-    min-spaces-after: 1
-    max-spaces-after: 1
-  comments:
-    require-starting-space: true
-    min-spaces-from-content: 1
-  document-end: disable
-  document-start: disable           # No --- to start a file
-  empty-lines:
-    max: 2
-    max-start: 0
-    max-end: 0
-  hyphens:
-    max-spaces-after: 1
-  indentation:
-    spaces: consistent
-    indent-sequences: whatever      # - list indentation will handle both indentation and without
-    check-multi-line-strings: false
-  key-duplicates: enable
-  line-length: disable              # Lines can be any length
-  new-line-at-end-of-file: enable
-  new-lines:
-    type: unix
-  trailing-spaces: enable
-  truthy:
-    level: warning
diff --git a/pkg/utils.go b/pkg/utils.go
index 6b581764..faf86b90 100644
--- a/pkg/utils.go
+++ b/pkg/utils.go
@@ -127,7 +127,7 @@ func (session *sessionWrapper) setTLSParameters(appBinding *appcatalog.AppBindin
 		if err := os.WriteFile(filepath.Join(scratchDir, MariaDBTLSRootCA), appBinding.Spec.ClientConfig.CABundle, os.ModePerm); err != nil {
 			return err
 		}
-		tlsCreds := []interface{}{
+		tlsCreds := []any{
 			fmt.Sprintf("--ssl-ca=%v", filepath.Join(scratchDir, MariaDBTLSRootCA)),
 		}