Read every module whole for the plan-hands check, so its verdict follows their source, and judge a shared value's consumer by whether its plan hands it; leave mesh-provisioner out of the group (review round 1, issue 774)
This commit is contained in:
@@ -1,3 +1,3 @@
|
|||||||
# What these tests read outside their package, as paths from the repository's root (issue 1936).
|
# What these tests read outside their package, as paths from the repository's root (issue 1936).
|
||||||
# every module's Go source, for a line that takes a plan existing for its module handed.
|
# every module whole (a directory is read whole, so a module's Go source at any depth enters the digest), for a line that takes a plan existing for its module handed.
|
||||||
modules/**/*.go
|
modules
|
||||||
|
|||||||
@@ -251,7 +251,7 @@ func (h *Holder) writeRefused(node string, held map[string]string) error {
|
|||||||
}
|
}
|
||||||
|
|
||||||
// providerPlan is the plan of a provision's provider on its node: from this composition when it is on this node, else
|
// providerPlan is the plan of a provision's provider on its node: from this composition when it is on this node, else
|
||||||
// as kept in `plans`; nil when the seat keeps no plan of it (one of provisions alone counts: its keys are waited for).
|
// as kept in `plans`; nil when the provider is not handed.
|
||||||
func (h *Holder) providerPlan(p catalogue.PlanProvision, node string, here map[string]catalogue.Plan) *catalogue.Plan {
|
func (h *Holder) providerPlan(p catalogue.PlanProvision, node string, here map[string]catalogue.Plan) *catalogue.Plan {
|
||||||
if p.Provider == node {
|
if p.Provider == node {
|
||||||
if plan, ok := here[p.ProviderModule]; ok {
|
if plan, ok := here[p.ProviderModule]; ok {
|
||||||
|
|||||||
@@ -729,7 +729,7 @@ func sharedRefusal(store *Store, read AssignmentReader, node, provider, provisio
|
|||||||
continue
|
continue
|
||||||
}
|
}
|
||||||
var a plannedProvisions
|
var a plannedProvisions
|
||||||
if json.Unmarshal(raw, &a) != nil || a.Node != node || a.Module != parts[1] || a.Provisioning == nil { // binds, not handing
|
if json.Unmarshal(raw, &a) != nil || a.Node != node || a.Module != parts[1] || !hands(raw) {
|
||||||
continue
|
continue
|
||||||
}
|
}
|
||||||
for _, p := range a.Provisioning.Provisions {
|
for _, p := range a.Provisioning.Provisions {
|
||||||
|
|||||||
Reference in New Issue
Block a user