Integration Re-sync Bug Fix #6124
Conversation
saadmk11
added
PR: work in progress
|
@ericholscher This is done because previously we did not sync webhooks when we create an integration but now we do so. If for any reason the webhook fails to re-sync this tries to remove the |
|
Ugh, I broke something trying to push to this branch. Silly github :/ |
ericholscher
force-pushed
the
sync-bug-fix
branch
from
67cd06a to
79cdefb
Compare
|
Alright, fixed up the commits, and cleaned up some of the logic. I think it makes more sense now -- I'm not 100% sold on the GitHub |
readthedocs/oauth/services/github.py
Outdated
| @@ -203,7 +203,7 @@ def setup_webhook(self, project, integration=None): | |||
| """ | |||
| session = self.get_session() | |||
| owner, repo = build_utils.get_github_username_repo(url=project.repo) | |||
| if integration: | |||
| if integration and not integration.secret: | |||
There was a problem hiding this comment.
@ericholscher When we pass the integration from update_webhook to setup_webhook on 404the integration already has a secret so this condition always returns False and creates a new integration. thats why some tests are failing.
readthedocs/oauth/services/base.py
Outdated
| @@ -226,6 +226,19 @@ def get_paginated_results(self, response): | |||
| """ | |||
| raise NotImplementedError | |||
|
|
|||
| def get_provider_data(self, project, integration): | |||
| """ | |||
| Gets provider data from GitHub Webhooks API. | |||
There was a problem hiding this comment.
This shouldn't mention GitHub, as it's on the base class.
|
@stsewd Would love your take on this -- I think it's a better approach, but could use a bit more review. |
|
@ericholscher I'll try to review this today |
There was a problem hiding this comment.
LGTM 👍
I removed some dead code and updated the docs.
So, looks like we are not updating the secret on resync anymore. But looks like we found a better pattern to remove the secret if something failed p: If we go for not update the secret on resync, we need to update our docs https://docs.readthedocs.io/en/stable/webhooks.html#payload-validation
|
@stsewd Thanks for the update looks good :) |
Yea, we should update the doc in this PR then 👍 |
|
Done, feel free to merge :) |
closes: #6123
ref: #6122