allow for optional custom zero values for defaultFlags and add config-id

Author: sgsullivan

cmd/cloudNetworkVipCreate.go

@@ -94,6 +94,6 @@ func init() {
 	cloudNetworkVipCmd.AddCommand(cloudNetworkVipCreateCmd)
 	cloudNetworkVipCreateCmd.Flags().String("name", fmt.Sprintf("vip-%s", utils.RandomString(8)),
 		"name for the new VIP")
-	cloudNetworkVipCreateCmd.Flags().Int64("zone", cast.ToInt64(defaultFlag("zone")),
+	cloudNetworkVipCreateCmd.Flags().Int64("zone", cast.ToInt64(defaultFlag("zone", -1)),
 		"zone id to create VIP in (see: 'cloud server options --zones')")
 }

cmd/cloudPrivateParentCreate.go

@@ -72,7 +72,7 @@ func init() {
 
 	cloudPrivateParentCreateCmd.Flags().Int64("config-id", -1, "config-id (category must be bare-metal or bare-metal-r)")
 	cloudPrivateParentCreateCmd.Flags().String("name", "", "name for your Private Parent")
-	cloudPrivateParentCreateCmd.Flags().Int64("zone", cast.ToInt64(defaultFlag("zone")),
+	cloudPrivateParentCreateCmd.Flags().Int64("zone", cast.ToInt64(defaultFlag("zone", -1)),
 		"id number of the zone to provision the Private Parent in ('cloud server options --zones')")
 
 	reqs := []string{"config-id", "name"}

cmd/cloudServerClone.go

@@ -18,6 +18,7 @@ package cmd
 import (
 	"fmt"
 
+	"github.com/spf13/cast"
 	"github.com/spf13/cobra"
 
 	"github.com/liquidweb/liquidweb-cli/types/api"
@@ -162,7 +163,7 @@ func init() {
 	cloudServerCloneCmd.Flags().Int64("vcpu", -1, "amount of vcpus for new Cloud Server (when private-parent)")
 
 	// Non Private Parent
-	cloudServerCloneCmd.Flags().Int64("config-id", -1,
+	cloudServerCloneCmd.Flags().Int64("config-id", cast.ToInt64(defaultFlag("config-id", -1)),
 		"config-id for new Cloud Server (when !private-parent) (see: 'cloud server options --configs')")
 
 	if err := cloudServerCloneCmd.MarkFlagRequired("uniq-id"); err != nil {

cmd/cloudServerCreate.go

@@ -140,11 +140,11 @@ func init() {
 	cloudServerCreateCmd.Flags().Int("ips", 1, "amount of IP addresses")
 	cloudServerCreateCmd.Flags().String("public-ssh-key", sshPubKeyFile,
 		"path to file containing the public ssh key you wish to be on the new Cloud Server")
-	cloudServerCreateCmd.Flags().Int("config-id", 0, "config-id to use")
+	cloudServerCreateCmd.Flags().Int("config-id", cast.ToInt(defaultFlag("config-id", -1)), "config-id to use")
 	cloudServerCreateCmd.Flags().Int("backup-days", -1, "Enable daily backup plan. This is the amount of days to keep a backup")
 	cloudServerCreateCmd.Flags().Int("backup-quota", -1, "Enable quota backup plan. This is the total amount of GB to keep.")
 	cloudServerCreateCmd.Flags().String("bandwidth", "SS.10000", "bandwidth package to use")
-	cloudServerCreateCmd.Flags().Int64("zone", cast.ToInt64(defaultFlag("zone")), "zone (id) to create new Cloud Server in (see 'cloud server options --zones')")
+	cloudServerCreateCmd.Flags().Int64("zone", cast.ToInt64(defaultFlag("zone", -1)), "zone (id) to create new Cloud Server in (see 'cloud server options --zones')")
 	cloudServerCreateCmd.Flags().String("password", "", "root or administrator password to set")
 
 	cloudServerCreateCmd.Flags().Int("backup-id", -1, "id of cloud backup to create from (see 'cloud backup list')")

cmd/networkIpPoolCreate.go

@@ -37,7 +37,7 @@ your account.`,
 		zoneFlag, _ := cmd.Flags().GetInt64("zone")
 		newIpsFlag, _ := cmd.Flags().GetInt64("new-ips")
 
-		if len(networkIpPoolCreateCmdAddIpsFlag) == 0 && newIpsFlag == -1 || zoneFlag == 0 {
+		if len(networkIpPoolCreateCmdAddIpsFlag) == 0 && newIpsFlag == -1 || zoneFlag == -1 {
 			lwCliInst.Die(fmt.Errorf("flags --new-ips --add-ips cannot both be empty. --zone cannot be empty"))
 		}
 
@@ -66,6 +66,6 @@ func init() {
 	networkIpPoolCreateCmd.Flags().StringSliceVar(&networkIpPoolCreateCmdAddIpsFlag, "add-ips", []string{},
 		"ips separated by ',' to add to created IP Pool")
 	networkIpPoolCreateCmd.Flags().Int64("new-ips", -1, "amount of IPs to assign to the created IP Pool")
-	networkIpPoolCreateCmd.Flags().Int64("zone", cast.ToInt64(defaultFlag("zone")),
+	networkIpPoolCreateCmd.Flags().Int64("zone", cast.ToInt64(defaultFlag("zone", -1)),
 		"zone id to create the IP Pool in")
 }

cmd/root.go

@@ -101,11 +101,14 @@ func osArgsForContext(re *regexp.Regexp) {
 	}
 }
 
-func defaultFlag(flag string) (value interface{}) {
+func defaultFlag(flag string, defaultValueList ...interface{}) (value interface{}) {
 	// calling config.InitConfig() here so default context gets set
 	_, _ = config.InitConfig()
 	setConfigArgs()
 	value = defaults.GetOrNag(flag)
+	if len(defaultValueList) > 0 && value == nil {
+		value = defaultValueList[0]
+	}
 	return
 }
 

flags/defaults/types.go

@@ -25,6 +25,7 @@ func (self AllFlags) String() string {
 }
 
 var permittedFlags = map[string]bool{
-	"zone":     true,
-	"template": true,
+	"zone":      true,
+	"template":  true,
+	"config-id": true,
 }