Merge branch 'main' into wip/dev-2732-missing-context

dsp_permissions_scripts/main.py

@@ -2,7 +2,7 @@
 
 from dsp_permissions_scripts.models.groups import BuiltinGroup
 from dsp_permissions_scripts.models.host import Hosts
-from dsp_permissions_scripts.models.scope import StandardScope
+from dsp_permissions_scripts.models.scope import PUBLIC
 from dsp_permissions_scripts.utils.authentication import login
 from dsp_permissions_scripts.utils.permissions import (
     get_doaps_of_project,
@@ -29,7 +29,7 @@ def main() -> None:
     )
     token = login(host)
 
-    new_scope = StandardScope().PUBLIC
+    new_scope = PUBLIC
     groups = [BuiltinGroup.PROJECT_ADMIN, BuiltinGroup.PROJECT_MEMBER]
 
     doaps = get_doaps_of_project(

dsp_permissions_scripts/models/scope.py

@@ -4,27 +4,19 @@
 
 
 class PermissionScope(BaseModel):
+    """
+    A scope is an object encoding the information:
+    "Which user group gets which permissions on a resource/value?"
+    """
     CR: list[str | BuiltinGroup] = []
     D: list[str | BuiltinGroup] = []
     M: list[str | BuiltinGroup] = []
     V: list[str | BuiltinGroup] = []
     RV: list[str | BuiltinGroup] = []
 
 
-class StandardScope:
-    """
-    A scope is an object encoding the information:
-    "Which user group gets which permissions on a resource/value?"
-    This class offers some predefined scopes.
-    If your preferred scope is not available,
-    please add a new class attribute and implement it in the __init__ method.
-    """
-
-    PUBLIC: PermissionScope
-
-    def __init__(self):
-        self.PUBLIC = PermissionScope(
-            CR=[BuiltinGroup.PROJECT_ADMIN],
-            D=[BuiltinGroup.CREATOR, BuiltinGroup.PROJECT_MEMBER],
-            V=[BuiltinGroup.UNKNOWN_USER, BuiltinGroup.KNOWN_USER],
-        )
+PUBLIC = PermissionScope(
+    CR=[BuiltinGroup.PROJECT_ADMIN],
+    D=[BuiltinGroup.CREATOR, BuiltinGroup.PROJECT_MEMBER],
+    V=[BuiltinGroup.UNKNOWN_USER, BuiltinGroup.KNOWN_USER],
+)