delete: add new -i switch

Similar to `update -i`.

Author: vmiklos

commands/delete.go

@@ -14,47 +14,67 @@ func newDeleteCommand(ctx *Context) *cobra.Command {
 	var user string
 	var passwordType PasswordType = "plain"
 	var dryRun bool
+	var id string
 	var cmd = &cobra.Command{
 		Use:   "delete",
 		Short: "deletes an existing password",
 		RunE: func(cmd *cobra.Command, args []string) error {
-			reader := bufio.NewReader(cmd.InOrStdin())
-			if len(machine) == 0 {
-				fmt.Fprintf(cmd.OutOrStdout(), "Machine: ")
-				line, err := reader.ReadString('\n')
-				if err != nil {
-					return fmt.Errorf("ReadString() failed: %s", err)
-				}
-				machine = strings.TrimSuffix(line, "\n")
-			}
-			if len(user) == 0 {
-				fmt.Fprintf(cmd.OutOrStdout(), "User: ")
-				line, err := reader.ReadString('\n')
-				if err != nil {
-					return fmt.Errorf("ReadString() failed: %s", err)
-				}
-				user = strings.TrimSuffix(line, "\n")
-			}
-
 			transaction, err := ctx.Database.Begin()
 			if err != nil {
 				return fmt.Errorf("db.Begin() failed: %s", err)
 			}
 
 			defer transaction.Rollback()
-			query, err := transaction.Prepare("delete from passwords where machine=? and service=? and user=? and type=?")
-			if err != nil {
-				return fmt.Errorf("db.Prepare() failed: %s", err)
-			}
 
-			result, err := query.Exec(machine, service, user, passwordType)
-			if err != nil {
-				return fmt.Errorf("db.Exec() failed: %s", err)
-			}
+			var affected int64
+			if len(id) > 0 {
+				query, err := transaction.Prepare("delete from passwords where id=?")
+				if err != nil {
+					return fmt.Errorf("db.Prepare() failed: %s", err)
+				}
 
-			affected, err := result.RowsAffected()
-			if err != nil {
-				return fmt.Errorf("result.RowsAffected() failed: %s", err)
+				result, err := query.Exec(id)
+				if err != nil {
+					return fmt.Errorf("db.Exec() failed: %s", err)
+				}
+
+				affected, err = result.RowsAffected()
+				if err != nil {
+					return fmt.Errorf("result.RowsAffected() failed: %s", err)
+				}
+			} else {
+				reader := bufio.NewReader(cmd.InOrStdin())
+				if len(machine) == 0 {
+					fmt.Fprintf(cmd.OutOrStdout(), "Machine: ")
+					line, err := reader.ReadString('\n')
+					if err != nil {
+						return fmt.Errorf("ReadString() failed: %s", err)
+					}
+					machine = strings.TrimSuffix(line, "\n")
+				}
+				if len(user) == 0 {
+					fmt.Fprintf(cmd.OutOrStdout(), "User: ")
+					line, err := reader.ReadString('\n')
+					if err != nil {
+						return fmt.Errorf("ReadString() failed: %s", err)
+					}
+					user = strings.TrimSuffix(line, "\n")
+				}
+
+				query, err := transaction.Prepare("delete from passwords where machine=? and service=? and user=? and type=?")
+				if err != nil {
+					return fmt.Errorf("db.Prepare() failed: %s", err)
+				}
+
+				result, err := query.Exec(machine, service, user, passwordType)
+				if err != nil {
+					return fmt.Errorf("db.Exec() failed: %s", err)
+				}
+
+				affected, err = result.RowsAffected()
+				if err != nil {
+					return fmt.Errorf("result.RowsAffected() failed: %s", err)
+				}
 			}
 			if dryRun {
 				fmt.Fprintf(cmd.OutOrStdout(), "Would delete %v password\n", affected)
@@ -72,6 +92,7 @@ func newDeleteCommand(ctx *Context) *cobra.Command {
 	cmd.Flags().StringVarP(&user, "user", "u", "", "user (default: ask)")
 	cmd.Flags().VarP(&passwordType, "type", "t", `password type ("plain" or "totp")`)
 	cmd.Flags().BoolVarP(&dryRun, "dry-run", "n", false, `do everything except actually perform the database action (default: false)`)
+	cmd.Flags().StringVarP(&id, "id", "i", "", `unique identifier (default: '')`)
 
 	return cmd
 }

commands/delete_test.go

@@ -38,6 +38,38 @@ func TestDelete(t *testing.T) {
 	}
 }
 
+func TestDeleteById(t *testing.T) {
+	ctx := CreateContextForTesting(t)
+	expectedMachine := "mymachine"
+	expectedService := "myservice"
+	expectedUser := "myuser"
+	expectedPassword := "mypassword"
+	var expectedType PasswordType = "plain"
+	_, err := createPassword(&ctx, expectedMachine, expectedService, expectedUser, expectedPassword, expectedType)
+	if err != nil {
+		t.Fatalf("createPassword() = %q, want nil", err)
+	}
+	os.Args = []string{"", "delete", "--id", "1"}
+	inBuf := new(bytes.Buffer)
+	outBuf := new(bytes.Buffer)
+
+	actualRet := Main(inBuf, outBuf)
+
+	expectedRet := 0
+	if actualRet != expectedRet {
+		t.Fatalf("Main() = %q, want %q", actualRet, expectedRet)
+	}
+	results, err := readPasswords(ctx.Database, searchOptions{})
+	if err != nil {
+		t.Fatalf("readPasswords() err = %q, want nil", err)
+	}
+	actualLength := len(results)
+	expectedLength := 0
+	if actualLength != expectedLength {
+		t.Fatalf("actualLength = %q, want %q", actualLength, expectedLength)
+	}
+}
+
 func TestInteractiveDelete(t *testing.T) {
 	ctx := CreateContextForTesting(t)
 	expectedMachine := "mymachine"

guide/src/news.md

@@ -5,6 +5,7 @@
 - update: new `-i` switch to edit the `machine`, `service` or `user` of a password without changing
   the password itself
 - `sync` is renamed to `pull`, since it's a remote -> local copy only
+- delete: new `-i` switch to delete a password based on the search result
 
 ## 7.4
 

guide/src/usage.md

@@ -166,3 +166,10 @@ In which case the command is not interactive:
 ```console
 Deleted 1 password
 ```
+
+An alternative approach is to use `cpm search` to find the password ID, then you can delete based on
+that ID:
+
+```
+cpm delete -i <id>
+```

man/cpm-delete.1

@@ -25,6 +25,10 @@ deletes an existing password
 \fB-h\fP, \fB--help\fP[=false]
 	help for delete
 
+.PP
+\fB-i\fP, \fB--id\fP=""
+	unique identifier (default: '')
+
 .PP
 \fB-m\fP, \fB--machine\fP=""
 	machine (default: ask)