forward-netbox 2.2.3__tar.gz → 2.2.4__tar.gz

{forward_netbox-2.2.3 → forward_netbox-2.2.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: forward-netbox
-Version: 2.2.3
+Version: 2.2.4
 Summary: NetBox plugin to sync Forward data into NetBox via built-in NQE queries
 License: MIT
 License-File: LICENSE
@@ -31,7 +31,8 @@ Forward 26.6 is the baseline for async NQE.
 
 | Plugin Release | NetBox Version | Status |
 | --- | --- | --- |
-| `v2.2.3` | `4.6.3` required; needs netbox-branching `1.1.0+` | Current release; Field-feedback fixes: delete-count labeling, vsys/vdom auto-link, skip empty VRFs, per-device CVE list, churn pinpoint, query-ID status clarify |
+| `v2.2.4` | `4.6.3` required; needs netbox-branching `1.1.0+` | Current release; Hotfix: device-analysis NQE (bare foreach) errored refresh + CVE list; surface job errors into job.data |
+| `v2.2.3` | `4.6.3` required; needs netbox-branching `1.1.0+` | Superseded by `v2.2.4`; Field-feedback fixes: delete-count labeling, vsys/vdom auto-link, skip empty VRFs, per-device CVE list, churn pinpoint, query-ID status clarify |
 | `v2.2.2` | `4.6.3` required; needs netbox-branching `1.1.0+` | Superseded by `v2.2.3`; Fix 504 gateway timeouts on large syncs: stop recomputing change-explainability on every poll during a long merge + back off poll to 15s |
 | `v2.2.1` | `4.6.3` required; needs netbox-branching `1.1.0+` | Superseded by `v2.2.2`; Add read-only forward_apply_identity_audit diagnostic to pinpoint 1-created/1-deleted idempotency churn |
 | `v2.2.0` | `4.6.3` required; needs netbox-branching `1.1.0+` | Superseded by `v2.2.1`; Fix devices mis-assigned the ACI platform; link Palo vsys / Fortinet vdom firewalls to their physical chassis |

{forward_netbox-2.2.3 → forward_netbox-2.2.4}/README.md

@@ -8,7 +8,8 @@ Forward 26.6 is the baseline for async NQE.
 
 | Plugin Release | NetBox Version | Status |
 | --- | --- | --- |
-| `v2.2.3` | `4.6.3` required; needs netbox-branching `1.1.0+` | Current release; Field-feedback fixes: delete-count labeling, vsys/vdom auto-link, skip empty VRFs, per-device CVE list, churn pinpoint, query-ID status clarify |
+| `v2.2.4` | `4.6.3` required; needs netbox-branching `1.1.0+` | Current release; Hotfix: device-analysis NQE (bare foreach) errored refresh + CVE list; surface job errors into job.data |
+| `v2.2.3` | `4.6.3` required; needs netbox-branching `1.1.0+` | Superseded by `v2.2.4`; Field-feedback fixes: delete-count labeling, vsys/vdom auto-link, skip empty VRFs, per-device CVE list, churn pinpoint, query-ID status clarify |
 | `v2.2.2` | `4.6.3` required; needs netbox-branching `1.1.0+` | Superseded by `v2.2.3`; Fix 504 gateway timeouts on large syncs: stop recomputing change-explainability on every poll during a long merge + back off poll to 15s |
 | `v2.2.1` | `4.6.3` required; needs netbox-branching `1.1.0+` | Superseded by `v2.2.2`; Add read-only forward_apply_identity_audit diagnostic to pinpoint 1-created/1-deleted idempotency churn |
 | `v2.2.0` | `4.6.3` required; needs netbox-branching `1.1.0+` | Superseded by `v2.2.1`; Fix devices mis-assigned the ACI platform; link Palo vsys / Fortinet vdom firewalls to their physical chassis |

{forward_netbox-2.2.3 → forward_netbox-2.2.4}/forward_netbox/__init__.py

@@ -8,7 +8,7 @@ class NetboxForwardConfig(PluginConfig):
     name = "forward_netbox"
     verbose_name = "Forward Field Integration"
     description = "Sync Forward data into NetBox using built-in NQE queries."
-    version = "2.2.3"
+    version = "2.2.4"
     base_url = "forward"
     min_version = "4.6.3"
 

{forward_netbox-2.2.3 → forward_netbox-2.2.4}/forward_netbox/jobs.py

@@ -385,6 +385,13 @@ def refresh_forward_device_analysis(job, *args, **kwargs):
         job.save(update_fields=["data"])
         job.terminate()
     except Exception as exc:
+        # Record the failure on the job so it is visible in the UI (the Data
+        # panel) instead of an empty Error field with null data.
+        job.data = {
+            "error": str(exc) or exc.__class__.__name__,
+            "error_type": exc.__class__.__name__,
+        }
+        job.save(update_fields=["data"])
         job.terminate(status=JobStatusChoices.STATUS_ERRORED)
         if type(exc) in (SyncError, JobTimeoutException):
             logger.error(exc)
@@ -408,6 +415,13 @@ def tag_forward_backfilled_devices(job, *args, **kwargs):
         job.save(update_fields=["data"])
         job.terminate()
     except Exception as exc:
+        # Record the failure on the job so it is visible in the UI (the Data
+        # panel) instead of an empty Error field with null data.
+        job.data = {
+            "error": str(exc) or exc.__class__.__name__,
+            "error_type": exc.__class__.__name__,
+        }
+        job.save(update_fields=["data"])
         job.terminate(status=JobStatusChoices.STATUS_ERRORED)
         if type(exc) in (SyncError, JobTimeoutException):
             logger.error(exc)
@@ -464,6 +478,13 @@ def tag_forward_delete_eligible_ipam(job, *args, **kwargs):
         job.save(update_fields=["data"])
         job.terminate()
     except Exception as exc:
+        # Record the failure on the job so it is visible in the UI (the Data
+        # panel) instead of an empty Error field with null data.
+        job.data = {
+            "error": str(exc) or exc.__class__.__name__,
+            "error_type": exc.__class__.__name__,
+        }
+        job.save(update_fields=["data"])
         job.terminate(status=JobStatusChoices.STATUS_ERRORED)
         if type(exc) in (SyncError, JobTimeoutException):
             logger.error(exc)
@@ -485,6 +506,13 @@ def create_forward_module_bays(job, *args, **kwargs):
         job.save(update_fields=["data"])
         job.terminate()
     except Exception as exc:
+        # Record the failure on the job so it is visible in the UI (the Data
+        # panel) instead of an empty Error field with null data.
+        job.data = {
+            "error": str(exc) or exc.__class__.__name__,
+            "error_type": exc.__class__.__name__,
+        }
+        job.save(update_fields=["data"])
         job.terminate(status=JobStatusChoices.STATUS_ERRORED)
         if type(exc) in (SyncError, JobTimeoutException):
             logger.error(exc)
@@ -511,6 +539,13 @@ def forward_dependency_preview(job, *args, **kwargs):
         job.save(update_fields=["data"])
         job.terminate()
     except Exception as exc:
+        # Record the failure on the job so it is visible in the UI (the Data
+        # panel) instead of an empty Error field with null data.
+        job.data = {
+            "error": str(exc) or exc.__class__.__name__,
+            "error_type": exc.__class__.__name__,
+        }
+        job.save(update_fields=["data"])
         job.terminate(status=JobStatusChoices.STATUS_ERRORED)
         if type(exc) in (SyncError, JobTimeoutException):
             logger.error(exc)

{forward_netbox-2.2.3 → forward_netbox-2.2.4}/forward_netbox/queries/forward_device_analysis.nqe

@@ -31,9 +31,9 @@ let physicalLinks =
          foreach l in i.links
          select l)
 let cveIds =
-  foreach c in device.cveFindings
-  where c.isVulnerable
-  select c.cveId
+  (foreach c in device.cveFindings
+   where c.isVulnerable
+   select c.cveId)
 select {
   name: device.name,
   reachable: device.snapshotInfo.result == DeviceSnapshotResult.completed,

forward_netbox-2.2.4/forward_netbox/tests/test_device_analysis_query.py

@@ -0,0 +1,26 @@
+import re
+
+from django.test import SimpleTestCase
+
+from forward_netbox.utilities.query_registry import read_builtin_query_source
+
+
+class DeviceAnalysisQueryTest(SimpleTestCase):
+    """Guard the device-analysis NQE against the 2.2.3 regression: a bare
+    ``let x = foreach ... select ...`` is INVALID NQE — the live Forward engine
+    returns HTTP 400 (``extraneous input 'foreach'``) and the whole
+    refresh-device-analysis job errors. The local NQE linter does NOT catch this
+    (it reported 0 errors on the broken query), so this source-level test is the
+    real guard. A ``foreach`` used as a value must be wrapped in parens / a call.
+    """
+
+    def test_cve_ids_comprehension_is_parenthesized(self):
+        source = read_builtin_query_source("forward_device_analysis.nqe")
+        self.assertIn("(foreach c in device.cveFindings", source)
+
+    def test_no_bare_foreach_in_let_binding(self):
+        source = read_builtin_query_source("forward_device_analysis.nqe")
+        # A `let <name> =` immediately followed by a bare `foreach` is the invalid
+        # pattern; wrapped forms (`(foreach`, `length(foreach`) are fine.
+        bare = re.findall(r"let\s+\w+\s*=\s*\n\s*foreach\b", source)
+        self.assertEqual(bare, [], f"bare foreach in a let binding: {bare}")

{forward_netbox-2.2.3 → forward_netbox-2.2.4}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "forward-netbox"
-version = "2.2.3"
+version = "2.2.4"
 description = "NetBox plugin to sync Forward data into NetBox via built-in NQE queries"
 authors = ["Craig Johnson <craigjohnson@forwardnetworks.com>"]
 license = "MIT"