ref(preprod): Remove ProjectPreprodArtifactImageEndpoint, use objectstore proxy directly

lcian · lcian · commit 573c15fa7506 · 2026-04-08T17:14:18.000+02:00
The objectstore proxy endpoint already sets the content type, so the
dedicated image proxy endpoint is redundant. Frontend now constructs
objectstore proxy URLs directly for all image fetches.
diff --git a/src/sentry/preprod/api/endpoints/project_preprod_artifact_image.py b/src/sentry/preprod/api/endpoints/project_preprod_artifact_image.py
diff --git a/src/sentry/preprod/api/endpoints/urls.py b/src/sentry/preprod/api/endpoints/urls.py
@@ -3,9 +3,6 @@
 from django.urls import re_path
 
 from sentry.preprod.api.endpoints.builds import BuildsEndpoint
-from sentry.preprod.api.endpoints.project_preprod_artifact_image import (
-    ProjectPreprodArtifactImageEndpoint,
-)
 from sentry.preprod.api.endpoints.size_analysis.project_preprod_size_analysis_compare import (
     ProjectPreprodArtifactSizeAnalysisCompareEndpoint,
 )
@@ -93,11 +90,6 @@
         ProjectInstallablePreprodArtifactDownloadEndpoint.as_view(),
         name="sentry-api-0-installable-preprod-artifact-download",
     ),
-    re_path(
-        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-artifact-image",
-    ),
     re_path(
         r"^(?P<organization_id_or_slug>[^/]+)/(?P<project_id_or_slug>[^/]+)/preprodartifacts/size-analysis/compare/(?P<head_size_metric_id>[^/]+)/(?P<base_size_metric_id>[^/]+)/download/$",
         ProjectPreprodArtifactSizeAnalysisCompareDownloadEndpoint.as_view(),
diff --git a/static/app/utils/api/knownSentryApiUrls.generated.ts b/static/app/utils/api/knownSentryApiUrls.generated.ts
@@ -647,7 +647,6 @@ export type KnownSentryApiUrls =
   | '/projects/$organizationIdOrSlug/$projectIdOrSlug/files/dsyms/'
   | '/projects/$organizationIdOrSlug/$projectIdOrSlug/files/dsyms/associate/'
   | '/projects/$organizationIdOrSlug/$projectIdOrSlug/files/dsyms/unknown/'
-  | '/projects/$organizationIdOrSlug/$projectIdOrSlug/files/images/$imageId/'
   | '/projects/$organizationIdOrSlug/$projectIdOrSlug/files/installablepreprodartifact/$urlPath/'
   | '/projects/$organizationIdOrSlug/$projectIdOrSlug/files/preprodartifacts/assemble/'
   | '/projects/$organizationIdOrSlug/$projectIdOrSlug/files/proguard-artifact-releases'
diff --git a/static/app/views/preprod/buildComparison/header/buildCompareHeaderContent.tsx b/static/app/views/preprod/buildComparison/header/buildCompareHeaderContent.tsx
@@ -85,7 +85,7 @@ export function BuildCompareHeaderContent(props: BuildCompareHeaderContentProps)
               <AppIcon
                 appName={buildDetails.app_info.name}
                 appIconId={buildDetails.app_info.app_icon_id}
-                projectId={buildDetails.project_slug}
+                projectId={buildDetails.project_id}
               />
               <Text>{buildDetails.app_info.name}</Text>
             </Flex>
diff --git a/static/app/views/preprod/buildDetails/buildDetails.tsx b/static/app/views/preprod/buildDetails/buildDetails.tsx
@@ -201,7 +201,6 @@ export default function BuildDetails() {
                 buildDetailsData={buildDetailsQuery.data}
                 isBuildDetailsPending={buildDetailsQuery.isLoading}
                 artifactId={artifactId}
-                projectId={projectSlug ?? null}
               />
             </BuildDetailsSide>
             <BuildDetailsMain>
diff --git a/static/app/views/preprod/buildDetails/sidebar/buildDetailsSidebarAppInfo.tsx b/static/app/views/preprod/buildDetails/sidebar/buildDetailsSidebarAppInfo.tsx
@@ -23,7 +23,8 @@ import {
 interface BuildDetailsSidebarAppInfoProps {
   appInfo: BuildDetailsAppInfo;
   artifactId: string;
-  projectId: string | null;
+  projectId: number | null;
+  projectSlug: string | null;
 }
 
 export function BuildDetailsSidebarAppInfo(props: BuildDetailsSidebarAppInfoProps) {
@@ -107,9 +108,9 @@ export function BuildDetailsSidebarAppInfo(props: BuildDetailsSidebarAppInfoProp
             <IconLink />
           </InfoIcon>
           <Text>
-            {props.projectId ? (
+            {props.projectSlug ? (
               <InstallAppButton
-                projectId={props.projectId}
+                projectId={props.projectSlug}
                 artifactId={props.artifactId}
                 platform={props.appInfo.platform ?? null}
                 source="build_details_sidebar"
diff --git a/static/app/views/preprod/buildDetails/sidebar/buildDetailsSidebarContent.tsx b/static/app/views/preprod/buildDetails/sidebar/buildDetailsSidebarContent.tsx
@@ -12,13 +12,12 @@ import {BuildDetailsState} from 'sentry/views/preprod/types/buildDetailsTypes';
 
 interface BuildDetailsSidebarContentProps {
   artifactId: string;
-  projectId: string | null;
   buildDetailsData?: BuildDetailsApiResponse | null;
   isBuildDetailsPending?: boolean;
 }
 
 export function BuildDetailsSidebarContent(props: BuildDetailsSidebarContentProps) {
-  const {buildDetailsData, isBuildDetailsPending = false, artifactId, projectId} = props;
+  const {buildDetailsData, isBuildDetailsPending = false, artifactId} = props;
 
   if (isBuildDetailsPending || !buildDetailsData) {
     return <SidebarLoadingSkeleton data-testid="sidebar-loading-skeleton" />;
@@ -33,7 +32,8 @@ export function BuildDetailsSidebarContent(props: BuildDetailsSidebarContentProp
     <Flex direction="column" gap="2xl">
       <BuildDetailsSidebarAppInfo
         appInfo={buildDetailsData.app_info}
-        projectId={projectId}
+        projectId={buildDetailsData.project_id}
+        projectSlug={buildDetailsData.project_slug}
         artifactId={artifactId}
       />
 
diff --git a/static/app/views/preprod/components/appIcon.tsx b/static/app/views/preprod/components/appIcon.tsx
@@ -6,7 +6,7 @@ import {useOrganization} from 'sentry/utils/useOrganization';
 interface AppIconProps {
   appName: string;
   appIconId?: string | null;
-  projectId?: string | null;
+  projectId?: number | null;
 }
 
 export function AppIcon({appName, appIconId, projectId}: AppIconProps) {
@@ -15,7 +15,7 @@ export function AppIcon({appName, appIconId, projectId}: AppIconProps) {
 
   let iconUrl = undefined;
   if (appIconId && projectId) {
-    iconUrl = `/api/0/projects/${organization.slug}/${projectId}/files/images/${appIconId}/`;
+    iconUrl = `/api/0/organizations/${organization.slug}/objectstore/v1/objects/preprod/org=${organization.id};project=${projectId}/${organization.id}/${projectId}/${appIconId}`;
   }
 
   return (
diff --git a/static/app/views/preprod/install/buildInstallHeader.tsx b/static/app/views/preprod/install/buildInstallHeader.tsx
@@ -26,11 +26,10 @@ import {
 
 interface BuildInstallHeaderProps {
   buildDetailsQuery: UseApiQueryResult<BuildDetailsApiResponse, RequestError>;
-  projectId?: string;
 }
 
 export function BuildInstallHeader(props: BuildInstallHeaderProps) {
-  const {buildDetailsQuery, projectId} = props;
+  const {buildDetailsQuery} = props;
   const {
     data: buildDetailsData,
     isPending: isBuildDetailsPending,
@@ -84,7 +83,7 @@ export function BuildInstallHeader(props: BuildInstallHeaderProps) {
               <AppIcon
                 appName={appInfo.name}
                 appIconId={appInfo.app_icon_id}
-                projectId={projectId}
+                projectId={buildDetailsData.project_id}
               />
             ) : null}
             {appInfo.name ? <span>{appInfo.name}</span> : null}
diff --git a/static/app/views/preprod/install/installPage.tsx b/static/app/views/preprod/install/installPage.tsx
@@ -39,10 +39,7 @@ export default function InstallPage() {
     <SentryDocumentTitle title="Install">
       <Stack flex={1}>
         <Layout.Header>
-          <BuildInstallHeader
-            buildDetailsQuery={buildDetailsQuery}
-            projectId={buildDetailsQuery.data?.project_slug}
-          />
+          <BuildInstallHeader buildDetailsQuery={buildDetailsQuery} />
         </Layout.Header>
 
         <Layout.Body>
diff --git a/static/app/views/preprod/snapshots/main/imageDisplay/diffImageDisplay.tsx b/static/app/views/preprod/snapshots/main/imageDisplay/diffImageDisplay.tsx
@@ -46,8 +46,8 @@ export function DiffImageDisplay({
   const [onionOpacity, setOnionOpacity] = useState(50);
   const blobUrlRef = useRef<string | null>(null);
 
-  const baseImageUrl = `${imageBaseUrl}${pair.base_image.key}/`;
-  const headImageUrl = `${imageBaseUrl}${pair.head_image.key}/`;
+  const baseImageUrl = `${imageBaseUrl}${pair.base_image.key}`;
+  const headImageUrl = `${imageBaseUrl}${pair.head_image.key}`;
   const diffImageUrl = pair.diff_image_key
     ? `${diffImageBaseUrl}${pair.diff_image_key}`
     : null;
diff --git a/static/app/views/preprod/snapshots/main/snapshotMainContent.tsx b/static/app/views/preprod/snapshots/main/snapshotMainContent.tsx
@@ -115,7 +115,7 @@ export function SnapshotMainContent({
     }
     const displayName = getImageName(currentImage);
     const totalVariants = selectedItem.images.length;
-    const imageUrl = `${imageBaseUrl}${currentImage.key}/`;
+    const imageUrl = `${imageBaseUrl}${currentImage.key}`;
 
     return (
       <Flex direction="column" gap="0" padding="0" height="100%" width="100%">
@@ -150,7 +150,7 @@ export function SnapshotMainContent({
       return null;
     }
     const totalVariants = selectedItem.pairs.length;
-    const imageUrl = `${imageBaseUrl}${currentPair.head_image.key}/`;
+    const imageUrl = `${imageBaseUrl}${currentPair.head_image.key}`;
     const displayName = getImageName(currentPair.head_image);
 
     return (
@@ -199,7 +199,7 @@ export function SnapshotMainContent({
     return null;
   }
   const displayName = getImageName(currentImage);
-  const imageUrl = `${imageBaseUrl}${currentImage.key}/`;
+  const imageUrl = `${imageBaseUrl}${currentImage.key}`;
   const totalVariants = selectedItem.images.length;
   const STATUS_LABELS: Record<string, string> = {
     added: t('Added'),
diff --git a/static/app/views/preprod/snapshots/snapshots.tsx b/static/app/views/preprod/snapshots/snapshots.tsx
@@ -309,10 +309,11 @@ export default function SnapshotsPage() {
       comparisonRunInfo.state
     );
 
-  const imageBaseUrl = `/api/0/projects/${organization.slug}/${data?.project_id ?? ''}/files/images/`;
-  const diffImageBaseUrl = data
+  const objectstoreBaseUrl = data
     ? `/api/0/organizations/${organization.slug}/objectstore/v1/objects/preprod/org=${organization.id};project=${data.project_id}/${organization.id}/${data.project_id}/`
     : '';
+  const imageBaseUrl = objectstoreBaseUrl;
+  const diffImageBaseUrl = objectstoreBaseUrl;
 
   const processingContent = (
     <Flex width="100%" justify="center" align="center">
diff --git a/tests/sentry/preprod/api/endpoints/test_preprod_artifact_image.py b/tests/sentry/preprod/api/endpoints/test_preprod_artifact_image.py

Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@ import {useOrganization} from 'sentry/utils/useOrganization';`
`6`	`6`	`interface AppIconProps {`
`7`	`7`	`appName: string;`
`8`	`8`	`appIconId?: string \| null;`
`9`		`- projectId?: string \| null;`
	`9`	`+ projectId?: number \| null;`
`10`	`10`	`}`
`11`	`11`
`12`	`12`	`export function AppIcon({appName, appIconId, projectId}: AppIconProps) {`
`@@ -15,7 +15,7 @@ export function AppIcon({appName, appIconId, projectId}: AppIconProps) {`
`15`	`15`
`16`	`16`	`let iconUrl = undefined;`
`17`	`17`	`if (appIconId && projectId) {`
`18`		- iconUrl = `/api/0/projects/${organization.slug}/${projectId}/files/images/${appIconId}/`;
	`18`	+ iconUrl = `/api/0/organizations/${organization.slug}/objectstore/v1/objects/preprod/org=${organization.id};project=${projectId}/${organization.id}/${projectId}/${appIconId}`;
`19`	`19`	`}`
`20`	`20`
`21`	`21`	`return (`