From 23e53b730b572d200d5fc37eb47738c34502af10 Mon Sep 17 00:00:00 2001 From: bryanl Date: Wed, 23 Mar 2016 15:22:53 -0400 Subject: [PATCH] fix short flags by removing short flags --- commands/actions.go | 3 +-- commands/doit.go | 9 ++----- commands/droplet_actions.go | 48 +++++++++++++------------------------ commands/droplets.go | 27 ++++++++------------- commands/image_actions.go | 3 +-- 5 files changed, 30 insertions(+), 60 deletions(-) diff --git a/commands/actions.go b/commands/actions.go index 7edee95..8e6e5a7 100644 --- a/commands/actions.go +++ b/commands/actions.go @@ -36,8 +36,7 @@ func Actions() *Command { cmdActionWait := CmdBuilder(cmd, RunCmdActionWait, "wait ACTIONID", "wait for action to complete", Writer, aliasOpt("w"), displayerType(&action{}), docCategories("action")) - AddIntFlag(cmdActionWait, doit.ArgPollTime, 5, "Re-poll time in seconds", - shortFlag("p")) + AddIntFlag(cmdActionWait, doit.ArgPollTime, 5, "Re-poll time in seconds") return cmd } diff --git a/commands/doit.go b/commands/doit.go index 43a39a8..208010b 100644 --- a/commands/doit.go +++ b/commands/doit.go @@ -143,12 +143,6 @@ func requiredOpt() flagOpt { } } -func shortFlag(f string) flagOpt { - return func(c *Command, name, key string) { - c.Flag(name).Shorthand = f - } -} - func requiredKey(key string) string { return fmt.Sprintf("%s.required", key) } @@ -157,11 +151,12 @@ func requiredKey(key string) string { func AddStringFlag(cmd *Command, name, dflt, desc string, opts ...flagOpt) { fn := flagName(cmd, name) cmd.Flags().String(name, dflt, desc) - viper.BindPFlag(fn, cmd.Flags().Lookup(name)) for _, o := range opts { o(cmd, name, fn) } + + viper.BindPFlag(fn, cmd.Flags().Lookup(name)) } // AddIntFlag adds an integr flag to a command. diff --git a/commands/droplet_actions.go b/commands/droplet_actions.go index 2a91199..9211e06 100644 --- a/commands/droplet_actions.go +++ b/commands/droplet_actions.go @@ -53,105 +53,89 @@ func DropletAction() *Command { cmdDropletActionDisableBackups := CmdBuilder(cmd, RunDropletActionDisableBackups, "disable-backups ", "disable backups", Writer, displayerType(&action{}), docCategories("droplet")) - AddBoolFlag(cmdDropletActionDisableBackups, doit.ArgCommandWait, false, "Wait for action to complete", - shortFlag("w")) + AddBoolFlag(cmdDropletActionDisableBackups, doit.ArgCommandWait, false, "Wait for action to complete") cmdDropletActionReboot := CmdBuilder(cmd, RunDropletActionReboot, "reboot ", "reboot droplet", Writer, displayerType(&action{}), docCategories("droplet")) - AddBoolFlag(cmdDropletActionReboot, doit.ArgCommandWait, false, "Wait for action to complete", - shortFlag("w")) + AddBoolFlag(cmdDropletActionReboot, doit.ArgCommandWait, false, "Wait for action to complete") cmdDropletActionPowerCycle := CmdBuilder(cmd, RunDropletActionPowerCycle, "power-cycle ", "power cycle droplet", Writer, displayerType(&action{}), docCategories("droplet")) - AddBoolFlag(cmdDropletActionPowerCycle, doit.ArgCommandWait, false, "Wait for action to complete", - shortFlag("w")) + AddBoolFlag(cmdDropletActionPowerCycle, doit.ArgCommandWait, false, "Wait for action to complete") cmdDropletActionShutdown := CmdBuilder(cmd, RunDropletActionShutdown, "shutdown ", "shutdown droplet", Writer, displayerType(&action{}), docCategories("droplet")) - AddBoolFlag(cmdDropletActionShutdown, doit.ArgCommandWait, false, "Wait for action to complete", - shortFlag("w")) + AddBoolFlag(cmdDropletActionShutdown, doit.ArgCommandWait, false, "Wait for action to complete") cmdDropletActionPowerOff := CmdBuilder(cmd, RunDropletActionPowerOff, "power-off ", "power off droplet", Writer, displayerType(&action{}), docCategories("droplet")) - AddBoolFlag(cmdDropletActionPowerOff, doit.ArgCommandWait, false, "Wait for action to complete", - shortFlag("w")) + AddBoolFlag(cmdDropletActionPowerOff, doit.ArgCommandWait, false, "Wait for action to complete") cmdDropletActionPowerOn := CmdBuilder(cmd, RunDropletActionPowerOn, "power-on ", "power on droplet", Writer, displayerType(&action{}), docCategories("droplet")) - AddBoolFlag(cmdDropletActionPowerOn, doit.ArgCommandWait, false, "Wait for action to complete", - shortFlag("w")) + AddBoolFlag(cmdDropletActionPowerOn, doit.ArgCommandWait, false, "Wait for action to complete") cmdDropletActionPasswordReset := CmdBuilder(cmd, RunDropletActionPasswordReset, "power-reset ", "power reset droplet", Writer, displayerType(&action{}), docCategories("droplet")) - AddBoolFlag(cmdDropletActionPasswordReset, doit.ArgCommandWait, false, "Wait for action to complete", - shortFlag("w")) + AddBoolFlag(cmdDropletActionPasswordReset, doit.ArgCommandWait, false, "Wait for action to complete") cmdDropletActionEnableIPv6 := CmdBuilder(cmd, RunDropletActionEnableIPv6, "enable-ipv6 ", "enable ipv6", Writer, displayerType(&action{}), docCategories("droplet")) - AddBoolFlag(cmdDropletActionEnableIPv6, doit.ArgCommandWait, false, "Wait for action to complete", - shortFlag("w")) + AddBoolFlag(cmdDropletActionEnableIPv6, doit.ArgCommandWait, false, "Wait for action to complete") cmdDropletActionEnablePrivateNetworking := CmdBuilder(cmd, RunDropletActionEnablePrivateNetworking, "enable-private-networking ", "enable private networking", Writer, displayerType(&action{}), docCategories("droplet")) - AddBoolFlag(cmdDropletActionEnablePrivateNetworking, doit.ArgCommandWait, false, "Wait for action to complete", - shortFlag("w")) + AddBoolFlag(cmdDropletActionEnablePrivateNetworking, doit.ArgCommandWait, false, "Wait for action to complete") cmdDropletActionUpgrade := CmdBuilder(cmd, RunDropletActionUpgrade, "upgrade ", "upgrade droplet", Writer, displayerType(&action{}), docCategories("droplet")) - AddBoolFlag(cmdDropletActionUpgrade, doit.ArgCommandWait, false, "Wait for action to complete", - shortFlag("w")) + AddBoolFlag(cmdDropletActionUpgrade, doit.ArgCommandWait, false, "Wait for action to complete") cmdDropletActionRestore := CmdBuilder(cmd, RunDropletActionRestore, "restore ", "restore backup", Writer, displayerType(&action{}), docCategories("droplet")) AddIntFlag(cmdDropletActionRestore, doit.ArgImageID, 0, "Image ID", requiredOpt()) - AddBoolFlag(cmdDropletActionRestore, doit.ArgCommandWait, false, "Wait for action to complete", - shortFlag("w")) + AddBoolFlag(cmdDropletActionRestore, doit.ArgCommandWait, false, "Wait for action to complete") cmdDropletActionResize := CmdBuilder(cmd, RunDropletActionResize, "resize ", "resize droplet", Writer, displayerType(&action{}), docCategories("droplet")) AddBoolFlag(cmdDropletActionResize, doit.ArgResizeDisk, false, "Resize disk") AddStringFlag(cmdDropletActionResize, doit.ArgSizeSlug, "", "New size") - AddBoolFlag(cmdDropletActionResize, doit.ArgCommandWait, false, "Wait for action to complete", - shortFlag("w")) + AddBoolFlag(cmdDropletActionResize, doit.ArgCommandWait, false, "Wait for action to complete") cmdDropletActionRebuild := CmdBuilder(cmd, RunDropletActionRebuild, "rebuild ", "rebuild droplet", Writer, displayerType(&action{}), docCategories("droplet")) AddIntFlag(cmdDropletActionRebuild, doit.ArgImageID, 0, "Image ID", requiredOpt()) - AddBoolFlag(cmdDropletActionRebuild, doit.ArgCommandWait, false, "Wait for action to complete", - shortFlag("w")) + AddBoolFlag(cmdDropletActionRebuild, doit.ArgCommandWait, false, "Wait for action to complete") cmdDropletActionRename := CmdBuilder(cmd, RunDropletActionRename, "rename ", "rename droplet", Writer, displayerType(&action{}), docCategories("droplet")) AddStringFlag(cmdDropletActionRename, doit.ArgDropletName, "", "Droplet name", requiredOpt()) - AddBoolFlag(cmdDropletActionRename, doit.ArgCommandWait, false, "Wait for action to complete", - shortFlag("w")) + AddBoolFlag(cmdDropletActionRename, doit.ArgCommandWait, false, "Wait for action to complete") cmdDropletActionChangeKernel := CmdBuilder(cmd, RunDropletActionChangeKernel, "change-kernel ", "change kernel", Writer, docCategories("droplet")) AddIntFlag(cmdDropletActionChangeKernel, doit.ArgKernelID, 0, "Kernel ID", requiredOpt()) - AddBoolFlag(cmdDropletActionChangeKernel, doit.ArgCommandWait, false, "Wait for action to complete", - shortFlag("w")) + AddBoolFlag(cmdDropletActionChangeKernel, doit.ArgCommandWait, false, "Wait for action to complete") cmdDropletActionSnapshot := CmdBuilder(cmd, RunDropletActionSnapshot, "snapshot ", "snapshot droplet", Writer, displayerType(&action{}), docCategories("droplet")) AddStringFlag(cmdDropletActionSnapshot, doit.ArgSnapshotName, "", "Snapshot name", requiredOpt()) - AddBoolFlag(cmdDropletActionSnapshot, doit.ArgCommandWait, false, "Wait for action to complete", - shortFlag("w")) + AddBoolFlag(cmdDropletActionSnapshot, doit.ArgCommandWait, false, "Wait for action to complete") return cmd } diff --git a/commands/droplets.go b/commands/droplets.go index 3b02ad8..2390d9d 100644 --- a/commands/droplets.go +++ b/commands/droplets.go @@ -36,26 +36,19 @@ func Droplet() *Command { cmdDropletCreate := CmdBuilder(cmd, RunDropletCreate, "create NAME [NAME ...]", "create droplet", Writer, aliasOpt("c"), displayerType(&droplet{}), docCategories("droplet")) - AddStringSliceFlag(cmdDropletCreate, doit.ArgSSHKeys, []string{}, "SSH Keys or fingerprints", - shortFlag("k")) - AddStringFlag(cmdDropletCreate, doit.ArgUserData, "", "User data", - shortFlag("u")) - AddStringFlag(cmdDropletCreate, doit.ArgUserDataFile, "", "User data file", - shortFlag("f")) - AddBoolFlag(cmdDropletCreate, doit.ArgCommandWait, false, "Wait for droplet to be created", - shortFlag("w")) + AddStringSliceFlag(cmdDropletCreate, doit.ArgSSHKeys, []string{}, "SSH Keys or fingerprints") + AddStringFlag(cmdDropletCreate, doit.ArgUserData, "", "User data") + AddStringFlag(cmdDropletCreate, doit.ArgUserDataFile, "", "User data file") + AddBoolFlag(cmdDropletCreate, doit.ArgCommandWait, false, "Wait for droplet to be created") AddStringFlag(cmdDropletCreate, doit.ArgRegionSlug, "", "Droplet region", - requiredOpt(), shortFlag("r")) + requiredOpt()) AddStringFlag(cmdDropletCreate, doit.ArgSizeSlug, "", "Droplet size", - requiredOpt(), shortFlag("s")) - AddBoolFlag(cmdDropletCreate, doit.ArgBackups, false, "Backup droplet", - shortFlag("b")) - AddBoolFlag(cmdDropletCreate, doit.ArgIPv6, false, "IPv6 support", - shortFlag("6")) - AddBoolFlag(cmdDropletCreate, doit.ArgPrivateNetworking, false, "Private networking", - shortFlag("p")) + requiredOpt()) + AddBoolFlag(cmdDropletCreate, doit.ArgBackups, false, "Backup droplet") + AddBoolFlag(cmdDropletCreate, doit.ArgIPv6, false, "IPv6 support") + AddBoolFlag(cmdDropletCreate, doit.ArgPrivateNetworking, false, "Private networking") AddStringFlag(cmdDropletCreate, doit.ArgImage, "", "Droplet image", - requiredOpt(), shortFlag("i")) + requiredOpt()) CmdBuilder(cmd, RunDropletDelete, "delete ID [ID|Name ...]", "Delete droplet by id or name", Writer, aliasOpt("d", "del", "rm"), docCategories("droplet")) diff --git a/commands/image_actions.go b/commands/image_actions.go index bc554ea..fb927cd 100644 --- a/commands/image_actions.go +++ b/commands/image_actions.go @@ -29,8 +29,7 @@ func ImageAction() *Command { "transfer ", "transfer image", Writer, displayerType(&action{}), docCategories("image")) AddStringFlag(cmdImageActionsTransfer, doit.ArgRegionSlug, "", "region", requiredOpt()) - AddBoolFlag(cmdImageActionsTransfer, doit.ArgCommandWait, false, "Wait for action to complete", - shortFlag("w")) + AddBoolFlag(cmdImageActionsTransfer, doit.ArgCommandWait, false, "Wait for action to complete") return cmd }