diff --git a/cmd/tailscale/cli/risks.go b/cmd/tailscale/cli/risks.go index 5decdd5d2..763727f04 100644 --- a/cmd/tailscale/cli/risks.go +++ b/cmd/tailscale/cli/risks.go @@ -18,6 +18,7 @@ import ( var ( riskTypes []string riskLoseSSH = registerRiskType("lose-ssh") + riskAll = registerRiskType("all") ) func registerRiskType(riskType string) string { @@ -35,7 +36,7 @@ func registerAcceptRiskFlag(f *flag.FlagSet, acceptedRisks *string) { // risks in acceptedRisks. func isRiskAccepted(riskType, acceptedRisks string) bool { for _, r := range strings.Split(acceptedRisks, ",") { - if r == riskType { + if r == riskType || r == riskAll { return true } } diff --git a/tstest/integration/integration_test.go b/tstest/integration/integration_test.go index 504597586..e59a29441 100644 --- a/tstest/integration/integration_test.go +++ b/tstest/integration/integration_test.go @@ -846,7 +846,7 @@ func (n *testNode) MustUp(extraArgs ...string) { func (n *testNode) MustDown() { t := n.env.t t.Logf("Running down ...") - if err := n.Tailscale("down").Run(); err != nil { + if err := n.Tailscale("down", "--accept-risk=all").Run(); err != nil { t.Fatalf("down: %v", err) } }