refactor: use slices.Contains to simplify code

Signed-off-by: deepdring <[email protected]>

Author: deepdring

cmd/minikube/cmd/config/defaults_test.go

@@ -17,6 +17,7 @@ limitations under the License.
 package config
 
 import (
+	"slices"
 	"testing"
 
 	"k8s.io/minikube/pkg/minikube/out"
@@ -49,10 +50,8 @@ func TestGetDefaults(t *testing.T) {
 			if tc.shouldErr {
 				return
 			}
-			for _, d := range defaults {
-				if d == tc.expectedContents {
-					return
-				}
+			if slices.Contains(defaults, tc.expectedContents) {
+				return
 			}
 			t.Fatalf("defaults didn't contain expected default. Actual: %v\nExpected: %v\n", defaults, tc.expectedContents)
 		})

cmd/minikube/cmd/delete.go

@@ -22,6 +22,7 @@ import (
 	"os"
 	"os/exec"
 	"path/filepath"
+	"slices"
 	"strconv"
 	"strings"
 	"time"
@@ -174,11 +175,8 @@ func kicbaseImages(ctx context.Context, ociBin string) ([]string, error) {
 
 	var result []string
 	for _, img := range allImages {
-		for _, kicImg := range kicImagesRepo {
-			if kicImg == strings.Split(img, ":")[0] {
-				result = append(result, img)
-				break
-			}
+		if slices.Contains(kicImagesRepo, strings.Split(img, ":")[0]) {
+			result = append(result, img)
 		}
 	}
 	return result, nil

cmd/minikube/cmd/root.go

@@ -22,6 +22,7 @@ import (
 	"os"
 	"path/filepath"
 	"runtime"
+	"slices"
 	"strings"
 
 	"github.com/spf13/cobra"
@@ -99,11 +100,8 @@ func Execute() {
 	// Check whether this is a windows binary (.exe) running inisde WSL.
 	if runtime.GOOS == "windows" && detect.IsMicrosoftWSL() {
 		var found = false
-		for _, a := range os.Args {
-			if a == "--force" {
-				found = true
-				break
-			}
+		if slices.Contains(os.Args, "--force") {
+			found = true
 		}
 		if !found {
 			exit.Message(reason.WrongBinaryWSL, "You are trying to run a windows .exe binary inside WSL. For better integration please use a Linux binary instead (Download at https://minikube.sigs.k8s.io/docs/start/.). Otherwise if you still want to do this, you can do it using --force")

cmd/minikube/cmd/start.go

@@ -28,6 +28,7 @@ import (
 	"os/user"
 	"regexp"
 	"runtime"
+	"slices"
 	"sort"
 	"strconv"
 	"strings"
@@ -2095,11 +2096,5 @@ func startNerdctld() {
 
 // contains checks whether the parameter slice contains the parameter string
 func contains(sl []string, s string) bool {
-	for _, k := range sl {
-		if s == k {
-			return true
-		}
-
-	}
-	return false
+	return slices.Contains(sl, s)
 }

cmd/minikube/cmd/start_flags.go

@@ -19,6 +19,7 @@ package cmd
 import (
 	"fmt"
 	"runtime"
+	"slices"
 	"strings"
 	"time"
 
@@ -1016,13 +1017,7 @@ func checkExtraDiskOptions(cmd *cobra.Command, driverName string) {
 	supportedDrivers := []string{driver.HyperKit, driver.KVM2, driver.QEMU2, driver.VFKit, driver.Krunkit}
 
 	if cmd.Flags().Changed(extraDisks) {
-		supported := false
-		for _, driver := range supportedDrivers {
-			if driverName == driver {
-				supported = true
-				break
-			}
-		}
+		supported := slices.Contains(supportedDrivers, driverName)
 		if !supported {
 			out.WarningT("Specifying extra disks is currently only supported for the following drivers: {{.supported_drivers}}. If you can contribute to add this feature, please create a PR.", out.V{"supported_drivers": supportedDrivers})
 		}

cmd/minikube/cmd/start_test.go

@@ -18,6 +18,7 @@ package cmd
 
 import (
 	"fmt"
+	"slices"
 	"strings"
 	"testing"
 	"time"
@@ -253,13 +254,7 @@ func TestGenerateCfgFromFlagsHTTPProxyHandling(t *testing.T) {
 					}
 				} else {
 					// proxy must in config
-					found := false
-					for _, v := range config.DockerEnv {
-						if v == proxyEnv {
-							found = true
-							break
-						}
-					}
+					found := slices.Contains(config.DockerEnv, proxyEnv)
 					if !found {
 						t.Fatalf("Value %s expected in dockerEnv but not occurred", test.proxy)
 					}