Removed superfluous registry

The mode_registry and the mode_permissions_ensurance_registry were
always in sync, anyway. Furhtermore, instantiating entries from the
latter is complicated by the fact that they are a Protocol, and mypy
implicity assumes that its constructor has no arguments. This will
not be the case when the WatoMode constructor gets an argument, which
it will in an upcoming commit.

Change-Id: I4ee1f1b378226fa4c2921dcdbbbd93e7f9a73ec8

Author: spt29

cmk/gui/search/engines/setup.py

@@ -63,7 +63,7 @@
 from cmk.gui.utils.output_funnel import output_funnel
 from cmk.gui.utils.roles import UserPermissions, UserPermissionSerializableConfig
 from cmk.gui.utils.urls import file_name_and_query_vars_from_url
-from cmk.gui.watolib.mode_permissions import mode_permissions_ensurance_registry
+from cmk.gui.watolib.mode import mode_registry
 from cmk.gui.watolib.rulesets import may_edit_ruleset
 from cmk.shared_typing.unified_search import ProviderName, UnifiedSearchResultItem
 from cmk.utils import paths
@@ -323,7 +323,7 @@ def _check_page_handler(self, url: str) -> bool:
 
         try:
             if mode:
-                mode_permissions_ensurance_registry[mode]().ensure_permissions()
+                mode_registry[mode]().ensure_permissions()
             else:
                 self._check_if_handling_page_triggers_exception(file_name)
             return True

cmk/gui/watolib/BUILD

@@ -61,7 +61,6 @@ py_library(
         "mode/_base.py",
         "mode/_helpers.py",
         "mode/_registry.py",
-        "mode_permissions.py",
     ],
     imports = ["../../.."],
     visibility = [
@@ -214,7 +213,6 @@ py_library(
             "mode/_base.py",
             "mode/_helpers.py",
             "mode/_registry.py",
-            "mode_permissions.py",
             # Already in other leaf targets
             "config_domain_core.py",
             "groups_io.py",

cmk/gui/watolib/mode/_registry.py

@@ -6,7 +6,6 @@
 # mypy: disable-error-code="type-arg"
 
 from cmk.ccc.plugin_registry import Registry
-from cmk.gui.watolib.mode_permissions import mode_permissions_ensurance_registry
 
 from ._base import WatoMode
 
@@ -15,10 +14,5 @@ class ModeRegistry(Registry[type[WatoMode]]):
     def plugin_name(self, instance: type[WatoMode]) -> str:
         return instance.name()
 
-    def register(self, instance: type[WatoMode]) -> type[WatoMode]:
-        super().register(instance)
-        mode_permissions_ensurance_registry.register(instance)
-        return instance
-
 
 mode_registry = ModeRegistry()