[services] Fix issue where env var is ignored #1570
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
mikeland73
force-pushed
the
landau/fix-services-regression
branch
from
0a855a8 to
ecf452a
Compare
savil
reviewed
Oct 19, 2023
| @@ -19,7 +20,6 @@ | |||
| "init_db": "initdb", | |||
| "run_test": [ | |||
| "mkdir -p /tmp/devbox/lapp", | |||
| "export PGHOST=/tmp/devbox/lapp", | |||
There was a problem hiding this comment.
TODO savil: come back to this change. Refer to slack convo b/w mike and john
| @@ -22,6 +23,7 @@ | |||
| "run_test": [ | |||
| "mkdir -p /tmp/devbox/lepp", | |||
| "export PGHOST=/tmp/devbox/lepp", | |||
| "rm -rf .devbox/virtenv/postgresql/data", | |||
There was a problem hiding this comment.
This just makes testing easier by making run_test more idempotent.
| @@ -9,7 +9,8 @@ | |||
| "env": { | |||
| "NGINX_WEB_PORT": "8089", | |||
| "NGINX_WEB_ROOT": "../../../my_app", | |||
| "PGPORT": "5433" | |||
| "PGPORT": "5433", | |||
| "PGHOST": "/tmp/devbox/lepp" | |||
There was a problem hiding this comment.
do we need this if we're exporting PGHOST in run_test?
internal/boxcli/services.go
Outdated
| Short: "Interact with devbox services", | ||
| Short: "Interact with devbox services.", | ||
| Long: "Interact with devbox services. Services start in a new shell. " + | ||
| "Plugin services use envrinment variables specified by plugin unless " + |
| @@ -526,15 +538,22 @@ func (d *Devbox) Services() (services.Services, error) { | |||
| return result, nil | |||
| } | |||
|
|
|||
| func (d *Devbox) StartServices(ctx context.Context, serviceNames ...string) error { | |||
| if !d.IsEnvEnabled() { | |||
There was a problem hiding this comment.
🤔 I did re-implement this function in the PathStack PR. I wonder if that update caused this bug.
internal/impl/envpath/pathlists.go
Outdated
| @@ -35,3 +36,22 @@ func JoinPathLists(pathLists ...string) string { | |||
| } | |||
| return strings.Join(cleaned, string(filepath.ListSeparator)) | |||
| } | |||
|
|
|||
| func RemoveFromPath(path, pathToRemove string) string { | |||
| paths := strings.Split(path, string(os.PathListSeparator)) | |||
There was a problem hiding this comment.
nit: can use filepath.SplitList
| } | ||
|
|
||
| // Join the modified paths using ":" as the delimiter | ||
| newPath := strings.Join(newPaths, string(os.PathListSeparator)) |
There was a problem hiding this comment.
filepath.Join is for directory paths! not for path lists!
e.g. /path/to/my/file vs path1:path2:path3
savil
approved these changes
Oct 19, 2023
| } | ||
|
|
||
| // Join the modified paths using ":" as the delimiter | ||
| newPath := strings.Join(newPaths, string(os.PathListSeparator)) |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Summary
Fixes #1565
The bugs:
--env-file(and possibly via other methods) are ignored in nginx config.Intermediate causes:
envsubstbinary was a bin wrapped binary. This was resetting the env vars. Fix: Never use bin wrappers when inside adevbox run(This was previously only scoped to using the CLI command explicitly, but now we do it any time we use RunScript function)Root cause:
Sorry in advance for all the boolean params. We should move to structs, but I didn't want to make those changes here.
How was it tested?
envsubstregression in0.7.0#1565.