Merge branch 'main' of github.com:codecov/codecov-api

nora-shap · nora-shap · commit a16a695c1f47 · 2025-03-20T11:51:16.000-07:00
diff --git a/.github/workflows/upload-overwatch.yml b/.github/workflows/upload-overwatch.yml
@@ -24,12 +24,6 @@ jobs:
         run: |
           pip install mypy==1.15.0
           pip install ruff==0.9.6
-      - name: Install Build Dependencies
-        run: |
-          sudo apt-get update
-          # Install libssl1.1 from Ubuntu 20.04 repositories
-          wget http://archive.ubuntu.com/ubuntu/pool/main/o/openssl/libssl1.1_1.1.1f-1ubuntu2_amd64.deb
-          sudo dpkg -i libssl1.1_1.1.1f-1ubuntu2_amd64.deb
       - name: Install Overwatch CLI
         run: |
           curl -o overwatch-cli https://overwatch.codecov.dev/linux/cli
@@ -40,4 +34,4 @@ jobs:
             --auth-token ${{ secrets.SENTRY_AUTH_TOKEN }} \
             --organization-slug codecov \
             python \
-            --python-path $(which python3)
+            --python-path $(which python3)
diff --git a/api/internal/tests/views/test_compare_viewset.py b/api/internal/tests/views/test_compare_viewset.py
@@ -91,14 +91,14 @@ def setUp(self):
         self.base_file = ReportFile(
             name=self.file_name, totals=[46, 46, 0, 0, 100, 0, 0, 0, 1, 0, 0, 0]
         )
-        self.base_file._lines = [[1, "", [[1, 1, 0, 0, 0]], 0, 0]] * 46
+        self.base_file._parsed_lines = [[1, "", [[1, 1, 0, 0, 0]], 0, 0]] * 46
         self.base_report = MockSerializableReport()
         self.base_report.mocked_files = {self.file_name: self.base_file}
 
         self.head_file = ReportFile(
             name=self.file_name, totals=[6, 6, 0, 0, 100, 0, 0, 0, 1, 0, 0, 0]
         )
-        self.head_file._lines = [[1, "", [[1, 1, 0, 0, 0]], 0, 0]] * 6
+        self.head_file._parsed_lines = [[1, "", [[1, 1, 0, 0, 0]], 0, 0]] * 6
         self.head_file.totals.diff = ReportTotals.default_totals()
         self.head_report = MockSerializableReport()
         self.head_report.mocked_files = {self.file_name: self.head_file}
diff --git a/api/public/v2/tests/test_api_compare_viewset.py b/api/public/v2/tests/test_api_compare_viewset.py
@@ -259,14 +259,14 @@ def setUp(self):
         self.base_file = ReportFile(
             name=self.file_name, totals=[46, 46, 0, 0, 100, 0, 0, 0, 1, 0, 0, 0]
         )
-        self.base_file._lines = [[1, "", [[1, 1, 0, 0, 0]], 0, 0]] * 46
+        self.base_file._parsed_lines = [[1, "", [[1, 1, 0, 0, 0]], 0, 0]] * 46
         self.base_report = MockSerializableReport()
         self.base_report.mocked_files = {self.file_name: self.base_file}
 
         self.head_file = ReportFile(
             name=self.file_name, totals=[6, 6, 0, 0, 100, 0, 0, 0, 1, 0, 0, 0]
         )
-        self.head_file._lines = [[1, "", [[1, 1, 0, 0, 0]], 0, 0]] * 6
+        self.head_file._parsed_lines = [[1, "", [[1, 1, 0, 0, 0]], 0, 0]] * 6
         self.head_file.totals.diff = ReportTotals.default_totals()
         self.head_report = MockSerializableReport()
         self.head_report.mocked_files = {self.file_name: self.head_file}
diff --git a/codecov/settings_base.py b/codecov/settings_base.py
@@ -76,7 +76,9 @@
 TEMPLATES = [
     {
         "BACKEND": "django.template.backends.django.DjangoTemplates",
-        "DIRS": [],
+        "DIRS": [
+            "templates",
+        ],
         "APP_DIRS": True,
         "OPTIONS": {
             "context_processors": [
diff --git a/codecov/settings_test.py b/codecov/settings_test.py
@@ -4,6 +4,7 @@
 
 ALLOWED_HOSTS = ["localhost"]
 CORS_ALLOWED_ORIGINS = ["http://localhost:9000", "http://localhost"]
+SHELTER_ENABLED = True
 SHELTER_PUBSUB_PROJECT_ID = "test-project-id"
 SHELTER_PUBSUB_SYNC_REPO_TOPIC_ID = "test-topic-id"
 
diff --git a/graphql_api/tests/test_test_analytics.py b/graphql_api/tests/test_test_analytics.py
@@ -21,6 +21,7 @@
     get_results,
 )
 from services.redis_configuration import get_redis_connection
+from utils.test_results import dedup_table
 
 from .helper import GraphQLTestHelper
 
@@ -171,21 +172,23 @@ def store_in_redis(repository):
 
 @pytest.fixture
 def store_in_storage(repository, mock_storage):
+    from django.conf import settings
+
     try:
-        mock_storage.create_root_storage("codecov")
+        mock_storage.create_root_storage(settings.GCS_BUCKET_NAME)
     except BucketAlreadyExistsError:
         pass
 
     mock_storage.write_file(
-        "codecov",
+        settings.GCS_BUCKET_NAME,
         f"test_results/rollups/{repository.repoid}/{repository.branch}/30",
         test_results_table.write_ipc(None).getvalue(),
     )
 
     yield
 
     mock_storage.delete_file(
-        "codecov",
+        settings.GCS_BUCKET_NAME,
         f"test_results/rollups/{repository.repoid}/{repository.branch}/30",
     )
 
@@ -218,7 +221,8 @@ def test_get_test_results(
     ):
         results = get_results(repository.repoid, repository.branch, 30)
         assert results is not None
-        assert results.equals(test_results_table)
+
+        assert results.equals(dedup_table(test_results_table))
 
     def test_get_test_results_no_storage(
         self, transactional_db, repository, mock_storage
@@ -231,7 +235,7 @@ def test_get_test_results_no_redis(
         m = mocker.patch("services.task.TaskService.cache_test_results_redis")
         results = get_results(repository.repoid, repository.branch, 30)
         assert results is not None
-        assert results.equals(test_results_table)
+        assert results.equals(dedup_table(test_results_table))
 
         m.assert_called_once_with(repository.repoid, repository.branch)
 
diff --git a/graphql_api/types/test_analytics/test_analytics.py b/graphql_api/types/test_analytics/test_analytics.py
@@ -215,37 +215,6 @@ def generate_test_results(
             },
         )
 
-    failure_rate_expr = (
-        pl.col("failure_rate")
-        * (pl.col("total_fail_count") + pl.col("total_pass_count"))
-    ).sum() / (pl.col("total_fail_count") + pl.col("total_pass_count")).sum()
-
-    flake_rate_expr = (
-        pl.col("flake_rate") * (pl.col("total_fail_count") + pl.col("total_pass_count"))
-    ).sum() / (pl.col("total_fail_count") + pl.col("total_pass_count")).sum()
-
-    avg_duration_expr = (
-        pl.col("avg_duration")
-        * (pl.col("total_pass_count") + pl.col("total_fail_count"))
-    ).sum() / (pl.col("total_pass_count") + pl.col("total_fail_count")).sum()
-
-    # dedup
-    table = table.group_by("name").agg(
-        pl.col("test_id").first().alias("test_id"),
-        pl.col("testsuite").alias("testsuite"),
-        pl.col("flags").explode().unique().alias("flags"),
-        failure_rate_expr.alias("failure_rate"),
-        flake_rate_expr.alias("flake_rate"),
-        pl.col("updated_at").max().alias("updated_at"),
-        avg_duration_expr.alias("avg_duration"),
-        pl.col("total_fail_count").sum().alias("total_fail_count"),
-        pl.col("total_flaky_fail_count").sum().alias("total_flaky_fail_count"),
-        pl.col("total_pass_count").sum().alias("total_pass_count"),
-        pl.col("total_skip_count").sum().alias("total_skip_count"),
-        pl.col("commits_where_fail").sum().alias("commits_where_fail"),
-        pl.col("last_duration").max().alias("last_duration"),
-    )
-
     if term:
         table = table.filter(pl.col("name").str.contains(term))
 
diff --git a/pyproject.toml b/pyproject.toml
@@ -74,4 +74,4 @@ dev-dependencies = [
 ]
 
 [tool.uv.sources]
-shared = { git = "https://github.com/codecov/shared", rev = "284b92c74f0bc7ca5c4f6f139f3b26fe64fe9c1a" }
+shared = { git = "https://github.com/codecov/shared", rev = "290557e977c4ff60d5d9dcb9ee54afea1c1df83f" }
diff --git a/services/activation.py b/services/activation.py
@@ -76,12 +76,24 @@ def try_auto_activate(org: Owner, owner: Owner) -> bool:
     activator = _get_activator(org, owner)
 
     if activator.is_autoactivation_enabled():
-        log.info(f"Attemping to auto-activate user {owner.ownerid} in {org.ownerid}")
+        log.info(
+            "Attemping to auto-activate user",
+            extra=dict(
+                owner_id=owner.ownerid,
+                org_id=org.ownerid
+            ),
+        )
         if activator.can_activate_user():
             activator.activate_user()
             return True
         else:
-            log.info("Auto-activation failed -- not enough seats remaining")
+            log.info(
+                "Auto-activation failed -- not enough seats remaining",
+                extra=dict(
+                    owner_id=owner.ownerid,
+                    org_id=org.ownerid
+                ),
+            )
     return False
 
 
diff --git a/services/tests/test_comparison.py b/services/tests/test_comparison.py
@@ -569,8 +569,8 @@ def test_lines(self):
         }
         src = [first_line_val, "this is an added line", last_line_val]
 
-        self.file_comparison.head_file._lines = head_lines
-        self.file_comparison.base_file._lines = base_lines
+        self.file_comparison.head_file._parsed_lines = head_lines
+        self.file_comparison.base_file._parsed_lines = base_lines
         self.file_comparison.diff_data = {"segments": [segment]}
         self.file_comparison.src = src
 
@@ -665,8 +665,8 @@ def test_change_summary(self):
         }
         src = [first_line_val, "this is an added line", last_line_val]
 
-        self.file_comparison.head_file._lines = head_lines
-        self.file_comparison.base_file._lines = base_lines
+        self.file_comparison.head_file._parsed_lines = head_lines
+        self.file_comparison.base_file._parsed_lines = base_lines
         self.file_comparison.diff_data = {"segments": [segment]}
         self.file_comparison.src = src
 
@@ -1311,10 +1311,10 @@ def setUp(self):
 
     def test_single_segment(self):
         self.file_comparison.src = self._src(12)
-        self.file_comparison.head_file._lines = self._report_lines(
+        self.file_comparison.head_file._parsed_lines = self._report_lines(
             [1 for _ in range(12)]
         )
-        self.file_comparison.base_file._lines = self._report_lines(
+        self.file_comparison.base_file._parsed_lines = self._report_lines(
             [
                 1,
                 1,  # first line of segment
@@ -1341,10 +1341,10 @@ def test_single_segment(self):
 
     def test_multiple_segments(self):
         self.file_comparison.src = self._src(25)
-        self.file_comparison.head_file._lines = self._report_lines(
+        self.file_comparison.head_file._parsed_lines = self._report_lines(
             [1 for _ in range(25)]
         )
-        self.file_comparison.base_file._lines = self._report_lines(
+        self.file_comparison.base_file._parsed_lines = self._report_lines(
             [
                 1,
                 1,  # first line of segment 1
diff --git a/services/tests/test_report.py b/services/tests/test_report.py
@@ -6,19 +6,14 @@
     CommitFactory,
     CommitWithReportFactory,
 )
-from shared.reports.api_report_service import (
-    build_report,
-    build_report_from_commit,
-)
+from shared.reports.api_report_service import build_report_from_commit
 from shared.reports.resources import Report, ReportFile
 from shared.reports.types import ReportLine
 from shared.storage.exceptions import FileNotInStorageError
 from shared.utils.sessions import Session
 
 from reports.tests.factories import UploadFactory, UploadFlagMembershipFactory
-from services.report import (
-    files_belonging_to_flags,
-)
+from services.report import files_belonging_to_flags
 
 current_file = Path(__file__)
 
@@ -50,64 +45,6 @@ def sorted_files(report: Report) -> list[ReportFile]:
 
 
 class ReportServiceTest(TestCase):
-    def test_report_generator(self):
-        data = {
-            "chunks": "{}\n[1, null, [[0, 1]]]\n\n\n[1, null, [[0, 1]]]\n[0, null, [[0, 0]]]\n<<<<< end_of_chunk >>>>>\n{}\n[1, null, [[0, 1]]]\n\n\n[1, null, [[0, 1]]]\n[1, null, [[0, 1]]]\n\n\n[1, null, [[0, 1]]]\n[1, null, [[0, 1]]]\n\n\n[1, null, [[0, 1]]]\n[1, null, [[0, 1]]]\n<<<<< end_of_chunk >>>>>\n{}\n[1, null, [[0, 1]]]\n[1, null, [[0, 1]]]\n\n\n[1, null, [[0, 1]]]\n[0, null, [[0, 0]]]\n\n\n[1, null, [[0, 1]]]\n[1, null, [[0, 1]]]\n[1, null, [[0, 1]]]\n[1, null, [[0, 1]]]\n\n\n[1, null, [[0, 1]]]\n[0, null, [[0, 0]]]",
-            "files": {
-                "awesome/__init__.py": [
-                    2,
-                    [0, 10, 8, 2, 0, "80.00000", 0, 0, 0, 0, 0, 0, 0],
-                    [[0, 10, 8, 2, 0, "80.00000", 0, 0, 0, 0, 0, 0, 0]],
-                    [0, 2, 1, 1, 0, "50.00000", 0, 0, 0, 0, 0, 0, 0],
-                ],
-                "tests/__init__.py": [
-                    0,
-                    [0, 3, 2, 1, 0, "66.66667", 0, 0, 0, 0, 0, 0, 0],
-                    [[0, 3, 2, 1, 0, "66.66667", 0, 0, 0, 0, 0, 0, 0]],
-                    None,
-                ],
-                "tests/test_sample.py": [
-                    1,
-                    [0, 7, 7, 0, 0, "100", 0, 0, 0, 0, 0, 0, 0],
-                    [[0, 7, 7, 0, 0, "100", 0, 0, 0, 0, 0, 0, 0]],
-                    None,
-                ],
-            },
-            "sessions": {
-                "0": {
-                    "N": None,
-                    "a": "v4/raw/2019-01-10/839C9EAF1A3F1CD45AA08DF5F791461F/abf6d4df662c47e32460020ab14abf9303581429/9ccc55a1-8b41-4bb1-a946-ee7a33a7fb56.txt",
-                    "c": None,
-                    "d": 1547084427,
-                    "e": None,
-                    "f": None,
-                    "j": None,
-                    "n": None,
-                    "p": None,
-                    "t": [3, 20, 17, 3, 0, "85.00000", 0, 0, 0, 0, 0, 0, 0],
-                    "": None,
-                }
-            },
-            "totals": {
-                "C": 0,
-                "M": 0,
-                "N": 0,
-                "b": 0,
-                "c": "85.00000",
-                "d": 0,
-                "diff": [1, 2, 1, 1, 0, "50.00000", 0, 0, 0, 0, 0, 0, 0],
-                "f": 3,
-                "h": 17,
-                "m": 3,
-                "n": 20,
-                "p": 0,
-                "s": 1,
-            },
-        }
-
-        res = build_report(**data)
-        assert len(res.files) == 3
-
     @patch("shared.api_archive.archive.ArchiveService.read_chunks")
     def test_build_report_from_commit(self, read_chunks_mock):
         f = open(current_file.parent / "samples" / "chunks.txt", "r")
diff --git a/templates/admin/base_site.html b/templates/admin/base_site.html
@@ -0,0 +1,60 @@
+{% extends "admin/base_site.html" %}
+{% load i18n %}
+
+{% block branding %}
+<h1 id="site-name">
+    <a href="{% url 'admin:index' %}">
+        {% trans 'Django administration' %}
+        <span id="impersonation-notice" style="display: none;">
+            - Impersonating (return to codecov.io and log out)
+        </span>
+    </a>
+</h1>
+{% endblock %}
+
+{% block extrahead %}
+{{ block.super }}
+<style>
+    /* Custom styling when cookie is present */
+    html[data-theme="light"].impersonation, :root.impersonation {
+      --primary: #ff9800;
+      --secondary: #ff9800;
+      --link-fg: #ff9800;
+      --link-selected-fg: #ff9800;
+    }
+    
+    #header.impersonation {
+        background-color: #ff9800 !important;
+    }
+</style>
+<script>
+    document.addEventListener('DOMContentLoaded', function() {
+        function getCookie(name) {
+            const value = `; ${document.cookie}`;
+            const parts = value.split(`; ${name}=`);
+            if (parts.length === 2) return parts.pop().split(';').shift();
+            return null;
+        }
+
+        // Check for the "staff_user" cookie
+        const staffUserCookie = getCookie('staff_user');
+
+        if (staffUserCookie) {
+            // Modify the header appearance
+            const headerElement = document.querySelector('#header');
+            if (headerElement) {
+                headerElement.classList.add('impersonation');
+            }
+            
+            // Add class to html element for theme variables
+            document.documentElement.classList.add('impersonation');
+            
+            // Show the impersonation notice
+            const impersonationNotice = document.getElementById('impersonation-notice');
+            if (impersonationNotice) {
+                impersonationNotice.style.display = 'inline';
+            }
+        }
+    });
+</script>
+{% endblock %}
diff --git a/upload/tests/views/test_uploads.py b/upload/tests/views/test_uploads.py
diff --git a/upload/views/upload_coverage.py b/upload/views/upload_coverage.py
diff --git a/upload/views/uploads.py b/upload/views/uploads.py
diff --git a/utils/test_results.py b/utils/test_results.py
diff --git a/uv.lock b/uv.lock

Original file line number	Diff line number	Diff line change
`@@ -74,4 +74,4 @@ dev-dependencies = [`
`74`	`74`	`]`
`75`	`75`
`76`	`76`	`[tool.uv.sources]`
`77`		`-shared = { git = "https://github.com/codecov/shared", rev = "284b92c74f0bc7ca5c4f6f139f3b26fe64fe9c1a" }`
	`77`	`+shared = { git = "https://github.com/codecov/shared", rev = "290557e977c4ff60d5d9dcb9ee54afea1c1df83f" }`