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

add 1.80 to capver and update deps (#2394)

Browse source
This commit is contained in:
Kristoffer Dalby 2025-02-05 07:17:51 +01:00 • committed by GitHub
parent 9a7890d56b
commit 8b92c017ec
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
13 changed files with 136 additions and 121 deletions
Download patch file Download diff file Expand all files Collapse all files

8
integration/dockertestutil/network.go
View file

@ -3,6 +3,7 @@ package dockertestutil
import (
"errors"
"net"
"fmt"
"github.com/ory/dockertest/v3"
"github.com/ory/dockertest/v3/docker"
@ -12,7 +13,10 @@ var ErrContainerNotFound = errors.New("container not found")
func GetFirstOrCreateNetwork(pool *dockertest.Pool, name string) (*dockertest.Network, error) {
networks, err := pool.NetworksByName(name)
if err != nil || len(networks) == 0 {
if err != nil {
return nil, fmt.Errorf("looking up network names: %w", err)
}
if len(networks) == 0 {
if _, err := pool.CreateNetwork(name); err == nil {
// Create does not give us an updated version of the resource, so we need to
// get it again.
@ -22,6 +26,8 @@ func GetFirstOrCreateNetwork(pool *dockertest.Pool, name string) (*dockertest.Ne
}
return &networks[0], nil
} else {
return nil, fmt.Errorf("creating network: %w", err)
}
}