Merge pull request #1114 from SergeyKanzhelev/staticchecklinter

fix the static ckeck linter issues

Author: k8s-ci-robot

.golangci.yml

@@ -7,6 +7,10 @@ linters:
   default: none
   enable:
     - ineffassign
+    - unused
+    - govet
+    #- errcheck
+    - staticcheck
   exclusions:
     generated: lax
     paths:

pkg/custompluginmonitor/types/config.go

@@ -161,7 +161,7 @@ func (cpc CustomPluginConfig) Validate() error {
 			}
 		}
 		if !defaultConditionExists {
-			return fmt.Errorf("Permanent problem %s does not have preset default condition.", conditionType)
+			return fmt.Errorf("permanent problem %s does not have preset default condition", conditionType)
 		}
 	}
 

pkg/exporters/k8sexporter/condition/manager.go

@@ -120,7 +120,7 @@ func (c *conditionManager) syncLoop(ctx context.Context) {
 				c.sync(ctx)
 			}
 		case <-ctx.Done():
-			break
+			return
 		}
 	}
 }

pkg/exporters/k8sexporter/condition/manager_test.go

@@ -83,8 +83,7 @@ func TestNeedUpdates(t *testing.T) {
 		t.Log(tc.name)
 		if tc.condition != "" {
 			// Guarantee that the time advances before creating a new condition.
-			for now := time.Now(); now == time.Now(); {
-			}
+			time.Sleep(time.Nanosecond)
 			c = newTestCondition(tc.condition)
 		}
 		m.UpdateCondition(c)

pkg/exporters/k8sexporter/problemclient/configs.go

@@ -89,7 +89,7 @@ func getKubeClientConfig(uri *url.URL) (*kube_rest.Config, error) {
 		kubeConfig.GroupVersion = &schema.GroupVersion{Version: APIVersion}
 		kubeConfig.Insecure = configOverrides.ClusterInfo.InsecureSkipTLSVerify
 		if configOverrides.ClusterInfo.InsecureSkipTLSVerify {
-			kubeConfig.TLSClientConfig.CAFile = ""
+			kubeConfig.CAFile = ""
 		}
 	} else {
 		authFile := ""

pkg/exporters/prometheusexporter/prometheus_exporter.go

@@ -56,5 +56,4 @@ func NewExporterOrDie(npdo *options.NodeProblemDetectorOptions) types.Exporter {
 // ExportProblems does nothing.
 // Prometheus exporter only exports metrics.
 func (pe *prometheusExporter) ExportProblems(status *types.Status) {
-	return
 }

pkg/exporters/stackdriver/gce/type.go

@@ -17,6 +17,8 @@ limitations under the License.
 package gce
 
 import (
+	"context"
+
 	"cloud.google.com/go/compute/metadata"
 	"k8s.io/klog/v2"
 )
@@ -38,26 +40,28 @@ func (md *Metadata) HasMissingField() bool {
 func (md *Metadata) PopulateFromGCE() error {
 	var err error
 	klog.Info("Fetching GCE metadata from metadata server")
+	// Need to be initialized with a context at the main.
+	ctx := context.TODO()
 	if md.ProjectID == "" {
-		md.ProjectID, err = metadata.ProjectID()
+		md.ProjectID, err = metadata.ProjectIDWithContext(ctx)
 		if err != nil {
 			return err
 		}
 	}
 	if md.Zone == "" {
-		md.Zone, err = metadata.Zone()
+		md.Zone, err = metadata.ZoneWithContext(ctx)
 		if err != nil {
 			return err
 		}
 	}
 	if md.InstanceID == "" {
-		md.InstanceID, err = metadata.InstanceID()
+		md.InstanceID, err = metadata.InstanceIDWithContext(ctx)
 		if err != nil {
 			return err
 		}
 	}
 	if md.InstanceName == "" {
-		md.InstanceName, err = metadata.InstanceName()
+		md.InstanceName, err = metadata.InstanceNameWithContext(ctx)
 		if err != nil {
 			return err
 		}

pkg/exporters/stackdriver/stackdriver_exporter.go

@@ -186,7 +186,6 @@ func (se *stackdriverExporter) populateMetadataOrDie() {
 // ExportProblems does nothing.
 // Stackdriver exporter only exports metrics.
 func (se *stackdriverExporter) ExportProblems(status *types.Status) {
-	return
 }
 
 type commandLineOptions struct {

pkg/problemmetrics/problem_metrics.go

@@ -78,7 +78,7 @@ func NewProblemMetricsManagerOrDie() *ProblemMetricsManager {
 // IncrementProblemCounter increments the value of a problem counter.
 func (pmm *ProblemMetricsManager) IncrementProblemCounter(reason string, count int64) error {
 	if pmm.problemCounter == nil {
-		return errors.New("problem counter is being incremented before initialized.")
+		return errors.New("problem counter is being incremented before initialized")
 	}
 
 	return pmm.problemCounter.Record(map[string]string{"reason": reason}, count)
@@ -87,7 +87,7 @@ func (pmm *ProblemMetricsManager) IncrementProblemCounter(reason string, count i
 // SetProblemGauge sets the value of a problem gauge.
 func (pmm *ProblemMetricsManager) SetProblemGauge(problemType string, reason string, value bool) error {
 	if pmm.problemGauge == nil {
-		return errors.New("problem gauge is being set before initialized.")
+		return errors.New("problem gauge is being set before initialized")
 	}
 
 	pmm.problemTypeToReasonMutex.Lock()

pkg/systemlogmonitor/config.go

@@ -54,8 +54,8 @@ func (mc *MonitorConfig) ApplyDefaultConfiguration() {
 	if mc.EnableMetricsReporting == nil {
 		mc.EnableMetricsReporting = &defaultEnableMetricsReporting
 	}
-	if mc.WatcherConfig.Lookback == "" {
-		mc.WatcherConfig.Lookback = defaultLookback
+	if mc.Lookback == "" {
+		mc.Lookback = defaultLookback
 	}
 }