From e02987cfef7f379b37db4438c98a308589a3d8f2 Mon Sep 17 00:00:00 2001 From: Kristoffer Dalby Date: Mon, 31 Mar 2025 08:29:41 +0200 Subject: [PATCH] hsic: only set db policy if exist Signed-off-by: Kristoffer Dalby --- integration/hsic/hsic.go | 2 +- integration/route_test.go | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/integration/hsic/hsic.go b/integration/hsic/hsic.go index 17c04336..f60889f4 100644 --- a/integration/hsic/hsic.go +++ b/integration/hsic/hsic.go @@ -448,7 +448,7 @@ func New( // Load the database from policy file on repeat until it succeeds, // this is done as the container sleeps before starting headscale. - if hsic.policyMode == types.PolicyModeDB { + if hsic.aclPolicy != nil && hsic.policyMode == types.PolicyModeDB { err := pool.Retry(hsic.reloadDatabasePolicy) if err != nil { return nil, fmt.Errorf("loading database policy on startup: %w", err) diff --git a/integration/route_test.go b/integration/route_test.go index 67a9c2bf..ece89909 100644 --- a/integration/route_test.go +++ b/integration/route_test.go @@ -1401,7 +1401,7 @@ func TestAutoApproveMultiNetwork(t *testing.T) { }, }, TagOwners: map[string][]string{ - "tag:approve": {"user1"}, + "tag:approve": {"user1@"}, }, AutoApprovers: policyv1.AutoApprovers{ Routes: map[string][]string{ @@ -1598,6 +1598,7 @@ func TestAutoApproveMultiNetwork(t *testing.T) { peerStatus := status.Peer[peerKey] if peerStatus.ID == "1" { + require.NotNil(t, peerStatus.PrimaryRoutes) assert.Contains(t, peerStatus.PrimaryRoutes.AsSlice(), *route) requirePeerSubnetRoutes(t, peerStatus, []netip.Prefix{*route}) } else {