From 790dbca362a31777f2d986d050882447ec525438 Mon Sep 17 00:00:00 2001 From: p4u1 Date: Mon, 8 Jul 2024 16:20:38 +0200 Subject: [PATCH] feat!: remove all catalogue reads from app commands --- cli/app/deploy.go | 20 +------------------- cli/app/list.go | 9 +-------- cli/app/new.go | 2 +- cli/app/rollback.go | 22 +--------------------- cli/app/upgrade.go | 21 +-------------------- cli/catalogue/catalogue.go | 2 +- cli/recipe/version.go | 2 +- pkg/recipe/git.go | 2 +- 8 files changed, 8 insertions(+), 72 deletions(-) diff --git a/cli/app/deploy.go b/cli/app/deploy.go index 46249174..aa4f3367 100644 --- a/cli/app/deploy.go +++ b/cli/app/deploy.go @@ -15,7 +15,6 @@ import ( "coopcloud.tech/abra/pkg/git" "coopcloud.tech/abra/pkg/lint" "coopcloud.tech/abra/pkg/log" - "coopcloud.tech/abra/pkg/recipe" "coopcloud.tech/abra/pkg/upstream/stack" "github.com/urfave/cli" ) @@ -121,27 +120,10 @@ EXAMPLE: } if !internal.Chaos && specificVersion == "" { - catl, err := recipe.ReadRecipeCatalogue(internal.Offline) + versions, err := app.Recipe.Tags() if err != nil { log.Fatal(err) } - versions, err := recipe.GetRecipeCatalogueVersions(app.Recipe.Name, catl) - if err != nil { - log.Fatal(err) - } - - if len(versions) == 0 && !internal.Chaos { - log.Debug("no published versions in catalogue, trying local recipe repository") - recipeVersions, err := app.Recipe.GetRecipeVersions(internal.Offline) - if err != nil { - log.Fatal(err) - } - for _, recipeVersion := range recipeVersions { - for version := range recipeVersion { - versions = append(versions, version) - } - } - } if len(versions) > 0 && !internal.Chaos { version = versions[len(versions)-1] diff --git a/cli/app/list.go b/cli/app/list.go index 407a39cb..20fa2acc 100644 --- a/cli/app/list.go +++ b/cli/app/list.go @@ -11,7 +11,6 @@ import ( appPkg "coopcloud.tech/abra/pkg/app" "coopcloud.tech/abra/pkg/formatter" "coopcloud.tech/abra/pkg/log" - "coopcloud.tech/abra/pkg/recipe" "coopcloud.tech/tagcmp" "github.com/urfave/cli" ) @@ -101,7 +100,6 @@ can take some time.`, sort.Sort(appPkg.ByServerAndRecipe(apps)) statuses := make(map[string]map[string]string) - var catl recipe.RecipeCatalogue if status { alreadySeen := make(map[string]bool) for _, app := range apps { @@ -114,11 +112,6 @@ can take some time.`, if err != nil { log.Fatal(err) } - - catl, err = recipe.ReadRecipeCatalogue(internal.Offline) - if err != nil { - log.Fatal(err) - } } var totalServersCount int @@ -182,7 +175,7 @@ can take some time.`, var newUpdates []string if version != "unknown" { - updates, err := recipe.GetRecipeCatalogueVersions(app.Recipe.Name, catl) + updates, err := app.Recipe.Tags() if err != nil { log.Fatal(err) } diff --git a/cli/app/new.go b/cli/app/new.go index 2ef010bc..9a81c581 100644 --- a/cli/app/new.go +++ b/cli/app/new.go @@ -78,7 +78,7 @@ var appNewCommand = cli.Command{ if c.Args().Get(1) == "" { var version string - recipeVersions, err := recipe.GetRecipeVersions(internal.Offline) + recipeVersions, err := recipe.GetRecipeVersions() if err != nil { log.Fatal(err) } diff --git a/cli/app/rollback.go b/cli/app/rollback.go index 91a4e6dd..366d3127 100644 --- a/cli/app/rollback.go +++ b/cli/app/rollback.go @@ -8,7 +8,6 @@ import ( "coopcloud.tech/abra/pkg/autocomplete" "coopcloud.tech/abra/pkg/envfile" "coopcloud.tech/abra/pkg/lint" - "coopcloud.tech/abra/pkg/recipe" stack "coopcloud.tech/abra/pkg/upstream/stack" "coopcloud.tech/tagcmp" @@ -75,30 +74,11 @@ EXAMPLE: log.Fatalf("%s is not deployed?", app.Name) } - catl, err := recipe.ReadRecipeCatalogue(internal.Offline) + versions, err := app.Recipe.Tags() if err != nil { log.Fatal(err) } - versions, err := recipe.GetRecipeCatalogueVersions(app.Recipe.Name, catl) - if err != nil { - log.Fatal(err) - } - - if len(versions) == 0 { - log.Debug("no published versions in catalogue, trying local recipe repository") - recipeVersions, err := app.Recipe.GetRecipeVersions(internal.Offline) - if err != nil { - log.Fatal(err) - } - - for _, recipeVersion := range recipeVersions { - for version := range recipeVersion { - versions = append(versions, version) - } - } - } - var availableDowngrades []string if deployMeta.Version == "unknown" { availableDowngrades = versions diff --git a/cli/app/upgrade.go b/cli/app/upgrade.go index 54b79730..69198151 100644 --- a/cli/app/upgrade.go +++ b/cli/app/upgrade.go @@ -11,7 +11,6 @@ import ( "coopcloud.tech/abra/pkg/envfile" "coopcloud.tech/abra/pkg/lint" "coopcloud.tech/abra/pkg/log" - recipePkg "coopcloud.tech/abra/pkg/recipe" stack "coopcloud.tech/abra/pkg/upstream/stack" "coopcloud.tech/tagcmp" "github.com/AlecAivazis/survey/v2" @@ -75,29 +74,11 @@ EXAMPLE: log.Fatalf("%s is not deployed?", app.Name) } - catl, err := recipePkg.ReadRecipeCatalogue(internal.Offline) + versions, err := app.Recipe.Tags() if err != nil { log.Fatal(err) } - versions, err := recipePkg.GetRecipeCatalogueVersions(app.Recipe.Name, catl) - if err != nil { - log.Fatal(err) - } - - if len(versions) == 0 { - log.Debug("no published versions in catalogue, trying local recipe repository") - recipeVersions, err := app.Recipe.GetRecipeVersions(internal.Offline) - if err != nil { - log.Fatal(err) - } - for _, recipeVersion := range recipeVersions { - for version := range recipeVersion { - versions = append(versions, version) - } - } - } - var availableUpgrades []string if deployMeta.Version == "unknown" { availableUpgrades = versions diff --git a/cli/catalogue/catalogue.go b/cli/catalogue/catalogue.go index bcfe3505..27069680 100644 --- a/cli/catalogue/catalogue.go +++ b/cli/catalogue/catalogue.go @@ -91,7 +91,7 @@ keys configured on your account.`, continue } - versions, err := r.GetRecipeVersions(internal.Offline) + versions, err := r.GetRecipeVersions() if err != nil { log.Warn(err) } diff --git a/cli/recipe/version.go b/cli/recipe/version.go index 74efbd34..a0069bc0 100644 --- a/cli/recipe/version.go +++ b/cli/recipe/version.go @@ -48,7 +48,7 @@ var recipeVersionCommand = cli.Command{ if !ok { log.Warn("no published versions in catalogue, trying local recipe repository") - recipeVersions, err := recipe.GetRecipeVersions(internal.Offline) + recipeVersions, err := recipe.GetRecipeVersions() if err != nil { log.Warn(err) } diff --git a/pkg/recipe/git.go b/pkg/recipe/git.go index 851e3229..775c7491 100644 --- a/pkg/recipe/git.go +++ b/pkg/recipe/git.go @@ -292,7 +292,7 @@ func (r Recipe) Tags() ([]string, error) { } // GetRecipeVersions retrieves all recipe versions. -func (r Recipe) GetRecipeVersions(offline bool) (RecipeVersions, error) { +func (r Recipe) GetRecipeVersions() (RecipeVersions, error) { versions := RecipeVersions{} log.Debugf("attempting to open git repository in %s", r.Dir)