eyjhb/headscale
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

restructure command/api to use stable IDs (#2261)

Browse source
This commit is contained in:
Kristoffer Dalby 2024-12-10 16:23:55 +01:00 • committed by GitHub
parent 08bd4b9bc5
commit 64fd1f9483
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
29 changed files with 1902 additions and 3613 deletions
Download patch file Download diff file Expand all files Collapse all files

14
integration/scenario.go
View file

@ -22,6 +22,7 @@ import (
"github.com/samber/lo"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
xmaps "golang.org/x/exp/maps"
"golang.org/x/sync/errgroup"
"tailscale.com/envknob"
)
@ -512,23 +513,26 @@ func (s *Scenario) CreateHeadscaleEnv(
return err
}
for userName, clientCount := range users {
err = s.CreateUser(userName)
usernames := xmaps.Keys(users)
sort.Strings(usernames)
for _, username := range usernames {
clientCount := users[username]
err = s.CreateUser(username)
if err != nil {
return err
}
err = s.CreateTailscaleNodesInUser(userName, "all", clientCount, tsOpts...)
err = s.CreateTailscaleNodesInUser(username, "all", clientCount, tsOpts...)
if err != nil {
return err
}
key, err := s.CreatePreAuthKey(userName, true, false)
key, err := s.CreatePreAuthKey(username, true, false)
if err != nil {
return err
}
err = s.RunTailscaleUp(userName, headscale.GetEndpoint(), key.GetKey())
err = s.RunTailscaleUp(username, headscale.GetEndpoint(), key.GetKey())
if err != nil {
return err
}