Update audit-disable command

command/audit_disable.go

@@ -4,68 +4,87 @@ import (
 	"fmt"
 	"strings"
 
-	"github.com/hashicorp/vault/meta"
+	"github.com/mitchellh/cli"
+	"github.com/posener/complete"
 )
 
+// Ensure we are implementing the right interfaces.
+var _ cli.Command = (*AuditDisableCommand)(nil)
+var _ cli.CommandAutocomplete = (*AuditDisableCommand)(nil)
+
 // AuditDisableCommand is a Command that mounts a new mount.
 type AuditDisableCommand struct {
-	meta.Meta
-}
-
-func (c *AuditDisableCommand) Run(args []string) int {
-	flags := c.Meta.FlagSet("mount", meta.FlagSetDefault)
-	flags.Usage = func() { c.Ui.Error(c.Help()) }
-	if err := flags.Parse(args); err != nil {
-		return 1
-	}
-
-	args = flags.Args()
-	if len(args) != 1 {
-		flags.Usage()
-		c.Ui.Error(fmt.Sprintf(
-			"\naudit-disable expects one argument: the id to disable"))
-		return 1
-	}
-
-	id := args[0]
-
-	client, err := c.Client()
-	if err != nil {
-		c.Ui.Error(fmt.Sprintf(
-			"Error initializing client: %s", err))
-		return 2
-	}
-
-	if err := client.Sys().DisableAudit(id); err != nil {
-		c.Ui.Error(fmt.Sprintf(
-			"Error disabling audit backend: %s", err))
-		return 2
-	}
-
-	c.Ui.Output(fmt.Sprintf(
-		"Successfully disabled audit backend '%s' if it was enabled", id))
-
-	return 0
+	*BaseCommand
 }
 
 func (c *AuditDisableCommand) Synopsis() string {
-	return "Disable an audit backend"
+	return "Disables an audit backend"
 }
 
 func (c *AuditDisableCommand) Help() string {
 	helpText := `
-Usage: vault audit-disable [options] id
+Usage: vault audit-disable [options] PATH
 
-  Disable an audit backend.
+  Disables an audit backend. Once an audit backend is disabled, no future
+  audit logs are dispatched to it. The data associated with the audit backend
+  is not affected.
 
-  Once the audit backend is disabled no more audit logs will be sent to
-  it. The data associated with the audit backend isn't affected.
+  The argument corresponds to the PATH of the mount, not the TYPE!
 
-  The "id" parameter should map to the "path" used in "audit-enable". If
-  no path was provided to "audit-enable" you should use the backend
-  type (e.g. "file").
+  Disable the audit backend at file/:
+
+      $ vault audit-disable file/
+
+` + c.Flags().Help()
 
-General Options:
-` + meta.GeneralOptionsUsage()
 	return strings.TrimSpace(helpText)
 }
+
+func (c *AuditDisableCommand) Flags() *FlagSets {
+	return c.flagSet(FlagSetHTTP)
+}
+
+func (c *AuditDisableCommand) AutocompleteArgs() complete.Predictor {
+	return c.PredictVaultAudits()
+}
+
+func (c *AuditDisableCommand) AutocompleteFlags() complete.Flags {
+	return c.Flags().Completions()
+}
+
+func (c *AuditDisableCommand) Run(args []string) int {
+	f := c.Flags()
+
+	if err := f.Parse(args); err != nil {
+		c.UI.Error(err.Error())
+		return 1
+	}
+
+	args = f.Args()
+	path, kvs, err := extractPath(args)
+	if err != nil {
+		c.UI.Error(err.Error())
+		return 1
+	}
+	path = ensureTrailingSlash(path)
+
+	if len(kvs) > 0 {
+		c.UI.Error(fmt.Sprintf("Too many arguments (expected 1, got %d)", len(args)))
+		return 1
+	}
+
+	client, err := c.Client()
+	if err != nil {
+		c.UI.Error(err.Error())
+		return 2
+	}
+
+	if err := client.Sys().DisableAudit(path); err != nil {
+		c.UI.Error(fmt.Sprintf("Error disabling audit backend: %s", err))
+		return 2
+	}
+
+	c.UI.Output(fmt.Sprintf("Success! Disabled audit backend (if it was enabled) at: %s", path))
+
+	return 0
+}