Enhance YAML loading with custom tags support and error handling#88
Merged
Enhance YAML loading with custom tags support and error handling#88
Conversation
There was a problem hiding this comment.
Pull request overview
This PR addresses YAML parsing failures in the Compose Manager UI when Docker Compose custom YAML tags (!override, !reset, !merge) are present, by introducing a shared js-yaml schema + loader and refactoring call sites to use it.
Changes:
- Added
buildComposeYamlSchema()+ cachedloadComposeYaml()wrapper aroundjsyaml.loadwith custom tag support. - Updated YAML parsing call sites (profiles generation, labels parsing, editor validation) to use
loadComposeYaml(). - Added a source-level unit test asserting the custom-tag schema helpers are present in
ComposeManager.php.
Reviewed changes
Copilot reviewed 2 out of 2 changed files in this pull request and generated 2 comments.
| File | Description |
|---|---|
source/compose.manager/include/ComposeManager.php |
Introduces custom js-yaml schema/loader and routes key YAML parses through it. |
tests/unit/ComposeManagerMainSourceTest.php |
Adds a source-level assertion that the custom-tag support is declared. |
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
This pull request enhances Docker Compose YAML parsing in the Compose Manager by adding support for custom YAML tags (
!override,!reset,!merge). It introduces a custom schema forjsyamlto handle these tags robustly and refactors YAML loading throughout the codebase to use this schema. Additionally, a unit test is added to ensure the custom tag support is present in the source.YAML Parsing Improvements:
buildComposeYamlSchemaandloadComposeYamlfunctions to define and use a customjsyamlschema supporting the!override,!reset, and!mergetags for all YAML kinds (scalar, sequence, mapping). (source/compose.manager/include/ComposeManager.php)jsyaml.load) calls in the codebase to use the newloadComposeYamlfunction, ensuring consistent handling of custom tags. (source/compose.manager/include/ComposeManager.php) [1] [2] [3]Testing:
tests/unit/ComposeManagerMainSourceTest.php)Title: Pull request summaryWhat changed
Short summary of changes and rationale.
Related issues
Closes # (if applicable)
Checklist
Testing notes
How to test locally (commands, env vars).
Notes
For issue #81 - [Bug]: Override Tag Causes Yaml Error