Skip to content

Commit 7341f22

Browse files
committed
scenario: create users in alphabetical order
Signed-off-by: Kristoffer Dalby <[email protected]>
1 parent 7aea7ac commit 7341f22

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
)
@@ -502,23 +503,26 @@ func (s *Scenario) CreateHeadscaleEnv(
502503
return err
503504
}
504505

505-
for userName, clientCount := range users {
506-
err = s.CreateUser(userName)
506+
usernames := xmaps.Keys(users)
507+
sort.Strings(usernames)
508+
for _, username := range usernames {
509+
clientCount := users[username]
510+
err = s.CreateUser(username)
507511
if err != nil {
508512
return err
509513
}
510514

511-
err = s.CreateTailscaleNodesInUser(userName, "all", clientCount, tsOpts...)
515+
err = s.CreateTailscaleNodesInUser(username, "all", clientCount, tsOpts...)
512516
if err != nil {
513517
return err
514518
}
515519

516-
key, err := s.CreatePreAuthKey(userName, true, false)
520+
key, err := s.CreatePreAuthKey(username, true, false)
517521
if err != nil {
518522
return err
519523
}
520524

521-
err = s.RunTailscaleUp(userName, headscale.GetEndpoint(), key.GetKey())
525+
err = s.RunTailscaleUp(username, headscale.GetEndpoint(), key.GetKey())
522526
if err != nil {
523527
return err
524528
}

0 commit comments

Comments
 (0)