fix: use Jinja2 none instead of null and add defensive checks for optional relationships (#20)
Replace all `null` literals with `none` (valid Jinja2/Python) in all three templates. Add explicit `is defined and is not none and .node is not none` guards before accessing nested nodes on optional GraphQL relationships, to avoid `Undefined is not JSON serializable` errors at render time. Also add `| default(none)` on optional scalar attributes (speed, mode, lacp_mode, mlag_id, mtu, description, virtual_router_address, route_distinguisher, learn_restrict, vlan_type, trunk_groups) so that Infrahub `Undefined` values from unset optional fields are safely coerced to JSON null rather than crashing tojson serialization. Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
This commit is contained in:
@@ -17,9 +17,9 @@
|
||||
{%- set _ = interfaces.append({
|
||||
"type": "loopback",
|
||||
"name": iface.name.value,
|
||||
"description": iface.description.value,
|
||||
"description": iface.description.value | default(none),
|
||||
"enabled": iface.enabled.value,
|
||||
"mtu": iface.mtu.value,
|
||||
"mtu": iface.mtu.value | default(none),
|
||||
"ip_addresses": ip_list
|
||||
}) -%}
|
||||
{%- endfor -%}
|
||||
@@ -31,18 +31,18 @@
|
||||
{%- for ip_edge in iface.ip_addresses.edges -%}
|
||||
{%- set _ = ip_list.append(ip_edge.node.address.value) -%}
|
||||
{%- endfor -%}
|
||||
{%- set lag_name = null -%}
|
||||
{%- if iface.lag and iface.lag.node -%}
|
||||
{%- set lag_name = none -%}
|
||||
{%- if iface.lag is defined and iface.lag is not none and iface.lag.node is not none -%}
|
||||
{%- set lag_name = iface.lag.node.name.value -%}
|
||||
{%- endif -%}
|
||||
{%- set _ = interfaces.append({
|
||||
"type": "ethernet",
|
||||
"name": iface.name.value,
|
||||
"description": iface.description.value,
|
||||
"description": iface.description.value | default(none),
|
||||
"enabled": iface.enabled.value,
|
||||
"mtu": iface.mtu.value,
|
||||
"speed": iface.speed.value,
|
||||
"mode": iface.mode.value,
|
||||
"mtu": iface.mtu.value | default(none),
|
||||
"speed": iface.speed.value | default(none),
|
||||
"mode": iface.mode.value | default(none),
|
||||
"lag": lag_name,
|
||||
"ip_addresses": ip_list
|
||||
}) -%}
|
||||
@@ -55,18 +55,18 @@
|
||||
{%- for ip_edge in iface.ip_addresses.edges -%}
|
||||
{%- set _ = ip_list.append(ip_edge.node.address.value) -%}
|
||||
{%- endfor -%}
|
||||
{%- set vlan_id = null -%}
|
||||
{%- if iface.vlan and iface.vlan.node -%}
|
||||
{%- set vlan_id = none -%}
|
||||
{%- if iface.vlan is defined and iface.vlan is not none and iface.vlan.node is not none -%}
|
||||
{%- set vlan_id = iface.vlan.node.vlan_id.value -%}
|
||||
{%- endif -%}
|
||||
{%- set _ = interfaces.append({
|
||||
"type": "vlan",
|
||||
"name": iface.name.value,
|
||||
"description": iface.description.value,
|
||||
"description": iface.description.value | default(none),
|
||||
"enabled": iface.enabled.value,
|
||||
"mtu": iface.mtu.value,
|
||||
"mtu": iface.mtu.value | default(none),
|
||||
"vlan_id": vlan_id,
|
||||
"virtual_router_address": iface.virtual_router_address.value,
|
||||
"virtual_router_address": iface.virtual_router_address.value | default(none),
|
||||
"autostate": iface.autostate.value,
|
||||
"ip_addresses": ip_list
|
||||
}) -%}
|
||||
@@ -86,11 +86,11 @@
|
||||
{%- set _ = interfaces.append({
|
||||
"type": "lag",
|
||||
"name": iface.name.value,
|
||||
"description": iface.description.value,
|
||||
"description": iface.description.value | default(none),
|
||||
"enabled": iface.enabled.value,
|
||||
"mtu": iface.mtu.value,
|
||||
"lacp_mode": iface.lacp_mode.value,
|
||||
"mlag_id": iface.mlag_id.value,
|
||||
"mtu": iface.mtu.value | default(none),
|
||||
"lacp_mode": iface.lacp_mode.value | default(none),
|
||||
"mlag_id": iface.mlag_id.value | default(none),
|
||||
"members": member_list,
|
||||
"ip_addresses": ip_list
|
||||
}) -%}
|
||||
|
||||
Reference in New Issue
Block a user