update required flags list

Author: Eslam-Nawara

registrar-cli/cmd/account_create.go

@@ -47,9 +47,6 @@ var accountCreateCmd = &cobra.Command{
 func init() {
 	accountCmd.AddCommand(accountCreateCmd)
 	accountCreateCmd.Flags().StringP("mnemonic", "m", "", "account mnemonic")
-	if err := accountCreateCmd.MarkFlagRequired("mnemonic"); err != nil {
-		log.Fatal().Err(err).Send()
-	}
 	accountCreateCmd.Flags().StringArrayP("relays", "r", nil, "relays urls")
 	accountCreateCmd.Flags().StringP("rmb-enc-key", "k", "", "rmb encryption key")
 }

registrar-cli/cmd/account_get.go

@@ -42,4 +42,5 @@ func init() {
 	accountCmd.AddCommand(accountGetCmd)
 	accountGetCmd.Flags().Uint64P("twin-id", "i", 0, "twin id")
 	accountGetCmd.Flags().StringP("public-key", "k", "", "account public key")
+	accountGetCmd.MarkFlagsOneRequired("twin-id", "public-key")
 }

registrar-cli/cmd/account_update.go

@@ -51,4 +51,5 @@ func init() {
 	}
 	accountUpdateCmd.Flags().StringArrayP("relays", "r", nil, "relays urls")
 	accountUpdateCmd.Flags().StringP("rmb-enc-key", "k", "", "rmb encryption key")
+	accountUpdateCmd.MarkFlagsOneRequired("relays", "rmb-enc-key")
 }

registrar-cli/cmd/farm_create.go

@@ -51,10 +51,9 @@ var farmCreateCmd = &cobra.Command{
 func init() {
 	farmCmd.AddCommand(farmCreateCmd)
 	farmCreateCmd.Flags().StringP("mnemonic", "m", "", "account mnemonic")
-	if err := farmCreateCmd.MarkFlagRequired("mnemonic"); err != nil {
-		log.Fatal().Err(err).Send()
-	}
 	farmCreateCmd.Flags().StringP("farm-name", "f", "", "farm name")
 	farmCreateCmd.Flags().StringP("stellar-address", "s", "", "stellar address")
+	farmCreateCmd.MarkFlagsRequiredTogether("mnemonic", "farm-name", "stellar-address")
+
 	farmCreateCmd.Flags().BoolP("dedicated", "d", false, "is farm dedicated")
 }

registrar-cli/cmd/farm_get.go

@@ -41,4 +41,7 @@ var farmGetCmd = &cobra.Command{
 func init() {
 	farmCmd.AddCommand(farmGetCmd)
 	farmGetCmd.Flags().Uint64P("farm-id", "i", 0, "farm id")
+	if err := farmGetCmd.MarkFlagRequired("farm-id"); err != nil {
+		log.Fatal().Err(err).Send()
+	}
 }

registrar-cli/cmd/farm_update.go

@@ -56,11 +56,11 @@ var farmUpdateCmd = &cobra.Command{
 func init() {
 	farmCmd.AddCommand(farmUpdateCmd)
 	farmUpdateCmd.Flags().StringP("mnemonic", "m", "", "account mnemonic")
-	if err := farmUpdateCmd.MarkFlagRequired("mnemonic"); err != nil {
-		log.Fatal().Err(err).Send()
-	}
 	farmUpdateCmd.Flags().Uint64P("farm-id", "i", 0, "farm id")
 	farmUpdateCmd.Flags().String("farm-name", "", "new farm name")
+	farmUpdateCmd.MarkFlagsRequiredTogether("mnemonic", "farm-id", "farm-name")
+
 	farmUpdateCmd.Flags().StringP("stellar-address", "s", "", "stellar address")
 	farmUpdateCmd.Flags().BoolP("dedicated", "d", false, "farm is dedicated")
+	farmUpdateCmd.MarkFlagsOneRequired("stellar-address", "dedicated")
 }

registrar-cli/cmd/node_get.go

@@ -42,4 +42,5 @@ func init() {
 	nodeCmd.AddCommand(nodeGetCmd)
 	nodeGetCmd.Flags().Uint64("node-id", 0, "node id")
 	nodeGetCmd.Flags().Uint64("twin-id", 0, "twin id")
+	nodeGetCmd.MarkFlagsOneRequired("node-id", "twin-id")
 }

registrar-cli/cmd/root.go

@@ -30,7 +30,4 @@ func init() {
 	zerolog.SetGlobalLevel(zerolog.InfoLevel)
 	log.Logger = log.Output(zerolog.ConsoleWriter{Out: os.Stderr})
 	rootCmd.PersistentFlags().StringP("network", "n", "", "network (dev, qa, test, main)")
-	if err := rootCmd.MarkFlagRequired("network"); err != nil {
-		log.Fatal().Err(err).Send()
-	}
 }

registrar-cli/cmd/zos_version_update.go

@@ -46,9 +46,7 @@ var zosVersionUpdateCmd = &cobra.Command{
 func init() {
 	zosVersionCmd.AddCommand(zosVersionUpdateCmd)
 	zosVersionUpdateCmd.Flags().StringP("mnemonic", "m", "", "account mnemonic")
-	if err := zosVersionUpdateCmd.MarkFlagRequired("mnemonic"); err != nil {
-		log.Fatal().Err(err).Send()
-	}
 	zosVersionUpdateCmd.Flags().StringP("version", "v", "v0.0.0", "new zos version")
 	zosVersionUpdateCmd.Flags().BoolP("safe-to-upgrade", "u", false, "safe to upgrade")
+	zosVersionUpdateCmd.MarkFlagsRequiredTogether("mnemonic", "version", "safe-to-upgrade")
 }

registrar-cli/internal/cmd/account.go

@@ -35,19 +35,20 @@ func GetAccount(network string, twinID uint64, pk string) (account client.Accoun
 		return account, fmt.Errorf("invalid network %s", network)
 	}
 
-	publicKey, err := hex.DecodeString(pk)
-	if err != nil {
-		return
-	}
-
 	cli, err := client.NewRegistrarClient(u)
 	if err != nil {
 		return
 	}
 
 	if twinID != 0 {
 		return cli.GetAccount(twinID)
-	} else if len(publicKey) != 0 {
+	} else if len(pk) != 0 {
+
+		publicKey, err := hex.DecodeString(pk)
+		if err != nil {
+			return account, err
+		}
+
 		return cli.GetAccountByPK(publicKey)
 	}