toolshed/abra
4
2
Fork 18
Code Issues 32 Pull Requests 3 Packages Releases 40 Activity

refactor(recipe): load load compoes config where its used

Browse Source
This commit is contained in:
p4u1
2024-07-08 12:31:39 +02:00
parent 99da8d4e57
commit c1b03bcbd7
16 changed files with 263 additions and 230 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
cli/app/deploy.go
View File

@ -58,13 +58,8 @@ recipes.
log.Fatal("cannot use <version> and --chaos together")
}
r2 := recipe.Get2(app.Recipe)
if err := r2.Ensure(internal.Chaos, internal.Offline); err != nil {
log.Fatal(err)
}
r, err := recipe.Get(app.Recipe, internal.Offline)
if err != nil {
r := recipe.Get2(app.Recipe)
if err := r.Ensure(internal.Chaos, internal.Offline); err != nil {
log.Fatal(err)
}
@ -92,7 +87,7 @@ recipes.
if specificVersion != "" {
version = specificVersion
log.Debugf("choosing %s as version to deploy", version)
if err := r2.EnsureVersion(version); err != nil {
if err := r.EnsureVersion(version); err != nil {
log.Fatal(err)
}
}
@ -128,7 +123,7 @@ recipes.
if len(versions) == 0 && !internal.Chaos {
log.Warn("no published versions in catalogue, trying local recipe repository")
recipeVersions, err := recipe.GetRecipeVersions(app.Recipe, internal.Offline)
recipeVersions, err := r.GetRecipeVersions(internal.Offline)
if err != nil {
log.Warn(err)
}
@ -142,7 +137,7 @@ recipes.
if len(versions) > 0 && !internal.Chaos {
version = versions[len(versions)-1]
log.Debugf("choosing %s as version to deploy", version)
if err := r2.EnsureVersion(version); err != nil {
if err := r.EnsureVersion(version); err != nil {
log.Fatal(err)
}
} else {
@ -158,7 +153,7 @@ recipes.
if internal.Chaos {
log.Warnf("chaos mode engaged")
var err error
version, err = r2.ChaosVersion()
version, err = r.ChaosVersion()
if err != nil {
log.Fatal(err)
}
@ -173,7 +168,7 @@ recipes.
app.Env[k] = v
}
composeFiles, err := r2.GetComposeFiles(app.Env)
composeFiles, err := r.GetComposeFiles(app.Env)
if err != nil {
log.Fatal(err)
}