Skip to content

Merge stable into develop#1039

Open
infrahub-github-bot-app[bot] wants to merge 3 commits into
developfrom
stable
Open

Merge stable into develop#1039
infrahub-github-bot-app[bot] wants to merge 3 commits into
developfrom
stable

Conversation

@infrahub-github-bot-app
Copy link
Copy Markdown
Contributor

@infrahub-github-bot-app infrahub-github-bot-app Bot commented May 20, 2026

Merging stable into develop after merging pull request #1036.


Summary by cubic

Merge stable into develop for 1.20.1: adds SHA-1 idempotent file ops for file objects, fixes object_profile validation and schema load messaging, adds the MERGING branch status, and bumps infrahub-testcontainers to 1.9.5.

Written for commit 98bb218. Summary will update on new commits. Review in cubic

dependabot Bot and others added 2 commits May 18, 2026 10:17
)

Bumps [infrahub-testcontainers](https://github.com/opsmill/infrahub) from 1.9.3 to 1.9.5.
- [Release notes](https://github.com/opsmill/infrahub/releases)
- [Changelog](https://github.com/opsmill/infrahub/blob/stable/CHANGELOG.md)
- [Commits](opsmill/infrahub@infrahub-v1.9.3...infrahub-v1.9.5)

---
updated-dependencies:
- dependency-name: infrahub-testcontainers
  dependency-version: 1.9.5
  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>
* fix(branch): add MERGING to BranchStatus enum to match server (#9293)

The server-side BranchStatus enum gained MERGING in Infrahub 1.9.3 (PR
opsmill/infrahub#9116) but the SDK enum was not updated. Any branch
returned with status="MERGING" — including a branch stranded in that
state by a task worker dying mid-merge — caused client.branch.all() to
raise ValidationError, which crashloops the task worker on every
sync_remote_repositories run.

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>

* fix(tests): use model_validate so ty accepts the parametrized status string

ty rejects passing str where BranchStatus is annotated; switch to
BranchData.model_validate({...}) which mirrors how the SDK actually
parses server JSON in branch.py.

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>

* review(branch): address PR feedback — drop test, rename changelog, shorten note

- Drop test_branch_data_accepts_all_server_statuses: per review, the
  enum-coverage test belongs in the infrahub community repo where it
  can iterate over the actual server-side BranchStatus enum instead of
  a hardcoded list of strings. It will be added there as part of the
  PR that bumps the SDK commit pin.
- Rename changelog +branchstatus-merging.fixed.md → 1037.fixed.md to
  link it to the newly-filed SDK-side issue #1037 (migrated from
  opsmill/infrahub#9293).
- Shorten changelog note per review.

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>

* chore(changelog): shorten 1037.fixed.md per review

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>

---------

Co-authored-by: Phillip Simonds <phillip@opsmill.com>
Co-authored-by: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
@cloudflare-workers-and-pages
Copy link
Copy Markdown

cloudflare-workers-and-pages Bot commented May 20, 2026

Deploying infrahub-sdk-python with  Cloudflare Pages  Cloudflare Pages

Latest commit: 98bb218
Status: ✅  Deploy successful!
Preview URL: https://911618f8.infrahub-sdk-python.pages.dev

View logs

Copy link
Copy Markdown

@cubic-dev-ai cubic-dev-ai Bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No issues found across 3 files

Re-trigger cubic

* Prepare for version 1.20.1

* fix version
@codecov
Copy link
Copy Markdown

codecov Bot commented May 20, 2026

Codecov Report

✅ All modified and coverable lines are covered by tests.

@@           Coverage Diff            @@
##           develop    #1039   +/-   ##
========================================
  Coverage    81.54%   81.54%           
========================================
  Files          134      134           
  Lines        11467    11468    +1     
  Branches      1735     1735           
========================================
+ Hits          9351     9352    +1     
  Misses        1569     1569           
  Partials       547      547           
Flag Coverage Δ
integration-tests 41.71% <0.00%> (-0.01%) ⬇️
python-3.10 54.58% <0.00%> (-0.01%) ⬇️
python-3.11 54.58% <0.00%> (+0.01%) ⬆️
python-3.12 54.58% <0.00%> (+0.01%) ⬆️
python-3.13 54.58% <0.00%> (-0.01%) ⬇️
python-3.14 54.58% <0.00%> (-0.01%) ⬇️
python-filler-3.12 22.67% <100.00%> (+<0.01%) ⬆️

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

Files with missing lines Coverage Δ
infrahub_sdk/branch.py 68.75% <100.00%> (+0.21%) ⬆️
🚀 New features to boost your workflow:
  • ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants