diff --git a/acl/policy_merger.go b/acl/policy_merger.go index c04ae129a7..aa52b95396 100644 --- a/acl/policy_merger.go +++ b/acl/policy_merger.go @@ -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.Keyring = p.keyringRule merged.Operator = p.operatorRule @@ -354,8 +354,8 @@ func (m *PolicyMerger) Policy() *Policy { ID: fmt.Sprintf("%x", m.idHasher.Sum(nil)), } - m.policyRulesMergeContext.update(&merged.PolicyRules) - m.enterprisePolicyRulesMergeContext.update(&merged.EnterprisePolicyRules) + m.policyRulesMergeContext.fill(&merged.PolicyRules) + m.enterprisePolicyRulesMergeContext.fill(&merged.EnterprisePolicyRules) return merged } diff --git a/acl/policy_merger_oss.go b/acl/policy_merger_oss.go index b97361da44..9b7cb07f89 100644 --- a/acl/policy_merger_oss.go +++ b/acl/policy_merger_oss.go @@ -12,6 +12,6 @@ func (ctx *enterprisePolicyRulesMergeContext) merge(*EnterprisePolicyRules) { // do nothing } -func (ctx *enterprisePolicyRulesMergeContext) update(*EnterprisePolicyRules) { +func (ctx *enterprisePolicyRulesMergeContext) fill(*EnterprisePolicyRules) { // do nothing }