add back check for seeds and host

aerospike · Jul 3, 2024 · ee7b061 · ee7b061
1 parent b58f6db
commit ee7b061
Show file tree

Hide file tree

Showing 11 changed files with 39 additions and 1 deletion.
diff --git a/cmd/indexCreate.go b/cmd/indexCreate.go
@@ -92,6 +92,9 @@ For example:
 asvec index create -i myindex -n test -s testset -d 256 -m COSINE --%s vector \
 	--%s test --%s false
 			`, HelpTxtSetupEnv, flags.VectorField, flags.StorageNamespace, flags.BatchEnabled),
+		PreRunE: func(_ *cobra.Command, _ []string) error {
+			return checkSeedsAndHost()
+		},
 		RunE: func(_ *cobra.Command, _ []string) error {
 			logger.Debug("parsed flags",
 				append(indexCreateFlags.clientFlags.NewSLogAttr(),

diff --git a/cmd/indexDrop.go b/cmd/indexDrop.go
@@ -51,6 +51,9 @@ For example:
 %s
 asvec index drop -i myindex -n test
 			`, HelpTxtSetupEnv),
+		PreRunE: func(_ *cobra.Command, _ []string) error {
+			return checkSeedsAndHost()
+		},
 		RunE: func(_ *cobra.Command, _ []string) error {
 			logger.Debug("parsed flags",
 				append(indexDropFlags.clientFlags.NewSLogAttr(),

diff --git a/cmd/indexList.go b/cmd/indexList.go
@@ -44,6 +44,9 @@ For example:
 %s
 asvec index ls
 		`, flags.Verbose, HelpTxtSetupEnv),
+		PreRunE: func(_ *cobra.Command, _ []string) error {
+			return checkSeedsAndHost()
+		},
 		RunE: func(_ *cobra.Command, _ []string) error {
 			logger.Debug("parsed flags",
 				append(indexListFlags.clientFlags.NewSLogAttr(),

diff --git a/cmd/rolesList.go b/cmd/rolesList.go
@@ -39,6 +39,9 @@ For example:
 %s
 asvec role ls
 		`, HelpTxtSetupEnv),
+		PreRunE: func(_ *cobra.Command, _ []string) error {
+			return checkSeedsAndHost()
+		},
 		RunE: func(_ *cobra.Command, _ []string) error {
 			logger.Debug("parsed flags",
 				rolesListFlags.clientFlags.NewSLogAttr()...,

diff --git a/cmd/userCreate.go b/cmd/userCreate.go
@@ -49,6 +49,9 @@ For example:
 %s
 asvec user create --%s foo --%s read-write
 			`, HelpTxtSetupEnv, flags.Name, flags.Roles),
+		PreRunE: func(_ *cobra.Command, _ []string) error {
+			return checkSeedsAndHost()
+		},
 		RunE: func(_ *cobra.Command, _ []string) error {
 			logger.Debug("parsed flags",
 				append(

diff --git a/cmd/userDrop.go b/cmd/userDrop.go
@@ -42,6 +42,9 @@ For example:
 %s
 asvec user drop --%s foo
 			`, HelpTxtSetupEnv, flags.Name),
+		PreRunE: func(_ *cobra.Command, _ []string) error {
+			return checkSeedsAndHost()
+		},
 		RunE: func(_ *cobra.Command, _ []string) error {
 			logger.Debug("parsed flags",
 				append(

diff --git a/cmd/userGrant.go b/cmd/userGrant.go
@@ -46,6 +46,9 @@ For example:
 %s
 asvec user grant --%s foo --%s admin
 			`, HelpTxtSetupEnv, flags.Name, flags.Roles),
+		PreRunE: func(_ *cobra.Command, _ []string) error {
+			return checkSeedsAndHost()
+		},
 		RunE: func(_ *cobra.Command, _ []string) error {
 			logger.Debug("parsed flags",
 				append(

diff --git a/cmd/userList.go b/cmd/userList.go
@@ -38,6 +38,9 @@ For example:
 %s
 asvec user ls
 		`, HelpTxtSetupEnv),
+		PreRunE: func(_ *cobra.Command, _ []string) error {
+			return checkSeedsAndHost()
+		},
 		RunE: func(_ *cobra.Command, _ []string) error {
 			logger.Debug("parsed flags",
 				userListFlags.clientFlags.NewSLogAttr()...,

diff --git a/cmd/userNewPassword.go b/cmd/userNewPassword.go
@@ -46,7 +46,9 @@ For example:
 %s
 asvec user new-password --%s foo
 			`, HelpTxtSetupEnv, flags.Name),
-
+		PreRunE: func(_ *cobra.Command, _ []string) error {
+			return checkSeedsAndHost()
+		},
 		RunE: func(_ *cobra.Command, _ []string) error {
 			logger.Debug("parsed flags",
 				append(

diff --git a/cmd/userRevoke.go b/cmd/userRevoke.go
@@ -46,6 +46,9 @@ For example:
 %s
 asvec user revoke --%s foo --%s admin
 			`, HelpTxtSetupEnv, flags.Name, flags.Roles),
+		PreRunE: func(_ *cobra.Command, _ []string) error {
+			return checkSeedsAndHost()
+		},
 		RunE: func(_ *cobra.Command, _ []string) error {
 			logger.Debug("parsed flags",
 				append(

diff --git a/cmd/utils.go b/cmd/utils.go
@@ -11,6 +11,7 @@ import (
 	"golang.org/x/term"
 
 	avs "github.com/aerospike/avs-client-go"
+	"github.com/spf13/viper"
 )
 
 func passwordPrompt(prompt string) (string, error) {
@@ -107,3 +108,11 @@ func confirm(prompt string) bool {
 
 	return strings.EqualFold(confirm, "y")
 }
+
+func checkSeedsAndHost() error {
+	if viper.IsSet(flags.Seeds) && viper.IsSet(flags.Host) {
+		return fmt.Errorf("only --%s or --%s allowed", flags.Seeds, flags.Host)
+	}
+
+	return nil
+}