Merge branch 'main' into array-pagination

Author: RulaKhaled

codecov_auth/admin.py

@@ -379,10 +379,6 @@ def is_stale(user: dict) -> bool:
         )
 
     stale_users = {user.ownerid for user in resolved_users if is_stale(user)}
-
-    # TODO: the existing stale user cleanup script clears the `oauth_token`, though the reason for that is not clear?
-    # Owner.objects.filter(ownerid__in=stale_users).update(oauth_token=None)
-
     affected_orgs = {
         org for org in orgs if stale_users.intersection(set(org.plan_activated_users))
     }

codecov_auth/authentication/helpers.py

@@ -13,16 +13,17 @@ class UploadInfo(NamedTuple):
 def get_upload_info_from_request_path(request: HttpRequest) -> UploadInfo | None:
     path_info = request.get_full_path_info()
     # The repo part comes from https://stackoverflow.com/a/22312124
-    upload_views_prefix_regex = (
-        r"\/upload\/(\w+)\/([\w\.@:_/\-~]+)\/commits(?:\/([a-f0-9]{40}))?"
-    )
+    upload_views_prefix_regex = r"\/upload\/(\w+)\/([\w\.@:_/\-~]+)\/(commits|upload-coverage)(?:\/([a-f0-9]{40}))?"
     match = re.search(upload_views_prefix_regex, path_info)
 
     if match is None:
         return None
 
     service = match.group(1)
     encoded_slug = match.group(2)
-    commitid = match.group(3)
+    if match.group(3) == "commits":
+        commitid = match.group(4)
+    else:
+        commitid = None
 
     return UploadInfo(service, encoded_slug, commitid)

codecov_auth/commands/owner/interactors/set_yaml_on_owner.py

@@ -2,6 +2,8 @@
 from typing import Optional
 
 import yaml
+from shared.django_apps.core.models import Repository
+from shared.django_apps.utils.model_utils import get_ownerid_if_member
 from shared.validation.exceptions import InvalidYamlException
 from shared.yaml.validation import validate_yaml
 
@@ -50,13 +52,45 @@ def convert_yaml_to_dict(self, yaml_input: str) -> Optional[dict]:
             message = f"Error at {str(e.error_location)}: {e.error_message}"
             raise ValidationError(message)
 
+    def yaml_side_effects(self, old_yaml: dict, new_yaml: dict):
+        old_yaml_branch = old_yaml and old_yaml.get("codecov", {}).get("branch")
+        new_yaml_branch = new_yaml and new_yaml.get("codecov", {}).get("branch")
+
+        # Update all repositories from owner if branch is updated in yaml
+        if new_yaml_branch != old_yaml_branch:
+            repos = Repository.objects.filter(author_id=self.owner.ownerid)
+            repos.update(
+                branch=new_yaml_branch or old_yaml_branch
+            )  # Keeps old_branch if new_branch is None
+
+        old_yaml_bot = old_yaml and old_yaml.get("codecov", {}).get("bot")
+        new_yaml_bot = new_yaml and new_yaml.get("codecov", {}).get("bot")
+
+        # Update owner's bot column if bot is updated in yaml
+        if new_yaml_bot != old_yaml_bot:
+            new_bot = (
+                get_ownerid_if_member(
+                    service=self.owner.service,
+                    owner_username=new_yaml_bot,
+                    owner_id=self.owner.ownerid,
+                )
+                or old_yaml_bot
+                or None
+            )
+            self.owner.bot = new_bot
+            self.owner.save()
+
     @sync_to_async
     def execute(self, username: str, yaml_input: str) -> Owner:
         self.validate()
         self.owner = self.get_owner(username)
         self.authorize()
+        old_yaml = self.owner.yaml
         self.owner.yaml = self.convert_yaml_to_dict(yaml_input)
         if self.owner.yaml:
             self.owner.yaml[OWNER_YAML_TO_STRING_KEY] = yaml_input
         self.owner.save()
+
+        # side effects
+        self.yaml_side_effects(old_yaml=old_yaml, new_yaml=self.owner.yaml)
         return self.owner

codecov_auth/commands/owner/interactors/tests/test_set_yaml_on_owner.py

@@ -1,13 +1,14 @@
 import pytest
 from django.test import TransactionTestCase
-from shared.django_apps.core.tests.factories import OwnerFactory
+from shared.django_apps.core.tests.factories import OwnerFactory, RepositoryFactory
 
 from codecov.commands.exceptions import (
     NotFound,
     Unauthenticated,
     Unauthorized,
     ValidationError,
 )
+from codecov.db import sync_to_async
 
 from ..set_yaml_on_owner import SetYamlOnOwnerInteractor
 
@@ -21,6 +22,18 @@
   bot: 'codecov'
 """
 
+good_yaml_with_bot_and_branch = """
+codecov:
+  branch: 'test-1'
+  bot: 'codecov'
+"""
+
+yaml_with_changed_branch_and_bot = """
+codecov:
+  branch: 'test-2'
+  bot: 'codecov-2'
+"""
+
 bad_yaml_not_dict = """
 hey
 """
@@ -143,3 +156,15 @@ async def test_yaml_has_comments(self):
             "# comment 3\n"
             "    #comment 4\n",
         }
+
+    async def test_user_changes_yaml_bot_and_branch(self):
+        await sync_to_async(RepositoryFactory)(author=self.org, branch="fake-branch")
+        owner_updated = await self.execute(
+            self.current_owner, self.org.username, yaml_with_changed_branch_and_bot
+        )
+        # check the interactor returns the right owner
+        assert owner_updated.ownerid == self.org.ownerid
+        assert owner_updated.yaml == {
+            "codecov": {"branch": "test-2", "bot": "codecov-2"},
+            "to_string": "\ncodecov:\n  branch: 'test-2'\n  bot: 'codecov-2'\n",
+        }

graphql_api/dataloader/bundle_analysis.py

@@ -1,5 +1,6 @@
 from typing import Union
 
+from shared.api_archive.archive import ArchiveService
 from shared.bundle_analysis import (
     BundleAnalysisReportLoader,
     MissingBaseReportError,
@@ -10,7 +11,6 @@
 from core.models import Commit
 from graphql_api.types.comparison.comparison import MissingBaseReport, MissingHeadReport
 from reports.models import CommitReport
-from services.archive import ArchiveService
 from services.bundle_analysis import BundleAnalysisComparison, BundleAnalysisReport
 
 

graphql_api/tests/test_bundle_analysis_measurements.py

@@ -1,6 +1,7 @@
 from unittest.mock import patch
 
 from django.test import TransactionTestCase
+from shared.api_archive.archive import ArchiveService
 from shared.bundle_analysis import StoragePaths
 from shared.bundle_analysis.storage import get_bucket_name
 from shared.django_apps.core.tests.factories import (
@@ -11,10 +12,7 @@
 from shared.storage.memory import MemoryStorageService
 
 from reports.models import CommitReport
-from reports.tests.factories import (
-    CommitReportFactory,
-)
-from services.archive import ArchiveService
+from reports.tests.factories import CommitReportFactory
 from timeseries.tests.factories import MeasurementFactory
 
 from .helper import GraphQLTestHelper

graphql_api/tests/test_commit.py

@@ -6,6 +6,7 @@
 
 import yaml
 from django.test import TransactionTestCase
+from shared.api_archive.archive import ArchiveService
 from shared.bundle_analysis import StoragePaths
 from shared.bundle_analysis.storage import get_bucket_name
 from shared.django_apps.core.tests.factories import (
@@ -30,7 +31,6 @@
     UploadFactory,
     UploadFlagMembershipFactory,
 )
-from services.archive import ArchiveService
 from services.comparison import MissingComparisonReport
 from services.components import Component
 from services.profiling import CriticalFile
@@ -3323,3 +3323,70 @@ def test_bundle_analysis_asset_routes(self, get_storage_service):
             "/login",
             "/super/long/url/path",
         ]
+
+    @patch("graphql_api.dataloader.bundle_analysis.get_appropriate_storage_service")
+    def test_bundle_analysis_report_info(self, get_storage_service):
+        storage = MemoryStorageService({})
+        get_storage_service.return_value = storage
+
+        head_commit_report = CommitReportFactory(
+            commit=self.commit, report_type=CommitReport.ReportType.BUNDLE_ANALYSIS
+        )
+
+        with open(
+            "./services/tests/samples/bundle_with_assets_and_modules.sqlite", "rb"
+        ) as f:
+            storage_path = StoragePaths.bundle_report.path(
+                repo_key=ArchiveService.get_archive_hash(self.repo),
+                report_key=head_commit_report.external_id,
+            )
+            storage.write_file(get_bucket_name(), storage_path, f)
+
+        query = """
+            query FetchCommit($org: String!, $repo: String!, $commit: String!) {
+                owner(username: $org) {
+                    repository(name: $repo) {
+                        ... on Repository {
+                            commit(id: $commit) {
+                                bundleAnalysis {
+                                    bundleAnalysisReport {
+                                        __typename
+                                        ... on BundleAnalysisReport {
+                                            bundle(name: "b5") {
+                                                info {
+                                                    version
+                                                    plugin_name
+                                                    plugin_version
+                                                    built_at
+                                                    duration
+                                                    bundler_name
+                                                    bundler_version
+                                                }
+                                            }
+                                        }
+                                    }
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+        """
+
+        variables = {
+            "org": self.org.username,
+            "repo": self.repo.name,
+            "commit": self.commit.commitid,
+        }
+        data = self.gql_request(query, variables=variables)
+        commit = data["owner"]["repository"]["commit"]
+
+        bundle_info = commit["bundleAnalysis"]["bundleAnalysisReport"]["bundle"]["info"]
+
+        assert bundle_info["version"] == "1"
+        assert bundle_info["plugin_name"] == "codecov-vite-bundle-analysis-plugin"
+        assert bundle_info["plugin_version"] == "1.0.0"
+        assert bundle_info["built_at"] == "2023-12-01 17:17:28.604000"
+        assert bundle_info["duration"] == 331
+        assert bundle_info["bundler_name"] == "rollup"
+        assert bundle_info["bundler_version"] == "3.29.4"

graphql_api/tests/test_pull.py

@@ -4,6 +4,7 @@
 
 from django.test import TransactionTestCase
 from freezegun import freeze_time
+from shared.api_archive.archive import ArchiveService
 from shared.bundle_analysis import StoragePaths
 from shared.bundle_analysis.storage import get_bucket_name
 from shared.django_apps.core.tests.factories import (
@@ -18,7 +19,6 @@
 from core.models import Commit
 from reports.models import CommitReport
 from reports.tests.factories import CommitReportFactory, ReportLevelTotalsFactory
-from services.archive import ArchiveService
 
 from .helper import GraphQLTestHelper, paginate_connection
 

graphql_api/types/__init__.py

@@ -17,6 +17,7 @@
     bundle_data_bindable,
     bundle_module_bindable,
     bundle_report_bindable,
+    bundle_report_info_bindable,
 )
 from .commit import (
     commit,
@@ -149,6 +150,7 @@
     bundle_data_bindable,
     bundle_module_bindable,
     bundle_report_bindable,
+    bundle_report_info_bindable,
     commit_bindable,
     commit_bundle_analysis_bindable,
     commit_coverage_analytics_bindable,

graphql_api/types/bundle_analysis/__init__.py

@@ -5,6 +5,7 @@
     bundle_data_bindable,
     bundle_module_bindable,
     bundle_report_bindable,
+    bundle_report_info_bindable,
 )
 from .comparison import (
     bundle_analysis_comparison_bindable,
@@ -26,6 +27,7 @@
     "bundle_data_bindable",
     "bundle_module_bindable",
     "bundle_report_bindable",
+    "bundle_report_info_bindable",
     "bundle_analysis_comparison_bindable",
     "bundle_analysis_comparison_result_bindable",
     "bundle_comparison_bindable",