fix the thing

Author: JerrySentry

upload/tests/views/test_bundle_analysis.py

@@ -104,6 +104,7 @@ def test_upload_bundle_analysis_success(db, client, mocker, mock_redis):
             "endpoint": "bundle_analysis",
             "is_using_shelter": "no",
             "position": "end",
+            "result": "success",
         },
     )
 
@@ -207,6 +208,7 @@ def test_upload_bundle_analysis_success_shelter(db, client, mocker, mock_redis):
             "endpoint": "bundle_analysis",
             "is_using_shelter": "no",
             "position": "end",
+            "result": "success",
         },
     )
 
@@ -245,6 +247,7 @@ def test_upload_bundle_analysis_org_token(db, client, mocker, mock_redis):
             "endpoint": "bundle_analysis",
             "is_using_shelter": "no",
             "position": "end",
+            "result": "success",
         },
     )
 
@@ -292,6 +295,7 @@ def test_upload_bundle_analysis_existing_commit(db, client, mocker, mock_redis):
             "endpoint": "bundle_analysis",
             "is_using_shelter": "no",
             "position": "end",
+            "result": "success",
         },
     )
 
@@ -340,7 +344,8 @@ def test_upload_bundle_analysis_missing_args(db, client, mocker, mock_redis):
             "action": "bundle_analysis",
             "endpoint": "bundle_analysis",
             "is_using_shelter": "no",
-            "position": "start",
+            "position": "end",
+            "result": "bad_request",
         },
     )
 
@@ -412,6 +417,7 @@ def test_upload_bundle_analysis_github_oidc_auth(
             "endpoint": "bundle_analysis",
             "is_using_shelter": "no",
             "position": "end",
+            "result": "success",
         },
     )
 
@@ -472,6 +478,7 @@ def test_upload_bundle_analysis_measurement_datasets_created(
             "endpoint": "bundle_analysis",
             "is_using_shelter": "no",
             "position": "end",
+            "result": "success",
         },
     )
 
@@ -533,6 +540,7 @@ def test_upload_bundle_analysis_measurement_timeseries_disabled(
             "endpoint": "bundle_analysis",
             "is_using_shelter": "no",
             "position": "end",
+            "result": "success",
         },
     )
 
@@ -574,7 +582,8 @@ def test_upload_bundle_analysis_no_repo(db, client, mocker, mock_redis):
             "action": "bundle_analysis",
             "endpoint": "bundle_analysis",
             "is_using_shelter": "no",
-            "position": "start",
+            "position": "end",
+            "result": "error",
         },
     )
 
@@ -629,6 +638,7 @@ def test_upload_bundle_analysis_tokenless_success(db, client, mocker, mock_redis
             "endpoint": "bundle_analysis",
             "is_using_shelter": "no",
             "position": "end",
+            "result": "success",
         },
     )
 

upload/views/bundle_analysis.py

@@ -1,6 +1,6 @@
 import logging
 import uuid
-from typing import Any, Callable
+from typing import Any, Callable, Tuple
 
 from django.conf import settings
 from django.http import HttpRequest
@@ -86,10 +86,13 @@ class BundleAnalysisView(APIView, ShelterMixin):
     def get_exception_handler(self) -> Callable:
         return repo_auth_custom_exception_handler
 
-    def _handle_upload(self, request: HttpRequest) -> str | None:
+    def _handle_upload(self, request: HttpRequest) -> Tuple[str, Response]:
         serializer = UploadSerializer(data=request.data)
         if not serializer.is_valid():
-            return Response(serializer.errors, status=status.HTTP_400_BAD_REQUEST)
+            return (
+                "bad_request",
+                Response(serializer.errors, status=status.HTTP_400_BAD_REQUEST),
+            )
         data = serializer.validated_data
 
         if isinstance(request.user, Owner):
@@ -211,7 +214,7 @@ def _handle_upload(self, request: HttpRequest) -> str | None:
                         ),
                     )
 
-        return url
+        return ("success", Response({"url": url}, status=201))
 
     def post(self, request: HttpRequest) -> Response:
         labels = generate_upload_prometheus_metrics_labels(
@@ -223,15 +226,14 @@ def post(self, request: HttpRequest) -> Response:
             include_empty_labels=False,
         )
         labels["result"] = "pending"
-        url = None
         inc_counter(
             BUNDLE_ANALYSIS_UPLOAD_VIEWS_COUNTER,
             labels=labels,
         )
 
-        upload_result = "success"
         try:
-            url = self._handle_upload(request)
+            upload_result, response = self._handle_upload(request)
+            return response
         except Exception as e:
             log.error(
                 "Error handling bundle analysis upload",
@@ -241,11 +243,11 @@ def post(self, request: HttpRequest) -> Response:
                 exc_info=True,
             )
             upload_result = "error"
-
-        labels["position"] = "end"
-        labels["result"] = upload_result
-        inc_counter(
-            BUNDLE_ANALYSIS_UPLOAD_VIEWS_COUNTER,
-            labels=labels,
-        )
-        return Response({"url": url}, status=201)
+            raise
+        finally:
+            labels["position"] = "end"
+            labels["result"] = upload_result
+            inc_counter(
+                BUNDLE_ANALYSIS_UPLOAD_VIEWS_COUNTER,
+                labels=labels,
+            )