diff --git a/Makefile b/Makefile index 5df9ce2421..4a6163eb78 100644 --- a/Makefile +++ b/Makefile @@ -12,8 +12,7 @@ LINGUAS := $(basename $(POFILES)) export GOPRIVATE=coopcloud.tech -# NOTE(d1): default `make` optimised for Abra hacking -all: format check build-abra test +all: format check build run: @go run -gcflags=$(GCFLAGS) -ldflags=$(LDFLAGS) $(ABRA) diff --git a/cli/app/deploy.go b/cli/app/deploy.go index 228cbe4d35..23541fdd64 100644 --- a/cli/app/deploy.go +++ b/cli/app/deploy.go @@ -158,7 +158,6 @@ checkout as-is. Recipe commit hashes are also supported as values for if internal.Chaos { appPkg.SetChaosVersionLabel(compose, stackName, toDeployVersion) } - appPkg.SetUpdateLabel(compose, stackName, app.Env) versionLabel := toDeployVersion if internal.Chaos { diff --git a/cli/app/list.go b/cli/app/list.go index 26b58711e4..2c4bf52107 100644 --- a/cli/app/list.go +++ b/cli/app/list.go @@ -25,7 +25,6 @@ type appStatus struct { Status string `json:"status"` Chaos string `json:"chaos"` ChaosVersion string `json:"chaosVersion"` - AutoUpdate string `json:"autoUpdate"` Version string `json:"version"` Upgrade string `json:"upgrade"` } @@ -118,7 +117,6 @@ Use "--status/-S" flag to query all servers for the live deployment status.`), version := i18n.G("unknown") chaos := i18n.G("unknown") chaosVersion := i18n.G("unknown") - autoUpdate := i18n.G("unknown") if statusMeta, ok := statuses[app.StackName()]; ok { if currentVersion, exists := statusMeta["version"]; exists { if currentVersion != "" { @@ -131,9 +129,6 @@ Use "--status/-S" flag to query all servers for the live deployment status.`), if chaosDeployVersion, exists := statusMeta["chaosVersion"]; exists { chaosVersion = chaosDeployVersion } - if autoUpdateState, exists := statusMeta["autoUpdate"]; exists { - autoUpdate = autoUpdateState - } if statusMeta["status"] != "" { status = statusMeta["status"] } @@ -146,7 +141,6 @@ Use "--status/-S" flag to query all servers for the live deployment status.`), appStats.Chaos = chaos appStats.ChaosVersion = chaosVersion appStats.Version = version - appStats.AutoUpdate = autoUpdate var newUpdates []string if version != "unknown" && chaos == "false" { @@ -231,7 +225,6 @@ Use "--status/-S" flag to query all servers for the live deployment status.`), i18n.G("CHAOS"), i18n.G("VERSION"), i18n.G("UPGRADE"), - i18n.G("AUTOUPDATE"), }..., ) } @@ -262,8 +255,7 @@ Use "--status/-S" flag to query all servers for the live deployment status.`), appStat.Status, chaosStatus, appStat.Version, - appStat.Upgrade, - appStat.AutoUpdate}..., + appStat.Upgrade}..., ) } diff --git a/cli/app/rollback.go b/cli/app/rollback.go index 56b87f6707..921a338fa3 100644 --- a/cli/app/rollback.go +++ b/cli/app/rollback.go @@ -183,7 +183,6 @@ beforehand. See "abra app backup" for more.`), if internal.Chaos { appPkg.SetChaosVersionLabel(compose, stackName, chosenDowngrade) } - appPkg.SetUpdateLabel(compose, stackName, app.Env) // Gather secrets secretInfo, err := deploy.GatherSecretsForDeploy(cl, app, internal.ShowUnchanged) diff --git a/cli/app/upgrade.go b/cli/app/upgrade.go index e0817606a4..daaf232da8 100644 --- a/cli/app/upgrade.go +++ b/cli/app/upgrade.go @@ -196,7 +196,6 @@ beforehand. See "abra app backup" for more.`), if internal.Chaos { appPkg.SetChaosVersionLabel(compose, stackName, chosenUpgrade) } - appPkg.SetUpdateLabel(compose, stackName, app.Env) envVars, err := appPkg.CheckEnv(app) if err != nil { diff --git a/pkg/app/app.go b/pkg/app/app.go index a2ffe46a32..c094db9a89 100644 --- a/pkg/app/app.go +++ b/pkg/app/app.go @@ -471,13 +471,6 @@ func GetAppStatuses(apps []App, MachineReadable bool) (map[string]map[string]str result["chaosVersion"] = chaosVersion } - labelKey = fmt.Sprintf("coop-cloud.%s.autoupdate", name) - if autoUpdate, ok := service.Spec.Labels[labelKey]; ok { - result["autoUpdate"] = autoUpdate - } else { - result["autoUpdate"] = "false" - } - labelKey = fmt.Sprintf("coop-cloud.%s.version", name) if version, ok := service.Spec.Labels[labelKey]; ok { result["version"] = version diff --git a/pkg/app/compose.go b/pkg/app/compose.go index 781d5877d8..82066c4c2e 100644 --- a/pkg/app/compose.go +++ b/pkg/app/compose.go @@ -5,7 +5,6 @@ import ( "fmt" "strconv" - "coopcloud.tech/abra/pkg/envfile" "coopcloud.tech/abra/pkg/i18n" "coopcloud.tech/abra/pkg/log" composetypes "github.com/docker/cli/cli/compose/types" @@ -56,23 +55,6 @@ func SetVersionLabel(compose *composetypes.Config, stackName string, version str } } -// SetUpdateLabel adds env ENABLE_AUTO_UPDATE as label to enable/disable the -// auto update process for this app. The default if this variable is not set is to disable -// the auto update process. -func SetUpdateLabel(compose *composetypes.Config, stackName string, appEnv envfile.AppEnv) { - for _, service := range compose.Services { - if service.Name == "app" { - enable_auto_update, exists := appEnv["ENABLE_AUTO_UPDATE"] - if !exists { - enable_auto_update = "false" - } - log.Debug(i18n.G("set label 'coop-cloud.%s.autoupdate' to %s for %s", stackName, enable_auto_update, stackName)) - labelKey := fmt.Sprintf("coop-cloud.%s.autoupdate", stackName) - service.Deploy.Labels[labelKey] = enable_auto_update - } - } -} - // GetLabel reads docker labels in the format of "coop-cloud.${STACK_NAME}.${LABEL}" from the local compose files func GetLabel(compose *composetypes.Config, stackName string, label string) string { for _, service := range compose.Services { diff --git a/pkg/i18n/locales/abra.pot b/pkg/i18n/locales/abra.pot index 69c4ef8720..495a430dc3 100644 --- a/pkg/i18n/locales/abra.pot +++ b/pkg/i18n/locales/abra.pot @@ -7,7 +7,7 @@ msgid "" msgstr "Project-Id-Version: \n" "Report-Msgid-Bugs-To: EMAIL\n" - "POT-Creation-Date: 2025-10-19 15:32+0200\n" + "POT-Creation-Date: 2025-10-19 15:46+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -65,7 +65,7 @@ msgid " # insert regular secret\n" " echo \"mmySuperSecret\" | abra app secret insert 1312.net my_secret v1" msgstr "" -#: ./cli/app/list.go:55 +#: ./cli/app/list.go:54 msgid " # list apps of all servers without live status\n" " abra app ls\n" "\n" @@ -331,17 +331,17 @@ msgstr "" msgid "%s is missing the TYPE env var?" msgstr "" -#: ./cli/app/rollback.go:306 ./cli/app/rollback.go:310 +#: ./cli/app/rollback.go:305 ./cli/app/rollback.go:309 #, c-format msgid "%s is not a downgrade for %s?" msgstr "" -#: ./cli/app/upgrade.go:427 ./cli/app/upgrade.go:431 +#: ./cli/app/upgrade.go:426 ./cli/app/upgrade.go:430 #, c-format msgid "%s is not an upgrade for %s?" msgstr "" -#: ./cli/app/logs.go:65 ./cli/app/ps.go:62 ./cli/app/restart.go:100 ./cli/app/services.go:55 ./cli/app/undeploy.go:65 ./cli/app/upgrade.go:448 +#: ./cli/app/logs.go:65 ./cli/app/ps.go:62 ./cli/app/restart.go:100 ./cli/app/services.go:55 ./cli/app/undeploy.go:65 ./cli/app/upgrade.go:447 #, c-format msgid "%s is not deployed?" msgstr "" @@ -356,7 +356,7 @@ msgstr "" msgid "%s is still deployed. Run \"abra app undeploy %s\"" msgstr "" -#: ./cli/app/deploy.go:183 ./cli/app/upgrade.go:209 +#: ./cli/app/deploy.go:182 ./cli/app/upgrade.go:208 #, c-format msgid "%s missing from %s.env" msgstr "" @@ -466,7 +466,7 @@ msgstr "" msgid "%s: %s β†’ %s" msgstr "" -#: ./pkg/app/app.go:521 +#: ./pkg/app/app.go:514 #, c-format msgid "%s: %s: %s" msgstr "" @@ -531,12 +531,12 @@ msgstr "" msgid "%s: waiting %d seconds before next retry" msgstr "" -#: ./cli/app/upgrade.go:422 +#: ./cli/app/upgrade.go:421 #, c-format msgid "'%s' is not a known version" msgstr "" -#: ./cli/app/rollback.go:301 ./cli/app/upgrade.go:417 +#: ./cli/app/rollback.go:300 ./cli/app/upgrade.go:416 #, c-format msgid "'%s' is not a known version for %s" msgstr "" @@ -575,10 +575,6 @@ msgstr "" msgid "ALERTA ALERTA: deleting %s data and config (local/remote)" msgstr "" -#: ./cli/app/list.go:234 -msgid "AUTOUPDATE" -msgstr "" - #. translators: Short description for `server add` command #: ./cli/server/add.go:30 msgid "Add a new server" @@ -607,11 +603,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:394 ./cli/app/labels.go:143 ./cli/app/new.go:397 ./cli/app/ps.go:213 ./cli/app/restart.go:162 ./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:393 ./cli/app/labels.go:143 ./cli/app/new.go:397 ./cli/app/ps.go:213 ./cli/app/restart.go:162 ./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:231 ./cli/app/ps.go:189 +#: ./cli/app/list.go:225 ./cli/app/ps.go:189 msgid "CHAOS" msgstr "" @@ -748,7 +744,7 @@ msgid "Creates a new app from a default recipe.\n" "on your $PATH." msgstr "" -#: ./cli/app/deploy.go:410 ./cli/app/new.go:373 ./cli/app/rollback.go:358 ./cli/app/upgrade.go:468 +#: ./cli/app/deploy.go:409 ./cli/app/new.go:373 ./cli/app/rollback.go:357 ./cli/app/upgrade.go:467 msgid "D" msgstr "" @@ -760,7 +756,7 @@ msgstr "" msgid "DEPLOYED LABELS" msgstr "" -#: ./cli/app/list.go:227 ./cli/internal/deploy.go:78 ./cli/internal/deploy.go:208 +#: ./cli/app/list.go:221 ./cli/internal/deploy.go:78 ./cli/internal/deploy.go:208 msgid "DOMAIN" msgstr "" @@ -853,7 +849,7 @@ msgid "Generate a new copy of the recipe catalogue.\n" " ssh-add ~/.ssh/" msgstr "" -#: ./cli/app/list.go:52 +#: ./cli/app/list.go:51 msgid "Generate a report of all managed apps.\n" "\n" "Use \"--status/-S\" flag to query all servers for the live deployment status." @@ -949,7 +945,7 @@ msgid "List all available commands" msgstr "" #. translators: Short description for `app list` command -#: ./cli/app/list.go:51 +#: ./cli/app/list.go:50 msgid "List all managed apps" msgstr "" @@ -1107,7 +1103,7 @@ msgstr "" msgid "README.md metadata filled in" msgstr "" -#: ./cli/app/list.go:227 ./cli/internal/deploy.go:79 ./cli/internal/deploy.go:209 +#: ./cli/app/list.go:221 ./cli/internal/deploy.go:79 ./cli/internal/deploy.go:209 msgid "RECIPE" msgstr "" @@ -1223,7 +1219,7 @@ msgstr "" msgid "Run app commands" msgstr "" -#: ./cli/app/backup.go:303 ./cli/app/list.go:300 ./cli/app/logs.go:109 ./cli/app/new.go:389 +#: ./cli/app/backup.go:303 ./cli/app/list.go:292 ./cli/app/logs.go:109 ./cli/app/new.go:389 msgid "S" msgstr "" @@ -1235,7 +1231,7 @@ msgstr "" msgid "SECRETS OVERVIEW" msgstr "" -#: ./cli/app/list.go:227 ./cli/internal/deploy.go:80 +#: ./cli/app/list.go:221 ./cli/internal/deploy.go:80 msgid "SERVER" msgstr "" @@ -1260,7 +1256,7 @@ msgstr "" msgid "SSO" msgstr "" -#: ./cli/app/list.go:230 ./cli/app/ps.go:186 +#: ./cli/app/list.go:224 ./cli/app/ps.go:186 msgid "STATUS" msgstr "" @@ -1438,7 +1434,7 @@ msgid "To load completions:\n" " # and source this file from your PowerShell profile." msgstr "" -#: ./cli/app/deploy.go:434 ./cli/app/rollback.go:374 ./cli/app/upgrade.go:492 +#: ./cli/app/deploy.go:433 ./cli/app/rollback.go:373 ./cli/app/upgrade.go:491 msgid "U" msgstr "" @@ -1450,7 +1446,7 @@ msgstr "" msgid "UNDEPLOY" msgstr "" -#: ./cli/app/list.go:233 ./cli/internal/deploy.go:174 +#: ./cli/app/list.go:227 ./cli/internal/deploy.go:174 msgid "UPGRADE" msgstr "" @@ -1548,7 +1544,7 @@ msgstr "" msgid "VALUE" msgstr "" -#: ./cli/app/list.go:232 ./cli/app/ps.go:188 ./cli/app/secret.go:481 ./cli/recipe/version.go:69 ./cli/recipe/version.go:110 +#: ./cli/app/list.go:226 ./cli/app/ps.go:188 ./cli/app/secret.go:481 ./cli/recipe/version.go:69 ./cli/recipe/version.go:110 msgid "VERSION" msgstr "" @@ -1725,7 +1721,7 @@ msgstr "" msgid "add release note? (leave empty to skip)" msgstr "" -#: ./pkg/app/app.go:515 +#: ./pkg/app/app.go:508 #, c-format msgid "adding env vars to %s service config" msgstr "" @@ -1809,7 +1805,7 @@ msgstr "" msgid "attempting to run %s" msgstr "" -#: ./cli/app/deploy.go:271 ./cli/app/upgrade.go:294 +#: ./cli/app/deploy.go:270 ./cli/app/upgrade.go:293 #, c-format msgid "attempting to run post deploy commands, saw: %s" msgstr "" @@ -1889,7 +1885,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:418 ./cli/app/rollback.go:366 ./cli/app/upgrade.go:476 +#: ./cli/app/backup.go:148 ./cli/app/cp.go:30 ./cli/app/deploy.go:417 ./cli/app/rollback.go:365 ./cli/app/upgrade.go:475 msgid "c" msgstr "" @@ -1945,7 +1941,7 @@ msgstr "" msgid "cannot redeploy previous chaos version (%s), did you mean to use \"--chaos\"?" msgstr "" -#: ./cli/app/deploy.go:368 +#: ./cli/app/deploy.go:367 #, 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\"" @@ -1964,7 +1960,7 @@ msgstr "" msgid "cannot use '[secret] [version]' and '--all' together" msgstr "" -#: ./cli/app/deploy.go:310 +#: ./cli/app/deploy.go:309 msgid "cannot use --chaos and --latest together" msgstr "" @@ -1988,11 +1984,11 @@ msgstr "" msgid "cannot use [service] and --all-services/-a together" msgstr "" -#: ./cli/app/deploy.go:302 ./cli/app/new.go:76 +#: ./cli/app/deploy.go:301 ./cli/app/new.go:76 msgid "cannot use [version] and --chaos together" msgstr "" -#: ./cli/app/deploy.go:306 +#: ./cli/app/deploy.go:305 msgid "cannot use [version] and --latest together" msgstr "" @@ -2024,7 +2020,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:393 ./cli/app/labels.go:142 ./cli/app/new.go:396 ./cli/app/ps.go:212 ./cli/app/restart.go:161 ./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:392 ./cli/app/labels.go:142 ./cli/app/new.go:396 ./cli/app/ps.go:212 ./cli/app/restart.go:161 ./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 "" @@ -2033,7 +2029,7 @@ msgstr "" msgid "check [flags]" msgstr "" -#: ./cli/app/deploy.go:94 ./cli/app/undeploy.go:57 ./cli/app/upgrade.go:440 +#: ./cli/app/deploy.go:94 ./cli/app/undeploy.go:57 ./cli/app/upgrade.go:439 #, c-format msgid "checking whether %s is already deployed" msgstr "" @@ -2315,7 +2311,7 @@ msgstr "" msgid "critical errors present in %s config" msgstr "" -#: ./cli/app/rollback.go:296 +#: ./cli/app/rollback.go:295 #, c-format msgid "current deployment '%s' is not a known version for %s" msgstr "" @@ -2367,7 +2363,7 @@ msgstr "" msgid "deploy labels stanza present" msgstr "" -#: ./cli/app/deploy.go:428 +#: ./cli/app/deploy.go:427 msgid "deploy latest recipe version" msgstr "" @@ -2469,11 +2465,11 @@ msgstr "" msgid "dirty: %v, " msgstr "" -#: ./cli/app/deploy.go:420 ./cli/app/rollback.go:368 ./cli/app/upgrade.go:478 +#: ./cli/app/deploy.go:419 ./cli/app/rollback.go:367 ./cli/app/upgrade.go:477 msgid "disable converge logic checks" msgstr "" -#: ./cli/app/deploy.go:412 ./cli/app/rollback.go:360 ./cli/app/upgrade.go:470 +#: ./cli/app/deploy.go:411 ./cli/app/rollback.go:359 ./cli/app/upgrade.go:469 msgid "disable public DNS checks" msgstr "" @@ -2691,7 +2687,7 @@ msgstr "" #. translators: `abra recipe fetch` aliases. use a comma separated list of aliases #. with no spaces in between -#: ./cli/app/deploy.go:402 ./cli/app/remove.go:163 ./cli/app/rollback.go:350 ./cli/app/secret.go:593 ./cli/app/upgrade.go:460 ./cli/app/volume.go:217 ./cli/recipe/fetch.go:20 ./cli/recipe/fetch.go:138 +#: ./cli/app/deploy.go:401 ./cli/app/remove.go:163 ./cli/app/rollback.go:349 ./cli/app/secret.go:593 ./cli/app/upgrade.go:459 ./cli/app/volume.go:217 ./cli/recipe/fetch.go:20 ./cli/recipe/fetch.go:138 msgid "f" msgstr "" @@ -2917,7 +2913,7 @@ msgstr "" msgid "filter by recipe" msgstr "" -#: ./cli/app/deploy.go:401 ./cli/app/remove.go:162 ./cli/app/rollback.go:349 ./cli/app/upgrade.go:459 ./cli/app/volume.go:216 ./cli/recipe/fetch.go:137 +#: ./cli/app/deploy.go:400 ./cli/app/remove.go:162 ./cli/app/rollback.go:348 ./cli/app/upgrade.go:458 ./cli/app/volume.go:216 ./cli/recipe/fetch.go:137 msgid "force" msgstr "" @@ -2976,7 +2972,7 @@ msgstr "" msgid "generated secrets %s shown again, please take note of them %s" msgstr "" -#: ./pkg/app/compose.go:81 +#: ./pkg/app/compose.go:63 #, c-format msgid "get label '%s'" msgstr "" @@ -3131,7 +3127,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:396 ./cli/app/labels.go:145 ./cli/app/new.go:399 ./cli/app/ps.go:215 ./cli/app/restart.go:164 ./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:395 ./cli/app/labels.go:145 ./cli/app/new.go:399 ./cli/app/ps.go:215 ./cli/app/restart.go:164 ./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 "" @@ -3314,7 +3310,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:426 ./cli/app/logs.go:20 ./cli/recipe/lint.go:17 ./cli/server/add.go:207 +#: ./cli/app/cmd.go:261 ./cli/app/deploy.go:425 ./cli/app/logs.go:20 ./cli/recipe/lint.go:17 ./cli/server/add.go:207 msgid "l" msgstr "" @@ -3323,7 +3319,7 @@ msgstr "" msgid "labels [flags]" msgstr "" -#: ./cli/app/deploy.go:425 ./cli/app/list.go:188 +#: ./cli/app/deploy.go:424 ./cli/app/list.go:182 msgid "latest" msgstr "" @@ -3372,7 +3368,7 @@ msgstr "" #. translators: `app list` command #. translators: `server list` command -#: ./cli/app/list.go:48 ./cli/server/list.go:23 +#: ./cli/app/list.go:47 ./cli/server/list.go:23 msgid "list [flags]" msgstr "" @@ -3438,7 +3434,7 @@ msgstr "" #. aliases with no spaces in between #. translators: `abra server list` aliases. use a comma separated list of #. aliases with no spaces in between -#: ./cli/app/backup.go:17 ./cli/app/cmd.go:203 ./cli/app/list.go:44 ./cli/app/secret.go:453 ./cli/app/volume.go:21 ./cli/recipe/list.go:19 ./cli/server/list.go:19 +#: ./cli/app/backup.go:17 ./cli/app/cmd.go:203 ./cli/app/list.go:43 ./cli/app/secret.go:453 ./cli/app/volume.go:21 ./cli/recipe/list.go:19 ./cli/server/list.go:19 msgid "ls" msgstr "" @@ -3446,11 +3442,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:323 ./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:376 ./cli/recipe/version.go:139 ./cli/run.go:152 ./cli/server/list.go:106 +#: ./cli/app/list.go:315 ./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:376 ./cli/recipe/version.go:139 ./cli/run.go:152 ./cli/server/list.go:106 msgid "m" msgstr "" -#: ./cli/app/list.go:322 ./cli/app/ps.go:204 ./cli/app/secret.go:552 ./cli/app/secret.go:648 ./cli/recipe/list.go:103 ./cli/recipe/upgrade.go:375 ./cli/recipe/version.go:138 ./cli/server/list.go:105 +#: ./cli/app/list.go:314 ./cli/app/ps.go:204 ./cli/app/secret.go:552 ./cli/app/secret.go:648 ./cli/recipe/list.go:103 ./cli/recipe/upgrade.go:375 ./cli/recipe/version.go:138 ./cli/server/list.go:105 msgid "machine" msgstr "" @@ -3602,7 +3598,7 @@ msgstr "" msgid "no %s exists, skipping reading gitignore paths" msgstr "" -#: ./pkg/app/compose.go:87 +#: ./pkg/app/compose.go:69 #, c-format msgid "no %s label found for %s" msgstr "" @@ -3770,11 +3766,11 @@ msgstr "" msgid "no volumes to remove" msgstr "" -#: ./cli/app/deploy.go:417 ./cli/app/rollback.go:365 ./cli/app/upgrade.go:475 +#: ./cli/app/deploy.go:416 ./cli/app/rollback.go:364 ./cli/app/upgrade.go:474 msgid "no-converge-checks" msgstr "" -#: ./cli/app/deploy.go:409 ./cli/app/rollback.go:357 ./cli/app/upgrade.go:467 +#: ./cli/app/deploy.go:408 ./cli/app/rollback.go:356 ./cli/app/upgrade.go:466 msgid "no-domain-checks" msgstr "" @@ -3830,7 +3826,7 @@ msgstr "" msgid "only show errors" msgstr "" -#: ./cli/app/upgrade.go:486 +#: ./cli/app/upgrade.go:485 msgid "only show release notes" msgstr "" @@ -3861,22 +3857,22 @@ msgstr "" msgid "parsed following command arguments: %s" msgstr "" -#: ./cli/app/upgrade.go:343 +#: ./cli/app/upgrade.go:342 #, c-format msgid "parsing chosen upgrade version failed: %s" msgstr "" -#: ./cli/app/upgrade.go:387 +#: ./cli/app/upgrade.go:386 #, c-format msgid "parsing deployed version failed: %s" msgstr "" -#: ./cli/app/upgrade.go:348 +#: ./cli/app/upgrade.go:347 #, c-format msgid "parsing deployment version failed: %s" msgstr "" -#: ./cli/app/upgrade.go:354 ./cli/app/upgrade.go:393 +#: ./cli/app/upgrade.go:353 ./cli/app/upgrade.go:392 #, c-format msgid "parsing recipe version failed: %s" msgstr "" @@ -3901,7 +3897,7 @@ msgstr "" msgid "pattern" msgstr "" -#: ./cli/app/deploy.go:404 ./cli/app/remove.go:165 ./cli/app/rollback.go:352 ./cli/app/upgrade.go:462 ./cli/app/volume.go:219 +#: ./cli/app/deploy.go:403 ./cli/app/remove.go:165 ./cli/app/rollback.go:351 ./cli/app/upgrade.go:461 ./cli/app/volume.go:219 msgid "perform action without further prompt" msgstr "" @@ -3910,22 +3906,22 @@ msgstr "" msgid "please fix your synced label for %s and re-run this command" msgstr "" -#: ./cli/app/rollback.go:264 +#: ./cli/app/rollback.go:263 #, c-format msgid "please select a downgrade (version: %s):" msgstr "" -#: ./cli/app/rollback.go:269 +#: ./cli/app/rollback.go:268 #, c-format msgid "please select a downgrade (version: %s, chaos: %s):" msgstr "" -#: ./cli/app/upgrade.go:310 +#: ./cli/app/upgrade.go:309 #, c-format msgid "please select an upgrade (version: %s):" msgstr "" -#: ./cli/app/upgrade.go:315 +#: ./cli/app/upgrade.go:314 #, c-format msgid "please select an upgrade (version: %s, chaos: %s):" msgstr "" @@ -3946,7 +3942,7 @@ msgstr "" msgid "previous git tags detected, assuming new semver release" msgstr "" -#: ./cli/app/list.go:325 ./cli/app/ps.go:207 ./cli/app/secret.go:555 ./cli/app/secret.go:651 ./cli/recipe/list.go:106 ./cli/recipe/upgrade.go:378 ./cli/recipe/version.go:141 ./cli/server/list.go:108 +#: ./cli/app/list.go:317 ./cli/app/ps.go:207 ./cli/app/secret.go:555 ./cli/app/secret.go:651 ./cli/recipe/list.go:106 ./cli/recipe/upgrade.go:378 ./cli/recipe/version.go:141 ./cli/server/list.go:108 msgid "print machine-readable output" msgstr "" @@ -4006,7 +4002,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:308 ./cli/app/move.go:346 ./cli/app/run.go:23 ./cli/app/upgrade.go:484 ./cli/catalogue/catalogue.go:302 ./cli/recipe/recipe.go:12 ./cli/recipe/release.go:649 ./cli/recipe/sync.go:272 +#: ./cli/app/backup.go:327 ./cli/app/list.go:300 ./cli/app/move.go:346 ./cli/app/run.go:23 ./cli/app/upgrade.go:483 ./cli/catalogue/catalogue.go:302 ./cli/recipe/recipe.go:12 ./cli/recipe/release.go:649 ./cli/recipe/sync.go:272 msgid "r" msgstr "" @@ -4021,12 +4017,12 @@ msgstr "" msgid "read %s as tags for recipe %s" msgstr "" -#: ./pkg/app/app.go:582 ./pkg/config/env.go:50 ./pkg/envfile/envfile.go:42 ./pkg/envfile/envfile.go:80 +#: ./pkg/app/app.go:575 ./pkg/config/env.go:50 ./pkg/envfile/envfile.go:42 ./pkg/envfile/envfile.go:80 #, c-format msgid "read %s from %s" msgstr "" -#: ./pkg/app/app.go:584 +#: ./pkg/app/app.go:577 #, c-format msgid "read 0 command names from %s" msgstr "" @@ -4084,7 +4080,7 @@ msgid "readme: %s, " msgstr "" #. translators: `abra recipe` command for autocompletion -#: ./cli/app/list.go:307 ./cli/app/list.go:314 ./cli/run.go:99 +#: ./cli/app/list.go:299 ./cli/app/list.go:306 ./cli/run.go:99 msgid "recipe" msgstr "" @@ -4122,7 +4118,7 @@ msgstr "" msgid "release [version] [flags]" msgstr "" -#: ./cli/app/upgrade.go:483 +#: ./cli/app/upgrade.go:482 msgid "releasenotes" msgstr "" @@ -4324,7 +4320,7 @@ msgstr "" msgid "retrieved %s configs for %s" msgstr "" -#: ./pkg/app/app.go:506 +#: ./pkg/app/app.go:499 #, c-format msgid "retrieved %s for %s" msgstr "" @@ -4339,7 +4335,7 @@ msgstr "" msgid "retrieved %v servers: %s" msgstr "" -#: ./pkg/app/app.go:492 +#: ./pkg/app/app.go:485 #, c-format msgid "retrieved app statuses: %s" msgstr "" @@ -4421,7 +4417,7 @@ msgstr "" msgid "run command locally" msgstr "" -#: ./cli/app/deploy.go:269 ./cli/app/upgrade.go:291 +#: ./cli/app/deploy.go:268 ./cli/app/upgrade.go:290 #, c-format msgid "run the following post-deploy commands: %s" msgstr "" @@ -4464,7 +4460,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/list.go:331 ./cli/app/logs.go:101 ./cli/app/new.go:358 ./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:24 ./cli/server/server.go:12 +#: ./cli/app/backup.go:198 ./cli/app/backup.go:263 ./cli/app/backup.go:287 ./cli/app/list.go:323 ./cli/app/logs.go:101 ./cli/app/new.go:358 ./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:24 ./cli/server/server.go:12 msgid "s" msgstr "" @@ -4506,12 +4502,12 @@ msgstr "" msgid "secret not found: %s" msgstr "" -#: ./cli/app/deploy.go:338 +#: ./cli/app/deploy.go:337 #, c-format msgid "secret not generated: %s" msgstr "" -#: ./cli/app/deploy.go:336 +#: ./cli/app/deploy.go:335 #, c-format msgid "secret not inserted (#generate=false): %s" msgstr "" @@ -4531,7 +4527,7 @@ msgid "secrets are %s shown again, please save them %s" msgstr "" #. translators: `abra server` command for autocompletion -#: ./cli/app/list.go:330 ./cli/app/list.go:337 ./cli/app/new.go:357 ./cli/app/new.go:364 ./cli/run.go:101 +#: ./cli/app/list.go:322 ./cli/app/list.go:329 ./cli/app/new.go:357 ./cli/app/new.go:364 ./cli/run.go:101 msgid "server" msgstr "" @@ -4602,27 +4598,22 @@ msgstr "" msgid "set 'main' as the default branch" msgstr "" -#: ./pkg/app/compose.go:69 -#, c-format -msgid "set label 'coop-cloud.%s.autoupdate' to %s for %s" -msgstr "" - -#: ./pkg/app/compose.go:31 +#: ./pkg/app/compose.go:30 #, c-format msgid "set label 'coop-cloud.%s.chaos' to %v for %s" msgstr "" -#: ./pkg/app/compose.go:42 +#: ./pkg/app/compose.go:41 #, c-format msgid "set label 'coop-cloud.%s.chaos-version' to %v for %s" msgstr "" -#: ./pkg/app/compose.go:52 +#: ./pkg/app/compose.go:51 #, c-format msgid "set label 'coop-cloud.%s.version' to %v for %s" msgstr "" -#: ./pkg/app/compose.go:19 +#: ./pkg/app/compose.go:18 #, c-format msgid "set recipe label 'coop-cloud.%s.recipe' to %s for %s" msgstr "" @@ -4636,7 +4627,7 @@ msgstr "" msgid "severity" msgstr "" -#: ./cli/app/deploy.go:436 ./cli/app/rollback.go:376 ./cli/app/upgrade.go:494 +#: ./cli/app/deploy.go:435 ./cli/app/rollback.go:375 ./cli/app/upgrade.go:493 msgid "show all configs & images, including unchanged ones" msgstr "" @@ -4644,15 +4635,15 @@ msgstr "" msgid "show all paths" msgstr "" -#: ./cli/app/list.go:302 +#: ./cli/app/list.go:294 msgid "show app deployment status" msgstr "" -#: ./cli/app/list.go:310 +#: ./cli/app/list.go:302 msgid "show apps of a specific recipe" msgstr "" -#: ./cli/app/list.go:333 +#: ./cli/app/list.go:325 msgid "show apps of a specific server" msgstr "" @@ -4660,7 +4651,7 @@ msgstr "" msgid "show debug messages" msgstr "" -#: ./cli/app/deploy.go:433 ./cli/app/rollback.go:373 ./cli/app/upgrade.go:491 +#: ./cli/app/deploy.go:432 ./cli/app/rollback.go:372 ./cli/app/upgrade.go:490 msgid "show-unchanged" msgstr "" @@ -4708,11 +4699,11 @@ msgstr "" msgid "skipping converge logic checks" msgstr "" -#: ./cli/app/deploy.go:197 +#: ./cli/app/deploy.go:196 msgid "skipping domain checks" msgstr "" -#: ./cli/app/deploy.go:194 +#: ./cli/app/deploy.go:193 msgid "skipping domain checks, no DOMAIN=... configured" msgstr "" @@ -4721,12 +4712,12 @@ msgstr "" msgid "skipping generation of %s (generate=false)" msgstr "" -#: ./pkg/app/app.go:690 +#: ./pkg/app/app.go:683 #, c-format msgid "skipping version %s write as already exists in %s.env" msgstr "" -#: ./pkg/app/app.go:684 +#: ./pkg/app/app.go:677 #, c-format msgid "skipping writing version %s because dry run" msgstr "" @@ -4789,7 +4780,7 @@ msgstr "" msgid "ssh: SSH_AUTH_SOCK missing, --publish/-p will fail. see \"abra catalogue generate --help\"" msgstr "" -#: ./cli/app/list.go:299 ./cli/recipe/list.go:45 +#: ./cli/app/list.go:291 ./cli/recipe/list.go:45 msgid "status" msgstr "" @@ -4910,7 +4901,7 @@ msgstr "" msgid "timed out on undeploy (timeout=%v sec)" msgstr "" -#: ./pkg/app/compose.go:98 +#: ./pkg/app/compose.go:80 #, c-format msgid "timeout label: %s" msgstr "" @@ -4999,7 +4990,7 @@ msgstr "" msgid "unable to clean up git clone of %s: %s" msgstr "" -#: ./cli/app/list.go:154 +#: ./cli/app/list.go:148 #, c-format msgid "unable to clone %s: %s" msgstr "" @@ -5013,7 +5004,7 @@ msgstr "" msgid "unable to continue, input required for initial version" msgstr "" -#: ./pkg/app/compose.go:103 +#: ./pkg/app/compose.go:85 #, c-format msgid "unable to convert timeout label %s to int: %s" msgstr "" @@ -5112,7 +5103,7 @@ msgstr "" msgid "unable to parse %s, skipping" msgstr "" -#: ./cli/app/list.go:169 +#: ./cli/app/list.go:163 #, c-format msgid "unable to parse %s, skipping as upgrade option" msgstr "" @@ -5182,7 +5173,7 @@ msgstr "" msgid "unable to retrieve %s resources on %s: %s" msgstr "" -#: ./cli/app/list.go:159 +#: ./cli/app/list.go:153 #, c-format msgid "unable to retrieve tags for %s: %s" msgstr "" @@ -5266,7 +5257,7 @@ msgstr "" msgid "unimplemented call: SetWriteDeadline(%v)" msgstr "" -#: ./cli/app/labels.go:78 ./cli/app/list.go:117 ./cli/app/list.go:118 ./cli/app/list.go:119 ./cli/app/list.go:120 ./cli/app/list.go:121 ./cli/app/list.go:186 ./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:116 ./cli/app/list.go:117 ./cli/app/list.go:118 ./cli/app/list.go:119 ./cli/app/list.go:180 ./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 "" @@ -5421,7 +5412,7 @@ msgstr "" msgid "version" msgstr "" -#: ./pkg/app/app.go:688 +#: ./pkg/app/app.go:681 #, c-format msgid "version %s saved to %s.env" msgstr "" @@ -5445,32 +5436,32 @@ msgstr "" msgid "version seems invalid: %s" msgstr "" -#: ./pkg/app/app.go:627 +#: ./pkg/app/app.go:620 #, c-format msgid "version wiped from %s.env" msgstr "" -#: ./cli/app/deploy.go:352 +#: ./cli/app/deploy.go:351 #, c-format msgid "version: taking chaos version: %s" msgstr "" -#: ./cli/app/deploy.go:378 +#: ./cli/app/deploy.go:377 #, c-format msgid "version: taking deployed version: %s" msgstr "" -#: ./cli/app/deploy.go:383 +#: ./cli/app/deploy.go:382 #, c-format msgid "version: taking new recipe version: %s" msgstr "" -#: ./cli/app/deploy.go:372 +#: ./cli/app/deploy.go:371 #, c-format msgid "version: taking version from .env file: %s" msgstr "" -#: ./cli/app/deploy.go:358 +#: ./cli/app/deploy.go:357 #, c-format msgid "version: taking version from cli arg: %s" msgstr "" @@ -5593,7 +5584,7 @@ msgstr "" msgid "writer: %v, " msgstr "" -#: ./cli/app/deploy.go:276 ./cli/app/new.go:241 ./cli/app/rollback.go:253 ./cli/app/undeploy.go:119 ./cli/app/upgrade.go:299 +#: ./cli/app/deploy.go:275 ./cli/app/new.go:241 ./cli/app/rollback.go:252 ./cli/app/undeploy.go:119 ./cli/app/upgrade.go:298 #, c-format msgid "writing recipe version failed: %s" msgstr "" diff --git a/pkg/i18n/locales/es.po b/pkg/i18n/locales/es.po index 7c1c713077..2f3c81106f 100644 --- a/pkg/i18n/locales/es.po +++ b/pkg/i18n/locales/es.po @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: EMAIL\n" -"POT-Creation-Date: 2025-10-19 15:32+0200\n" +"POT-Creation-Date: 2025-10-19 15:46+0200\n" "PO-Revision-Date: 2025-09-04 08:14+0000\n" "Last-Translator: chasqui \n" "Language-Team: Spanish " msgstr "" -#: cli/app/list.go:52 +#: cli/app/list.go:51 msgid "" "Generate a report of all managed apps.\n" "\n" @@ -1017,7 +1013,7 @@ msgid "List all available commands" msgstr "πŸ“‹ Listar todos los comandos disponibles" #. translators: Short description for `app list` command -#: cli/app/list.go:51 +#: cli/app/list.go:50 msgid "List all managed apps" msgstr "πŸ“‹ Listar todas plataformas πŸš€ administradas" @@ -1184,7 +1180,7 @@ msgstr "" msgid "README.md metadata filled in" msgstr "" -#: cli/app/list.go:227 cli/internal/deploy.go:79 cli/internal/deploy.go:209 +#: cli/app/list.go:221 cli/internal/deploy.go:79 cli/internal/deploy.go:209 msgid "RECIPE" msgstr "" @@ -1319,7 +1315,7 @@ msgstr "" msgid "Run app commands" msgstr "πŸ’» Ejecutar comandos en una plataforma πŸš€" -#: cli/app/backup.go:303 cli/app/list.go:300 cli/app/logs.go:109 +#: cli/app/backup.go:303 cli/app/list.go:292 cli/app/logs.go:109 #: cli/app/new.go:389 msgid "S" msgstr "" @@ -1332,7 +1328,7 @@ msgstr "" msgid "SECRETS OVERVIEW" msgstr "" -#: cli/app/list.go:227 cli/internal/deploy.go:80 +#: cli/app/list.go:221 cli/internal/deploy.go:80 msgid "SERVER" msgstr "" @@ -1358,7 +1354,7 @@ msgstr "" msgid "SSO" msgstr "" -#: cli/app/list.go:230 cli/app/ps.go:186 +#: cli/app/list.go:224 cli/app/ps.go:186 msgid "STATUS" msgstr "" @@ -1554,7 +1550,7 @@ msgid "" " # and source this file from your PowerShell profile." msgstr "" -#: cli/app/deploy.go:434 cli/app/rollback.go:374 cli/app/upgrade.go:492 +#: cli/app/deploy.go:433 cli/app/rollback.go:373 cli/app/upgrade.go:491 msgid "U" msgstr "" @@ -1566,7 +1562,7 @@ msgstr "" msgid "UNDEPLOY" msgstr "" -#: cli/app/list.go:233 cli/internal/deploy.go:174 +#: cli/app/list.go:227 cli/internal/deploy.go:174 msgid "UPGRADE" msgstr "" @@ -1655,19 +1651,19 @@ msgid "" "\n" "Available Commands:{{range .Commands}}{{if (or .IsAvailableCommand (eq .Name " "\"help\"))}}\n" -" {{rpad .Name .NamePadding }} {{.Short}}{{end}}{{end}}{{end}}" -"{{if .HasAvailableLocalFlags}}\n" +" {{rpad .Name .NamePadding }} {{.Short}}{{end}}{{end}}{{end}}{{if ." +"HasAvailableLocalFlags}}\n" "\n" "Flags:\n" -"{{.LocalFlags.FlagUsages | trimTrailingWhitespaces}}{{end}}" -"{{if .HasAvailableInheritedFlags}}\n" +"{{.LocalFlags.FlagUsages | trimTrailingWhitespaces}}{{end}}{{if ." +"HasAvailableInheritedFlags}}\n" "\n" "Global Flags:\n" -"{{.InheritedFlags.FlagUsages | trimTrailingWhitespaces}}{{end}}" -"{{if .HasHelpSubCommands}}\n" +"{{.InheritedFlags.FlagUsages | trimTrailingWhitespaces}}{{end}}{{if ." +"HasHelpSubCommands}}\n" "\n" -"Additional help topics:{{range .Commands}}" -"{{if .IsAdditionalHelpTopicCommand}}\n" +"Additional help topics:{{range .Commands}}{{if ." +"IsAdditionalHelpTopicCommand}}\n" " {{rpad .CommandPath .CommandPathPadding}} {{.Short}}{{end}}{{end}}{{end}}" "{{if .HasAvailableSubCommands}}\n" "\n" @@ -1685,7 +1681,7 @@ msgstr "" msgid "VALUE" msgstr "" -#: cli/app/list.go:232 cli/app/ps.go:188 cli/app/secret.go:481 +#: cli/app/list.go:226 cli/app/ps.go:188 cli/app/secret.go:481 #: cli/recipe/version.go:69 cli/recipe/version.go:110 msgid "VERSION" msgstr "" @@ -1879,7 +1875,7 @@ msgstr "agregar [[server] | --local] [flags]" msgid "add release note? (leave empty to skip)" msgstr "" -#: pkg/app/app.go:515 +#: pkg/app/app.go:508 #, c-format msgid "adding env vars to %s service config" msgstr "" @@ -1964,7 +1960,7 @@ msgstr "" msgid "attempting to run %s" msgstr "" -#: cli/app/deploy.go:271 cli/app/upgrade.go:294 +#: cli/app/deploy.go:270 cli/app/upgrade.go:293 #, c-format msgid "attempting to run post deploy commands, saw: %s" msgstr "" @@ -2050,8 +2046,8 @@ 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:418 -#: cli/app/rollback.go:366 cli/app/upgrade.go:476 +#: cli/app/backup.go:148 cli/app/cp.go:30 cli/app/deploy.go:417 +#: cli/app/rollback.go:365 cli/app/upgrade.go:475 msgid "c" msgstr "" @@ -2108,7 +2104,7 @@ msgid "" "cannot redeploy previous chaos version (%s), did you mean to use \"--chaos\"?" msgstr "" -#: cli/app/deploy.go:368 +#: cli/app/deploy.go:367 #, c-format msgid "" "cannot redeploy previous chaos version (%s), did you mean to use \"--" @@ -2130,7 +2126,7 @@ msgstr "" msgid "cannot use '[secret] [version]' and '--all' together" msgstr "" -#: cli/app/deploy.go:310 +#: cli/app/deploy.go:309 msgid "cannot use --chaos and --latest together" msgstr "" @@ -2154,11 +2150,11 @@ msgstr "" msgid "cannot use [service] and --all-services/-a together" msgstr "" -#: cli/app/deploy.go:302 cli/app/new.go:76 +#: cli/app/deploy.go:301 cli/app/new.go:76 msgid "cannot use [version] and --chaos together" msgstr "" -#: cli/app/deploy.go:306 +#: cli/app/deploy.go:305 msgid "cannot use [version] and --latest together" msgstr "" @@ -2191,7 +2187,7 @@ 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:393 +#: cli/app/cmd.go:284 cli/app/cp.go:384 cli/app/deploy.go:392 #: cli/app/labels.go:142 cli/app/new.go:396 cli/app/ps.go:212 #: cli/app/restart.go:161 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 @@ -2204,7 +2200,7 @@ msgstr "" msgid "check [flags]" msgstr "verificar [flags]" -#: cli/app/deploy.go:94 cli/app/undeploy.go:57 cli/app/upgrade.go:440 +#: cli/app/deploy.go:94 cli/app/undeploy.go:57 cli/app/upgrade.go:439 #, c-format msgid "checking whether %s is already deployed" msgstr "" @@ -2492,7 +2488,7 @@ msgstr "" msgid "critical errors present in %s config" msgstr "" -#: cli/app/rollback.go:296 +#: cli/app/rollback.go:295 #, c-format msgid "current deployment '%s' is not a known version for %s" msgstr "" @@ -2544,7 +2540,7 @@ msgstr "" msgid "deploy labels stanza present" msgstr "" -#: cli/app/deploy.go:428 +#: cli/app/deploy.go:427 #, fuzzy msgid "deploy latest recipe version" msgstr "Publicar una nueva versiΓ³n de una receta" @@ -2647,11 +2643,11 @@ msgstr "" msgid "dirty: %v, " msgstr "" -#: cli/app/deploy.go:420 cli/app/rollback.go:368 cli/app/upgrade.go:478 +#: cli/app/deploy.go:419 cli/app/rollback.go:367 cli/app/upgrade.go:477 msgid "disable converge logic checks" msgstr "" -#: cli/app/deploy.go:412 cli/app/rollback.go:360 cli/app/upgrade.go:470 +#: cli/app/deploy.go:411 cli/app/rollback.go:359 cli/app/upgrade.go:469 msgid "disable public DNS checks" msgstr "" @@ -2874,8 +2870,8 @@ msgstr "" #. translators: `abra recipe fetch` aliases. use a comma separated list of aliases #. with no spaces in between -#: cli/app/deploy.go:402 cli/app/remove.go:163 cli/app/rollback.go:350 -#: cli/app/secret.go:593 cli/app/upgrade.go:460 cli/app/volume.go:217 +#: cli/app/deploy.go:401 cli/app/remove.go:163 cli/app/rollback.go:349 +#: cli/app/secret.go:593 cli/app/upgrade.go:459 cli/app/volume.go:217 #: cli/recipe/fetch.go:20 cli/recipe/fetch.go:138 msgid "f" msgstr "" @@ -3102,8 +3098,8 @@ msgstr "" msgid "filter by recipe" msgstr "" -#: cli/app/deploy.go:401 cli/app/remove.go:162 cli/app/rollback.go:349 -#: cli/app/upgrade.go:459 cli/app/volume.go:216 cli/recipe/fetch.go:137 +#: cli/app/deploy.go:400 cli/app/remove.go:162 cli/app/rollback.go:348 +#: cli/app/upgrade.go:458 cli/app/volume.go:216 cli/recipe/fetch.go:137 msgid "force" msgstr "" @@ -3162,7 +3158,7 @@ msgstr "" msgid "generated secrets %s shown again, please take note of them %s" msgstr "" -#: pkg/app/compose.go:81 +#: pkg/app/compose.go:63 #, c-format msgid "get label '%s'" msgstr "" @@ -3319,7 +3315,7 @@ 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:396 +#: cli/app/cmd.go:287 cli/app/cp.go:387 cli/app/deploy.go:395 #: cli/app/labels.go:145 cli/app/new.go:399 cli/app/ps.go:215 #: cli/app/restart.go:164 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 @@ -3508,7 +3504,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:426 cli/app/logs.go:20 +#: cli/app/cmd.go:261 cli/app/deploy.go:425 cli/app/logs.go:20 #: cli/recipe/lint.go:17 cli/server/add.go:207 msgid "l" msgstr "" @@ -3518,7 +3514,7 @@ msgstr "" msgid "labels [flags]" msgstr "etiquetas [flags]" -#: cli/app/deploy.go:425 cli/app/list.go:188 +#: cli/app/deploy.go:424 cli/app/list.go:182 msgid "latest" msgstr "" @@ -3567,7 +3563,7 @@ msgstr "listar [flags]" #. translators: `app list` command #. translators: `server list` command -#: cli/app/list.go:48 cli/server/list.go:23 +#: cli/app/list.go:47 cli/server/list.go:23 msgid "list [flags]" msgstr "listar [flags]" @@ -3633,7 +3629,7 @@ msgstr "" #. aliases with no spaces in between #. translators: `abra server list` aliases. use a comma separated list of #. aliases with no spaces in between -#: cli/app/backup.go:17 cli/app/cmd.go:203 cli/app/list.go:44 +#: cli/app/backup.go:17 cli/app/cmd.go:203 cli/app/list.go:43 #: cli/app/secret.go:453 cli/app/volume.go:21 cli/recipe/list.go:19 #: cli/server/list.go:19 msgid "ls" @@ -3643,14 +3639,14 @@ msgstr "plataformas" #. 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:323 cli/app/move.go:34 cli/app/ps.go:205 +#: cli/app/list.go:315 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:376 cli/recipe/version.go:139 cli/run.go:152 #: cli/server/list.go:106 msgid "m" msgstr "" -#: cli/app/list.go:322 cli/app/ps.go:204 cli/app/secret.go:552 +#: cli/app/list.go:314 cli/app/ps.go:204 cli/app/secret.go:552 #: cli/app/secret.go:648 cli/recipe/list.go:103 cli/recipe/upgrade.go:375 #: cli/recipe/version.go:138 cli/server/list.go:105 msgid "machine" @@ -3813,7 +3809,7 @@ msgstr "" msgid "no %s exists, skipping reading gitignore paths" msgstr "" -#: pkg/app/compose.go:87 +#: pkg/app/compose.go:69 #, c-format msgid "no %s label found for %s" msgstr "" @@ -3985,11 +3981,11 @@ msgstr "" msgid "no volumes to remove" msgstr "" -#: cli/app/deploy.go:417 cli/app/rollback.go:365 cli/app/upgrade.go:475 +#: cli/app/deploy.go:416 cli/app/rollback.go:364 cli/app/upgrade.go:474 msgid "no-converge-checks" msgstr "" -#: cli/app/deploy.go:409 cli/app/rollback.go:357 cli/app/upgrade.go:467 +#: cli/app/deploy.go:408 cli/app/rollback.go:356 cli/app/upgrade.go:466 msgid "no-domain-checks" msgstr "" @@ -4047,7 +4043,7 @@ msgstr "" msgid "only show errors" msgstr "" -#: cli/app/upgrade.go:486 +#: cli/app/upgrade.go:485 msgid "only show release notes" msgstr "" @@ -4081,22 +4077,22 @@ msgstr "" msgid "parsed following command arguments: %s" msgstr "" -#: cli/app/upgrade.go:343 +#: cli/app/upgrade.go:342 #, c-format msgid "parsing chosen upgrade version failed: %s" msgstr "" -#: cli/app/upgrade.go:387 +#: cli/app/upgrade.go:386 #, c-format msgid "parsing deployed version failed: %s" msgstr "" -#: cli/app/upgrade.go:348 +#: cli/app/upgrade.go:347 #, c-format msgid "parsing deployment version failed: %s" msgstr "" -#: cli/app/upgrade.go:354 cli/app/upgrade.go:393 +#: cli/app/upgrade.go:353 cli/app/upgrade.go:392 #, c-format msgid "parsing recipe version failed: %s" msgstr "" @@ -4124,8 +4120,8 @@ msgstr "" msgid "pattern" msgstr "" -#: cli/app/deploy.go:404 cli/app/remove.go:165 cli/app/rollback.go:352 -#: cli/app/upgrade.go:462 cli/app/volume.go:219 +#: cli/app/deploy.go:403 cli/app/remove.go:165 cli/app/rollback.go:351 +#: cli/app/upgrade.go:461 cli/app/volume.go:219 msgid "perform action without further prompt" msgstr "" @@ -4134,22 +4130,22 @@ msgstr "" msgid "please fix your synced label for %s and re-run this command" msgstr "" -#: cli/app/rollback.go:264 +#: cli/app/rollback.go:263 #, c-format msgid "please select a downgrade (version: %s):" msgstr "" -#: cli/app/rollback.go:269 +#: cli/app/rollback.go:268 #, c-format msgid "please select a downgrade (version: %s, chaos: %s):" msgstr "" -#: cli/app/upgrade.go:310 +#: cli/app/upgrade.go:309 #, c-format msgid "please select an upgrade (version: %s):" msgstr "" -#: cli/app/upgrade.go:315 +#: cli/app/upgrade.go:314 #, c-format msgid "please select an upgrade (version: %s, chaos: %s):" msgstr "" @@ -4171,7 +4167,7 @@ msgstr "" msgid "previous git tags detected, assuming new semver release" msgstr "" -#: cli/app/list.go:325 cli/app/ps.go:207 cli/app/secret.go:555 +#: cli/app/list.go:317 cli/app/ps.go:207 cli/app/secret.go:555 #: cli/app/secret.go:651 cli/recipe/list.go:106 cli/recipe/upgrade.go:378 #: cli/recipe/version.go:141 cli/server/list.go:108 msgid "print machine-readable output" @@ -4233,8 +4229,8 @@ 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:308 cli/app/move.go:346 -#: cli/app/run.go:23 cli/app/upgrade.go:484 cli/catalogue/catalogue.go:302 +#: cli/app/backup.go:327 cli/app/list.go:300 cli/app/move.go:346 +#: cli/app/run.go:23 cli/app/upgrade.go:483 cli/catalogue/catalogue.go:302 #: cli/recipe/recipe.go:12 cli/recipe/release.go:649 cli/recipe/sync.go:272 msgid "r" msgstr "" @@ -4250,13 +4246,13 @@ msgstr "" msgid "read %s as tags for recipe %s" msgstr "" -#: pkg/app/app.go:582 pkg/config/env.go:50 pkg/envfile/envfile.go:42 +#: pkg/app/app.go:575 pkg/config/env.go:50 pkg/envfile/envfile.go:42 #: pkg/envfile/envfile.go:80 #, c-format msgid "read %s from %s" msgstr "" -#: pkg/app/app.go:584 +#: pkg/app/app.go:577 #, c-format msgid "read 0 command names from %s" msgstr "" @@ -4314,7 +4310,7 @@ msgid "readme: %s, " msgstr "" #. translators: `abra recipe` command for autocompletion -#: cli/app/list.go:307 cli/app/list.go:314 cli/run.go:99 +#: cli/app/list.go:299 cli/app/list.go:306 cli/run.go:99 msgid "recipe" msgstr "" @@ -4353,7 +4349,7 @@ msgstr "" msgid "release [version] [flags]" msgstr "publicar [version] [flags]" -#: cli/app/upgrade.go:483 +#: cli/app/upgrade.go:482 msgid "releasenotes" msgstr "" @@ -4556,7 +4552,7 @@ msgstr "" msgid "retrieved %s configs for %s" msgstr "" -#: pkg/app/app.go:506 +#: pkg/app/app.go:499 #, c-format msgid "retrieved %s for %s" msgstr "" @@ -4571,7 +4567,7 @@ msgstr "" msgid "retrieved %v servers: %s" msgstr "" -#: pkg/app/app.go:492 +#: pkg/app/app.go:485 #, c-format msgid "retrieved app statuses: %s" msgstr "" @@ -4654,7 +4650,7 @@ msgstr "" msgid "run command locally" msgstr "" -#: cli/app/deploy.go:269 cli/app/upgrade.go:291 +#: cli/app/deploy.go:268 cli/app/upgrade.go:290 #, c-format msgid "run the following post-deploy commands: %s" msgstr "" @@ -4698,7 +4694,7 @@ msgstr "" #. 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/list.go:331 cli/app/logs.go:101 cli/app/new.go:358 +#: cli/app/list.go:323 cli/app/logs.go:101 cli/app/new.go:358 #: 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:24 #: cli/server/server.go:12 @@ -4743,12 +4739,12 @@ msgstr "" msgid "secret not found: %s" msgstr "" -#: cli/app/deploy.go:338 +#: cli/app/deploy.go:337 #, c-format msgid "secret not generated: %s" msgstr "" -#: cli/app/deploy.go:336 +#: cli/app/deploy.go:335 #, c-format msgid "secret not inserted (#generate=false): %s" msgstr "" @@ -4768,7 +4764,7 @@ msgid "secrets are %s shown again, please save them %s" msgstr "" #. translators: `abra server` command for autocompletion -#: cli/app/list.go:330 cli/app/list.go:337 cli/app/new.go:357 +#: cli/app/list.go:322 cli/app/list.go:329 cli/app/new.go:357 #: cli/app/new.go:364 cli/run.go:101 msgid "server" msgstr "" @@ -4820,8 +4816,8 @@ msgstr "" #: cli/recipe/upgrade.go:228 #, c-format msgid "" -"service %s is at version %s, but pinned to %s, please correct your " -"compose.yml file manually!" +"service %s is at version %s, but pinned to %s, please correct your compose." +"yml file manually!" msgstr "" #: cli/recipe/upgrade.go:224 @@ -4842,27 +4838,22 @@ msgstr "servicios [flags]" msgid "set 'main' as the default branch" msgstr "" -#: pkg/app/compose.go:69 -#, c-format -msgid "set label 'coop-cloud.%s.autoupdate' to %s for %s" -msgstr "" - -#: pkg/app/compose.go:31 +#: pkg/app/compose.go:30 #, c-format msgid "set label 'coop-cloud.%s.chaos' to %v for %s" msgstr "" -#: pkg/app/compose.go:42 +#: pkg/app/compose.go:41 #, c-format msgid "set label 'coop-cloud.%s.chaos-version' to %v for %s" msgstr "" -#: pkg/app/compose.go:52 +#: pkg/app/compose.go:51 #, c-format msgid "set label 'coop-cloud.%s.version' to %v for %s" msgstr "" -#: pkg/app/compose.go:19 +#: pkg/app/compose.go:18 #, c-format msgid "set recipe label 'coop-cloud.%s.recipe' to %s for %s" msgstr "" @@ -4876,7 +4867,7 @@ msgstr "" msgid "severity" msgstr "" -#: cli/app/deploy.go:436 cli/app/rollback.go:376 cli/app/upgrade.go:494 +#: cli/app/deploy.go:435 cli/app/rollback.go:375 cli/app/upgrade.go:493 msgid "show all configs & images, including unchanged ones" msgstr "" @@ -4884,15 +4875,15 @@ msgstr "" msgid "show all paths" msgstr "" -#: cli/app/list.go:302 +#: cli/app/list.go:294 msgid "show app deployment status" msgstr "" -#: cli/app/list.go:310 +#: cli/app/list.go:302 msgid "show apps of a specific recipe" msgstr "" -#: cli/app/list.go:333 +#: cli/app/list.go:325 msgid "show apps of a specific server" msgstr "" @@ -4900,7 +4891,7 @@ msgstr "" msgid "show debug messages" msgstr "" -#: cli/app/deploy.go:433 cli/app/rollback.go:373 cli/app/upgrade.go:491 +#: cli/app/deploy.go:432 cli/app/rollback.go:372 cli/app/upgrade.go:490 msgid "show-unchanged" msgstr "" @@ -4948,11 +4939,11 @@ msgstr "" msgid "skipping converge logic checks" msgstr "" -#: cli/app/deploy.go:197 +#: cli/app/deploy.go:196 msgid "skipping domain checks" msgstr "" -#: cli/app/deploy.go:194 +#: cli/app/deploy.go:193 msgid "skipping domain checks, no DOMAIN=... configured" msgstr "" @@ -4961,12 +4952,12 @@ msgstr "" msgid "skipping generation of %s (generate=false)" msgstr "" -#: pkg/app/app.go:690 +#: pkg/app/app.go:683 #, c-format msgid "skipping version %s write as already exists in %s.env" msgstr "" -#: pkg/app/app.go:684 +#: pkg/app/app.go:677 #, c-format msgid "skipping writing version %s because dry run" msgstr "" @@ -5031,7 +5022,7 @@ msgid "" "generate --help\"" msgstr "" -#: cli/app/list.go:299 cli/recipe/list.go:45 +#: cli/app/list.go:291 cli/recipe/list.go:45 msgid "status" msgstr "" @@ -5153,7 +5144,7 @@ msgstr "" msgid "timed out on undeploy (timeout=%v sec)" msgstr "" -#: pkg/app/compose.go:98 +#: pkg/app/compose.go:80 #, c-format msgid "timeout label: %s" msgstr "" @@ -5243,7 +5234,7 @@ msgstr "" msgid "unable to clean up git clone of %s: %s" msgstr "" -#: cli/app/list.go:154 +#: cli/app/list.go:148 #, c-format msgid "unable to clone %s: %s" msgstr "" @@ -5257,7 +5248,7 @@ msgstr "" msgid "unable to continue, input required for initial version" msgstr "" -#: pkg/app/compose.go:103 +#: pkg/app/compose.go:85 #, c-format msgid "unable to convert timeout label %s to int: %s" msgstr "" @@ -5357,7 +5348,7 @@ msgstr "" msgid "unable to parse %s, skipping" msgstr "" -#: cli/app/list.go:169 +#: cli/app/list.go:163 #, c-format msgid "unable to parse %s, skipping as upgrade option" msgstr "" @@ -5430,7 +5421,7 @@ msgstr "" msgid "unable to retrieve %s resources on %s: %s" msgstr "" -#: cli/app/list.go:159 +#: cli/app/list.go:153 #, c-format msgid "unable to retrieve tags for %s: %s" msgstr "" @@ -5514,11 +5505,10 @@ msgstr "" msgid "unimplemented call: SetWriteDeadline(%v)" msgstr "" -#: cli/app/labels.go:78 cli/app/list.go:117 cli/app/list.go:118 -#: cli/app/list.go:119 cli/app/list.go:120 cli/app/list.go:121 -#: cli/app/list.go:186 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:116 cli/app/list.go:117 +#: cli/app/list.go:118 cli/app/list.go:119 cli/app/list.go:180 +#: 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 "" @@ -5674,7 +5664,7 @@ msgstr "" msgid "version" msgstr "" -#: pkg/app/app.go:688 +#: pkg/app/app.go:681 #, c-format msgid "version %s saved to %s.env" msgstr "" @@ -5699,32 +5689,32 @@ msgstr "" msgid "version seems invalid: %s" msgstr "" -#: pkg/app/app.go:627 +#: pkg/app/app.go:620 #, c-format msgid "version wiped from %s.env" msgstr "" -#: cli/app/deploy.go:352 +#: cli/app/deploy.go:351 #, c-format msgid "version: taking chaos version: %s" msgstr "" -#: cli/app/deploy.go:378 +#: cli/app/deploy.go:377 #, c-format msgid "version: taking deployed version: %s" msgstr "" -#: cli/app/deploy.go:383 +#: cli/app/deploy.go:382 #, c-format msgid "version: taking new recipe version: %s" msgstr "" -#: cli/app/deploy.go:372 +#: cli/app/deploy.go:371 #, c-format msgid "version: taking version from .env file: %s" msgstr "" -#: cli/app/deploy.go:358 +#: cli/app/deploy.go:357 #, c-format msgid "version: taking version from cli arg: %s" msgstr "" @@ -5850,8 +5840,8 @@ msgstr "" msgid "writer: %v, " msgstr "" -#: cli/app/deploy.go:276 cli/app/new.go:241 cli/app/rollback.go:253 -#: cli/app/undeploy.go:119 cli/app/upgrade.go:299 +#: cli/app/deploy.go:275 cli/app/new.go:241 cli/app/rollback.go:252 +#: cli/app/undeploy.go:119 cli/app/upgrade.go:298 #, c-format msgid "writing recipe version failed: %s" msgstr ""