Skip to content

Commit a61ccc3

Browse files
committed
scenario: create users in alphabetical order
Signed-off-by: Kristoffer Dalby <[email protected]>
1 parent 0be4c85 commit a61ccc3

File tree

1 file changed

+9
-5
lines changed

1 file changed

+9
-5
lines changed

integration/scenario.go

+9-5
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ import (
2222
"github.com/samber/lo"
2323
"github.com/stretchr/testify/assert"
2424
"github.com/stretchr/testify/require"
25+
xmaps "golang.org/x/exp/maps"
2526
"golang.org/x/sync/errgroup"
2627
"tailscale.com/envknob"
2728
)
@@ -512,23 +513,26 @@ func (s *Scenario) CreateHeadscaleEnv(
512513
return err
513514
}
514515

515-
for userName, clientCount := range users {
516-
err = s.CreateUser(userName)
516+
usernames := xmaps.Keys(users)
517+
sort.Strings(usernames)
518+
for _, username := range usernames {
519+
clientCount := users[username]
520+
err = s.CreateUser(username)
517521
if err != nil {
518522
return err
519523
}
520524

521-
err = s.CreateTailscaleNodesInUser(userName, "all", clientCount, tsOpts...)
525+
err = s.CreateTailscaleNodesInUser(username, "all", clientCount, tsOpts...)
522526
if err != nil {
523527
return err
524528
}
525529

526-
key, err := s.CreatePreAuthKey(userName, true, false)
530+
key, err := s.CreatePreAuthKey(username, true, false)
527531
if err != nil {
528532
return err
529533
}
530534

531-
err = s.RunTailscaleUp(userName, headscale.GetEndpoint(), key.GetKey())
535+
err = s.RunTailscaleUp(username, headscale.GetEndpoint(), key.GetKey())
532536
if err != nil {
533537
return err
534538
}

0 commit comments

Comments
 (0)