Skip to content

Merge develop into infrahub-develop#1023

Merged
ogenstad merged 14 commits into
infrahub-developfrom
develop
May 15, 2026
Merged

Merge develop into infrahub-develop#1023
ogenstad merged 14 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 14, 2026

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


Summary by cubic

Fixes infrahubctl schema error rendering and patches vulnerable docs dependencies. Errors from schema extensions: now print as clear one-line messages instead of crashing; requests and ujson are bumped for security.

  • Bug Fixes

    • Render extensions: validation errors in infrahubctl schema load; no more ValueError crash.
    • Add integration tests for the error renderer and tighten path validation.
    • Update Python SDK docs links to new locations.
  • Dependencies

    • Add overrides in docs to patch vulnerable transitive deps and regenerate package-lock.json (0 vulns after).
    • Raise dev requests floor to >=2.33.0 and bump ujson to 5.12.1.

Written for commit 2de8b09. Summary will update on new commits.

petercrocker and others added 14 commits May 7, 2026 21:15
- Add npm overrides in docs/package.json for 12 vulnerable transitive deps
  (postcss, follow-redirects, lodash, path-to-regexp, serialize-javascript,
  node-forge, picomatch, rollup, markdown-it, ajv, qs, webpack) and
  regenerate docs/package-lock.json against current registry.
- Bump requests dev dependency floor to >=2.33.0 to clear
  GHSA-gc5v-m9x4-r6x2 (Insecure Temp File Reuse in extract_zipped_paths).

Resolves the 27 currently open Dependabot alerts. `npm audit` reports
0 vulnerabilities after the lockfile regeneration.
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
…ests

  Replace patch()-heavy unit tests for display_schema_load_errors with integration
  tests that exercise the real server response → renderer path, so we catch any
  drift between the schema-load endpoint's error shape and CLI handling
  (particularly for extensions paths). Add an optional  Console parameter
  to display_schema_load_errors so tests can capture rendered output via
  dependency injection instead of patching the module-level console. Keep
  valid_error_path covered as a fast parametrized unit test with no patchin
  Replace  on  with a  Literal of
  nodes, generics, relationships so the accepted values are explicit at the
  type level. Matches the set already enforced at runtime by valid_error_path
…notate _render_schema_error parsing branches
* docs: adjust links following doc migration

* docs: further adjust
…le.capture() and hoist SchemaContainer alias
Bumps [ujson](https://github.com/ultrajson/ultrajson) from 5.12.0 to 5.12.1.
- [Release notes](https://github.com/ultrajson/ultrajson/releases)
- [Commits](ultrajson/ultrajson@5.12.0...5.12.1)

---
updated-dependencies:
- dependency-name: ujson
  dependency-version: 5.12.1
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
chore(deps): bump ujson from 5.12.0 to 5.12.1
fix(ctl): handle extensions paths in display_schema_load_errors (#1007)
chore(deps): patch transitive vulns in docs and bump requests dev floor
* chore(deps): patch transitive vulns in docs and bump requests dev floor

- Add npm overrides in docs/package.json for 12 vulnerable transitive deps
  (postcss, follow-redirects, lodash, path-to-regexp, serialize-javascript,
  node-forge, picomatch, rollup, markdown-it, ajv, qs, webpack) and
  regenerate docs/package-lock.json against current registry.
- Bump requests dev dependency floor to >=2.33.0 to clear
  GHSA-gc5v-m9x4-r6x2 (Insecure Temp File Reuse in extract_zipped_paths).

Resolves the 27 currently open Dependabot alerts. `npm audit` reports
0 vulnerabilities after the lockfile regeneration.

* fix(ctl): handle extensions paths in display_schema_load_errors (#1007)

* chore(changelog): add newsfragment for #1007

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

* test(ctl): replace brittle schema-load-error mocks with integration tests

  Replace patch()-heavy unit tests for display_schema_load_errors with integration
  tests that exercise the real server response → renderer path, so we catch any
  drift between the schema-load endpoint's error shape and CLI handling
  (particularly for extensions paths). Add an optional  Console parameter
  to display_schema_load_errors so tests can capture rendered output via
  dependency injection instead of patching the module-level console. Keep
  valid_error_path covered as a fast parametrized unit test with no patchin

* refactor(ctl): type schema get_node container as Literal

  Replace  on  with a  Literal of
  nodes, generics, relationships so the accepted values are explicit at the
  type level. Matches the set already enforced at runtime by valid_error_path

* fix(ctl): default missing msg/type keys in schema error renderer

* fix(ctl): guard out-of-range index in _resolve_attribute_label and annotate _render_schema_error parsing branches

* docs: adjust links following doc migration (#1016)

* docs: adjust links following doc migration

* docs: further adjust

* refactor(ctl): address schema-load review feedback and use rich console.capture() and hoist SchemaContainer alias

* chore(deps): bump ujson from 5.12.0 to 5.12.1

Bumps [ujson](https://github.com/ultrajson/ultrajson) from 5.12.0 to 5.12.1.
- [Release notes](https://github.com/ultrajson/ultrajson/releases)
- [Commits](ultrajson/ultrajson@5.12.0...5.12.1)

---
updated-dependencies:
- dependency-name: ujson
  dependency-version: 5.12.1
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>

---------

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: Pete Crocker <pete@petecrocker.com>
Co-authored-by: Iddo <iddocohen@gmail.com>
Co-authored-by: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
Co-authored-by: Baptiste <32564248+BaptisteGi@users.noreply.github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Patrick Ogenstad <patrick@ogenstad.com>
@infrahub-github-bot-app infrahub-github-bot-app Bot requested a review from a team as a code owner May 14, 2026 14:25
@cloudflare-workers-and-pages
Copy link
Copy Markdown

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

Deploying infrahub-sdk-python with  Cloudflare Pages  Cloudflare Pages

Latest commit: 2de8b09
Status: ✅  Deploy successful!
Preview URL: https://c77c8e49.infrahub-sdk-python.pages.dev
Branch Preview URL: https://develop.infrahub-sdk-python.pages.dev

View logs

@github-actions github-actions Bot added the type/documentation Improvements or additions to documentation label May 14, 2026
@codecov
Copy link
Copy Markdown

codecov Bot commented May 14, 2026

Codecov Report

❌ Patch coverage is 70.49180% with 18 lines in your changes missing coverage. Please review.

Files with missing lines Patch % Lines
infrahub_sdk/ctl/schema.py 70.49% 11 Missing and 7 partials ⚠️
@@                 Coverage Diff                  @@
##           infrahub-develop    #1023      +/-   ##
====================================================
- Coverage             81.56%   81.54%   -0.03%     
====================================================
  Files                   134      134              
  Lines                 11454    11479      +25     
  Branches               1730     1735       +5     
====================================================
+ Hits                   9343     9361      +18     
- Misses                 1565     1570       +5     
- Partials                546      548       +2     
Flag Coverage Δ
integration-tests 41.78% <55.73%> (+0.22%) ⬆️
python-3.10 54.60% <63.93%> (+<0.01%) ⬆️
python-3.11 54.62% <63.93%> (+<0.01%) ⬆️
python-3.12 54.62% <63.93%> (+<0.01%) ⬆️
python-3.13 54.60% <63.93%> (+<0.01%) ⬆️
python-3.14 54.60% <63.93%> (+<0.01%) ⬆️
python-filler-3.12 22.64% <0.00%> (-0.05%) ⬇️

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

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

@ogenstad ogenstad merged commit 333b9ff into infrahub-develop May 15, 2026
33 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.

5 participants