Declare openings and a refusal-only guard on an adopted node in place of the filter (hq ADR 0100)
This commit is contained in:
@@ -485,16 +485,21 @@ func declarationWith(ctx context.Context, open *stores, node string,
|
||||
break
|
||||
}
|
||||
|
||||
composed, err := plan.Compose(catalogue.Rendering{
|
||||
Settings: settings, Generators: gens, Grants: grants, Needed: needed, Ports: ports,
|
||||
Certificate: certificate, Authority: authority, Mesh: private, Names: names,
|
||||
Suffix: overlay.Suffix(), Foundation: foundation, Kept: kept})
|
||||
// Whether this node is adopted (novox/hq ADR 0100): then the found firewall stays in force, and
|
||||
// the declaration carries openings and the mesh's guard in place of a filter.
|
||||
record, err := inv.NodeByName(ctx, node)
|
||||
if err != nil {
|
||||
return sendable{}, err
|
||||
}
|
||||
// Whether this node is adopted, and what was taken on it, said in every declaration it is
|
||||
// sent from this one place (novox/hq ADR 0100).
|
||||
adoption, err := adoptionOf(ctx, inv, node, plan, composed)
|
||||
composed, err := plan.Compose(catalogue.Rendering{
|
||||
Settings: settings, Generators: gens, Grants: grants, Needed: needed, Ports: ports,
|
||||
Certificate: certificate, Authority: authority, Mesh: private, Names: names,
|
||||
Suffix: overlay.Suffix(), Foundation: foundation, Kept: kept, Adopted: record.Adopted})
|
||||
if err != nil {
|
||||
return sendable{}, err
|
||||
}
|
||||
// And what was taken on it, said in every declaration it is sent from this one place.
|
||||
adoption, err := adoptionOf(ctx, inv, record, plan, composed)
|
||||
if err != nil {
|
||||
return sendable{}, err
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user