From 8215bb455b29e026bcf40dd3f0561c806bc0d30a Mon Sep 17 00:00:00 2001
From: cellarspoon <cellarspoon@riseup.net>
Date: Mon, 13 Dec 2021 12:29:26 +0100
Subject: [PATCH] fix: warn if secrets still exist

---
 pkg/secret/secret.go | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/pkg/secret/secret.go b/pkg/secret/secret.go
index 87270bfbb..2175fe2f5 100644
--- a/pkg/secret/secret.go
+++ b/pkg/secret/secret.go
@@ -140,7 +140,12 @@ func GenerateSecrets(secretEnvVars map[string]string, appName, server string) (m
 					return
 				}
 				if err := client.StoreSecret(secretRemoteName, passwords[0], server); err != nil {
-					ch <- err
+					if strings.Contains(err.Error(), "AlreadyExists") {
+						logrus.Warnf("%s already exists, moving on...", secretRemoteName)
+						ch <- nil
+					} else {
+						ch <- err
+					}
 					return
 				}
 				secrets[secretName] = passwords[0]
@@ -151,7 +156,13 @@ func GenerateSecrets(secretEnvVars map[string]string, appName, server string) (m
 					return
 				}
 				if err := client.StoreSecret(secretRemoteName, passphrases[0], server); err != nil {
-					ch <- err
+					if strings.Contains(err.Error(), "AlreadyExists") {
+						logrus.Warnf("%s already exists, moving on...", secretRemoteName)
+						ch <- nil
+					} else {
+						ch <- err
+					}
+					return
 				}
 				secrets[secretName] = passphrases[0]
 			}