Merge pull request #2969 from kolyshkin/linter-cmd

cmd: enable linter, fix warnings

Author: bobbypage

Makefile

@@ -97,6 +97,7 @@ lint:
 	fi
 	@echo ">> running golangci-lint using configuration at .golangci.yml"
 	@golangci-lint run
+	@cd cmd && golangci-lint run
 
 clean:
 	@rm -f *.test cadvisor

cmd/cadvisor.go

@@ -44,7 +44,7 @@ import (
 	"k8s.io/klog/v2"
 )
 
-var argIp = flag.String("listen_ip", "", "IP to listen on, defaults to all IPs")
+var argIP = flag.String("listen_ip", "", "IP to listen on, defaults to all IPs")
 var argPort = flag.Int("port", 8080, "port to listen")
 var maxProcs = flag.Int("max_procs", 0, "max number of CPUs that can be used simultaneously. Less than 1 for default (number of cores).")
 
@@ -102,7 +102,7 @@ func init() {
 	flag.Var(&enableMetrics, "enable_metrics", fmt.Sprintf("comma-separated list of `metrics` to be enabled. If set, overrides 'disable_metrics'. Options are %s.", optstr))
 
 	// Default logging verbosity to V(2)
-	flag.Set("v", "2")
+	_ = flag.Set("v", "2")
 }
 
 func main() {
@@ -131,9 +131,9 @@ func main() {
 
 	sysFs := sysfs.NewRealSysFs()
 
-	collectorHttpClient := createCollectorHttpClient(*collectorCert, *collectorKey)
+	collectorHTTPClient := createCollectorHTTPClient(*collectorCert, *collectorKey)
 
-	resourceManager, err := manager.New(memoryStorage, sysFs, manager.HousekeepingConfigFlags, includedMetrics, &collectorHttpClient, strings.Split(*rawCgroupPrefixWhiteList, ","), strings.Split(*envMetadataWhiteList, ","), *perfEvents, *resctrlInterval)
+	resourceManager, err := manager.New(memoryStorage, sysFs, manager.HousekeepingConfigFlags, includedMetrics, &collectorHTTPClient, strings.Split(*rawCgroupPrefixWhiteList, ","), strings.Split(*envMetadataWhiteList, ","), *perfEvents, *resctrlInterval)
 	if err != nil {
 		klog.Fatalf("Failed to create a manager: %s", err)
 	}
@@ -175,7 +175,7 @@ func main() {
 	rootMux := http.NewServeMux()
 	rootMux.Handle(*urlBasePrefix+"/", http.StripPrefix(*urlBasePrefix, mux))
 
-	addr := fmt.Sprintf("%s:%d", *argIp, *argPort)
+	addr := fmt.Sprintf("%s:%d", *argIP, *argPort)
 	klog.Fatal(http.ListenAndServe(addr, rootMux))
 }
 
@@ -212,7 +212,7 @@ func installSignalHandler(containerManager manager.Manager) {
 	}()
 }
 
-func createCollectorHttpClient(collectorCert, collectorKey string) http.Client {
+func createCollectorHTTPClient(collectorCert, collectorKey string) http.Client {
 	//Enable accessing insecure endpoints. We should be able to access metrics from any endpoint
 	tlsConfig := &tls.Config{
 		InsecureSkipVerify: true,

cmd/internal/api/handler.go

@@ -41,14 +41,14 @@ const (
 )
 
 func RegisterHandlers(mux httpmux.Mux, m manager.Manager) error {
-	apiVersions := getApiVersions()
-	supportedApiVersions := make(map[string]ApiVersion, len(apiVersions))
+	apiVersions := getAPIVersions()
+	supportedAPIVersions := make(map[string]ApiVersion, len(apiVersions))
 	for _, v := range apiVersions {
-		supportedApiVersions[v.Version()] = v
+		supportedAPIVersions[v.Version()] = v
 	}
 
 	mux.HandleFunc(apiResource, func(w http.ResponseWriter, r *http.Request) {
-		err := handleRequest(supportedApiVersions, m, w, r)
+		err := handleRequest(supportedAPIVersions, m, w, r)
 		if err != nil {
 			http.Error(w, err.Error(), 500)
 		}
@@ -65,7 +65,7 @@ const (
 	apiRequestArgs
 )
 
-func handleRequest(supportedApiVersions map[string]ApiVersion, m manager.Manager, w http.ResponseWriter, r *http.Request) error {
+func handleRequest(supportedAPIVersions map[string]ApiVersion, m manager.Manager, w http.ResponseWriter, r *http.Request) error {
 	start := time.Now()
 	defer func() {
 		klog.V(4).Infof("Request took %s", time.Since(start))
@@ -80,8 +80,8 @@ func handleRequest(supportedApiVersions map[string]ApiVersion, m manager.Manager
 
 	// If the request doesn't have an API version, list those.
 	if request == apiPrefix || request == apiResource {
-		versions := make([]string, 0, len(supportedApiVersions))
-		for v := range supportedApiVersions {
+		versions := make([]string, 0, len(supportedAPIVersions))
+		for v := range supportedAPIVersions {
 			versions = append(versions, v)
 		}
 		sort.Strings(versions)
@@ -100,7 +100,7 @@ func handleRequest(supportedApiVersions map[string]ApiVersion, m manager.Manager
 	requestArgs := strings.Split(requestElements[apiRequestArgs], "/")
 
 	// Check supported versions.
-	versionHandler, ok := supportedApiVersions[version]
+	versionHandler, ok := supportedAPIVersions[version]
 	if !ok {
 		return fmt.Errorf("unsupported API version %q", version)
 	}
@@ -129,16 +129,12 @@ func writeResult(res interface{}, w http.ResponseWriter) error {
 	}
 
 	w.Header().Set("Content-Type", "application/json")
-	w.Write(out)
-	return nil
+	_, err = w.Write(out)
+	return err
 
 }
 
 func streamResults(eventChannel *events.EventChannel, w http.ResponseWriter, r *http.Request, m manager.Manager) error {
-	cn, ok := w.(http.CloseNotifier)
-	if !ok {
-		return errors.New("could not access http.CloseNotifier")
-	}
 	flusher, ok := w.(http.Flusher)
 	if !ok {
 		return errors.New("could not access http.Flusher")
@@ -151,7 +147,7 @@ func streamResults(eventChannel *events.EventChannel, w http.ResponseWriter, r *
 	enc := json.NewEncoder(w)
 	for {
 		select {
-		case <-cn.CloseNotify():
+		case <-r.Context().Done():
 			m.CloseEventChannel(eventChannel.GetWatchId())
 			return nil
 		case ev := <-eventChannel.GetChannel():

cmd/internal/api/versions.go

@@ -29,20 +29,20 @@ import (
 )
 
 const (
-	containersApi    = "containers"
-	subcontainersApi = "subcontainers"
-	machineApi       = "machine"
-	machineStatsApi  = "machinestats"
-	dockerApi        = "docker"
-	summaryApi       = "summary"
-	statsApi         = "stats"
-	specApi          = "spec"
-	eventsApi        = "events"
-	storageApi       = "storage"
-	attributesApi    = "attributes"
-	versionApi       = "version"
-	psApi            = "ps"
-	customMetricsApi = "appmetrics"
+	containersAPI    = "containers"
+	subcontainersAPI = "subcontainers"
+	machineAPI       = "machine"
+	machineStatsAPI  = "machinestats"
+	dockerAPI        = "docker"
+	summaryAPI       = "summary"
+	statsAPI         = "stats"
+	specAPI          = "spec"
+	eventsAPI        = "events"
+	storageAPI       = "storage"
+	attributesAPI    = "attributes"
+	versionAPI       = "version"
+	psAPI            = "ps"
+	customMetricsAPI = "appmetrics"
 )
 
 // Interface for a cAdvisor API version
@@ -58,7 +58,7 @@ type ApiVersion interface {
 }
 
 // Gets all supported API versions.
-func getApiVersions() []ApiVersion {
+func getAPIVersions() []ApiVersion {
 	v1_0 := &version1_0{}
 	v1_1 := newVersion1_1(v1_0)
 	v1_2 := newVersion1_2(v1_1)
@@ -80,12 +80,12 @@ func (api *version1_0) Version() string {
 }
 
 func (api *version1_0) SupportedRequestTypes() []string {
-	return []string{containersApi, machineApi}
+	return []string{containersAPI, machineAPI}
 }
 
 func (api *version1_0) HandleRequest(requestType string, request []string, m manager.Manager, w http.ResponseWriter, r *http.Request) error {
 	switch requestType {
-	case machineApi:
+	case machineAPI:
 		klog.V(4).Infof("Api - Machine")
 
 		// Get the MachineInfo
@@ -98,7 +98,7 @@ func (api *version1_0) HandleRequest(requestType string, request []string, m man
 		if err != nil {
 			return err
 		}
-	case containersApi:
+	case containersAPI:
 		containerName := getContainerName(request)
 		klog.V(4).Infof("Api - Container(%s)", containerName)
 
@@ -143,12 +143,12 @@ func (api *version1_1) Version() string {
 }
 
 func (api *version1_1) SupportedRequestTypes() []string {
-	return append(api.baseVersion.SupportedRequestTypes(), subcontainersApi)
+	return append(api.baseVersion.SupportedRequestTypes(), subcontainersAPI)
 }
 
 func (api *version1_1) HandleRequest(requestType string, request []string, m manager.Manager, w http.ResponseWriter, r *http.Request) error {
 	switch requestType {
-	case subcontainersApi:
+	case subcontainersAPI:
 		containerName := getContainerName(request)
 		klog.V(4).Infof("Api - Subcontainers(%s)", containerName)
 
@@ -193,12 +193,12 @@ func (api *version1_2) Version() string {
 }
 
 func (api *version1_2) SupportedRequestTypes() []string {
-	return append(api.baseVersion.SupportedRequestTypes(), dockerApi)
+	return append(api.baseVersion.SupportedRequestTypes(), dockerAPI)
 }
 
 func (api *version1_2) HandleRequest(requestType string, request []string, m manager.Manager, w http.ResponseWriter, r *http.Request) error {
 	switch requestType {
-	case dockerApi:
+	case dockerAPI:
 		klog.V(4).Infof("Api - Docker(%v)", request)
 
 		// Get the query request.
@@ -262,12 +262,12 @@ func (api *version1_3) Version() string {
 }
 
 func (api *version1_3) SupportedRequestTypes() []string {
-	return append(api.baseVersion.SupportedRequestTypes(), eventsApi)
+	return append(api.baseVersion.SupportedRequestTypes(), eventsAPI)
 }
 
 func (api *version1_3) HandleRequest(requestType string, request []string, m manager.Manager, w http.ResponseWriter, r *http.Request) error {
 	switch requestType {
-	case eventsApi:
+	case eventsAPI:
 		return handleEventRequest(request, m, w, r)
 	default:
 		return api.baseVersion.HandleRequest(requestType, request, m, w, r)
@@ -310,7 +310,7 @@ func (api *version2_0) Version() string {
 }
 
 func (api *version2_0) SupportedRequestTypes() []string {
-	return []string{versionApi, attributesApi, eventsApi, machineApi, summaryApi, statsApi, specApi, storageApi, psApi, customMetricsApi}
+	return []string{versionAPI, attributesAPI, eventsAPI, machineAPI, summaryAPI, statsAPI, specAPI, storageAPI, psAPI, customMetricsAPI}
 }
 
 func (api *version2_0) HandleRequest(requestType string, request []string, m manager.Manager, w http.ResponseWriter, r *http.Request) error {
@@ -319,14 +319,14 @@ func (api *version2_0) HandleRequest(requestType string, request []string, m man
 		return err
 	}
 	switch requestType {
-	case versionApi:
+	case versionAPI:
 		klog.V(4).Infof("Api - Version")
 		versionInfo, err := m.GetVersionInfo()
 		if err != nil {
 			return err
 		}
 		return writeResult(versionInfo.CadvisorVersion, w)
-	case attributesApi:
+	case attributesAPI:
 		klog.V(4).Info("Api - Attributes")
 
 		machineInfo, err := m.GetMachineInfo()
@@ -339,7 +339,7 @@ func (api *version2_0) HandleRequest(requestType string, request []string, m man
 		}
 		info := v2.GetAttributes(machineInfo, versionInfo)
 		return writeResult(info, w)
-	case machineApi:
+	case machineAPI:
 		klog.V(4).Info("Api - Machine")
 
 		// TODO(rjnagal): Move machineInfo from v1.
@@ -348,7 +348,7 @@ func (api *version2_0) HandleRequest(requestType string, request []string, m man
 			return err
 		}
 		return writeResult(machineInfo, w)
-	case summaryApi:
+	case summaryAPI:
 		containerName := getContainerName(request)
 		klog.V(4).Infof("Api - Summary for container %q, options %+v", containerName, opt)
 
@@ -357,7 +357,7 @@ func (api *version2_0) HandleRequest(requestType string, request []string, m man
 			return err
 		}
 		return writeResult(stats, w)
-	case statsApi:
+	case statsAPI:
 		name := getContainerName(request)
 		klog.V(4).Infof("Api - Stats: Looking for stats for container %q, options %+v", name, opt)
 		infos, err := m.GetRequestedContainersInfo(name, opt)
@@ -367,27 +367,27 @@ 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)
 		}
 		return writeResult(contStats, w)
-	case customMetricsApi:
+	case customMetricsAPI:
 		containerName := getContainerName(request)
 		klog.V(4).Infof("Api - Custom Metrics: Looking for metrics for container %q, options %+v", containerName, opt)
 		infos, err := m.GetContainerInfoV2(containerName, opt)
 		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{
@@ -412,15 +412,15 @@ func (api *version2_0) HandleRequest(requestType string, request []string, m man
 			contMetrics[containerName] = metrics
 		}
 		return writeResult(contMetrics, w)
-	case specApi:
+	case specAPI:
 		containerName := getContainerName(request)
 		klog.V(4).Infof("Api - Spec for container %q, options %+v", containerName, opt)
 		specs, err := m.GetContainerSpec(containerName, opt)
 		if err != nil {
 			return err
 		}
 		return writeResult(specs, w)
-	case storageApi:
+	case storageAPI:
 		label := r.URL.Query().Get("label")
 		uuid := r.URL.Query().Get("uuid")
 		switch {
@@ -445,9 +445,9 @@ func (api *version2_0) HandleRequest(requestType string, request []string, m man
 			}
 			return writeResult(fi, w)
 		}
-	case eventsApi:
+	case eventsAPI:
 		return handleEventRequest(request, m, w, r)
-	case psApi:
+	case psAPI:
 		// reuse container type from request.
 		// ignore recursive.
 		// TODO(rjnagal): consider count to limit ps output.
@@ -478,7 +478,7 @@ func (api *version2_1) Version() string {
 }
 
 func (api *version2_1) SupportedRequestTypes() []string {
-	return append([]string{machineStatsApi}, api.baseVersion.SupportedRequestTypes()...)
+	return append([]string{machineStatsAPI}, api.baseVersion.SupportedRequestTypes()...)
 }
 
 func (api *version2_1) HandleRequest(requestType string, request []string, m manager.Manager, w http.ResponseWriter, r *http.Request) error {
@@ -489,7 +489,7 @@ func (api *version2_1) HandleRequest(requestType string, request []string, m man
 	}
 
 	switch requestType {
-	case machineStatsApi:
+	case machineStatsAPI:
 		klog.V(4).Infof("Api - MachineStats(%v)", request)
 		cont, err := m.GetRequestedContainersInfo("/", opt)
 		if err != nil {
@@ -499,7 +499,7 @@ func (api *version2_1) HandleRequest(requestType string, request []string, m man
 			klog.Errorf("Error calling GetRequestedContainersInfo: %v", err)
 		}
 		return writeResult(v2.MachineStatsFromV1(cont["/"]), w)
-	case statsApi:
+	case statsAPI:
 		name := getContainerName(request)
 		klog.V(4).Infof("Api - Stats: Looking for stats for container %q, options %+v", name, opt)
 		conts, err := m.GetRequestedContainersInfo(name, opt)

cmd/internal/container/install/install.go

@@ -16,6 +16,7 @@
 package install
 
 import (
+	// Register all included container providers.
 	_ "github.com/google/cadvisor/cmd/internal/container/mesos/install"
 	_ "github.com/google/cadvisor/container/containerd/install"
 	_ "github.com/google/cadvisor/container/crio/install"