feat: Resolve root level symlinked folders in Layers #6236
Merged
Conversation
This file contains 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
github-actions
bot
added
area/local/start-api
mndeveci
reviewed
Nov 9, 2023
Comment on lines
182
to
185
| # eg. `.aws-sam/build/MyLayer` + `nodejs` | ||
| artifact_layer_path = Path(layer.codeuri, layer_folder) | ||
| # eg. `/opt` + `nodejs` | ||
| container_bind_path = Path(LambdaImage._LAYERS_DIR, layer_folder) |
There was a problem hiding this comment.
Curious, what happens if there are multiple layers used by the function? Are we going to accept that last one will replace the earlier mappings?
There was a problem hiding this comment.
Updated, turns out that the tar library includes an option that lets it resolve symlinks for us. No need to write custom logic to do this. This will let us have multiple layers that are merged together, the same as it works now pre-symlink.
mildaniel
approved these changes
Nov 14, 2023
mndeveci
approved these changes
Nov 15, 2023
github-merge-queue bot
pushed a commit
that referenced
this pull request
Dec 5, 2023
* feat: Added event tracking for feature (#5872) * Added event tracking for feature * Correctly pass event value and fix typing * feat: Resolve symlinks at root level and mount to container (#5870) * Resolve symlinks at root level and mount to container * Continue early instead of nesting in if statement * make format * Added integration test * make format * Use node project to test local deps and building in source * Removed old test data * Update test class name to reference testing symlinks * Use correct skip decorator from unittest * Changed mount mode to read only * Removed the removed mount parameter in tests * Remove kwarg in method call * feat: Build in source click option (#5951) * Added skeleton for build in source click option * Fix tests and renamed option * Added description and updated click option to include build * Disable build tests again until esbuild resolution fix * Revert template change * Make hook name option mutually exclusive with build in source * Fix integration test message assert * chore(tests): Enable build in souce build command tests (#6099) * chore(tests): Node build in source test (#6132) * Added nodejs tests * make format * Enable retries * Run build test inside of a scratch directory * make format * Updated Makefile test to properly use scratch directory and moved source copy to setup * Changed copytree call to in house version * Removed redundant parent method calling * make format * chore: Bump Nodejs version in AppVeyor job configuration (#6210) * Bump npm version to 10.2.3 for linux testing * Upgrade node to 18.18.2 * chore(tests): Build in source sync temp folder (#6166) * Enable and use new test data folder paths * Added nodejs tests * feat: Resolve root level symlinked folders in Layers (#6236) * Resolve Layer symlinks before mounting container * Use .get instead of if else * Added integration tests * Unprivate static method and make format * Create paths using pathlib * Remove debug flag * Revert "Resolve Layer symlinks before mounting container" This reverts commit e557067. * Resolve links when creating tarfile for Docker build call * make format * Removed debug line * Updated arugment with optional typing * feat: Add additional default excludes and exclude option for sync (#6299) * Add additional default excludes and exclude option * Updated test and option definition * Updated option and added tests * Update resource match to consider nested stacks * Handle parameters saved in samconfig * fix: Fix sync tests not cleaning up correctly and Linux watch behaviour (#6372) * Use develop version of Lambda Builders * Run nodejs local dep command in scratch directory and clean up aws-sam folder * Exclude the folder of the modified file from trigger sync flows on Linux * Revert "Use develop version of Lambda Builders" This reverts commit fde143e. * Add test validing ignoring Linux modified folder events * Fix test
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.
Which issue(s) does this change fix?
None.
Why is this change necessary?
As a result of the new build in source behaviour, Nodejs Layers will contain a
node_modulesfolder that is a symbolic link to the sourcenode_modules. Mounting this will not work in Docker.How does it address the issue?
Resolves this link using the same logic as Functions before the container is created.
What side effects does this change have?
All Layers that contain symlinked resources at the root level will be resolved.
Mandatory Checklist
PRs will only be reviewed after checklist is complete
make prpassesmake update-reproducible-reqsif dependencies were changedBy submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.