Update deps ans fix linter errors (#67)

Signed-off-by: PulokSaha0706 <puloksaha@appscode.com>
Signed-off-by: Anisur Rahman <anisur@appscode.com>

Author: anisurrahman75

.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

Makefile

@@ -53,7 +53,7 @@ BIN_PLATFORMS    := $(DOCKER_PLATFORMS) windows/amd64 darwin/amd64 darwin/arm64
 OS   := $(if $(GOOS),$(GOOS),$(shell go env GOOS))
 ARCH := $(if $(GOARCH),$(GOARCH),$(shell go env GOARCH))
 
-GO_VERSION       ?= 1.25
+GO_VERSION       ?= 1.25.5
 BUILD_IMAGE      ?= ghcr.io/appscode/golang-dev:$(GO_VERSION)
 
 RESTIC_VER  := 0.17.3
@@ -220,7 +220,7 @@ lint: $(BUILD_DIRS)
 	    --env GO111MODULE=on                                    \
 	    --env GOFLAGS="-mod=vendor"                             \
 	    $(BUILD_IMAGE)                                          \
-	    golangci-lint run --enable $(ADDTL_LINTERS) --timeout=10m --exclude-files="generated.*\.go$\" --exclude-dirs-use-default
+	    golangci-lint run
 
 $(BUILD_DIRS):
 	@mkdir -p $@

go.mod

@@ -1,8 +1,6 @@
 module kubestash.dev/cli
 
-go 1.24.0
-
-toolchain go1.24.3
+go 1.25.5
 
 require (
 	github.com/jedib0t/go-pretty/v6 v6.6.8

hack/gendocs/main.go

@@ -92,7 +92,7 @@ func main() {
 	filePrepender := func(filename string) string {
 		filename = filepath.Base(filename)
 		base := strings.TrimSuffix(filename, path.Ext(filename))
-		name := cases.Title(language.English).String(strings.Replace(base, "_", " ", -1))
+		name := cases.Title(language.English).String(strings.ReplaceAll(base, "_", " "))
 		parts := strings.Split(name, " ")
 		if len(parts) > 1 {
 			name = strings.Join(parts[1:], " ")
@@ -102,7 +102,7 @@ func main() {
 			Name    string
 			RootCmd bool
 		}{
-			strings.Replace(base, "_", "-", -1),
+			strings.ReplaceAll(base, "_", "-"),
 			name,
 			!strings.ContainsRune(base, '_'),
 		}

pkg/common/dump/helpers.go

@@ -161,7 +161,7 @@ func isCompleted(obj *unstructured.Unstructured) (bool, error) {
 			return false, nil
 		}
 		for _, conditionRaw := range conditions {
-			condition, ok := conditionRaw.(map[string]interface{})
+			condition, ok := conditionRaw.(map[string]any)
 			if !ok {
 				continue
 			}

pkg/common/dump/restore.go

@@ -211,7 +211,7 @@ func (m *ResourceManager) applyItem(ctx context.Context, groupRes string, itm co
 
 	if gvr.Resource == apis.PersistentVolumeClaims.Resource &&
 		m.StorageClassMappingsStr != "" {
-		if spec, ok := sObj["spec"].(map[string]interface{}); ok && spec != nil {
+		if spec, ok := sObj["spec"].(map[string]any); ok && spec != nil {
 			sObj["spec"] = m.mapStorageClass(spec)
 		}
 	}
@@ -257,7 +257,7 @@ func (m *ResourceManager) downloadTheItem(groupRes string, obj *unstructured.Uns
 	return nil
 }
 
-func (m *ResourceManager) mapStorageClass(spec map[string]interface{}) map[string]interface{} {
+func (m *ResourceManager) mapStorageClass(spec map[string]any) map[string]any {
 	if oldStorageClassName, ok := spec["storageClassName"].(string); ok {
 		if _, exist := m.StorageClassMappings[oldStorageClassName]; exist {
 			spec["storageClassName"] = m.StorageClassMappings[oldStorageClassName]
@@ -273,7 +273,7 @@ func (m *ResourceManager) ensureNamespace(ctx context.Context, ns string) error
 		klog.V(2).Infof("Iteration %d: namespace %s exists", m.currentIteration, ns)
 		return nil
 	}
-	obj := &unstructured.Unstructured{Object: map[string]interface{}{"apiVersion": "v1", "kind": "Namespace", "metadata": map[string]interface{}{"name": ns}}}
+	obj := &unstructured.Unstructured{Object: map[string]any{"apiVersion": "v1", "kind": "Namespace", "metadata": map[string]any{"name": ns}}}
 	key := getItemKey(obj)
 	if _, done := m.restoredItems[key]; done {
 		klog.V(3).Infof("Iteration %d: already restored %s", m.currentIteration, key)
@@ -334,8 +334,8 @@ func (m *ResourceManager) setOwnerReferences(ctx context.Context) error {
 			continue
 		}
 
-		patchPayload := map[string]interface{}{
-			"metadata": map[string]interface{}{
+		patchPayload := map[string]any{
+			"metadata": map[string]any{
 				"ownerReferences": validRelinkedOwners,
 			},
 		}
@@ -401,7 +401,7 @@ func (m *ResourceManager) shouldRestore(obj *unstructured.Unstructured) bool {
 		return false
 	}
 	labels := LabelsToStrings(obj.GetLabels())
-	return matchesAny(labels, m.Options.ORedLabelSelectors) && matchesAll(labels, m.Options.ANDedLabelSelectors)
+	return matchesAny(labels, m.ORedLabelSelectors) && matchesAll(labels, m.ANDedLabelSelectors)
 }
 
 func (m *ResourceManager) isNamespaced(groupRes string) (bool, error) {
@@ -430,7 +430,7 @@ func (m *ResourceManager) parseItems() (map[string]*common.ResourceItems, error)
 		klog.Errorf("Failed to get restic stats: %v", err)
 	} else {
 		for _, resticStat := range manifestResticStats {
-			baseDir := filepath.Join(m.Options.DataDir, m.SnapshotName, apis.ComponentManifest, resticStat.HostPath)
+			baseDir := filepath.Join(m.DataDir, m.SnapshotName, apis.ComponentManifest, resticStat.HostPath)
 			entries, err := m.reader.ReadDir(baseDir)
 			if err != nil {
 				return nil, fmt.Errorf("failed to read backup directory: %w", err)
@@ -498,7 +498,7 @@ func (m *ResourceManager) getRestoreableItems(r *common.ResourceItems) map[strin
 		klog.Errorf("Failed to get restic stats: %v", err)
 	} else {
 		for _, resticStat := range manifestResticStats {
-			baseDir := filepath.Join(m.Options.DataDir, m.SnapshotName, apis.ComponentManifest, resticStat.HostPath)
+			baseDir := filepath.Join(m.DataDir, m.SnapshotName, apis.ComponentManifest, resticStat.HostPath)
 			resourceForPath := filepath.Join(baseDir, r.GroupResource)
 			for namespace, items := range r.ItemsByNamespace {
 				identifier := apis.NamespaceScopedDir

pkg/common/helpers.go

@@ -23,7 +23,6 @@ import (
 	core "k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/runtime"
 	utilruntime "k8s.io/apimachinery/pkg/util/runtime"
-	"k8s.io/client-go/rest"
 	restclient "k8s.io/client-go/rest"
 	kmapi "kmodules.xyz/client-go/api/v1"
 	kubedbapi "kubedb.dev/apimachinery/apis/kubedb/v1alpha2"
@@ -40,7 +39,7 @@ func NewRuntimeClient(cfg *restclient.Config) (client.Client, error) {
 	utilruntime.Must(kubedbapi.AddToScheme(scheme))
 	utilruntime.Must(core.AddToScheme(scheme))
 
-	hc, err := rest.HTTPClientFor(cfg)
+	hc, err := restclient.HTTPClientFor(cfg)
 	if err != nil {
 		return nil, err
 	}

pkg/convert.go

@@ -443,7 +443,7 @@ func configureBackupAddonInfo(bc *v1beta1.BackupConfiguration) *coreapi.AddonInf
 	}
 	if bc.Spec.Target != nil && isTargetWorkload(bc.Spec.Target.Ref) {
 		params := &runtime.RawExtension{}
-		pathsMap := make(map[string]interface{})
+		pathsMap := make(map[string]any)
 
 		if len(bc.Spec.Target.Paths) > 0 {
 			pathsMap["paths"] = strings.Join(bc.Spec.Target.Paths, ",")
@@ -667,8 +667,8 @@ func setValidValue(fieldName string) string {
 	return fmt.Sprintf("### Set Valid %s ###", fieldName)
 }
 
-func writeToTargetDir(srcPath string, addSeparator bool, obj interface{}) error {
-	targetPath := strings.Replace(srcPath, sourceDir, targetDir, -1)
+func writeToTargetDir(srcPath string, addSeparator bool, obj any) error {
+	targetPath := strings.ReplaceAll(srcPath, sourceDir, targetDir)
 	if err := os.MkdirAll(filepath.Dir(targetPath), os.ModePerm); err != nil {
 		return err
 	}
@@ -689,7 +689,7 @@ func writeToTargetDir(srcPath string, addSeparator bool, obj interface{}) error
 	if err != nil {
 		return err
 	}
-	defer file.Close()
+	defer closeFileWithLogError(file)
 	if _, err := file.Write(marshalled); err != nil {
 		return err
 	}
@@ -701,10 +701,17 @@ func addSeparatorToTargetFile(filePath string) error {
 	if err != nil {
 		return err
 	}
-	defer file.Close()
+	defer closeFileWithLogError(file)
 	separator := "\n---\n\n"
 	if _, err := file.WriteString(separator); err != nil {
 		return err
 	}
 	return nil
 }
+
+func closeFileWithLogError(file *os.File) {
+	err := file.Close()
+	if err != nil {
+		klog.Errorf("Error closing file: %v", err)
+	}
+}