update tests and some minor logic

Author: bodrovis

.github/dependabot.yml

@@ -2,11 +2,17 @@ version: 2
 updates:
   - package-ecosystem: "gomod"
     directory: "/"
+    open-pull-requests-limit: 10
+    cooldown:
+      default-days: 7
     schedule:
       interval: "monthly"
     target-branch: "master"
   - package-ecosystem: "github-actions"
     directory: "/"
+    open-pull-requests-limit: 10
+    cooldown:
+      default-days: 7
     schedule:
       interval: "monthly"
     target-branch: "master"

client/upload_test.go

@@ -548,7 +548,7 @@ func removeIfEmpty(path string) error {
 	if err != nil {
 		return err
 	}
-	defer f.Close()
+	defer func() { _ = f.Close() }()
 
 	_, err = f.Readdirnames(1)
 	if err == io.EOF {

internal/zipx/zipx.go

@@ -4,6 +4,7 @@ package zipx
 
 import (
 	"archive/zip"
+	"errors"
 	"fmt"
 	"io"
 	"os"
@@ -33,12 +34,20 @@ func DefaultPolicy() Policy {
 
 // Validate checks that zipPath is a readable ZIP file.
 // Returns io.ErrUnexpectedEOF if it is not.
-func Validate(zipPath string) error {
+func Validate(zipPath string) (err error) {
 	zr, err := zip.OpenReader(zipPath)
 	if err != nil {
-		return fmt.Errorf("zip validate: %w", io.ErrUnexpectedEOF)
+		if errors.Is(err, zip.ErrFormat) || errors.Is(err, io.ErrUnexpectedEOF) {
+			return fmt.Errorf("zip validate: %w", io.ErrUnexpectedEOF)
+		}
+		return fmt.Errorf("zip validate open: %w", err)
 	}
-	zr.Close()
+	defer func() {
+		if cerr := zr.Close(); err == nil && cerr != nil {
+			err = fmt.Errorf("zip validate close: %w", cerr)
+		}
+	}()
+
 	return nil
 }
 
@@ -49,7 +58,12 @@ func Unzip(srcZip, destDir string, p Policy) error {
 	if err != nil {
 		return err
 	}
-	defer r.Close()
+
+	defer func() {
+		if cerr := r.Close(); cerr != nil {
+			err = errors.Join(err, fmt.Errorf("close zip: %w", cerr))
+		}
+	}()
 
 	if err := os.MkdirAll(destDir, 0o755); err != nil {
 		return err
@@ -122,7 +136,7 @@ func Unzip(srcZip, destDir string, p Policy) error {
 
 		out, err := os.OpenFile(targetAbs, os.O_CREATE|os.O_TRUNC|os.O_WRONLY, perm)
 		if err != nil {
-			rc.Close()
+			_ = rc.Close()
 			return err
 		}
 

internal/zipx/zipx_test.go

@@ -153,7 +153,7 @@ func makeZip(t *testing.T, entries []zentry) string {
 	if err != nil {
 		t.Fatalf("create temp zip: %v", err)
 	}
-	defer f.Close()
+	defer func() { _ = f.Close() }()
 
 	zw := zip.NewWriter(f)
 	for _, e := range entries {

tools/go.mod

@@ -1,3 +1,3 @@
 module github.com/bodrovis/lokex
 
-go 1.24
+go 1.25