PR feedback

Author: trevor-e

src/sentry/migrations/0909_emerge_upload_models.py renamed to src/sentry/preprod/migrations/0001_emerge_upload_models.py

@@ -1,11 +1,12 @@
-# Generated by Django 5.2.1 on 2025-05-21 22:48
+# Generated by Django 5.2.1 on 2025-05-27 18:53
 
 import django.db.models.deletion
 from django.db import migrations, models
 
 import sentry.db.models.fields.bounded
 import sentry.db.models.fields.foreignkey
 import sentry.db.models.fields.jsonfield
+import sentry.preprod.models
 from sentry.new_migrations.migrations import CheckedMigration
 
 
@@ -24,8 +25,10 @@ class Migration(CheckedMigration):
 
     is_post_deployment = False
 
+    initial = True
+
     dependencies = [
-        ("sentry", "0908_increase_email_field_length"),
+        ("sentry", "0913_split_discover_dataset_dashboards_self_hosted"),
     ]
 
     operations = [
@@ -40,10 +43,6 @@ class Migration(CheckedMigration):
                 ),
                 ("date_updated", models.DateTimeField(auto_now=True)),
                 ("date_added", models.DateTimeField(auto_now_add=True)),
-                (
-                    "organization_id",
-                    sentry.db.models.fields.bounded.BoundedBigIntegerField(db_index=True),
-                ),
                 ("name", models.CharField(max_length=255)),
                 (
                     "project",
@@ -68,12 +67,13 @@ class Migration(CheckedMigration):
                 ),
                 ("date_updated", models.DateTimeField(auto_now=True)),
                 ("date_added", models.DateTimeField(auto_now_add=True)),
+                ("date_built", models.DateTimeField(null=True)),
                 (
-                    "organization_id",
-                    sentry.db.models.fields.bounded.BoundedBigIntegerField(db_index=True),
+                    "state",
+                    sentry.db.models.fields.bounded.BoundedPositiveIntegerField(
+                        default=sentry.preprod.models.PreprodArtifact.ArtifactState["UPLOADING"]
+                    ),
                 ),
-                ("date_built", models.DateTimeField(null=True)),
-                ("state", sentry.db.models.fields.bounded.BoundedPositiveIntegerField(default=0)),
                 (
                     "artifact_type",
                     sentry.db.models.fields.bounded.BoundedPositiveIntegerField(null=True),
@@ -85,8 +85,7 @@ class Migration(CheckedMigration):
                 ("error_message", models.TextField(null=True)),
                 ("build_version", models.CharField(max_length=255, null=True)),
                 ("build_number", sentry.db.models.fields.bounded.BoundedBigIntegerField(null=True)),
-                ("build_uuid", models.UUIDField(null=True)),
-                ("misc", sentry.db.models.fields.jsonfield.JSONField(null=True)),
+                ("extras", sentry.db.models.fields.jsonfield.JSONField(null=True)),
                 (
                     "file",
                     sentry.db.models.fields.foreignkey.FlexibleForeignKey(
@@ -104,7 +103,7 @@ class Migration(CheckedMigration):
                     sentry.db.models.fields.foreignkey.FlexibleForeignKey(
                         null=True,
                         on_delete=django.db.models.deletion.SET_NULL,
-                        to="sentry.preprodbuildconfiguration",
+                        to="preprod.preprodbuildconfiguration",
                     ),
                 ),
             ],
@@ -127,7 +126,14 @@ class Migration(CheckedMigration):
                     "metrics_artifact_type",
                     sentry.db.models.fields.bounded.BoundedPositiveIntegerField(null=True),
                 ),
-                ("state", sentry.db.models.fields.bounded.BoundedPositiveIntegerField(default=0)),
+                (
+                    "state",
+                    sentry.db.models.fields.bounded.BoundedPositiveIntegerField(
+                        default=sentry.preprod.models.PreprodArtifactSizeMetrics.SizeAnalysisState[
+                            "PENDING"
+                        ]
+                    ),
+                ),
                 (
                     "error_code",
                     sentry.db.models.fields.bounded.BoundedPositiveIntegerField(null=True),
@@ -153,7 +159,7 @@ class Migration(CheckedMigration):
                 (
                     "preprod_artifact",
                     sentry.db.models.fields.foreignkey.FlexibleForeignKey(
-                        on_delete=django.db.models.deletion.CASCADE, to="sentry.preprodartifact"
+                        on_delete=django.db.models.deletion.CASCADE, to="preprod.preprodartifact"
                     ),
                 ),
             ],

src/sentry/preprod/migrations/__init__.py

@@ -1,3 +1,4 @@
+from enum import IntEnum
 from typing import Any
 
 from django.db import models
@@ -16,7 +17,7 @@
 @region_silo_model
 class PreprodArtifact(DefaultFieldsModel):
     """
-    A pre-production artifact provided by the user, presumably from their CI/CD pipeline.
+    A pre-production artifact provided by the user, presumably from their CI/CD pipeline or a manual build.
     With this, we can analyze their artifact and provide them with insights to fix _before_
     it's released to production.
 
@@ -25,7 +26,7 @@ class PreprodArtifact(DefaultFieldsModel):
     - Android app builds
     """
 
-    class ArtifactState:
+    class ArtifactState(IntEnum):
         UPLOADING = 0
         """The user has initiated the upload, but it is not yet complete."""
         UPLOADED = 1
@@ -44,7 +45,7 @@ def as_choices(cls):
                 (cls.FAILED, "failed"),
             )
 
-    class ArtifactType:
+    class ArtifactType(IntEnum):
         XCARCHIVE = 0
         """Apple Xcode archive."""
         AAB = 1
@@ -60,7 +61,7 @@ def as_choices(cls):
                 (cls.APK, "apk"),
             )
 
-    class ErrorCode:
+    class ErrorCode(IntEnum):
         UNKNOWN = 0
         """The error code is unknown. Try to use a descriptive error code if possible."""
         UPLOAD_TIMEOUT = 1
@@ -81,8 +82,6 @@ def as_choices(cls):
 
     __relocation_scope__ = RelocationScope.Excluded
 
-    # Having a FK to both Org/Project is unnecessary
-    organization_id = BoundedBigIntegerField(db_index=True)
     project = FlexibleForeignKey("sentry.Project")
 
     # Nullable in case the file upload fails
@@ -93,13 +92,14 @@ def as_choices(cls):
     date_built = models.DateTimeField(null=True)
 
     build_configuration = FlexibleForeignKey(
-        "sentry.PreprodBuildConfiguration", null=True, on_delete=models.SET_NULL
+        "preprod.PreprodBuildConfiguration", null=True, on_delete=models.SET_NULL
     )
 
     state = BoundedPositiveIntegerField(
         default=ArtifactState.UPLOADING, choices=ArtifactState.as_choices()
     )
 
+    # Nullable because we only know the type after the artifact has been processed
     artifact_type = BoundedPositiveIntegerField(choices=ArtifactType.as_choices(), null=True)
 
     error_code = BoundedPositiveIntegerField(choices=ErrorCode.as_choices(), null=True)
@@ -110,10 +110,10 @@ def as_choices(cls):
     # E.g. 9999
     build_number = BoundedBigIntegerField(null=True)
 
-    misc: models.Field[dict[str, Any], dict[str, Any]] = JSONField(null=True)
+    extras: models.Field[dict[str, Any], dict[str, Any]] = JSONField(null=True)
 
     class Meta:
-        app_label = "sentry"
+        app_label = "preprod"
         db_table = "sentry_preprodartifact"
 
 
@@ -123,12 +123,11 @@ class PreprodBuildConfiguration(DefaultFieldsModel):
 
     __relocation_scope__ = RelocationScope.Excluded
 
-    organization_id = BoundedBigIntegerField(db_index=True)
     project = FlexibleForeignKey("sentry.Project")
     name = models.CharField(max_length=255)
 
     class Meta:
-        app_label = "sentry"
+        app_label = "preprod"
         db_table = "sentry_preprodbuildconfiguration"
         unique_together = ("project", "name")
 
@@ -140,7 +139,7 @@ class PreprodArtifactSizeMetrics(DefaultFieldsModel):
     size metrics.
     """
 
-    class MetricsArtifactType:
+    class MetricsArtifactType(IntEnum):
         MAIN_ARTIFACT = 0
         """The main artifact."""
         WATCH_ARTIFACT = 1
@@ -156,7 +155,7 @@ def as_choices(cls):
                 (cls.ANDROID_DYNAMIC_FEATURE, "android_dynamic_feature_artifact"),
             )
 
-    class SizeAnalysisState:
+    class SizeAnalysisState(IntEnum):
         PENDING = 0
         """Size analysis has not started yet."""
         PROCESSING = 1
@@ -175,7 +174,7 @@ def as_choices(cls):
                 (cls.FAILED, "failed"),
             )
 
-    class ErrorCode:
+    class ErrorCode(IntEnum):
         UNKNOWN = 0
         """The error code is unknown. Try to use a descriptive error code if possible."""
         TIMEOUT = 1
@@ -196,7 +195,7 @@ def as_choices(cls):
 
     __relocation_scope__ = RelocationScope.Excluded
 
-    preprod_artifact = FlexibleForeignKey("sentry.PreprodArtifact")
+    preprod_artifact = FlexibleForeignKey("preprod.PreprodArtifact")
     metrics_artifact_type = BoundedPositiveIntegerField(
         choices=MetricsArtifactType.as_choices(), null=True
     )
@@ -218,6 +217,6 @@ def as_choices(cls):
     max_download_size = BoundedPositiveBigIntegerField(null=True)
 
     class Meta:
-        app_label = "sentry"
+        app_label = "preprod"
         db_table = "sentry_preprodartifactsizemetrics"
         unique_together = ("preprod_artifact", "metrics_artifact_type")