Address event correlation issues in the awx_display callback #1345
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
sivel
commented
Mar 13, 2024
| @@ -311,7 +295,15 @@ def wrapper(*args, **kwargs): | |||
| return wrapper | |||
|
|
|||
|
|
|||
| Display.display = display_with_context(Display.display) | |||
| for _display_attr in ('banner', 'deprecated', 'display', 'error', | |||
| 'system_warning', 'verbose', 'warning'): | |||
There was a problem hiding this comment.
The display events "supported" by awx are only:
(0, 'debug', _('Debug'), False),
(0, 'verbose', _('Verbose'), False),
(0, 'deprecated', _('Deprecated'), False),
(0, 'warning', _('Warning'), False),
(0, 'system_warning', _('System Warning'), False),
(0, 'error', _('Error'), True),
This would potentially apply to unclassified_display too. Although the previous monkeypatching didn't exclude banner.
sivel
commented
Mar 13, 2024
| @@ -386,14 +386,14 @@ def _emit_event(self, | |||
| event_data = self._current_event_data | |||
| stdout_chunks = [buffered_stdout] | |||
| elif buffered_stdout: | |||
| event_data = dict({'event': 'verbose'}) | |||
| event_data = dict({'event': 'unclassified_display'}) | |||
There was a problem hiding this comment.
There was a problem hiding this comment.
All of the CI failures appear to be related to this, where verbose is being excluded, or depended on. I'm not sure we can make this change, but I'd prefer to not just classify any unknown display event as verbose if possible.
sivel
commented
Mar 13, 2024
| C.config.initialize_plugin_configuration_definitions( | ||
| 'callback', self._load_name, base_config | my_config | ||
| ) | ||
| return super().set_options(*args, **kwargs) |
There was a problem hiding this comment.
Not related, but since I'm in here making a mess, this fixes the options issue with callbacks not matching the default from a config perspective.
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.
No description provided.