try to change all the tests, removing references to file_id

Author: Swatinem

src/sentry/testutils/factories.py

@@ -87,7 +87,6 @@
 )
 from sentry.models.debugfile import ProjectDebugFile
 from sentry.models.environment import Environment
-from sentry.models.eventattachment import EventAttachment
 from sentry.models.files.control_file import ControlFile
 from sentry.models.files.file import File
 from sentry.models.group import Group
@@ -1106,25 +1105,6 @@ def create_file_from_path(path, name=None, **kwargs):
             file.putfile(f)
         return file
 
-    @staticmethod
-    @assume_test_silo_mode(SiloMode.REGION)
-    def create_event_attachment(event, file=None, **kwargs):
-        if file is None:
-            file = Factories.create_file(
-                name="log.txt",
-                size=32,
-                headers={"Content-Type": "text/plain"},
-                checksum="dc1e3f3e411979d336c3057cce64294f3420f93a",
-            )
-
-        return EventAttachment.objects.create(
-            project_id=event.project_id,
-            event_id=event.event_id,
-            file_id=file.id,
-            type=file.type,
-            **kwargs,
-        )
-
     @staticmethod
     @assume_test_silo_mode(SiloMode.REGION)
     def create_dif_file(

src/sentry/testutils/fixtures.py

@@ -317,11 +317,6 @@ def create_file(self, **kwargs):
     def create_file_from_path(self, *args, **kwargs):
         return Factories.create_file_from_path(*args, **kwargs)
 
-    def create_event_attachment(self, event=None, *args, **kwargs):
-        if event is None:
-            event = self.event
-        return Factories.create_event_attachment(event, *args, **kwargs)
-
     def create_dif_file(self, project: Project | None = None, *args, **kwargs):
         if project is None:
             project = self.project

src/sentry/utils/mockdata/core.py

@@ -647,12 +647,9 @@ def generate_events(
             project_id=project.id,
             event_id=event1.event_id,
             name="example-logfile.txt",
-            file_id=File.objects.get_or_create(
-                name="example-logfile.txt",
-                type="text/plain",
-                checksum="abcde" * 8,
-                size=13043,
-            )[0].id,
+            type="text/plain",
+            sha1="abcde" * 8,
+            size=13043,
         )
 
         event2 = create_sample_event(

tests/sentry/api/endpoints/test_event_attachments.py

@@ -1,7 +1,4 @@
-from io import BytesIO
-
 from sentry.models.eventattachment import EventAttachment
-from sentry.models.files.file import File
 from sentry.testutils.cases import APITestCase
 from sentry.testutils.helpers.datetime import before_now
 from sentry.testutils.skips import requires_snuba
@@ -21,14 +18,13 @@ def test_simple(self):
             data={"fingerprint": ["group1"], "timestamp": min_ago}, project_id=self.project.id
         )
 
-        file1 = File.objects.create(name="hello.png", type="event.attachment")
-        file1.putfile(BytesIO(b"File contents here"))
         attachment1 = EventAttachment.objects.create(
             project_id=event1.project_id,
             event_id=event1.event_id,
             type="event.attachment",
-            name=file1.name,
-            file_id=file1.id,
+            name="hello.png",
+            content_type="image/png",
+            blob_path=":File contents here",
         )
 
         attachment2 = EventAttachment.objects.create(
@@ -39,7 +35,6 @@ def test_simple(self):
             content_type="image/png",
             size=1234,
             sha1="1234",
-            # NOTE: we are not actually attaching the `file_id` here
         )
 
         path = f"/api/0/projects/{event1.project.organization.slug}/{event1.project.slug}/events/{event1.event_id}/attachments/"
@@ -82,26 +77,21 @@ def test_is_screenshot(self):
             data={"fingerprint": ["group1"], "timestamp": min_ago}, project_id=self.project.id
         )
 
-        file = File.objects.create(name="screenshot.png", type="image/png")
         EventAttachment.objects.create(
             event_id=event1.event_id,
             project_id=event1.project_id,
-            file_id=file.id,
-            name=file.name,
+            name="screenshot.png",
+            content_type="image/png",
         )
-        file = File.objects.create(name="crash_screenshot.png")
         EventAttachment.objects.create(
             event_id=event1.event_id,
             project_id=event1.project_id,
-            file_id=file.id,
-            name=file.name,
+            name="crash_screenshot.png",
         )
-        file = File.objects.create(name="foo.png")
         EventAttachment.objects.create(
             event_id=event1.event_id,
             project_id=event1.project_id,
-            file_id=file.id,
-            name=file.name,
+            name="foo.png",
         )
 
         path = f"/api/0/projects/{event1.project.organization.slug}/{event1.project.slug}/events/{event1.event_id}/attachments/"

tests/sentry/deletions/test_group.py

@@ -15,7 +15,6 @@
 from sentry.issues.grouptype import FeedbackGroup, GroupCategory
 from sentry.issues.issue_occurrence import IssueOccurrence
 from sentry.models.eventattachment import EventAttachment
-from sentry.models.files.file import File
 from sentry.models.group import Group
 from sentry.models.groupassignee import GroupAssignee
 from sentry.models.grouphash import GroupHash
@@ -57,13 +56,11 @@ def setUp(self) -> None:
         UserReport.objects.create(
             event_id=self.event.event_id, project_id=self.event.project_id, name="With event id"
         )
-        file = File.objects.create(name="hello.png", type="image/png")
         EventAttachment.objects.create(
             event_id=self.event.event_id,
             project_id=self.event.project_id,
-            file_id=file.id,
-            type=file.type,
             name="hello.png",
+            content_type="image/png",
         )
         GroupAssignee.objects.create(group=group, project=self.project, user_id=self.user.id)
         GroupHash.objects.create(project=self.project, group=group, hash=uuid4().hex)

tests/sentry/deletions/test_project.py

@@ -108,13 +108,11 @@ def test_simple(self):
             object_name="object",
             project_id=project.id,
         )
-        file_attachment = File.objects.create(name="hello.png", type="image/png")
         EventAttachment.objects.create(
             event_id=event.event_id,
             project_id=event.project_id,
-            file_id=file_attachment.id,
-            type=file_attachment.type,
             name="hello.png",
+            type="image/png",
         )
         hook = self.create_service_hook(
             actor=self.user,

tests/sentry/issues/endpoints/test_organization_group_index.py

@@ -25,7 +25,6 @@
 from sentry.models.apitoken import ApiToken
 from sentry.models.environment import Environment
 from sentry.models.eventattachment import EventAttachment
-from sentry.models.files.file import File
 from sentry.models.group import Group, GroupStatus
 from sentry.models.groupassignee import GroupAssignee
 from sentry.models.groupbookmark import GroupBookmark
@@ -1979,14 +1978,12 @@ def test_expand_latest_event_has_attachments(self, _: MagicMock) -> None:
         assert "latestEventHasAttachments" not in response.data[0]
 
         # Add 1 attachment
-        file_attachment = File.objects.create(name="hello.png", type="image/png")
         EventAttachment.objects.create(
             group_id=event.group.id,
             event_id=event.event_id,
             project_id=event.project_id,
-            file_id=file_attachment.id,
-            type=file_attachment.type,
             name="hello.png",
+            content_type="image/png",
         )
 
         response = self.get_response(

tests/sentry/tasks/test_reprocessing2.py

@@ -1,7 +1,6 @@
 from __future__ import annotations
 
 import uuid
-from io import BytesIO
 from time import time
 from unittest import mock
 
@@ -16,7 +15,6 @@
 from sentry.grouping.fingerprinting import FingerprintingRules
 from sentry.models.activity import Activity
 from sentry.models.eventattachment import EventAttachment
-from sentry.models.files.file import File
 from sentry.models.group import Group
 from sentry.models.groupassignee import GroupAssignee
 from sentry.models.groupredirect import GroupRedirect
@@ -37,16 +35,14 @@
 
 
 def _create_event_attachment(evt, type):
-    file = File.objects.create(name="foo", type=type)
-    file.putfile(BytesIO(b"hello world"))
     EventAttachment.objects.create(
         event_id=evt.event_id,
         group_id=evt.group_id,
         project_id=evt.project_id,
-        file_id=file.id,
-        type=file.type,
+        type=type,
         name="foo",
-        size=file.size,
+        size=len("hello world"),
+        blob_path=":hello world",
     )