Skip to content
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.

Sign up for GitHub

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

Add filter condition to update less often #1080

Merged
merged 6 commits into from
Jan 9, 2025
Merged

Add filter condition to update less often #1080

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
4b6c28d
Add filter condition to update less often
adrian-codecov Jan 2, 2025
08416b3
Adjust logic
adrian-codecov Jan 9, 2025
cfa3d82
Merge branch 'main' of github.com:codecov/codecov-api into 3171-gh-we…
adrian-codecov Jan 9, 2025
4f2558a
remove makefile change
adrian-codecov Jan 9, 2025
4d4741b
Add suggestions
adrian-codecov Jan 9, 2025
2f0dbaf
lint hello?
adrian-codecov Jan 9, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 6 additions & 4 deletions webhook_handlers/tests/test_github.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -266,17 +266,19 @@ def test_push_updates_only_unmerged_commits_with_branch_name(self):
commit2.refresh_from_db()
merged_commit.refresh_from_db()

assert commit1.branch == unmerged_branch_name
assert commit2.branch == unmerged_branch_name
assert not commit1.merged
assert not commit2.merged

assert merged_commit.branch == merged_branch_name

@patch("redis.Redis.sismember", lambda x, y, z: False)
def test_push_updates_commit_on_default_branch(self):
commit1 = CommitFactory(merged=False, repository=self.repo)
commit2 = CommitFactory(merged=False, repository=self.repo)
commit1 = CommitFactory(
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Had to change branch name for these commits to non-default branch names for the test to make sense - I believe it originally wasn't working as intended

merged=False, repository=self.repo, branch="feature-branch"
)
commit2 = CommitFactory(
merged=False, repository=self.repo, branch="feature-branch"
)

merged_branch_name = "merged"
repo_branch = self.repo.branch
Expand Down
10 changes: 6 additions & 4 deletions webhook_handlers/tests/test_github_enterprise.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -222,17 +222,19 @@ def test_push_updates_only_unmerged_commits_with_branch_name(self):
commit2.refresh_from_db()
merged_commit.refresh_from_db()

assert commit1.branch == unmerged_branch_name
assert commit2.branch == unmerged_branch_name
assert not commit1.merged
assert not commit2.merged

assert merged_commit.branch == merged_branch_name

@patch("redis.Redis.sismember", lambda x, y, z: False)
def test_push_updates_commit_on_default_branch(self):
commit1 = CommitFactory(merged=False, repository=self.repo)
commit2 = CommitFactory(merged=False, repository=self.repo)
commit1 = CommitFactory(
merged=False, repository=self.repo, branch="feature-branch"
)
commit2 = CommitFactory(
merged=False, repository=self.repo, branch="feature-branch"
)

merged_branch_name = "merged"
repo_branch = self.repo.branch
Expand Down
16 changes: 9 additions & 7 deletions webhook_handlers/views/github.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
from hashlib import sha1, sha256
from typing import Optional

from django.db.models import Q
from django.utils import timezone
from django.utils.crypto import constant_time_compare
from rest_framework import status
Expand Down Expand Up @@ -239,24 +240,25 @@ def push(self, request, *args, **kwargs):
)
return Response(data=WebhookHandlerErrorMessages.SKIP_WEBHOOK_IGNORED)

branch_name = self.request.data.get("ref")[11:]
pushed_to_branch_name = self.request.data.get("ref")[11:]
commits = self.request.data.get("commits", [])

if not commits:
log.debug(
f"No commits in webhook payload for branch {branch_name}",
f"No commits in webhook payload for branch {pushed_to_branch_name}",
extra=dict(repoid=repo.repoid, github_webhook_event=self.event),
)
return Response()

commits_queryset = Commit.objects.filter(
~Q(branch=pushed_to_branch_name),
repository=repo,
commitid__in=[commit.get("id") for commit in commits],
merged=False,
)
commits_queryset.update(branch=branch_name)
if branch_name == repo.branch:
commits_queryset.update(merged=True)

if pushed_to_branch_name == repo.branch:
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

For more optimization, we can probably also call this before querying.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

donee

commits_queryset.update(branch=pushed_to_branch_name, merged=True)
log.info(
"Pushed commits to default branch; setting merged to True",
extra=dict(
Expand All @@ -267,7 +269,7 @@ def push(self, request, *args, **kwargs):
)

log.info(
f"Branch name updated for commits to {branch_name}",
f"Branch name updated for commits to {pushed_to_branch_name}",
extra=dict(
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This will probably also need to be in the if statement now. We're not updating the branch if it's not the default branch.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pushed and consolidated into 1 log

repoid=repo.repoid,
github_webhook_event=self.event,
Expand Down Expand Up @@ -300,7 +302,7 @@ def push(self, request, *args, **kwargs):
TaskService().status_set_pending(
repoid=repo.repoid,
commitid=most_recent_commit.get("id"),
branch=branch_name,
branch=pushed_to_branch_name,
on_a_pull_request=False,
)

Expand Down
Loading