fix: respect COMPOSE_FILE when loading compose files

Final part of coop-cloud/go-abra#57.

cli/app/deploy.go

@@ -3,11 +3,9 @@ package app
 import (
 	"errors"
 	"fmt"
-	"path/filepath"
 
 	"coopcloud.tech/abra/cli/internal"
 	"coopcloud.tech/abra/client"
-	loader "coopcloud.tech/abra/client/stack"
 	stack "coopcloud.tech/abra/client/stack"
 	"coopcloud.tech/abra/config"
 	"github.com/sirupsen/logrus"
@@ -39,12 +37,6 @@ var appDeployCommand = &cli.Command{
 			logrus.Fatal(err)
 		}
 
-		pattern := fmt.Sprintf("%s/%s/compose**yml", config.APPS_DIR, appEnv.Type)
-		composeFiles, err := filepath.Glob(pattern)
-		if err != nil {
-			logrus.Fatal(err)
-		}
-
 		abraShPath := fmt.Sprintf("%s/%s/%s", config.APPS_DIR, appEnv.Type, "abra.sh")
 		abraShEnv, err := config.ReadAbraShEnvVars(abraShPath)
 		if err != nil {
@@ -55,13 +47,17 @@ var appDeployCommand = &cli.Command{
 		}
 		appEnv.Env["STACK_NAME"] = appEnv.StackName()
 
+		composeFiles, err := config.GetAppComposeFiles(appEnv.Type, appEnv.Env)
+		if err != nil {
+			logrus.Fatal(err)
+		}
 		deployOpts := stack.Deploy{
 			Composefiles: composeFiles,
 			Namespace:    appEnv.StackName(),
 			Prune:        false,
 			ResolveImage: stack.ResolveImageAlways,
 		}
-		compose, err := loader.LoadComposefile(deployOpts, appEnv.Env)
+		compose, err := config.GetAppComposeConfig(appName, deployOpts, appEnv.Env)
 		if err != nil {
 			logrus.Fatal(err)
 		}