-
Notifications
You must be signed in to change notification settings - Fork 23.7k
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 loading vars_plugins in roles #82273
Merged
s-hertel
merged 6 commits into
ansible:devel
from
s-hertel:fix-clearing-vars-plugin-cache
Jan 26, 2024
Merged
Changes from all commits
Commits
Show all changes
6 commits
Select commit
Hold shift + click to select a range
383e0ce
fix loading vars_plugins in roles
s-hertel a97f73b
fix handling legacy/builtin vars plugins that need to be enabled - do…
s-hertel 5b413e5
remove extra exception handling
s-hertel fc65a63
dicts are ordered in 3.7+
s-hertel d1cca17
Don't reload cache until it's reset
s-hertel 3711be8
Update lib/ansible/vars/plugins.py
s-hertel File filter
Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
There are no files selected for viewing
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,2 @@ | ||
bugfixes: | ||
- Fix loading vars_plugins in roles (https://github.com/ansible/ansible/issues/82239). |
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
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
3 changes: 3 additions & 0 deletions
3
test/integration/targets/old_style_vars_plugins/roles/a/tasks/main.yml
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,3 @@ | ||
- assert: | ||
that: | ||
- auto_role_var is defined |
11 changes: 11 additions & 0 deletions
11
test/integration/targets/old_style_vars_plugins/roles/a/vars_plugins/auto_role_vars.py
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,11 @@ | ||
from __future__ import annotations | ||
|
||
from ansible.plugins.vars import BaseVarsPlugin | ||
|
||
|
||
class VarsModule(BaseVarsPlugin): | ||
# Implicitly | ||
# REQUIRES_ENABLED = False | ||
|
||
def get_vars(self, loader, path, entities): | ||
return {'auto_role_var': True} |
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
Oops, something went wrong.
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.
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.
I used vars_loader._paths here as opposed to (for example) vars_loader._search_paths because I'm assuming we don't want to extend
OLD_PLUGIN_CACHE_CLEARING
to new caches.I moved this into the vars plugin loader too.<- Actually can't, it duplicates any stateless enabled plugins.