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

Fix renamed method

Browse source 
Signed-off-by: Kristoffer Dalby <kristoffer@tailscale.com>
This commit is contained in:
Kristoffer Dalby 2022-11-14 12:07:02 +01:00 committed by Juan Font
parent 8e44596171
commit 4799859be0
1 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
integration/auth_web_flow_test.go
View file

@ -82,7 +82,7 @@ func (s *AuthWebFlowScenario) CreateHeadscaleEnv(namespaces map[string]int) erro
return err return err
} }
err = s.Headscale().WaitForReady() err = s.MustHeadscale().WaitForReady()
if err != nil { if err != nil {
return err return err
} }
@ -99,7 +99,7 @@ func (s *AuthWebFlowScenario) CreateHeadscaleEnv(namespaces map[string]int) erro
return err return err
} }
err = s.runTailscaleUp(namespaceName, s.Headscale().GetEndpoint()) err = s.runTailscaleUp(namespaceName, s.MustHeadscale().GetEndpoint())
if err != nil { if err != nil {
return err return err
} }
@ -146,7 +146,7 @@ func (s *AuthWebFlowScenario) runTailscaleUp(
func (s *AuthWebFlowScenario) runHeadscaleRegister(namespaceStr string, loginURL *url.URL) error { func (s *AuthWebFlowScenario) runHeadscaleRegister(namespaceStr string, loginURL *url.URL) error {
log.Printf("loginURL: %s", loginURL) 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" loginURL.Scheme = "http"
httpClient := &http.Client{} httpClient := &http.Client{}
@ -178,7 +178,9 @@ func (s *AuthWebFlowScenario) runHeadscaleRegister(namespaceStr string, loginURL
log.Printf("registering node %s", key) log.Printf("registering node %s", key)
if headscale, ok := s.controlServers["headscale"]; ok { 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 { if err != nil {
log.Printf("failed to register node: %s", err) log.Printf("failed to register node: %s", err)