Skip to content

refactor(options): reuse retrieveSubOptions in refreshSubOptions #1671

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
skevetter merged 1 commit into from
Oct 23, 2026
Merged

refactor(options): reuse retrieveSubOptions in refreshSubOptions #1671

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 4 additions & 24 deletions pkg/options/resolver/resolve.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -347,35 +347,15 @@ func (r *Resolver) refreshSubOptions(
optionName string,
resolvedOptionValues map[string]config.OptionValue,
) error {
option, ok := r.graph.GetNode(optionName)
if !ok {
return nil
}

if !r.resolveSubOptions || option.SubOptionsCommand == "" {
return nil
}

_, ok = resolvedOptionValues[optionName]
if !ok {
return nil
}

// execute the command
newDynamicOptions, err := resolveSubOptions(ctx, option, resolvedOptionValues, r.extraValues)
subOptions, err := r.retrieveSubOptions(ctx, optionName, resolvedOptionValues)
if err != nil {
return err
}

r.pruneChangedChildren(optionName, newDynamicOptions, resolvedOptionValues)
r.dropInvalidUserValues(newDynamicOptions)
setChildren(optionName, newDynamicOptions, resolvedOptionValues)

if err := addOptionsToGraph(r.graph, newDynamicOptions, resolvedOptionValues); err != nil {
return fmt.Errorf("add sub options: %w", err)
if subOptions == nil {
return nil
}

if err := resolveDynamicOptions(ctx, newDynamicOptions, r, resolvedOptionValues); err != nil {
if err := resolveDynamicOptions(ctx, subOptions, r, resolvedOptionValues); err != nil {
return fmt.Errorf("resolve dynamic sub options: %w", err)
}

Expand Down
Loading