Skip to content

Commit fe8f4d9

Browse files
omnom62jestabro
authored andcommitted
http-api: T8989: fix routers.py regressions from initial commit
- Restore mask_dict/config_dict variable names in _execute_configure_op (shadowing of Config object was causing potential crash on delete ops) - Fix load_section_tree() call to pass correct 3 arguments - Pass data.destructive to merge_config() to preserve destructive behavior
1 parent 18ed79a commit fe8f4d9

1 file changed

Lines changed: 7 additions & 5 deletions

File tree

src/services/api/rest/routers.py

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -460,8 +460,8 @@ def _execute_configure_op(
460460
section = c.section
461461

462462
elif isinstance(c, BaseConfigSectionTreeModel):
463-
mask = c.mask
464-
config = c.config
463+
mask_dict = c.mask
464+
config_dict = c.config
465465

466466
if isinstance(c, BaseConfigureModel):
467467
if op == 'set':
@@ -487,9 +487,11 @@ def _execute_configure_op(
487487

488488
elif isinstance(c, BaseConfigSectionTreeModel):
489489
if op == 'set':
490-
session.set_section_tree(config)
490+
session.set_section_tree(config_dict)
491491
elif op == 'load':
492-
session.load_section_tree(mask, config)
492+
config = Config(session_env=env)
493+
config_tree = config.get_config_tree()
494+
session.load_section_tree(config_tree, mask_dict, config_dict)
493495
else:
494496
raise op_error
495497
# end for
@@ -726,7 +728,7 @@ async def config_file_op(data: ConfigFileModel, background_tasks: BackgroundTask
726728
case 'load':
727729
session.migrate_and_load_config(path)
728730
case 'merge':
729-
session.merge_config(path)
731+
session.merge_config(path, destructive=data.destructive)
730732

731733
config = Config(session_env=env)
732734
d = get_config_diff(config)

0 commit comments

Comments
 (0)