cli/app/deploy.go

@@ -10,6 +10,7 @@ import (
 	"coopcloud.tech/abra/pkg/autocomplete"
 	"coopcloud.tech/abra/pkg/config"
 	"coopcloud.tech/abra/pkg/secret"
+	"coopcloud.tech/tagcmp"
 
 	appPkg "coopcloud.tech/abra/pkg/app"
 	"coopcloud.tech/abra/pkg/client"
@@ -107,6 +108,15 @@ checkout as-is. Recipe commit hashes are also supported as values for
 			log.Fatal(err)
 		}
 
+		isChaosCommit, err := app.Recipe.IsChaosCommit(toDeployVersion)
+		if err != nil {
+			log.Fatal(i18n.G("unable to determine if %s is a chaos commit: %s", toDeployVersion, err))
+		}
+
+		if !isChaosCommit && !tagcmp.IsParsable(toDeployVersion) {
+			log.Fatal(i18n.G("unable to parse deploy version: %s", toDeployVersion))
+		}
+
 		if !internal.Chaos {
 			isChaosCommit, err := app.Recipe.EnsureVersion(toDeployVersion)
 			if err != nil {

cli/app/list.go

@@ -113,13 +113,10 @@ Use "--status/-S" flag to query all servers for the live deployment status.`),
 				totalAppsCount++
 
 				if status {
-					if err := app.Recipe.EnsureUpToDate(); err != nil {
-						log.Warnf(
-							"failed to ensure repo is up to date for recipe: %s err: %s",
-							app.Recipe.Name,
-							err,
-						)
+					if err := app.Recipe.Ensure(internal.GetEnsureContext()); err != nil {
+						log.Fatal(err)
 					}
+
 					status := i18n.G("unknown")
 					version := i18n.G("unknown")
 					chaos := i18n.G("unknown")

cli/app/new.go

@@ -72,12 +72,8 @@ var AppNewCommand = &cobra.Command{
 	Run: func(cmd *cobra.Command, args []string) {
 		recipe := internal.ValidateRecipe(args, cmd.Name())
 
-		if err := recipe.EnsureUpToDate(); err != nil {
-			log.Warnf(
-				"failed to ensure repo is up to date for recipe: %s err: %s",
-				recipe.Name,
-				err,
-			)
+		if err := recipe.Ensure(internal.GetEnsureContext()); err != nil {
+			log.Fatal(err)
 		}
 
 		if len(args) == 2 && internal.Chaos {

pkg/i18n/locales/abra.pot

@@ -7,7 +7,7 @@
 msgid   ""
 msgstr  "Project-Id-Version: \n"
         "Report-Msgid-Bugs-To: EMAIL\n"
-        "POT-Creation-Date: 2026-02-15 14:40+0100\n"
+        "POT-Creation-Date: 2026-02-15 17:08+0100\n"
         "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
         "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
         "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -119,7 +119,7 @@ msgid   "  # run <cmd> with args/flags\n"
         "  abra app run 1312.net app --user nobody -- ls -lha"
 msgstr  ""
 
-#: ./cli/app/deploy.go:42
+#: ./cli/app/deploy.go:43
 msgid   "  # standard deployment\n"
         "  abra app deploy 1312.net\n"
         "\n"
@@ -214,7 +214,7 @@ msgstr  ""
 msgid   "%s already exists?"
 msgstr  ""
 
-#: ./cli/app/new.go:206
+#: ./cli/app/new.go:202
 #, c-format
 msgid   "%s created (version: %s)"
 msgstr  ""
@@ -299,7 +299,7 @@ msgstr  ""
 msgid   "%s has no published versions?"
 msgstr  ""
 
-#: ./cli/app/new.go:315
+#: ./cli/app/new.go:311
 #, c-format
 msgid   "%s has no secrets to generate, skipping..."
 msgstr  ""
@@ -314,7 +314,7 @@ msgstr  ""
 msgid   "%s inserted into pass store"
 msgstr  ""
 
-#: ./cli/app/deploy.go:102
+#: ./cli/app/deploy.go:103
 #, c-format
 msgid   "%s is already deployed"
 msgstr  ""
@@ -369,7 +369,7 @@ msgstr  ""
 msgid   "%s missing context, run \"abra server add %s\"?"
 msgstr  ""
 
-#: ./cli/app/deploy.go:184 ./cli/app/upgrade.go:210
+#: ./cli/app/deploy.go:194 ./cli/app/upgrade.go:210
 #, c-format
 msgid   "%s missing from %s.env"
 msgstr  ""
@@ -404,17 +404,17 @@ msgstr  ""
 msgid   "%s removed from pass store"
 msgstr  ""
 
-#: ./cli/app/new.go:224
+#: ./cli/app/new.go:220
 #, c-format
 msgid   "%s requires secret generation before deploy, run \"abra app secret generate %s --all\""
 msgstr  ""
 
-#: ./cli/app/new.go:228
+#: ./cli/app/new.go:224
 #, c-format
 msgid   "%s requires secret insertion before deploy (#generate=false)"
 msgstr  ""
 
-#: ./cli/app/new.go:155
+#: ./cli/app/new.go:151
 #, c-format
 msgid   "%s sanitised as %s for new app"
 msgstr  ""
@@ -621,11 +621,11 @@ msgstr  ""
 msgid   "Both local recipe and live deployment labels are shown."
 msgstr  ""
 
-#: ./cli/app/backup.go:319 ./cli/app/backup.go:335 ./cli/app/check.go:95 ./cli/app/cmd.go:285 ./cli/app/cp.go:385 ./cli/app/deploy.go:404 ./cli/app/labels.go:143 ./cli/app/new.go:411 ./cli/app/ps.go:213 ./cli/app/restart.go:163 ./cli/app/restore.go:138 ./cli/app/secret.go:569 ./cli/app/secret.go:609 ./cli/app/secret.go:633 ./cli/app/secret.go:641 ./cli/catalogue/catalogue.go:318 ./cli/recipe/lint.go:137
+#: ./cli/app/backup.go:319 ./cli/app/backup.go:335 ./cli/app/check.go:95 ./cli/app/cmd.go:285 ./cli/app/cp.go:385 ./cli/app/deploy.go:414 ./cli/app/labels.go:143 ./cli/app/new.go:407 ./cli/app/ps.go:213 ./cli/app/restart.go:163 ./cli/app/restore.go:138 ./cli/app/secret.go:569 ./cli/app/secret.go:609 ./cli/app/secret.go:633 ./cli/app/secret.go:641 ./cli/catalogue/catalogue.go:318 ./cli/recipe/lint.go:137
 msgid   "C"
 msgstr  ""
 
-#: ./cli/app/list.go:232 ./cli/app/ps.go:189
+#: ./cli/app/list.go:229 ./cli/app/ps.go:189
 msgid   "CHAOS"
 msgstr  ""
 
@@ -762,7 +762,7 @@ msgid   "Creates a new app from a default recipe.\n"
         "on your $PATH."
 msgstr  ""
 
-#: ./cli/app/deploy.go:420 ./cli/app/new.go:387 ./cli/app/rollback.go:361 ./cli/app/upgrade.go:470
+#: ./cli/app/deploy.go:430 ./cli/app/new.go:383 ./cli/app/rollback.go:361 ./cli/app/upgrade.go:470
 msgid   "D"
 msgstr  ""
 
@@ -774,7 +774,7 @@ msgstr  ""
 msgid   "DEPLOYED LABELS"
 msgstr  ""
 
-#: ./cli/app/list.go:228 ./cli/internal/deploy.go:78 ./cli/internal/deploy.go:208
+#: ./cli/app/list.go:225 ./cli/internal/deploy.go:78 ./cli/internal/deploy.go:208
 msgid   "DOMAIN"
 msgstr  ""
 
@@ -783,11 +783,11 @@ msgid   "DOWNGRADE"
 msgstr  ""
 
 #. translators: Short description for `app deploy` command
-#: ./cli/app/deploy.go:36
+#: ./cli/app/deploy.go:37
 msgid   "Deploy an app"
 msgstr  ""
 
-#: ./cli/app/deploy.go:37
+#: ./cli/app/deploy.go:38
 msgid   "Deploy an app.\n"
         "\n"
         "This command supports chaos operations. Use \"--chaos/-C\" to deploy your recipe\n"
@@ -873,7 +873,7 @@ msgid   "Generate a report of all managed apps.\n"
         "Use \"--status/-S\" flag to query all servers for the live deployment status."
 msgstr  ""
 
-#: ./cli/app/new.go:321
+#: ./cli/app/new.go:317
 msgid   "Generate app secrets?"
 msgstr  ""
 
@@ -1148,7 +1148,7 @@ msgstr  ""
 msgid   "README.md metadata filled in"
 msgstr  ""
 
-#: ./cli/app/list.go:228 ./cli/internal/deploy.go:79 ./cli/internal/deploy.go:209
+#: ./cli/app/list.go:225 ./cli/internal/deploy.go:79 ./cli/internal/deploy.go:209
 msgid   "RECIPE"
 msgstr  ""
 
@@ -1264,7 +1264,7 @@ msgstr  ""
 msgid   "Run app commands"
 msgstr  ""
 
-#: ./cli/app/backup.go:303 ./cli/app/list.go:299 ./cli/app/logs.go:109 ./cli/app/new.go:403
+#: ./cli/app/backup.go:303 ./cli/app/list.go:296 ./cli/app/logs.go:109 ./cli/app/new.go:399
 msgid   "S"
 msgstr  ""
 
@@ -1272,11 +1272,11 @@ msgstr  ""
 msgid   "SECRETS"
 msgstr  ""
 
-#: ./cli/app/new.go:238
+#: ./cli/app/new.go:234
 msgid   "SECRETS OVERVIEW"
 msgstr  ""
 
-#: ./cli/app/list.go:228 ./cli/internal/deploy.go:80
+#: ./cli/app/list.go:225 ./cli/internal/deploy.go:80
 msgid   "SERVER"
 msgstr  ""
 
@@ -1301,11 +1301,11 @@ msgstr  ""
 msgid   "SSO"
 msgstr  ""
 
-#: ./cli/app/list.go:231 ./cli/app/ps.go:186
+#: ./cli/app/list.go:228 ./cli/app/ps.go:186
 msgid   "STATUS"
 msgstr  ""
 
-#: ./cli/app/new.go:346
+#: ./cli/app/new.go:342
 msgid   "Select app server:"
 msgstr  ""
 
@@ -1337,7 +1337,7 @@ msgstr  ""
 msgid   "Specify a server name"
 msgstr  ""
 
-#: ./cli/app/new.go:297
+#: ./cli/app/new.go:293
 msgid   "Specify app domain"
 msgstr  ""
 
@@ -1474,7 +1474,7 @@ msgid   "To load completions:\n"
         "  # and source this file from your PowerShell profile."
 msgstr  ""
 
-#: ./cli/app/deploy.go:444 ./cli/app/rollback.go:377 ./cli/app/upgrade.go:494
+#: ./cli/app/deploy.go:454 ./cli/app/rollback.go:377 ./cli/app/upgrade.go:494
 msgid   "U"
 msgstr  ""
 
@@ -1486,7 +1486,7 @@ msgstr  ""
 msgid   "UNDEPLOY"
 msgstr  ""
 
-#: ./cli/app/list.go:234 ./cli/internal/deploy.go:174
+#: ./cli/app/list.go:231 ./cli/internal/deploy.go:174
 msgid   "UPGRADE"
 msgstr  ""
 
@@ -1586,7 +1586,7 @@ msgstr  ""
 msgid   "VALUE"
 msgstr  ""
 
-#: ./cli/app/list.go:233 ./cli/app/ps.go:188 ./cli/app/secret.go:481 ./cli/recipe/version.go:69 ./cli/recipe/version.go:110
+#: ./cli/app/list.go:230 ./cli/app/ps.go:188 ./cli/app/secret.go:481 ./cli/recipe/version.go:69 ./cli/recipe/version.go:110
 msgid   "VERSION"
 msgstr  ""
 
@@ -1847,7 +1847,7 @@ msgstr  ""
 msgid   "attempting to run %s"
 msgstr  ""
 
-#: ./cli/app/deploy.go:273 ./cli/app/upgrade.go:296
+#: ./cli/app/deploy.go:283 ./cli/app/upgrade.go:296
 #, c-format
 msgid   "attempting to run post deploy commands, saw: %s"
 msgstr  ""
@@ -1872,12 +1872,12 @@ msgstr  ""
 msgid   "autocomplete [bash|zsh|fish|powershell]"
 msgstr  ""
 
-#: ./cli/app/deploy.go:65 ./cli/app/logs.go:39 ./cli/app/rollback.go:65 ./cli/app/secret.go:49 ./cli/app/secret.go:191 ./cli/app/secret.go:360 ./cli/app/upgrade.go:63 ./pkg/autocomplete/autocomplete.go:18 ./pkg/autocomplete/autocomplete.go:33 ./pkg/autocomplete/autocomplete.go:44 ./pkg/autocomplete/autocomplete.go:50 ./pkg/autocomplete/autocomplete.go:70 ./pkg/autocomplete/autocomplete.go:88 ./pkg/autocomplete/autocomplete.go:104 ./pkg/autocomplete/autocomplete.go:110 ./pkg/autocomplete/autocomplete.go:125
+#: ./cli/app/deploy.go:66 ./cli/app/logs.go:39 ./cli/app/rollback.go:65 ./cli/app/secret.go:49 ./cli/app/secret.go:191 ./cli/app/secret.go:360 ./cli/app/upgrade.go:63 ./pkg/autocomplete/autocomplete.go:18 ./pkg/autocomplete/autocomplete.go:33 ./pkg/autocomplete/autocomplete.go:44 ./pkg/autocomplete/autocomplete.go:50 ./pkg/autocomplete/autocomplete.go:70 ./pkg/autocomplete/autocomplete.go:88 ./pkg/autocomplete/autocomplete.go:104 ./pkg/autocomplete/autocomplete.go:110 ./pkg/autocomplete/autocomplete.go:125
 #, c-format
 msgid   "autocomplete failed: %s"
 msgstr  ""
 
-#: ./cli/app/new.go:405
+#: ./cli/app/new.go:401
 msgid   "automatically generate secrets"
 msgstr  ""
 
@@ -1927,7 +1927,7 @@ msgstr  ""
 #. no spaces in between
 #. translators: `abra app cp` aliases. use a comma separated list of aliases with
 #. no spaces in between
-#: ./cli/app/backup.go:148 ./cli/app/cp.go:30 ./cli/app/deploy.go:428 ./cli/app/rollback.go:369 ./cli/app/upgrade.go:478
+#: ./cli/app/backup.go:148 ./cli/app/cp.go:30 ./cli/app/deploy.go:438 ./cli/app/rollback.go:369 ./cli/app/upgrade.go:478
 msgid   "c"
 msgstr  ""
 
@@ -1983,7 +1983,7 @@ msgstr  ""
 msgid   "cannot redeploy previous chaos version (%s), did you mean to use \"--chaos\"?"
 msgstr  ""
 
-#: ./cli/app/deploy.go:378
+#: ./cli/app/deploy.go:388
 #, c-format
 msgid   "cannot redeploy previous chaos version (%s), did you mean to use \"--chaos\"?\n"
         "     to return to a regular release, specify a release tag, commit SHA or use \"--latest\""
@@ -2002,7 +2002,7 @@ msgstr  ""
 msgid   "cannot use '[secret] [version]' and '--all' together"
 msgstr  ""
 
-#: ./cli/app/deploy.go:320
+#: ./cli/app/deploy.go:330
 msgid   "cannot use --chaos and --latest together"
 msgstr  ""
 
@@ -2026,11 +2026,11 @@ msgstr  ""
 msgid   "cannot use [service] and --all-services/-a together"
 msgstr  ""
 
-#: ./cli/app/deploy.go:312 ./cli/app/new.go:84
+#: ./cli/app/deploy.go:322 ./cli/app/new.go:80
 msgid   "cannot use [version] and --chaos together"
 msgstr  ""
 
-#: ./cli/app/deploy.go:316
+#: ./cli/app/deploy.go:326
 msgid   "cannot use [version] and --latest together"
 msgstr  ""
 
@@ -2066,7 +2066,7 @@ msgstr  ""
 msgid   "cfg"
 msgstr  ""
 
-#: ./cli/app/backup.go:318 ./cli/app/backup.go:334 ./cli/app/check.go:94 ./cli/app/cmd.go:284 ./cli/app/cp.go:384 ./cli/app/deploy.go:403 ./cli/app/labels.go:142 ./cli/app/new.go:410 ./cli/app/ps.go:212 ./cli/app/restart.go:162 ./cli/app/restore.go:137 ./cli/app/secret.go:568 ./cli/app/secret.go:608 ./cli/app/secret.go:632 ./cli/app/secret.go:640 ./cli/catalogue/catalogue.go:317 ./cli/recipe/lint.go:136
+#: ./cli/app/backup.go:318 ./cli/app/backup.go:334 ./cli/app/check.go:94 ./cli/app/cmd.go:284 ./cli/app/cp.go:384 ./cli/app/deploy.go:413 ./cli/app/labels.go:142 ./cli/app/new.go:406 ./cli/app/ps.go:212 ./cli/app/restart.go:162 ./cli/app/restore.go:137 ./cli/app/secret.go:568 ./cli/app/secret.go:608 ./cli/app/secret.go:632 ./cli/app/secret.go:640 ./cli/catalogue/catalogue.go:317 ./cli/recipe/lint.go:136
 msgid   "chaos"
 msgstr  ""
 
@@ -2075,7 +2075,7 @@ msgstr  ""
 msgid   "check <domain> [flags]"
 msgstr  ""
 
-#: ./cli/app/deploy.go:94 ./cli/app/undeploy.go:58 ./cli/app/upgrade.go:442
+#: ./cli/app/deploy.go:95 ./cli/app/undeploy.go:58 ./cli/app/upgrade.go:442
 #, c-format
 msgid   "checking whether %s is already deployed"
 msgstr  ""
@@ -2378,7 +2378,7 @@ msgstr  ""
 #. no spaces in between
 #. translators: `abra recipe diff` aliases. use a comma separated list of aliases
 #. with no spaces in between
-#: ./cli/app/backup.go:73 ./cli/app/deploy.go:29 ./cli/recipe/diff.go:16
+#: ./cli/app/backup.go:73 ./cli/app/deploy.go:30 ./cli/recipe/diff.go:16
 msgid   "d"
 msgstr  ""
 
@@ -2393,7 +2393,7 @@ msgid   "deleted %s successfully from server"
 msgstr  ""
 
 #. translators: `app deploy` command
-#: ./cli/app/deploy.go:33
+#: ./cli/app/deploy.go:34
 msgid   "deploy <domain> [version] [flags]"
 msgstr  ""
 
@@ -2409,7 +2409,7 @@ msgstr  ""
 msgid   "deploy labels stanza present"
 msgstr  ""
 
-#: ./cli/app/deploy.go:438
+#: ./cli/app/deploy.go:448
 msgid   "deploy latest recipe version"
 msgstr  ""
 
@@ -2511,11 +2511,11 @@ msgstr  ""
 msgid   "dirty: %v, "
 msgstr  ""
 
-#: ./cli/app/deploy.go:430 ./cli/app/rollback.go:371 ./cli/app/upgrade.go:480
+#: ./cli/app/deploy.go:440 ./cli/app/rollback.go:371 ./cli/app/upgrade.go:480
 msgid   "disable converge logic checks"
 msgstr  ""
 
-#: ./cli/app/deploy.go:422 ./cli/app/rollback.go:363 ./cli/app/upgrade.go:472
+#: ./cli/app/deploy.go:432 ./cli/app/rollback.go:363 ./cli/app/upgrade.go:472
 msgid   "disable public DNS checks"
 msgstr  ""
 
@@ -2536,11 +2536,11 @@ msgstr  ""
 msgid   "docker: is the daemon running / your user has docker permissions?"
 msgstr  ""
 
-#: ./cli/app/new.go:386
+#: ./cli/app/new.go:382
 msgid   "domain"
 msgstr  ""
 
-#: ./cli/app/new.go:389
+#: ./cli/app/new.go:385
 msgid   "domain name for app"
 msgstr  ""
 
@@ -2640,7 +2640,7 @@ msgstr  ""
 msgid   "ensure \"image: ...\" set on all services"
 msgstr  ""
 
-#: ./cli/app/deploy.go:113
+#: ./cli/app/deploy.go:123
 #, c-format
 msgid   "ensure recipe: %s"
 msgstr  ""
@@ -2733,7 +2733,7 @@ msgstr  ""
 
 #. translators: `abra recipe fetch` aliases. use a comma separated list of aliases
 #. with no spaces in between
-#: ./cli/app/deploy.go:412 ./cli/app/env.go:325 ./cli/app/remove.go:163 ./cli/app/rollback.go:353 ./cli/app/secret.go:593 ./cli/app/upgrade.go:462 ./cli/app/volume.go:217 ./cli/recipe/fetch.go:20 ./cli/recipe/fetch.go:138
+#: ./cli/app/deploy.go:422 ./cli/app/env.go:325 ./cli/app/remove.go:163 ./cli/app/rollback.go:353 ./cli/app/secret.go:593 ./cli/app/upgrade.go:462 ./cli/app/volume.go:217 ./cli/recipe/fetch.go:20 ./cli/recipe/fetch.go:138
 msgid   "f"
 msgstr  ""
 
@@ -2889,7 +2889,7 @@ msgstr  ""
 msgid   "failed to resize tty, using default size"
 msgstr  ""
 
-#: ./cli/app/new.go:138
+#: ./cli/app/new.go:134
 #, c-format
 msgid   "failed to retrieve latest commit for %s: %s"
 msgstr  ""
@@ -2979,7 +2979,7 @@ msgstr  ""
 msgid   "final merged env values for %s are: %s"
 msgstr  ""
 
-#: ./cli/app/deploy.go:411 ./cli/app/env.go:324 ./cli/app/remove.go:162 ./cli/app/rollback.go:352 ./cli/app/upgrade.go:461 ./cli/app/volume.go:216 ./cli/recipe/fetch.go:137
+#: ./cli/app/deploy.go:421 ./cli/app/env.go:324 ./cli/app/remove.go:162 ./cli/app/rollback.go:352 ./cli/app/upgrade.go:461 ./cli/app/volume.go:216 ./cli/recipe/fetch.go:137
 msgid   "force"
 msgstr  ""
 
@@ -3193,7 +3193,7 @@ msgstr  ""
 msgid   "id: %s, "
 msgstr  ""
 
-#: ./cli/app/backup.go:321 ./cli/app/backup.go:337 ./cli/app/check.go:97 ./cli/app/cmd.go:287 ./cli/app/cp.go:387 ./cli/app/deploy.go:406 ./cli/app/labels.go:145 ./cli/app/new.go:413 ./cli/app/ps.go:215 ./cli/app/restart.go:165 ./cli/app/restore.go:140 ./cli/app/secret.go:571 ./cli/app/secret.go:611 ./cli/app/secret.go:635 ./cli/app/secret.go:643 ./cli/catalogue/catalogue.go:320 ./cli/recipe/lint.go:139
+#: ./cli/app/backup.go:321 ./cli/app/backup.go:337 ./cli/app/check.go:97 ./cli/app/cmd.go:287 ./cli/app/cp.go:387 ./cli/app/deploy.go:416 ./cli/app/labels.go:145 ./cli/app/new.go:409 ./cli/app/ps.go:215 ./cli/app/restart.go:165 ./cli/app/restore.go:140 ./cli/app/secret.go:571 ./cli/app/secret.go:611 ./cli/app/secret.go:635 ./cli/app/secret.go:643 ./cli/catalogue/catalogue.go:320 ./cli/recipe/lint.go:139
 msgid   "ignore uncommitted recipes changes"
 msgstr  ""
 
@@ -3391,7 +3391,7 @@ msgstr  ""
 #. no spaces in between
 #. translators: `abra recipe lint` aliases. use a comma separated list of
 #. aliases with no spaces in between
-#: ./cli/app/cmd.go:261 ./cli/app/deploy.go:436 ./cli/app/logs.go:20 ./cli/recipe/lint.go:17 ./cli/server/add.go:207
+#: ./cli/app/cmd.go:261 ./cli/app/deploy.go:446 ./cli/app/logs.go:20 ./cli/recipe/lint.go:17 ./cli/server/add.go:207
 msgid   "l"
 msgstr  ""
 
@@ -3406,7 +3406,7 @@ msgstr  ""
 msgid   "labels <domain> [flags]"
 msgstr  ""
 
-#: ./cli/app/deploy.go:435 ./cli/app/list.go:189
+#: ./cli/app/deploy.go:445 ./cli/app/list.go:186
 msgid   "latest"
 msgstr  ""
 
@@ -3530,11 +3530,11 @@ msgstr  ""
 #. with no spaces in between
 #. translators: `abra man` aliases. use a comma separated list of aliases
 #. with no spaces in between
-#: ./cli/app/list.go:322 ./cli/app/move.go:34 ./cli/app/ps.go:205 ./cli/app/secret.go:553 ./cli/app/secret.go:649 ./cli/recipe/list.go:104 ./cli/recipe/upgrade.go:374 ./cli/recipe/version.go:139 ./cli/run.go:152 ./cli/server/list.go:106
+#: ./cli/app/list.go:319 ./cli/app/move.go:34 ./cli/app/ps.go:205 ./cli/app/secret.go:553 ./cli/app/secret.go:649 ./cli/recipe/list.go:104 ./cli/recipe/upgrade.go:374 ./cli/recipe/version.go:139 ./cli/run.go:152 ./cli/server/list.go:106
 msgid   "m"
 msgstr  ""
 
-#: ./cli/app/list.go:321 ./cli/app/ps.go:204 ./cli/app/secret.go:552 ./cli/app/secret.go:648 ./cli/recipe/list.go:103 ./cli/recipe/upgrade.go:373 ./cli/recipe/version.go:138 ./cli/server/list.go:105
+#: ./cli/app/list.go:318 ./cli/app/ps.go:204 ./cli/app/secret.go:552 ./cli/app/secret.go:648 ./cli/recipe/list.go:103 ./cli/recipe/upgrade.go:373 ./cli/recipe/version.go:138 ./cli/server/list.go:105
 msgid   "machine"
 msgstr  ""
 
@@ -3748,7 +3748,7 @@ msgstr  ""
 msgid   "no containers matching the %v filter found?"
 msgstr  ""
 
-#: ./cli/app/new.go:306 ./cli/internal/validate.go:129
+#: ./cli/app/new.go:302 ./cli/internal/validate.go:129
 msgid   "no domain provided"
 msgstr  ""
 
@@ -3801,7 +3801,7 @@ msgstr  ""
 msgid   "no secrets to remove?"
 msgstr  ""
 
-#: ./cli/app/new.go:355 ./cli/internal/validate.go:167
+#: ./cli/app/new.go:351 ./cli/internal/validate.go:167
 msgid   "no server provided"
 msgstr  ""
 
@@ -3864,11 +3864,11 @@ msgstr  ""
 msgid   "no volumes to remove"
 msgstr  ""
 
-#: ./cli/app/deploy.go:427 ./cli/app/rollback.go:368 ./cli/app/upgrade.go:477
+#: ./cli/app/deploy.go:437 ./cli/app/rollback.go:368 ./cli/app/upgrade.go:477
 msgid   "no-converge-checks"
 msgstr  ""
 
-#: ./cli/app/deploy.go:419 ./cli/app/rollback.go:360 ./cli/app/upgrade.go:469
+#: ./cli/app/deploy.go:429 ./cli/app/rollback.go:360 ./cli/app/upgrade.go:469
 msgid   "no-domain-checks"
 msgstr  ""
 
@@ -3936,7 +3936,7 @@ msgstr  ""
 #. with no spaces in between
 #. translators: `abra server prune` aliases. use a comma separated list of
 #. aliases with no spaces in between
-#: ./cli/app/backup.go:295 ./cli/app/new.go:395 ./cli/app/ps.go:29 ./cli/app/secret.go:561 ./cli/app/secret.go:585 ./cli/app/secret.go:625 ./cli/app/undeploy.go:169 ./cli/catalogue/catalogue.go:294 ./cli/recipe/list.go:112 ./cli/recipe/release.go:681 ./cli/server/prune.go:18
+#: ./cli/app/backup.go:295 ./cli/app/new.go:391 ./cli/app/ps.go:29 ./cli/app/secret.go:561 ./cli/app/secret.go:585 ./cli/app/secret.go:625 ./cli/app/undeploy.go:169 ./cli/catalogue/catalogue.go:294 ./cli/recipe/list.go:112 ./cli/recipe/release.go:681 ./cli/server/prune.go:18
 msgid   "p"
 msgstr  ""
 
@@ -3975,7 +3975,7 @@ msgstr  ""
 msgid   "parsing recipe version failed: %s"
 msgstr  ""
 
-#: ./cli/app/new.go:394 ./cli/app/secret.go:560 ./cli/app/secret.go:584 ./cli/app/secret.go:624
+#: ./cli/app/new.go:390 ./cli/app/secret.go:560 ./cli/app/secret.go:584 ./cli/app/secret.go:624
 msgid   "pass"
 msgstr  ""
 
@@ -3995,7 +3995,7 @@ msgstr  ""
 msgid   "pattern"
 msgstr  ""
 
-#: ./cli/app/deploy.go:414 ./cli/app/env.go:327 ./cli/app/remove.go:165 ./cli/app/rollback.go:355 ./cli/app/upgrade.go:464 ./cli/app/volume.go:219
+#: ./cli/app/deploy.go:424 ./cli/app/env.go:327 ./cli/app/remove.go:165 ./cli/app/rollback.go:355 ./cli/app/upgrade.go:464 ./cli/app/volume.go:219
 msgid   "perform action without further prompt"
 msgstr  ""
 
@@ -4046,7 +4046,7 @@ msgstr  ""
 msgid   "previous git tags detected, assuming new semver release"
 msgstr  ""
 
-#: ./cli/app/list.go:324 ./cli/app/ps.go:207 ./cli/app/secret.go:555 ./cli/app/secret.go:651 ./cli/recipe/list.go:106 ./cli/recipe/upgrade.go:376 ./cli/recipe/version.go:141 ./cli/server/list.go:108
+#: ./cli/app/list.go:321 ./cli/app/ps.go:207 ./cli/app/secret.go:555 ./cli/app/secret.go:651 ./cli/recipe/list.go:106 ./cli/recipe/upgrade.go:376 ./cli/recipe/version.go:141 ./cli/server/list.go:108
 msgid   "print machine-readable output"
 msgstr  ""
 
@@ -4116,7 +4116,7 @@ msgstr  ""
 #. with no spaces in between
 #. translators: `abra recipe` aliases. use a comma separated list of aliases
 #. with no spaces in between
-#: ./cli/app/backup.go:327 ./cli/app/list.go:307 ./cli/app/move.go:350 ./cli/app/run.go:23 ./cli/app/upgrade.go:486 ./cli/catalogue/catalogue.go:302 ./cli/recipe/recipe.go:12 ./cli/recipe/release.go:649 ./cli/recipe/sync.go:274
+#: ./cli/app/backup.go:327 ./cli/app/list.go:304 ./cli/app/move.go:350 ./cli/app/run.go:23 ./cli/app/upgrade.go:486 ./cli/catalogue/catalogue.go:302 ./cli/recipe/recipe.go:12 ./cli/recipe/release.go:649 ./cli/recipe/sync.go:274
 msgid   "r"
 msgstr  ""
 
@@ -4194,7 +4194,7 @@ msgid   "readme: %s, "
 msgstr  ""
 
 #. translators: `abra recipe` command for autocompletion
-#: ./cli/app/list.go:306 ./cli/app/list.go:313 ./cli/run.go:99
+#: ./cli/app/list.go:303 ./cli/app/list.go:310 ./cli/run.go:99
 msgid   "recipe"
 msgstr  ""
 
@@ -4536,7 +4536,7 @@ msgstr  ""
 msgid   "run command locally"
 msgstr  ""
 
-#: ./cli/app/deploy.go:271 ./cli/app/upgrade.go:293
+#: ./cli/app/deploy.go:281 ./cli/app/upgrade.go:293
 #, c-format
 msgid   "run the following post-deploy commands: %s"
 msgstr  ""
@@ -4579,7 +4579,7 @@ msgstr  ""
 #. aliases with no spaces in between
 #. translators: `abra server` aliases. use a comma separated list of aliases
 #. with no spaces in between
-#: ./cli/app/backup.go:198 ./cli/app/backup.go:263 ./cli/app/backup.go:287 ./cli/app/env.go:333 ./cli/app/list.go:330 ./cli/app/logs.go:101 ./cli/app/new.go:372 ./cli/app/restore.go:114 ./cli/app/secret.go:535 ./cli/catalogue/catalogue.go:27 ./cli/catalogue/catalogue.go:310 ./cli/recipe/fetch.go:130 ./cli/recipe/sync.go:28 ./cli/server/server.go:12
+#: ./cli/app/backup.go:198 ./cli/app/backup.go:263 ./cli/app/backup.go:287 ./cli/app/env.go:333 ./cli/app/list.go:327 ./cli/app/logs.go:101 ./cli/app/new.go:368 ./cli/app/restore.go:114 ./cli/app/secret.go:535 ./cli/catalogue/catalogue.go:27 ./cli/catalogue/catalogue.go:310 ./cli/recipe/fetch.go:130 ./cli/recipe/sync.go:28 ./cli/server/server.go:12
 msgid   "s"
 msgstr  ""
 
@@ -4621,12 +4621,12 @@ msgstr  ""
 msgid   "secret not found: %s"
 msgstr  ""
 
-#: ./cli/app/deploy.go:348
+#: ./cli/app/deploy.go:358
 #, c-format
 msgid   "secret not generated: %s"
 msgstr  ""
 
-#: ./cli/app/deploy.go:346
+#: ./cli/app/deploy.go:356
 #, c-format
 msgid   "secret not inserted (#generate=false): %s"
 msgstr  ""
@@ -4636,27 +4636,27 @@ msgstr  ""
 msgid   "secret: %s removed"
 msgstr  ""
 
-#: ./cli/app/backup.go:302 ./cli/app/new.go:402
+#: ./cli/app/backup.go:302 ./cli/app/new.go:398
 msgid   "secrets"
 msgstr  ""
 
-#: ./cli/app/new.go:242
+#: ./cli/app/new.go:238
 #, c-format
 msgid   "secrets are %s shown again, please save them %s"
 msgstr  ""
 
-#: ./cli/app/deploy.go:296
+#: ./cli/app/deploy.go:306
 #, c-format
 msgid   "selected latest recipe version: %s (from %d available versions)"
 msgstr  ""
 
-#: ./cli/app/new.go:125
+#: ./cli/app/new.go:121
 #, c-format
 msgid   "selected recipe version: %s (from %d available versions)"
 msgstr  ""
 
 #. translators: `abra server` command for autocompletion
-#: ./cli/app/env.go:332 ./cli/app/env.go:339 ./cli/app/list.go:329 ./cli/app/list.go:336 ./cli/app/new.go:371 ./cli/app/new.go:378 ./cli/run.go:101
+#: ./cli/app/env.go:332 ./cli/app/env.go:339 ./cli/app/list.go:326 ./cli/app/list.go:333 ./cli/app/new.go:367 ./cli/app/new.go:374 ./cli/run.go:101
 msgid   "server"
 msgstr  ""
 
@@ -4770,7 +4770,7 @@ msgstr  ""
 msgid   "severity"
 msgstr  ""
 
-#: ./cli/app/deploy.go:446 ./cli/app/rollback.go:379 ./cli/app/upgrade.go:496
+#: ./cli/app/deploy.go:456 ./cli/app/rollback.go:379 ./cli/app/upgrade.go:496
 msgid   "show all configs & images, including unchanged ones"
 msgstr  ""
 
@@ -4778,15 +4778,15 @@ msgstr  ""
 msgid   "show all paths"
 msgstr  ""
 
-#: ./cli/app/list.go:301
+#: ./cli/app/list.go:298
 msgid   "show app deployment status"
 msgstr  ""
 
-#: ./cli/app/list.go:309
+#: ./cli/app/list.go:306
 msgid   "show apps of a specific recipe"
 msgstr  ""
 
-#: ./cli/app/list.go:332
+#: ./cli/app/list.go:329
 msgid   "show apps of a specific server"
 msgstr  ""
 
@@ -4794,7 +4794,7 @@ msgstr  ""
 msgid   "show debug messages"
 msgstr  ""
 
-#: ./cli/app/deploy.go:443 ./cli/app/rollback.go:376 ./cli/app/upgrade.go:493
+#: ./cli/app/deploy.go:453 ./cli/app/rollback.go:376 ./cli/app/upgrade.go:493
 msgid   "show-unchanged"
 msgstr  ""
 
@@ -4802,7 +4802,7 @@ msgstr  ""
 msgid   "since"
 msgstr  ""
 
-#: ./cli/app/new.go:340
+#: ./cli/app/new.go:336
 #, c-format
 msgid   "single server detected, choosing %s automatically"
 msgstr  ""
@@ -4842,11 +4842,11 @@ msgstr  ""
 msgid   "skipping converge logic checks"
 msgstr  ""
 
-#: ./cli/app/deploy.go:198
+#: ./cli/app/deploy.go:208
 msgid   "skipping domain checks"
 msgstr  ""
 
-#: ./cli/app/deploy.go:195
+#: ./cli/app/deploy.go:205
 msgid   "skipping domain checks, no DOMAIN=... configured"
 msgstr  ""
 
@@ -4902,7 +4902,7 @@ msgstr  ""
 msgid   "specify secret value"
 msgstr  ""
 
-#: ./cli/app/new.go:374
+#: ./cli/app/new.go:370
 msgid   "specify server for new app"
 msgstr  ""
 
@@ -4943,7 +4943,7 @@ msgstr  ""
 msgid   "ssh: SSH_AUTH_SOCK missing, --publish/-p will fail. see \"abra catalogue generate --help\""
 msgstr  ""
 
-#: ./cli/app/list.go:298 ./cli/recipe/list.go:45
+#: ./cli/app/list.go:295 ./cli/recipe/list.go:45
 msgid   "status"
 msgstr  ""
 
@@ -4960,7 +4960,7 @@ msgstr  ""
 msgid   "store generated secrets in a local pass store"
 msgstr  ""
 
-#: ./cli/app/new.go:397
+#: ./cli/app/new.go:393
 msgid   "store secrets in a local pass store"
 msgstr  ""
 
@@ -5115,7 +5115,7 @@ msgstr  ""
 msgid   "trim input"
 msgstr  ""
 
-#: ./cli/app/new.go:267 ./pkg/app/app.go:141
+#: ./cli/app/new.go:263 ./pkg/app/app.go:141
 #, c-format
 msgid   "trimming %s to %s to avoid runtime limits"
 msgstr  ""
@@ -5153,7 +5153,7 @@ msgstr  ""
 msgid   "unable to clean up git clone of %s: %s"
 msgstr  ""
 
-#: ./cli/app/list.go:155
+#: ./cli/app/list.go:152
 #, c-format
 msgid   "unable to clone %s: %s"
 msgstr  ""
@@ -5192,6 +5192,11 @@ msgstr  ""
 msgid   "unable to delete tag %s: %s"
 msgstr  ""
 
+#: ./cli/app/deploy.go:113
+#, c-format
+msgid   "unable to determine if %s is a chaos commit: %s"
+msgstr  ""
+
 #: ./cli/app/env.go:191
 #, c-format
 msgid   "unable to determine recipe type from %s, env: %v"
@@ -5286,7 +5291,7 @@ msgstr  ""
 msgid   "unable to parse %s, skipping"
 msgstr  ""
 
-#: ./cli/app/list.go:170
+#: ./cli/app/list.go:167
 #, c-format
 msgid   "unable to parse %s, skipping as upgrade option"
 msgstr  ""
@@ -5296,6 +5301,11 @@ msgstr  ""
 msgid   "unable to parse '%s' value as bool: %s"
 msgstr  ""
 
+#: ./cli/app/deploy.go:117
+#, c-format
+msgid   "unable to parse deploy version: %s"
+msgstr  ""
+
 #: ./cli/run.go:176
 #, c-format
 msgid   "unable to proceed, %s does not exist?"
@@ -5366,7 +5376,7 @@ msgstr  ""
 msgid   "unable to retrieve container for %s: %s"
 msgstr  ""
 
-#: ./cli/app/list.go:160
+#: ./cli/app/list.go:157
 #, c-format
 msgid   "unable to retrieve tags for %s: %s"
 msgstr  ""
@@ -5460,7 +5470,7 @@ msgstr  ""
 msgid   "unimplemented call: SetWriteDeadline(%v)"
 msgstr  ""
 
-#: ./cli/app/labels.go:78 ./cli/app/list.go:123 ./cli/app/list.go:124 ./cli/app/list.go:125 ./cli/app/list.go:126 ./cli/app/list.go:187 ./cli/app/ps.go:125 ./cli/app/ps.go:126 ./cli/app/ps.go:127 ./cli/app/ps.go:128 ./cli/app/ps.go:129 ./cli/server/list.go:65 ./cli/server/list.go:77
+#: ./cli/app/labels.go:78 ./cli/app/list.go:120 ./cli/app/list.go:121 ./cli/app/list.go:122 ./cli/app/list.go:123 ./cli/app/list.go:184 ./cli/app/ps.go:125 ./cli/app/ps.go:126 ./cli/app/ps.go:127 ./cli/app/ps.go:128 ./cli/app/ps.go:129 ./cli/server/list.go:65 ./cli/server/list.go:77
 msgid   "unknown"
 msgstr  ""
 
@@ -5620,7 +5630,7 @@ msgstr  ""
 msgid   "version %s saved to %s.env"
 msgstr  ""
 
-#: ./cli/app/deploy.go:116
+#: ./cli/app/deploy.go:126
 #, c-format
 msgid   "version '%s' appears to be a chaos commit, but --chaos/-C was not provided"
 msgstr  ""
@@ -5648,27 +5658,27 @@ msgstr  ""
 msgid   "version wiped from %s.env"
 msgstr  ""
 
-#: ./cli/app/deploy.go:362
+#: ./cli/app/deploy.go:372
 #, c-format
 msgid   "version: taking chaos version: %s"
 msgstr  ""
 
-#: ./cli/app/deploy.go:388
+#: ./cli/app/deploy.go:398
 #, c-format
 msgid   "version: taking deployed version: %s"
 msgstr  ""
 
-#: ./cli/app/deploy.go:393
+#: ./cli/app/deploy.go:403
 #, c-format
 msgid   "version: taking new recipe version: %s"
 msgstr  ""
 
-#: ./cli/app/deploy.go:382
+#: ./cli/app/deploy.go:392
 #, c-format
 msgid   "version: taking version from .env file: %s"
 msgstr  ""
 
-#: ./cli/app/deploy.go:368
+#: ./cli/app/deploy.go:378
 #, c-format
 msgid   "version: taking version from cli arg: %s"
 msgstr  ""
@@ -5791,7 +5801,7 @@ msgstr  ""
 msgid   "writer: %v, "
 msgstr  ""
 
-#: ./cli/app/deploy.go:278 ./cli/app/new.go:255 ./cli/app/rollback.go:256 ./cli/app/undeploy.go:120 ./cli/app/upgrade.go:301
+#: ./cli/app/deploy.go:288 ./cli/app/new.go:251 ./cli/app/rollback.go:256 ./cli/app/undeploy.go:120 ./cli/app/upgrade.go:301
 #, c-format
 msgid   "writing recipe version failed: %s"
 msgstr  ""

tests/integration/app_deploy.bats

@@ -655,3 +655,17 @@ teardown(){
   assert_success
   refute_output --partial "1.0.0+6.3.1-95"
 }
+
+# bats test_tags=slow
+@test "unable to deploy borked tag" {
+  _remove_tags
+
+  run git -C "$ABRA_DIR/recipes/$TEST_RECIPE" tag \
+    -a "2.4.8_1" -m "feat: completely borked tag"
+  assert_success
+
+  run $ABRA app deploy "$TEST_APP_DOMAIN" "2.4.8_1" \
+    --no-input --no-converge-checks --debug
+  assert_failure
+  assert_output --partial "unable to parse"
+}

tests/integration/app_list.bats

@@ -190,13 +190,16 @@ teardown(){
 
 # bats test_tags=slow
 @test "list ignores borked tags" {
-  run git -C "$ABRA_DIR/recipes/$TEST_RECIPE" tag \
-    -a "2.4.8_1" -m "feat: completely borked tag"
+  run $ABRA app deploy "$TEST_APP_DOMAIN" \
+    --no-input --no-converge-checks
   assert_success
 
-  _deploy_app
+  # NOTE(d1): always upgradable tag which is also borked
+  run git -C "$ABRA_DIR/recipes/$TEST_RECIPE" tag \
+    -a "100.100.100_1_2_3" -m "feat: completely borked tag"
+  assert_success
 
   run $ABRA app ls --status --debug
   assert_success
-  assert_output --partial "unable to parse 2.4.8_1"
+  assert_output --partial "unable to parse"
 }