Revert "feat(api): Project key creation rate limit params (#15077)" (#15357)

This reverts commit 0f003ed.

Author: markstory

src/sentry/api/endpoints/project_key_details.py

@@ -1,18 +1,21 @@
 from __future__ import absolute_import
 
 from django.db.models import F
-from rest_framework import status
+from rest_framework import serializers, status
 from rest_framework.response import Response
 
 from sentry import features
 from sentry.api.base import DocSection
 from sentry.api.bases.project import ProjectEndpoint
 from sentry.api.exceptions import ResourceDoesNotExist
+from sentry.api.fields.empty_integer import EmptyIntegerField
 from sentry.api.serializers import serialize
-from sentry.api.serializers.rest_framework import ProjectKeySerializer
 from sentry.models import AuditLogEntryEvent, ProjectKey, ProjectKeyStatus
 from sentry.utils.apidocs import scenario, attach_scenarios
-from sentry.loader.browsersdkversion import get_default_sdk_version_for_project
+from sentry.loader.browsersdkversion import (
+    get_default_sdk_version_for_project,
+    get_browser_sdk_version_choices,
+)
 
 
 @scenario("DeleteClientKey")
@@ -36,6 +39,20 @@ def update_key_scenario(runner):
     )
 
 
+class RateLimitSerializer(serializers.Serializer):
+    count = EmptyIntegerField(min_value=0, required=False, allow_null=True)
+    window = EmptyIntegerField(min_value=0, max_value=60 * 60 * 24, required=False, allow_null=True)
+
+
+class KeySerializer(serializers.Serializer):
+    name = serializers.CharField(max_length=200, required=False, allow_blank=True, allow_null=True)
+    isActive = serializers.BooleanField(required=False)
+    rateLimit = RateLimitSerializer(allow_null=True)
+    browserSdkVersion = serializers.ChoiceField(
+        choices=get_browser_sdk_version_choices(), required=False
+    )
+
+
 class ProjectKeyDetailsEndpoint(ProjectEndpoint):
     doc_section = DocSection.PROJECTS
 
@@ -71,7 +88,7 @@ def put(self, request, project, key_id):
         except ProjectKey.DoesNotExist:
             raise ResourceDoesNotExist
 
-        serializer = ProjectKeySerializer(data=request.data, partial=True)
+        serializer = KeySerializer(data=request.data, partial=True)
         default_version = get_default_sdk_version_for_project(project)
 
         if serializer.is_valid():

src/sentry/api/endpoints/project_keys.py

@@ -1,14 +1,12 @@
 from __future__ import absolute_import
 
 from django.db.models import F
-from rest_framework import status
+from rest_framework import serializers, status
 from rest_framework.response import Response
 
-from sentry import features
 from sentry.api.base import DocSection
 from sentry.api.bases.project import ProjectEndpoint
 from sentry.api.serializers import serialize
-from sentry.api.serializers.rest_framework import ProjectKeySerializer
 from sentry.models import AuditLogEntryEvent, ProjectKey, ProjectKeyStatus
 from sentry.utils.apidocs import scenario, attach_scenarios
 
@@ -29,6 +27,12 @@ def create_key_scenario(runner):
     )
 
 
+class KeySerializer(serializers.Serializer):
+    name = serializers.CharField(max_length=64, required=False, allow_blank=True, allow_null=True)
+    public = serializers.RegexField(r"^[a-f0-9]{32}$", required=False, allow_null=True)
+    secret = serializers.RegexField(r"^[a-f0-9]{32}$", required=False, allow_null=True)
+
+
 class ProjectKeysEndpoint(ProjectEndpoint):
     doc_section = DocSection.PROJECTS
 
@@ -78,27 +82,16 @@ def post(self, request, project):
                                      belong to.
         :param string name: the name for the new key.
         """
-        serializer = ProjectKeySerializer(data=request.data)
+        serializer = KeySerializer(data=request.data)
 
         if serializer.is_valid():
             result = serializer.validated_data
 
-            rate_limit_count = None
-            rate_limit_window = None
-
-            if features.has("projects:rate-limits", project):
-                ratelimit = result.get("rateLimit", -1)
-                if ratelimit != -1 and (ratelimit["count"] and ratelimit["window"]):
-                    rate_limit_count = result["rateLimit"]["count"]
-                    rate_limit_window = result["rateLimit"]["window"]
-
             key = ProjectKey.objects.create(
                 project=project,
                 label=result.get("name"),
                 public_key=result.get("public"),
                 secret_key=result.get("secret"),
-                rate_limit_count=rate_limit_count,
-                rate_limit_window=rate_limit_window,
             )
 
             self.create_audit_entry(

src/sentry/api/serializers/rest_framework/project_key.py

@@ -29,14 +29,10 @@ def test_simple(self):
             "sentry-api-0-project-keys",
             kwargs={"organization_slug": project.organization.slug, "project_slug": project.slug},
         )
-        resp = self.client.post(
-            url, data={"name": "hello world", "rateLimit": {"count": 10, "window": 60}}
-        )
+        resp = self.client.post(url, data={"name": "hello world"})
         assert resp.status_code == 201, resp.content
         key = ProjectKey.objects.get(public_key=resp.data["public"])
         assert key.label == "hello world"
-        assert key.rate_limit_count == 10
-        assert key.rate_limit_window == 60
 
     def test_minimal_args(self):
         project = self.create_project()