annet 0.10__py3-none-any.whl → 0.11__py3-none-any.whl

annet/annlib/jsontools.py

@@ -92,7 +92,11 @@ def apply_patch(content: Optional[bytes], patch_bytes: bytes) -> bytes:
 def apply_acl_filters(content: Dict[str, Any], filters: List[str]) -> Dict[str, Any]:
     result = {}
     for f in filters:
-        pointer = jsonpointer.JsonPointer(f)
+        filter_text = f.strip()
+        if not filter_text:
+            continue
+
+        pointer = jsonpointer.JsonPointer(filter_text)
 
         try:
             part = pointer.get(copy.deepcopy(content))
@@ -103,7 +107,7 @@ def apply_acl_filters(content: Dict[str, Any], filters: List[str]) -> Dict[str,
                     sub_tree[i] = {}
                 sub_tree = sub_tree[i]
 
-            patch = jsonpatch.JsonPatch([{"op": "add", "path": f, "value": part}])
+            patch = jsonpatch.JsonPatch([{"op": "add", "path": filter_text, "value": part}])
             result = patch.apply(result)
         except jsonpointer.JsonPointerException:
             # no value found in content by the pointer, skip the ACL item

annet/gen.py

@@ -245,28 +245,27 @@ def _old_new_per_device(ctx: OldNewDeviceContext, device: Device, filterer: Filt
             filters = filters_text.split("\n")
 
             for file_name in new_json_fragment_files:
-                new_json_fragment_files = _update_json_config(
-                    new_json_fragment_files,
-                    file_name,
-                    jsontools.apply_acl_filters(new_json_fragment_files[file_name][0], filters)
-                )
+                if new_json_fragment_files.get(file_name) is not None:
+                    new_json_fragment_files = _update_json_config(
+                        new_json_fragment_files,
+                        file_name,
+                        jsontools.apply_acl_filters(new_json_fragment_files[file_name][0], filters)
+                    )
             for file_name in old_json_fragment_files:
-                old_json_fragment_files = _update_json_config(
-                    old_json_fragment_files,
-                    file_name,
-                    jsontools.apply_acl_filters(old_json_fragment_files[file_name][0], filters)
-                )
+                if old_json_fragment_files.get(file_name) is not None:
+                    old_json_fragment_files[file_name] = jsontools.apply_acl_filters(old_json_fragment_files[file_name], filters)
 
         if ctx.args.acl_safe:
             safe_new_files = res.new_files(safe=True)
             safe_new_json_fragment_files = res.new_json_fragment_files(old_json_fragment_files, safe=True)
             if filters:
                 for file_name in safe_new_json_fragment_files:
-                    safe_new_json_fragment_files = _update_json_config(
-                        safe_new_json_fragment_files,
-                        file_name,
-                        jsontools.apply_acl_filters(safe_new_json_fragment_files[file_name][0], filters)
-                    )
+                    if safe_new_json_fragment_files.get(file_name):
+                        safe_new_json_fragment_files = _update_json_config(
+                            safe_new_json_fragment_files,
+                            file_name,
+                            jsontools.apply_acl_filters(safe_new_json_fragment_files[file_name][0], filters)
+                        )
 
     if ctx.args.profile:
         perf = res.perf_mesures()

{annet-0.10.dist-info → annet-0.11.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: annet
-Version: 0.10
+Version: 0.11
 Summary: annet
 Home-page: https://github.com/annetutil/annet
 License: MIT

{annet-0.10.dist-info → annet-0.11.dist-info}/RECORD

@@ -8,7 +8,7 @@ annet/deploy.py,sha256=B8E0P_VvCrS2URjFvgmUiIkHp95g7pAWfmT34igaDeo,18893
 annet/diff.py,sha256=zLcaCnb4lZRUb7frpH1CstQ3kacRcCblZs1uLG8J5lk,3391
 annet/executor.py,sha256=bw7COJNtssuxIqbQehlHYJnkdUeYvvL8WO5B-c67XE0,19040
 annet/filtering.py,sha256=F4ZKUCU3Yb1RlL2zKdyHtVUaWPzjWF4vWyMcdygKNYk,852
-annet/gen.py,sha256=FFIzfDudMihS824wmTPMuFTOWRwn0EZac-VxITrlyTw,33068
+annet/gen.py,sha256=yxlAht0SgYKFYI1gxhqEz92aNy-D5Cq_Gi78orFpG8w,33195
 annet/hardware.py,sha256=HYPDfji_GdRn5S0_0fl4rvM7byOY9aHxG6VMAtsLaxE,1090
 annet/implicit.py,sha256=QigK4uoxvrFho2h9yFjOq1d9rLsC5xFlAU4bKkCuMWk,5139
 annet/lib.py,sha256=zQIfNBg7fAAk2BHbHAqy_McAiXhz0RqpBAcfdU-6pAA,3742
@@ -44,7 +44,7 @@ annet/annlib/command.py,sha256=uuBddMQphtn8P5MO5kzIa8_QrtMns-k05VeKv1bcAuA,1043
 annet/annlib/diff.py,sha256=UPt3kYFQdQdVVy3ePYzNHPAxMVmHxCrCnZnMCV6ou2Q,4587
 annet/annlib/errors.py,sha256=jBcSFzY6Vj-FxR__vqjFm-87AwYQ0xHuAopTirii5AU,287
 annet/annlib/filter_acl.py,sha256=0w1VF6WcONiTYTQh0yWi6_j9rCTc_kMLAUMr0hbdkNU,7203
-annet/annlib/jsontools.py,sha256=_astuRFlt4KlDrneAbuL-HWt1ceu0pWp13skGoV0k-c,3359
+annet/annlib/jsontools.py,sha256=UXZrO6RZ4LIcJkQ6xUcef6WuHMgpMTipolcIBZTEhuc,3461
 annet/annlib/lib.py,sha256=eJ4hcVuQ6pdYBzLs4YKCHFtq45idOfZCYp92XfF7_QI,15317
 annet/annlib/output.py,sha256=_SjJ6G6bejvnTKqNHw6xeio0FT9oO3OIkLaOC3cEga4,7569
 annet/annlib/patching.py,sha256=Gh8uUjFyYND9TJBBQH-DH6-AwFiiR-dXVXOisMS7elg,19784
@@ -120,10 +120,10 @@ annet/rulebook/texts/routeros.rul,sha256=ipfxjj0mjFef6IsUlupqx4BY_Je_OUb8u_U1019
 annet_generators/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 annet_generators/example/__init__.py,sha256=zVd8_DrXuOASrNzg2Ab94rPyvJff83L-_HppDFxnUjM,228
 annet_generators/example/lldp.py,sha256=68CLrK7vxTQQy9XIBxtywuEdBNlIlfXGYj8_wYWs5UI,1146
-annet-0.10.dist-info/AUTHORS,sha256=rh3w5P6gEgqmuC-bw-HB68vBCr-yIBFhVL0PG4hguLs,878
-annet-0.10.dist-info/LICENSE,sha256=yPxl7dno02Pw7gAcFPIFONzx_gapwDoPXsIsh6Y7lC0,1079
-annet-0.10.dist-info/METADATA,sha256=wUvxu4XGIQ0tSRIwoetdSNG45tkxpO70zPAngL0NN5Y,692
-annet-0.10.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-annet-0.10.dist-info/entry_points.txt,sha256=yHimujIzR2bwNIbb--MTs_GpXiAve89Egpu2LlgTEkg,119
-annet-0.10.dist-info/top_level.txt,sha256=QsoTZBsUtwp_FEcmRwuN8QITBmLOZFqjssRfKilGbP8,23
-annet-0.10.dist-info/RECORD,,
+annet-0.11.dist-info/AUTHORS,sha256=rh3w5P6gEgqmuC-bw-HB68vBCr-yIBFhVL0PG4hguLs,878
+annet-0.11.dist-info/LICENSE,sha256=yPxl7dno02Pw7gAcFPIFONzx_gapwDoPXsIsh6Y7lC0,1079
+annet-0.11.dist-info/METADATA,sha256=NsxmrzE8om8V_vysVIFVFXPEMPGDWyz0VG6DYSu5Q-k,692
+annet-0.11.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+annet-0.11.dist-info/entry_points.txt,sha256=yHimujIzR2bwNIbb--MTs_GpXiAve89Egpu2LlgTEkg,119
+annet-0.11.dist-info/top_level.txt,sha256=QsoTZBsUtwp_FEcmRwuN8QITBmLOZFqjssRfKilGbP8,23
+annet-0.11.dist-info/RECORD,,