luxolus
/
open-consul
2
0
Fork 0
Code Issues 1 Pull Requests Packages Releases Wiki Activity

acl: remove updateEnterpriseSerfTags 

The only remaining caller is a test helper, and the tests don't use the enterprise gossip
pools.
This commit is contained in:
Daniel Nephin 2021-10-04 17:01:51 -04:00
parent ec935a2486
commit b9f0014d70
2 changed files with 1 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
agent/consul/enterprise_server_oss.go
View File

@ -1,3 +1,4 @@
//go:build !consulent
// +build !consulent
package consul
@ -86,9 +87,3 @@ func (s *Server) validateEnterpriseIntentionNamespace(ns string, _ bool) error {
func addEnterpriseSerfTags(_ map[string]string, _ *structs.EnterpriseMeta) {
// do nothing
}
// updateEnterpriseSerfTags in enterprise will update any instances of Serf with the tag that
// are not the normal LAN or WAN serf instances (network segments and network areas)
func (_ *Server) updateEnterpriseSerfTags(_, _ string) {
// do nothing
}

3
agent/consul/leader_test.go
View File

@ -1771,14 +1771,11 @@ func TestDatacenterSupportsFederationStates(t *testing.T) {
}
func updateSerfTags(s *Server, key, value string) {
// Update the LAN serf
libserf.UpdateTag(s.serfLAN, key, value)
if s.serfWAN != nil {
libserf.UpdateTag(s.serfWAN, key, value)
}
s.updateEnterpriseSerfTags(key, value)
}
func TestDatacenterSupportsIntentionsAsConfigEntries(t *testing.T) {