add tests

Author: adrian-codecov

upload/helpers.py

@@ -756,7 +756,7 @@ def dispatch_upload_task(
 
 
 def validate_activated_repo(repository):
-    if not repository.activated:
+    if repository.active and not repository.activated:
         settings_url = f"{settings.CODECOV_DASHBOARD_URL}/{repository.author.service}/{repository.author.username}/{repository.name}/settings"
         raise ValidationError(
             f"This repository is deactivated. To resume uploading to it, please activate the repository in the codecov UI: {settings_url}"
@@ -790,15 +790,14 @@ def get_version_from_headers(headers):
         return "unknown-user-agent"
 
 
-def generate_upload_prometheus_metrics_labels(
+def generate_upload_sentry_metrics_tags(
     action,
     request,
     is_shelter_request,
     endpoint: Optional[str] = None,
     repository: Optional[Repository] = None,
     position: Optional[str] = None,
     upload_version: Optional[str] = None,
-    include_empty_labels: bool = True,
 ):
     metrics_tags = dict(
         agent=get_agent_from_headers(request.headers),
@@ -807,23 +806,13 @@ def generate_upload_prometheus_metrics_labels(
         endpoint=endpoint,
         is_using_shelter="yes" if is_shelter_request else "no",
     )
-
-    repo_visibility = None
     if repository:
-        repo_visibility = "private" if repository.private else "public"
-
-    optional_fields = {
-        "repo_visibility": repo_visibility,
-        "position": position,
-        "upload_version": upload_version,
-    }
-
-    metrics_tags.update(
-        {
-            field: value
-            for field, value in optional_fields.items()
-            if value or include_empty_labels
-        }
-    )
+        metrics_tags["repo_visibility"] = (
+            "private" if repository.private is True else "public"
+        )
+    if position:
+        metrics_tags["position"] = position
+    if upload_version:
+        metrics_tags["upload_version"] = upload_version
 
     return metrics_tags

upload/tests/test_upload.py

@@ -298,7 +298,7 @@ def test_get_global_tokens(self, mock_get_config):
     def test_determine_repo_upload(self):
         with self.subTest("token found"):
             org = G(Owner)
-            repo = G(Repository, author=org, activated=True)
+            repo = G(Repository, author=org)
 
             params = {
                 "version": "v4",
@@ -310,7 +310,7 @@ def test_determine_repo_upload(self):
 
         with self.subTest("token not found"):
             org = G(Owner)
-            repo = G(Repository, author=org, activated=True)
+            repo = G(Repository, author=org)
 
             params = {
                 "version": "v4",
@@ -330,7 +330,7 @@ def test_determine_repo_upload(self):
     @patch.object(requests, "get")
     def test_determine_repo_upload_tokenless(self, mock_get):
         org = G(Owner, username="codecov", service="github")
-        repo = G(Repository, author=org, activated=True)
+        repo = G(Repository, author=org)
         expected_response = {
             "id": 732059764,
             "finishTime": f"{datetime.now()}",
@@ -503,7 +503,7 @@ def test_determine_upload_commit_to_use(
                 service="bitbucket",
                 oauth_token=encryptor.encode("hahahahaha").decode(),
             )
-            repo = G(Repository, author=org, activated=True)
+            repo = G(Repository, author=org)
             upload_params = {
                 "service": "bitbucket",
                 "commit": "3be5c52bd748c508a7e96993c02cf3518c816e84",
@@ -519,7 +519,7 @@ def test_determine_upload_commit_to_use(
                 service="github",
                 oauth_token=encryptor.encode("hahahahaha").decode(),
             )
-            repo = G(Repository, author=org, activated=True)
+            repo = G(Repository, author=org)
             upload_params = {
                 "service": "github",
                 "commit": "3084886b7ff869dcf327ad1d28a8b7d34adc7584",
@@ -532,7 +532,7 @@ def test_determine_upload_commit_to_use(
 
         with self.subTest("just no bot available"):
             org = G(Owner, service="github", oauth_token=None)
-            repo = G(Repository, author=org, private=True, activated=True)
+            repo = G(Repository, author=org, private=True)
             upload_params = {
                 "service": "github",
                 "commit": "3084886b7ff869dcf327ad1d28a8b7d34adc7584",
@@ -549,7 +549,7 @@ def test_determine_upload_commit_to_use(
                 service="github",
                 oauth_token=encryptor.encode("hahahahaha").decode(),
             )
-            repo = G(Repository, author=org, activated=True)
+            repo = G(Repository, author=org)
             upload_params = {
                 "service": "github",
                 "commit": "3084886b7ff869dcf327ad1d28a8b7d34adc7584",
@@ -564,7 +564,7 @@ def test_determine_upload_commit_to_use(
         with self.subTest("use repo bot token when available"):
             bot = OwnerFactory()
             org = G(Owner, service="github")
-            repo = G(Repository, author=org, bot=bot, activated=True)
+            repo = G(Repository, author=org, bot=bot)
 
             upload_params = {
                 "service": "github",
@@ -597,7 +597,7 @@ def test_determine_upload_commit_to_use(
 
         with self.subTest("HTTP error"):
             org = G(Owner, service="github")
-            repo = G(Repository, author=org, activated=True)
+            repo = G(Repository, author=org)
             upload_params = {
                 "service": "github",
                 "commit": "3084886b7ff869dcf327ad1d28a8b7d34adc7584",
@@ -610,7 +610,7 @@ def test_determine_upload_commit_to_use(
 
     def test_insert_commit(self):
         org = G(Owner)
-        repo = G(Repository, author=org, activated=True)
+        repo = G(Repository, author=org)
 
         with self.subTest("newly created"):
             insert_commit(
@@ -743,7 +743,7 @@ def test_store_report_in_redis(self):
     def test_validate_upload_repository_moved(self):
         redis = MockRedis()
         owner = G(Owner, plan="users-free")
-        repo = G(Repository, author=owner, name="", activated=True)
+        repo = G(Repository, author=owner, name="")
         commit = G(Commit)
 
         with self.assertRaises(ValidationError) as err:
@@ -757,7 +757,7 @@ def test_validate_upload_repository_moved(self):
     def test_validate_upload_empty_totals(self):
         redis = MockRedis()
         owner = G(Owner, plan="5m")
-        repo = G(Repository, author=owner, activated=True)
+        repo = G(Repository, author=owner)
         commit = G(Commit, totals=None, repository=repo)
 
         validate_upload({"commit": commit.commitid}, repo, redis)
@@ -769,7 +769,7 @@ def test_validate_upload_empty_totals(self):
     def test_validate_upload_too_many_uploads_for_commit(self):
         redis = MockRedis()
         owner = G(Owner, plan="users-free")
-        repo = G(Repository, author=owner, activated=True)
+        repo = G(Repository, author=owner)
         commit = G(Commit, totals={"s": 151}, repository=repo)
         report = CommitReportFactory.create(commit=commit)
         for i in range(151):
@@ -782,7 +782,7 @@ def test_validate_upload_too_many_uploads_for_commit(self):
     def test_validate_upload_repository_blacklisted(self):
         redis = MockRedis(blacklisted=True)
         owner = G(Owner, plan="users-free")
-        repo = G(Repository, author=owner, activated=True)
+        repo = G(Repository, author=owner)
         commit = G(Commit)
 
         with self.assertRaises(ValidationError) as err:
@@ -795,7 +795,7 @@ def test_validate_upload_repository_blacklisted(self):
     def test_validate_upload_per_repo_billing_invalid(self):
         redis = MockRedis()
         owner = G(Owner, plan="1m")
-        G(Repository, author=owner, private=True, activated=False, active=True)
+        G(Repository, author=owner, private=True, activated=True, active=True)
         repo = G(Repository, author=owner, private=True, activated=False, active=False)
         commit = G(Commit)
 
@@ -876,7 +876,7 @@ def test_validate_upload_valid_upload_repo_activated(self):
     @freeze_time("2023-01-01T00:00:00")
     @patch("services.task.TaskService.upload")
     def test_dispatch_upload_task(self, upload):
-        repo = G(Repository, activated=True)
+        repo = G(Repository)
         task_arguments = {
             "commit": "commit123",
             "version": "v4",

upload/tests/views/test_commits.py

@@ -42,6 +42,7 @@ def test_get_repo_not_found(db):
         upload_views.get_repo()
     assert exp.match("Repository not found")
 
+
 def test_deactivated_repo(db):
     repo = RepositoryFactory(
         name="the_repo",

upload/tests/views/test_reports.py

@@ -39,6 +39,7 @@ def test_reports_get_not_allowed(client, mocker, db):
     res = client.get(url, **headers)
     assert res.status_code == 405
 
+
 def test_deactivated_repo(db):
     repo = RepositoryFactory(
         name="the_repo",
@@ -59,9 +60,7 @@ def test_deactivated_repo(db):
         args=["github", repo_slug, commit.commitid],
     )
     response = client.post(
-        url,
-        data={"code": "code1"},
-        headers={"User-Agent": "codecov-cli/0.4.7"}
+        url, data={"code": "code1"}, headers={"User-Agent": "codecov-cli/0.4.7"}
     )
     response_json = response.json()
     assert response.status_code == 400

upload/views/commits.py

@@ -14,7 +14,10 @@
     repo_auth_custom_exception_handler,
 )
 from core.models import Commit
-from upload.helpers import generate_upload_prometheus_metrics_labels, validate_activated_repo
+from upload.helpers import (
+    generate_upload_prometheus_metrics_labels,
+    validate_activated_repo,
+)
 from upload.metrics import API_UPLOAD_COUNTER
 from upload.serializers import CommitSerializer
 from upload.views.base import GetterMixin

upload/views/reports.py

@@ -16,7 +16,10 @@
 )
 from reports.models import CommitReport, ReportResults
 from services.task import TaskService
-from upload.helpers import generate_upload_prometheus_metrics_labels, validate_activated_repo
+from upload.helpers import (
+    generate_upload_prometheus_metrics_labels,
+    validate_activated_repo,
+)
 from upload.metrics import API_UPLOAD_COUNTER
 from upload.serializers import CommitReportSerializer, ReportResultsSerializer
 from upload.views.base import GetterMixin