toolshed/abra
4
2
Fork 18
Code Issues 25 Pull Requests 1 Packages Releases 41 Activity

Move MergeAbraShEnv to shared method

Browse Source 
Re #638
This commit is contained in:
3wc
2025-09-03 13:32:30 -04:00
parent 3a8158c8d0
commit 0777177113
5 changed files with 32 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
cli/updater/updater.go
View File

@ -11,6 +11,7 @@ import (
"coopcloud.tech/abra/cli/internal"
appPkg "coopcloud.tech/abra/pkg/app"
"coopcloud.tech/abra/pkg/client"
"coopcloud.tech/abra/pkg/deploy"
"coopcloud.tech/abra/pkg/envfile"
"coopcloud.tech/abra/pkg/i18n"
"coopcloud.tech/abra/pkg/lint"
@ -335,21 +336,6 @@ func processRecipeRepoVersion(r recipe.Recipe, version string) error {
return nil
}
// mergeAbraShEnv merges abra.sh env vars into the app env vars.
func mergeAbraShEnv(recipe recipe.Recipe, env envfile.AppEnv) error {
abraShEnv, err := envfile.ReadAbraShEnvVars(recipe.AbraShPath)
if err != nil {
return err
}
for k, v := range abraShEnv {
log.Debugf("read v:%s k: %s", v, k)
env[k] = v
}
return nil
}
// createDeployConfig merges and enriches the compose config for the deployment.
func createDeployConfig(r recipe.Recipe, stackName string, env envfile.AppEnv) (*composetypes.Config, stack.Deploy, error) {
env["STACK_NAME"] = stackName
@ -444,7 +430,7 @@ func upgrade(cl *dockerclient.Client, stackName, recipeName, upgradeVersion stri
return err
}
if err = mergeAbraShEnv(app.Recipe, app.Env); err != nil {
if err = deploy.MergeAbraShEnv(app.Recipe, app.Env); err != nil {
return err
}