kos updates - #176
Open
bsandu-peridio wants to merge 6 commits into
Open
Conversation
There was a problem hiding this comment.
Pull request overview
This PR aligns extension config resolution between runtime/remote and standalone/local execution paths by applying the same override-dispatch logic (target-<name>: and legacy bare <name>:) when reading composed extension config values.
Changes:
- Use
Config::resolve_overrides_in_valuewhen loading remote/composed extension config forext build. - Use
Config::resolve_overrides_in_valuewhen loading remote/composed extension config forext image. - Add explanatory comments describing why this override resolution is needed in the runtime-build path.
Reviewed changes
Copilot reviewed 2 out of 2 changed files in this pull request and generated 3 comments.
| File | Description |
|---|---|
| src/commands/ext/image.rs | Applies override-resolution to composed extension config in the remote/runtime path so target-<name>: overlays are honored consistently. |
| src/commands/ext/build.rs | Applies override-resolution to composed extension config in the remote/runtime path so target-<name>: overlays are honored consistently. |
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
Comment on lines
+370
to
+375
| // Resolve target-<name>: / kernel-<spec>: / legacy bare <name>: | ||
| // overrides from the composed extension value so the preferred | ||
| // `target-<name>:` form is honored in the runtime-build path too | ||
| // (previously only the standalone `Local` path resolved it, so a | ||
| // path-sourced ext in `avocado build` got the base config: no | ||
| // per-target overlay). |
Comment on lines
+440
to
+447
| // Resolve target-<name>: / kernel-<spec>: / legacy bare <name>: | ||
| // overrides from the composed extension value (find_ext_in_mapping | ||
| // returns it raw). Using resolve_overrides_in_value here — rather | ||
| // than only checking a bare `<target>:` key — means the preferred | ||
| // `target-<name>:` form is honored in the runtime-build path too | ||
| // (previously only the standalone `Local` path resolved it, so a | ||
| // path-sourced ext in `avocado build` got the base config: no | ||
| // per-target overlay and the base `--tag`). |
Comment on lines
+376
to
+380
| ext_section.map(|ext_val| { | ||
| config.resolve_overrides_in_value( | ||
| ext_val.clone(), | ||
| &target, | ||
| None, |
bsandu-peridio
force-pushed
the
beni/dev
branch
2 times, most recently
from
July 14, 2026 09:15
2e569f9 to
b3b971d
Compare
bsandu-peridio
changed the title
Signed-off-by: Beniamin Sandu <b.sandu@peridio.com>
Signed-off-by: Beniamin Sandu <b.sandu@peridio.com>
Signed-off-by: Beniamin Sandu <b.sandu@peridio.com>
Signed-off-by: Beniamin Sandu <b.sandu@peridio.com>
Signed-off-by: Beniamin Sandu <b.sandu@peridio.com>
bsandu-peridio
changed the title
There was a problem hiding this comment.
Pull request overview
Copilot reviewed 5 out of 5 changed files in this pull request and generated no new comments.
Suppressed comments (1)
src/utils/config.rs:3182
kernel-<spec>:override blocks are merged without first runningresolve_overrides_in_valueon the block itself. That means any nested override keys inside a matching kernel block (e.g., nestedtarget-<name>:or anotherkernel-<spec>:) will leak through into the merged result as literal keys, despite this function’s contract that recognized override sub-keys are stripped. Recursing on each matched kernel block before merging keeps behavior consistent with the newly-added recursion fortarget-<name>:blocks and prevents key leakage.
for v in kernel_matches {
merged = self.merge_values(merged, v);
}
Signed-off-by: Beniamin Sandu <b.sandu@peridio.com>
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.
No description provided.