Fix auto PATH ordering #938
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
Missing delimiter strikes again
schneems
commented
Apr 29, 2025
schneems
commented
May 13, 2025
The docs stated that we're appending the layer-bin path. With this change we're now prepending it to align with lifecycle.
873bf84 to
cf6b9f0
Compare
Malax
requested changes
May 15, 2025
There was a problem hiding this c 8000 omment.
Thanks for working on this. I have two small code suggestions. I also took the liberty to refactor the tests in cf6b9f0. I found them hard to grasp and they had some things in them that didn't matter to the issue under test and are tested already. LMK if you're fine with those changes.
Before:
```
thread 'layer_env::tests::layer_paths_come_before_manually_added_paths' panicked at libcnb/src/layer_env.rs:944:13:
assertion `left == right` failed
left: Some("/var/folders/yr/yytf3z3n3q336f1tj2b2j0gw0000gn/T/.tmpKPAfq0/bin:test-value")
right: Some("test-value/var/folders/yr/yytf3z3n3q336f1tj2b2j0gw0000gn/T/.tmpKPAfq0/bin")
```
After:
```
thread 'layer_env::tests::layer_paths_come_before_manually_added_paths' panicked at libcnb/src/layer_env.rs:944:13:
assertion `left == right` failed: For ENV var `PATH` scope `Build`
left: Some("/var/folders/yr/yytf3z3n3q336f1tj2b2j0gw0000gn/T/.tmpaCmToR/bin:test-value")
right: Some("test-value/var/folders/yr/yytf3z3n3q336f1tj2b2j0gw0000gn/T/.tmpaCmToR/bin")
note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace
```
Co-authored-by: Manuel Fuchs <manuel.fuchs@salesforce.com> Signed-off-by: Richard Schneeman <richard.schneeman+no-recruiters@gmail.com>
|
Applied all suggestions. Your test seems good. I made a small addition to emit the env var and scope on failure aef08b6. Ready for re-review. |
Malax
approved these changes
May 19, 2025
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.
In #900, I observed that the path of a layer's
./bindir (if present) is appended to any explicitly added paths by CNB lifecycle. Libcnb instead prepends the path.This is fixed to match the upstream implementation by changing the order of path evaluation.
Close #900