Take the plan entry's Given and ConsumerAt back out: route-proxy's seat defines its own contract and the provisioner's plan stays generic (the operator, 2026-10-31; issue 774). process.Conn.Read stays.

This commit is contained in:
2026-10-31 09:29:17 +01:00
parent 98d5306d6b
commit 2d1d8def75
4 changed files with 2 additions and 87 deletions
-31
View File
@@ -1076,11 +1076,6 @@ func (r Resolution) compose(with Rendering, owner map[string]string,
return nil, err
}
handed.name(m.Module, to, own)
given, err := r.givenOf(m, to, with.Settings[m.Module])
if err != nil {
return nil, err
}
handed.give(m.Module, to, r.At, given)
}
}
// A handed collector is filled from items alone: each old form its collections would have held is said
@@ -1828,32 +1823,6 @@ func (r Resolution) contributions(settings SettingsBy, grants []Grant,
return out, nil
}
// givenOf is each contribution m makes to one requirement, composed as its provider receives it in a received file
// (contributions): the one of `contributes` with what the module shares of its bucket, then each of
// `contributes-many` by local name. The plan carries them (PlanProvision.Given, issue 774), so the two forms cannot
// say different things.
func (r Resolution) givenOf(m Manifest, to string, layers []Layer) ([]PlanGiven, error) {
var out []PlanGiven
if raw, ok := m.Contributes[to]; ok {
values, err := r.composed(m, to, raw, layers, m.Module+" contributing to "+to)
if err != nil {
return nil, err
}
if values, err = withShares(m, to, values); err != nil {
return nil, err
}
out = append(out, PlanGiven{Values: values})
}
for _, local := range sortedKeys(m.ContributesMany[to]) {
values, err := r.composed(m, to, m.ContributesMany[to][local], layers, m.Module+" contributing "+local+" to "+to)
if err != nil {
return nil, err
}
out = append(out, PlanGiven{Local: local, Values: values})
}
return out, nil
}
// composed is one contribution as its provider receives it: settled with this node's settings, its
// endpoint's port filled in, and its names composed from the label.
//