Revert "feat: new page in snuba admin to do deletes (#6157)"

This reverts commit 1aab7d6.

Co-authored-by: kylemumma <24424170+kylemumma@users.noreply.github.com>

snuba/admin/static/api_client.tsx

@@ -100,7 +100,6 @@ interface Client {
   ) => Promise<ReplayInstruction | null>;
   clearDlqInstruction: () => Promise<ReplayInstruction | null>;
   getAdminRegions: () => Promise<string[]>;
-  runLightweightDelete: (storage_name: string, column_conditions: object) => Promise<Response>
 }
 
 function Client() {
@@ -474,19 +473,6 @@ function Client() {
         method: "DELETE",
       }).then((resp) => resp.json());
     },
-    runLightweightDelete: (storage_name: string, column_conditions: object) => {
-      const url = baseUrl + "delete"
-      return fetch(url, {
-        method: 'DELETE',
-        headers: {
-          'Content-Type': 'application/json'
-        },
-        body: JSON.stringify({
-          storage: storage_name,
-          columns: column_conditions
-        })
-      })
-    },
   };
 }
 

snuba/admin/static/data.tsx

@@ -13,7 +13,6 @@ import CardinalityAnalyzer from "SnubaAdmin/cardinality_analyzer";
 import ProductionQueries from "SnubaAdmin/production_queries";
 import SnubaExplain from "SnubaAdmin/snuba_explain";
 import Welcome from "SnubaAdmin/welcome";
-import DeleteTool from "SnubaAdmin/delete_tool";
 
 const NAV_ITEMS = [
   { id: "overview", display: "🤿 Snuba Admin", component: Welcome },
@@ -83,11 +82,6 @@ const NAV_ITEMS = [
     display: "🔦 Production Queries",
     component: ProductionQueries,
   },
-  {
-    id: "delete-tool",
-    display: "🗑️ Delete Tool",
-    component: DeleteTool,
-  },
 ];
 
 export { NAV_ITEMS };

snuba/admin/tool_policies.py

@@ -31,7 +31,6 @@ class AdminTools(Enum):
     PRODUCTION_QUERIES = "production-queries"
     CARDINALITY_ANALYZER = "cardinality-analyzer"
     SNUBA_EXPLAIN = "snuba-explain"
-    DELETE_TOOL = "delete_tool"
 
 
 DEVELOPER_TOOLS: set[AdminTools] = {AdminTools.SNQL_TO_SQL, AdminTools.QUERY_TRACING}

snuba/admin/views.py

@@ -59,26 +59,18 @@
     store_instruction,
 )
 from snuba.datasets.factory import InvalidDatasetError, get_enabled_dataset_names
-from snuba.datasets.storages.factory import (
-    get_all_storage_keys,
-    get_storage,
-    get_writable_storage,
-)
+from snuba.datasets.storages.factory import get_all_storage_keys, get_storage
 from snuba.datasets.storages.storage_key import StorageKey
 from snuba.migrations.connect import check_for_inactive_replicas
 from snuba.migrations.errors import InactiveClickhouseReplica, MigrationError
 from snuba.migrations.groups import MigrationGroup, get_group_readiness_state
 from snuba.migrations.runner import MigrationKey, Runner
 from snuba.query.exceptions import InvalidQueryException
-from snuba.query.query_settings import HTTPQuerySettings
 from snuba.replacers.replacements_and_expiry import (
     get_config_auto_replacements_bypass_projects,
 )
-from snuba.request.exceptions import InvalidJsonRequestException
-from snuba.request.schema import RequestSchema
 from snuba.state.explain_meta import explain_cleanup, get_explain_meta
 from snuba.utils.metrics.timer import Timer
-from snuba.web.delete_query import delete_from_storage
 from snuba.web.views import dataset_query
 
 logger = structlog.get_logger().bind(module=__name__)
@@ -1054,64 +1046,3 @@ def get_allowed_projects() -> Response:
 @application.route("/admin_regions", methods=["GET"])
 def get_admin_regions() -> Response:
     return make_response(jsonify(settings.ADMIN_REGIONS), 200)
-
-
-@application.route(
-    "/delete",
-    methods=["DELETE"],
-)
-@check_tool_perms(tools=[AdminTools.DELETE_TOOL])
-def delete() -> Response:
-    """
-    Given a storage name and columns object, parses the input and calls
-    delete_from_storage with them.
-
-    Input:
-        an http DELETE request with a json body containing elements "storage" and "columns"
-        see delete_from_storage for definition of these inputs.
-    """
-    body = request.get_json()
-    assert isinstance(body, dict)
-    storage = body.pop("storage", None)
-    if storage is None:
-        return make_response(
-            jsonify(
-                {
-                    "error",
-                    "all required input 'storage' is not present in the request body",
-                }
-            ),
-            400,
-        )
-    try:
-        storage = get_writable_storage(StorageKey(storage))
-    except Exception as e:
-        return make_response(
-            jsonify(
-                {
-                    "error": str(e),
-                }
-            ),
-            400,
-        )
-    try:
-        schema = RequestSchema.build(HTTPQuerySettings, is_delete=True)
-        request_parts = schema.validate(body)
-        delete_results = delete_from_storage(storage, request_parts.query["columns"])
-    except InvalidJsonRequestException as schema_error:
-        return make_response(
-            jsonify({"error": str(schema_error)}),
-            400,
-        )
-    except Exception as e:
-        if application.debug:
-            from traceback import format_exception
-
-            return make_response(jsonify({"error": format_exception(e)}), 500)
-        else:
-            sentry_sdk.capture_exception(e)
-            return make_response(jsonify({"error": "unexpected internal error"}), 500)
-
-    return Response(
-        json.dumps(delete_results), 200, {"Content-Type": "application/json"}
-    )

snuba/web/delete_query.py

@@ -20,8 +20,9 @@
 
 @with_span()
 def delete_from_storage(
-    storage: WritableTableStorage, columns: Dict[str, list[Any]]
-) -> dict[str, Result]:
+    storage: WritableTableStorage,
+    columns: Dict[str, Any],
+) -> dict[str, Any]:
     """
     Inputs:
         storage - storage to delete from
@@ -36,9 +37,6 @@ def delete_from_storage(
 
     Deletes all rows in the given storage, that satisfy the conditions
     defined in 'columns' input.
-
-    Returns a mapping from clickhouse table name to deletion results, there
-    will be an entry for every local clickhouse table that makes up the storage.
     """
     if get_config("storage_deletes_enabled", 0):
         raise Exception("Deletes not enabled")
@@ -47,11 +45,11 @@ def delete_from_storage(
     if not delete_settings.is_enabled:
         raise Exception(f"Deletes not enabled for {storage.get_storage_key().value}")
 
-    results: dict[str, Result] = {}
+    payload: dict[str, Any] = {}
     for table in delete_settings.tables:
         result = _delete_from_table(storage, table, columns)
-        results[table] = result
-    return results
+        payload[table] = {**result}
+    return payload
 
 
 def _get_rows_to_delete(