Merge branch 'main' into rvinnakota/add-ip-address-sentry

Author: rohitvinnakota-codecov

.github/workflows/ci.yml

@@ -19,19 +19,19 @@ permissions:
 jobs:
   lint:
     name: Run Lint
-    uses: codecov/gha-workflows/.github/workflows/[email protected].23
+    uses: codecov/gha-workflows/.github/workflows/[email protected].24
 
   build:
     name: Build API
-    uses: codecov/gha-workflows/.github/workflows/[email protected].23
+    uses: codecov/gha-workflows/.github/workflows/[email protected].24
     secrets: inherit
     with:
       repo: ${{ vars.CODECOV_IMAGE_V2 || 'codecov/self-hosted-api' }}
 
   codecovstartup:
     name: Codecov Startup
     needs: build
-    uses: codecov/gha-workflows/.github/workflows/[email protected].23
+    uses: codecov/gha-workflows/.github/workflows/[email protected].24
     secrets: inherit
 
   # ats:
@@ -47,15 +47,15 @@ jobs:
   test:
     name: Test
     needs: [build]
-    uses: codecov/gha-workflows/.github/workflows/[email protected].23
+    uses: codecov/gha-workflows/.github/workflows/[email protected].24
     secrets: inherit
     with:
       repo: ${{ vars.CODECOV_IMAGE_V2 || 'codecov/self-hosted-api' }}
 
   build-self-hosted:
     name: Build Self Hosted API
     needs: [build, test]
-    uses: codecov/gha-workflows/.github/workflows/[email protected].23
+    uses: codecov/gha-workflows/.github/workflows/[email protected].24
     secrets: inherit
     with:
       repo: ${{ vars.CODECOV_IMAGE_V2 || 'codecov/self-hosted-api' }}
@@ -64,7 +64,7 @@ jobs:
     name: Push Staging Image
     needs: [build, test]
     if: ${{ github.event_name == 'push' && github.event.ref == 'refs/heads/staging' && github.repository_owner == 'codecov' }}
-    uses: codecov/gha-workflows/.github/workflows/[email protected].23
+    uses: codecov/gha-workflows/.github/workflows/[email protected].24
     secrets: inherit
     with:
       environment: staging
@@ -74,7 +74,7 @@ jobs:
     name: Push Production Image
     needs: [build, test]
     if: ${{ github.event_name == 'push' && github.event.ref == 'refs/heads/main' && github.repository_owner == 'codecov' }}
-    uses: codecov/gha-workflows/.github/workflows/[email protected].23
+    uses: codecov/gha-workflows/.github/workflows/[email protected].24
     secrets: inherit
     with:
       environment: production
@@ -85,7 +85,7 @@ jobs:
     needs: [build-self-hosted, test]
     secrets: inherit
     if: ${{ github.event_name == 'push' && github.event.ref == 'refs/heads/main' && github.repository_owner == 'codecov' }}
-    uses: codecov/gha-workflows/.github/workflows/[email protected].23
+    uses: codecov/gha-workflows/.github/workflows/[email protected].24
     with:
       push_rolling: true
       repo: ${{ vars.CODECOV_IMAGE_V2 || 'codecov/self-hosted-api' }}

.gitignore

@@ -49,6 +49,8 @@ coverage.xml
 *.cover
 .hypothesis/
 .pytest_cache/
+*.coverage.xml
+*junit.xml
 
 # Translations
 *.mo
@@ -129,5 +131,6 @@ dmypy.json
 
 # PyCharm stuff
 .idea
+.run
 
 *.pem

Makefile

@@ -31,13 +31,13 @@ check-for-migration-conflicts:
 	python manage.py check_for_migration_conflicts
 
 test:
-	COVERAGE_CORE=sysmon python -m pytest --cov=./ --junitxml=junit.xml
+	COVERAGE_CORE=sysmon python -m pytest --cov=./ --junitxml=junit.xml -o junit_family=legacy
 
 test.unit:
-	COVERAGE_CORE=sysmon python -m pytest --cov=./ -m "not integration" --cov-report=xml:unit.coverage.xml --junitxml=unit.junit.xml
+	COVERAGE_CORE=sysmon python -m pytest --cov=./ -m "not integration" --cov-report=xml:unit.coverage.xml --junitxml=unit.junit.xml -o junit_family=legacy
 
 test.integration:
-	COVERAGE_CORE=sysmon python -m pytest --cov=./ -m "integration" --cov-report=xml:integration.coverage.xml --junitxml=integration.junit.xml
+	COVERAGE_CORE=sysmon python -m pytest --cov=./ -m "integration" --cov-report=xml:integration.coverage.xml --junitxml=integration.junit.xml -o junit_family=legacy
 
 lint:
 	make lint.install
@@ -178,6 +178,9 @@ push.self-hosted-rolling:
 	docker push ${DOCKERHUB_REPO}:rolling_no_dependencies
 	docker push ${DOCKERHUB_REPO}:rolling
 
+shell:
+	docker-compose exec api bash
+	
 test_env.up:
 	env | grep GITHUB > .testenv; true
 	TIMESERIES_ENABLED=${TIMESERIES_ENABLED} docker-compose up -d

README.md

@@ -79,7 +79,7 @@ Do not change `requirements.txt` directly.
 
 ### Formatting
 
-This project uses `black` for formatting.      
+This project uses `ruff` for formatting.      
 You can run the linter using the command `make lint`.
 
 ### Migrations

VERSION

@@ -1 +1 @@
-24.9.1
+24.11.1

api/internal/commit/serializers.py

@@ -1,9 +1,9 @@
 import logging
 
+import shared.reports.api_report_service as report_service
 from rest_framework import serializers
 from shared.reports.types import TOTALS_MAP
 
-import services.report as report_service
 from api.internal.owner.serializers import OwnerSerializer
 from api.shared.commit.serializers import CommitTotalsSerializer
 from core.models import Commit

api/internal/coverage/views.py

@@ -1,3 +1,6 @@
+from typing import Any
+
+from django.http import HttpRequest
 from rest_framework import viewsets
 from rest_framework.decorators import action
 from rest_framework.exceptions import NotFound
@@ -13,7 +16,7 @@
 class CoverageViewSet(viewsets.ViewSet, RepoPropertyMixin):
     permission_classes = [RepositoryArtifactPermissions]
 
-    def get_object(self):
+    def get_object(self) -> ReportPaths:
         commit_sha = self.request.query_params.get("sha")
         if not commit_sha:
             branch_name = self.request.query_params.get("branch", self.repo.branch)
@@ -39,9 +42,7 @@ def get_object(self):
         components = self.request.query_params.getlist("components")
         component_paths = []
         if components:
-            all_components = components_service.commit_components(
-                commit, self.request.user
-            )
+            all_components = components_service.commit_components(commit, self.owner)
             filtered_components = components_service.filter_components_by_name(
                 all_components, components
             )
@@ -62,7 +63,7 @@ def get_object(self):
         return paths
 
     @action(detail=False, methods=["get"], url_path="tree")
-    def tree(self, request, *args, **kwargs):
+    def tree(self, request: HttpRequest, *args: Any, **kwargs: Any) -> Response:
         paths = self.get_object()
         serializer = TreeSerializer(paths.single_directory(), many=True)
         return Response(serializer.data)

api/internal/owner/serializers.py

@@ -230,12 +230,15 @@ def get_scheduled_phase(self, schedule):
             return StripeScheduledPhaseSerializer(schedule["phases"][-1]).data
         else:
             # This error represents the phases object not having 2 phases; we are interested in the 2nd entry within phases
-            # since it represents the scheduled phase
+            # since it represents the scheduled phase.
+            # It should not be possible for a schedule to have one phase, but we have seen certain cases where this is true
+            # after manual intervention on a subscription.
             log.error(
                 "Expecting schedule object to have 2 phases, returning None",
                 extra=dict(
-                    ownerid=schedule.metadata.obo_organization,
-                    requesting_user_id=schedule.metadata.obo,
+                    ownerid=schedule.metadata.get("obo_organization"),
+                    requesting_user_id=schedule.metadata.get("obo"),
+                    phases=schedule.get("phases", "no phases"),
                 ),
             )
             return None

api/internal/tests/test_charts.py

@@ -13,6 +13,7 @@
 from pytz import UTC
 from rest_framework.exceptions import ValidationError
 from rest_framework.reverse import reverse
+from shared.django_apps.core.tests.factories import OwnerFactory, RepositoryFactory
 
 from api.internal.chart.filters import apply_default_filters, apply_simple_filters
 from api.internal.chart.helpers import (
@@ -23,7 +24,6 @@
 )
 from codecov.tests.base_test import InternalAPITest
 from core.models import Commit
-from core.tests.factories import OwnerFactory, RepositoryFactory
 from utils.test_utils import Client
 
 fake = faker.Faker()
@@ -56,7 +56,7 @@ def generate_random_totals(
 def setup_commits(
     repo,
     num_commits,
-    branch="master",
+    branch="main",
     start_date=None,
     meets_default_filters=True,
     **kwargs,
@@ -251,7 +251,7 @@ def test_apply_simple_filters(self):
         end_date = datetime.now()
         data = {
             "owner_username": self.org1.username,
-            "branch": "master",
+            "branch": "main",
             "start_date": start_date.isoformat(),
             "end_date": end_date.isoformat(),
             "repositories": [self.repo1_org1.name, self.repo2_org1.name],
@@ -318,7 +318,7 @@ def test_apply_simple_filters_branch_filtering(self):
         for commit in queryset:
             assert (
                 commit.repository.name == self.repo1_org1.name
-                and commit.branch == "master"
+                and commit.branch == "main"
             ) or (
                 commit.repository.name == branch_test.name and commit.branch == "main"
             )
@@ -860,7 +860,7 @@ def setUp(self):
 
     def test_no_permissions(self, mocked_get_permissions):
         data = {
-            "branch": "master",
+            "branch": "main",
             "start_date": timezone.now() - timedelta(7),
             "end_date": timezone.now(),
             "grouping_unit": "commit",
@@ -879,7 +879,7 @@ def test_no_permissions(self, mocked_get_permissions):
     @pytest.mark.skip(reason="flaky, skipping until re write")
     def test_get_commits_no_time_grouping(self, mocked_get_permissions):
         data = {
-            "branch": "master",
+            "branch": "main",
             "start_date": timezone.now() - timedelta(7),
             "end_date": timezone.now(),
             "grouping_unit": "commit",
@@ -897,7 +897,7 @@ def test_get_commits_no_time_grouping(self, mocked_get_permissions):
 
     def test_get_commits_with_time_grouping(self, mocked_get_permissions):
         data = {
-            "branch": "master",
+            "branch": "main",
             "start_date": timezone.now() - timedelta(7),
             "end_date": timezone.now(),
             "grouping_unit": "day",
@@ -917,7 +917,7 @@ def test_get_commits_with_time_grouping(self, mocked_get_permissions):
 
     def test_get_commits_with_coverage_change(self, mocked_get_permissions):
         data = {
-            "branch": "master",
+            "branch": "main",
             "start_date": timezone.now() - timedelta(7),
             "end_date": timezone.now(),
             "grouping_unit": "day",

api/internal/tests/test_feature.py

@@ -3,13 +3,13 @@
 import pytest
 from django.urls import reverse
 from rest_framework.test import APITestCase
+from shared.django_apps.core.tests.factories import OwnerFactory
 from shared.django_apps.rollouts.models import (
     FeatureFlag,
     FeatureFlagVariant,
     RolloutUniverse,
 )
 
-from codecov_auth.tests.factories import OwnerFactory
 from utils.test_utils import Client