From 3fbd381f55b163eec376fa7e9851abdd862194c7 Mon Sep 17 00:00:00 2001
From: decentral1se <cellarspoon@riseup.net>
Date: Sat, 12 Mar 2022 09:17:24 +0100
Subject: [PATCH] fix: add pass remove flag & show name is optional

---
 cli/app/secret.go   |  8 ++++----
 cli/internal/cli.go | 10 ++++++++++
 2 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/cli/app/secret.go b/cli/app/secret.go
index a6c82c8b..52cfdec6 100644
--- a/cli/app/secret.go
+++ b/cli/app/secret.go
@@ -157,18 +157,18 @@ var appSecretRmCommand = cli.Command{
 	Flags: []cli.Flag{
 		internal.DebugFlag,
 		internal.NoInputFlag,
-		allSecretsFlag, internal.PassFlag,
+		allSecretsFlag,
+		internal.PassRemoveFlag,
 	},
 	Before:       internal.SubCommandBefore,
-	ArgsUsage:    "<domain> <secret-name>",
+	ArgsUsage:    "<domain> [<secret-name>]",
 	BashComplete: autocomplete.AppNameComplete,
 	Description: `
-This command removes a secret from an app environment.
+This command removes app secrets.
 
 Example:
 
     abra app secret remove myapp db_pass
-
 `,
 	Action: func(c *cli.Context) error {
 		app := internal.ValidateApp(c)
diff --git a/cli/internal/cli.go b/cli/internal/cli.go
index b50a594d..9eb94975 100644
--- a/cli/internal/cli.go
+++ b/cli/internal/cli.go
@@ -28,6 +28,16 @@ var PassFlag = &cli.BoolFlag{
 	Destination: &Pass,
 }
 
+// PassRemove stores the variable for PassRemoveFlag
+var PassRemove bool
+
+// PassRemoveFlag turns on/off removing generated secrets from pass
+var PassRemoveFlag = &cli.BoolFlag{
+	Name:        "pass, p",
+	Usage:       "Remove generated secrets from a local pass store",
+	Destination: &PassRemove,
+}
+
 // Force force functionality without asking.
 var Force bool