Fix more linter issues

Signed-off-by: Shengqi Chen <harry-chen@outlook.com>

manager/config_test.go

@@ -2,7 +2,6 @@ package manager
 
 import (
 	"fmt"
-	"io/ioutil"
 	"os"
 	"strings"
 	"testing"
@@ -37,11 +36,11 @@ func TestConfig(t *testing.T) {
 
 	Convey("load Config should work", t, func() {
 		Convey("create config file & cli context", func() {
-			tmpfile, err := ioutil.TempFile("", "tunasync")
+			tmpfile, err := os.CreateTemp("", "tunasync")
 			So(err, ShouldEqual, nil)
 			defer os.Remove(tmpfile.Name())
 
-			err = ioutil.WriteFile(tmpfile.Name(), []byte(cfgBlob), 0644)
+			err = os.WriteFile(tmpfile.Name(), []byte(cfgBlob), 0644)
 			So(err, ShouldEqual, nil)
 			defer tmpfile.Close()
 

manager/db.go

@@ -141,7 +141,7 @@ func (b *kvDBAdapter) ListWorkers() (ws []WorkerStatus, err error) {
 
 func (b *kvDBAdapter) GetWorker(workerID string) (w WorkerStatus, err error) {
 	var v []byte
-	v, err = b.db.Get(_workerBucketKey, workerID)
+	v, _ = b.db.Get(_workerBucketKey, workerID)
 	if v == nil {
 		err = fmt.Errorf("invalid workerID %s", workerID)
 	} else {

manager/db_test.go

@@ -3,7 +3,6 @@ package manager
 import (
 	"encoding/json"
 	"fmt"
-	"io/ioutil"
 	"os"
 	"path/filepath"
 	"sort"
@@ -32,7 +31,7 @@ func DBAdapterTest(db dbAdapter) {
 				LastOnline:   time.Now(),
 				LastRegister: time.Now(),
 			}
-			w, err = db.CreateWorker(w)
+			_, err = db.CreateWorker(w)
 			So(err, ShouldBeNil)
 		}
 
@@ -73,7 +72,7 @@ func DBAdapterTest(db dbAdapter) {
 
 	Convey("update mirror status", func() {
 		status := []MirrorStatus{
-			MirrorStatus{
+			{
 				Name:        "arch-sync1",
 				Worker:      testWorkerIDs[0],
 				IsMaster:    true,
@@ -84,7 +83,7 @@ func DBAdapterTest(db dbAdapter) {
 				Upstream:    "mirrors.tuna.tsinghua.edu.cn",
 				Size:        "3GB",
 			},
-			MirrorStatus{
+			{
 				Name:        "arch-sync2",
 				Worker:      testWorkerIDs[1],
 				IsMaster:    true,
@@ -95,7 +94,7 @@ func DBAdapterTest(db dbAdapter) {
 				Upstream:    "mirrors.tuna.tsinghua.edu.cn",
 				Size:        "4GB",
 			},
-			MirrorStatus{
+			{
 				Name:        "arch-sync3",
 				Worker:      testWorkerIDs[1],
 				IsMaster:    true,
@@ -159,12 +158,11 @@ func DBAdapterTest(db dbAdapter) {
 		})
 
 	})
-	return
 }
 
 func TestDBAdapter(t *testing.T) {
 	Convey("boltAdapter should work", t, func() {
-		tmpDir, err := ioutil.TempDir("", "tunasync")
+		tmpDir, err := os.MkdirTemp("", "tunasync")
 		defer os.RemoveAll(tmpDir)
 		So(err, ShouldBeNil)
 
@@ -200,7 +198,7 @@ func TestDBAdapter(t *testing.T) {
 	})
 
 	Convey("badgerAdapter should work", t, func() {
-		tmpDir, err := ioutil.TempDir("", "tunasync")
+		tmpDir, err := os.MkdirTemp("", "tunasync")
 		defer os.RemoveAll(tmpDir)
 		So(err, ShouldBeNil)
 
@@ -218,7 +216,7 @@ func TestDBAdapter(t *testing.T) {
 	})
 
 	Convey("leveldbAdapter should work", t, func() {
-		tmpDir, err := ioutil.TempDir("", "tunasync")
+		tmpDir, err := os.MkdirTemp("", "tunasync")
 		defer os.RemoveAll(tmpDir)
 		So(err, ShouldBeNil)
 

manager/server.go

@@ -267,7 +267,7 @@ func (s *Manager) updateSchedulesOfWorker(c *gin.Context) {
 		if len(mirrorName) == 0 {
 			s.returnErrJSON(
 				c, http.StatusBadRequest,
-				errors.New("Mirror Name should not be empty"),
+				errors.New("mirror Name should not be empty"),
 			)
 		}
 
@@ -312,7 +312,7 @@ func (s *Manager) updateJobOfWorker(c *gin.Context) {
 	if len(mirrorName) == 0 {
 		s.returnErrJSON(
 			c, http.StatusBadRequest,
-			errors.New("Mirror Name should not be empty"),
+			errors.New("mirror Name should not be empty"),
 		)
 	}
 

manager/server_test.go

@@ -3,7 +3,7 @@ package manager
 import (
 	"encoding/json"
 	"fmt"
-	"io/ioutil"
+	"io"
 	"math/rand"
 	"net/http"
 	"strings"
@@ -36,7 +36,7 @@ func TestHTTPServer(t *testing.T) {
 		So(s, ShouldNotBeNil)
 		s.setDBAdapter(&mockDBAdapter{
 			workerStore: map[string]WorkerStatus{
-				_magicBadWorkerID: WorkerStatus{
+				_magicBadWorkerID: {
 					ID: _magicBadWorkerID,
 				}},
 			statusStore: make(map[string]MirrorStatus),
@@ -48,7 +48,7 @@ func TestHTTPServer(t *testing.T) {
 		So(resp.StatusCode, ShouldEqual, http.StatusOK)
 		So(resp.Header.Get("Content-Type"), ShouldEqual, "application/json; charset=utf-8")
 		defer resp.Body.Close()
-		body, err := ioutil.ReadAll(resp.Body)
+		body, err := io.ReadAll(resp.Body)
 		So(err, ShouldBeNil)
 		var p map[string]string
 		err = json.Unmarshal(body, &p)
@@ -268,8 +268,8 @@ func TestHTTPServer(t *testing.T) {
 				Convey("Update schedule of valid mirrors", func(ctx C) {
 					msg := MirrorSchedules{
 						Schedules: []MirrorSchedule{
-							MirrorSchedule{MirrorName: "arch-sync1", NextSchedule: time.Now().Add(time.Minute * 10)},
-							MirrorSchedule{MirrorName: "arch-sync2", NextSchedule: time.Now().Add(time.Minute * 7)},
+							{MirrorName: "arch-sync1", NextSchedule: time.Now().Add(time.Minute * 10)},
+							{MirrorName: "arch-sync2", NextSchedule: time.Now().Add(time.Minute * 7)},
 						},
 					}
 
@@ -346,8 +346,8 @@ func TestHTTPServer(t *testing.T) {
 				invalidWorker := "test_worker2"
 				sch := MirrorSchedules{
 					Schedules: []MirrorSchedule{
-						MirrorSchedule{MirrorName: "arch-sync1", NextSchedule: time.Now().Add(time.Minute * 10)},
-						MirrorSchedule{MirrorName: "arch-sync2", NextSchedule: time.Now().Add(time.Minute * 7)},
+						{MirrorName: "arch-sync1", NextSchedule: time.Now().Add(time.Minute * 10)},
+						{MirrorName: "arch-sync2", NextSchedule: time.Now().Add(time.Minute * 7)},
 					},
 				}
 				resp, err := PostJSON(fmt.Sprintf("%s/workers/%s/schedules",