This repository was archived by the owner on Jun 13, 2025. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 29
feat: Create coverage single upload endpoint #962
Merged
Merged
Changes from 19 commits
Commits
Show all changes
21 commits
Select commit
Hold shift + click to select a range
d58c40e
Initial commit
lvthanh03 af557db
Add back validate_activated_repo
lvthanh03 8e1560b
Combined Upload v1
lvthanh03 541451a
Linting
lvthanh03 a0a5bc4
Fix tests
lvthanh03 c5ce5d3
Lints
lvthanh03 3f74fa4
Add throttling for combined-upload
lvthanh03 a4a5466
Merge branch 'main' into tony/coverage-single-upload
lvthanh03 87e2a2b
Better code
lvthanh03 7987e60
Add metrics
lvthanh03 deb6e15
Use updated repository obj
lvthanh03 fd7dcf4
Lints
lvthanh03 001c993
Use emit_metrics for better readability
lvthanh03 24f9c94
Return early if broken upload
lvthanh03 b527507
Add external_id and created_at outputs for combined_upload
lvthanh03 93b0f48
Add successful combined_upload test for normal use case and shelter
lvthanh03 a99b9f2
Merge branch 'main' into tony/coverage-single-upload
lvthanh03 52ce8a4
Use functions instead of Mix ins
lvthanh03 be72579
Merge branch 'main' into tony/coverage-single-upload
lvthanh03 6becd24
Use analytics_token instead of token
lvthanh03 2100332
Lints
lvthanh03 File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,289 @@ | ||
| from unittest.mock import patch | ||
|
|
||
| from django.conf import settings | ||
| from django.test import override_settings | ||
| from django.urls import reverse | ||
| from rest_framework.test import APIClient | ||
| from shared.django_apps.core.tests.factories import ( | ||
| CommitFactory, | ||
| RepositoryFactory, | ||
| ) | ||
|
|
||
| from reports.models import ( | ||
| ReportSession, | ||
| RepositoryFlag, | ||
| UploadFlagMembership, | ||
| ) | ||
| from services.archive import ArchiveService, MinioEndpoints | ||
| from upload.views.combined_upload import CanDoCoverageUploadsPermission | ||
|
|
||
|
|
||
| def test_get_repo(db): | ||
| repository = RepositoryFactory( | ||
| name="the_repo", author__username="codecov", author__service="github" | ||
| ) | ||
| repository.save() | ||
| repo_slug = f"{repository.author.username}::::{repository.name}" | ||
| url = reverse( | ||
| "new_upload.combined_upload", | ||
| args=[repository.author.service, repo_slug], | ||
| ) | ||
| client = APIClient() | ||
| client.credentials(HTTP_AUTHORIZATION="token " + repository.upload_token) | ||
| response = client.post(url, {}, format="json") | ||
| assert response.status_code == 400 # Bad request due to missing required fields | ||
| assert "commitid" in response.json() | ||
|
|
||
|
|
||
| @patch("services.task.TaskService.upload") | ||
| def test_get_repo_not_found(upload, db): | ||
| repository = RepositoryFactory( | ||
| name="the_repo", author__username="codecov", author__service="github" | ||
| ) | ||
| repo_slug = "codecov::::wrong-repo-name" | ||
| url = reverse( | ||
| "new_upload.combined_upload", | ||
| args=[repository.author.service, repo_slug], | ||
| ) | ||
| client = APIClient() | ||
| response = client.post(url, {}, format="json") | ||
| assert response.status_code == 401 | ||
| assert response.json() == {"detail": "Not valid tokenless upload"} | ||
| assert not upload.called | ||
|
|
||
|
|
||
| def test_deactivated_repo(db): | ||
| repository = RepositoryFactory( | ||
| name="the_repo", | ||
| author__username="codecov", | ||
| author__service="github", | ||
| active=True, | ||
| activated=False, | ||
| ) | ||
| repository.save() | ||
| repo_slug = f"{repository.author.username}::::{repository.name}" | ||
| url = reverse( | ||
| "new_upload.combined_upload", | ||
| args=[repository.author.service, repo_slug], | ||
| ) | ||
| client = APIClient() | ||
| client.credentials(HTTP_AUTHORIZATION="token " + repository.upload_token) | ||
| response = client.post(url, {"commit_sha": "abc123"}, format="json") | ||
| assert response.status_code == 400 | ||
| assert "This repository is deactivated" in str(response.json()) | ||
|
|
||
|
|
||
| def test_combined_upload_with_errors(db): | ||
| repository = RepositoryFactory() | ||
| repo_slug = f"{repository.author.username}::::{repository.name}" | ||
| url = reverse( | ||
| "new_upload.combined_upload", | ||
| args=[repository.author.service, repo_slug], | ||
| ) | ||
|
|
||
| client = APIClient() | ||
| client.credentials(HTTP_AUTHORIZATION="token " + repository.upload_token) | ||
|
|
||
| # Missing required fields | ||
| response = client.post(url, {}, format="json") | ||
| assert response.status_code == 400 | ||
| assert "commitid" in response.json() | ||
|
|
||
| # Invalid flag format | ||
| response = client.post( | ||
| url, {"commit_sha": "abc123", "flags": "not-a-list"}, format="json" | ||
| ) | ||
| assert response.status_code == 400 | ||
| assert "flags" in response.json() | ||
|
|
||
|
|
||
| def test_combined_upload_post(db, mocker): | ||
| mocker.patch.object( | ||
| CanDoCoverageUploadsPermission, "has_permission", return_value=True | ||
| ) | ||
| presigned_put_mock = mocker.patch( | ||
| "services.archive.StorageService.create_presigned_put", | ||
| return_value="presigned put", | ||
| ) | ||
| upload_task_mock = mocker.patch( | ||
| "upload.views.uploads.trigger_upload_task", return_value=True | ||
| ) | ||
|
|
||
| repository = RepositoryFactory( | ||
| name="the_repo1", author__username="codecov", author__service="github" | ||
| ) | ||
| commit = CommitFactory(repository=repository) | ||
| repository.save() | ||
| commit.save() | ||
|
|
||
| owner = repository.author | ||
| client = APIClient() | ||
| client.force_authenticate(user=owner) | ||
| repo_slug = f"{repository.author.username}::::{repository.name}" | ||
| url = reverse( | ||
| "new_upload.combined_upload", | ||
| args=[repository.author.service, repo_slug], | ||
| ) | ||
| response = client.post( | ||
| url, | ||
| { | ||
| "branch": "branch", | ||
| "ci_service": "ci_service", | ||
| "ci_url": "ci_url", | ||
| "code": "code", | ||
| "commit_sha": commit.commitid, | ||
| "flags": ["flag1", "flag2"], | ||
| "job_code": "job_code", | ||
| "version": "version", | ||
| }, | ||
| format="json", | ||
| ) | ||
| response_json = response.json() | ||
| upload = ReportSession.objects.filter( | ||
| report__commit=commit, | ||
| report__code="code", | ||
| upload_extras={"format_version": "v1"}, | ||
| ).first() | ||
| assert response.status_code == 201 | ||
| assert all( | ||
| map( | ||
| lambda x: x in response_json.keys(), | ||
| ["external_id", "created_at", "raw_upload_location", "url"], | ||
| ) | ||
| ) | ||
| assert ( | ||
| response_json.get("url") | ||
| == f"{settings.CODECOV_DASHBOARD_URL}/{repository.author.service}/{repository.author.username}/{repository.name}/commit/{commit.commitid}" | ||
| ) | ||
|
|
||
| assert ReportSession.objects.filter( | ||
| report__commit=commit, | ||
| report__code="code", | ||
| upload_extras={"format_version": "v1"}, | ||
| ).exists() | ||
| assert RepositoryFlag.objects.filter( | ||
| repository_id=repository.repoid, flag_name="flag1" | ||
| ).exists() | ||
| assert RepositoryFlag.objects.filter( | ||
| repository_id=repository.repoid, flag_name="flag2" | ||
| ).exists() | ||
| flag1 = RepositoryFlag.objects.filter( | ||
| repository_id=repository.repoid, flag_name="flag1" | ||
| ).first() | ||
| flag2 = RepositoryFlag.objects.filter( | ||
| repository_id=repository.repoid, flag_name="flag2" | ||
| ).first() | ||
| assert UploadFlagMembership.objects.filter( | ||
| report_session_id=upload.id, flag_id=flag1.id | ||
| ).exists() | ||
| assert UploadFlagMembership.objects.filter( | ||
| report_session_id=upload.id, flag_id=flag2.id | ||
| ).exists() | ||
| assert [flag for flag in upload.flags.all()] == [flag1, flag2] | ||
|
|
||
| archive_service = ArchiveService(repository) | ||
| assert upload.storage_path == MinioEndpoints.raw_with_upload_id.get_path( | ||
| version="v4", | ||
| date=upload.created_at.strftime("%Y-%m-%d"), | ||
| repo_hash=archive_service.storage_hash, | ||
| commit_sha=commit.commitid, | ||
| reportid=upload.report.external_id, | ||
| uploadid=upload.external_id, | ||
| ) | ||
| presigned_put_mock.assert_called_with("archive", upload.storage_path, 10) | ||
| upload_task_mock.assert_called() | ||
|
|
||
|
|
||
| @override_settings(SHELTER_SHARED_SECRET="shelter-shared-secret") | ||
| def test_combined_upload_post_shelter(db, mocker): | ||
| mocker.patch.object( | ||
| CanDoCoverageUploadsPermission, "has_permission", return_value=True | ||
| ) | ||
| presigned_put_mock = mocker.patch( | ||
| "services.archive.StorageService.create_presigned_put", | ||
| return_value="presigned put", | ||
| ) | ||
| upload_task_mock = mocker.patch( | ||
| "upload.views.uploads.trigger_upload_task", return_value=True | ||
| ) | ||
|
|
||
| repository = RepositoryFactory( | ||
| name="the_repo", author__username="codecov", author__service="github" | ||
| ) | ||
| commit = CommitFactory(repository=repository) | ||
| repository.save() | ||
| commit.save() | ||
|
|
||
| owner = repository.author | ||
| client = APIClient() | ||
| client.force_authenticate(user=owner) | ||
| repo_slug = f"{repository.author.username}::::{repository.name}" | ||
| url = reverse( | ||
| "new_upload.combined_upload", | ||
| args=[repository.author.service, repo_slug], | ||
| ) | ||
| response = client.post( | ||
| url, | ||
| { | ||
| "branch": "branch", | ||
| "ci_service": "ci_service", | ||
| "ci_url": "ci_url", | ||
| "code": "code", | ||
| "commit_sha": commit.commitid, | ||
| "flags": ["flag1", "flag2"], | ||
| "job_code": "job_code", | ||
| "storage_path": "shelter/test/path.txt", | ||
| "version": "version", | ||
| }, | ||
| headers={ | ||
| "X-Shelter-Token": "shelter-shared-secret", | ||
| "User-Agent": "codecov-cli/0.4.7", | ||
| }, | ||
| format="json", | ||
| ) | ||
| response_json = response.json() | ||
| upload = ReportSession.objects.filter( | ||
| report__commit=commit, | ||
| report__code="code", | ||
| upload_extras={"format_version": "v1"}, | ||
| ).first() | ||
| assert response.status_code == 201 | ||
| assert all( | ||
| map( | ||
| lambda x: x in response_json.keys(), | ||
| ["external_id", "created_at", "raw_upload_location", "url"], | ||
| ) | ||
| ) | ||
| assert ( | ||
| response_json.get("url") | ||
| == f"{settings.CODECOV_DASHBOARD_URL}/{repository.author.service}/{repository.author.username}/{repository.name}/commit/{commit.commitid}" | ||
| ) | ||
|
|
||
| assert ReportSession.objects.filter( | ||
| report__commit=commit, | ||
| report__code="code", | ||
| upload_extras={"format_version": "v1"}, | ||
| ).exists() | ||
| assert RepositoryFlag.objects.filter( | ||
| repository_id=repository.repoid, flag_name="flag1" | ||
| ).exists() | ||
| assert RepositoryFlag.objects.filter( | ||
| repository_id=repository.repoid, flag_name="flag2" | ||
| ).exists() | ||
| flag1 = RepositoryFlag.objects.filter( | ||
| repository_id=repository.repoid, flag_name="flag1" | ||
| ).first() | ||
| flag2 = RepositoryFlag.objects.filter( | ||
| repository_id=repository.repoid, flag_name="flag2" | ||
| ).first() | ||
| assert UploadFlagMembership.objects.filter( | ||
| report_session_id=upload.id, flag_id=flag1.id | ||
| ).exists() | ||
| assert UploadFlagMembership.objects.filter( | ||
| report_session_id=upload.id, flag_id=flag2.id | ||
| ).exists() | ||
| assert [flag for flag in upload.flags.all()] == [flag1, flag2] | ||
|
|
||
| assert upload.storage_path == "shelter/test/path.txt" | ||
| presigned_put_mock.assert_called_with("archive", upload.storage_path, 10) | ||
| upload_task_mock.assert_called() | ||
This file contains hidden or 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
Oops, something went wrong.
Oops, something went wrong.
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.
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.
instead of these exists calls, I would just assert that the flags are properly attached:
We shouldn’t care about the implementation details of how the database manages its relations and joins. We care that our upload has the proper flags.