From d803e0eadba92ccf030a4a0592848791be5d6ec0 Mon Sep 17 00:00:00 2001 From: Mitchell Hashimoto Date: Tue, 31 Mar 2015 16:28:46 -0700 Subject: [PATCH] command/mount --- command/mount.go | 96 +++++++++++++++++++++++++++++++++++++++++++ command/mount_test.go | 49 ++++++++++++++++++++++ commands.go | 6 +++ 3 files changed, 151 insertions(+) create mode 100644 command/mount.go create mode 100644 command/mount_test.go diff --git a/command/mount.go b/command/mount.go new file mode 100644 index 0000000000..7573c17210 --- /dev/null +++ b/command/mount.go @@ -0,0 +1,96 @@ +package command + +import ( + "fmt" + "strings" +) + +// MountCommand is a Command that mounts a new mount. +type MountCommand struct { + Meta +} + +func (c *MountCommand) Run(args []string) int { + var description, path string + flags := c.Meta.FlagSet("mount", FlagSetDefault) + flags.StringVar(&description, "description", "", "") + flags.StringVar(&path, "path", "", "") + 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( + "\nMount expects one argument: the type to mount.")) + return 1 + } + + mountType := args[0] + + // If no path is specified, we default the path to the backend type + if path == "" { + path = mountType + } + + client, err := c.Client() + if err != nil { + c.Ui.Error(fmt.Sprintf( + "Error initializing client: %s", err)) + return 2 + } + + if err := client.Sys().Mount(path, mountType, description); err != nil { + c.Ui.Error(fmt.Sprintf( + "Mount error: %s", err)) + return 2 + } + + c.Ui.Output(fmt.Sprintf( + "Successfully mounted '%s' at '%s'!", + mountType, path)) + + return 0 +} + +func (c *MountCommand) Synopsis() string { + return "Mount a logical backend" +} + +func (c *MountCommand) Help() string { + helpText := ` +Usage: vault mount [options] type + + Mount a logical backend. + + This command mounts a logical backend for storing and/or generating + secrets. + +General Options: + + -address=TODO The address of the Vault server. + + -ca-cert=path Path to a PEM encoded CA cert file to use to + verify the Vault server SSL certificate. + + -ca-path=path Path to a directory of PEM encoded CA cert files + to verify the Vault server SSL certificate. If both + -ca-cert and -ca-path are specified, -ca-path is used. + + -insecure Do not verify TLS certificate. This is highly + not recommended. This is especially not recommended + for unsealing a vault. + +Mount Options: + + -description= Human-friendly description of the purpose for the + mount. This shows up in the mounts command. + + -path= Mount point for the logical backend. This defaults + to the type of the mount. + +` + return strings.TrimSpace(helpText) +} diff --git a/command/mount_test.go b/command/mount_test.go new file mode 100644 index 0000000000..c634cb7930 --- /dev/null +++ b/command/mount_test.go @@ -0,0 +1,49 @@ +package command + +import ( + "testing" + + "github.com/hashicorp/vault/http" + "github.com/hashicorp/vault/vault" + "github.com/mitchellh/cli" +) + +func TestMount(t *testing.T) { + core, _, token := vault.TestCoreUnsealed(t) + ln, addr := http.TestServer(t, core) + defer ln.Close() + + ui := new(cli.MockUi) + c := &MountCommand{ + Meta: Meta{ + ClientToken: token, + Ui: ui, + }, + } + + args := []string{ + "-address", addr, + "generic", + } + if code := c.Run(args); code != 0 { + t.Fatalf("bad: %d\n\n%s", code, ui.ErrorWriter.String()) + } + + client, err := c.Client() + if err != nil { + t.Fatalf("err: %s", err) + } + + mounts, err := client.Sys().ListMounts() + if err != nil { + t.Fatalf("err: %s", err) + } + + mount, ok := mounts["generic/"] + if !ok { + t.Fatal("should have generic mount") + } + if mount.Type != "generic" { + t.Fatal("should be generic type") + } +} diff --git a/commands.go b/commands.go index 81377728e0..3a8c65f573 100644 --- a/commands.go +++ b/commands.go @@ -76,6 +76,12 @@ func init() { }, nil }, + "mount": func() (cli.Command, error) { + return &command.MountCommand{ + Meta: meta, + }, nil + }, + "mounts": func() (cli.Command, error) { return &command.MountsCommand{ Meta: meta,