Skip to content

fix: Harden configuration parsing for nested settings (1.2) - #317

Merged
skazantsev merged 1 commit into
1.2from
fix/1.2-config-nested-settings
Oct 23, 2026
Merged

skazantsev merged 1 commit into
1.2from
fix/1.2-config-nested-settings

Conversation

@skazantsev

@skazantsev skazantsev commented Oct 23, 2026 •

Copy link
Copy Markdown
Contributor

Description of Changes

Backport an upstream VS Code fix that hardens how nested objects in configuration files are parsed. Adds a common quilt patch to all targets and registers it in patches/backported-patches.json.

Remove the patch when Code-OSS is updated to >= 1.136.2.

Testing

  • prepare-src.sh applies cleanly on all 4 targets.
  • Upstream configurationModels.test.ts passes on the patched source (92 passing); the new upstream tests fail without the patch.
  • security-scan.sh scan-github-advisories no longer reports the advisory.
  • CI: Build Code Editor Targets passed for sagemaker. SageMaker app starts (InService); smoke E2E is blocked by sagemaker-smoke-testing-entry.diff failing to apply, same as on 1.2.3.

Backporting

Follow-up PRs for main, 1.1 and 1.0.


By submitting this pull request, I confirm that you can use, modify, copy, and redistribute this contribution, under the terms of your choice.

@skazantsev
skazantsev added this pull request to the merge queue Oct 23, 2026
Merged via the queue into 1.2 with commit 92dfd93 Oct 23, 2026
10 of 13 checks passed
@skazantsev
skazantsev deleted the fix/1.2-config-nested-settings branch October 23, 2026 14:41

This branch had an error being deployed

1 failed deployment
sagemaker-e2e-tests-workflow-env — 6cf5f1dd Deployed Oct 23, 2026 by skazantsev via Run Smoke Tests for SageMaker #101
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