Skip to content

Merge stable into develop#1173

Merged
polmichel merged 5 commits into
developfrom
stable
Jul 13, 2026
Merged

Merge stable into develop#1173
polmichel merged 5 commits into
developfrom
stable

Conversation

@infrahub-github-bot-app

@infrahub-github-bot-app infrahub-github-bot-app Bot commented Jul 13, 2026

Copy link
Copy Markdown
Contributor

Merging stable into develop after merging pull request #1169.


Summary by cubic

Aligns InfrahubClientSync with InfrahubClient and fixes small SDK inconsistencies. Sync branch.merge enforces a 120s minimum timeout, and upsert creates now omit hfid to avoid server overhead.

  • Bug Fixes
    • branch.merge (sync): applies a 120s timeout floor via max(120, default_timeout).
    • Node upsert: create(allow_upsert=True) omits hfid in mutation payload (async and sync).
    • Artifact fetch: async path now uses the correct "fetch not supported" message; resource pool error text fixed.
    • Docs: client.filters return type corrected to list[InfrahubNode] and SDK reference updated.

Written for commit 8c41010. Summary will update on new commits.

Review in cubic

dgarros and others added 5 commits July 12, 2026 19:56
The hand-maintained async/sync client twins had silently diverged. Fix the
behavioral and annotation drift and lock the two behavioral fixes with tests:

- branch: sync merge now applies the 120s minimum timeout floor like async
- node: sync create(allow_upsert=True) excludes the hfid to avoid upsert overhead
- node: async artifact fetch uses the FETCH (not GENERATE) unsupported message
- node: fix sync resource-pool error text typo ("Allocate" -> "Allocated")
- client: fix async filters docstring return type (InfrahubNode, not the Sync)
- schema/node: converge private-helper annotations that drifted between twins

Add regression tests covering the upsert-hfid exclusion and the merge timeout
floor for both the async and sync clients.

Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
Regenerated docs/docs/python-sdk/sdk_ref/infrahub_sdk/client.mdx to match
the corrected InfrahubClient.filters docstring (list[InfrahubNode] instead
of list[InfrahubNodeSync]) from the async/sync twin drift fix.

Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
Co-authored-by: cubic-dev-ai[bot] <191113872+cubic-dev-ai[bot]@users.noreply.github.com>
fix: correct drifted async/sync twins and add parity regression tests
@infrahub-github-bot-app infrahub-github-bot-app Bot requested a review from a team as a code owner July 13, 2026 07:22
@github-actions github-actions Bot added the type/documentation Improvements or additions to documentation label Jul 13, 2026
@cloudflare-workers-and-pages

Copy link
Copy Markdown

Deploying infrahub-sdk-python with  Cloudflare Pages  Cloudflare Pages

Latest commit: 8c41010
Status: ✅  Deploy successful!
Preview URL: https://2a25ec73.infrahub-sdk-python.pages.dev

View logs

@codecov

codecov Bot commented Jul 13, 2026

Copy link
Copy Markdown

Codecov Report

❌ Patch coverage is 85.71429% with 1 line in your changes missing coverage. Please review.

Files with missing lines Patch % Lines
infrahub_sdk/node/node.py 83.33% 1 Missing ⚠️
@@             Coverage Diff             @@
##           develop    #1173      +/-   ##
===========================================
+ Coverage    82.49%   82.88%   +0.38%     
===========================================
  Files          139      139              
  Lines        12210    13074     +864     
  Branches      1823     2069     +246     
===========================================
+ Hits         10073    10836     +763     
- Misses        1576     1627      +51     
- Partials       561      611      +50     
Flag Coverage Δ
integration-tests 41.12% <14.28%> (+0.39%) ⬆️
python-3.10 56.98% <42.85%> (+0.99%) ⬆️
python-3.11 56.96% <42.85%> (+0.96%) ⬆️
python-3.12 56.98% <42.85%> (+0.98%) ⬆️
python-3.13 56.98% <42.85%> (+0.98%) ⬆️
python-3.14 56.98% <42.85%> (+0.98%) ⬆️
python-filler-3.12 23.09% <42.85%> (+0.58%) ⬆️

Flags with carried forward coverage won't be shown. Click here to find out more.

Files with missing lines Coverage Δ
infrahub_sdk/branch.py 74.30% <100.00%> (+5.55%) ⬆️
infrahub_sdk/client.py 79.79% <ø> (+3.25%) ⬆️
infrahub_sdk/schema/__init__.py 73.56% <ø> (ø)
infrahub_sdk/node/node.py 87.38% <83.33%> (-0.19%) ⬇️

... and 4 files with indirect coverage changes

🚀 New features to boost your workflow:
  • ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.

@polmichel polmichel merged commit bfedde9 into develop Jul 13, 2026
37 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

type/documentation Improvements or additions to documentation

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants