Skip to content

Commit cddaab9

Browse files
authored
♻️ Mark new trash web-api as dev-features (#6665)
1 parent cba3237 commit cddaab9

File tree

3 files changed

+16
-0
lines changed

3 files changed

+16
-0
lines changed

.codecov.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ flag_management:
1818

1919
component_management:
2020
default_rules:
21+
carryforward: true
2122
statuses:
2223
- type: project
2324
target: auto

services/web/server/src/simcore_service_webserver/projects/_trash_handlers.py

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
from servicelib.status_codes_utils import is_5xx_server_error
1515

1616
from .._meta import API_VTAG as VTAG
17+
from ..application_settings_utils import requires_dev_feature_enabled
1718
from ..login.decorators import get_user_id, login_required
1819
from ..products.api import get_product_name
1920
from ..projects._common_models import ProjectPathParams
@@ -102,6 +103,7 @@ async def _wrapper(request: web.Request) -> web.StreamResponse:
102103

103104

104105
@routes.delete(f"/{VTAG}/trash", name="empty_trash")
106+
@requires_dev_feature_enabled
105107
@login_required
106108
@permission_required("project.delete")
107109
@_handle_request_exceptions
@@ -117,6 +119,7 @@ async def empty_trash(request: web.Request):
117119

118120

119121
@routes.post(f"/{VTAG}/projects/{{project_id}}:trash", name="trash_project")
122+
@requires_dev_feature_enabled
120123
@login_required
121124
@permission_required("project.delete")
122125
@_handle_request_exceptions
@@ -140,6 +143,7 @@ async def trash_project(request: web.Request):
140143

141144

142145
@routes.post(f"/{VTAG}/projects/{{project_id}}:untrash", name="untrash_project")
146+
@requires_dev_feature_enabled
143147
@login_required
144148
@permission_required("project.delete")
145149
@_handle_request_exceptions

services/web/server/tests/unit/with_dbs/03/test_trash.py

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,23 @@
1818
from models_library.rest_pagination import Page
1919
from pytest_mock import MockerFixture
2020
from pytest_simcore.helpers.assert_checks import assert_status
21+
from pytest_simcore.helpers.monkeypatch_envs import setenvs_from_dict
22+
from pytest_simcore.helpers.typing_env import EnvVarsDict
2123
from pytest_simcore.helpers.webserver_login import UserInfoDict
2224
from servicelib.aiohttp import status
2325
from simcore_service_webserver.db.models import UserRole
2426
from simcore_service_webserver.projects.models import ProjectDict
2527

2628

29+
@pytest.fixture
30+
def app_environment(
31+
app_environment: EnvVarsDict, monkeypatch: pytest.MonkeyPatch
32+
) -> EnvVarsDict:
33+
return app_environment | setenvs_from_dict(
34+
monkeypatch, {"WEBSERVER_DEV_FEATURES_ENABLED": "1"}
35+
)
36+
37+
2738
@pytest.fixture
2839
def user_role() -> UserRole:
2940
return UserRole.USER

0 commit comments

Comments
 (0)