fix: go modernize fix tests

Author: afkbluey

cmd/admin-bucket-remote-add_test.go

@@ -121,7 +121,6 @@ func TestGetBandwidthInBytes(t *testing.T) {
 	}
 	t.Parallel()
 	for _, tt := range tests {
-		tt := tt
 		t.Run(tt.name, func(t *testing.T) {
 			if got, err := getBandwidthInBytes(tt.args.bandwidthStr); err != nil || got != tt.want {
 				t.Errorf("getBandwidthInBytes() = %v, want %v", got, tt.want)

cmd/admin-decom-status.go

@@ -125,7 +125,7 @@ func mainAdminDecommissionStatus(ctx *cli.Context) error {
 	}
 
 	dspOrder := []col{colGreen} // Header
-	for i := 0; i < len(poolStatuses); i++ {
+	for range poolStatuses {
 		dspOrder = append(dspOrder, colGrey)
 	}
 	var printColors []*color.Color

cmd/admin-replicate-resync-status.go

@@ -206,7 +206,7 @@ func (m *resyncMetricsUI) View() string {
 	table.SetNoWhiteSpace(true)
 
 	var data [][]string
-	addLine := func(prefix string, value interface{}) {
+	addLine := func(prefix string, value any) {
 		data = append(data, []string{
 			prefix,
 			whiteStyle.Render(fmt.Sprint(value)),

cmd/admin-replicate-status.go

@@ -426,10 +426,7 @@ func (i srStatus) String() string {
 				currDowntime = UTCNow().Sub(m.LastOnline)
 			}
 			// normalize because total downtime is calculated at server side at heartbeat interval, may be slightly behind
-			totalDowntime := m.TotalDowntime
-			if currDowntime > totalDowntime {
-				totalDowntime = currDowntime
-			}
+			totalDowntime := max(currDowntime, m.TotalDowntime)
 			var linkStatus string
 			if m.Online {
 				linkStatus = healthDot + fmt.Sprintf(" online (total downtime: %s)", timeDurationToHumanizedDuration(totalDowntime).String())

cmd/admin-scanner-status.go

@@ -397,7 +397,7 @@ func (m *scannerMetricsUI) View() string {
 		writtenRows++
 	}
 	_ = addRow
-	addRowF := func(format string, vals ...interface{}) {
+	addRowF := func(format string, vals ...any) {
 		s := fmt.Sprintf(format, vals...)
 		table.Append([]string{s})
 		writtenRows++

cmd/admin-service-restart.go

@@ -173,7 +173,7 @@ func (m *serviceRestartUI) View() string {
 
 func initServiceRestartUI(rowCount int, currentCh chan serviceRestartMessage) *serviceRestartUI {
 	var printColors []*color.Color
-	for i := 0; i < rowCount; i++ {
+	for range rowCount {
 		printColors = append(printColors, getPrintCol(colGreen))
 	}
 

cmd/admin-user-svcacct-add.go

@@ -244,7 +244,7 @@ func generateCredentials() (accessKey, secretKey string, err *probe.Error) {
 	if e != nil {
 		return "", "", probe.NewError(e)
 	}
-	for i := 0; i < accessKeyMaxLen; i++ {
+	for i := range accessKeyMaxLen {
 		keyBytes[i] = alphaNumericTable[keyBytes[i]%alphaNumericTableLen]
 	}
 	accessKey = string(keyBytes)

cmd/anonymous-main.go

@@ -116,11 +116,11 @@ func (s anonymousRules) JSON() string {
 
 // anonymousMessage is container for anonymous command on bucket success and failure messages.
 type anonymousMessage struct {
-	Operation string                 `json:"operation"`
-	Status    string                 `json:"status"`
-	Bucket    string                 `json:"bucket"`
-	Perms     accessPerms            `json:"permission"`
-	Anonymous map[string]interface{} `json:"anonymous,omitempty"`
+	Operation string         `json:"operation"`
+	Status    string         `json:"status"`
+	Bucket    string         `json:"bucket"`
+	Perms     accessPerms    `json:"permission"`
+	Anonymous map[string]any `json:"anonymous,omitempty"`
 }
 
 // String colorized access message.
@@ -464,7 +464,7 @@ func runAnonymousCmd(args cli.Args) {
 				"Unable to "+operation+" anonymous `"+string(perms)+"` for `"+targetURL+"`.")
 		}
 	}
-	anonymousJSON := map[string]interface{}{}
+	anonymousJSON := map[string]any{}
 	if anonymousStr != "" {
 		e := json.Unmarshal([]byte(anonymousStr), &anonymousJSON)
 		fatalIf(probe.NewError(e), "Unable to unmarshal custom anonymous file.")

cmd/batch-list.go

@@ -134,7 +134,7 @@ func (c batchListMessage) JSON() string {
 	c.Status = "success"
 
 	// Create a temporary slice to hold jobs with derived statuses
-	jobsWithStatus := make([]map[string]interface{}, len(c.Jobs))
+	jobsWithStatus := make([]map[string]any, len(c.Jobs))
 
 	// Fetch the status for the batch job using BatchJobStatus API
 	for i, job := range c.Jobs {
@@ -155,7 +155,7 @@ func (c batchListMessage) JSON() string {
 		}
 
 		// Add the job details along with the derived status
-		jobsWithStatus[i] = map[string]interface{}{
+		jobsWithStatus[i] = map[string]any{
 			"id":      job.ID,
 			"type":    job.Type,
 			"user":    job.User,
@@ -165,7 +165,7 @@ func (c batchListMessage) JSON() string {
 	}
 
 	// Marshal the updated jobs into JSON
-	batchListMessageBytes, e := json.MarshalIndent(map[string]interface{}{
+	batchListMessageBytes, e := json.MarshalIndent(map[string]any{
 		"status": c.Status,
 		"jobs":   jobsWithStatus,
 	}, "", " ")

cmd/batch-status.go

@@ -232,7 +232,7 @@ func (m *batchJobMetricsUI) View() string {
 	table.SetNoWhiteSpace(true)
 
 	var data [][]string
-	addLine := func(prefix string, value interface{}) {
+	addLine := func(prefix string, value any) {
 		data = append(data, []string{
 			prefix,
 			whiteStyle.Render(fmt.Sprint(value)),