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

Make sure all clients of a user are ready (#1335)

Browse source
This commit is contained in:
Juan Font 2023-04-12 09:25:51 +02:00 committed by GitHub
parent d0b3b1bfc4
commit 9836b097a4
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 36 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
integration/auth_oidc_test.go
View file

@ -362,6 +362,15 @@ func (s *AuthOIDCScenario) runTailscaleUp(
user.joinWaitGroup.Wait() user.joinWaitGroup.Wait()
for _, client := range user.Clients {
err := client.WaitForReady()
if err != nil {
log.Printf("client %s was not ready: %s", client.Hostname(), err)
return fmt.Errorf("failed to up tailscale node: %w", err)
}
}
return nil return nil
} }

9
integration/auth_web_flow_test.go
View file

@ -274,6 +274,15 @@ func (s *AuthWebFlowScenario) runTailscaleUp(
} }
user.joinWaitGroup.Wait() user.joinWaitGroup.Wait()
for _, client := range user.Clients {
err := client.WaitForReady()
if err != nil {
log.Printf("client %s was not ready: %s", client.Hostname(), err)
return fmt.Errorf("failed to up tailscale node: %w", err)
}
}
return nil return nil
} }

9
integration/scenario.go
View file

@ -356,6 +356,15 @@ func (s *Scenario) RunTailscaleUp(
user.joinWaitGroup.Wait() user.joinWaitGroup.Wait()
for _, client := range user.Clients {
err := client.WaitForReady()
if err != nil {
log.Printf("client %s was not ready: %s", client.Hostname(), err)
return fmt.Errorf("failed to up tailscale node: %w", err)
}
}
return nil return nil
} }

9
integration/tsic/tsic.go
View file

@ -430,6 +430,15 @@ func (t *TailscaleInContainer) WaitForReady() error {
return nil return nil
} }
// ipnstate.Status.CurrentTailnet was added in Tailscale 1.22.0
// https://github.com/tailscale/tailscale/pull/3865
//
// Before that, we can check the BackendState to see if the
// tailscaled daemon is connected to the control system.
if status.BackendState == "Running" {
return nil
}
return errTailscaleNotConnected return errTailscaleNotConnected
}) })
} }