From c1467242c6a0787ae12cdb9b520981cc9adc1154 Mon Sep 17 00:00:00 2001 From: Praveen M Date: Mon, 1 Apr 2024 09:02:41 +0530 Subject: [PATCH] cleanup: use slices package This commit replaces the user implemented function `CheckSliceContains()` with `slices.Contains()` function introduced in Go 1.21. Signed-off-by: Praveen M --- internal/rbd/rbd_attach.go | 3 ++- internal/util/util.go | 13 +------------ 2 files changed, 3 insertions(+), 13 deletions(-) diff --git a/internal/rbd/rbd_attach.go b/internal/rbd/rbd_attach.go index ee17a7c7e..fbac9a3f7 100644 --- a/internal/rbd/rbd_attach.go +++ b/internal/rbd/rbd_attach.go @@ -21,6 +21,7 @@ import ( "encoding/json" "fmt" "os" + "slices" "strings" "time" @@ -363,7 +364,7 @@ func attachRBDImage(ctx context.Context, volOptions *rbdVolume, device string, c } func appendNbdDeviceTypeAndOptions(cmdArgs []string, userOptions, cookie string) []string { - isUnmap := util.CheckSliceContains(cmdArgs, "unmap") + isUnmap := slices.Contains(cmdArgs, "unmap") if !isUnmap { if !strings.Contains(userOptions, useNbdNetlink) { cmdArgs = append(cmdArgs, "--"+useNbdNetlink) diff --git a/internal/util/util.go b/internal/util/util.go index 83a470e25..65909a2c1 100644 --- a/internal/util/util.go +++ b/internal/util/util.go @@ -383,17 +383,6 @@ func CallStack() string { return string(stack) } -// CheckSliceContains checks the slice for string. -func CheckSliceContains(options []string, opt string) bool { - for _, o := range options { - if o == opt { - return true - } - } - - return false -} - // GetVolumeContext filters out parameters that are not required in volume context. func GetVolumeContext(parameters map[string]string) map[string]string { volumeContext := map[string]string{} @@ -403,7 +392,7 @@ func GetVolumeContext(parameters map[string]string) map[string]string { topologyPoolsParam, } for k, v := range parameters { - if !CheckSliceContains(notRequiredParams, k) { + if !slices.Contains(notRequiredParams, k) { volumeContext[k] = v } }