feat(key): add command

Author: dbohdan

README.md

@@ -256,13 +256,17 @@ numbers = [1, 1, 2, 3, 5]
 EOF
 ```
 
-You can then retrieve individual values from the TOML entry using the `-k`/`--key` option flag with the commands `show`, `clip`, and `pick`.
+You can then retrieve individual values from the TOML entry using the `-k`/`--key` option flag with the commands `show`, `clip`, and `pick`, or with the `key` command.
 
 ```shell
 # Show the user from the TOML entry.
 pago show -k user services/my-api
 # => jdoe
 
+# The `key` command is a shortcut for `show --key`.
+pago key services/my-api user
+# => jdoe
+
 # Show an array.
 pago show -k numbers services/my-api
 # => [1, 1, 2, 3, 5]

cmd/pago/main.go

@@ -64,6 +64,7 @@ type CLI struct {
 	Generate GenerateCmd `cmd:"" aliases:"g,gen" help:"Generate and print password"`
 	Info     InfoCmd     `cmd:"" hidden:"" help:"Show information"`
 	Init     InitCmd     `cmd:"" help:"Create a new password store"`
+	Key      KeyCmd      `cmd:"" aliases:"k" help:"Show a key from a TOML entry. A shortcut for \"show --key\"."`
 	Pick     PickCmd     `cmd:"" aliases:"p" help:"Show password entry picked with a fuzzy finder. A shortcut for \"show --pick\"."`
 	Rekey    RekeyCmd    `cmd:"" help:"Reencrypt all password entries with the recipients file"`
 	Rename   RenameCmd   `cmd:"" aliases:"mv,r" help:"Rename or move a password entry"`
@@ -748,6 +749,20 @@ func (cmd *InitCmd) Run(config *Config) error {
 	return nil
 }
 
+type KeyCmd struct {
+	Name string `arg:"" help:"Name of the password entry"`
+	Key  string `arg:"" help:"Key to retrieve from the TOML entry"`
+}
+
+func (cmd *KeyCmd) Run(config *Config) error {
+	if config.Verbose {
+		printRepr(cmd)
+	}
+
+	showCmd := &ShowCmd{Name: cmd.Name, Key: cmd.Key}
+	return showCmd.Run(config)
+}
+
 type PickCmd struct {
 	Name string `arg:"" optional:"" help:"Name of the password entry"`
 	Key  string `short:"k" help:"Retrieve a key from a TOML entry"`

test/e2e_test.go

@@ -777,6 +777,61 @@ qux = {"key" = "value"}
 	}
 }
 
+func TestKeyCmd(t *testing.T) {
+	var buf bytes.Buffer
+
+	_, err := withPagoDir(func(dataDir string) (string, error) {
+		// Add a TOML entry.
+		cmd := exec.Command(commandPago, "--dir", dataDir, "add", "toml-test", "--multiline")
+		cmd.Stdin = strings.NewReader(`foo = "string"`)
+		var stdout, stderr bytes.Buffer
+		cmd.Stdout = &stdout
+		cmd.Stderr = &stderr
+		err := cmd.Run()
+		if err != nil {
+			return stdout.String() + "\n" + stderr.String(), err
+		}
+
+		// Show a key from the entry using the 'key' command.
+		c, err := expect.NewConsole()
+		if err != nil {
+			return "", fmt.Errorf("failed to create console: %w", err)
+		}
+		defer c.Close()
+
+		buf.Reset()
+
+		cmd = exec.Command(commandPago, "--dir", dataDir, "--socket", "", "key", "toml-test", "foo")
+		cmd.Stdin = c.Tty()
+		cmd.Stdout = &buf
+		cmd.Stderr = c.Tty()
+
+		err = cmd.Start()
+		if err != nil {
+			return "", fmt.Errorf("failed to start command for key %q: %w", "foo", err)
+		}
+
+		_, _ = c.ExpectString("Enter password")
+		_, _ = c.SendLine(password)
+
+		err = cmd.Wait()
+		if err != nil {
+			return "", fmt.Errorf("command failed for key %q: %w", "foo", err)
+		}
+
+		output := strings.TrimSpace(buf.String())
+		expected := "string"
+		if output != expected {
+			return "", fmt.Errorf("for key %q, expected %q, got %q", "foo", expected, output)
+		}
+
+		return "", nil
+	})
+	if err != nil {
+		t.Errorf("Command `key` failed: %v (%q)", err, buf)
+	}
+}
+
 func TestShowOTP(t *testing.T) {
 	_, err := withPagoDir(func(dataDir string) (string, error) {
 		// Add a TOML entry with a 6-digit otpauth URI.