Merge branch 'main' into max/notify-fix

Author: maxweng-sentry

.github/workflows/_build-app.yml

@@ -87,7 +87,7 @@ jobs:
 
   build-test-app:
     name: Build Test App
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-large
     steps:
       - name: Checkout
         uses: actions/checkout@v4

.github/workflows/_run-tests.yml

@@ -104,7 +104,11 @@ jobs:
           - codecov_url_secret: CODECOV_PUBLIC_QA_URL
             codecov_token_secret: CODECOV_PUBLIC_QA_TOKEN
             name: public qa
+          - codecov_url_secret: CODECOV_EUROPE_WEST3_URL
+            codecov_token_secret: CODECOV_EUROPE_WEST3_TOKEN
+            name: europe-west3
 
+      
     steps:
       - name: Checkout
         uses: actions/checkout@v4

VERSION

@@ -1 +1 @@
-25.10.6
+25.11.3

apps/codecov-api/Makefile

@@ -26,7 +26,7 @@ check-for-migration-conflicts:
 	python manage.py check_for_migration_conflicts
 
 test:
-	COVERAGE_CORE=sysmon pytest --cov=./ --junitxml=junit.xml -o junit_family=legacy -c pytest.ini --rootdir=${PYTEST_ROOTDIR}
+	pytest --cov=./ --junitxml=junit.xml -o junit_family=legacy -c pytest.ini --rootdir=${PYTEST_ROOTDIR}
 
 shell:
 	docker compose exec api bash

apps/codecov-api/api.sh

@@ -4,6 +4,44 @@ set -euo pipefail
 # Default entrypoint for api
 echo "Starting api"
 
+# Signal handling for graceful shutdown
+shutdown_in_progress=false
+shutdown() {
+  # Prevent duplicate shutdown attempts (in case both shell and process receive signal)
+  if [[ "$shutdown_in_progress" == "true" ]]; then
+    return 0
+  fi
+  shutdown_in_progress=true
+  
+  echo "Received SIGTERM, shutting down gracefully..."
+  if [[ -n "${api_pid:-}" ]]; then
+    # Send SIGTERM to the API process (gunicorn)
+    kill -TERM "$api_pid" 2>/dev/null || true
+    
+    # Wait for graceful shutdown with timeout (default 25s, less than K8s terminationGracePeriodSeconds)
+    local timeout=${SHUTDOWN_TIMEOUT:-25}
+    local count=0
+    
+    while kill -0 "$api_pid" 2>/dev/null && [[ $count -lt $timeout ]]; do
+      sleep 1
+      ((count++))
+    done
+    
+    # If process is still running, force kill
+    if kill -0 "$api_pid" 2>/dev/null; then
+      echo "API did not shutdown gracefully after ${timeout}s, forcing shutdown..."
+      kill -KILL "$api_pid" 2>/dev/null || true
+      wait "$api_pid" 2>/dev/null || true
+    else
+      echo "API shutdown complete"
+    fi
+  fi
+  exit 0
+}
+
+# Trap SIGTERM and SIGINT
+trap shutdown SIGTERM SIGINT
+
 # Script section to keep in sync with worker.sh
 #### Start ####
 
@@ -67,6 +105,8 @@ if [[ -z "${1:-}" ]]; then
     echo "Starting gunicorn in default mode"
     ;;
   esac
+  
+  # Start gunicorn in the background and capture its PID
   $pre $berglas gunicorn codecov.wsgi:application \
     $added_args \
     $statsd \
@@ -76,7 +116,12 @@ if [[ -z "${1:-}" ]]; then
     --bind "${CODECOV_API_BIND:-0.0.0.0}":"${CODECOV_API_PORT:-8000}" \
     --access-logfile '-' \
     --timeout "${GUNICORN_TIMEOUT:-600}" \
-    $post
+    $post &
+  api_pid=$!
+  echo "Gunicorn started with PID $api_pid"
+  
+  # Wait for the background process
+  wait "$api_pid"
 else
   echo "Executing custom command"
   exec "$@"

apps/codecov-api/api/internal/owner/serializers.py

@@ -140,7 +140,7 @@ def validate_value(self, value: str) -> str:
 
     def validate(self, plan: dict[str, Any]) -> dict[str, Any]:
         current_org = self.context["view"].owner
-        if current_org.account:
+        if current_org.has_billing_account:
             raise serializers.ValidationError(
                 detail="You cannot update your plan manually, for help or changes to plan, connect with [email protected]"
             )
@@ -312,22 +312,22 @@ def get_checkout_session_id(self, _: Any) -> str:
         return self.context.get("checkout_session_id")
 
     def get_activated_student_count(self, owner: Owner) -> int:
-        if owner.account:
+        if owner.has_billing_account:
             return owner.account.activated_student_count
         return owner.activated_student_count
 
     def get_activated_user_count(self, owner: Owner) -> int:
-        if owner.account:
+        if owner.has_billing_account:
             return owner.account.activated_user_count
         return owner.activated_user_count
 
     def get_delinquent(self, owner: Owner) -> bool:
-        if owner.account:
+        if owner.has_billing_account:
             return owner.account.is_delinquent
         return owner.delinquent
 
     def get_uses_invoice(self, owner: Owner) -> bool:
-        if owner.account:
+        if owner.has_billing_account:
             return (
                 hasattr(owner.account, "invoice_billing")
                 and owner.account.invoice_billing.is_active

apps/codecov-api/api/internal/owner/views.py

@@ -17,11 +17,7 @@
 from shared.django_apps.codecov_auth.models import Owner
 from shared.plan.constants import DEFAULT_FREE_PLAN
 
-from .serializers import (
-    AccountDetailsSerializer,
-    OwnerSerializer,
-    UserSerializer,
-)
+from .serializers import AccountDetailsSerializer, OwnerSerializer, UserSerializer
 
 log = logging.getLogger(__name__)
 
@@ -62,7 +58,7 @@ def destroy(self, request, *args, **kwargs):
         return Response(status=status.HTTP_204_NO_CONTENT)
 
     def get_object(self):
-        if self.owner.account:
+        if self.owner.has_billing_account:
             # gets the related account and invoice_billing objects from db in 1 query
             # otherwise, each reference to owner.account would be an additional query
             self.owner = (

apps/codecov-api/api/internal/tests/views/cassetes/test_account_viewset/AccountViewSetTests/test_validate_plan_allows_update_for_sentry_merge_account.yaml

@@ -0,0 +1,70 @@
+interactions:
+- request:
+    body: null
+    headers:
+      Accept:
+      - '*/*'
+      Accept-Encoding:
+      - gzip, deflate
+      Connection:
+      - keep-alive
+      Stripe-Version:
+      - 2024-12-18.acacia
+      User-Agent:
+      - Stripe/v1 PythonBindings/12.1.0
+      X-Stripe-Client-Telemetry:
+      - '{"last_request_metrics": {"request_id": "req_AaY8IvHbbSDcvz", "request_duration_ms":
+        1}}'
+      X-Stripe-Client-User-Agent:
+      - '{"bindings_version": "12.1.0", "lang": "python", "publisher": "stripe", "httplib":
+        "requests", "lang_version": "3.13.8", "platform": "Linux-6.8.0-50-generic-aarch64-with-glibc2.36",
+        "uname": "Linux affeb8b59f6a 6.8.0-50-generic #51-Ubuntu SMP PREEMPT_DYNAMIC
+        Sat Nov  9 18:03:35 UTC 2024 aarch64 "}'
+    method: GET
+    uri: https://api.stripe.com/v1/subscriptions/sub_test123?expand%5B0%5D=latest_invoice&expand%5B1%5D=customer&expand%5B2%5D=customer.invoice_settings.default_payment_method&expand%5B3%5D=customer.tax_ids
+  response:
+    body:
+      string: "{\n  \"error\": {\n    \"message\": \"Invalid API Key provided: default\",\n
+        \   \"type\": \"invalid_request_error\"\n  }\n}\n"
+    headers:
+      Access-Control-Allow-Credentials:
+      - 'true'
+      Access-Control-Allow-Methods:
+      - GET, HEAD, PUT, PATCH, POST, DELETE
+      Access-Control-Allow-Origin:
+      - '*'
+      Access-Control-Expose-Headers:
+      - Request-Id, Stripe-Manage-Version, Stripe-Should-Retry, X-Stripe-External-Auth-Required,
+        X-Stripe-Privileged-Session-Required
+      Access-Control-Max-Age:
+      - '300'
+      Cache-Control:
+      - no-cache, no-store
+      Connection:
+      - keep-alive
+      Content-Length:
+      - '109'
+      Content-Security-Policy:
+      - base-uri 'none'; default-src 'none'; form-action 'none'; frame-ancestors 'none';
+        img-src 'self'; script-src 'self' 'report-sample'; style-src 'self'; worker-src
+        'none'; upgrade-insecure-requests; report-uri https://q.stripe.com/csp-violation?q=ExuJuLbTEDCmAz4Yn3NBLx-GG6q1al6t0FbBrJYe4vkB3kq1BMch4lmx4XLhDMGPvdcJoWL6ddxZhq9D
+      Content-Type:
+      - application/json
+      Date:
+      - Wed, 08 Oct 2025 21:44:22 GMT
+      Server:
+      - nginx
+      Strict-Transport-Security:
+      - max-age=63072000; includeSubDomains; preload
+      Vary:
+      - Origin
+      Www-Authenticate:
+      - Bearer realm="Stripe"
+      X-Robots-Tag:
+      - none
+      X-Wc:
+      - ABHIJ
+    status:
+      code: 401
+      message: Unauthorized
+version: 1

apps/codecov-api/api/internal/tests/views/test_account_viewset.py

@@ -1859,6 +1859,77 @@ def test_retrieve_org_with_account(self):
         self.assertDictEqual(response.data["plan"], expected_response["plan"])
         self.assertDictEqual(response.data, expected_response)
 
+    def test_retrieve_with_sentry_merge_account_uses_owner_fields(self):
+        org = OwnerFactory(
+            plan=PlanName.CODECOV_PRO_YEARLY.value,
+            plan_user_count=10,
+            stripe_customer_id="cus_test123",
+            delinquent=True,
+        )
+        org.plan_activated_users = []
+        org.save()
+
+        activated_owner = OwnerFactory(
+            service=Service.GITHUB.value,
+            user=UserFactory(),
+            organizations=[org.ownerid],
+        )
+        org.plan_activated_users = [activated_owner.ownerid]
+        org.admins = [activated_owner.ownerid]
+        org.save()
+
+        account = AccountFactory(
+            plan=PlanName.SENTRY_MERGE_PLAN.value,
+            plan_seat_count=5,
+            is_delinquent=False,
+        )
+        InvoiceBillingFactory(account=account, is_active=True)
+        org.account = account
+        org.save()
+
+        self.client.force_login_owner(activated_owner)
+        response = self._retrieve(
+            kwargs={"service": Service.GITHUB.value, "owner_username": org.username}
+        )
+        assert response.status_code == status.HTTP_200_OK
+
+        expected_response = {
+            "activated_user_count": 1,
+            "activated_student_count": 0,
+            "delinquent": True,
+            "uses_invoice": False,
+            "plan": {
+                "marketing_name": "Pro",
+                "value": PlanName.CODECOV_PRO_YEARLY.value,
+                "billing_rate": "annually",
+                "base_unit_price": 10,
+                "benefits": [
+                    "Configurable # of users",
+                    "Unlimited public repositories",
+                    "Unlimited private repositories",
+                    "Priority Support",
+                ],
+                "quantity": 10,
+            },
+            "root_organization": None,
+            "integration_id": org.integration_id,
+            "plan_auto_activate": org.plan_auto_activate,
+            "inactive_user_count": 0,
+            "subscription_detail": None,
+            "checkout_session_id": None,
+            "name": org.name,
+            "email": org.email,
+            "nb_active_private_repos": 0,
+            "repo_total_credits": 99999999,
+            "plan_provider": org.plan_provider,
+            "student_count": 0,
+            "schedule_detail": None,
+        }
+        self.assertDictEqual(response.data["plan"], expected_response["plan"])
+        self.assertEqual(response.data["activated_user_count"], 1)
+        self.assertEqual(response.data["delinquent"], True)
+        self.assertEqual(response.data["uses_invoice"], False)
+
 
 @override_settings(IS_ENTERPRISE=True)
 class EnterpriseAccountViewSetTests(APITestCase):

apps/codecov-api/api/public/v2/tests/test_api_evals_viewset.py

@@ -192,11 +192,17 @@ def test_summary_aggregation_and_filtering_no_filter(self):
         assert data["totalItems"] == 3
         assert data["passedItems"] == 2
         assert data["failedItems"] == 1
-        assert data["avgDurationSeconds"] == (10.0 + 20.0 + 30.0) / 3
-        assert data["avgCost"] == (5.0 + 7.0 + 3.0) / 3
+        assert data["avgDurationSeconds"] == pytest.approx((10.0 + 20.0 + 30.0) / 3)
+        assert data["avgCost"] == pytest.approx((5.0 + 7.0 + 3.0) / 3)
         assert data["scores"] == {
-            "accuracy": {"sum": (0.9 + 0.7 + 0.1), "avg": (0.9 + 0.7 + 0.1) / 3},
-            "f1": {"sum": (0.8 + 0.6 + 0.2), "avg": (0.8 + 0.6 + 0.2) / 3},
+            "accuracy": {
+                "sum": pytest.approx(0.9 + 0.7 + 0.1),
+                "avg": pytest.approx((0.9 + 0.7 + 0.1) / 3),
+            },
+            "f1": {
+                "sum": pytest.approx(0.8 + 0.6 + 0.2),
+                "avg": pytest.approx((0.8 + 0.6 + 0.2) / 3),
+            },
         }
 
     def test_summary_aggregation_and_filtering_filter_classA(self):