Skip to content

test(integration): harden network block wait in health check tests #2369

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
rafaelwestphal wants to merge 1 commit into
base: master
Choose a base branch
from
Open

test(integration): harden network block wait in health check tests #2369

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 21 additions & 4 deletions integration_test/ops_agent_test/main_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5428,9 +5428,26 @@ func TestPortsAndAPIHealthChecks(t *testing.T) {

func waitForNetworkBlock(ctx context.Context, logger *log.Logger, vm *gce.VM) error {
logger.Println("Waiting for network block to propagate...")
checkCmd := "curl -s -m 5 https://telemetry.googleapis.com > /dev/null"
// The deny egress firewall rule is eventually consistent. We want to wait
// until ALL key endpoints are blocked before proceeding, to ensure the health
// checks consistently detect the block.
checkCmd := `if curl -s -m 5 https://telemetry.googleapis.com > /dev/null || \
curl -s -m 5 https://dl.google.com > /dev/null || \
curl -s -m 5 https://packages.cloud.google.com > /dev/null; then
exit 0
else
exit 1
fi`
if gce.IsWindows(vm.ImageSpec) {
checkCmd = "if ((Test-NetConnection telemetry.googleapis.com -Port 443 -WarningAction SilentlyContinue).TcpTestSucceeded) { exit 0 } else { exit 1 }"
checkCmd = `if (
(Test-NetConnection telemetry.googleapis.com -Port 443 -WarningAction SilentlyContinue).TcpTestSucceeded -or
(Test-NetConnection dl.google.com -Port 443 -WarningAction SilentlyContinue).TcpTestSucceeded -or
(Test-NetConnection packages.cloud.google.com -Port 443 -WarningAction SilentlyContinue).TcpTestSucceeded
) {
exit 0
} else {
exit 1
}`
}

timeout := time.After(5 * time.Minute)
Expand All @@ -5446,10 +5463,10 @@ func waitForNetworkBlock(ctx context.Context, logger *log.Logger, vm *gce.VM) er
case <-tick.C:
_, err := gce.RunRemotely(ctx, logger, vm, checkCmd)
if err != nil {
logger.Printf("Network check failed as expected (network block propagated): %v", err)
logger.Printf("Network check failed as expected (all endpoints blocked): %v", err)
return nil
}
logger.Println("Network check still succeeded, waiting...")
logger.Println("At least one network endpoint is still reachable, waiting...")
}
}
}
Expand Down
Loading