f2cf586414
This refactor is to make it easier to see how serf feature flags are encoded as serf tags, and where those feature flags are read. - use constants for both the prefix and feature flag name. A constant makes it much easier for an IDE to locate the read and write location. - isolate the feature-flag encoding logic in the metadata package, so that the feature flag prefix can be unexported. Only expose a function for encoding the flags into tags. This logic is now next to the logic which reads the tags. - remove the duplicate `addEnterpriseSerfTags` functions. Both Client and Server structs had the same implementation. And neither implementation needed the method receiver.
86 lines
1.9 KiB
Go
86 lines
1.9 KiB
Go
// +build !consulent
|
|
|
|
package consul
|
|
|
|
import (
|
|
"errors"
|
|
"net"
|
|
"strings"
|
|
|
|
"github.com/hashicorp/go-version"
|
|
"github.com/hashicorp/serf/serf"
|
|
|
|
"github.com/hashicorp/consul/agent/pool"
|
|
"github.com/hashicorp/consul/agent/structs"
|
|
)
|
|
|
|
var (
|
|
// minMultiDCConnectVersion is the minimum version in order to support multi-DC Connect
|
|
// features.
|
|
minMultiDCConnectVersion = version.Must(version.NewVersion("1.6.0"))
|
|
)
|
|
|
|
type EnterpriseServer struct{}
|
|
|
|
func (s *Server) initEnterprise() error {
|
|
return nil
|
|
}
|
|
|
|
func (s *Server) startEnterprise() error {
|
|
return nil
|
|
}
|
|
|
|
func (s *Server) handleEnterpriseUserEvents(event serf.UserEvent) bool {
|
|
return false
|
|
}
|
|
|
|
func (s *Server) handleEnterpriseRPCConn(rtype pool.RPCType, conn net.Conn, isTLS bool) bool {
|
|
return false
|
|
}
|
|
|
|
func (s *Server) handleEnterpriseNativeTLSConn(alpnProto string, conn net.Conn) bool {
|
|
return false
|
|
}
|
|
|
|
func (s *Server) handleEnterpriseLeave() {
|
|
return
|
|
}
|
|
|
|
func (s *Server) enterpriseStats() map[string]map[string]string {
|
|
return nil
|
|
}
|
|
|
|
func (s *Server) establishEnterpriseLeadership() error {
|
|
return nil
|
|
}
|
|
|
|
func (s *Server) revokeEnterpriseLeadership() error {
|
|
return nil
|
|
}
|
|
|
|
func (s *Server) validateEnterpriseRequest(entMeta *structs.EnterpriseMeta, write bool) error {
|
|
return nil
|
|
}
|
|
|
|
func (s *Server) validateEnterpriseIntentionNamespace(ns string, _ bool) error {
|
|
if ns == "" {
|
|
return nil
|
|
} else if strings.ToLower(ns) == structs.IntentionDefaultNamespace {
|
|
return nil
|
|
}
|
|
|
|
// No special handling for wildcard namespaces as they are pointless in OSS.
|
|
|
|
return errors.New("Namespaces is a Consul Enterprise feature")
|
|
}
|
|
|
|
func addEnterpriseSerfTags(_ map[string]string) {
|
|
// 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
|
|
}
|