Skip to content

Commit 0cb67e5

Browse files
committed
Split cmk/gui: Extract quick_setup, eliminate endpoints filegroup
Remove redundant register_config_setups() calls from quick_setup handlers (already called in registration.py). This breaks the config_setups > cmk.plugins dependency chain. Extract quick_setup as //cmk/gui/quick_setup target and move quick_setup endpoint into endpoints target. Endpoints filegroup eliminated. CMK-33056 Change-Id: I9159f53dbf141fca604fff66654d82b407f108ba
1 parent c0e279c commit 0cb67e5

6 files changed

Lines changed: 64 additions & 21 deletions

File tree

cmk/BUILD

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -490,6 +490,7 @@ py_wheel(
490490
"//cmk/gui/openapi/spec",
491491
"//cmk/gui/openapi/spec:utils",
492492
"//cmk/gui/openapi/spec/spec_generator",
493+
"//cmk/gui/quick_setup",
493494
"//cmk/gui/rest_api_types:notifications",
494495
"//cmk/gui/rule_specs:compatibility",
495496
"//cmk/gui/rule_specs:loader",

cmk/gui/BUILD

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1333,8 +1333,8 @@ py_library(
13331333
"//cmk/gui/oauth2_connections:gui_srcs",
13341334
"//cmk/gui/openapi:gui_srcs",
13351335
"//cmk/gui/openapi/api_endpoints:gui_srcs",
1336-
"//cmk/gui/openapi/endpoints:gui_srcs",
13371336
"//cmk/gui/openapi/spec/spec_generator:gui_srcs",
1337+
"//cmk/gui/quick_setup:gui_srcs",
13381338
"//cmk/gui/rule_specs:gui_srcs",
13391339
"//cmk/gui/wsgi:gui_srcs",
13401340
],
@@ -1455,6 +1455,7 @@ py_library(
14551455
"//cmk/gui/openapi/spec",
14561456
"//cmk/gui/openapi/spec:utils",
14571457
"//cmk/gui/openapi/spec/spec_generator",
1458+
"//cmk/gui/quick_setup",
14581459
"//cmk/gui/rest_api_types:notifications",
14591460
"//cmk/gui/rule_specs:compatibility",
14601461
"//cmk/gui/rule_specs:loader",

cmk/gui/openapi/endpoints/BUILD

Lines changed: 2 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,7 @@ load("@cmk_requirements//:requirements.bzl", "requirement")
33

44
py_library(
55
name = "endpoints",
6-
srcs = glob(
7-
include = ["**/*.py"],
8-
exclude = [
9-
# Blocked: needs cmk.gui.quick_setup (monolithic, needs cmk.plugins)
10-
"quick_setup/**/*.py",
11-
],
12-
),
6+
srcs = glob(include = ["**/*.py"]),
137
imports = ["../../../.."],
148
visibility = [
159
"//cmk:__subpackages__",
@@ -45,6 +39,7 @@ py_library(
4539
"//cmk/gui/openapi/restful_objects:type_defs",
4640
"//cmk/gui/openapi/shared_endpoint_families",
4741
"//cmk/gui/openapi/spec:utils",
42+
"//cmk/gui/quick_setup",
4843
"//cmk/gui/rest_api_types:notifications",
4944
"//cmk/gui/userdb",
5045
"//cmk/gui/utils:agent",
@@ -75,12 +70,3 @@ py_library(
7570
requirement("werkzeug"),
7671
],
7772
)
78-
79-
# Temporary: endpoint files that still belong to the monolithic //cmk/gui target.
80-
filegroup(
81-
name = "gui_srcs",
82-
srcs = glob(include = [
83-
"quick_setup/**/*.py",
84-
]),
85-
visibility = ["//cmk/gui:__pkg__"],
86-
)

cmk/gui/quick_setup/BUILD

Lines changed: 59 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,59 @@
1+
load("@aspect_rules_py//py:defs.bzl", "py_library")
2+
3+
py_library(
4+
name = "quick_setup",
5+
srcs = ["__init__.py"] + glob(
6+
include = [
7+
"handlers/**/*.py",
8+
"private/**/*.py",
9+
"v0_unstable/**/*.py",
10+
],
11+
),
12+
imports = ["../../.."],
13+
visibility = [
14+
"//cmk:__subpackages__",
15+
"//tests:__subpackages__",
16+
],
17+
deps = [
18+
"//cmk/gui:config",
19+
"//cmk/gui:default_name",
20+
"//cmk/gui:exceptions",
21+
"//cmk/gui:http",
22+
"//cmk/gui:i18n",
23+
"//cmk/gui:log",
24+
"//cmk/gui:logged_in",
25+
"//cmk/gui:permissions",
26+
"//cmk/gui:site_config",
27+
"//cmk/gui:user_sites",
28+
"//cmk/gui/background_job/job",
29+
"//cmk/gui/fields",
30+
"//cmk/gui/form_specs",
31+
"//cmk/gui/htmllib:html",
32+
"//cmk/gui/utils:roles",
33+
"//cmk/gui/watolib",
34+
"//cmk/gui/watolib:config_infra",
35+
"//cmk/gui/watolib:passwords",
36+
"//cmk/gui/watolib:registries",
37+
"//cmk/utils",
38+
"//packages/cmk-ccc:exceptions",
39+
"//packages/cmk-ccc:site",
40+
"//packages/cmk-ccc:store",
41+
"//packages/cmk-ccc:version",
42+
"//packages/cmk-plugin-apis:rulesets",
43+
],
44+
)
45+
46+
# Temporary: quick_setup files that still belong to the monolithic //cmk/gui target.
47+
filegroup(
48+
name = "gui_srcs",
49+
srcs = glob(
50+
include = ["**/*.py"],
51+
exclude = [
52+
"__init__.py",
53+
"handlers/**/*.py",
54+
"private/**/*.py",
55+
"v0_unstable/**/*.py",
56+
],
57+
),
58+
visibility = ["//cmk/gui:__pkg__"],
59+
)

cmk/gui/quick_setup/handlers/setup.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@
2626
from cmk.gui.i18n import _, translate_to_current_language
2727
from cmk.gui.logged_in import user
2828
from cmk.gui.permissions import permission_registry
29-
from cmk.gui.quick_setup.config_setups import register as register_config_setups
3029
from cmk.gui.quick_setup.handlers.stage import (
3130
NextStageStructure,
3231
validate_stage_formspecs,
@@ -412,7 +411,6 @@ def _run_quick_setup_stage(
412411
) -> None:
413412
job_interface.send_progress_update(_("Starting Quick Setup action..."))
414413

415-
register_config_setups(quick_setup_registry)
416414
quick_setup = quick_setup_registry[self._quick_setup_id]
417415
action_result = verify_custom_validators_and_complete_quick_setup(
418416
quick_setup=quick_setup,

cmk/gui/quick_setup/handlers/stage.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@
3535
from cmk.gui.i18n import localize
3636
from cmk.gui.logged_in import user
3737
from cmk.gui.permissions import permission_registry
38-
from cmk.gui.quick_setup.config_setups import register as register_config_setups
3938
from cmk.gui.quick_setup.handlers.utils import (
4039
Action,
4140
BackgroundJobException,
@@ -392,7 +391,6 @@ def _run_quick_setup_stage_action(
392391
) -> None:
393392
job_interface.send_progress_update(_("Starting Quick stage action..."))
394393

395-
register_config_setups(quick_setup_registry)
396394
quick_setup = quick_setup_registry[self._quick_setup_id]
397395
built_stages_up_to_index = [
398396
stage() for stage in quick_setup.stages[: self._stage_index + 1]

0 commit comments

Comments
 (0)