0
0
forked from toolshed/abra

Compare commits

..

1 Commits

Author SHA1 Message Date
d575131d5b fix(overview): Adds linebreak after compose file in deploy overview 2025-02-10 16:08:19 +01:00
3 changed files with 9 additions and 10 deletions

View File

@ -49,11 +49,11 @@ var AppSecretGenerateCommand = &cobra.Command{
log.Fatal(err)
}
if len(args) <= 2 && !generateAllSecrets {
if len(args) == 1 && !generateAllSecrets {
log.Fatal("missing arguments [secret]/[version] or '--all'")
}
if len(args) > 2 && generateAllSecrets {
if len(args) > 1 && generateAllSecrets {
log.Fatal("cannot use '[secret] [version]' and '--all' together")
}

View File

@ -49,7 +49,7 @@ func NewVersionOverview(
releaseNotes string) error {
deployConfig := "compose.yml"
if composeFiles, ok := app.Env["COMPOSE_FILE"]; ok {
deployConfig = composeFiles
deployConfig = formatComposeFiles(composeFiles)
}
server := app.Server
@ -128,6 +128,10 @@ func NewVersionOverview(
return nil
}
func formatComposeFiles(composeFiles string) string {
return strings.ReplaceAll(composeFiles, ":", "\n")
}
// DeployOverview shows a deployment overview
func DeployOverview(
app appPkg.App,
@ -140,7 +144,7 @@ func DeployOverview(
) error {
deployConfig := "compose.yml"
if composeFiles, ok := app.Env["COMPOSE_FILE"]; ok {
deployConfig = composeFiles
deployConfig = formatComposeFiles(composeFiles)
}
server := app.Server
@ -225,7 +229,7 @@ func UndeployOverview(
) error {
deployConfig := "compose.yml"
if composeFiles, ok := app.Env["COMPOSE_FILE"]; ok {
deployConfig = composeFiles
deployConfig = formatComposeFiles(composeFiles)
}
server := app.Server

View File

@ -41,11 +41,6 @@ teardown(){
run $ABRA app secret generate "$TEST_APP_DOMAIN"
assert_failure
assert_output --partial 'missing arguments'
run $ABRA app secret generate "$TEST_APP_DOMAIN" test_pass_one
assert_failure
assert_output --partial 'missing arguments'
run $ABRA app secret generate "$TEST_APP_DOMAIN" testSecret testVersion --all
assert_failure