Retreive hostnames from headscale, now that they are random

This commit is contained in:
Kristoffer Dalby 2022-05-17 22:11:51 +02:00
parent e631c6f7e0
commit 9ebeb3d7e4
2 changed files with 40 additions and 3 deletions

View File

@ -5,10 +5,12 @@ package headscale
import (
"bytes"
"encoding/json"
"fmt"
"strings"
"time"
v1 "github.com/juanfont/headscale/gen/go/headscale/v1"
"github.com/ory/dockertest/v3"
"github.com/ory/dockertest/v3/docker"
"inet.af/netaddr"
@ -212,3 +214,37 @@ func getIPs(
return ips, nil
}
func getDNSNames(
headscale *dockertest.Resource,
) ([]string, error) {
listAllResult, err := ExecuteCommand(
headscale,
[]string{
"headscale",
"nodes",
"list",
"--output",
"json",
},
[]string{},
)
if err != nil {
return nil, err
}
var listAll []v1.Machine
err = json.Unmarshal([]byte(listAllResult), &listAll)
if err != nil {
return nil, err
}
hostnames := make([]string, len(listAll))
for index := range listAll {
hostnames[index] = listAll[index].GetGivenName()
}
return hostnames, nil
}

View File

@ -353,11 +353,12 @@ func (s *IntegrationDERPTestSuite) saveLog(
}
func (s *IntegrationDERPTestSuite) TestPingAllPeersByHostname() {
ips, err := getIPs(s.tailscales)
hostnames, err := getDNSNames(&s.headscale)
assert.Nil(s.T(), err)
for hostname, tailscale := range s.tailscales {
for peername := range ips {
if peername == hostname {
for _, peername := range hostnames {
if strings.Contains(peername, hostname) {
continue
}
s.T().Run(fmt.Sprintf("%s-%s", hostname, peername), func(t *testing.T) {