toolshed/abra
4
2
Fork 18
Code Issues 26 Pull Requests 3 Packages Releases 41 Activity

refactor: move MergeAbraShEnv to shared method

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

12
cli/app/rollback.go
View File

@ -4,12 +4,10 @@ import (
"errors"
"strings"
"coopcloud.tech/abra/pkg/app"
appPkg "coopcloud.tech/abra/pkg/app"
"coopcloud.tech/abra/pkg/autocomplete"
"coopcloud.tech/abra/pkg/config"
"coopcloud.tech/abra/pkg/deploy"
"coopcloud.tech/abra/pkg/envfile"
"coopcloud.tech/abra/pkg/formatter"
"coopcloud.tech/abra/pkg/i18n"
"coopcloud.tech/abra/pkg/lint"
@ -156,13 +154,9 @@ beforehand. See "abra app backup" for more.`),
log.Fatal(err)
}
abraShEnv, err := envfile.ReadAbraShEnvVars(app.Recipe.AbraShPath)
if err != nil {
if err := deploy.MergeAbraShEnv(app.Recipe, app.Env); err != nil {
log.Fatal(err)
}
for k, v := range abraShEnv {
app.Env[k] = v
}
composeFiles, err := app.Recipe.GetComposeFiles(app.Env)
if err != nil {
@ -198,7 +192,7 @@ beforehand. See "abra app backup" for more.`),
}
// Gather configs
configInfo, err := deploy.GatherConfigsForDeploy(cl, app, compose, abraShEnv)
configInfo, err := deploy.GatherConfigsForDeploy(cl, app, compose, app.Env)
if err != nil {
log.Fatal(err)
}
@ -289,7 +283,7 @@ func chooseDowngrade(
// validateDownpgradeVersionArg validates the specific version.
func validateDowngradeVersionArg(
specificVersion string,
app app.App,
app appPkg.App,
deployMeta stack.DeployMeta,
) error {
parsedDeployedVersion, err := tagcmp.Parse(deployMeta.Version)