Fix deep merge for existing env on work-pools
#15325
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
zzstoatzz
force-pushed
the
deep-merge-logic
branch
from
1a4f290
to
79ce13c
Compare
CodSpeed Performance ReportMerging #15325 will not alter performanceComparing Summary
|
cicdw
requested changes
Sep 11, 2024
zzstoatzz
force-pushed
the
deep-merge-logic
branch
from
01b7bc5
to
905e833
Compare
desertaxle
approved these changes
Sep 11, 2024
Comment on lines
+1778
to
+1812
| @pytest.mark.parametrize( | ||
| "work_pool_env, deployment_env, flow_run_env, expected_env", | ||
| [ | ||
| ( | ||
| {}, | ||
| {"test-var": "foo"}, | ||
| {"another-var": "boo"}, | ||
| {"test-var": "foo", "another-var": "boo"}, | ||
| ), | ||
| ( | ||
| {"A": "1", "B": "2"}, | ||
| {"C": "3", "D": "4"}, | ||
| {}, | ||
| {"A": "1", "B": "2", "C": "3", "D": "4"}, | ||
| ), | ||
| ( | ||
| {"A": "1", "B": "2"}, | ||
| {"C": "42"}, | ||
| {"C": "3", "D": "4"}, | ||
| {"A": "1", "B": "2", "C": "3", "D": "4"}, | ||
| ), | ||
| ( | ||
| {"A": "1", "B": "2"}, | ||
| {"B": ""}, # will be treated as unset and not apply | ||
| {}, | ||
| {"A": "1", "B": "2"}, | ||
| ), | ||
| ], | ||
| ids=[ | ||
| "flow_run_into_deployment", | ||
| "deployment_into_work_pool", | ||
| "flow_run_into_work_pool", | ||
| "try_overwrite_with_empty_str", | ||
| ], | ||
| ) |
|
Since this is a worker change, does this (and the previous change, probably) need to be written again for the base push pool worker so push pool behavior is consistent with this? |
yes, i would say that is likely. great callout |
cicdw
approved these changes
Sep 11, 2024
Closed
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.
currently on
main, we correctly deep mergeenvlikedeployment | flow_run, but this merged result totally overwrites any hardcodedenvdefined directly on the work pool.this PR makes sure we deep merge the result of
deployment | flow_runwith anyenvthat may be defined on the work pool itself