-
Notifications
You must be signed in to change notification settings - Fork 3.5k
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
feat: remove collection support for oauth #15623
feat: remove collection support for oauth #15623
Conversation
68ed9a5
to
634d445
Compare
From output:
Our collection often can not comply with the Ansible sanity rules because of the dual-versioning system where it vendors as both |
5fa8667
to
310cb6f
Compare
310cb6f
to
b490ef2
Compare
14e0988
to
e052876
Compare
788938f
to
327d784
Compare
@AlanCoding I think I need the CLI PR merged first. The CI fails when testing the |
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.
Just a couple of small comments, otherwise this looks good.
awx_collection/tools/roles/template_galaxy/templates/README.md.j2
Outdated
Show resolved
Hide resolved
327d784
to
299e0cc
Compare
That's just a single failure, and a legitimate point of overlap between the two PRs. I don't see any problem with us both making the same obvious change (deleting applications from options and use), and it likely won't require manual intervention in the rebase. |
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.
One collection test needs "application" removed in one place and then this is otherwise in good shape.
@AlanCoding The parameters are retrieved automatically from an API/and-or whatever is available in AWXKIT so that is why we would need to merge #15613 (or maybe #15588 too) first before the CI passes |
#15613 has another blocker that I'd like to not block this with. Maybe you can skip around that test or something temporarily since it'll be resolved by the other merge anyway. Otherwise I was expecting this to merge first, but we can get together and coordinate order if needed. I'll go ahead and approve because my comment was self-evident from the checks anyway. |
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.
Remaining issues are related to merge-order coordination. This should be otherwise ready to go and I don't see any reason to delay.
Request to merge into feature branch |
self.connection.login(username=self.username, password=self.password) | ||
self.authenticated = True | ||
self.connection.login(username=self.username, password=self.password) | ||
self.authenticated = True |
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.
This is the merge conflict and my branch actually has:
MERGE: fix conflicts with removal of OAuth2 token from collection branch
So there's no lack of clarity there (take this diff). We just need to formally have that happen.
a9ef11c
into
ansible:feature_token_removal
Quality Gate passedIssues Measures |
Co-authored-by: Alan Rominger <[email protected]>
SUMMARY
ISSUE TYPE
COMPONENT NAME
AWX VERSION
ADDITIONAL INFORMATION