Skip to content

Commit a9fce45

Browse files
committed
Use standard slices package instead of custom code
1 parent 019bf0c commit a9fce45

File tree

3 files changed

+5
-24
lines changed

3 files changed

+5
-24
lines changed

public/tools/multicluster/cmd/recover.go

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ package cmd
33
import (
44
"fmt"
55
"os"
6+
"slices"
67
"strings"
78

89
"github.com/mongodb/mongodb-kubernetes/multi/pkg/common"
@@ -68,12 +69,12 @@ kubectl-mongodb multicluster recover --central-cluster="operator-cluster" --memb
6869
var RecoverFlags = common.Flags{}
6970

7071
func parseRecoverFlags(args []string) error {
71-
if common.AnyAreEmpty(common.MemberClusters, RecoverFlags.ServiceAccount, RecoverFlags.CentralCluster, RecoverFlags.MemberClusterNamespace, RecoverFlags.CentralClusterNamespace, RecoverFlags.SourceCluster) {
72+
if slices.Contains([]string{common.MemberClusters, RecoverFlags.ServiceAccount, RecoverFlags.CentralCluster, RecoverFlags.MemberClusterNamespace, RecoverFlags.CentralClusterNamespace, RecoverFlags.SourceCluster}, "") {
7273
return xerrors.Errorf("non empty values are required for [service-account, member-clusters, central-cluster, member-cluster-namespace, central-cluster-namespace, source-cluster]")
7374
}
7475

7576
RecoverFlags.MemberClusters = strings.Split(common.MemberClusters, ",")
76-
if !common.Contains(RecoverFlags.MemberClusters, RecoverFlags.SourceCluster) {
77+
if !slices.Contains(RecoverFlags.MemberClusters, RecoverFlags.SourceCluster) {
7778
return xerrors.Errorf("source-cluster has to be one of the healthy member clusters: %s", common.MemberClusters)
7879
}
7980

public/tools/multicluster/cmd/setup.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ import (
44
"fmt"
55
"os"
66
"runtime/debug"
7+
"slices"
78
"strings"
89

910
"github.com/mongodb/mongodb-kubernetes/multi/pkg/common"
@@ -75,7 +76,7 @@ kubectl-mongodb multicluster setup --central-cluster="operator-cluster" --member
7576
var setupFlags = common.Flags{}
7677

7778
func parseSetupFlags() error {
78-
if common.AnyAreEmpty(common.MemberClusters, setupFlags.ServiceAccount, setupFlags.CentralCluster, setupFlags.MemberClusterNamespace, setupFlags.CentralClusterNamespace) {
79+
if slices.Contains([]string{common.MemberClusters, setupFlags.ServiceAccount, setupFlags.CentralCluster, setupFlags.MemberClusterNamespace, setupFlags.CentralClusterNamespace}, "") {
7980
return xerrors.Errorf("non empty values are required for [service-account, member-clusters, central-cluster, member-cluster-namespace, central-cluster-namespace]")
8081
}
8182

public/tools/multicluster/pkg/common/utils.go

Lines changed: 0 additions & 21 deletions
This file was deleted.

0 commit comments

Comments
 (0)