Update nameref.go

This commit is contained in:
Jeff Regan
2020-08-26 12:00:37 -07:00
committed by GitHub
parent 0f67692265
commit 9359155418

View File

@@ -86,7 +86,9 @@ func (f Filter) setScalar(node *yaml.RNode) error {
return nil return nil
} }
func filterReferralCandidates(referrer *resource.Resource, matches []*resource.Resource) []*resource.Resource { func filterReferralCandidates(
referrer *resource.Resource,
matches []*resource.Resource) []*resource.Resource {
var ret []*resource.Resource var ret []*resource.Resource
for _, m := range matches { for _, m := range matches {
if referrer.PrefixesSuffixesEquals(m) { if referrer.PrefixesSuffixesEquals(m) {
@@ -113,7 +115,8 @@ func selectReferral(
id := res.OrgId() id := res.OrgId()
if id.IsSelected(&target) && res.GetOriginalName() == oldName { if id.IsSelected(&target) && res.GetOriginalName() == oldName {
matches := referralCandidates.GetMatchingResourcesByOriginalId(id.Equals) matches := referralCandidates.GetMatchingResourcesByOriginalId(id.Equals)
// If there's more than one match, we need to filter the matches by prefix and suffix // If there's more than one match,
// filter the matches by prefix and suffix
if len(matches) > 1 { if len(matches) > 1 {
filteredMatches := filterReferralCandidates(referrer, matches) filteredMatches := filterReferralCandidates(referrer, matches)
if len(filteredMatches) > 1 { if len(filteredMatches) > 1 {