Skip to content
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

Include env defaults from variables.properties.env in deep merge #15692

Merged
merged 6 commits into from
Oct 21, 2024

Conversation

kevingrismore
Copy link
Contributor

The deep merge for env from the deployment->work pool only worked if the env vars were written directly into the template. This copies down the defaults to include them in the deep merge as well.

Checklist

  • This pull request references any related issue by including "closes <link to issue>"
    • If no issue exists and your change is not a small fix, please create an issue first.
  • If this pull request adds new functionality, it includes unit tests that cover the changes
  • If this pull request removes docs files, it includes redirect settings in mint.json.
  • If this pull request adds functions or classes, it includes helpful docstrings.

Copy link

codspeed-hq bot commented Oct 14, 2024

CodSpeed Performance Report

Merging #15692 will not alter performance

Comparing fix-worker-env-deep-merge (759cd1b) with main (dcf250b)

Summary

✅ 3 untouched benchmarks

@kevingrismore kevingrismore marked this pull request as ready for review October 14, 2024 21:12
@kevingrismore
Copy link
Contributor Author

This one has a weird feel to it, very open to suggestions for other solutions.

Copy link
Collaborator

@zzstoatzz zzstoatzz left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

after talking sync, the change makes sense to me

but for the test, can we just parameterize the base job template and have one parameterized test?

Copy link
Collaborator

@zzstoatzz zzstoatzz left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

lgtm!

@kevingrismore kevingrismore merged commit c78feea into main Oct 21, 2024
34 checks passed
@kevingrismore kevingrismore deleted the fix-worker-env-deep-merge branch October 21, 2024 16:46
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants