Skip to content

Merge develop into infrahub-develop#1043

Open
infrahub-github-bot-app[bot] wants to merge 6 commits into
infrahub-developfrom
develop
Open

Merge develop into infrahub-develop#1043
infrahub-github-bot-app[bot] wants to merge 6 commits into
infrahub-developfrom
develop

Conversation

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

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

Merging develop into infrahub-develop after merging pull request #1039.


Summary by cubic

Prepare infrahub-sdk v1.20.1: adds idempotent file operations, aligns branch status with the server, changes branch.create() default (sync_with_git=False), refreshes CLI docs, and bumps click and typer.

  • New Features

    • Idempotent file ops for file objects: compare local checksum, upload only if changed, and skip downloads when unchanged.
    • Default sync_with_git in branch.create() is now False to match the UI.
  • Bug Fixes

    • Added MERGING to BranchStatus to prevent client validation errors when a branch is mid-merge.
    • Improved error rendering in infrahubctl schema load for rejections in extensions: blocks.
    • Skip mandatory field validation during object load when object_profile is provided.

Written for commit 3de7861. Summary will update on new commits. Review in cubic

dependabot Bot and others added 6 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>
* Prepare for version 1.20.1

* fix version
* IHS-136: Update click version

* update docs
Merge stable into develop
@infrahub-github-bot-app infrahub-github-bot-app Bot requested a review from a team as a code owner May 25, 2026 08:39
@cloudflare-workers-and-pages
Copy link
Copy Markdown

Deploying infrahub-sdk-python with  Cloudflare Pages  Cloudflare Pages

Latest commit: 3de7861
Status: ✅  Deploy successful!
Preview URL: https://58646c03.infrahub-sdk-python.pages.dev
Branch Preview URL: https://develop.infrahub-sdk-python.pages.dev

View logs

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.

3 participants