forked from toolshed/abra
Compare commits
1 Commits
overview-c
...
fix-panic-
Author | SHA1 | Date | |
---|---|---|---|
4facfea7c2 |
@ -49,11 +49,11 @@ var AppSecretGenerateCommand = &cobra.Command{
|
|||||||
log.Fatal(err)
|
log.Fatal(err)
|
||||||
}
|
}
|
||||||
|
|
||||||
if len(args) == 1 && !generateAllSecrets {
|
if len(args) <= 2 && !generateAllSecrets {
|
||||||
log.Fatal("missing arguments [secret]/[version] or '--all'")
|
log.Fatal("missing arguments [secret]/[version] or '--all'")
|
||||||
}
|
}
|
||||||
|
|
||||||
if len(args) > 1 && generateAllSecrets {
|
if len(args) > 2 && generateAllSecrets {
|
||||||
log.Fatal("cannot use '[secret] [version]' and '--all' together")
|
log.Fatal("cannot use '[secret] [version]' and '--all' together")
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -49,7 +49,7 @@ func NewVersionOverview(
|
|||||||
releaseNotes string) error {
|
releaseNotes string) error {
|
||||||
deployConfig := "compose.yml"
|
deployConfig := "compose.yml"
|
||||||
if composeFiles, ok := app.Env["COMPOSE_FILE"]; ok {
|
if composeFiles, ok := app.Env["COMPOSE_FILE"]; ok {
|
||||||
deployConfig = formatComposeFiles(composeFiles)
|
deployConfig = composeFiles
|
||||||
}
|
}
|
||||||
|
|
||||||
server := app.Server
|
server := app.Server
|
||||||
@ -128,10 +128,6 @@ func NewVersionOverview(
|
|||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
func formatComposeFiles(composeFiles string) string {
|
|
||||||
return strings.ReplaceAll(composeFiles, ":", "\n")
|
|
||||||
}
|
|
||||||
|
|
||||||
// DeployOverview shows a deployment overview
|
// DeployOverview shows a deployment overview
|
||||||
func DeployOverview(
|
func DeployOverview(
|
||||||
app appPkg.App,
|
app appPkg.App,
|
||||||
@ -144,7 +140,7 @@ func DeployOverview(
|
|||||||
) error {
|
) error {
|
||||||
deployConfig := "compose.yml"
|
deployConfig := "compose.yml"
|
||||||
if composeFiles, ok := app.Env["COMPOSE_FILE"]; ok {
|
if composeFiles, ok := app.Env["COMPOSE_FILE"]; ok {
|
||||||
deployConfig = formatComposeFiles(composeFiles)
|
deployConfig = composeFiles
|
||||||
}
|
}
|
||||||
|
|
||||||
server := app.Server
|
server := app.Server
|
||||||
@ -229,7 +225,7 @@ func UndeployOverview(
|
|||||||
) error {
|
) error {
|
||||||
deployConfig := "compose.yml"
|
deployConfig := "compose.yml"
|
||||||
if composeFiles, ok := app.Env["COMPOSE_FILE"]; ok {
|
if composeFiles, ok := app.Env["COMPOSE_FILE"]; ok {
|
||||||
deployConfig = formatComposeFiles(composeFiles)
|
deployConfig = composeFiles
|
||||||
}
|
}
|
||||||
|
|
||||||
server := app.Server
|
server := app.Server
|
||||||
|
@ -41,6 +41,11 @@ teardown(){
|
|||||||
|
|
||||||
run $ABRA app secret generate "$TEST_APP_DOMAIN"
|
run $ABRA app secret generate "$TEST_APP_DOMAIN"
|
||||||
assert_failure
|
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
|
run $ABRA app secret generate "$TEST_APP_DOMAIN" testSecret testVersion --all
|
||||||
assert_failure
|
assert_failure
|
||||||
|
Reference in New Issue
Block a user