Skip to content

Commit b162efb

Browse files
committed
user_roles: switch to new framework, remove old
Change-Id: I61ebf7a4e3edbd44da2abf0135c81a22152d2f74
1 parent 6921665 commit b162efb

11 files changed

Lines changed: 8 additions & 425 deletions

File tree

cmk/gui/fields/definitions.py

Lines changed: 0 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@
3535
from cmk.gui.fields.utils import edition_field_description, tree_to_expr
3636
from cmk.gui.groups import GroupName, GroupType
3737
from cmk.gui.logged_in import user
38-
from cmk.gui.permissions import permission_registry
3938
from cmk.gui.userdb import load_users
4039
from cmk.gui.watolib import userroles
4140
from cmk.gui.watolib.groups_io import load_group_information
@@ -1437,32 +1436,6 @@ def _validate(self, value: str) -> None:
14371436
raise self.make_error("should_be_custom", role=value)
14381437

14391438

1440-
class PermissionField(base.String):
1441-
default_error_messages = {
1442-
"invalid_permission": "The specified permission name doesn't exist: {value!r}",
1443-
}
1444-
1445-
def __init__(
1446-
self,
1447-
required: bool = True,
1448-
validate: Callable[[object], bool] | Collection[Callable[[object], bool]] | None = None,
1449-
**kwargs: Any,
1450-
) -> None:
1451-
super().__init__(
1452-
example="general.edit_profile",
1453-
description="The name of a permission",
1454-
required=required,
1455-
validate=validate,
1456-
**kwargs,
1457-
)
1458-
1459-
@override
1460-
def _validate(self, value: str) -> None:
1461-
super()._validate(value)
1462-
if value not in permission_registry:
1463-
raise self.make_error("invalid_permission", value=value)
1464-
1465-
14661439
class Username(base.String):
14671440
default_error_messages = {
14681441
"should_exist": "Username missing: {username!r}",
@@ -1620,7 +1593,6 @@ def _serialize(self, value: str | Folder, attr: str | None, obj: object, **kwarg
16201593
"PasswordEditableBy",
16211594
"PasswordIdent",
16221595
"PasswordShare",
1623-
"PermissionField",
16241596
"PythonString",
16251597
"query_field",
16261598
"SiteField",

cmk/gui/openapi/api_endpoints/user_role/create_user_role.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,5 +50,5 @@ def create_user_role_v1(body: CreateUserRoleModel) -> UserRoleModel:
5050
),
5151
permissions=EndpointPermissions(required=RW_PERMISSIONS),
5252
doc=EndpointDoc(family=USER_ROLE_FAMILY.name),
53-
versions={APIVersion.UNSTABLE: EndpointHandler(handler=create_user_role_v1)},
53+
versions={APIVersion.V1: EndpointHandler(handler=create_user_role_v1)},
5454
)

cmk/gui/openapi/api_endpoints/user_role/delete_user_role.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,5 +48,5 @@ def delete_user_role_v1(
4848
),
4949
permissions=EndpointPermissions(required=RW_PERMISSIONS),
5050
doc=EndpointDoc(family=USER_ROLE_FAMILY.name),
51-
versions={APIVersion.UNSTABLE: EndpointHandler(handler=delete_user_role_v1)},
51+
versions={APIVersion.V1: EndpointHandler(handler=delete_user_role_v1)},
5252
)

cmk/gui/openapi/api_endpoints/user_role/edit_user_role.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -111,5 +111,5 @@ def edit_user_role_v1(
111111
),
112112
permissions=EndpointPermissions(required=RW_PERMISSIONS),
113113
doc=EndpointDoc(family=USER_ROLE_FAMILY.name),
114-
versions={APIVersion.UNSTABLE: EndpointHandler(handler=edit_user_role_v1)},
114+
versions={APIVersion.V1: EndpointHandler(handler=edit_user_role_v1)},
115115
)

cmk/gui/openapi/api_endpoints/user_role/list_user_roles.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,5 +60,5 @@ def list_user_roles_v1() -> UserRoleCollectionModel:
6060
),
6161
permissions=EndpointPermissions(required=PERMISSIONS),
6262
doc=EndpointDoc(family=USER_ROLE_FAMILY.name),
63-
versions={APIVersion.UNSTABLE: EndpointHandler(handler=list_user_roles_v1)},
63+
versions={APIVersion.V1: EndpointHandler(handler=list_user_roles_v1)},
6464
)

cmk/gui/openapi/api_endpoints/user_role/show_user_role.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,5 +45,5 @@ def show_user_role_v1(
4545
),
4646
permissions=EndpointPermissions(required=PERMISSIONS),
4747
doc=EndpointDoc(family=USER_ROLE_FAMILY.name),
48-
versions={APIVersion.UNSTABLE: EndpointHandler(handler=show_user_role_v1)},
48+
versions={APIVersion.V1: EndpointHandler(handler=show_user_role_v1)},
4949
)

cmk/gui/openapi/endpoints/user_role/__init__.py

Lines changed: 0 additions & 266 deletions
This file was deleted.

0 commit comments

Comments
 (0)