Make endpoint work for snapshots too

Author: noahsmartin

src/sentry/objectstore/__init__.py

@@ -1,4 +1,4 @@
 from sentry.objectstore.service import ClientBuilder
 
 attachments = ClientBuilder("attachments")
-app_icons = ClientBuilder("app-icons")
+preprod = ClientBuilder("preprod")

…dpoints/project_preprod_artifact_icon.py …points/project_preprod_artifact_image.pysrc/sentry/preprod/api/endpoints/project_preprod_artifact_icon.py renamed to src/sentry/preprod/api/endpoints/project_preprod_artifact_image.py src/sentry/preprod/api/endpoints/project_preprod_artifact_icon.py renamed to src/sentry/preprod/api/endpoints/project_preprod_artifact_image.py

@@ -10,7 +10,7 @@
 from sentry.api.base import region_silo_endpoint
 from sentry.api.bases.project import ProjectEndpoint
 from sentry.models.project import Project
-from sentry.objectstore import app_icons
+from sentry.objectstore import preprod
 from sentry.objectstore.service import ClientError
 
 logger = logging.getLogger(__name__)
@@ -56,7 +56,7 @@ def detect_image_content_type(image_data: bytes) -> str:
 
 
 @region_silo_endpoint
-class ProjectPreprodArtifactIconEndpoint(ProjectEndpoint):
+class ProjectPreprodArtifactImageEndpoint(ProjectEndpoint):
     owner = ApiOwner.EMERGE_TOOLS
     publish_status = {
         "GET": ApiPublishStatus.EXPERIMENTAL,
@@ -66,36 +66,36 @@ def get(
         self,
         request: Request,
         project: Project,
-        app_icon_id: str,
+        image_id: str,
     ) -> HttpResponse:
         organization_id = project.organization_id
         project_id = project.id
 
-        # object_key = f"{organization_id}/{project_id}/{app_icon_id}"
+        object_key = f"{organization_id}/{project_id}/{image_id}"
         logger.info(
-            "Retrieving app icon from objectstore",
+            "Retrieving image from objectstore",
             extra={
                 "organization_id": organization_id,
                 "project_id": project_id,
-                "app_icon_id": app_icon_id,
+                "image_id": image_id,
             },
         )
-        client = app_icons.for_project(organization_id, project_id)
+        client = preprod.for_project(organization_id, project_id)
 
         try:
-            result = client.get(app_icon_id)
+            result = client.get(object_key)
             # Read the entire stream at once
             image_data = result.payload.read()
 
             # Detect content type from the image data
             content_type = detect_image_content_type(image_data)
 
             logger.info(
-                "Retrieved app icon from objectstore",
+                "Retrieved image from objectstore",
                 extra={
                     "organization_id": organization_id,
                     "project_id": project_id,
-                    "app_icon_id": app_icon_id,
+                    "image_id": image_id,
                     "size_bytes": len(image_data),
                     "content_type": content_type,
                 },
@@ -109,7 +109,7 @@ def get(
                     extra={
                         "organization_id": organization_id,
                         "project_id": project_id,
-                        "app_icon_id": app_icon_id,
+                        "image_id": image_id,
                     },
                 )
 
@@ -121,7 +121,7 @@ def get(
                 extra={
                     "organization_id": organization_id,
                     "project_id": project_id,
-                    "app_icon_id": app_icon_id,
+                    "image_id": image_id,
                     "error": str(e),
                     "status": e.status,
                 },
@@ -134,7 +134,7 @@ def get(
                 extra={
                     "organization_id": organization_id,
                     "project_id": project_id,
-                    "app_icon_id": app_icon_id,
+                    "image_id": image_id,
                 },
             )
             return HttpResponse({"error": "Internal server error"}, status=500)

src/sentry/preprod/api/endpoints/urls.py

@@ -3,7 +3,7 @@
 from django.urls import re_path
 
 from sentry.preprod.api.endpoints.project_preprod_artifact_icon import (
-    ProjectPreprodArtifactIconEndpoint,
+    ProjectPreprodArtifactImageEndpoint,
 )
 from sentry.preprod.api.endpoints.size_analysis.project_preprod_size_analysis_compare import (
     ProjectPreprodArtifactSizeAnalysisCompareEndpoint,
@@ -85,8 +85,8 @@
         name="sentry-api-0-installable-preprod-artifact-download",
     ),
     re_path(
-        r"^(?P<organization_id_or_slug>[^/]+)/(?P<project_id_or_slug>[^/]+)/files/app-icons/(?P<app_icon_id>[^/]+)/$",
-        ProjectPreprodArtifactIconEndpoint.as_view(),
+        r"^(?P<organization_id_or_slug>[^/]+)/(?P<project_id_or_slug>[^/]+)/files/images/(?P<image_id>[^/]+)/$",
+        ProjectPreprodArtifactImageEndpoint.as_view(),
         name="sentry-api-0-project-preprod-app-icon",
     ),
     # Size analysis