codegod100/abra
0
0
Fork 0
forked from toolshed/abra
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: sync recipes from remotes

Browse Source
This commit is contained in:
cellarspoon
2021-12-24 16:06:29 +01:00
parent dddf84d92b
commit 14400d4ed8
2 changed files with 52 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
cli/internal/validate.go
View File

@ -25,7 +25,7 @@ func ValidateRecipe(c *cli.Context) recipe.Recipe {
ShowSubcommandHelpAndError(c, errors.New("no recipe provided"))
}
recipe, err := recipe.Get(recipeName)
chosenRecipe, err := recipe.Get(recipeName)
if err != nil {
if c.Command.Name == "generate" {
if strings.Contains(err.Error(), "missing a compose") {
@ -37,9 +37,13 @@ func ValidateRecipe(c *cli.Context) recipe.Recipe {
}
}
logrus.Debugf("validated '%s' as recipe argument", recipeName)
if err := recipe.EnsureUpToDate(recipeName); err != nil {
logrus.Fatal(err)
}
return recipe
logrus.Debugf("validated %s as recipe argument", recipeName)
return chosenRecipe
}
// ValidateRecipeWithPrompt ensures a recipe argument is present before
@ -93,14 +97,18 @@ func ValidateRecipeWithPrompt(c *cli.Context) recipe.Recipe {
ShowSubcommandHelpAndError(c, errors.New("no recipe provided"))
}
recipe, err := recipe.Get(recipeName)
chosenRecipe, err := recipe.Get(recipeName)
if err != nil {
logrus.Fatal(err)
}
if err := recipe.EnsureUpToDate(chosenRecipe.Name); err != nil {
logrus.Fatal(err)
}
logrus.Debugf("validated %s as recipe argument", recipeName)
return recipe
return chosenRecipe
}
// ValidateApp ensures the app name arg is valid.
@ -125,6 +133,10 @@ func ValidateApp(c *cli.Context) config.App {
logrus.Fatal(err)
}
if err := recipe.EnsureUpToDate(app.Type); err != nil {
logrus.Fatal(err)
}
if err := ssh.EnsureHostKey(app.Server); err != nil {
logrus.Fatal(err)
}