Skip to content

ref(preprod): Remove image proxy endpoint in favor of objectstore proxy #112469

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
lcian wants to merge 1 commit into
base: master
Choose a base branch
from
Draft

ref(preprod): Remove image proxy endpoint in favor of objectstore proxy #112469

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
67 changes: 0 additions & 67 deletions src/sentry/preprod/api/endpoints/project_preprod_artifact_image.py
View file
Open in desktop

This file was deleted.

8 changes: 0 additions & 8 deletions src/sentry/preprod/api/endpoints/urls.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
)
Expand Down Expand Up @@ -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(),
Expand Down
1 change: 0 additions & 1 deletion static/app/utils/api/knownSentryApiUrls.generated.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
2 changes: 1 addition & 1 deletion static/app/views/preprod/buildComparison/header/buildCompareHeaderContent.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
1 change: 0 additions & 1 deletion static/app/views/preprod/buildDetails/buildDetails.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -201,7 +201,6 @@ export default function BuildDetails() {
buildDetailsData={buildDetailsQuery.data}
isBuildDetailsPending={buildDetailsQuery.isLoading}
artifactId={artifactId}
projectId={projectSlug ?? null}
/>
</BuildDetailsSide>
<BuildDetailsMain>
Expand Down
7 changes: 4 additions & 3 deletions static/app/views/preprod/buildDetails/sidebar/buildDetailsSidebarAppInfo.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down Expand Up @@ -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"
Expand Down
17 changes: 3 additions & 14 deletions static/app/views/preprod/buildDetails/sidebar/buildDetailsSidebarContent.spec.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,19 +42,16 @@ const mockBuildDetailsData: BuildDetailsApiResponse = {

function TestComponent({
artifactId,
projectId,
buildDetailsData,
isBuildDetailsPending,
}: {
artifactId: string;
projectId: string;
buildDetailsData?: BuildDetailsApiResponse | null;
isBuildDetailsPending?: boolean;
}) {
return (
<BuildDetailsSidebarContent
artifactId={artifactId}
projectId={projectId}
buildDetailsData={buildDetailsData}
isBuildDetailsPending={isBuildDetailsPending}
/>
Expand All @@ -68,7 +65,6 @@ describe('BuildDetailsSidebarContent', () => {

const defaultProps = {
artifactId: '123',
projectId: 'test-project',
};

beforeEach(() => {
Expand Down Expand Up @@ -264,16 +260,9 @@ describe('BuildDetailsSidebarContent', () => {
},
};

render(
<TestComponent
{...defaultProps}
projectId={null as unknown as string}
buildDetailsData={buildDetailsData}
/>,
{
organization,
}
);
render(<TestComponent {...defaultProps} buildDetailsData={buildDetailsData} />, {
organization,
});

await waitFor(() => {
expect(screen.getByText('Build Metadata')).toBeInTheDocument();
Expand Down
6 changes: 3 additions & 3 deletions static/app/views/preprod/buildDetails/sidebar/buildDetailsSidebarContent.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" />;
Expand All @@ -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}
/>

Expand Down
4 changes: 2 additions & 2 deletions static/app/views/preprod/components/appIcon.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand All @@ -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 (
Expand Down
5 changes: 2 additions & 3 deletions static/app/views/preprod/install/buildInstallHeader.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -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}
Expand Down
5 changes: 1 addition & 4 deletions static/app/views/preprod/install/installPage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
4 changes: 2 additions & 2 deletions static/app/views/preprod/snapshots/main/imageDisplay/diffImageDisplay.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
6 changes: 3 additions & 3 deletions static/app/views/preprod/snapshots/main/snapshotMainContent.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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%">
Expand Down Expand Up @@ -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 (
Expand Down Expand Up @@ -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'),
Expand Down
5 changes: 3 additions & 2 deletions static/app/views/preprod/snapshots/snapshots.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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">
Expand Down
1 change: 0 additions & 1 deletion static/app/views/pullRequest/details/main/pullRequestDetailsSizeContent.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,6 @@ export function PullRequestDetailsSizeContent({
<BuildDetailsSidebarContent
buildDetailsData={selectedBuildDetail}
artifactId={selectedBuildId}
projectId={null}
/>
)}
</Flex>
Expand Down
Loading
Loading