wip

Author: runningcode

src/launchpad/artifact_processor.py

@@ -34,6 +34,7 @@
 from launchpad.artifacts.artifact_factory import ArtifactFactory
 from launchpad.constants import (
     ArtifactType,
+    DistributionState,
     PreprodFeature,
     ProcessingErrorCode,
     ProcessingErrorMessage,
@@ -304,23 +305,11 @@ def _do_distribution(
             apple_info = cast(AppleAppInfo, info)
             if not apple_info.is_code_signature_valid:
                 logger.warning(f"BUILD_DISTRIBUTION skipped for {artifact_id}: invalid code signature")
-                self._update_artifact_error(
-                    organization_id,
-                    project_id,
-                    artifact_id,
-                    ProcessingErrorCode.ARTIFACT_PROCESSING_ERROR,
-                    ProcessingErrorMessage.INVALID_CODE_SIGNATURE,
-                )
+                self._update_distribution_skip(organization_id, project_id, artifact_id, "invalid_signature")
                 return
             if apple_info.is_simulator:
                 logger.warning(f"BUILD_DISTRIBUTION skipped for {artifact_id}: simulator build")
-                self._update_artifact_error(
-                    organization_id,
-                    project_id,
-                    artifact_id,
-                    ProcessingErrorCode.ARTIFACT_PROCESSING_ERROR,
-                    ProcessingErrorMessage.SIMULATOR_BUILD,
-                )
+                self._update_distribution_skip(organization_id, project_id, artifact_id, "simulator")
                 return
             with tempfile.TemporaryDirectory() as temp_dir_str:
                 temp_dir = Path(temp_dir_str)
@@ -345,14 +334,8 @@ def _do_distribution(
             with apk.raw_file() as f:
                 self._sentry_client.upload_installable_app(organization_id, project_id, artifact_id, f)
         else:
-            logger.error(f"BUILD_DISTRIBUTION failed for {artifact_id} (project: {project_id}, org: {organization_id})")
-            self._update_artifact_error(
-                organization_id,
-                project_id,
-                artifact_id,
-                ProcessingErrorCode.ARTIFACT_PROCESSING_ERROR,
-                ProcessingErrorMessage.UNSUPPORTED_ARTIFACT_TYPE,
-            )
+            logger.error(f"BUILD_DISTRIBUTION failed for {artifact_id}: unsupported artifact type")
+            self._update_distribution_skip(organization_id, project_id, artifact_id, "unsupported")
 
     def _do_size(
         self,
@@ -434,6 +417,27 @@ def _update_artifact_error(
         else:
             logger.info(f"Successfully updated artifact {artifact_id} with error information")
 
+    def _update_distribution_skip(
+        self,
+        organization_id: str,
+        project_id: str,
+        artifact_id: str,
+        skip_reason: str,
+    ) -> None:
+        """Update artifact with distribution skip state."""
+        try:
+            self._sentry_client.update_artifact(
+                org=organization_id,
+                project=project_id,
+                artifact_id=artifact_id,
+                data={
+                    "distribution_state": DistributionState.NOT_RAN.value,
+                    "distribution_skip_reason": skip_reason,
+                },
+            )
+        except SentryClientError:
+            logger.exception(f"Failed to update distribution skip for artifact {artifact_id}")
+
     def _update_size_error_from_exception(
         self,
         organization_id: str,

src/launchpad/constants.py

@@ -32,6 +32,13 @@ class PreprodFeature(Enum):
     BUILD_DISTRIBUTION = "build_distribution"
 
 
+# Matches PreprodArtifact.DistributionState in sentry
+class DistributionState(Enum):
+    PENDING = 0
+    COMPLETED = 1
+    NOT_RAN = 2
+
+
 # Health check threshold - consider unhealthy if file not touched in 60 seconds
 HEALTHCHECK_MAX_AGE_SECONDS = 60.0
 
@@ -49,8 +56,6 @@ class ProcessingErrorMessage(Enum):
     SIZE_ANALYSIS_FAILED = "Failed to perform size analysis"
     ARTIFACT_PARSING_FAILED = "Failed to parse artifact file"
     UNSUPPORTED_ARTIFACT_TYPE = "Unsupported artifact type"
-    INVALID_CODE_SIGNATURE = "Cannot distribute app with invalid code signature"
-    SIMULATOR_BUILD = "Cannot distribute simulator builds"
 
     # System-related errors
     TEMP_FILE_CREATION_FAILED = "Failed to create temporary file"

tests/unit/artifacts/test_artifact_processor.py

@@ -9,6 +9,7 @@
 from launchpad.artifacts.apple.zipped_xcarchive import ZippedXCArchive
 from launchpad.artifacts.artifact import Artifact
 from launchpad.constants import (
+    DistributionState,
     ProcessingErrorCode,
     ProcessingErrorMessage,
 )
@@ -139,8 +140,7 @@ def test_processing_error_message_enum_values(self):
         assert ProcessingErrorMessage.SIZE_ANALYSIS_FAILED.value == "Failed to perform size analysis"
         assert ProcessingErrorMessage.UNKNOWN_ERROR.value == "An unknown error occurred"
 
-    def test_do_distribution_unknown_artifact_type_reports_error(self):
-        """Test that _do_distribution reports an error for unknown artifact types."""
+    def test_do_distribution_unknown_artifact_type_skips(self):
         mock_sentry_client = Mock(spec=SentryClient)
         mock_sentry_client.update_artifact.return_value = None
         self.processor._sentry_client = mock_sentry_client
@@ -157,12 +157,12 @@ def test_do_distribution_unknown_artifact_type_reports_error(self):
             project="test-project-id",
             artifact_id="test-artifact-id",
             data={
-                "error_code": ProcessingErrorCode.ARTIFACT_PROCESSING_ERROR.value,
-                "error_message": ProcessingErrorMessage.UNSUPPORTED_ARTIFACT_TYPE.value,
+                "distribution_state": DistributionState.NOT_RAN.value,
+                "distribution_skip_reason": "unsupported",
             },
         )
 
-    def test_do_distribution_invalid_code_signature_reports_error(self):
+    def test_do_distribution_invalid_code_signature_skips(self):
         mock_sentry_client = Mock(spec=SentryClient)
         mock_sentry_client.update_artifact.return_value = None
         self.processor._sentry_client = mock_sentry_client
@@ -179,13 +179,13 @@ def test_do_distribution_invalid_code_signature_reports_error(self):
             project="test-project-id",
             artifact_id="test-artifact-id",
             data={
-                "error_code": ProcessingErrorCode.ARTIFACT_PROCESSING_ERROR.value,
-                "error_message": ProcessingErrorMessage.INVALID_CODE_SIGNATURE.value,
+                "distribution_state": DistributionState.NOT_RAN.value,
+                "distribution_skip_reason": "invalid_signature",
             },
         )
         mock_sentry_client.upload_installable_app.assert_not_called()
 
-    def test_do_distribution_simulator_build_reports_error(self):
+    def test_do_distribution_simulator_build_skips(self):
         mock_sentry_client = Mock(spec=SentryClient)
         mock_sentry_client.update_artifact.return_value = None
         self.processor._sentry_client = mock_sentry_client
@@ -202,8 +202,8 @@ def test_do_distribution_simulator_build_reports_error(self):
             project="test-project-id",
             artifact_id="test-artifact-id",
             data={
-                "error_code": ProcessingErrorCode.ARTIFACT_PROCESSING_ERROR.value,
-                "error_message": ProcessingErrorMessage.SIMULATOR_BUILD.value,
+                "distribution_state": DistributionState.NOT_RAN.value,
+                "distribution_skip_reason": "simulator",
             },
         )
         mock_sentry_client.upload_installable_app.assert_not_called()