run make fmt

Author: volatilemolotov

cmd/minikube/cmd/config/view.go

@@ -40,7 +40,7 @@ type ViewTemplate struct {
 var configViewCmd = &cobra.Command{
 	Use:   "view",
 	Short: "Display values currently set in the minikube config file",
-	Long:  `Display values currently set in the minikube config file. 
+	Long: `Display values currently set in the minikube config file. 
 	The output format can be customized using the --format flag, which accepts a Go template. 
 	The config file is typically located at "~/.minikube/config/config.json".`,
 	Run: func(_ *cobra.Command, _ []string) {

pkg/addons/addons.go

@@ -450,20 +450,18 @@ func enableOrDisableAddonInternal(cc *config.ClusterConfig, addon *assets.Addon,
 		}
 	}
 
-if addon.HelmChart != nil {
-	err := helmInstallBinary(addon,runner)
-	if err != nil {
-		return err
-	}
-	
-	ctx, cancel := context.WithTimeout(context.Background(), 2*time.Minute)
-	defer cancel()
-	cmd := helmUninstallOrInstall(ctx, addon.HelmChart, enable)
-	_, err = runner.RunCmd(cmd)
-	return err
+	if addon.HelmChart != nil {
+		err := helmInstallBinary(addon, runner)
+		if err != nil {
+			return err
 		}
-  
 
+		ctx, cancel := context.WithTimeout(context.Background(), 2*time.Minute)
+		defer cancel()
+		cmd := helmUninstallOrInstall(ctx, addon.HelmChart, enable)
+		_, err = runner.RunCmd(cmd)
+		return err
+	}
 
 	// on the first attempt try without force, but on subsequent attempts use force
 	force := false

pkg/addons/helm.go

@@ -29,41 +29,41 @@ import (
 )
 
 // runs a helm install within the minikube vm or container based on the contents of chart *assets.HelmChart
-func installHelmChart (ctx context.Context, chart *assets.HelmChart) *exec.Cmd {
+func installHelmChart(ctx context.Context, chart *assets.HelmChart) *exec.Cmd {
 	args := []string{
 		fmt.Sprintf("KUBECONFIG=%s", path.Join(vmpath.GuestPersistentDir, "kubeconfig")),
 		"helm", "upgrade", "--install", chart.Name, chart.Repo, "--create-namespace",
 	}
-			if chart.Namespace != "" {
-			args = append(args, "--namespace", chart.Namespace)
-		}
+	if chart.Namespace != "" {
+		args = append(args, "--namespace", chart.Namespace)
+	}
 
-			if chart.Values != nil {
-				for _, value := range chart.Values {
-					args = append(args, "--set", value)
-					}
-				}
+	if chart.Values != nil {
+		for _, value := range chart.Values {
+			args = append(args, "--set", value)
+		}
+	}
 
-			if chart.ValueFiles != nil {
-				for _, value := range chart.ValueFiles {
-					args = append(args, "--values", value)
-					}
-				}
-				
-		return exec.CommandContext(ctx, "sudo", args...)
+	if chart.ValueFiles != nil {
+		for _, value := range chart.ValueFiles {
+			args = append(args, "--values", value)
+		}
 	}
 
+	return exec.CommandContext(ctx, "sudo", args...)
+}
+
 // runs a helm uninstall based on the contents of chart *assets.HelmChart
-func uninstalllHelmChart (ctx context.Context, chart *assets.HelmChart) *exec.Cmd {
+func uninstalllHelmChart(ctx context.Context, chart *assets.HelmChart) *exec.Cmd {
 	args := []string{
 		fmt.Sprintf("KUBECONFIG=%s", path.Join(vmpath.GuestPersistentDir, "kubeconfig")),
 		"helm", "uninstall", chart.Name,
-		}
-			if chart.Namespace != "" {
-			args = append(args, "--namespace", chart.Namespace)
-		}
-		return exec.CommandContext(ctx, "sudo", args...)
 	}
+	if chart.Namespace != "" {
+		args = append(args, "--namespace", chart.Namespace)
+	}
+	return exec.CommandContext(ctx, "sudo", args...)
+}
 
 // based on enable will execute installHelmChart or uninstallHelmChart
 func helmUninstallOrInstall(ctx context.Context, chart *assets.HelmChart, enable bool) *exec.Cmd {
@@ -86,8 +86,8 @@ func helmInstallBinary(addon *assets.Addon, runner command.Runner) error {
 		// we copy the binary from /usr/local/bin to /usr/bin because /usr/local/bin is not in PATH in both iso and kicbase
 		_, err = runner.RunCmd(exec.Command("sudo", "mv", "/usr/local/bin/helm", "/usr/bin/helm"))
 		if err != nil {
-		return errors.Wrap(err, "installing helm")
+			return errors.Wrap(err, "installing helm")
 		}
 	}
 	return err
-	}
+}

pkg/addons/helm_test.go

@@ -30,15 +30,15 @@ func TestHelmCommand(t *testing.T) {
 		chart       *assets.HelmChart
 		enable      bool
 		expected    string
-		mode 				string
+		mode        string
 	}{
 		{
 			description: "enable an addon",
 			chart: &assets.HelmChart{
-				Name:      "addon-name",
-				Repo:      "addon-repo/addon-chart",
-				Namespace: "addon-namespace",
-				Values:    []string{"key=value"},
+				Name:       "addon-name",
+				Repo:       "addon-repo/addon-chart",
+				Namespace:  "addon-namespace",
+				Values:     []string{"key=value"},
 				ValueFiles: []string{"/etc/kubernetes/addons/values.yaml"},
 			},
 			enable:   true,
@@ -47,13 +47,13 @@ func TestHelmCommand(t *testing.T) {
 		{
 			description: "enable an addon without namespace",
 			chart: &assets.HelmChart{
-				Name: "addon-name",
-				Repo: "addon-repo/addon-chart",
-				Values:    []string{"key=value"},
+				Name:       "addon-name",
+				Repo:       "addon-repo/addon-chart",
+				Values:     []string{"key=value"},
 				ValueFiles: []string{"/etc/kubernetes/addons/values.yaml"},
 			},
 			enable:   true,
-			expected: "sudo KUBECONFIG=/var/lib/minikube/kubeconfig helm upgrade --install addon-name addon-repo/addon-chart --create-namespace --set key=value --values /etc/kubernetes/addons/values.yaml" ,
+			expected: "sudo KUBECONFIG=/var/lib/minikube/kubeconfig helm upgrade --install addon-name addon-repo/addon-chart --create-namespace --set key=value --values /etc/kubernetes/addons/values.yaml",
 		},
 		{
 			description: "disable an addon",
@@ -63,13 +63,13 @@ func TestHelmCommand(t *testing.T) {
 			},
 			enable:   false,
 			expected: "sudo KUBECONFIG=/var/lib/minikube/kubeconfig helm uninstall addon-name --namespace addon-namespace",
-			mode: "cpu",
+			mode:     "cpu",
 		},
 	}
 
 	for _, test := range tests {
 		t.Run(test.description, func(t *testing.T) {
-			command := helmUninstallOrInstall(context.Background(), test.chart, test.enable )
+			command := helmUninstallOrInstall(context.Background(), test.chart, test.enable)
 			actual := strings.Join(command.Args, " ")
 			if actual != test.expected {
 				t.Errorf("helm command mismatch:\nexpected: %s\nactual:   %s", test.expected, actual)

pkg/minikube/assets/addons.go

@@ -36,12 +36,11 @@ import (
 
 // HelmChart holds information about a helm chart.
 type HelmChart struct {
-	Name      string
-	Repo      string
-	Namespace string
-	Values    []string
+	Name       string
+	Repo       string
+	Namespace  string
+	Values     []string
 	ValueFiles []string
-
 }
 
 // Addon is a named list of assets, that can be enabled

pkg/minikube/assets/addons_test.go

@@ -45,7 +45,7 @@ func mapsEqual(a, b map[string]string) bool {
 
 func TestParseMapString(t *testing.T) {
 	cases := map[string]map[string]string{
-		"Aardvark=1,B=2,Cantaloupe=3":         {"Aardvark": "1", "B": "2", "Cantaloupe": "3"},
+		"Aardvark=1,B=2,Cantaloupe=3":        {"Aardvark": "1", "B": "2", "Cantaloupe": "3"},
 		"A=,B=2,C=":                          {"A": "", "B": "2", "C": ""},
 		"":                                   {},
 		"malformed,good=howdy,manyequals==,": {"good": "howdy"},

pkg/minikube/assets/vm_assets.go

@@ -20,13 +20,13 @@ import (
 	"bytes"
 	"embed"
 	"fmt"
-	"text/template"
 	"io"
 	"os"
 	"path"
 	"path/filepath"
 	"strconv"
 	"strings"
+	"text/template"
 	"time"
 
 	"github.com/pkg/errors"

pkg/minikube/download/licenses.go

@@ -67,15 +67,15 @@ func Licenses(dir string) error {
 		return fmt.Errorf("failed to create temporary file: %v", err)
 	}
 	defer func() {
-                if err := os.Remove(tempFile.Name()); err != nil {
-                        klog.Warningf("Failed to remove temp file %s: %v", tempFile.Name(), err)
-                }
-        }()
+		if err := os.Remove(tempFile.Name()); err != nil {
+			klog.Warningf("Failed to remove temp file %s: %v", tempFile.Name(), err)
+		}
+	}()
 	defer func() {
-                if err := tempFile.Close(); err != nil {
-                        klog.Warningf("Failed to close temp file %s: %v", tempFile.Name(), err)
-                }
-        }()
+		if err := tempFile.Close(); err != nil {
+			klog.Warningf("Failed to close temp file %s: %v", tempFile.Name(), err)
+		}
+	}()
 
 	if _, err := io.Copy(tempFile, resp.Body); err != nil {
 		return fmt.Errorf("failed to copy downloaded content from %s: %v", url, err)