Skip to content

Commit 06da4e1

Browse files
authored
chore(project-options): Remove template option lookup (#97565)
Project tempaltes is the feature that was paused, and is not currently not used anywhere, but it may be revisited so we don't want to completely remove it. This PR removes code that causes an extra unnecessary lookup, and simplifies the code in `get_option` method.
1 parent 108141c commit 06da4e1

File tree

3 files changed

+5
-4
lines changed

3 files changed

+5
-4
lines changed

src/sentry/models/project.py

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -443,10 +443,6 @@ def template_manager(self) -> ProjectTemplateOptionManager:
443443
def get_option(
444444
self, key: str, default: Any | None = None, validate: Callable[[object], bool] | None = None
445445
) -> Any:
446-
# if the option is not set, check the template
447-
if not self.option_manager.isset(self, key) and self.template is not None:
448-
return self.template_manager.get_value(self.template, key, default, validate)
449-
450446
return self.option_manager.get_value(self, key, default, validate)
451447

452448
def update_option(self, key: str, value: Any, reload_cache: bool = True) -> bool:

tests/sentry/models/test_project.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
from collections.abc import Iterable
2+
from unittest import skip
23
from unittest.mock import MagicMock, patch
34

45
from sentry.deletions.models.scheduleddeletion import RegionScheduledDeletion
@@ -471,6 +472,7 @@ def test_get_option(self) -> None:
471472
ProjectOption.objects.set_value(self.project, self.option_key, True)
472473
assert self.project.get_option(self.option_key) is True
473474

475+
@skip("Template feature is not active at the moment")
474476
def test_get_template_option(self) -> None:
475477
assert self.project.get_option(self.option_key) is None
476478
ProjectTemplateOption.objects.set_value(self.project_template, self.option_key, "test")

tests/sentry/projectoptions/test_basic.py

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
from unittest import mock
22

3+
import pytest
4+
35
from sentry.models.options.project_option import ProjectOption
46
from sentry.models.options.project_template_option import ProjectTemplateOption
57
from sentry.models.projecttemplate import ProjectTemplate
@@ -76,6 +78,7 @@ def test_isset_differentiates_unset_from_set_to_default(default_project) -> None
7678

7779

7880
@django_db_all
81+
@pytest.mark.skip
7982
def test_project_template_options(default_project) -> None:
8083
default_manager.register("test_option", default="default")
8184
assert default_project.get_option("test_option") == "default"

0 commit comments

Comments
 (0)