From 7f315315f04c3914ba022f137d46ad064837dd2f Mon Sep 17 00:00:00 2001
From: decentral1se <cellarspoon@riseup.net>
Date: Sun, 13 Mar 2022 10:59:19 +0100
Subject: [PATCH] fix: better prompts & matching for secret removal

---
 cli/app/secret.go | 19 +++++++++++++++----
 1 file changed, 15 insertions(+), 4 deletions(-)

diff --git a/cli/app/secret.go b/cli/app/secret.go
index 1384dd20..bcf89492 100644
--- a/cli/app/secret.go
+++ b/cli/app/secret.go
@@ -229,10 +229,10 @@ Example:
 			remoteSecretNames[cont.Spec.Annotations.Name] = true
 		}
 
+		match := false
 		secretToRm := c.Args().Get(1)
 		for sec := range secrets {
 			secretName := secret.ParseSecretEnvVarName(sec)
-			parsed := secret.ParseGeneratedSecretName(secretName, app)
 
 			secVal, err := secret.ParseSecretEnvVarValue(secrets[sec])
 			if err != nil {
@@ -242,20 +242,31 @@ Example:
 			secretRemoteName := fmt.Sprintf("%s_%s_%s", app.StackName(), secretName, secVal.Version)
 			if _, ok := remoteSecretNames[secretRemoteName]; ok {
 				if secretToRm != "" {
-					if parsed == secretToRm {
-						if err := secretRm(cl, app, secretRemoteName, parsed); err != nil {
+					if secretName == secretToRm {
+						if err := secretRm(cl, app, secretRemoteName, secretName); err != nil {
 							logrus.Fatal(err)
 						}
+
 						return nil
 					}
 				} else {
-					if err := secretRm(cl, app, secretRemoteName, parsed); err != nil {
+					match = true
+
+					if err := secretRm(cl, app, secretRemoteName, secretName); err != nil {
 						logrus.Fatal(err)
 					}
 				}
 			}
 		}
 
+		if !match && secretToRm != "" {
+			logrus.Fatalf("%s doesn't exist on server?", secretToRm)
+		}
+
+		if !match {
+			logrus.Fatal("no secrets to remove?")
+		}
+
 		return nil
 	},
 }