diff --git a/internal/catalogue/declaration.go b/internal/catalogue/declaration.go index 5d3c077..9fbee3a 100644 --- a/internal/catalogue/declaration.go +++ b/internal/catalogue/declaration.go @@ -911,7 +911,7 @@ func (r Resolution) contributions(settings SettingsBy, grants []Grant, if err != nil { return nil, fmt.Errorf("%s contributing to %s: %w", m.Module, to, err) } - composeName(values, r.PublicDomain) + composeName(values, r.PublicDomain, r.At) out[to] = append(out[to], Contribution{From: m.Module, Values: values}) } // Several contributions to one requirement (ADR 0094's sibling for `contributes`): an @@ -925,7 +925,7 @@ func (r Resolution) contributions(settings SettingsBy, grants []Grant, if err != nil { return nil, fmt.Errorf("%s contributing %s to %s: %w", m.Module, local, to, err) } - composeName(values, r.PublicDomain) + composeName(values, r.PublicDomain, r.At) out[to] = append(out[to], Contribution{From: m.Module, Values: values}) } } @@ -933,23 +933,31 @@ func (r Resolution) contributions(settings SettingsBy, grants []Grant, return out, nil } -// composeName joins a contribution's label with a node's public domain, in place (novox/hq ADR -// 0056). +// composeName joins a contribution's label with a node's public domain, and separately with its +// private one, in place (novox/hq ADR 0056). // -// **The whole of what the mesh does with a route's name: join two given strings.** A contribution -// carries a `label` — the subdomain its operator chose — and the node carries its public domain; -// the granted name is `