recursively merge default arguments
This commit is contained in:
parent
640066d7e0
commit
d4fc0262d2
3 changed files with 6 additions and 4 deletions
|
@ -2,7 +2,7 @@ namespace: snailed
|
|||
|
||||
name: ez_docker
|
||||
|
||||
version: 2.0.0
|
||||
version: 3.0.0
|
||||
|
||||
readme: README.md
|
||||
|
||||
|
|
|
@ -5,7 +5,7 @@ from __future__ import annotations
|
|||
|
||||
from typing import TYPE_CHECKING, Any
|
||||
|
||||
from ansible_collections.snailed.ez_docker.plugins.module_utils import label, spec
|
||||
from ansible_collections.snailed.ez_docker.plugins.module_utils import common, label, spec
|
||||
|
||||
if TYPE_CHECKING:
|
||||
from ansible_collections.snailed.ez_docker.plugins.module_utils.models import State
|
||||
|
@ -46,7 +46,8 @@ def helper(state: State, service_params: dict[str, Any]) -> dict[str, Any]:
|
|||
|
||||
for name, labels_params in service_params.get("label_helpers", {}).items():
|
||||
for label_params in labels_params:
|
||||
params = label.common.get_default_args(state, name) | label_params
|
||||
default_params = label.common.get_default_args(state, name)
|
||||
params = common.recursive_update(default_params, label_params)
|
||||
helper = getattr(label, name).helper
|
||||
update |= label.common.run_helper(state, service_params["name"], update, params, helper)
|
||||
|
||||
|
|
|
@ -838,7 +838,8 @@ def main() -> None:
|
|||
|
||||
for name, services_params in state.params.get("services", {}).items():
|
||||
for index, service_params in enumerate(services_params):
|
||||
params = service.common.get_default_args(state, name) | service_params
|
||||
default_params = service.common.get_default_args(state, name)
|
||||
params = common.recursive_update(default_params, service_params)
|
||||
params["_index"] = index
|
||||
helper = getattr(service, name).helper
|
||||
state = service.common.run_helper(state, params, helper)
|
||||
|
|
Loading…
Add table
Reference in a new issue