Merge pull request #21681 from nirs/slices-contains

config: Use slices.Contains

Author: medyagh

cmd/minikube/cmd/config/prompt.go

@@ -21,6 +21,7 @@ import (
 	"io"
 	"log"
 	"os"
+	"slices"
 	"strings"
 
 	"golang.org/x/term"
@@ -44,9 +45,9 @@ func AskForYesNoConfirmation(s string, posResponses, negResponses []string) bool
 		}
 
 		switch r := strings.ToLower(strings.TrimSpace(response)); {
-		case containsString(posResponses, r):
+		case slices.Contains(posResponses, r):
 			return true
-		case containsString(negResponses, r):
+		case slices.Contains(negResponses, r):
 			return false
 		default:
 			out.Err("Please type yes or no:")
@@ -137,22 +138,6 @@ func AskForPasswordValue(s string) string {
 	return result
 }
 
-// posString returns the first index of element in slice.
-// If slice does not contain element, returns -1.
-func posString(slice []string, element string) int {
-	for index, elem := range slice {
-		if elem == element {
-			return index
-		}
-	}
-	return -1
-}
-
-// containsString returns true if slice contains element
-func containsString(slice []string, element string) bool {
-	return posString(slice, element) != -1
-}
-
 // AskForStaticValidatedValue asks for a single value to enter and check for valid input
 func AskForStaticValidatedValue(s string, validator func(s string) bool) string {
 	reader := bufio.NewReader(os.Stdin)

cmd/minikube/cmd/start.go

@@ -28,6 +28,7 @@ import (
 	"os/user"
 	"regexp"
 	"runtime"
+	"slices"
 	"sort"
 	"strconv"
 	"strings"
@@ -1373,8 +1374,8 @@ func validateFlags(cmd *cobra.Command, drvName string) { //nolint:gocyclo
 
 	// check that kubeadm extra args contain only allowed parameters
 	for param := range config.ExtraOptions.AsMap().Get(bsutil.Kubeadm) {
-		if !config.ContainsParam(bsutil.KubeadmExtraArgsAllowed[bsutil.KubeadmCmdParam], param) &&
-			!config.ContainsParam(bsutil.KubeadmExtraArgsAllowed[bsutil.KubeadmConfigParam], param) {
+		if !slices.Contains(bsutil.KubeadmExtraArgsAllowed[bsutil.KubeadmCmdParam], param) &&
+			!slices.Contains(bsutil.KubeadmExtraArgsAllowed[bsutil.KubeadmConfigParam], param) {
 			exit.Message(reason.Usage, "Sorry, the kubeadm.{{.parameter_name}} parameter is currently not supported by --extra-config", out.V{"parameter_name": param})
 		}
 	}
@@ -1812,7 +1813,7 @@ func validateKubernetesVersion(old *config.ClusterConfig) {
 	}
 	if nvs.GT(newestVersion) {
 		out.WarningT("Specified Kubernetes version {{.specified}} is newer than the newest supported version: {{.newest}}. Use `minikube config defaults kubernetes-version` for details.", out.V{"specified": nvs, "newest": constants.NewestKubernetesVersion})
-		if contains(constants.ValidKubernetesVersions, kubernetesVer) {
+		if slices.Contains(constants.ValidKubernetesVersions, kubernetesVer) {
 			out.Styled(style.Check, "Kubernetes version {{.specified}} found in version list", out.V{"specified": nvs})
 		} else {
 			out.WarningT("Specified Kubernetes version {{.specified}} not found in Kubernetes version list", out.V{"specified": nvs})
@@ -2098,14 +2099,3 @@ func startNerdctld() {
 		exit.Error(reason.StartNerdctld, fmt.Sprintf("Failed to set up DOCKER_HOST: %s", rest.Output()), err)
 	}
 }
-
-// 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
-}

pkg/addons/validations.go

@@ -19,6 +19,7 @@ package addons
 import (
 	"errors"
 	"fmt"
+	"slices"
 	"strconv"
 
 	"github.com/spf13/viper"
@@ -66,7 +67,7 @@ func isVolumesnapshotsEnabled(cc *config.ClusterConfig, _, value string) error {
 	// assets.Addons[].IsEnabled() returns the current status of the addon or default value.
 	// config.AddonList contains list of addons to be enabled.
 	addonList := viper.GetStringSlice(config.AddonListFlag)
-	isVolumesnapshotsEnabled := assets.Addons[volumesnapshotsAddon].IsEnabled(cc) || contains(addonList, volumesnapshotsAddon)
+	isVolumesnapshotsEnabled := assets.Addons[volumesnapshotsAddon].IsEnabled(cc) || slices.Contains(addonList, volumesnapshotsAddon)
 	if isCsiDriverEnabled && !isVolumesnapshotsEnabled {
 		// just print out a warning directly, we don't want to return any errors since
 		// that would prevent the addon from being enabled (callbacks wouldn't be run)
@@ -94,12 +95,3 @@ func isAddonValid(name string) (*Addon, bool) {
 	}
 	return nil, false
 }
-
-func contains(slice []string, val string) bool {
-	for _, item := range slice {
-		if item == val {
-			return true
-		}
-	}
-	return false
-}

pkg/addons/validations_test.go

@@ -48,39 +48,6 @@ func TestIsAddonValid(t *testing.T) {
 	}
 }
 
-func TestContains(t *testing.T) {
-	tests := []struct {
-		slice    []string
-		str      string
-		expected bool
-	}{
-		{
-			slice:    []string{},
-			str:      "test",
-			expected: false,
-		},
-		{
-			slice:    []string{"test", "test1"},
-			str:      "test1",
-			expected: true,
-		},
-		{
-			slice:    []string{"test", "test1"},
-			str:      "test2",
-			expected: false,
-		},
-	}
-
-	for _, test := range tests {
-		t.Run(test.str, func(t *testing.T) {
-			actual := contains(test.slice, test.str)
-			if test.expected != actual {
-				t.Fatalf("slice: %v\nstr: %v\nexpected: %v\nactual:%v\n", test.slice, test.str, test.expected, actual)
-			}
-		})
-	}
-}
-
 func TestIsKVMDriverForNVIDIA(t *testing.T) {
 	tests := []struct {
 		cc        *config.ClusterConfig

pkg/minikube/bootstrapper/bsutil/extraconfig.go

@@ -19,6 +19,7 @@ package bsutil
 
 import (
 	"fmt"
+	"slices"
 	"sort"
 	"strings"
 
@@ -87,7 +88,7 @@ func CreateFlagsFromExtraArgs(extraOptions config.ExtraOptionSlice) string {
 	// kubeadm allows only a small set of parameters to be supplied from the command line when the --config param
 	// is specified, here we remove those that are not allowed
 	for opt := range kubeadmExtraOpts {
-		if !config.ContainsParam(KubeadmExtraArgsAllowed[KubeadmCmdParam], opt) {
+		if !slices.Contains(KubeadmExtraArgsAllowed[KubeadmCmdParam], opt) {
 			// kubeadmExtraOpts is a copy so safe to delete
 			delete(kubeadmExtraOpts, opt)
 		}

pkg/minikube/bootstrapper/bsutil/kubeadm.go

@@ -21,6 +21,7 @@ import (
 	"bytes"
 	"fmt"
 	"path"
+	"slices"
 
 	"github.com/blang/semver/v4"
 	"github.com/pkg/errors"
@@ -261,7 +262,7 @@ func kubeletConfigOpts(extraOpts config.ExtraOptionSlice) map[string]string {
 		if eo.Component != Kubelet {
 			continue
 		}
-		if config.ContainsParam(kubeletConfigParams, eo.Key) {
+		if slices.Contains(kubeletConfigParams, eo.Key) {
 			args[eo.Key] = eo.Value
 		}
 	}

pkg/minikube/cluster/pause.go

@@ -17,6 +17,7 @@ limitations under the License.
 package cluster
 
 import (
+	"slices"
 	"time"
 
 	"github.com/pkg/errors"
@@ -136,10 +137,5 @@ func doesNamespaceContainKubeSystem(namespaces []string) bool {
 	if namespaces == nil {
 		return true
 	}
-	for _, ns := range namespaces {
-		if ns == "kube-system" {
-			return true
-		}
-	}
-	return false
+	return slices.Contains(namespaces, "kube-system")
 }

pkg/minikube/config/extra_options.go

@@ -18,6 +18,7 @@ package config
 
 import (
 	"fmt"
+	"slices"
 	"strings"
 
 	"k8s.io/klog/v2"
@@ -109,7 +110,7 @@ func (es *ExtraOptionSlice) String() string {
 // component is not specified, all of the components are used.
 func (es *ExtraOptionSlice) Get(key string, component ...string) string {
 	for _, opt := range *es {
-		if component == nil || ContainsParam(component, opt.Component) {
+		if component == nil || slices.Contains(component, opt.Component) {
 			if opt.Key == key {
 				return opt.Value
 			}
@@ -141,17 +142,6 @@ func (cm ComponentExtraOptionMap) Get(component string) map[string]string {
 	return cm[component]
 }
 
-// ContainsParam checks if a given slice of strings contains the provided string.
-// If a modifier func is provided, it is called with the slice item before the comparison.
-func ContainsParam(slice []string, s string) bool {
-	for _, item := range slice {
-		if item == s {
-			return true
-		}
-	}
-	return false
-}
-
 // NewUnversionedOption returns a VersionedExtraOption that applies to all versions.
 func NewUnversionedOption(component, k, v string) VersionedExtraOption {
 	return VersionedExtraOption{

pkg/minikube/extract/extract.go

@@ -25,6 +25,7 @@ import (
 	"net/url"
 	"os"
 	"path/filepath"
+	"slices"
 	"strconv"
 	"strings"
 
@@ -349,10 +350,8 @@ func checkString(s string) string {
 	}
 
 	// Don't translate excluded strings
-	for _, e := range exclude {
-		if e == stringToTranslate {
-			return ""
-		}
+	if slices.Contains(exclude, stringToTranslate) {
+		return ""
 	}
 
 	// Remove unnecessary backslashes