mirrors/ceph-csi
1
0
Fork 0
mirror of https://github.com/ceph/ceph-csi.git synced 2024-09-16 13:39:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

util: use slices package for contains

Browse Source 
use slices package to check whether
the slice contains the element or not.

Signed-off-by: Madhu Rajanna <madhupr007@gmail.com>
This commit is contained in:
Madhu Rajanna 2024-04-02 10:11:04 +02:00 committed by mergify[bot]
parent 86b5db90bc
commit 1e0254daba
3 changed files with 6 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
actions/retest/main.go
View File

@ -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 {

14
e2e/deployment.go
View File

@ -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 {

13
internal/util/util.go
View File

@ -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().