From ff96ac52596ecfe8ff5536a4597cb3b8223be5b6 Mon Sep 17 00:00:00 2001 From: Kristoffer Dalby Date: Mon, 17 Feb 2025 18:36:44 +0100 Subject: [PATCH] run route integration tests offline Signed-off-by: Kristoffer Dalby --- integration/route_test.go | 46 +++++++++++++++++++++++---------------- 1 file changed, 27 insertions(+), 19 deletions(-) diff --git a/integration/route_test.go b/integration/route_test.go index 644cc992..dbb5d311 100644 --- a/integration/route_test.go +++ b/integration/route_test.go @@ -262,7 +262,11 @@ func TestHASubnetRouterFailover(t *testing.T) { user: 3, } - err = scenario.CreateHeadscaleEnv(spec, []tsic.Option{}, hsic.WithTestName("clienableroute")) + err = scenario.CreateHeadscaleEnv(spec, []tsic.Option{}, + hsic.WithTestName("clienableroute"), + hsic.WithEmbeddedDERPServerOnly(), + hsic.WithTLS(), + ) assertNoErrHeadscaleEnv(t, err) allClients, err := scenario.ListTailscaleClients() @@ -966,7 +970,7 @@ func TestAutoApprovedSubRoute2068(t *testing.T) { expectedRoutes := "10.42.7.0/24" - user := "subroute" + user := "user1" scenario, err := NewScenario(dockertestMaxWait()) assertNoErrf(t, "failed to create scenario: %s", err) @@ -976,25 +980,29 @@ func TestAutoApprovedSubRoute2068(t *testing.T) { user: 1, } - err = scenario.CreateHeadscaleEnv(spec, []tsic.Option{tsic.WithTags([]string{"tag:approve"})}, hsic.WithTestName("clienableroute"), hsic.WithACLPolicy( - &policy.ACLPolicy{ - ACLs: []policy.ACL{ - { - Action: "accept", - Sources: []string{"*"}, - Destinations: []string{"*:*"}, + err = scenario.CreateHeadscaleEnv(spec, []tsic.Option{tsic.WithTags([]string{"tag:approve"})}, + hsic.WithTestName("clienableroute"), + hsic.WithEmbeddedDERPServerOnly(), + hsic.WithTLS(), + hsic.WithACLPolicy( + &policy.ACLPolicy{ + ACLs: []policy.ACL{ + { + Action: "accept", + Sources: []string{"*"}, + Destinations: []string{"*:*"}, + }, + }, + TagOwners: map[string][]string{ + "tag:approve": {user}, + }, + AutoApprovers: policy.AutoApprovers{ + Routes: map[string][]string{ + "10.42.0.0/16": {"tag:approve"}, + }, }, }, - TagOwners: map[string][]string{ - "tag:approve": {user}, - }, - AutoApprovers: policy.AutoApprovers{ - Routes: map[string][]string{ - "10.42.0.0/16": {"tag:approve"}, - }, - }, - }, - )) + )) assertNoErrHeadscaleEnv(t, err) allClients, err := scenario.ListTailscaleClients()