Merge 'develop' into 'infrahub-develop' with resolved conflicts#1073
Merged
ogenstad merged 4 commits intoJun 10, 2026
Conversation
) Bumps [infrahub-testcontainers](https://github.com/opsmill/infrahub) from 1.9.6 to 1.9.7. - [Release notes](https://github.com/opsmill/infrahub/releases) - [Changelog](https://github.com/opsmill/infrahub/blob/stable/CHANGELOG.md) - [Commits](opsmill/infrahub@infrahub-v1.9.6...infrahub-v1.9.7) --- updated-dependencies: - dependency-name: infrahub-testcontainers dependency-version: 1.9.7 dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Merge stable into develop
#1067) * IHS-183: Fix typing errors for protocols * fix ty * fix failing tests * address comments * use CoreNodeBase in get_schema_name * remove breakpoint * add test for store get_schema_name * update test * Make RelatedNode/RelationshipManager generic over peer type (#1063) Parameterise RelatedNode, RelatedNodeSync, RelationshipManager and RelationshipManagerSync over the peer type (defaulting to InfrahubNode/ InfrahubNodeSync for backward compatibility) and have infrahubctl protocols emit the peer type for each relationship. Relationship traversal via .peer/ .peers/indexing now preserves the peer type instead of collapsing to the dynamic InfrahubNode. Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com> * Type cardinality-one relationships as an assignable descriptor (#1064) Generated cardinality-one relationships now use a RelationshipAttribute descriptor that reads back as RelatedNode[Peer] but accepts assignment of an id string, an HFID, a peer node, or None — matching the runtime __setattr__ that wraps the value in a RelatedNode. Previously relationships were typed read-only as RelatedNode, so node.rel = "<id>" / node.rel = peer failed type checking. Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com> * chore: regenerate SDK docs for generic RelatedNode peer types The develop merge combined upstream peer/get docstrings with our generic PeerT/PeerTSync return types, leaving the committed related_node.mdx stale. Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com> * docs: note protocols must be regenerated in changelog fragment Highlight in the 1064 newsfragment that the new relationship-assignment typing lives in generated protocols, so existing projects must rerun `infrahubctl protocols` to pick it up — it won't work out of the box. Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com> --------- Co-authored-by: Sola Infrahub User <sola@opsmill.com> Co-authored-by: Aaron McCarty <aaron@opsmill.com> Co-authored-by: Sola Babatunde <solababatunde12@gmail.com> Co-authored-by: Mikhail Yohman <mikhail@opsmill.com> Co-authored-by: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
Deploying infrahub-sdk-python with
|
| Latest commit: |
d37bbc7
|
| Status: | ✅ Deploy successful! |
| Preview URL: | https://f793d74b.infrahub-sdk-python.pages.dev |
| Branch Preview URL: | https://pog-develop-to-infrahub-deve-gdg4.infrahub-sdk-python.pages.dev |
github-actions
Bot
added
the
type/documentation
Codecov Report❌ Patch coverage is
@@ Coverage Diff @@
## infrahub-develop #1073 +/- ##
====================================================
- Coverage 82.26% 81.86% -0.41%
====================================================
Files 135 135
Lines 11956 11701 -255
Branches 1785 1766 -19
====================================================
- Hits 9836 9579 -257
+ Misses 1573 1572 -1
- Partials 547 550 +3
Flags with carried forward coverage won't be shown. Click here to find out more.
... and 3 files with indirect coverage changes 🚀 New features to boost your workflow:
|
![cubic-dev-ai[bot]](https://avatars.githubusercontent.com/in/1082092?s=60&v=4){kind=small}
polmichel
approved these changes
Jun 10, 2026
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Why
Resolve merge conflicts between the two branches
What changed
Summary by cubic
Introduce
RelationshipAttribute/RelationshipAttributeSyncin generated protocols so cardinality‑one relationships are assignable (id, HFID, peer, or None) while reading as a typedRelatedNode, fixing mypy/ty errors. Also updates codegen templates, docs, tests, and bumpsinfrahub-testcontainersto 1.9.7.Bug Fixes
RelatedNode[Peer]on read and allows safe assignment.Migration
infrahubctl protocols.Written for commit d37bbc7. Summary will update on new commits.