diff --git a/public/tools/multicluster/cmd/recover.go b/public/tools/multicluster/cmd/recover.go index cd5c24b77..322aa413b 100644 --- a/public/tools/multicluster/cmd/recover.go +++ b/public/tools/multicluster/cmd/recover.go @@ -3,6 +3,7 @@ package cmd import ( "fmt" "os" + "slices" "strings" "github.com/mongodb/mongodb-kubernetes/multi/pkg/common" @@ -68,12 +69,12 @@ kubectl-mongodb multicluster recover --central-cluster="operator-cluster" --memb var RecoverFlags = common.Flags{} func parseRecoverFlags(args []string) error { - if common.AnyAreEmpty(common.MemberClusters, RecoverFlags.ServiceAccount, RecoverFlags.CentralCluster, RecoverFlags.MemberClusterNamespace, RecoverFlags.CentralClusterNamespace, RecoverFlags.SourceCluster) { + if slices.Contains([]string{common.MemberClusters, RecoverFlags.ServiceAccount, RecoverFlags.CentralCluster, RecoverFlags.MemberClusterNamespace, RecoverFlags.CentralClusterNamespace, RecoverFlags.SourceCluster}, "") { return xerrors.Errorf("non empty values are required for [service-account, member-clusters, central-cluster, member-cluster-namespace, central-cluster-namespace, source-cluster]") } RecoverFlags.MemberClusters = strings.Split(common.MemberClusters, ",") - if !common.Contains(RecoverFlags.MemberClusters, RecoverFlags.SourceCluster) { + if !slices.Contains(RecoverFlags.MemberClusters, RecoverFlags.SourceCluster) { return xerrors.Errorf("source-cluster has to be one of the healthy member clusters: %s", common.MemberClusters) } diff --git a/public/tools/multicluster/cmd/setup.go b/public/tools/multicluster/cmd/setup.go index 881b2f5c8..89a24197f 100644 --- a/public/tools/multicluster/cmd/setup.go +++ b/public/tools/multicluster/cmd/setup.go @@ -4,6 +4,7 @@ import ( "fmt" "os" "runtime/debug" + "slices" "strings" "github.com/mongodb/mongodb-kubernetes/multi/pkg/common" @@ -75,7 +76,7 @@ kubectl-mongodb multicluster setup --central-cluster="operator-cluster" --member var setupFlags = common.Flags{} func parseSetupFlags() error { - if common.AnyAreEmpty(common.MemberClusters, setupFlags.ServiceAccount, setupFlags.CentralCluster, setupFlags.MemberClusterNamespace, setupFlags.CentralClusterNamespace) { + if slices.Contains([]string{common.MemberClusters, setupFlags.ServiceAccount, setupFlags.CentralCluster, setupFlags.MemberClusterNamespace, setupFlags.CentralClusterNamespace}, "") { return xerrors.Errorf("non empty values are required for [service-account, member-clusters, central-cluster, member-cluster-namespace, central-cluster-namespace]") } diff --git a/public/tools/multicluster/pkg/common/utils.go b/public/tools/multicluster/pkg/common/utils.go deleted file mode 100644 index 77980e187..000000000 --- a/public/tools/multicluster/pkg/common/utils.go +++ /dev/null @@ -1,21 +0,0 @@ -package common - -// Contains checks if a string is present in the provided slice. -func Contains(s []string, str string) bool { - for _, v := range s { - if v == str { - return true - } - } - return false -} - -// AnyAreEmpty returns true if any of the given strings have the zero value. -func AnyAreEmpty(values ...string) bool { - for _, v := range values { - if v == "" { - return true - } - } - return false -}