From 8e73310fae8951797c31ab2d72dcb65f650b36a3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christian=20Fra=C3=9F?= Date: Thu, 17 Oct 2024 19:29:05 +0200 Subject: [PATCH] [fix] role:mas:conf compose script --- roles/mas/files/conf-compose.py | 21 ++++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/roles/mas/files/conf-compose.py b/roles/mas/files/conf-compose.py index 59434c3..c1fe8cc 100644 --- a/roles/mas/files/conf-compose.py +++ b/roles/mas/files/conf-compose.py @@ -103,16 +103,23 @@ def main(): data = {} ### base if True: - data_ = _json.loads(file_read(args.base_file_path)) - data = dict_merge(data, data_) + data = dict_merge( + data, + _json.loads(file_read(args.base_file_path)) + ) ### clients if True: - for name in _os.listdir(args.clients_directory_path): - data__ = _json.loads(file_read(_os.path.join(args.clients_directory_path, name))) - data_ = { - "clients": data__ + data = dict_merge( + data, + { + "clients": list( + map( + lambda name: _json.loads(file_read(_os.path.join(args.clients_directory_path, name))), + _os.listdir(args.clients_directory_path) + ) + ), } - data = dict_merge(data, data_) + ) ## output if True: if (args.output_format == "json"):