fix: nuance of generate=false for app deploy
This commit is contained in:
@ -300,6 +300,16 @@ func validateArgsAndFlags(args []string) error {
|
|||||||
}
|
}
|
||||||
|
|
||||||
func validateSecrets(cl *dockerClient.Client, app appPkg.App) 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)
|
secStats, err := secret.PollSecretsStatus(cl, app)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return err
|
return err
|
||||||
@ -307,6 +317,10 @@ func validateSecrets(cl *dockerClient.Client, app appPkg.App) error {
|
|||||||
|
|
||||||
for _, secStat := range secStats {
|
for _, secStat := range secStats {
|
||||||
if !secStat.CreatedOnRemote {
|
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))
|
return errors.New(i18n.G("secret not generated: %s", secStat.LocalName))
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user