From 2cca04de90681d620c41b060f69d9efcefc1c077 Mon Sep 17 00:00:00 2001 From: decentral1se Date: Fri, 31 Oct 2025 21:36:51 +0100 Subject: [PATCH] fix(move): does not error when secret already exists on new server See https://git.coopcloud.tech/toolshed/abra/pulls/709 --- cli/app/move.go | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/cli/app/move.go b/cli/app/move.go index 2d22baf1b..60cafb65f 100644 --- a/cli/app/move.go +++ b/cli/app/move.go @@ -128,6 +128,10 @@ Use "--dry-run/-r" to see which secrets and volumes will be moved.`), secretName := strings.Join(sname[:len(sname)-1], "_") data := resources.Secrets[secretName] if err := client.StoreSecret(newServerClient, s.Spec.Name, data); err != nil { + if strings.Contains(err.Error(), "already exists") { + log.Info(i18n.G("skipping secret (because it already exists) on %s: %s", s.Spec.Name, newServer)) + continue + } log.Fatal(i18n.G("failed to store secret on %s: %s", err, newServer)) } log.Info(i18n.G("created secret on %s: %s", s.Spec.Name, newServer))