Use the new handlers when evaluating repo webhooks #4565
Merged
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
jhrozek
commented
Sep 20, 2024
| mockPropsBld: newPropSvcMock( | ||
| withSuccessRepoProto(), | ||
| ), | ||
| mockRepoBld: newRepoSvcMock( |
There was a problem hiding this comment.
We can remove these two because we no longer call the repo service to refresh the repository and no longer call the property service. That's all done by the new handler.
jhrozek
commented
Sep 20, 2024
| }), | ||
| ), | ||
| topic: events.TopicQueueEntityEvaluate, | ||
| topic: events.TopicQueueRefreshEntityAndEvaluate, |
There was a problem hiding this comment.
we send a message to a new handler
jhrozek
commented
Sep 20, 2024
| @@ -1380,9 +1358,6 @@ func (s *UnitTestSuite) TestHandleGitHubWebHook() { | |||
| require.Equal(t, "12345", received.Metadata["id"]) | |||
| require.Equal(t, event, received.Metadata["type"]) | |||
| require.Equal(t, "https://api.github.com/", received.Metadata["source"]) | |||
| require.Equal(t, providerID.String(), received.Metadata["provider_id"]) | |||
| require.Equal(t, projectID.String(), received.Metadata[entities.ProjectIDEventKey]) | |||
| require.Equal(t, repositoryID.String(), received.Metadata["repository_id"]) | |||
There was a problem hiding this comment.
The message in the new handler doesn't have these metadata anymore, the job of the new handler is to figure these out
We added new watermill handlers that allow to refresh and evaluate a generic entity with properties. This is the first patch in a series that takes these handlers into account with the eventual goal of removing all the bespoke code from the GitHub webhook handler and eventually remove direct database access from the webhook handler. I'll expand the same method for the other webhook events we issue, but let's do small PRs so we can have some test runs in between them and revert in case of issues. Related: mindersec#4327
jhrozek
force-pushed
the
webhook_repo_refresh_new_handler
branch
from
d6b57a0
to
52e6c77
Compare
JAORMX
approved these changes
Sep 22, 2024
10 tasks
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
We added new watermill handlers that allow to refresh and evaluate a
generic entity with properties. This is the first patch in a series that
takes these handlers into account with the eventual goal of removing all
the bespoke code from the GitHub webhook handler and eventually remove
direct database access from the webhook handler.
I'll expand the same method for the other webhook events we issue, but
let's do small PRs so we can have some test runs in between them and
revert in case of issues.
Related: #4327
Change Type
Testing
I ran a subset of smoke tests that target repos and made the unit tests pass.
Review Checklist: