Skip to content

fix: deterministic ordering of required var prompts #2871

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

Open
caproven wants to merge 1 commit into
base: main
Choose a base branch
from
+7 −5
Open

fix: deterministic ordering of required var prompts #2871

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
12 changes: 7 additions & 5 deletions requires.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@ package task
import (
"slices"

"github.com/elliotchance/orderedmap/v3"

"github.com/go-task/task/v3/errors"
"github.com/go-task/task/v3/internal/input"
"github.com/go-task/task/v3/internal/term"
Expand Down Expand Up @@ -32,7 +34,7 @@ func (e *Executor) promptDepsVars(calls []*Call) error {

// Collect all missing vars from the dependency tree
visited := make(map[string]bool)
varsMap := make(map[string]*ast.VarsWithValidation)
varsMap := orderedmap.NewOrderedMap[string, *ast.VarsWithValidation]()

var collect func(call *Call) error
collect = func(call *Call) error {
Expand All @@ -42,8 +44,8 @@ func (e *Executor) promptDepsVars(calls []*Call) error {
}

for _, v := range getMissingRequiredVars(compiledTask) {
if _, exists := varsMap[v.Name]; !exists {
varsMap[v.Name] = v
if varsMap.Has(v.Name) {
varsMap.Set(v.Name, v)
}
}

Expand Down Expand Up @@ -73,14 +75,14 @@ func (e *Executor) promptDepsVars(calls []*Call) error {
}
}

if len(varsMap) == 0 {
if varsMap.Len() == 0 {
return nil
}

prompter := e.newPrompter()
e.promptedVars = ast.NewVars()

for _, v := range varsMap {
for v := range varsMap.Values() {
value, err := prompter.Prompt(v.Name, getEnumValues(v.Enum))
if err != nil {
if errors.Is(err, input.ErrCancelled) {
Expand Down