diff --git a/upload/tests/views/test_combined_upload.py b/upload/tests/views/test_upload_coverage.py similarity index 95% rename from upload/tests/views/test_combined_upload.py rename to upload/tests/views/test_upload_coverage.py index d52fc1fc1c..a3661416b2 100644 --- a/upload/tests/views/test_combined_upload.py +++ b/upload/tests/views/test_upload_coverage.py @@ -15,7 +15,7 @@ UploadFlagMembership, ) from services.archive import ArchiveService, MinioEndpoints -from upload.views.combined_upload import CanDoCoverageUploadsPermission +from upload.views.upload_coverage import CanDoCoverageUploadsPermission def test_get_repo(db): @@ -25,7 +25,7 @@ def test_get_repo(db): repository.save() repo_slug = f"{repository.author.username}::::{repository.name}" url = reverse( - "new_upload.combined_upload", + "new_upload.upload_coverage", args=[repository.author.service, repo_slug], ) client = APIClient() @@ -42,7 +42,7 @@ def test_get_repo_not_found(upload, db): ) repo_slug = "codecov::::wrong-repo-name" url = reverse( - "new_upload.combined_upload", + "new_upload.upload_coverage", args=[repository.author.service, repo_slug], ) client = APIClient() @@ -63,7 +63,7 @@ def test_deactivated_repo(db): repository.save() repo_slug = f"{repository.author.username}::::{repository.name}" url = reverse( - "new_upload.combined_upload", + "new_upload.upload_coverage", args=[repository.author.service, repo_slug], ) client = APIClient() @@ -73,11 +73,11 @@ def test_deactivated_repo(db): assert "This repository is deactivated" in str(response.json()) -def test_combined_upload_with_errors(db): +def test_upload_coverage_with_errors(db): repository = RepositoryFactory() repo_slug = f"{repository.author.username}::::{repository.name}" url = reverse( - "new_upload.combined_upload", + "new_upload.upload_coverage", args=[repository.author.service, repo_slug], ) @@ -97,7 +97,7 @@ def test_combined_upload_with_errors(db): assert "flags" in response.json() -def test_combined_upload_post(db, mocker): +def test_upload_coverage_post(db, mocker): mocker.patch.object( CanDoCoverageUploadsPermission, "has_permission", return_value=True ) @@ -121,7 +121,7 @@ def test_combined_upload_post(db, mocker): client.force_authenticate(user=owner) repo_slug = f"{repository.author.username}::::{repository.name}" url = reverse( - "new_upload.combined_upload", + "new_upload.upload_coverage", args=[repository.author.service, repo_slug], ) response = client.post( @@ -195,7 +195,7 @@ def test_combined_upload_post(db, mocker): @override_settings(SHELTER_SHARED_SECRET="shelter-shared-secret") -def test_combined_upload_post_shelter(db, mocker): +def test_upload_coverage_post_shelter(db, mocker): mocker.patch.object( CanDoCoverageUploadsPermission, "has_permission", return_value=True ) @@ -219,7 +219,7 @@ def test_combined_upload_post_shelter(db, mocker): client.force_authenticate(user=owner) repo_slug = f"{repository.author.username}::::{repository.name}" url = reverse( - "new_upload.combined_upload", + "new_upload.upload_coverage", args=[repository.author.service, repo_slug], ) response = client.post( diff --git a/upload/urls.py b/upload/urls.py index a2eb26dab8..5194d09c3c 100644 --- a/upload/urls.py +++ b/upload/urls.py @@ -1,13 +1,13 @@ from django.urls import path, re_path from upload.views.bundle_analysis import BundleAnalysisView -from upload.views.combined_upload import CombinedUploadView from upload.views.commits import CommitViews from upload.views.empty_upload import EmptyUploadView from upload.views.legacy import UploadDownloadHandler, UploadHandler from upload.views.reports import ReportResultsView, ReportViews from upload.views.test_results import TestResultsView from upload.views.upload_completion import UploadCompletionView +from upload.views.upload_coverage import UploadCoverageView from upload.views.uploads import UploadViews urlpatterns = [ @@ -59,9 +59,9 @@ name="new_upload.commits", ), path( - "//combined-upload", - CombinedUploadView.as_view(), - name="new_upload.combined_upload", + "//upload-coverage", + UploadCoverageView.as_view(), + name="new_upload.upload_coverage", ), # This was getting in the way of the new endpoints, so I moved to the end re_path(r"(?P\w+)/?", UploadHandler.as_view(), name="upload-handler"), diff --git a/upload/views/combined_upload.py b/upload/views/upload_coverage.py similarity index 97% rename from upload/views/combined_upload.py rename to upload/views/upload_coverage.py index b5f80a025f..a4f4c54103 100644 --- a/upload/views/combined_upload.py +++ b/upload/views/upload_coverage.py @@ -37,7 +37,7 @@ log = logging.getLogger(__name__) -class CombinedUploadView(APIView, GetterMixin): +class UploadCoverageView(APIView, GetterMixin): permission_classes = [CanDoCoverageUploadsPermission] authentication_classes = [ UploadTokenRequiredAuthenticationCheck, @@ -57,7 +57,7 @@ def emit_metrics(self, position: str) -> None: API_UPLOAD_COUNTER, labels=generate_upload_prometheus_metrics_labels( action="coverage", - endpoint="combined_upload", + endpoint="upload_coverage", request=self.request, is_shelter_request=self.is_shelter_request(), position=position, @@ -85,7 +85,7 @@ def post(self, request: HttpRequest, *args, **kwargs) -> Response: commit = create_commit(commit_serializer, repository) log.info( - "Request to create new combined upload", + "Request to create new coverage upload", extra=dict( repo=repository.name, commit=commit.commitid,