Merge pull request #12253 from medyagh/golint_revive

change deprecated golint to revive and fix lint issues

Author: medyagh

Diff for: Makefile

@@ -77,7 +77,7 @@ GOLINT_GOGC ?= 100
 # options for lint (golangci-lint)
 GOLINT_OPTIONS = --timeout 7m \
 	  --build-tags "${MINIKUBE_INTEGRATION_BUILD_TAGS}" \
-	  --enable gofmt,goimports,gocritic,golint,gocyclo,misspell,nakedret,stylecheck,unconvert,unparam,dogsled \
+	  --enable gofmt,goimports,gocritic,revive,gocyclo,misspell,nakedret,stylecheck,unconvert,unparam,dogsled \
 	  --exclude 'variable on range scope.*in function literal|ifElseChain'
 
 export GO111MODULE := on

Diff for: hack/benchmark/time-to-k8s/chart.go

@@ -220,11 +220,7 @@ func createChart(chartPath string, values []plotter.Values, totals []float64, na
 
 	p.Add(l)
 
-	if err := p.Save(12*vg.Inch, 8*vg.Inch, chartPath); err != nil {
-		return err
-	}
-
-	return nil
+	return p.Save(12*vg.Inch, 8*vg.Inch, chartPath)
 }
 
 func createBars(values plotter.Values, index int) (*plotter.BarChart, error) {

Diff for: hack/update/registry.go

@@ -98,10 +98,7 @@ func crUpdate(ctx context.Context, reg registry, image, version string) error {
 // TagImage tags local image:current with stable version, and returns any error occurred.
 func TagImage(ctx context.Context, image, current, stable string) error {
 	tag := exec.CommandContext(ctx, "docker", "tag", image+":"+current, image+":"+stable)
-	if err := RunWithRetryNotify(ctx, tag, nil, 1*time.Second, 10); err != nil {
-		return err
-	}
-	return nil
+	return RunWithRetryNotify(ctx, tag, nil, 1*time.Second, 10)
 }
 
 // PullImage checks if current image exists locally, tries to pull it if not, and returns reference image url and any error occurred.

Diff for: hack/update/update.go

@@ -189,7 +189,7 @@ func RunWithRetryNotify(ctx context.Context, cmd *exec.Cmd, stdin io.Reader, max
 	notify := func(err error, wait time.Duration) {
 		klog.Errorf("Temporary error running '%s' (will retry in %s): %v", cmd.String(), wait, err)
 	}
-	if err := backoff.RetryNotify(func() error {
+	return backoff.RetryNotify(func() error {
 		cmd.Stdin = stdin
 		var stderr bytes.Buffer
 		cmd.Stderr = &stderr
@@ -198,10 +198,7 @@ func RunWithRetryNotify(ctx context.Context, cmd *exec.Cmd, stdin io.Reader, max
 			return fmt.Errorf("%w: %s", err, stderr.String())
 		}
 		return nil
-	}, bc, notify); err != nil {
-		return err
-	}
-	return nil
+	}, bc, notify)
 }
 
 // Run runs command cmd with stdin

Diff for: pkg/addons/addons.go

@@ -48,11 +48,11 @@ import (
 )
 
 // Force is used to override checks for addons
-var Force bool = false
+var Force = false
 
 // Refresh is used to refresh pods in specific cases when an addon is enabled
 // Currently only used for gcp-auth
-var Refresh bool = false
+var Refresh = false
 
 // RunCallbacks runs all actions associated to an addon, but does not set it (thread-safe)
 func RunCallbacks(cc *config.ClusterConfig, name string, value string) error {
@@ -377,7 +377,7 @@ func Start(wg *sync.WaitGroup, cc *config.ClusterConfig, toEnable map[string]boo
 
 	var awg sync.WaitGroup
 
-	enabledAddons := []string{}
+	var enabledAddons []string
 
 	defer func() { // making it show after verifications (see #7613)
 		register.Reg.SetStep(register.EnablingAddons)

Diff for: pkg/drivers/hyperkit/driver.go

@@ -276,10 +276,7 @@ func (d *Driver) Start() error {
 		return err
 	}
 
-	if err := d.setupNFSMounts(); err != nil {
-		return err
-	}
-	return nil
+	return d.setupNFSMounts()
 }
 
 func (d *Driver) setupIP(mac string) error {

Diff for: pkg/drivers/none/none.go

@@ -192,10 +192,7 @@ func (d *Driver) Remove() error {
 
 // Restart a host
 func (d *Driver) Restart() error {
-	if err := sysinit.New(d.exec).Restart("kubelet"); err != nil {
-		return err
-	}
-	return nil
+	return sysinit.New(d.exec).Restart("kubelet")
 }
 
 // Start a host

Diff for: pkg/drivers/ssh/ssh.go

@@ -206,10 +206,7 @@ func (d *Driver) Stop() error {
 
 // Restart a host
 func (d *Driver) Restart() error {
-	if err := sysinit.New(d.exec).Restart("kubelet"); err != nil {
-		return err
-	}
-	return nil
+	return sysinit.New(d.exec).Restart("kubelet")
 }
 
 // Kill stops a host forcefully, including any containers that we are managing.

Diff for: pkg/minikube/config/profile.go

@@ -152,10 +152,7 @@ func SaveProfile(name string, cfg *ClusterConfig, miniHome ...string) error {
 
 	// If no config file exists, don't worry about swapping paths
 	if _, err := os.Stat(path); os.IsNotExist(err) {
-		if err := lock.WriteFile(path, data, 0600); err != nil {
-			return err
-		}
-		return nil
+		return lock.WriteFile(path, data, 0600)
 	}
 
 	tf, err := ioutil.TempFile(filepath.Dir(path), "config.json.tmp")
@@ -176,11 +173,7 @@ func SaveProfile(name string, cfg *ClusterConfig, miniHome ...string) error {
 		return err
 	}
 
-	if err = os.Rename(tf.Name(), path); err != nil {
-		return err
-	}
-
-	return nil
+	return os.Rename(tf.Name(), path)
 }
 
 // DeleteProfile deletes a profile and removes the profile dir

Diff for: pkg/minikube/download/download.go

@@ -35,8 +35,8 @@ import (
 
 var (
 	// DownloadMock is called instead of the download implementation if not nil.
-	DownloadMock func(src, dst string) error = nil
-	checkCache                               = os.Stat
+	DownloadMock func(src, dst string) error
+	checkCache   = os.Stat
 )
 
 // CreateDstDownloadMock is the default mock implementation of download.

Diff for: pkg/minikube/download/preload.go

@@ -49,7 +49,7 @@ const (
 )
 
 var (
-	preloadStates map[string]map[string]bool = make(map[string]map[string]bool)
+	preloadStates = make(map[string]map[string]bool)
 )
 
 // TarballName returns name of the tarball

Diff for: pkg/minikube/driver/driver_darwin.go

@@ -22,7 +22,7 @@ import (
 )
 
 // supportedDrivers is a list of supported drivers on Darwin.
-var supportedDrivers []string = func() []string {
+var supportedDrivers = func() []string {
 	if runtime.GOARCH == "arm64" {
 		// on darwin/arm64 only docker and ssh are supported yet
 		return []string{

Diff for: pkg/minikube/kubeconfig/context.go

@@ -28,15 +28,15 @@ func UnsetCurrentContext(machineName string, configPath ...string) error {
 	if configPath != nil {
 		fPath = configPath[0]
 	}
-	kCfg, err := readOrNew(fPath)
+	cfg, err := readOrNew(fPath)
 	if err != nil {
 		return errors.Wrap(err, "Error getting kubeconfig status")
 	}
 
 	// Unset current-context only if profile is the current-context
-	if kCfg.CurrentContext == machineName {
-		kCfg.CurrentContext = ""
-		if err := writeToFile(kCfg, fPath); err != nil {
+	if cfg.CurrentContext == machineName {
+		cfg.CurrentContext = ""
+		if err := writeToFile(cfg, fPath); err != nil {
 			return errors.Wrap(err, "writing kubeconfig")
 		}
 		return nil

Diff for: pkg/minikube/kubeconfig/extension.go

@@ -55,10 +55,7 @@ func (in *Extension) DeepCopy() *Extension {
 
 // DeepCopyObject is an autogenerated deepcopy function, copying the receiver, creating a new runtime.Object.
 func (in *Extension) DeepCopyObject() runtime.Object {
-	if c := in.DeepCopy(); c != nil {
-		return c
-	}
-	return nil
+	return in.DeepCopy()
 }
 
 // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.

Diff for: pkg/minikube/node/start.go

@@ -401,11 +401,7 @@ func waitForCRISocket(runner cruntime.CommandRunner, socket string, wait int, in
 		}
 		return nil
 	}
-	if err := retry.Expo(chkPath, time.Duration(interval)*time.Second, time.Duration(wait)*time.Second); err != nil {
-		return err
-	}
-
-	return nil
+	return retry.Expo(chkPath, time.Duration(interval)*time.Second, time.Duration(wait)*time.Second)
 }
 
 func waitForCRIVersion(runner cruntime.CommandRunner, socket string, wait int, interval int) error {
@@ -426,11 +422,7 @@ func waitForCRIVersion(runner cruntime.CommandRunner, socket string, wait int, i
 		klog.Info(rr.Stdout.String())
 		return nil
 	}
-	if err := retry.Expo(chkInfo, time.Duration(interval)*time.Second, time.Duration(wait)*time.Second); err != nil {
-		return err
-	}
-
-	return nil
+	return retry.Expo(chkInfo, time.Duration(interval)*time.Second, time.Duration(wait)*time.Second)
 }
 
 // setupKubeAdm adds any requested files into the VM before Kubernetes is started

Diff for: pkg/minikube/shell/shell.go

@@ -139,7 +139,7 @@ REM @FOR /f "tokens=*" %%i IN ('%s') DO @%%i
 }
 
 var defaultSh = "bash"
-var defaultShell shellData = shellConfigMap[defaultSh]
+var defaultShell = shellConfigMap[defaultSh]
 
 var (
 	// ForceShell forces a shell name

Diff for: test/integration/functional_test_mount_test.go

@@ -276,7 +276,7 @@ func validateMountCmd(ctx context.Context, t *testing.T, profile string) { // no
 		t.Logf("reading mount text")
 		mountText := func() string {
 			str := ""
-			var err error = nil
+			var err error
 			for err == nil {
 				var add string
 				add, err = ss.Stdout.ReadString(0)