Merge pull request #204 from opsmill/develop

Pre Release

Author: BeArchiTek

docs/_templates/readme.mdx.j2

@@ -30,21 +30,21 @@ These are the plugins in the `opsmill.infrahub` collection:
 
 <!-- vale off -->
 {% for plugin in plugins.modules %}
-* [{{ plugin.name }}](./references/plugins/{{ plugin.name }}_module){% if plugin.documentation.get('short_description') %} – {{ plugin.documentation.get('short_description') }}{% endif %}
+* [{{ plugin.name }}](./references/plugins/{{ plugin.name }}_module.mdx){% if plugin.documentation.get('short_description') %} – {{ plugin.documentation.get('short_description') }}{% endif %}
 {%- endfor %}
 
 <!-- vale on -->
 
 #### Inventory
 
-{% for plugin in plugins.inventory %}* [{{ plugin.name }}](./references/plugins/{{ plugin.name }}_inventory){% if plugin.documentation.get('short_description') %} – {{ plugin.documentation.get('short_description') }}{% endif %}{% endfor %}
+{% for plugin in plugins.inventory %}* [{{ plugin.name }}](./references/plugins/{{ plugin.name }}_inventory.mdx){% if plugin.documentation.get('short_description') %} – {{ plugin.documentation.get('short_description') }}{% endif %}{% endfor %}
 
 #### Lookup
 
-{% for plugin in plugins.lookup %}* [{{ plugin.name }}](./references/plugins/{{ plugin.name }}_lookup){% if plugin.documentation.get('short_description') %} – {{ plugin.documentation.get('short_description') }}{% endif %}{% endfor %}
+{% for plugin in plugins.lookup %}* [{{ plugin.name }}](./references/plugins/{{ plugin.name }}_lookup.mdx){% if plugin.documentation.get('short_description') %} – {{ plugin.documentation.get('short_description') }}{% endif %}{% endfor %}
 
 ### Roles
 
 These are the roles in the `opsmill.infrahub` collection:
 
-{% for role in roles %}* [{{ role.name }}](./references/roles/{{ role.name }}){% if role.description %} – {{ role.description }}{% endif %}{% endfor %}
+{% for role in roles %}* [{{ role.name }}](./references/roles/{{ role.name }}.mdx){% if role.description %} – {{ role.description }}{% endif %}{% endfor %}

plugins/module_utils/infrahub_utils.py

@@ -22,7 +22,6 @@
         InfrahubNodeSync,
         RelatedNodeSync,
         RelationshipManagerSync,
-        generate_relationship_property,
     )
     from infrahub_sdk.schema import (
         GenericSchemaAPI,
@@ -1092,29 +1091,35 @@ def _update_object(self, data: dict) -> tuple[InfrahubNodeSync, dict]:
             # https://github.com/opsmill/infrahub-sdk-python/issues/272
             for attr_name in data:
                 if attr_name in tmp_obj._schema.attribute_names:
-                    attr_schema = next(attr for attr in tmp_obj._schema.attributes if attr.name == attr_name)
+                    attr_schema = next(attr for attr in self.infrahub_node._schema.attributes if attr.name == attr_name)
                     attr_data = data.get(attr_name)
                     new_attr = Attribute(name=attr_name, schema=attr_schema, data=attr_data)
                     setattr(tmp_obj, attr_name, new_attr)
                 elif attr_name in tmp_obj._schema.relationship_names:
-                    rel_schema = next(rel for rel in self._schema.relationships if rel.name == attr_name)
+                    rel_schema = next(rel for rel in self.infrahub_node._schema.relationships if rel.name == attr_name)
                     rel_data = data.get(attr_name)
                     if rel_schema.cardinality == RelationshipCardinality.ONE:
                         setattr(tmp_obj, f"_{attr_name}", None)
                         setattr(
                             tmp_obj,
                             attr_name,
-                            generate_relationship_property(name=attr_name, node=tmp_obj),
+                            RelatedNodeSync(
+                                name=attr_name,
+                                client=self.infrahub_node._client,
+                                branch=self.infrahub_node._branch,
+                                schema=rel_schema,
+                                data=rel_data,
+                            ),
                         )
                     elif rel_schema.cardinality == RelationshipCardinality.MANY:
                         setattr(
                             tmp_obj,
                             attr_name,
                             RelationshipManagerSync(
                                 name=attr_name,
-                                client=tmp_obj._client,
+                                client=self.infrahub_node._client,
                                 node=tmp_obj,
-                                branch=tmp_obj._branch,
+                                branch=self.infrahub_node._branch,
                                 schema=rel_schema,
                                 data=rel_data,
                             ),