609c9dab02
Ensure we close the Sentinel Evaluator so as not to leak go routines Fix a bunch of test logging so that various warnings when starting a test agent go to the ltest logger and not straight to stdout. Various canned ent meta types always return a valid pointer (no more nils). This allows us to blindly deref + assign in various places. Update ACL index tracking to ensure oss -> ent upgrades will work as expected. Update ent meta parsing to include function to disallow wildcarding.
44 lines
869 B
Go
44 lines
869 B
Go
// +build !consulent
|
|
|
|
package structs
|
|
|
|
import (
|
|
"hash"
|
|
|
|
"github.com/hashicorp/consul/acl"
|
|
)
|
|
|
|
var emptyEnterpriseMeta = EnterpriseMeta{}
|
|
|
|
// EnterpriseMeta stub
|
|
type EnterpriseMeta struct{}
|
|
|
|
func (m *EnterpriseMeta) estimateSize() int {
|
|
return 0
|
|
}
|
|
|
|
func (m *EnterpriseMeta) addToHash(_ hash.Hash, _ bool) {
|
|
// do nothing
|
|
}
|
|
|
|
// ReplicationEnterpriseMeta stub
|
|
func ReplicationEnterpriseMeta() *EnterpriseMeta {
|
|
return &emptyEnterpriseMeta
|
|
}
|
|
|
|
// DefaultEnterpriseMeta stub
|
|
func DefaultEnterpriseMeta() *EnterpriseMeta {
|
|
return &emptyEnterpriseMeta
|
|
}
|
|
|
|
// WildcardEnterpriseMeta stub
|
|
func WildcardEnterpriseMeta() *EnterpriseMeta {
|
|
return &emptyEnterpriseMeta
|
|
}
|
|
|
|
// FillAuthzContext stub
|
|
func (_ *EnterpriseMeta) FillAuthzContext(_ *acl.EnterpriseAuthorizerContext) {}
|
|
|
|
// FillAuthzContext stub
|
|
func (d *DirEntry) FillAuthzContext(*acl.EnterpriseAuthorizerContext) {}
|