-
Notifications
You must be signed in to change notification settings - Fork 1.2k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
chore: merge from develop branch #4179
Merged
moelasmar
merged 28 commits into
aws:develop-terraform-hooks
from
moelasmar:develop_tf_hooks_merge_from_develop
Sep 1, 2022
Merged
chore: merge from develop branch #4179
moelasmar
merged 28 commits into
aws:develop-terraform-hooks
from
moelasmar:develop_tf_hooks_merge_from_develop
Sep 1, 2022
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
…3d7cea636fe5220d) (aws#4087) Co-authored-by: GitHub Action <[email protected]>
…-maps is provided (aws#4062) * Added support to only specific Sourcemap or NODE_OPTIONS to enable source map usage * Added unit tests * Added warning message about improper NODE_OPTIONS usage * Fixed enabling source maps too late * Added missing space in string join * Improved clarity in enable source map function * Changed wording of variable from 'incorrect' to 'invalid' * Fixed comments and make pr * Adding missing newline * Changed warning message to make it clear they need to remove both options * Improved log message to include function name
* create symlink during cached build & use first built folder for de-dup builds * add experimental flag and unit tests * add adl use case * create osutil function * create osutil function * update integration tests * format files * Rename feature flag * Add comment and make shared constant Co-authored-by: Daniel Mil <[email protected]> Co-authored-by: Daniel Mil <[email protected]> Co-authored-by: Qingchuan Ma <[email protected]>
* Added --on-failure DO_NOTHING to deploy and updated unit tests * Added --on-failure to sam deploy * Resolved linting type hint * Updated tests * Added string cast * Added missing parameter and fix make pr issues * Added console log statements * Fixed describe stack events reporting wrong events * Revert removal of method and its tests * Added test to check output on stack update * Fix make black * Removed unnecessary parameter for execution time. * Updated rollback logic and fixed unit tests * Added integ test and disable error message on DELETE * Added additional test for rollback waiter * Addressed comments for PR Co-authored-by: Qingchuan Ma <[email protected]>
* Added esbuild integration tests to sam sync * Changed over to use experimental flag and removed esbuild assert * Removed redundant toggling of dep layer in test * Fix make black * Changed test files to Typescript
* exit when --config-file does not exist * Apply suggestions from code review Co-authored-by: Qingchuan Ma <[email protected]> * unit: add unit tests for a specified invalid config file. Co-authored-by: Cibin Mathew <[email protected]> Co-authored-by: Sriram Madapusi Vasudevan <[email protected]> Co-authored-by: Qingchuan Ma <[email protected]> Co-authored-by: Sriram Madapusi Vasudevan <[email protected]>
Co-authored-by: Lau <[email protected]>
* feat: Move esbuild binary to normal dependency * Suppress warning from test data
…ws#4108) * Support pipeline templates manifests in custom Git locations When a custom Git location is passed to `sam pipeline init`, the utility will first look for a valid pipeline template manifest in the repository's root. If one is found, the user will be prompted to choose which pipeline to create. If one is not found, the repository will be treated as a standard pipeline template.
…7d6d6473f09f20ce) (aws#4135) Co-authored-by: GitHub Action <[email protected]>
* Add project metadata tracking with telemetry (aws#3929) * Implement project metadata metrics * Implement metric metadata integration tests * Tweak methods so tests don't fail on Linux machines * Repair failing integration test * Implement proper exception handling for subprocesses * Format according to standard * Refactor function names and encryption logic * Remove unnecessary file * Add type hints to new functions * Fix retrieval process for directory name (aws#3962) * Implement event data structure and relevant unit tests (aws#3955) * Implement event data structure and relevant unit tests * Implement requested changes * Remove unused (useless) file * Remove unnecessary ABC class * Implement tracker methods (aws#3970) * Implement tracker methods * Improve readability of Event's __repr__ method * Add method to convert Event to dictionary for JSON-compatibility * Send Event metrics via Telemetry (aws#3979) * Send Event metrics via Telemetry * Add unit tests for event telemetry * Simplify event telemetry unit tests * Clean up unit tests * Add BuildRuntime event and trackers (aws#3994) * Add BuildRuntime Events * Remove unnecessary file * Prevent tracked Event 'spillage' from previous tests * Fix builder logic * Redefine BuildRuntime to focus on function runtimes * Remove unnecessary file (again) * Add UsedFeature event and trackers (aws#4003) * Add UsedFeature command and trackers * Remove LocalTest events Events regarding sam local will be implemented at a later time. * Prevent methods from failing if track_event fails * Reformat code to match current standard * Use correct string formatting * Use proper LOG message * Add thread lock to EventTracker (aws#4019) * Add thread lock to EventTracker * Place lock in appropriate methods * Refactor Event data structure (aws#4027) * Add new attributes to Event datastructure * Fix non-JSON-serializable field in Event * Fix repr to ensure SQL casting will work * Add comment for timestamp method clarity * Update tests to verify EventTracker thread lock is working (aws#4035) * Add send_events method to EventTracker (aws#4039) * Add framework for Event-sending method * Perform some general refactors and cleanup * Implement EventTracker Telemetry unit tests * Cleanup tests and unused imports * Update Metric name for consistency * Repair failing unit test * (Hopefully) repair broken integration test * *Actually* repair broken integration test I had the >= logic backwards lol * Fix integration test For sure this time * Really fix the integration test Windows development is not fun * Properly fix integration test * Reformat files * Implement requested changes * Add Lock logic to send_events method * Implement requested changes * Repair failing tests * Upgrade encryption algorithm from SHA-1 to SHA-256 (aws#4061) * Upgrade encryption algorithm from SHA1 to SHA256 * Make return value of hash JSON-serializable * Add long event tracker (aws#4067) * Send events via thread when at capacity (aws#4072) * Switch send_events to thread when at capacity * Repair failing unit test * Add `sam sync` Events (aws#4076) * Add sam sync Events * Refactor methods for tracking sync events * Improve SyncFlow tracking * Add additional SyncFlow value * Add workflow events (aws#4096) * Add workflow_config events * Refactor workflow Events * Add tests for verifying workflow events * Remove redundant (UsedFeature, ESBuild) event * Repair failing unit test * Rename workflow event to prevent ambiguity * Fix send_events logic (aws#4104) * Make minor tweaks before launch (aws#4111) * Apply minor changes (some major) * Add session_id for multithreaded send_events * Adjust tests for new multithreading * Fix failing integration test * *Actually* fix failing integration test * Properly fix integration test * This time for sure * Really really repair that test * OK this one SHOULD work I swear * This time for sure * FIX INTEGRATION TEST * IT'S A LIST * Remove unused imports * Add debug log for EventTracker session ID * Place debug log in better position Co-authored-by: Wing Fung Lau <[email protected]>
aws#4132) * Updated local_lambda.py to allow using mix of CF and Standard format env vars * Added/updated unit tests for local_lambda.py * Added integration tests for local invoke env vars from json file * Updated comments for mixed format * Enabled functionname to read env vars from json file Co-authored-by: Mohamed Elasmar <[email protected]>
…ws#4140) Co-authored-by: Jacob Fuss <[email protected]>
* feat: Disable adl for esbuild * Revert invalid change * Update declaration * Split into pre/post processing, add test case for globals * Black reformat
* PR aws#4044 has caused a regression.
* feat: Disable adl for esbuild * Revert invalid change * Update declaration * Split into pre/post processing, add test case for globals * Black reformat * fix: Update function provider after modifying stack * Black reformat * Add integration tests for sourcemap generation * Return public member instead of protected
…ws#4141) * Added stack trace information to telemetry * Fixed leading slash in relative path * Added stack trace information to telemetry * Fixed leading slash in relative path * Minor formatting changes * Modified filtering for non working directory case * Resolve merge conflicts * Fixed changes with commit history * Fixed typo in comment * Address CR comments to expand path cleaning cases * Fix for make pr * Revamped _get_stack_trace to be more robust to path extraction * Restructured for easier unit testing * Naming changes * Added exception message to telemetry Co-authored-by: Louis Liu <[email protected]> Co-authored-by: Jacob Fuss <[email protected]>
* fix: Fix esbuild build properties integration tests * Remove template initialization
* feat: Remove esbuild beta flag (aws#4120) * Removed esbuild beta flag * Error out and exit when --config-file does not exist (aws#4044) * exit when --config-file does not exist * Apply suggestions from code review Co-authored-by: Qingchuan Ma <[email protected]> * unit: add unit tests for a specified invalid config file. Co-authored-by: Cibin Mathew <[email protected]> Co-authored-by: Sriram Madapusi Vasudevan <[email protected]> Co-authored-by: Qingchuan Ma <[email protected]> Co-authored-by: Sriram Madapusi Vasudevan <[email protected]> * feat: Add option to CfnTag parameter to accept multiple values per key (aws#4103) * chore: Bump SamTranslator version to 1.50.0 (aws#4124) * chore: bump version to 1.55.0 (aws#4125) Co-authored-by: Lau <[email protected]> * Undo removal of beta word, removed unused imports and removed experimental calls * Removed unused import * Removed unused import Co-authored-by: Cibin Mathew <[email protected]> Co-authored-by: Cibin Mathew <[email protected]> Co-authored-by: Sriram Madapusi Vasudevan <[email protected]> Co-authored-by: Qingchuan Ma <[email protected]> Co-authored-by: Sriram Madapusi Vasudevan <[email protected]> Co-authored-by: JaredB <[email protected]> Co-authored-by: aws-sam-cli-bot <[email protected]> Co-authored-by: Wing Fung Lau <[email protected]> Co-authored-by: Lau <[email protected]> * Esbuild bug bash (aws#4146) * feat: Disable adl for esbuild * Revert invalid change * Update declaration * Split into pre/post processing, add test case for globals * Black reformat * Run docker images with latest lambda builders * Revert "Run docker images with latest lambda builders" This reverts commit 6177420. * Removed beta features flag from test * fix: Fixed URI path being resolved incorrectly and remove experimental call (aws#4175) * Fixed docker path being resolved automatically * Added unit test and removed experimental flag Co-authored-by: Cibin Mathew <[email protected]> Co-authored-by: Cibin Mathew <[email protected]> Co-authored-by: Sriram Madapusi Vasudevan <[email protected]> Co-authored-by: Qingchuan Ma <[email protected]> Co-authored-by: Sriram Madapusi Vasudevan <[email protected]> Co-authored-by: JaredB <[email protected]> Co-authored-by: aws-sam-cli-bot <[email protected]> Co-authored-by: Wing Fung Lau <[email protected]> Co-authored-by: Lau <[email protected]> Co-authored-by: Daniel Mil <[email protected]>
…00d57e00032370c7) (aws#4173) Co-authored-by: GitHub Action <[email protected]>
github-actions
bot
added
pr/internal
area/build
sam build command
area/deploy
sam deploy command
labels
Sep 1, 2022
hawflau
reviewed
Sep 1, 2022
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Should we use squash merge or merge commit? Thinking when we merge this branch to develop
in the future, we might encounter merge conflicts
I think we should do merge commit. |
torresxb1
approved these changes
Sep 1, 2022
hawflau
approved these changes
Sep 1, 2022
…oks' into develop # Conflicts: # samcli/commands/_utils/experimental.py
moelasmar
force-pushed
the
develop_tf_hooks_merge_from_develop
branch
from
September 1, 2022 20:54
49813a9
to
c7d28da
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Labels
area/build
sam build command
area/deploy
sam deploy command
area/pipeline
area/sync
sam sync command
pr/internal
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.
By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.