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

16
cli/app/deploy.go
View File

@ -6,10 +6,8 @@ import (
"strings"
"coopcloud.tech/abra/cli/internal"
"coopcloud.tech/abra/pkg/app"
"coopcloud.tech/abra/pkg/autocomplete"
"coopcloud.tech/abra/pkg/config"
"coopcloud.tech/abra/pkg/envfile"
"coopcloud.tech/abra/pkg/secret"
appPkg "coopcloud.tech/abra/pkg/app"
@ -130,13 +128,9 @@ checkout as-is. Recipe commit hashes are also supported as values for
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 {
@ -202,7 +196,7 @@ checkout as-is. Recipe commit hashes are also supported as values for
}
// 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)
}
@ -269,7 +263,7 @@ checkout as-is. Recipe commit hashes are also supported as values for
},
}
func getLatestVersionOrCommit(app app.App) (string, error) {
func getLatestVersionOrCommit(app appPkg.App) (string, error) {
versions, err := app.Recipe.Tags()
if err != nil {
return "", err
@ -304,7 +298,7 @@ func validateArgsAndFlags(args []string) error {
return nil
}
func validateSecrets(cl *dockerClient.Client, app app.App) error {
func validateSecrets(cl *dockerClient.Client, app appPkg.App) error {
secStats, err := secret.PollSecretsStatus(cl, app)
if err != nil {
return err
@ -319,7 +313,7 @@ func validateSecrets(cl *dockerClient.Client, app app.App) error {
return nil
}
func getDeployVersion(cliArgs []string, deployMeta stack.DeployMeta, app app.App) (string, error) {
func getDeployVersion(cliArgs []string, deployMeta stack.DeployMeta, app appPkg.App) (string, error) {
// Chaos mode overrides everything
if internal.Chaos {
v, err := app.Recipe.ChaosVersion()