From cb549b2a05d351c7d9438c0297bca2e1e1a4a68c Mon Sep 17 00:00:00 2001 From: anthony sottile <103459774+asottile-sentry@users.noreply.github.com> Date: Fri, 3 May 2024 14:56:34 -0400 Subject: [PATCH] ref: ensure type of deserialized model is a sentry model (#70255) fixes a type error pointed out by upgrading django-stubs: ``` src/sentry/services/hybrid_cloud/import_export/impl.py:203: error: "Model" has no attribute "get_possible_relocation_scopes" [attr-defined] src/sentry/services/hybrid_cloud/import_export/impl.py:223: error: "Model" has no attribute "normalize_before_relocation_import" [attr-defined] src/sentry/services/hybrid_cloud/import_export/impl.py:233: error: "Model" has no attribute "get_relocation_scope" [attr-defined] src/sentry/services/hybrid_cloud/import_export/impl.py:239: error: "Model" has no attribute "write_relocation_import" [attr-defined] ``` --- src/sentry/backup/dependencies.py | 2 -- .../hybrid_cloud/import_export/impl.py | 18 ++++++++++++++---- 2 files changed, 14 insertions(+), 6 deletions(-) diff --git a/src/sentry/backup/dependencies.py b/src/sentry/backup/dependencies.py index fff9fc3e1e1413..df374aff6f4a26 100644 --- a/src/sentry/backup/dependencies.py +++ b/src/sentry/backup/dependencies.py @@ -23,8 +23,6 @@ class NormalizedModelName: backup, so a string of the form `{app_label.lower()}.{model_name.lower()}`. """ - __model_name: str - def __init__(self, model_name: str): if "." not in model_name: raise TypeError("cannot create NormalizedModelName from invalid input string") diff --git a/src/sentry/services/hybrid_cloud/import_export/impl.py b/src/sentry/services/hybrid_cloud/import_export/impl.py index 618c6f0d090642..c03b6197409dc5 100644 --- a/src/sentry/services/hybrid_cloud/import_export/impl.py +++ b/src/sentry/services/hybrid_cloud/import_export/impl.py @@ -26,6 +26,7 @@ from sentry.backup.findings import InstanceID from sentry.backup.helpers import EXCLUDED_APPS, DatetimeSafeDjangoJSONEncoder, Filter, ImportFlags from sentry.backup.scopes import ExportScope +from sentry.db.models.base import BaseModel from sentry.models.importchunk import ControlImportChunk, RegionImportChunk from sentry.models.user import User from sentry.models.userpermission import UserPermission @@ -198,15 +199,24 @@ def import_by_model( last_seen_ordinal = min_ordinal - 1 for deserialized_object in deserialize("json", json_data, use_natural_keys=False): model_instance = deserialized_object.object + inst_model_name = get_model_name(model_instance) + + if not isinstance(model_instance, BaseModel): + return RpcImportError( + kind=RpcImportErrorKind.UnexpectedModel, + on=InstanceID(model=str(inst_model_name), ordinal=None), + left_pk=model_instance.pk, + reason=f"Received non-sentry model of kind `{inst_model_name}`", + ) + if model_instance._meta.app_label not in EXCLUDED_APPS or model_instance: if model_instance.get_possible_relocation_scopes() & ok_relocation_scopes: - inst_model_name = get_model_name(model_instance) if inst_model_name != batch_model_name: return RpcImportError( kind=RpcImportErrorKind.UnexpectedModel, - on=InstanceID(model=str(inst_model_name), ordinal=1), + on=InstanceID(model=str(inst_model_name), ordinal=None), left_pk=model_instance.pk, - reason=f"Received model of kind `{str(inst_model_name)}` when `{str(batch_model_name)}` was expected", + reason=f"Received model of kind `{inst_model_name}` when `{batch_model_name}` was expected", ) for f in filters: @@ -449,7 +459,7 @@ def export_by_model( return RpcExportError( kind=RpcExportErrorKind.UnexportableModel, on=InstanceID(model_name), - reason=f"The model `{str(batch_model_name)}` is not exportable", + reason=f"The model `{batch_model_name}` is not exportable", ) max_pk = from_pk