Skip to content

Prevent InfrahubNode from instantiating optional relationships of car… #631

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed

Prevent InfrahubNode from instantiating optional relationships of car… #631

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions changelog/630.fixed.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Prevent InfrahubNode from instantiating optional relationships of cardinality one with None data.
1 change: 0 additions & 1 deletion infrahub_sdk/node/node.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -235,7 +235,6 @@ def _generate_input_data( # noqa: C901
rel: RelatedNodeBase | RelationshipManagerBase = getattr(self, item_name)

if rel_schema.cardinality == RelationshipCardinality.ONE and rel_schema.optional and not rel.initialized:
data[item_name] = None
continue

if rel is None or not rel.initialized:
Expand Down
10 changes: 4 additions & 6 deletions tests/unit/sdk/test_node.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1365,7 +1365,6 @@ async def test_create_input_data(client, location_schema: NodeSchemaAPI, client_
"name": {"value": "JFK1"},
"description": {"value": "JFK Airport"},
"type": {"value": "SITE"},
"primary_tag": None,
}
}

Expand Down Expand Up @@ -1393,7 +1392,6 @@ async def test_create_input_data_with_dropdown(client, location_schema_with_drop
"description": {"value": "JFK Airport"},
"type": {"value": "SITE"},
"status": {"value": None},
"primary_tag": None,
}
}

Expand Down Expand Up @@ -1641,7 +1639,7 @@ async def test_create_input_data_with_IPHost_attribute(client, ipaddress_schema,
ip_address = InfrahubNodeSync(client=client, schema=ipaddress_schema, data=data)

assert ip_address._generate_input_data()["data"] == {
"data": {"address": {"value": "1.1.1.1/24", "is_protected": True}, "interface": None}
"data": {"address": {"value": "1.1.1.1/24", "is_protected": True}}
}


Expand All @@ -1655,7 +1653,7 @@ async def test_create_input_data_with_IPNetwork_attribute(client, ipnetwork_sche
ip_network = InfrahubNodeSync(client=client, schema=ipnetwork_schema, data=data)

assert ip_network._generate_input_data()["data"] == {
"data": {"network": {"value": "1.1.1.0/24", "is_protected": True}, "site": None}
"data": {"network": {"value": "1.1.1.0/24", "is_protected": True}}
}


Expand Down Expand Up @@ -1853,7 +1851,7 @@ async def test_update_input_data_empty_relationship(
"data": {
"id": "llllllll-llll-llll-llll-llllllllllll",
"name": {"value": "DFW"},
"primary_tag": None,
# "primary_tag": None,
"tags": [],
"type": {"value": "SITE"},
},
Expand All @@ -1862,7 +1860,7 @@ async def test_update_input_data_empty_relationship(
"data": {
"id": "llllllll-llll-llll-llll-llllllllllll",
"name": {"is_protected": True, "is_visible": True, "value": "DFW"},
"primary_tag": None,
# "primary_tag": None,
"tags": [],
"type": {"is_protected": True, "is_visible": True, "value": "SITE"},
},
Expand Down
Loading