From 560e0eab868067332b76a8d7d43334148e4e6981 Mon Sep 17 00:00:00 2001 From: cellarspoon Date: Sat, 1 Jan 2022 22:01:16 +0100 Subject: [PATCH] fix: ensure catalogue is present --- cli/recipe/list.go | 9 +++++++++ cli/recipe/version.go | 11 +++++++++++ 2 files changed, 20 insertions(+) diff --git a/cli/recipe/list.go b/cli/recipe/list.go index cc337889..ad4edb2d 100644 --- a/cli/recipe/list.go +++ b/cli/recipe/list.go @@ -2,11 +2,14 @@ package recipe import ( "fmt" + "path" "sort" "strconv" "strings" + "coopcloud.tech/abra/pkg/config" "coopcloud.tech/abra/pkg/formatter" + gitPkg "coopcloud.tech/abra/pkg/git" "coopcloud.tech/abra/pkg/recipe" "github.com/sirupsen/logrus" "github.com/urfave/cli/v2" @@ -29,6 +32,12 @@ var recipeListCommand = &cli.Command{ patternFlag, }, Action: func(c *cli.Context) error { + catalogueDir := path.Join(config.ABRA_DIR, "catalogue") + url := fmt.Sprintf("%s/%s.git", config.REPOS_BASE_URL, "recipes") + if err := gitPkg.Clone(catalogueDir, url); err != nil { + return err + } + catl, err := recipe.ReadRecipeCatalogue() if err != nil { logrus.Fatal(err.Error()) diff --git a/cli/recipe/version.go b/cli/recipe/version.go index 48dd7fce..f5f6f0a1 100644 --- a/cli/recipe/version.go +++ b/cli/recipe/version.go @@ -1,9 +1,14 @@ package recipe import ( + "fmt" + "path" + "coopcloud.tech/abra/cli/internal" "coopcloud.tech/abra/pkg/autocomplete" + "coopcloud.tech/abra/pkg/config" "coopcloud.tech/abra/pkg/formatter" + gitPkg "coopcloud.tech/abra/pkg/git" recipePkg "coopcloud.tech/abra/pkg/recipe" "github.com/sirupsen/logrus" "github.com/urfave/cli/v2" @@ -18,6 +23,12 @@ var recipeVersionCommand = &cli.Command{ Action: func(c *cli.Context) error { recipe := internal.ValidateRecipe(c) + catalogueDir := path.Join(config.ABRA_DIR, "catalogue") + url := fmt.Sprintf("%s/%s.git", config.REPOS_BASE_URL, "recipes") + if err := gitPkg.Clone(catalogueDir, url); err != nil { + return err + } + catalogue, err := recipePkg.ReadRecipeCatalogue() if err != nil { logrus.Fatal(err)