status-im
/
consul
mirror of https://github.com/status-im/consul.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

acl: rename merge context update() -> fill()

This commit is contained in:
Kyle Havlovitz 2021-09-14 15:20:56 -07:00
parent ce04ce13dd
commit a20ba21e29
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
acl/policy_merger.go
View File

@ -236,7 +236,7 @@ func (p *policyRulesMergeContext) merge(policy *PolicyRules) {
} }
} }
func (p *policyRulesMergeContext) update(merged *PolicyRules) { func (p *policyRulesMergeContext) fill(merged *PolicyRules) {
merged.ACL = p.aclRule merged.ACL = p.aclRule
merged.Keyring = p.keyringRule merged.Keyring = p.keyringRule
merged.Operator = p.operatorRule merged.Operator = p.operatorRule
@ -354,8 +354,8 @@ func (m *PolicyMerger) Policy() *Policy {
ID: fmt.Sprintf("%x", m.idHasher.Sum(nil)), ID: fmt.Sprintf("%x", m.idHasher.Sum(nil)),
} }
m.policyRulesMergeContext.update(&merged.PolicyRules) m.policyRulesMergeContext.fill(&merged.PolicyRules)
m.enterprisePolicyRulesMergeContext.update(&merged.EnterprisePolicyRules) m.enterprisePolicyRulesMergeContext.fill(&merged.EnterprisePolicyRules)
return merged return merged
} }

2
acl/policy_merger_oss.go
View File

@ -12,6 +12,6 @@ func (ctx *enterprisePolicyRulesMergeContext) merge(*EnterprisePolicyRules) {
// do nothing // do nothing
} }
func (ctx *enterprisePolicyRulesMergeContext) update(*EnterprisePolicyRules) { func (ctx *enterprisePolicyRulesMergeContext) fill(*EnterprisePolicyRules) {
// do nothing // do nothing
} }