Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
from sentry.api.bases.project import ProjectEndpoint, ProjectReleasePermission
from sentry.debug_files.upload import find_missing_chunks
from sentry.integrations.types import IntegrationProviderSlug
from sentry.models.organization import Organization
from sentry.models.orgauthtoken import is_org_auth_token_auth, update_org_auth_token_last_used
from sentry.models.project import Project
from sentry.preprod.analytics import PreprodArtifactApiAssembleEvent
Expand Down Expand Up @@ -237,12 +238,17 @@ def post(self, request: Request, project: Project) -> Response:
if is_org_auth_token_auth(request.auth):
update_org_auth_token_last_used(request.auth, [project.id])

Comment thread
joshdholtz marked this conversation as resolved.
artifact_url = get_preprod_artifact_url(artifact)
organization = Organization.objects.get_from_cache(id=project.organization_id)
artifact_url = get_preprod_artifact_url(artifact, organization=organization)
install_url = get_preprod_artifact_url(
artifact, view_type="install", organization=organization
)

return Response(
{
"state": ChunkFileState.CREATED,
"missingChunks": [],
"artifactUrl": artifact_url,
"installUrl": install_url,
}
)
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@

from pydantic import BaseModel, Field

from sentry.models.organization import Organization
from sentry.preprod.build_distribution_utils import (
get_download_count_for_artifact,
is_installable_artifact,
Expand All @@ -16,6 +17,7 @@
PreprodComparisonApproval,
)
from sentry.preprod.snapshots.models import PreprodSnapshotComparison, PreprodSnapshotMetrics
from sentry.preprod.url_utils import get_preprod_artifact_url
from sentry.preprod.vcs.status_checks.utils import StatusCheckErrorType

logger = logging.getLogger(__name__)
Expand Down Expand Up @@ -159,6 +161,8 @@ class BuildDetailsApiResponse(BaseModel):
vcs_info: BuildDetailsVcsInfo
project_id: int
project_slug: str
artifact_url: str
install_url: str
distribution_info: DistributionInfo
size_info: SizeInfo | None = None
posted_status_checks: PostedStatusChecks | None = None
Expand Down Expand Up @@ -390,13 +394,19 @@ def transform_preprod_artifact_to_build_details(

snapshot_comparison_info = to_snapshot_comparison_info(artifact)

organization = Organization.objects.get_from_cache(id=artifact.project.organization_id)

return BuildDetailsApiResponse(
id=artifact.id,
state=artifact.state,
app_info=app_info,
vcs_info=vcs_info,
project_id=artifact.project.id,
project_slug=artifact.project.slug,
artifact_url=get_preprod_artifact_url(artifact, organization=organization),
install_url=get_preprod_artifact_url(
artifact, view_type="install", organization=organization
),
distribution_info=distribution_info,
size_info=size_info,
posted_status_checks=posted_status_checks,
Expand Down
14 changes: 10 additions & 4 deletions src/sentry/preprod/url_utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,14 +9,20 @@


def get_preprod_artifact_url(
preprod_artifact: PreprodArtifact, view_type: ViewType = "size"
preprod_artifact: PreprodArtifact,
view_type: ViewType = "size",
organization: Organization | None = None,
) -> str:
"""
Build a region/customer-domain aware absolute URL for the preprod artifact UI.

Pass ``organization`` when building multiple URLs for the same artifact to
avoid repeated Organization cache lookups.
"""
organization: Organization = Organization.objects.get_from_cache(
id=preprod_artifact.project.organization_id
)
if organization is None:
organization = Organization.objects.get_from_cache(
id=preprod_artifact.project.organization_id
)

path = f"/organizations/{organization.slug}/preprod/{view_type}/{preprod_artifact.id}"
return organization.absolute_url(path)
Expand Down
2 changes: 2 additions & 0 deletions tests/sentry/preprod/api/endpoints/test_builds.py
Original file line number Diff line number Diff line change
Expand Up @@ -106,6 +106,8 @@ def test_one_build(self) -> None:
"project_id": ANY,
"posted_status_checks": None,
"project_slug": "bar",
"artifact_url": ANY,
"install_url": ANY,
"size_info": None,
"snapshot_comparison_info": None,
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -522,6 +522,10 @@ def test_assemble_basic(
assert set(response.data["missingChunks"]) == set()
expected_url = f"/organizations/{self.organization.slug}/preprod/size/{artifact_id}"
assert expected_url in response.data["artifactUrl"]
expected_install_url = (
f"/organizations/{self.organization.slug}/preprod/install/{artifact_id}"
)
assert expected_install_url in response.data["installUrl"]

mock_create_preprod_artifact.assert_called_once_with(
org_id=self.organization.id,
Expand Down Expand Up @@ -597,6 +601,10 @@ def test_assemble_with_metadata(
assert set(response.data["missingChunks"]) == set()
expected_url = f"/organizations/{self.organization.slug}/preprod/size/{artifact_id}"
assert expected_url in response.data["artifactUrl"]
expected_install_url = (
f"/organizations/{self.organization.slug}/preprod/install/{artifact_id}"
)
assert expected_install_url in response.data["installUrl"]

mock_create_preprod_artifact.assert_called_once_with(
org_id=self.organization.id,
Expand Down Expand Up @@ -669,6 +677,10 @@ def test_assemble_with_vcs_params_without_head_ref(
assert set(response.data["missingChunks"]) == set()
expected_url = f"/organizations/{self.organization.slug}/preprod/size/{artifact_id}"
assert expected_url in response.data["artifactUrl"]
expected_install_url = (
f"/organizations/{self.organization.slug}/preprod/install/{artifact_id}"
)
assert expected_install_url in response.data["installUrl"]

mock_create_preprod_artifact.assert_called_once_with(
org_id=self.organization.id,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,14 @@ def test_get_build_details_success(self) -> None:
assert resp_data["app_info"]["version"] == self.mobile_app_info.build_version
assert resp_data["app_info"]["build_number"] == self.mobile_app_info.build_number
assert resp_data["app_info"]["artifact_type"] == self.preprod_artifact.artifact_type
expected_artifact_path = (
f"/organizations/{self.org.slug}/preprod/size/{self.preprod_artifact.id}"
)
expected_install_path = (
f"/organizations/{self.org.slug}/preprod/install/{self.preprod_artifact.id}"
)
assert expected_artifact_path in resp_data["artifact_url"]
assert expected_install_path in resp_data["install_url"]

def test_get_build_details_distribution_info(self) -> None:
self.preprod_artifact.extras = {"release_notes": "Build notes"}
Expand Down
Loading