migrate last acl tests away from database

Signed-off-by: Kristoffer Dalby <kristoffer@tailscale.com>
juanfont · Jun 21, 2023 · 155cc07 · 155cc07
1 parent e2c08db
commit 155cc07
Show file tree

Hide file tree

Showing 5 changed files with 254 additions and 271 deletions.
diff --git a/hscontrol/db/acls_test.go b/hscontrol/db/acls_test.go
diff --git a/hscontrol/db/machine_test.go b/hscontrol/db/machine_test.go
@@ -292,10 +292,10 @@ func (s *Suite) TestGetACLFilteredPeers(c *check.C) {
 	testPeers, err := db.ListPeers(testMachine)
 	c.Assert(err, check.IsNil)
 
-	adminRules, _, err := policy.GenerateFilterRules(aclPolicy, adminMachine, adminPeers)
+	adminRules, _, err := policy.GenerateFilterAndSSHRules(aclPolicy, adminMachine, adminPeers)
 	c.Assert(err, check.IsNil)
 
-	testRules, _, err := policy.GenerateFilterRules(aclPolicy, testMachine, testPeers)
+	testRules, _, err := policy.GenerateFilterAndSSHRules(aclPolicy, testMachine, testPeers)
 	c.Assert(err, check.IsNil)
 
 	peersOfAdminMachine := policy.FilterMachinesByACL(adminMachine, adminPeers, adminRules)

diff --git a/hscontrol/mapper/mapper.go b/hscontrol/mapper/mapper.go
@@ -95,7 +95,7 @@ func fullMapResponse(
 		return nil, err
 	}
 
-	rules, sshPolicy, err := policy.GenerateFilterRules(
+	rules, sshPolicy, err := policy.GenerateFilterAndSSHRules(
 		pol,
 		machine,
 		peers,

diff --git a/hscontrol/policy/acls.go b/hscontrol/policy/acls.go
@@ -117,7 +117,7 @@ func LoadACLPolicyFromBytes(acl []byte, format string) (*ACLPolicy, error) {
 // TODO(kradalby): This needs to be replace with something that generates
 // the rules as needed and not stores it on the global object, rules are
 // per node and that should be taken into account.
-func GenerateFilterRules(
+func GenerateFilterAndSSHRules(
 	policy *ACLPolicy,
 	machine *types.Machine,
 	peers types.Machines,