From 53b4bb220dd0cafc7f77cf1b3f41b57c8489881a Mon Sep 17 00:00:00 2001
From: Kristoffer Dalby <kristoffer@tailscale.com>
Date: Sun, 23 Oct 2022 11:55:37 +0200
Subject: [PATCH] Fixup after ts interface

Signed-off-by: Kristoffer Dalby <kristoffer@tailscale.com>
---
 integration/general_test.go | 6 +++---
 integration/tailscale.go    | 1 +
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/integration/general_test.go b/integration/general_test.go
index 026a0691..501be87f 100644
--- a/integration/general_test.go
+++ b/integration/general_test.go
@@ -94,7 +94,7 @@ func TestPingAllByHostname(t *testing.T) {
 		t.Errorf("failed to create headscale environment: %s", err)
 	}
 
-	var allClients []*tsic.TailscaleInContainer
+	var allClients []TailscaleClient
 	var allHostnames []string
 
 	for namespace := range spec {
@@ -114,7 +114,7 @@ func TestPingAllByHostname(t *testing.T) {
 	for _, client := range allClients {
 		fqdn, err := client.FQDN()
 		if err != nil {
-			t.Errorf("failed to get fqdn of client %s: %s", client.Hostname, err)
+			t.Errorf("failed to get fqdn of client %s: %s", client.Hostname(), err)
 		}
 
 		allHostnames = append(allHostnames, fqdn)
@@ -126,7 +126,7 @@ func TestPingAllByHostname(t *testing.T) {
 		for _, hostname := range allHostnames {
 			err := client.Ping(hostname)
 			if err != nil {
-				t.Errorf("failed to ping %s from %s: %s", hostname, client.Hostname, err)
+				t.Errorf("failed to ping %s from %s: %s", hostname, client.Hostname(), err)
 			} else {
 				success++
 			}
diff --git a/integration/tailscale.go b/integration/tailscale.go
index 4d21798f..2d3ec72a 100644
--- a/integration/tailscale.go
+++ b/integration/tailscale.go
@@ -12,6 +12,7 @@ type TailscaleClient interface {
 	Version() string
 	Up(loginServer, authKey string) error
 	IPs() ([]netip.Addr, error)
+	FQDN() (string, error)
 	Status() (*ipnstate.Status, error)
 	WaitForPeers(expected int) error
 	Ping(hostnameOrIP string) error