diff --git a/actions/retest/main.go b/actions/retest/main.go index 26ef0b610d8..b9889536b54 100644 --- a/actions/retest/main.go +++ b/actions/retest/main.go @@ -22,6 +22,7 @@ import ( "fmt" "log" "os" + "slices" "strconv" "strings" @@ -145,7 +146,7 @@ func main() { failedTestFound := false for _, r := range statusList { log.Printf("found context %s with status %s\n", r.GetContext(), r.GetState()) - if contains([]string{"failed", "failure"}, r.GetState()) { + if slices.Contains([]string{"failed", "failure"}, r.GetState()) { log.Printf("found failed test %s\n", r.GetContext()) failedTestFound = true // rebase the pr if it is behind the devel branch. @@ -253,17 +254,6 @@ func (c *retestConfig) checkRetestLimitReached(prNumber int, msg string) (bool, return false, nil } -// containers check if slice contains string. -func contains(s []string, e string) bool { - for _, a := range s { - if a == e { - return true - } - } - - return false -} - // filterStatusesList returns list of unique and recently updated github RepoStatuses. // Raw github RepoStatus list may contain duplicate and older statuses. func filterStatusList(rawStatusList []*github.RepoStatus) []*github.RepoStatus { diff --git a/e2e/deployment.go b/e2e/deployment.go index 27a831791e9..1e7de8f7be8 100644 --- a/e2e/deployment.go +++ b/e2e/deployment.go @@ -20,6 +20,7 @@ import ( "context" "fmt" "os" + "slices" "time" appsv1 "k8s.io/api/apps/v1" @@ -349,17 +350,6 @@ func waitForDeploymentUpdate( return nil } -// contains check if slice contains string. -func contains(s []string, e string) bool { - for _, a := range s { - if a == e { - return true - } - } - - return false -} - func waitForContainersArgsUpdate( c kubernetes.Interface, ns, @@ -398,7 +388,7 @@ func waitForContainersArgsUpdate( } cid := deployment.Spec.Template.Spec.Containers // cid: read as containers in deployment for i := range cid { - if contains(containers, cid[i].Name) { + if slices.Contains(containers, cid[i].Name) { match := false for j, ak := range cid[i].Args { if ak == key { diff --git a/internal/util/util.go b/internal/util/util.go index 1dbaf54eaec..76607f9db49 100644 --- a/internal/util/util.go +++ b/internal/util/util.go @@ -23,6 +23,7 @@ import ( "math" "os" "runtime" + "slices" "strings" "time" @@ -363,7 +364,7 @@ func MountOptionsAdd(options string, add ...string) string { } for _, opt := range add { - if opt != "" && !contains(newOpts, opt) { + if opt != "" && !slices.Contains(newOpts, opt) { newOpts = append(newOpts, opt) } } @@ -371,16 +372,6 @@ func MountOptionsAdd(options string, add ...string) string { return strings.Join(newOpts, ",") } -func contains(s []string, key string) bool { - for _, v := range s { - if v == key { - return true - } - } - - return false -} - // CallStack returns the stack of the calls in the current goroutine. Useful // for debugging or reporting errors. This is a friendly alternative to // assert() or panic().