Compare commits

..

1 Commits

Author SHA1 Message Date
367fff60ea feat: msgctx support
Some checks failed
continuous-integration/drone/push Build is failing
See #647
See toolshed/xgettext-go#1
2025-09-28 12:52:25 +02:00
19 changed files with 243 additions and 262 deletions

1
.gitignore vendored
View File

@ -7,3 +7,4 @@
/kadabra
dist/
tests/integration/.bats
/bin

View File

@ -78,14 +78,20 @@ update-po:
done
.PHONY: update-pot
update-pot:
@xgettext-go \
update-pot: ./bin/xgettext-go
@./bin/xgettext-go \
-o pkg/i18n/locales/$(DOMAIN).pot \
--keyword=i18n.G \
--keyword-ctx=i18n.GC \
--sort-output \
--add-comments-tag="translators" \
$$(find . -name "*.go" -not -path "*vendor*" | sort)
./bin/xgettext-go:
@mkdir -p ./bin && \
wget -O ./bin/xgettext-go https://git.coopcloud.tech/toolshed/xgettext-go/raw/branch/main/xgettext-go && \
chmod +x ./bin/xgettext-go
.PHONY: update-pot-po-metadata
update-pot-po-metadata:
@sed -i "s/charset=CHARSET/charset=UTF-8/g" pkg/i18n/locales/*.po pkg/i18n/locales/*.pot

View File

@ -9,7 +9,7 @@ import (
// translators: `abra app` aliases. use a comma separated list of aliases with
// no spaces in between
var appAliases = i18n.G("a")
var appAliases = i18n.GC("a", "abra app")
var AppCommand = &cobra.Command{
// translators: `app` command group

View File

@ -268,7 +268,7 @@ func init() {
AppBackupListCommand.Flags().BoolVarP(
&showAllPaths,
i18n.G("all"),
i18n.G("a"),
i18n.GC("a", "app backup"),
false,
i18n.G("show all paths"),
)

View File

@ -300,16 +300,6 @@ func validateArgsAndFlags(args []string) error {
}
func validateSecrets(cl *dockerClient.Client, app appPkg.App) error {
composeFiles, err := app.Recipe.GetComposeFiles(app.Env)
if err != nil {
return err
}
secretsConfig, err := secret.ReadSecretsConfig(app.Path, composeFiles, app.StackName())
if err != nil {
return err
}
secStats, err := secret.PollSecretsStatus(cl, app)
if err != nil {
return err
@ -317,10 +307,6 @@ func validateSecrets(cl *dockerClient.Client, app appPkg.App) error {
for _, secStat := range secStats {
if !secStat.CreatedOnRemote {
secretConfig := secretsConfig[secStat.LocalName]
if secretConfig.SkipGenerate {
return errors.New(i18n.G("secret not inserted (#generate=false): %s", secStat.LocalName))
}
return errors.New(i18n.G("secret not generated: %s", secStat.LocalName))
}
}

View File

@ -192,27 +192,7 @@ var AppNewCommand = &cobra.Command{
log.Info(i18n.G("%s created (version: %s)", appDomain, recipeVersion))
if len(secretsConfig) > 0 {
var (
hasSecretToGenerate bool
hasSecretToSkip bool
)
for _, secretConfig := range secretsConfig {
if secretConfig.SkipGenerate {
hasSecretToSkip = true
continue
}
hasSecretToGenerate = true
}
if hasSecretToGenerate && !generateSecrets {
log.Warn(i18n.G("%s requires secret generation before deploy, run \"abra app secret generate %s --all\"", recipe.Name, appDomain))
}
if hasSecretToSkip {
log.Warn(i18n.G("%s requires secret insertion before deploy (#generate=false)", recipe.Name))
}
log.Warn(i18n.G("%s requires secret generation before deploying, run \"abra app secret generate %s --all\"", recipe.Name, appDomain))
}
if len(appSecrets) > 0 {

View File

@ -166,7 +166,7 @@ func init() {
AppRestartCommand.Flags().BoolVarP(
&allServices,
i18n.G("all-services"),
i18n.G("a"),
i18n.GC("a", "app restart"),
false,
i18n.G("restart all services"),
)

View File

@ -165,7 +165,7 @@ var AppSecretInsertCommand = &cobra.Command{
Arbitrary secret insertion is not supported. Secrets that are inserted must
match those configured in the recipe beforehand.
This command can be useful when you want to manually generate secrets for an app
This can be useful when you want to manually generate secrets for an app
environment. Typically, you can let Abra generate them for you on app creation
(see "abra app new --secrets/-S" for more).`),
Example: i18n.G(` # insert regular secret
@ -574,7 +574,7 @@ func init() {
AppSecretGenerateCommand.Flags().BoolVarP(
&generateAllSecrets,
i18n.G("all"),
i18n.G("a"),
i18n.GC("a", "app secret generate"),
false,
i18n.G("generate all secrets"),
)
@ -614,7 +614,7 @@ func init() {
AppSecretRmCommand.Flags().BoolVarP(
&rmAllSecrets,
i18n.G("all"),
i18n.G("a"),
i18n.GC("a", "app secret rm"),
false,
i18n.G("remove all secrets"),
)

View File

@ -119,7 +119,7 @@ func init() {
RecipeFetchCommand.Flags().BoolVarP(
&fetchAllRecipes,
i18n.G("all"),
i18n.G("a"),
i18n.GC("a", "recipe fetch"),
false,
i18n.G("fetch all recipes"),
)

View File

@ -381,7 +381,7 @@ func init() {
RecipeUpgradeCommand.Flags().BoolVarP(
&allTags,
i18n.G("all-tags"),
i18n.G("a"),
i18n.GC("a", "recipe upgrade"),
false,
i18n.G("list all tags, not just upgrades"),
)

View File

@ -20,7 +20,7 @@ import (
// translators: `abra server add` aliases. use a comma separated list of
// aliases with no spaces in between
var serverAddAliases = i18n.G("a")
var serverAddAliases = i18n.GC("a", "server add")
var ServerAddCommand = &cobra.Command{
// translators: `server add` command

View File

@ -96,7 +96,7 @@ func init() {
ServerPruneCommand.Flags().BoolVarP(
&allFilter,
i18n.G("all"),
i18n.G("a"),
i18n.GC("a", "server prune"),
false,
i18n.G("remove all unused images"),
)

View File

@ -551,7 +551,7 @@ func init() {
UpgradeCommand.Flags().BoolVarP(
&updateAll,
i18n.G("all"),
i18n.G("a"),
i18n.GC("a", "abra upgrade"),
false,
i18n.G("update all deployed apps"),
)

View File

@ -20,6 +20,7 @@ var (
Locale = DefaultLocale
_, Mo = LoadLocale()
G = Mo.Get
GC = Mo.GetC
)
func LoadLocale() (string, *gotext.Mo) {

View File

@ -7,7 +7,7 @@
msgid ""
msgstr "Project-Id-Version: \n"
"Report-Msgid-Bugs-To: EMAIL\n"
"POT-Creation-Date: 2025-09-29 10:31+0200\n"
"POT-Creation-Date: 2025-09-28 12:38+0200\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"
@ -201,7 +201,7 @@ msgstr ""
msgid "%s OVERVIEW"
msgstr ""
#: ./cli/server/add.go:127 ./pkg/secret/secret.go:233 ./pkg/secret/secret.go:253 ./pkg/server/server.go:21
#: ./cli/server/add.go:127 ./pkg/secret/secret.go:223 ./pkg/secret/secret.go:243 ./pkg/server/server.go:21
#, c-format
msgid "%s already exists"
msgstr ""
@ -296,7 +296,7 @@ msgstr ""
msgid "%s has no published versions?"
msgstr ""
#: ./cli/app/new.go:301
#: ./cli/app/new.go:281
#, c-format
msgid "%s has no secrets to generate, skipping..."
msgstr ""
@ -376,7 +376,7 @@ msgstr ""
msgid "%s not considered semver-like"
msgstr ""
#: ./pkg/secret/secret.go:135
#: ./pkg/secret/secret.go:130
#, c-format
msgid "%s not enabled in recipe config, skipping"
msgstr ""
@ -396,14 +396,9 @@ msgstr ""
msgid "%s removed from pass store"
msgstr ""
#: ./cli/app/new.go:210
#: ./cli/app/new.go:195
#, c-format
msgid "%s requires secret generation before deploy, run \"abra app secret generate %s --all\""
msgstr ""
#: ./cli/app/new.go:214
#, c-format
msgid "%s requires secret insertion before deploy (#generate=false)"
msgid "%s requires secret generation before deploying, run \"abra app secret generate %s --all\""
msgstr ""
#: ./cli/app/new.go:141
@ -607,7 +602,7 @@ 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:375 ./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/updater/updater.go:538
#: ./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:361 ./cli/app/labels.go:143 ./cli/app/new.go:377 ./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/updater/updater.go:538
msgid "C"
msgstr ""
@ -753,7 +748,7 @@ msgid "Creates a new app from a default recipe.\n"
"on your $PATH."
msgstr ""
#: ./cli/app/deploy.go:391 ./cli/app/new.go:373 ./cli/app/rollback.go:353 ./cli/app/upgrade.go:463
#: ./cli/app/deploy.go:377 ./cli/app/new.go:353 ./cli/app/rollback.go:353 ./cli/app/upgrade.go:463
msgid "D"
msgstr ""
@ -864,7 +859,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:307
#: ./cli/app/new.go:287
msgid "Generate app secrets?"
msgstr ""
@ -1236,7 +1231,7 @@ msgstr ""
msgid "Run app commands"
msgstr ""
#: ./cli/app/backup.go:303 ./cli/app/list.go:295 ./cli/app/logs.go:109 ./cli/app/new.go:389
#: ./cli/app/backup.go:303 ./cli/app/list.go:295 ./cli/app/logs.go:109 ./cli/app/new.go:369
msgid "S"
msgstr ""
@ -1244,7 +1239,7 @@ msgstr ""
msgid "SECRETS"
msgstr ""
#: ./cli/app/new.go:224
#: ./cli/app/new.go:204
msgid "SECRETS OVERVIEW"
msgstr ""
@ -1277,7 +1272,7 @@ msgstr ""
msgid "STATUS"
msgstr ""
#: ./cli/app/new.go:332
#: ./cli/app/new.go:312
msgid "Select app server:"
msgstr ""
@ -1314,7 +1309,7 @@ msgstr ""
msgid "Specify a server name"
msgstr ""
#: ./cli/app/new.go:283
#: ./cli/app/new.go:263
msgid "Specify app domain"
msgstr ""
@ -1368,7 +1363,7 @@ msgid "This command inserts a secret into an app environment.\n"
"Arbitrary secret insertion is not supported. Secrets that are inserted must\n"
"match those configured in the recipe beforehand.\n"
"\n"
"This command can be useful when you want to manually generate secrets for an app\n"
"This can be useful when you want to manually generate secrets for an app\n"
"environment. Typically, you can let Abra generate them for you on app creation\n"
"(see \"abra app new --secrets/-S\" for more)."
msgstr ""
@ -1456,7 +1451,7 @@ msgid "To load completions:\n"
" # and source this file from your PowerShell profile."
msgstr ""
#: ./cli/app/deploy.go:415 ./cli/app/rollback.go:369 ./cli/app/upgrade.go:487
#: ./cli/app/deploy.go:401 ./cli/app/rollback.go:369 ./cli/app/upgrade.go:487
msgid "U"
msgstr ""
@ -1673,9 +1668,55 @@ msgstr ""
#. translators: `abra app` aliases. use a comma separated list of aliases with
#. no spaces in between
#: ./cli/app/app.go:12
msgctxt "abra app"
msgid "a"
msgstr ""
#: ./cli/app/backup.go:271
msgctxt "app backup"
msgid "a"
msgstr ""
#: ./cli/app/restart.go:169
msgctxt "app restart"
msgid "a"
msgstr ""
#: ./cli/app/secret.go:577
msgctxt "app secret generate"
msgid "a"
msgstr ""
#: ./cli/app/secret.go:617
msgctxt "app secret rm"
msgid "a"
msgstr ""
#: ./cli/recipe/fetch.go:122
msgctxt "recipe fetch"
msgid "a"
msgstr ""
#: ./cli/recipe/upgrade.go:384
msgctxt "recipe upgrade"
msgid "a"
msgstr ""
#. translators: `abra server add` aliases. use a comma separated list of
#. aliases with no spaces in between
#: ./cli/app/app.go:12 ./cli/app/backup.go:271 ./cli/app/restart.go:169 ./cli/app/secret.go:577 ./cli/app/secret.go:617 ./cli/recipe/fetch.go:122 ./cli/recipe/upgrade.go:384 ./cli/server/add.go:23 ./cli/server/prune.go:99 ./cli/updater/updater.go:554
#: ./cli/server/add.go:23
msgctxt "server add"
msgid "a"
msgstr ""
#: ./cli/server/prune.go:99
msgctxt "server prune"
msgid "a"
msgstr ""
#: ./cli/updater/updater.go:554
msgctxt "abra upgrade"
msgid "a"
msgstr ""
@ -1800,7 +1841,7 @@ msgstr ""
msgid "attempting to create client for %s"
msgstr ""
#: ./pkg/secret/secret.go:222
#: ./pkg/secret/secret.go:212
#, c-format
msgid "attempting to generate and store %s on %s"
msgstr ""
@ -1840,7 +1881,7 @@ msgstr ""
msgid "autocomplete failed: %s"
msgstr ""
#: ./cli/app/new.go:391
#: ./cli/app/new.go:371
msgid "automatically generate secrets"
msgstr ""
@ -1900,7 +1941,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:399 ./cli/app/rollback.go:361 ./cli/app/upgrade.go:471
#: ./cli/app/backup.go:148 ./cli/app/cp.go:30 ./cli/app/deploy.go:385 ./cli/app/rollback.go:361 ./cli/app/upgrade.go:471
msgid "c"
msgstr ""
@ -2034,7 +2075,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:374 ./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/updater/updater.go:537
#: ./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:360 ./cli/app/labels.go:142 ./cli/app/new.go:376 ./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/updater/updater.go:537
msgid "chaos"
msgstr ""
@ -2385,7 +2426,7 @@ msgstr ""
msgid "deploy labels stanza present"
msgstr ""
#: ./cli/app/deploy.go:409
#: ./cli/app/deploy.go:395
msgid "deploy latest recipe version"
msgstr ""
@ -2487,11 +2528,11 @@ msgstr ""
msgid "dirty: %v, "
msgstr ""
#: ./cli/app/deploy.go:401 ./cli/app/rollback.go:363 ./cli/app/upgrade.go:473
#: ./cli/app/deploy.go:387 ./cli/app/rollback.go:363 ./cli/app/upgrade.go:473
msgid "disable converge logic checks"
msgstr ""
#: ./cli/app/deploy.go:393 ./cli/app/rollback.go:355 ./cli/app/upgrade.go:465
#: ./cli/app/deploy.go:379 ./cli/app/rollback.go:355 ./cli/app/upgrade.go:465
msgid "disable public DNS checks"
msgstr ""
@ -2512,11 +2553,11 @@ msgstr ""
msgid "docker: is the daemon running / your user has docker permissions?"
msgstr ""
#: ./cli/app/new.go:372
#: ./cli/app/new.go:352
msgid "domain"
msgstr ""
#: ./cli/app/new.go:375
#: ./cli/app/new.go:355
msgid "domain name for app"
msgstr ""
@ -2729,7 +2770,7 @@ msgstr ""
#. translators: `abra recipe fetch` aliases. use a comma separated list of aliases
#. with no spaces in between
#: ./cli/app/deploy.go:383 ./cli/app/remove.go:163 ./cli/app/rollback.go:345 ./cli/app/secret.go:593 ./cli/app/upgrade.go:455 ./cli/app/volume.go:217 ./cli/recipe/fetch.go:20 ./cli/recipe/fetch.go:138
#: ./cli/app/deploy.go:369 ./cli/app/remove.go:163 ./cli/app/rollback.go:345 ./cli/app/secret.go:593 ./cli/app/upgrade.go:455 ./cli/app/volume.go:217 ./cli/recipe/fetch.go:20 ./cli/recipe/fetch.go:138
msgid "f"
msgstr ""
@ -2965,7 +3006,7 @@ msgstr ""
msgid "for %s read env %s with value: %s from docker service"
msgstr ""
#: ./cli/app/deploy.go:382 ./cli/app/remove.go:162 ./cli/app/rollback.go:344 ./cli/app/upgrade.go:454 ./cli/app/volume.go:216 ./cli/recipe/fetch.go:137
#: ./cli/app/deploy.go:368 ./cli/app/remove.go:162 ./cli/app/rollback.go:344 ./cli/app/upgrade.go:454 ./cli/app/volume.go:216 ./cli/recipe/fetch.go:137
msgid "force"
msgstr ""
@ -3004,12 +3045,12 @@ msgstr ""
msgid "generate all secrets"
msgstr ""
#: ./pkg/secret/secret.go:67 ./pkg/secret/secret.go:85
#: ./pkg/secret/secret.go:62 ./pkg/secret/secret.go:80
#, c-format
msgid "generated %s"
msgstr ""
#: ./pkg/secret/secret.go:278
#: ./pkg/secret/secret.go:268
#, c-format
msgid "generated and stored %v on %s"
msgstr ""
@ -3184,7 +3225,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:377 ./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/updater/updater.go:540
#: ./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:363 ./cli/app/labels.go:145 ./cli/app/new.go:379 ./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/updater/updater.go:540
msgid "ignore uncommitted recipes changes"
msgstr ""
@ -3377,7 +3418,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:407 ./cli/app/logs.go:20 ./cli/recipe/lint.go:17 ./cli/server/add.go:207
#: ./cli/app/cmd.go:261 ./cli/app/deploy.go:393 ./cli/app/logs.go:20 ./cli/recipe/lint.go:17 ./cli/server/add.go:207
msgid "l"
msgstr ""
@ -3386,7 +3427,7 @@ msgstr ""
msgid "labels <domain> [flags]"
msgstr ""
#: ./cli/app/deploy.go:406 ./cli/app/list.go:183
#: ./cli/app/deploy.go:392 ./cli/app/list.go:183
msgid "latest"
msgstr ""
@ -3570,7 +3611,7 @@ msgstr ""
msgid "missing arguments or --all/-a flag"
msgstr ""
#: ./pkg/secret/secret.go:131
#: ./pkg/secret/secret.go:126
#, c-format
msgid "missing version for secret? (%s)"
msgstr ""
@ -3733,7 +3774,7 @@ msgstr ""
msgid "no containers matching the %v filter found?"
msgstr ""
#: ./cli/app/new.go:292 ./cli/internal/validate.go:129
#: ./cli/app/new.go:272 ./cli/internal/validate.go:129
msgid "no domain provided"
msgstr ""
@ -3791,7 +3832,7 @@ msgstr ""
msgid "no secrets to remove?"
msgstr ""
#: ./cli/app/new.go:341 ./cli/internal/validate.go:167
#: ./cli/app/new.go:321 ./cli/internal/validate.go:167
msgid "no server provided"
msgstr ""
@ -3849,11 +3890,11 @@ msgstr ""
msgid "no volumes to remove"
msgstr ""
#: ./cli/app/deploy.go:398 ./cli/app/rollback.go:360 ./cli/app/upgrade.go:470
#: ./cli/app/deploy.go:384 ./cli/app/rollback.go:360 ./cli/app/upgrade.go:470
msgid "no-converge-checks"
msgstr ""
#: ./cli/app/deploy.go:390 ./cli/app/rollback.go:352 ./cli/app/upgrade.go:462
#: ./cli/app/deploy.go:376 ./cli/app/rollback.go:352 ./cli/app/upgrade.go:462
msgid "no-domain-checks"
msgstr ""
@ -3870,7 +3911,7 @@ msgstr ""
msgid "not enough arguments: %s"
msgstr ""
#: ./pkg/secret/secret.go:124
#: ./pkg/secret/secret.go:119
msgid "not generating app secrets, none enabled in recipe config"
msgstr ""
@ -3930,7 +3971,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:381 ./cli/app/ps.go:29 ./cli/app/secret.go:561 ./cli/app/secret.go:585 ./cli/app/secret.go:625 ./cli/app/undeploy.go:163 ./cli/catalogue/catalogue.go:294 ./cli/recipe/list.go:112 ./cli/recipe/release.go:672 ./cli/server/prune.go:18
#: ./cli/app/backup.go:295 ./cli/app/new.go:361 ./cli/app/ps.go:29 ./cli/app/secret.go:561 ./cli/app/secret.go:585 ./cli/app/secret.go:625 ./cli/app/undeploy.go:163 ./cli/catalogue/catalogue.go:294 ./cli/recipe/list.go:112 ./cli/recipe/release.go:672 ./cli/server/prune.go:18
msgid "p"
msgstr ""
@ -3969,7 +4010,7 @@ msgstr ""
msgid "parsing recipe version failed: %s"
msgstr ""
#: ./cli/app/new.go:380 ./cli/app/secret.go:560 ./cli/app/secret.go:584 ./cli/app/secret.go:624
#: ./cli/app/new.go:360 ./cli/app/secret.go:560 ./cli/app/secret.go:584 ./cli/app/secret.go:624
msgid "pass"
msgstr ""
@ -3989,7 +4030,7 @@ msgstr ""
msgid "pattern"
msgstr ""
#: ./cli/app/deploy.go:385 ./cli/app/remove.go:165 ./cli/app/rollback.go:347 ./cli/app/upgrade.go:457 ./cli/app/volume.go:219
#: ./cli/app/deploy.go:371 ./cli/app/remove.go:165 ./cli/app/rollback.go:347 ./cli/app/upgrade.go:457 ./cli/app/volume.go:219
msgid "perform action without further prompt"
msgstr ""
@ -4557,7 +4598,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:326 ./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:326 ./cli/app/logs.go:101 ./cli/app/new.go:338 ./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 ""
@ -4575,7 +4616,7 @@ msgstr ""
msgid "searching abra.sh for version for %s"
msgstr ""
#: ./pkg/secret/secret.go:149
#: ./pkg/secret/secret.go:139
#, c-format
msgid "secret %s is > %d chars when combined with %s"
msgstr ""
@ -4599,32 +4640,27 @@ msgstr ""
msgid "secret not found: %s"
msgstr ""
#: ./cli/app/deploy.go:324
#: ./cli/app/deploy.go:310
#, c-format
msgid "secret not generated: %s"
msgstr ""
#: ./cli/app/deploy.go:322
#, c-format
msgid "secret not inserted (#generate=false): %s"
msgstr ""
#: ./cli/app/remove.go:123
#, c-format
msgid "secret: %s removed"
msgstr ""
#: ./cli/app/backup.go:302 ./cli/app/new.go:388
#: ./cli/app/backup.go:302 ./cli/app/new.go:368
msgid "secrets"
msgstr ""
#: ./cli/app/new.go:228
#: ./cli/app/new.go:208
#, c-format
msgid "secrets are %s shown again, please save them %s"
msgstr ""
#. translators: `abra server` command for autocompletion
#: ./cli/app/list.go:325 ./cli/app/list.go:332 ./cli/app/new.go:357 ./cli/app/new.go:364 ./cli/run.go:101
#: ./cli/app/list.go:325 ./cli/app/list.go:332 ./cli/app/new.go:337 ./cli/app/new.go:344 ./cli/run.go:101
msgid "server"
msgstr ""
@ -4724,7 +4760,7 @@ msgstr ""
msgid "severity"
msgstr ""
#: ./cli/app/deploy.go:417 ./cli/app/rollback.go:371 ./cli/app/upgrade.go:489
#: ./cli/app/deploy.go:403 ./cli/app/rollback.go:371 ./cli/app/upgrade.go:489
msgid "show all configs & images, including unchanged ones"
msgstr ""
@ -4748,7 +4784,7 @@ msgstr ""
msgid "show debug messages"
msgstr ""
#: ./cli/app/deploy.go:414 ./cli/app/rollback.go:368 ./cli/app/upgrade.go:486
#: ./cli/app/deploy.go:400 ./cli/app/rollback.go:368 ./cli/app/upgrade.go:486
msgid "show-unchanged"
msgstr ""
@ -4756,7 +4792,7 @@ msgstr ""
msgid "since"
msgstr ""
#: ./cli/app/new.go:326
#: ./cli/app/new.go:306
#, c-format
msgid "single server detected, choosing %s automatically"
msgstr ""
@ -4804,7 +4840,7 @@ msgstr ""
msgid "skipping domain checks, no DOMAIN=... configured"
msgstr ""
#: ./pkg/secret/secret.go:217
#: ./pkg/secret/secret.go:207
#, c-format
msgid "skipping generation of %s (generate=false)"
msgstr ""
@ -4836,7 +4872,7 @@ msgstr ""
msgid "specify secret value"
msgstr ""
#: ./cli/app/new.go:360
#: ./cli/app/new.go:340
msgid "specify server for new app"
msgstr ""
@ -4894,7 +4930,7 @@ msgstr ""
msgid "store generated secrets in a local pass store"
msgstr ""
#: ./cli/app/new.go:383
#: ./cli/app/new.go:363
msgid "store secrets in a local pass store"
msgstr ""
@ -5049,7 +5085,7 @@ msgstr ""
msgid "trim input"
msgstr ""
#: ./cli/app/new.go:253 ./pkg/app/app.go:141
#: ./cli/app/new.go:233 ./pkg/app/app.go:141
#, c-format
msgid "trimming %s to %s to avoid runtime limits"
msgstr ""
@ -5545,32 +5581,32 @@ msgstr ""
msgid "version wiped from %s.env"
msgstr ""
#: ./cli/app/deploy.go:351
#: ./cli/app/deploy.go:337
#, c-format
msgid "version: can not redeploy chaos version %s"
msgstr ""
#: ./cli/app/deploy.go:338
#: ./cli/app/deploy.go:324
#, c-format
msgid "version: taking chaos version: %s"
msgstr ""
#: ./cli/app/deploy.go:359
#: ./cli/app/deploy.go:345
#, c-format
msgid "version: taking deployed version: %s"
msgstr ""
#: ./cli/app/deploy.go:364
#: ./cli/app/deploy.go:350
#, c-format
msgid "version: taking new recipe version: %s"
msgstr ""
#: ./cli/app/deploy.go:353
#: ./cli/app/deploy.go:339
#, c-format
msgid "version: taking version from .env file: %s"
msgstr ""
#: ./cli/app/deploy.go:344
#: ./cli/app/deploy.go:330
#, c-format
msgid "version: taking version from cli arg: %s"
msgstr ""
@ -5693,7 +5729,7 @@ msgstr ""
msgid "writer: %v, "
msgstr ""
#: ./cli/app/deploy.go:262 ./cli/app/new.go:241 ./cli/app/rollback.go:248 ./cli/app/undeploy.go:114 ./cli/app/upgrade.go:294
#: ./cli/app/deploy.go:262 ./cli/app/new.go:221 ./cli/app/rollback.go:248 ./cli/app/undeploy.go:114 ./cli/app/upgrade.go:294
#, c-format
msgid "writing recipe version failed: %s"
msgstr ""

View File

@ -2,7 +2,7 @@ msgid ""
msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: EMAIL\n"
"POT-Creation-Date: 2025-09-29 10:31+0200\n"
"POT-Creation-Date: 2025-09-28 12:38+0200\n"
"PO-Revision-Date: 2025-09-04 08:14+0000\n"
"Last-Translator: chasqui <chasqui@cryptolab.net>\n"
"Language-Team: Spanish <https://translate.coopcloud.tech/projects/co-op-"
@ -211,7 +211,7 @@ msgstr ""
msgid "%s OVERVIEW"
msgstr ""
#: cli/server/add.go:127 pkg/secret/secret.go:233 pkg/secret/secret.go:253
#: cli/server/add.go:127 pkg/secret/secret.go:223 pkg/secret/secret.go:243
#: pkg/server/server.go:21
#, c-format
msgid "%s already exists"
@ -309,7 +309,7 @@ msgstr ""
msgid "%s has no published versions?"
msgstr ""
#: cli/app/new.go:301
#: cli/app/new.go:281
#, c-format
msgid "%s has no secrets to generate, skipping..."
msgstr ""
@ -391,7 +391,7 @@ msgstr ""
msgid "%s not considered semver-like"
msgstr ""
#: pkg/secret/secret.go:135
#: pkg/secret/secret.go:130
#, c-format
msgid "%s not enabled in recipe config, skipping"
msgstr ""
@ -411,16 +411,11 @@ msgstr ""
msgid "%s removed from pass store"
msgstr ""
#: cli/app/new.go:210
#: cli/app/new.go:195
#, c-format
msgid ""
"%s requires secret generation before deploy, run \"abra app secret generate "
"%s --all\""
msgstr ""
#: cli/app/new.go:214
#, c-format
msgid "%s requires secret insertion before deploy (#generate=false)"
"%s requires secret generation before deploying, run \"abra app secret "
"generate %s --all\""
msgstr ""
#: cli/app/new.go:141
@ -635,8 +630,8 @@ 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:375
#: cli/app/labels.go:143 cli/app/new.go:397 cli/app/ps.go:213
#: cli/app/cmd.go:285 cli/app/cp.go:385 cli/app/deploy.go:361
#: cli/app/labels.go:143 cli/app/new.go:377 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
@ -806,7 +801,7 @@ msgid ""
"on your $PATH."
msgstr ""
#: cli/app/deploy.go:391 cli/app/new.go:373 cli/app/rollback.go:353
#: cli/app/deploy.go:377 cli/app/new.go:353 cli/app/rollback.go:353
#: cli/app/upgrade.go:463
msgid "D"
msgstr ""
@ -932,7 +927,7 @@ msgid ""
"Use \"--status/-S\" flag to query all servers for the live deployment status."
msgstr ""
#: cli/app/new.go:307
#: cli/app/new.go:287
msgid "Generate app secrets?"
msgstr ""
@ -1336,7 +1331,7 @@ msgid "Run app commands"
msgstr "💻 Ejecutar comandos en una plataforma 🚀"
#: cli/app/backup.go:303 cli/app/list.go:295 cli/app/logs.go:109
#: cli/app/new.go:389
#: cli/app/new.go:369
msgid "S"
msgstr ""
@ -1344,7 +1339,7 @@ msgstr ""
msgid "SECRETS"
msgstr ""
#: cli/app/new.go:224
#: cli/app/new.go:204
msgid "SECRETS OVERVIEW"
msgstr ""
@ -1378,7 +1373,7 @@ msgstr ""
msgid "STATUS"
msgstr ""
#: cli/app/new.go:332
#: cli/app/new.go:312
msgid "Select app server:"
msgstr ""
@ -1417,7 +1412,7 @@ msgstr ""
msgid "Specify a server name"
msgstr ""
#: cli/app/new.go:283
#: cli/app/new.go:263
msgid "Specify app domain"
msgstr ""
@ -1473,8 +1468,7 @@ msgid ""
"Arbitrary secret insertion is not supported. Secrets that are inserted must\n"
"match those configured in the recipe beforehand.\n"
"\n"
"This command can be useful when you want to manually generate secrets for an "
"app\n"
"This can be useful when you want to manually generate secrets for an app\n"
"environment. Typically, you can let Abra generate them for you on app "
"creation\n"
"(see \"abra app new --secrets/-S\" for more)."
@ -1575,7 +1569,7 @@ msgid ""
" # and source this file from your PowerShell profile."
msgstr ""
#: cli/app/deploy.go:415 cli/app/rollback.go:369 cli/app/upgrade.go:487
#: cli/app/deploy.go:401 cli/app/rollback.go:369 cli/app/upgrade.go:487
msgid "U"
msgstr ""
@ -1835,12 +1829,55 @@ msgstr ""
#. translators: `abra app` aliases. use a comma separated list of aliases with
#. no spaces in between
#: cli/app/app.go:12
msgctxt "abra app"
msgid "a"
msgstr ""
#: cli/app/backup.go:271
msgctxt "app backup"
msgid "a"
msgstr ""
#: cli/app/restart.go:169
msgctxt "app restart"
msgid "a"
msgstr ""
#: cli/app/secret.go:577
msgctxt "app secret generate"
msgid "a"
msgstr ""
#: cli/app/secret.go:617
msgctxt "app secret rm"
msgid "a"
msgstr ""
#: cli/recipe/fetch.go:122
msgctxt "recipe fetch"
msgid "a"
msgstr ""
#: cli/recipe/upgrade.go:384
msgctxt "recipe upgrade"
msgid "a"
msgstr ""
#. translators: `abra server add` aliases. use a comma separated list of
#. aliases with no spaces in between
#: cli/app/app.go:12 cli/app/backup.go:271 cli/app/restart.go:169
#: cli/app/secret.go:577 cli/app/secret.go:617 cli/recipe/fetch.go:122
#: cli/recipe/upgrade.go:384 cli/server/add.go:23 cli/server/prune.go:99
#: cli/server/add.go:23
msgctxt "server add"
msgid "a"
msgstr ""
#: cli/server/prune.go:99
msgctxt "server prune"
msgid "a"
msgstr ""
#: cli/updater/updater.go:554
msgctxt "abra upgrade"
msgid "a"
msgstr ""
@ -1966,7 +2003,7 @@ msgstr ""
msgid "attempting to create client for %s"
msgstr ""
#: pkg/secret/secret.go:222
#: pkg/secret/secret.go:212
#, c-format
msgid "attempting to generate and store %s on %s"
msgstr ""
@ -2012,7 +2049,7 @@ msgstr "autocompletar [bash|zsh|fish|powershell]"
msgid "autocomplete failed: %s"
msgstr ""
#: cli/app/new.go:391
#: cli/app/new.go:371
msgid "automatically generate secrets"
msgstr ""
@ -2072,7 +2109,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:399
#: cli/app/backup.go:148 cli/app/cp.go:30 cli/app/deploy.go:385
#: cli/app/rollback.go:361 cli/app/upgrade.go:471
msgid "c"
msgstr ""
@ -2208,8 +2245,8 @@ 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:374
#: cli/app/labels.go:142 cli/app/new.go:396 cli/app/ps.go:212
#: cli/app/cmd.go:284 cli/app/cp.go:384 cli/app/deploy.go:360
#: cli/app/labels.go:142 cli/app/new.go:376 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
@ -2571,7 +2608,7 @@ msgstr ""
msgid "deploy labels stanza present"
msgstr ""
#: cli/app/deploy.go:409
#: cli/app/deploy.go:395
#, fuzzy
msgid "deploy latest recipe version"
msgstr "Publicar una nueva versión de una receta"
@ -2674,11 +2711,11 @@ msgstr ""
msgid "dirty: %v, "
msgstr ""
#: cli/app/deploy.go:401 cli/app/rollback.go:363 cli/app/upgrade.go:473
#: cli/app/deploy.go:387 cli/app/rollback.go:363 cli/app/upgrade.go:473
msgid "disable converge logic checks"
msgstr ""
#: cli/app/deploy.go:393 cli/app/rollback.go:355 cli/app/upgrade.go:465
#: cli/app/deploy.go:379 cli/app/rollback.go:355 cli/app/upgrade.go:465
msgid "disable public DNS checks"
msgstr ""
@ -2699,11 +2736,11 @@ msgstr ""
msgid "docker: is the daemon running / your user has docker permissions?"
msgstr ""
#: cli/app/new.go:372
#: cli/app/new.go:352
msgid "domain"
msgstr ""
#: cli/app/new.go:375
#: cli/app/new.go:355
msgid "domain name for app"
msgstr ""
@ -2923,7 +2960,7 @@ msgstr ""
#. translators: `abra recipe fetch` aliases. use a comma separated list of aliases
#. with no spaces in between
#: cli/app/deploy.go:383 cli/app/remove.go:163 cli/app/rollback.go:345
#: cli/app/deploy.go:369 cli/app/remove.go:163 cli/app/rollback.go:345
#: cli/app/secret.go:593 cli/app/upgrade.go:455 cli/app/volume.go:217
#: cli/recipe/fetch.go:20 cli/recipe/fetch.go:138
msgid "f"
@ -3161,7 +3198,7 @@ msgstr ""
msgid "for %s read env %s with value: %s from docker service"
msgstr ""
#: cli/app/deploy.go:382 cli/app/remove.go:162 cli/app/rollback.go:344
#: cli/app/deploy.go:368 cli/app/remove.go:162 cli/app/rollback.go:344
#: cli/app/upgrade.go:454 cli/app/volume.go:216 cli/recipe/fetch.go:137
msgid "force"
msgstr ""
@ -3201,12 +3238,12 @@ msgstr "regenerar [recipe] [flags]"
msgid "generate all secrets"
msgstr ""
#: pkg/secret/secret.go:67 pkg/secret/secret.go:85
#: pkg/secret/secret.go:62 pkg/secret/secret.go:80
#, c-format
msgid "generated %s"
msgstr ""
#: pkg/secret/secret.go:278
#: pkg/secret/secret.go:268
#, c-format
msgid "generated and stored %v on %s"
msgstr ""
@ -3383,8 +3420,8 @@ 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:377
#: cli/app/labels.go:145 cli/app/new.go:399 cli/app/ps.go:215
#: cli/app/cmd.go:287 cli/app/cp.go:387 cli/app/deploy.go:363
#: cli/app/labels.go:145 cli/app/new.go:379 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
@ -3583,7 +3620,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:407 cli/app/logs.go:20
#: cli/app/cmd.go:261 cli/app/deploy.go:393 cli/app/logs.go:20
#: cli/recipe/lint.go:17 cli/server/add.go:207
msgid "l"
msgstr ""
@ -3593,7 +3630,7 @@ msgstr ""
msgid "labels <domain> [flags]"
msgstr "etiquetas <domain> [flags]"
#: cli/app/deploy.go:406 cli/app/list.go:183
#: cli/app/deploy.go:392 cli/app/list.go:183
msgid "latest"
msgstr ""
@ -3788,7 +3825,7 @@ msgstr ""
msgid "missing arguments or --all/-a flag"
msgstr ""
#: pkg/secret/secret.go:131
#: pkg/secret/secret.go:126
#, c-format
msgid "missing version for secret? (%s)"
msgstr ""
@ -3957,7 +3994,7 @@ msgstr ""
msgid "no containers matching the %v filter found?"
msgstr ""
#: cli/app/new.go:292 cli/internal/validate.go:129
#: cli/app/new.go:272 cli/internal/validate.go:129
msgid "no domain provided"
msgstr ""
@ -4017,7 +4054,7 @@ msgstr ""
msgid "no secrets to remove?"
msgstr ""
#: cli/app/new.go:341 cli/internal/validate.go:167
#: cli/app/new.go:321 cli/internal/validate.go:167
msgid "no server provided"
msgstr ""
@ -4077,11 +4114,11 @@ msgstr ""
msgid "no volumes to remove"
msgstr ""
#: cli/app/deploy.go:398 cli/app/rollback.go:360 cli/app/upgrade.go:470
#: cli/app/deploy.go:384 cli/app/rollback.go:360 cli/app/upgrade.go:470
msgid "no-converge-checks"
msgstr ""
#: cli/app/deploy.go:390 cli/app/rollback.go:352 cli/app/upgrade.go:462
#: cli/app/deploy.go:376 cli/app/rollback.go:352 cli/app/upgrade.go:462
msgid "no-domain-checks"
msgstr ""
@ -4098,7 +4135,7 @@ msgstr ""
msgid "not enough arguments: %s"
msgstr ""
#: pkg/secret/secret.go:124
#: pkg/secret/secret.go:119
msgid "not generating app secrets, none enabled in recipe config"
msgstr ""
@ -4160,7 +4197,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:381 cli/app/ps.go:29
#: cli/app/backup.go:295 cli/app/new.go:361 cli/app/ps.go:29
#: cli/app/secret.go:561 cli/app/secret.go:585 cli/app/secret.go:625
#: cli/app/undeploy.go:163 cli/catalogue/catalogue.go:294
#: cli/recipe/list.go:112 cli/recipe/release.go:672 cli/server/prune.go:18
@ -4202,7 +4239,7 @@ msgstr ""
msgid "parsing recipe version failed: %s"
msgstr ""
#: cli/app/new.go:380 cli/app/secret.go:560 cli/app/secret.go:584
#: cli/app/new.go:360 cli/app/secret.go:560 cli/app/secret.go:584
#: cli/app/secret.go:624
msgid "pass"
msgstr ""
@ -4225,7 +4262,7 @@ msgstr ""
msgid "pattern"
msgstr ""
#: cli/app/deploy.go:385 cli/app/remove.go:165 cli/app/rollback.go:347
#: cli/app/deploy.go:371 cli/app/remove.go:165 cli/app/rollback.go:347
#: cli/app/upgrade.go:457 cli/app/volume.go:219
msgid "perform action without further prompt"
msgstr ""
@ -4804,7 +4841,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:326 cli/app/logs.go:101 cli/app/new.go:358
#: cli/app/list.go:326 cli/app/logs.go:101 cli/app/new.go:338
#: 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
@ -4825,7 +4862,7 @@ msgstr ""
msgid "searching abra.sh for version for %s"
msgstr ""
#: pkg/secret/secret.go:149
#: pkg/secret/secret.go:139
#, c-format
msgid "secret %s is > %d chars when combined with %s"
msgstr ""
@ -4849,33 +4886,28 @@ msgstr ""
msgid "secret not found: %s"
msgstr ""
#: cli/app/deploy.go:324
#: cli/app/deploy.go:310
#, c-format
msgid "secret not generated: %s"
msgstr ""
#: cli/app/deploy.go:322
#, c-format
msgid "secret not inserted (#generate=false): %s"
msgstr ""
#: cli/app/remove.go:123
#, c-format
msgid "secret: %s removed"
msgstr ""
#: cli/app/backup.go:302 cli/app/new.go:388
#: cli/app/backup.go:302 cli/app/new.go:368
msgid "secrets"
msgstr ""
#: cli/app/new.go:228
#: cli/app/new.go:208
#, c-format
msgid "secrets are %s shown again, please save them %s"
msgstr ""
#. translators: `abra server` command for autocompletion
#: cli/app/list.go:325 cli/app/list.go:332 cli/app/new.go:357
#: cli/app/new.go:364 cli/run.go:101
#: cli/app/list.go:325 cli/app/list.go:332 cli/app/new.go:337
#: cli/app/new.go:344 cli/run.go:101
msgid "server"
msgstr ""
@ -4977,7 +5009,7 @@ msgstr ""
msgid "severity"
msgstr ""
#: cli/app/deploy.go:417 cli/app/rollback.go:371 cli/app/upgrade.go:489
#: cli/app/deploy.go:403 cli/app/rollback.go:371 cli/app/upgrade.go:489
msgid "show all configs & images, including unchanged ones"
msgstr ""
@ -5001,7 +5033,7 @@ msgstr ""
msgid "show debug messages"
msgstr ""
#: cli/app/deploy.go:414 cli/app/rollback.go:368 cli/app/upgrade.go:486
#: cli/app/deploy.go:400 cli/app/rollback.go:368 cli/app/upgrade.go:486
msgid "show-unchanged"
msgstr ""
@ -5009,7 +5041,7 @@ msgstr ""
msgid "since"
msgstr ""
#: cli/app/new.go:326
#: cli/app/new.go:306
#, c-format
msgid "single server detected, choosing %s automatically"
msgstr ""
@ -5057,7 +5089,7 @@ msgstr ""
msgid "skipping domain checks, no DOMAIN=... configured"
msgstr ""
#: pkg/secret/secret.go:217
#: pkg/secret/secret.go:207
#, c-format
msgid "skipping generation of %s (generate=false)"
msgstr ""
@ -5089,7 +5121,7 @@ msgstr ""
msgid "specify secret value"
msgstr ""
#: cli/app/new.go:360
#: cli/app/new.go:340
msgid "specify server for new app"
msgstr ""
@ -5149,7 +5181,7 @@ msgstr ""
msgid "store generated secrets in a local pass store"
msgstr ""
#: cli/app/new.go:383
#: cli/app/new.go:363
msgid "store secrets in a local pass store"
msgstr ""
@ -5305,7 +5337,7 @@ msgstr ""
msgid "trim input"
msgstr ""
#: cli/app/new.go:253 pkg/app/app.go:141
#: cli/app/new.go:233 pkg/app/app.go:141
#, c-format
msgid "trimming %s to %s to avoid runtime limits"
msgstr ""
@ -5812,32 +5844,32 @@ msgstr ""
msgid "version wiped from %s.env"
msgstr ""
#: cli/app/deploy.go:351
#: cli/app/deploy.go:337
#, c-format
msgid "version: can not redeploy chaos version %s"
msgstr ""
#: cli/app/deploy.go:338
#: cli/app/deploy.go:324
#, c-format
msgid "version: taking chaos version: %s"
msgstr ""
#: cli/app/deploy.go:359
#: cli/app/deploy.go:345
#, c-format
msgid "version: taking deployed version: %s"
msgstr ""
#: cli/app/deploy.go:364
#: cli/app/deploy.go:350
#, c-format
msgid "version: taking new recipe version: %s"
msgstr ""
#: cli/app/deploy.go:353
#: cli/app/deploy.go:339
#, c-format
msgid "version: taking version from .env file: %s"
msgstr ""
#: cli/app/deploy.go:344
#: cli/app/deploy.go:330
#, c-format
msgid "version: taking version from cli arg: %s"
msgstr ""
@ -5963,7 +5995,7 @@ msgstr ""
msgid "writer: %v, "
msgstr ""
#: cli/app/deploy.go:262 cli/app/new.go:241 cli/app/rollback.go:248
#: cli/app/deploy.go:262 cli/app/new.go:221 cli/app/rollback.go:248
#: cli/app/undeploy.go:114 cli/app/upgrade.go:294
#, c-format
msgid "writing recipe version failed: %s"

View File

@ -50,11 +50,6 @@ type Secret struct {
// Will have this remote name:
// test_example_com_test_pass_two_v2
RemoteName string
// LocalName iis the name of the secret in the recipe config. This is also
// the name that you pass to `abra app secret insert` and is shown on `abra
// app secret list`
LocalName string
}
// GeneratePassword generates passwords.
@ -138,12 +133,7 @@ func ReadSecretsConfig(appEnvPath string, composeFiles []string, stackName strin
lastIdx := strings.LastIndex(secretConfig.Name, "_")
secretVersion := secretConfig.Name[lastIdx+1:]
value := Secret{
Version: secretVersion,
RemoteName: secretConfig.Name,
LocalName: secretId,
}
value := Secret{Version: secretVersion, RemoteName: secretConfig.Name}
if len(value.RemoteName) > config.MAX_DOCKER_SECRET_LENGTH {
return nil, errors.New(i18n.G("secret %s is > %d chars when combined with %s", secretId, config.MAX_DOCKER_SECRET_LENGTH, stackName))

View File

@ -367,21 +367,6 @@ teardown(){
run $ABRA app deploy "$TEST_APP_DOMAIN" --no-input --no-converge-checks
assert_failure
assert_output --partial "secret not generated"
}
@test "error if secret not inserted" {
run sed -i 's/COMPOSE_FILE="compose.yml"/COMPOSE_FILE="compose.yml:compose.skip_pass.yml"/g' \
"$ABRA_DIR/servers/$TEST_SERVER/$TEST_APP_DOMAIN.env"
assert_success
run sed -i 's/#SECRET_TEST_SKIP_PASS_VERSION=v1/SECRET_TEST_SKIP_PASS_VERSION=v1/g' \
"$ABRA_DIR/servers/$TEST_SERVER/$TEST_APP_DOMAIN.env"
assert_success
run $ABRA app deploy "$TEST_APP_DOMAIN" --no-input --no-converge-checks
assert_failure
assert_output --partial "secret not inserted"
}
# bats test_tags=slow

View File

@ -22,15 +22,8 @@ teardown(){
_reset_recipe
_reset_tags
if [[ -f "$ABRA_DIR/recipes/$TEST_RECIPE/foo" ]]; then
run rm -rf "$ABRA_DIR/recipes/$TEST_RECIPE/foo"
assert_not_exists "$ABRA_DIR/recipes/$TEST_RECIPE/foo"
fi
if [[ -f "$ABRA_DIR/servers/$TEST_SERVER/rauthy.$TEST_APP_DOMAIN.env" ]]; then
run rm -rf "$ABRA_DIR/servers/$TEST_SERVER/rauthy.$TEST_APP_DOMAIN.env"
assert_not_exists "$ABRA_DIR/servers/$TEST_SERVER/rauthy.$TEST_APP_DOMAIN.env"
fi
run rm -rf "$ABRA_DIR/recipes/$TEST_RECIPE/foo"
assert_not_exists "$ABRA_DIR/recipes/$TEST_RECIPE/foo"
}
@test "create new app" {
@ -277,32 +270,3 @@ teardown(){
assert_success
refute_output --partial "requires secret generation"
}
@test "do not warn about generation when generate=false" {
run $ABRA app new --domain "$TEST_APP_DOMAIN" renovate "1.0.1+41-full"
assert_success
refute_output --partial "requires secret generation"
}
@test "warn about insertion when generate=false" {
run $ABRA app new --domain "$TEST_APP_DOMAIN" renovate "1.0.1+41-full"
assert_success
assert_output --partial "requires secret insertion"
}
@test "warn about both insert/generate when generate=false/true" {
run $ABRA app new rauthy "1.0.0+0.32.3" \
--no-input \
--server "$TEST_SERVER" \
--domain "rauthy.$TEST_APP_DOMAIN"
assert_success
assert_exists "$ABRA_DIR/servers/$TEST_SERVER/rauthy.$TEST_APP_DOMAIN.env"
assert_output --partial "requires secret generation"
assert_output --partial "requires secret insertion"
}
@test "no warn about generation if already generated" {
run $ABRA app new "$TEST_RECIPE" --domain "$TEST_APP_DOMAIN" --secrets
assert_success
refute_output --partial "requires secret generation"
}