From 8aac9e450d3578b0f7f62802eed29c1d0f1d5ac2 Mon Sep 17 00:00:00 2001 From: Moritz Date: Thu, 26 Jan 2023 21:54:58 +0100 Subject: [PATCH] pull recipe and lint it --- cli/updater/updater.go | 11 +++++++++++ pkg/recipe/recipe.go | 3 +-- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/cli/updater/updater.go b/cli/updater/updater.go index cde87089..85802c89 100644 --- a/cli/updater/updater.go +++ b/cli/updater/updater.go @@ -10,6 +10,7 @@ import ( "coopcloud.tech/abra/cli/internal" "coopcloud.tech/abra/pkg/client" "coopcloud.tech/abra/pkg/config" + "coopcloud.tech/abra/pkg/lint" "coopcloud.tech/abra/pkg/recipe" "coopcloud.tech/abra/pkg/upstream/convert" "coopcloud.tech/abra/pkg/upstream/stack" @@ -232,6 +233,16 @@ func upgrade(cl *dockerclient.Client, stackName string, recipeName string) { if err := recipe.EnsureExists(recipeName); err != nil { logrus.Fatal(err) } + if err := recipe.EnsureUpToDate(recipeName); err != nil { + logrus.Fatal(err) + } + r, err := recipe.Get(app.Recipe) + if err != nil { + logrus.Fatal(err) + } + if err := lint.LintForErrors(r); err != nil { + logrus.Fatal(err) + } if err := recipe.EnsureVersion(recipeName, chosenUpgrade); err != nil { logrus.Fatal(err) } diff --git a/pkg/recipe/recipe.go b/pkg/recipe/recipe.go index acc167d4..e226de50 100644 --- a/pkg/recipe/recipe.go +++ b/pkg/recipe/recipe.go @@ -310,8 +310,7 @@ func EnsureVersion(recipeName, version string) error { logrus.Debugf("read %s as tags for recipe %s", strings.Join(parsedTags, ", "), recipeName) if tagRef.String() == "" { - logrus.Warnf("no published release discovered for %s", recipeName) - return nil + return fmt.Errorf("no published release discovered for %s", recipeName) } worktree, err := repo.Worktree()