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

refactor(recipe): move GetComposeFiles to new struct

Browse Source
This commit is contained in:
p4u1
2024-07-08 12:06:58 +02:00
parent ca1db33e97
commit 99da8d4e57
12 changed files with 70 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
pkg/app/app.go
View File

@ -161,7 +161,8 @@ func (a App) Filters(appendServiceNames, exactMatch bool, services ...string) (f
return filters, nil
}
composeFiles, err := recipe.GetComposeFiles(a.Recipe, a.Env)
r := recipe.Get2(a.Recipe)
composeFiles, err := r.GetComposeFiles(a.Env)
if err != nil {
return filters, err
}
@ -317,7 +318,8 @@ func GetAppServiceNames(appName string) ([]string, error) {
return serviceNames, err
}
composeFiles, err := recipe.GetComposeFiles(app.Recipe, app.Env)
r := recipe.Get2(app.Recipe)
composeFiles, err := r.GetComposeFiles(app.Env)
if err != nil {
return serviceNames, err
}

6
pkg/app/app_test.go
View File

@ -85,7 +85,8 @@ func TestGetComposeFiles(t *testing.T) {
}
for _, test := range tests {
composeFiles, err := recipe.GetComposeFiles(r.Name, test.appEnv)
r2 := recipe.Get2(r.Name)
composeFiles, err := r2.GetComposeFiles(test.appEnv)
if err != nil {
t.Fatal(err)
}
@ -106,7 +107,8 @@ func TestGetComposeFilesError(t *testing.T) {
}
for _, test := range tests {
_, err := recipe.GetComposeFiles(r.Name, test.appEnv)
r2 := recipe.Get2(r.Name)
_, err := r2.GetComposeFiles(test.appEnv)
if err == nil {
t.Fatalf("should have failed: %v", test.appEnv)
}