status-im/consul
2
0
Fork 0
mirror of https://github.com/status-im/consul.git synced 2025-01-10 13:55:55 +00:00
Code Issues Projects Releases Wiki Activity

Move valid policies to pkg level

Browse Source
This commit is contained in:
freddygv 2020-09-02 15:49:03 -06:00
parent f81fe6a1a1
commit ef877449ce
1 changed files with 20 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
agent/structs/config_entry_discoverychain.go
View File

@ -30,6 +30,23 @@ const (
HashPolicyQueryParam = "query_parameter"
)
var (
validLBPolicies = map[string]bool{
"": true,
LBPolicyRandom: true,
LBPolicyRoundRobin: true,
LBPolicyLeastRequest: true,
LBPolicyRingHash: true,
LBPolicyMaglev: true,
}
validHashPolicies = map[string]bool{
HashPolicyHeader: true,
HashPolicyCookie: true,
HashPolicyQueryParam: true,
}
)
// ServiceRouterConfigEntry defines L7 (e.g. http) routing rules for a named
// service exposed in Connect.
//
@ -828,15 +845,7 @@ func (e *ServiceResolverConfigEntry) Validate() error {
if e.LoadBalancer != nil && e.LoadBalancer.EnvoyConfig != nil {
ec := e.LoadBalancer.EnvoyConfig
validPolicies := map[string]bool{
"": true,
LBPolicyRandom: true,
LBPolicyRoundRobin: true,
LBPolicyLeastRequest: true,
LBPolicyRingHash: true,
LBPolicyMaglev: true,
}
if ok := validPolicies[ec.Policy]; !ok {
if ok := validLBPolicies[ec.Policy]; !ok {
return fmt.Errorf("Bad LoadBalancer policy: %q is not supported", ec.Policy)
}
@ -853,15 +862,11 @@ func (e *ServiceResolverConfigEntry) Validate() error {
"HashPolicies specified for non-hash-based Policy: %q", ec.Policy)
}
validFields := map[string]bool{
HashPolicyHeader: true,
HashPolicyCookie: true,
HashPolicyQueryParam: true,
}
for i, hp := range ec.HashPolicies {
if ok := validFields[hp.Field]; hp.Field != "" && !ok {
if ok := validHashPolicies[hp.Field]; hp.Field != "" && !ok {
return fmt.Errorf("Bad LoadBalancer HashPolicy[%d]: %q is not a supported field", i, hp.Field)
}
if hp.SourceIP && hp.Field != "" {
return fmt.Errorf("Bad LoadBalancer HashPolicy[%d]: "+
"A single hash policy cannot hash both a source address and a %q", i, hp.Field)