Webhook_credential field validation updates #14843 #14844
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
github-actions
bot
added
component:awx_collection
thedoubl3j
reviewed
Feb 7, 2024
| @@ -575,8 +575,11 @@ def main(): | |||
| new_fields['project'] = project_data['id'] | |||
| else: | |||
| new_fields['project'] = module.resolve_name_to_id('projects', project) | |||
| if webhook_credential is not None: | |||
|
|
|||
| if webhook_credential is not None and webhook_credential != '': | |||
There was a problem hiding this comment.
What happens if the user leaves off webhook credential? This seems like this would set it to None.
We have no set pattern for this but you have sparked @jbradberry interest.
There was a problem hiding this comment.
@kk-at-redhat I believe correct logic needs to distinguish the case "user didn't include this key-value" and "user explicitly set it to something empty/false", which only using module.params.get(...) with the default None fallback doesn't get us. I'm thinking something like:
if 'webhook_credential' in module.params:
if webhook_credential:
new_fields['webhook_credential'] = module.resolve_name_to_id('credentials', webhook_credential)
else:
new_fields['webhook_credential'] = None
There was a problem hiding this comment.
Similar logic could be used for #14841
dmzoneill
changed the title
jbradberry
force-pushed
the
webhook_credential_fix
branch
from
433ed05 to
436204b
Compare
|
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.
SUMMARY
Allow webhook_credential in ansible.controller.job_template to accept empty value and remove s=any existing selections in that field.
related #14843
ISSUE TYPE
COMPONENT NAME