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

Fix env var deep merge order on worker #16045

Merged
merged 3 commits into from
Nov 18, 2024
Merged

Conversation

kevingrismore
Copy link
Contributor

Changes merge order so overlapping keys select deployment env vars over work pool env vars.

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 Nov 18, 2024

CodSpeed Performance Report

Merging #16045 will not alter performance

Comparing fix-env-deep-merge-order (15f1e66) with main (c2a3fb5)

Summary

✅ 3 untouched benchmarks

@kevingrismore kevingrismore added the fix A fix for a bug in an existing feature label Nov 18, 2024
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.

thank you! just a couple requests

src/prefect/workers/base.py Outdated Show resolved Hide resolved
tests/workers/test_base_worker.py Outdated Show resolved Hide resolved
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 d1e15a0 into main Nov 18, 2024
36 checks passed
@kevingrismore kevingrismore deleted the fix-env-deep-merge-order branch November 18, 2024 20:35
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
fix A fix for a bug in an existing feature
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants