cmd: address gosimple linter warnings

internal/container/mesos/client.go:104:2: S1021: should merge variable declaration with assignment on next line (gosimple)
	var err error
	^
internal/pages/docker.go:161:2: S1023: redundant `return` statement (gosimple)
	return
	^
internal/storage/test/storagetests.go:73:2: S1008: should use 'return diff <= tolerance' instead of 'if diff <= tolerance { return true }; return false' (gosimple)
	if diff <= tolerance {
	^
internal/storage/bigquery/bigquery.go:257:39: S1019: should use make(map[string]interface{}) instead (gosimple)
		row := make(map[string]interface{}, 0)
		                                    ^
internal/api/versions.go:370:63: S1019: should use make(map[string][]v2.DeprecatedContainerStats) instead (gosimple)
		contStats := make(map[string][]v2.DeprecatedContainerStats, 0)
		                                                            ^
internal/api/versions.go:382:79: S1019: should use make(map[string]map[string]map[string][]info.MetricValBasic) instead (gosimple)
		contMetrics := make(map[string]map[string]map[string][]info.MetricValBasic, 0)
		                                                                            ^
internal/api/versions.go:384:65: S1019: should use make(map[string]map[string][]info.MetricValBasic) instead (gosimple)
			metrics := make(map[string]map[string][]info.MetricValBasic, 0)
			                                                             ^
internal/api/versions.go:390:61: S1019: should use make(map[string][]info.MetricValBasic) instead (gosimple)
					metricLabels := make(map[string][]info.MetricValBasic, 0)
					                                                       ^

Signed-off-by: Kir Kolyshkin <[email protected]>

Author: kolyshkin

cmd/internal/api/versions.go

@@ -367,7 +367,7 @@ func (api *version2_0) HandleRequest(requestType string, request []string, m man
 			}
 			klog.Errorf("Error calling GetRequestedContainersInfo: %v", err)
 		}
-		contStats := make(map[string][]v2.DeprecatedContainerStats, 0)
+		contStats := make(map[string][]v2.DeprecatedContainerStats)
 		for name, cinfo := range infos {
 			contStats[name] = v2.DeprecatedStatsFromV1(cinfo)
 		}
@@ -379,15 +379,15 @@ func (api *version2_0) HandleRequest(requestType string, request []string, m man
 		if err != nil {
 			return err
 		}
-		contMetrics := make(map[string]map[string]map[string][]info.MetricValBasic, 0)
+		contMetrics := make(map[string]map[string]map[string][]info.MetricValBasic)
 		for _, cinfo := range infos {
-			metrics := make(map[string]map[string][]info.MetricValBasic, 0)
+			metrics := make(map[string]map[string][]info.MetricValBasic)
 			for _, contStat := range cinfo.Stats {
 				if len(contStat.CustomMetrics) == 0 {
 					continue
 				}
 				for name, allLabels := range contStat.CustomMetrics {
-					metricLabels := make(map[string][]info.MetricValBasic, 0)
+					metricLabels := make(map[string][]info.MetricValBasic)
 					for _, metric := range allLabels {
 						if !metric.Timestamp.IsZero() {
 							metVal := info.MetricValBasic{

cmd/internal/container/mesos/client.go

@@ -101,8 +101,7 @@ func (c *client) ContainerInfo(id string) (*containerInfo, error) {
 // Get the Pid of the container
 func (c *client) ContainerPid(id string) (int, error) {
 	var pid int
-	var err error
-	err = retry.Retry(
+	err := retry.Retry(
 		func(attempt uint) error {
 			c, err := c.ContainerInfo(id)
 			if err != nil {

cmd/internal/pages/docker.go

@@ -158,5 +158,4 @@ func serveDockerPage(m manager.Manager, w http.ResponseWriter, u *url.URL) {
 	}
 
 	klog.V(5).Infof("Request took %s", time.Since(start))
-	return
 }

cmd/internal/storage/bigquery/bigquery.go

@@ -254,7 +254,7 @@ func (s *bigqueryStorage) containerFilesystemStatsToRows(
 	stats *info.ContainerStats,
 ) (rows []map[string]interface{}) {
 	for _, fsStat := range stats.Filesystem {
-		row := make(map[string]interface{}, 0)
+		row := make(map[string]interface{})
 		row[colFsDevice] = fsStat.Device
 		row[colFsLimit] = fsStat.Limit
 		row[colFsUsage] = fsStat.Usage

cmd/internal/storage/test/storagetests.go

@@ -70,10 +70,8 @@ func TimeEq(t1, t2 time.Time, tolerance time.Duration) bool {
 		t1, t2 = t2, t1
 	}
 	diff := t2.Sub(t1)
-	if diff <= tolerance {
-		return true
-	}
-	return false
+
+	return diff <= tolerance
 }
 
 // This function will generate random stats and write