From 4799859be058c3f156a6cd179187ebc546d908a4 Mon Sep 17 00:00:00 2001
From: Kristoffer Dalby <kristoffer@tailscale.com>
Date: Mon, 14 Nov 2022 12:07:02 +0100
Subject: [PATCH] Fix renamed method
Signed-off-by: Kristoffer Dalby <kristoffer@tailscale.com>
---
integration/auth_web_flow_test.go | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/integration/auth_web_flow_test.go b/integration/auth_web_flow_test.go
index 55d0fb49..d522d9e2 100644
--- a/integration/auth_web_flow_test.go
+++ b/integration/auth_web_flow_test.go
@@ -82,7 +82,7 @@ func (s *AuthWebFlowScenario) CreateHeadscaleEnv(namespaces map[string]int) erro
return err
}
- err = s.Headscale().WaitForReady()
+ err = s.MustHeadscale().WaitForReady()
if err != nil {
return err
}
@@ -99,7 +99,7 @@ func (s *AuthWebFlowScenario) CreateHeadscaleEnv(namespaces map[string]int) erro
return err
}
- err = s.runTailscaleUp(namespaceName, s.Headscale().GetEndpoint())
+ err = s.runTailscaleUp(namespaceName, s.MustHeadscale().GetEndpoint())
if err != nil {
return err
}
@@ -146,7 +146,7 @@ func (s *AuthWebFlowScenario) runTailscaleUp(
func (s *AuthWebFlowScenario) runHeadscaleRegister(namespaceStr string, loginURL *url.URL) error {
log.Printf("loginURL: %s", loginURL)
- loginURL.Host = fmt.Sprintf("%s:8080", s.Headscale().GetIP())
+ loginURL.Host = fmt.Sprintf("%s:8080", s.MustHeadscale().GetIP())
loginURL.Scheme = "http"
httpClient := &http.Client{}
@@ -178,7 +178,9 @@ func (s *AuthWebFlowScenario) runHeadscaleRegister(namespaceStr string, loginURL
log.Printf("registering node %s", key)
if headscale, ok := s.controlServers["headscale"]; ok {
- _, err = headscale.Execute([]string{"headscale", "-n", namespaceStr, "nodes", "register", "--key", key})
+ _, err = headscale.Execute(
+ []string{"headscale", "-n", namespaceStr, "nodes", "register", "--key", key},
+ )
if err != nil {
log.Printf("failed to register node: %s", err)