Move mergeAbraShEnv and use it in deploy, rollback, upgrade #638

New Issue

3wordchant · 2025-09-02T00:44:07Z

3wordchant commented

2025-09-02 00:44:07 +00:00

kadabra has a handy mergeAbraShEnv function, we could potentially use it in regular app deploy / app upgrade / app rollback.

kadabra has [a handy `mergeAbraShEnv` function](https://git.coopcloud.tech/toolshed/abra/src/branch/main/cli/updater/updater.go#L338-L351), we could potentially use it in regular `app deploy` / `app upgrade` / `app rollback`.

decentral1se commented

2025-09-02 07:38:10 +00:00

I believe that is already the case 👁️‍🗨️ I don't think that's documented anywhere for operators to know that these env vars will be put into the app env? I guess it's more for getting config versions and not arbitrary env vars for which the .env should be used?

> grep -iR ReadAbraShEnvVars
cli/app/upgrade.go:             abraShEnv, err := envfile.ReadAbraShEnvVars(app.Recipe.AbraShPath)
cli/app/rollback.go:            abraShEnv, err := envfile.ReadAbraShEnvVars(app.Recipe.AbraShPath)
cli/app/deploy.go:              abraShEnv, err := envfile.ReadAbraShEnvVars(app.Recipe.AbraShPath)
cli/updater/updater.go: abraShEnv, err := envfile.ReadAbraShEnvVars(recipe.AbraShPath)

I believe that is already the case 👁️‍🗨️ I don't think that's documented anywhere for operators to know that these env vars will be put into the app env? I guess it's more for getting config versions and not arbitrary env vars for which the `.env` should be used? ```bash > grep -iR ReadAbraShEnvVars cli/app/upgrade.go: abraShEnv, err := envfile.ReadAbraShEnvVars(app.Recipe.AbraShPath) cli/app/rollback.go: abraShEnv, err := envfile.ReadAbraShEnvVars(app.Recipe.AbraShPath) cli/app/deploy.go: abraShEnv, err := envfile.ReadAbraShEnvVars(app.Recipe.AbraShPath) cli/updater/updater.go: abraShEnv, err := envfile.ReadAbraShEnvVars(recipe.AbraShPath) ```

3wordchant commented

2025-09-02 15:48:34 +00:00

Ah sorry for being unclear.

cli/updater/updater.go (kadabra) has this:

// 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
}

The other 3 all copypasta the for loop, e.g. cli/app/deploy.go#345:

abraShEnv, err := envfile.ReadAbraShEnvVars(app.Recipe.AbraShPath)
if err != nil {
	log.Fatal(err)
}
for k, v := range abraShEnv {
	app.Env[k] = v
}

So we'd be saving uhh 2 lines per instance by replacing with mergeAbraShEnv, maybe not worth doing idk.

Ah sorry for being unclear. `cli/updater/updater.go` (kadabra) has this: ```golang // 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 } ``` The other 3 all copypasta the for loop, e.g. [`cli/app/deploy.go#345`](https://git.coopcloud.tech/toolshed/abra/src/branch/main/cli/app/deploy.go#L129-L135): ```golang abraShEnv, err := envfile.ReadAbraShEnvVars(app.Recipe.AbraShPath) if err != nil { log.Fatal(err) } for k, v := range abraShEnv { app.Env[k] = v } ``` So we'd be saving uhh 2 lines per instance by replacing with `mergeAbraShEnv`, maybe not worth doing idk.

👍 1

decentral1se commented

2025-09-02 21:30:56 +00:00

Ah gotcha, nah it sounds legit! There's loads of duplication and "moving fast"-isms around the codebase, so feel free go for stuff. If the tests pass then it's usually good to blast stuff out. The integration suite is pretty gnarly so we can be confident if it passes.

👍 1

3wordchant referenced this issue from a commit

2025-09-03 17:33:01 +00:00

Move MergeAbraShEnv to shared method

3wordchant referenced this issue from a commit

2025-09-06 18:18:31 +00:00

Move MergeAbraShEnv to shared method

3wordchant referenced this issue from a commit

2025-09-09 02:07:02 +00:00

Move MergeAbraShEnv to shared method

3wordchant referenced this issue from a commit

2025-09-09 02:12:34 +00:00