From 3f78a01cf1171b8a97bb67d6e1eb8bdda193feb2 Mon Sep 17 00:00:00 2001
From: "Lawrence, Rendall" <rlawrence@sot-te.ch>
Date: Mon, 22 Sep 2025 16:03:04 +0300
Subject: [PATCH] (minor) fix lint warnings

---
 .../container/directory/directory_test.go                | 9 ++++-----
 middleware/torrentapproval/container/s3/s3.go            | 5 +++--
 middleware/torrentapproval/container/s3/s3_test.go       | 8 ++++----
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/middleware/torrentapproval/container/directory/directory_test.go b/middleware/torrentapproval/container/directory/directory_test.go
index 4292700..387ba7b 100644
--- a/middleware/torrentapproval/container/directory/directory_test.go
+++ b/middleware/torrentapproval/container/directory/directory_test.go
@@ -64,9 +64,8 @@ func writeTmp() (string, error) {
 		return "", err
 	}
 	for _, f := range files {
-		err = os.WriteFile(filepath.Join(tmpDir, f.name), f.data, 0644)
-		if err != nil {
-			return "", err
+		if err = os.WriteFile(filepath.Join(tmpDir, f.name), f.data, 0o600); err != nil {
+			break
 		}
 	}
 	return tmpDir, err
@@ -96,14 +95,14 @@ func TestScan(t *testing.T) {
 	})
 	time.Sleep(time.Millisecond * 100)
 	for _, f := range files {
-		contains, _ := d.List.Storage.Contains(context.Background(), "TEST", f.hash)
+		contains, _ := d.Storage.Contains(context.Background(), "TEST", f.hash)
 		require.True(t, contains, "%s must present", f.name)
 		_ = os.Remove(filepath.Join(tmpDir, f.name))
 	}
 
 	time.Sleep(time.Millisecond * 100)
 	for _, f := range files {
-		contains, _ := d.List.Storage.Contains(context.Background(), "TEST", f.hash)
+		contains, _ := d.Storage.Contains(context.Background(), "TEST", f.hash)
 		require.False(t, contains, "%s must absent", f.name)
 	}
 }
diff --git a/middleware/torrentapproval/container/s3/s3.go b/middleware/torrentapproval/container/s3/s3.go
index d9529be..67ae05b 100644
--- a/middleware/torrentapproval/container/s3/s3.go
+++ b/middleware/torrentapproval/container/s3/s3.go
@@ -72,9 +72,10 @@ func build(conf conf.MapConfig, st storage.DataStorage) (container.Container, er
 	modifiers[0] = config.WithLogger(logging.LoggerFunc(func(
 		classification logging.Classification, format string, v ...interface{},
 	) {
-		if classification == logging.Debug {
+		switch classification {
+		case logging.Debug:
 			logger.Debug().CallerSkipFrame(1).Msg(fmt.Sprintf(format, v...))
-		} else if classification == logging.Warn {
+		case logging.Warn:
 			logger.Warn().CallerSkipFrame(1).Msg(fmt.Sprintf(format, v...))
 		}
 	}))
diff --git a/middleware/torrentapproval/container/s3/s3_test.go b/middleware/torrentapproval/container/s3/s3_test.go
index b26974f..c7b40ce 100644
--- a/middleware/torrentapproval/container/s3/s3_test.go
+++ b/middleware/torrentapproval/container/s3/s3_test.go
@@ -106,7 +106,7 @@ func TestScanMock(t *testing.T) {
 
 	time.Sleep(time.Millisecond * 100)
 	for name, f := range files {
-		contains, _ := d.List.Storage.Contains(context.Background(), "TEST", f.hash)
+		contains, _ := d.Storage.Contains(context.Background(), "TEST", f.hash)
 		require.True(t, contains, "%s must present", name)
 		for i := 0; i < len(cl.objs); i++ {
 			if *cl.objs[i].Key == name {
@@ -117,7 +117,7 @@ func TestScanMock(t *testing.T) {
 
 	time.Sleep(time.Millisecond * 100)
 	for name, f := range files {
-		contains, _ := d.List.Storage.Contains(context.Background(), "TEST", f.hash)
+		contains, _ := d.Storage.Contains(context.Background(), "TEST", f.hash)
 		require.False(t, contains, "%s must absent", name)
 	}
 }
@@ -208,7 +208,7 @@ func TestScanMinio(t *testing.T) {
 	time.Sleep(time.Millisecond * 200)
 
 	for name, f := range files {
-		contains, _ := d.List.Storage.Contains(context.Background(), "TEST", f.hash)
+		contains, _ := d.Storage.Contains(context.Background(), "TEST", f.hash)
 		require.True(t, contains, "%s must present", name)
 		name = minioPrefix + name
 		_, err = cl.DeleteObject(context.Background(), &awss3.DeleteObjectInput{
@@ -223,7 +223,7 @@ func TestScanMinio(t *testing.T) {
 	time.Sleep(time.Millisecond * 200)
 
 	for name, f := range files {
-		contains, _ := d.List.Storage.Contains(context.Background(), "TEST", f.hash)
+		contains, _ := d.Storage.Contains(context.Background(), "TEST", f.hash)
 		require.False(t, contains, "%s must absent", name)
 	}
 }