Merge branch 'main' into Ajay/remove-references-to-old-plan-representations

Author: ajay-sentry

codecov/settings_base.py

@@ -443,6 +443,7 @@
     "profiling": "shared.django_apps.profiling.migrations",
     "reports": "shared.django_apps.reports.migrations",
     "staticanalysis": "shared.django_apps.staticanalysis.migrations",
+    "timeseries": "shared.django_apps.timeseries.migrations",
 }
 
 # to aid in debugging, print out this info on startup. If no license, prints nothing

codecov_auth/authentication/repo_auth.py

@@ -9,7 +9,7 @@
 from django.utils import timezone
 from jwt import PyJWTError
 from rest_framework import authentication, exceptions, serializers
-from rest_framework.exceptions import NotAuthenticated
+from rest_framework.exceptions import NotAuthenticated, ValidationError
 from rest_framework.response import Response
 from rest_framework.views import exception_handler
 from shared.django_apps.codecov_auth.models import Owner
@@ -200,7 +200,7 @@ def authenticate(
         if not using_global_token:
             return None  # continue to next auth class
 
-        service = global_tokens[token]
+        service = global_tokens.get(token, "")
         upload_info = get_upload_info_from_request_path(request)
         if upload_info is None:
             return None  # continue to next auth class
@@ -257,7 +257,7 @@ def authenticate_credentials(
 
         try:
             repository = get_repo_with_github_actions_oidc_token(token)
-        except (ObjectDoesNotExist, PyJWTError):
+        except (ObjectDoesNotExist, PyJWTError, ValidationError):
             return None  # continue to next auth class
 
         log.info(

core/admin.py

@@ -7,6 +7,7 @@
 from codecov.admin import AdminMixin
 from codecov_auth.models import RepositoryToken
 from core.models import Pull, Repository
+from services.task.task import TaskService
 
 
 class RepositoryTokenInline(admin.TabularInline):
@@ -90,12 +91,19 @@ class RepositoryAdmin(AdminMixin, admin.ModelAdmin):
         "webhook_secret",
     )
 
-    def has_delete_permission(self, request, obj=None):
-        return False
-
     def has_add_permission(self, _, obj=None):
         return False
 
+    def has_delete_permission(self, request, obj=None):
+        return bool(request.user and request.user.is_superuser)
+
+    def delete_queryset(self, request, queryset) -> None:
+        for repo in queryset:
+            TaskService().flush_repo(repository_id=repo.repoid)
+
+    def delete_model(self, request, obj) -> None:
+        TaskService().flush_repo(repository_id=obj.repoid)
+
 
 @admin.register(Pull)
 class PullsAdmin(AdminMixin, admin.ModelAdmin):

core/apps.py

@@ -1,7 +1,6 @@
 import logging
 
 from django.apps import AppConfig
-from django.core.management import call_command
 from shared.helpers.cache import RedisBackend
 
 from services.redis_configuration import get_redis_connection
@@ -17,24 +16,6 @@ class CoreConfig(AppConfig):
     def ready(self):
         import core.signals  # noqa: F401
 
-        if RUN_ENV == "DEV":
-            try:
-                # Call your management command here
-                call_command(
-                    "insert_data_to_db_from_csv",
-                    "core/management/commands/codecovTiers-Jan25.csv",
-                    "--model",
-                    "tiers",
-                )
-                call_command(
-                    "insert_data_to_db_from_csv",
-                    "core/management/commands/codecovPlans-Jan25.csv",
-                    "--model",
-                    "plans",
-                )
-            except Exception as e:
-                logger.error(f"Failed to run startup command: {e}")
-
         if RUN_ENV not in ["DEV", "TESTING"]:
             cache_backend = RedisBackend(get_redis_connection())
             cache.configure(cache_backend)

core/management/commands/codecovPlans-Jan25.csv

@@ -2,12 +2,12 @@
 10,2025-01-16 04:40:55.162 -0800,2025-01-24 11:33:46.043 -0800,0,"{""Configurable # of users"",""Unlimited public repositories"",""Unlimited private repositories""}",,true,Developer,,,false,users-trial,6,
 9,2025-01-16 04:39:59.759 -0800,2025-01-24 11:34:10.038 -0800,10,"{""Configurable # of users"",""Unlimited public repositories"",""Unlimited private repositories"",""Priority Support""}",annually,true,Enterprise Cloud,,,true,users-enterprisey,4,price_1LmjzwGlVGuVgOrkIwlM46EU
 8,2025-01-16 04:39:15.877 -0800,2025-01-24 11:34:31.904 -0800,12,"{""Configurable # of users"",""Unlimited public repositories"",""Unlimited private repositories"",""Priority Support""}",monthly,true,Enterprise Cloud,,,true,users-enterprisem,4,price_1LmjypGlVGuVgOrkzKtNqhwW
-7,2025-01-16 04:38:12.544 -0800,2025-01-24 11:34:53.935 -0800,4,"{""Up to 10 users"",""Unlimited repositories"",""2500 private repo uploads"",""Patch coverage analysis""}",annually,true,Team,10,2500,true,users-teamy,2,price_1NrlXiGlVGuVgOrkgMTw5yno
-6,2025-01-16 04:37:08.918 -0800,2025-01-24 11:35:15.346 -0800,5,"{""Up to 10 users"",""Unlimited repositories"",""2500 private repo uploads"",""Patch coverage analysis""}",monthly,true,Team,10,2500,true,users-teamm,2,price_1NqPKdGlVGuVgOrkm9OFvtz8
-5,2025-01-16 04:35:34.152 -0800,2025-01-24 11:35:42.724 -0800,10,"{""Includes 5 seats"",""$10 per additional seat"",""Unlimited public repositories"",""Unlimited private repositories"",""Priority Support""}",annually,true,Sentry Pro,5,,true,users-sentryy,5,price_1MlYAYGlVGuVgOrke9SdbBUn
-4,2025-01-16 04:34:33.867 -0800,2025-01-24 11:35:48.218 -0800,12,"{""Includes 5 seats"",""$10 per additional seat"",""Unlimited public repositories"",""Unlimited private repositories"",""Priority Support""}",monthly,true,Sentry Pro,5,,true,users-sentrym,5,price_1MlY9yGlVGuVgOrkHluurBtJ
-3,2025-01-16 04:32:44.655 -0800,2025-01-24 11:36:09.660 -0800,10,"{""Configurable # of users"",""Unlimited public repositories"",""Unlimited private repositories"",""Priority Support""}",annually,true,Pro,,,true,users-pr-inappy,3,price_1Gv2COGlVGuVgOrkuOYVLIj7
-2,2025-01-16 04:30:42.897 -0800,2025-01-24 11:36:14.651 -0800,12,"{""Configurable # of users"",""Unlimited public repositories"",""Unlimited private repositories"",""Priority Support""}",monthly,true,Pro,,,true,users-pr-inappm,3,price_1Gv2B8GlVGuVgOrkFnLunCgc
+7,2025-01-16 04:38:12.544 -0800,2025-01-24 11:34:53.935 -0800,4,"{""Up to 10 users"",""Unlimited repositories"",""2500 private repo uploads"",""Patch coverage analysis""}",annually,true,Team,10,2500,true,users-teamy,2,price_1OCM2cGlVGuVgOrkMWUFjPFz
+6,2025-01-16 04:37:08.918 -0800,2025-01-24 11:35:15.346 -0800,5,"{""Up to 10 users"",""Unlimited repositories"",""2500 private repo uploads"",""Patch coverage analysis""}",monthly,true,Team,10,2500,true,users-teamm,2,price_1OCM0gGlVGuVgOrkWDYEBtSL
+5,2025-01-16 04:35:34.152 -0800,2025-01-24 11:35:42.724 -0800,10,"{""Includes 5 seats"",""$10 per additional seat"",""Unlimited public repositories"",""Unlimited private repositories"",""Priority Support""}",annually,true,Sentry Pro,5,,true,users-sentryy,5,price_1Mj1mMGlVGuVgOrkC0ORc6iW
+4,2025-01-16 04:34:33.867 -0800,2025-01-24 11:35:48.218 -0800,12,"{""Includes 5 seats"",""$10 per additional seat"",""Unlimited public repositories"",""Unlimited private repositories"",""Priority Support""}",monthly,true,Sentry Pro,5,,true,users-sentrym,5,price_1Mj1kYGlVGuVgOrk7jucaZAa
+3,2025-01-16 04:32:44.655 -0800,2025-01-24 11:36:09.660 -0800,10,"{""Configurable # of users"",""Unlimited public repositories"",""Unlimited private repositories"",""Priority Support""}",annually,true,Pro,,,true,users-pr-inappy,3,plan_H6P16wij3lUuxg
+2,2025-01-16 04:30:42.897 -0800,2025-01-24 11:36:14.651 -0800,12,"{""Configurable # of users"",""Unlimited public repositories"",""Unlimited private repositories"",""Priority Support""}",monthly,true,Pro,,,true,users-pr-inappm,3,plan_H6P3KZXwmAbqPS
 13,2025-01-23 14:25:04.793 -0800,2025-01-23 14:25:04.793 -0800,12,"{""Configurable # of users"",""Unlimited public repositories"",""Unlimited private repositories""}",,true,Github Marketplace,,,false,users,3,
 12,2025-01-16 04:44:51.064 -0800,2025-01-24 11:33:14.405 -0800,0,"{""Up to 1 user"",""Unlimited public repositories"",""Unlimited private repositories""}",,true,Developer,1,250,false,users-developer,2,
 11,2025-01-16 04:44:01.249 -0800,2025-01-24 11:33:28.532 -0800,0,"{""Up to 1 user"",""Unlimited public repositories"",""Unlimited private repositories""}",,true,Developer,1,250,false,users-basic,1,

core/management/commands/insert_data_to_db_from_csv.py

@@ -51,8 +51,15 @@ def handle(self, *args, **kwargs):
                         )
                         continue
 
-                Model.objects.create(**model_data)
-                self.stdout.write(self.style.SUCCESS(f"Inserted row: {row}"))
+                try:
+                    Model.objects.update_or_create(
+                        defaults=model_data,
+                        id=row.get("id"),
+                    )
+                    self.stdout.write(self.style.SUCCESS(f"Inserted row: {row}"))
+                except Exception as e:
+                    self.stdout.write(self.style.ERROR(f"Error inserting row: {e}"))
+                    continue
 
         self.stdout.write(
             self.style.SUCCESS(

dev.sh

@@ -2,7 +2,7 @@
 
 # starts the development server using gunicorn
 # NEVER run production with the --reload option command
-echo "Starting gunicorn in dev mode"
+echo "API: Starting gunicorn in dev mode"
 
 _start_gunicorn() {
   if [ -n "$PROMETHEUS_MULTIPROC_DIR" ]; then
@@ -19,6 +19,8 @@ _start_gunicorn() {
     python manage.py migrate
     python manage.py migrate --database "timeseries" timeseries
     python manage.py pgpartition --yes --skip-delete
+    python manage.py insert_data_to_db_from_csv core/management/commands/codecovTiers-Jan25.csv --model tiers
+    python manage.py insert_data_to_db_from_csv core/management/commands/codecovPlans-Jan25.csv --model plans
   fi
   if [[ "$DEBUGPY" ]]; then
       pip install debugpy

graphql_api/tests/test_owner.py

@@ -25,7 +25,6 @@
 
 from billing.helpers import mock_all_plans_and_tiers
 from codecov.commands.exceptions import (
-    MissingService,
     UnauthorizedGuestAccess,
 )
 from codecov_auth.models import GithubAppInstallation, OwnerProfile
@@ -708,7 +707,6 @@ def test_owner_query_with_no_service(self):
 
         res = self.gql_request(query, provider="", with_errors=True)
 
-        assert res["errors"][0]["message"] == MissingService.message
         assert res["data"]["owner"] is None
 
     def test_owner_query_with_private_repos(self):
@@ -1195,3 +1193,19 @@ def test_fetch_available_plans_is_enterprise_plan(self):
                 ]
             }
         }
+
+    def test_fetch_owner_with_no_service(self):
+        current_org = OwnerFactory(
+            username="random-plan-user",
+            service="github",
+            plan=PlanName.BASIC_PLAN_NAME.value,
+        )
+
+        query = """{
+            owner(username: "%s") {
+                username
+            }
+        }
+        """ % (current_org.username)
+        data = self.gql_request(query, owner=current_org, provider="", with_errors=True)
+        assert data == {"data": {"owner": None}}

graphql_api/tests/test_views.py

@@ -309,3 +309,23 @@ async def test_required_variable_missing(self):
         data = await self.do_query(schema, query=query, variables={})
 
         assert data == {"detail": "Missing required variables: name", "status": 400}
+
+    async def test_empty_request_body(self):
+        schema = generate_schema_with_required_variables()
+
+        request = RequestFactory().post(
+            "/graphql/gh", "", content_type="application/json"
+        )
+        match = ResolverMatch(func=lambda: None, args=(), kwargs={"service": "github"})
+        request.resolver_match = match
+        request.user = None
+        request.current_owner = None
+
+        view = AsyncGraphqlView.as_view(schema=schema)
+        response = await view(request, service="gh")
+
+        assert response.status_code == 400
+        assert json.loads(response.content) == {
+            "status": 400,
+            "detail": "Invalid JSON response received.",
+        }

graphql_api/types/errors/errors.graphql

@@ -37,3 +37,7 @@ type ProviderError implements ResolverError {
 type OwnerNotActivatedError implements ResolverError {
   message: String!
 }
+
+type MissingService implements ResolverError {
+  message: String!
+}