diff --git a/go/seatlist/bootstrap/mesh-delivery.json b/go/seatlist/bootstrap/mesh-delivery.json index eb8d844e..08e74ab4 100644 --- a/go/seatlist/bootstrap/mesh-delivery.json +++ b/go/seatlist/bootstrap/mesh-delivery.json @@ -649,6 +649,10 @@ "type": "string", "format": "date-time", "description": "when the gate first said it" + }, + "record": { + "type": "string", + "description": "the delivery record the act is for, by its source revision, .; absent on an act said before it was named, which bridge_owed_again by record never finds (design 47 H2 §807, H-A-432)" } }, "required": [ diff --git a/go/seatlist/bootstrap/node-engine.json b/go/seatlist/bootstrap/node-engine.json index a5aac3a6..4711ce8f 100644 --- a/go/seatlist/bootstrap/node-engine.json +++ b/go/seatlist/bootstrap/node-engine.json @@ -1,6 +1,6 @@ { "format": 1, - "form": 3, + "form": 4, "seat": "node-engine", "scope": "node", "grain": "whole", @@ -456,6 +456,32 @@ }, "description": "every resource that differs from what runs, when asked" }, + "drift": { + "type": "array", + "description": "when the diff is asked, each directory entry of what runs that the mesh made, as its record holds, whose owner or mode on disk differ from it (H-A-392 (b), H-A-458 (2)): read-only; the engine sets it right at its next start or apply of the module", + "items": { + "type": "object", + "required": [ + "id", + "path", + "drift" + ], + "properties": { + "id": { + "type": "string", + "description": "the directory entry's id in the composition" + }, + "path": { + "type": "string", + "description": "its path on the machine" + }, + "drift": { + "type": "string", + "description": "how its owner or mode on disk differ, in words" + } + } + } + }, "own": { "type": "object", "properties": { @@ -1334,6 +1360,10 @@ "type": "string", "description": "the composition run's pipeline sequence, in decimal, the module was applied from (design 47 H2 §813 (1), H-A-388): a restarted engine applies no older run again" }, + "pipeline": { + "type": "string", + "description": "the pipeline of the want the module was applied from, its key ., beside its run (H-A-429 (1), H-A-458 (1)): a want's run is compared with this run only when the want names the same; absent for a want in none" + }, "kept": { "type": "array", "items": { diff --git a/go/seatlist/seatlisttest/seats/mesh-builds.json b/go/seatlist/seatlisttest/seats/mesh-builds.json index 3ed175a9..b19a7f79 100644 --- a/go/seatlist/seatlisttest/seats/mesh-builds.json +++ b/go/seatlist/seatlisttest/seats/mesh-builds.json @@ -125,7 +125,7 @@ }, { "name": "drop", - "description": "End an ask on the seat's work queue for a caller that no longer waits for it (its step ended by its bound): one waiting is ended dropped when it is pulled, one taken is cancelled; both end the step dropped, naming who dropped it and why, so no holder works on it after (design 47 H2 §778; ADR 0664 §4).", + "description": "End an ask on the seat's work queue for a caller that no longer waits for it (its step ended by its bound): one waiting is ended dropped when it is pulled, one taken is cancelled; both end the step could-not-run, its why naming the drop and who asked it, so no holder works on it after (design 47 H2 §778; H-A-401; ADR 0664 §4).", "input": { "type": "object", "properties": { @@ -152,6 +152,150 @@ "description": "whether the ask was held here" }, "class": "act" + }, + { + "name": "publish-queue", + "class": "read", + "description": "What the builder's work queue publishes holds, read by the builder from its own stream (design 47 H2 §793; H-A-454): the items' count per registry seat holder and class with the oldest and newest queue time, and the first 50 in the order they are pulled (the live class first, each class oldest first); module, and version, list only that module's items. A queue read past 4,000 items is answered capped, naming the items read and the queue's size.", + "input": { + "type": "object", + "properties": { + "module": { + "type": "string", + "description": "list only this module's items" + }, + "version": { + "type": "string", + "description": "with module: only this version's, MAJOR.MINOR.PATCH" + } + }, + "required": [] + }, + "answer": { + "type": "object", + "properties": { + "total": { + "type": "integer", + "description": "how many items were read" + }, + "counts": { + "type": "array", + "items": { + "type": "object", + "properties": { + "holder": { + "type": "string", + "description": "the registry seat's holder" + }, + "class": { + "type": "string", + "enum": [ + "live", + "again" + ], + "description": "the items' class" + }, + "count": { + "type": "integer", + "description": "how many items of the class the holder's queue holds" + }, + "oldest": { + "type": "string", + "format": "date-time", + "description": "when the oldest of them was queued" + }, + "newest": { + "type": "string", + "format": "date-time", + "description": "when the newest of them was queued" + } + }, + "required": [ + "holder", + "class", + "count", + "oldest", + "newest" + ] + }, + "description": "per holder and class, sorted by holder, then class" + }, + "queue": { + "type": "array", + "items": { + "type": "object", + "properties": { + "holder": { + "type": "string", + "description": "the registry seat's holder the item is sent to, a module" + }, + "module": { + "type": "string", + "description": "the module whose version is published" + }, + "version": { + "type": "string", + "description": "the reserved version, MAJOR.MINOR.PATCH" + }, + "class": { + "type": "string", + "enum": [ + "live", + "again" + ], + "description": "live, a build a pipeline's step waits on, pulled first; again, asked again at a start" + }, + "artifacts": { + "type": "object", + "additionalProperties": { + "type": "string" + }, + "description": "each artifact reference, :, with the digest to publish" + }, + "queued": { + "type": "string", + "format": "date-time", + "description": "when the item was put on the work queue" + } + }, + "required": [ + "holder", + "module", + "version", + "class", + "queued" + ] + }, + "description": "the first 50 items listed, per holder in the order they are pulled" + }, + "listed": { + "type": "integer", + "description": "how many of total the answer lists" + }, + "capped": { + "type": "boolean", + "description": "true when the queue held more items than were read; every count is then of the items read" + }, + "items-read": { + "type": "integer", + "description": "with capped: how many items were read" + }, + "queue-items": { + "type": "integer", + "description": "with capped: how many items the queue holds, from its stream's state" + }, + "queue-bytes": { + "type": "integer", + "description": "with capped: the queue's size in bytes" + } + }, + "required": [ + "total", + "counts", + "queue", + "listed" + ] + } } ], "accepts": [ diff --git a/go/seatlist/seatlisttest/seats/mesh-delivery.json b/go/seatlist/seatlisttest/seats/mesh-delivery.json index eb8d844e..08e74ab4 100644 --- a/go/seatlist/seatlisttest/seats/mesh-delivery.json +++ b/go/seatlist/seatlisttest/seats/mesh-delivery.json @@ -649,6 +649,10 @@ "type": "string", "format": "date-time", "description": "when the gate first said it" + }, + "record": { + "type": "string", + "description": "the delivery record the act is for, by its source revision, .; absent on an act said before it was named, which bridge_owed_again by record never finds (design 47 H2 §807, H-A-432)" } }, "required": [ diff --git a/go/seatlist/seatlisttest/seats/mesh-wants.json b/go/seatlist/seatlisttest/seats/mesh-wants.json index e13f7058..f9d92669 100644 --- a/go/seatlist/seatlisttest/seats/mesh-wants.json +++ b/go/seatlist/seatlisttest/seats/mesh-wants.json @@ -278,9 +278,39 @@ ] } }, + { + "name": "keep-now", + "description": "Keep the assignment graph's revisions now, by hand (design 47 H2 §813 (2); H-A-417): written in the hand-act log first by the module's tool assigner_keep_now, then the keeping runs at once on the pass's newest computed revision; answers the revision kept, or the fault the keeping met.", + "input": { + "type": "object", + "properties": { + "why": { + "type": "string", + "description": "why the keeping runs now" + } + }, + "required": [ + "why" + ] + }, + "answer": { + "type": "object", + "properties": { + "revision": { + "$ref": "#/defs/AssignmentRevision", + "description": "the revision kept" + }, + "fault": { + "type": "string", + "description": "the fault the keeping met; absent when it kept the revision" + } + } + }, + "class": "act" + }, { "name": "drop", - "description": "End an ask on the seat's work queue for a caller that no longer waits for it (its step ended by its bound): one waiting is ended dropped when it is pulled, one taken is cancelled; both end the step dropped, naming who dropped it and why, so no holder works on it after (design 47 H2 §778; ADR 0664 §4).", + "description": "End an ask on the seat's work queue for a caller that no longer waits for it (its step ended by its bound): one waiting is ended dropped when it is pulled, one taken is cancelled; both end the step could-not-run, its why naming the drop and who asked it, so no holder works on it after (design 47 H2 §778; ADR 0664 §4).", "input": { "type": "object", "properties": { diff --git a/go/seatlist/seatlisttest/seats/node-engine.json b/go/seatlist/seatlisttest/seats/node-engine.json index a5aac3a6..4711ce8f 100644 --- a/go/seatlist/seatlisttest/seats/node-engine.json +++ b/go/seatlist/seatlisttest/seats/node-engine.json @@ -1,6 +1,6 @@ { "format": 1, - "form": 3, + "form": 4, "seat": "node-engine", "scope": "node", "grain": "whole", @@ -456,6 +456,32 @@ }, "description": "every resource that differs from what runs, when asked" }, + "drift": { + "type": "array", + "description": "when the diff is asked, each directory entry of what runs that the mesh made, as its record holds, whose owner or mode on disk differ from it (H-A-392 (b), H-A-458 (2)): read-only; the engine sets it right at its next start or apply of the module", + "items": { + "type": "object", + "required": [ + "id", + "path", + "drift" + ], + "properties": { + "id": { + "type": "string", + "description": "the directory entry's id in the composition" + }, + "path": { + "type": "string", + "description": "its path on the machine" + }, + "drift": { + "type": "string", + "description": "how its owner or mode on disk differ, in words" + } + } + } + }, "own": { "type": "object", "properties": { @@ -1334,6 +1360,10 @@ "type": "string", "description": "the composition run's pipeline sequence, in decimal, the module was applied from (design 47 H2 §813 (1), H-A-388): a restarted engine applies no older run again" }, + "pipeline": { + "type": "string", + "description": "the pipeline of the want the module was applied from, its key ., beside its run (H-A-429 (1), H-A-458 (1)): a want's run is compared with this run only when the want names the same; absent for a want in none" + }, "kept": { "type": "array", "items": { diff --git a/go/seatlist/seatlisttest/seats/node-packet-filter.json b/go/seatlist/seatlisttest/seats/node-packet-filter.json index 005b50ce..10bc82b5 100644 --- a/go/seatlist/seatlisttest/seats/node-packet-filter.json +++ b/go/seatlist/seatlisttest/seats/node-packet-filter.json @@ -2,13 +2,14 @@ "format": 1, "seat": "node-packet-filter", "scope": "node", - "grain": "seat-list", + "grain": "whole", "domain": "Connectivity", - "decision": "novox/hq ADR 0121", + "decision": "novox/hq ADR 0121, ADR 0170, ADR 0683", + "description": "The node seat of the machine's packet filter (ADR 0121, ADR 0170, ADR 0683): what the machine enforces, the mesh's own filter loaded again, one rule set the mesh did not write removed, and the operator's allowances, a port opened by hand beside the ports derived from the modules' listens (design 33 control-verbs). An allowance is the holder's own state, kept one bucket per machine under its node's keys; the node-engine asks allowed at every compose of a converged node's filter and renders it into the inet mesh table's input chain (design 08 control-verbs). Each verb is answered on this node's subject; the event allowances-changed is published on mesh.seat.node-packet-filter.event.allowances-changed..", "verbs": [ { "name": "rules", - "description": "The packet filter as this machine enforces it now: the nftables ruleset and, where the tool exists, the legacy filter's listings. Narrowed to one table or chain when asked.", + "description": "The packet filter as this machine enforces it now: the nftables ruleset and, where the tool exists, the legacy filter's listings. Narrowed to one table or chain when asked. Beside it every allowance, marked loaded only when a rule of the mesh's table carries its comment allowance with an equal at, and every loaded allowance comment whose key is not kept, listed as loaded, not kept.", "replaces": [ "nft list ruleset", "iptables -L", @@ -26,6 +27,42 @@ } }, "type": "object" + }, + "answer": { + "type": "object", + "required": [ + "nftables", + "legacy", + "allowances", + "loaded-not-kept" + ], + "properties": { + "nftables": { + "type": "string", + "description": "the nftables ruleset, whole or narrowed" + }, + "legacy": { + "type": "object", + "additionalProperties": { + "type": "string" + }, + "description": "each legacy tool's listing, by tool" + }, + "allowances": { + "type": "array", + "items": { + "$ref": "#/defs/Loaded" + }, + "description": "allowed's answer, each marked loaded only on a rule comment allowance with an equal at" + }, + "loaded-not-kept": { + "type": "array", + "items": { + "$ref": "#/defs/LoadedNotKept" + }, + "description": "every allowance comment of the mesh's table whose key is not kept: loaded, not kept" + } + } } }, { @@ -37,6 +74,23 @@ "input": { "properties": {}, "type": "object" + }, + "answer": { + "type": "object", + "required": [ + "loaded", + "table" + ], + "properties": { + "loaded": { + "type": "string", + "description": "the filter file loaded" + }, + "table": { + "type": "string", + "description": "the mesh's table as loaded" + } + } } }, { @@ -57,7 +111,501 @@ "where" ], "type": "object" + }, + "answer": { + "type": "object", + "required": [ + "where", + "did" + ], + "properties": { + "where": { + "type": "string" + }, + "did": { + "type": "array", + "items": { + "type": "string" + }, + "description": "each command run" + } + } + } + }, + { + "name": "allow", + "description": "Open a port by hand on this machine, beside the ports derived from the modules' listens: one allowance per protocol, port and interface, kept as the holder's state and rendered by the node-engine into the inet mesh table's input chain at its next compose of the filter. Who set it is the caller the bus proved (for a session's call, the tool runner's account). A key that exists is replaced whole and answered. A kept allowance whose named interface is an outward link, as the node-engine's converged names them, is answered with outward, that link. Written in the hand-act log. Refuses, naming the argument and writing nothing, an unproven caller, an adopted node (naming the adoption) or a node-engine converged that does not answer within 10 s, a bad port, protocol, interface, source or until, an empty or longer why, an unknown argument, a port a derived rule of the loaded mesh table admits from the private network only unless a source is given, and more allowances on the node than the holder's setting allowances-max (default 100). Whether the loaded chain carries it is read with rules.", + "replaces": [ + "nft add rule inet mesh input" + ], + "class": "act", + "input": { + "type": "object", + "additionalProperties": false, + "required": [ + "port", + "why" + ], + "properties": { + "port": { + "type": "integer", + "minimum": 1, + "maximum": 65535, + "description": "the port, 1-65535" + }, + "protocol": { + "type": "string", + "enum": [ + "tcp", + "udp" + ], + "description": "tcp (the default) or udp" + }, + "interfaces": { + "type": "array", + "items": { + "type": "string", + "pattern": "^[A-Za-z0-9_.-]{1,15}$" + }, + "description": "the input interfaces it is opened on, each 1-15 letters, digits, _ . - (optional; none: every input interface that is neither the private network's tunnel nor an outward link, so an outward link is opened only when named)" + }, + "source": { + "type": "string", + "description": "one IPv4 or IPv6 CIDR it is opened to (optional; none: any)" + }, + "until": { + "type": "string", + "description": "when it expires, an RFC 3339 time in the future (optional)" + }, + "why": { + "type": "string", + "minLength": 1, + "maxLength": 500, + "description": "why, in words the operator reads (1-500 characters)" + } + } + }, + "answer": { + "type": "object", + "required": [ + "allowances", + "said" + ], + "properties": { + "allowances": { + "type": "array", + "items": { + "$ref": "#/defs/Kept" + } + }, + "said": { + "type": "boolean", + "description": "allowances-changed was said with change allowed" + } + } + }, + "by-caller": true + }, + { + "name": "disallow", + "description": "Take back allowances: the keys the protocol, port and interfaces name (none: the default set's key) are deleted, or, when one does not exist, it is refused by name and none is deleted. The source is no part of an allowance's identity and is refused as an argument. Written in the hand-act log. Refuses as allow does an unproven caller, an adopted node and a converged that does not answer.", + "replaces": [ + "nft delete rule inet mesh input" + ], + "class": "act", + "input": { + "type": "object", + "additionalProperties": false, + "required": [ + "port", + "why" + ], + "properties": { + "port": { + "type": "integer", + "minimum": 1, + "maximum": 65535, + "description": "the port, 1-65535" + }, + "protocol": { + "type": "string", + "enum": [ + "tcp", + "udp" + ], + "description": "tcp (the default) or udp" + }, + "interfaces": { + "type": "array", + "items": { + "type": "string", + "pattern": "^[A-Za-z0-9_.-]{1,15}$" + }, + "description": "the input interfaces it is opened on, each 1-15 letters, digits, _ . - (optional; none: every input interface that is neither the private network's tunnel nor an outward link, so an outward link is opened only when named)" + }, + "why": { + "type": "string", + "minLength": 1, + "maxLength": 500, + "description": "why, in words the operator reads (1-500 characters)" + } + } + }, + "answer": { + "type": "object", + "required": [ + "allowances", + "said" + ], + "properties": { + "allowances": { + "type": "array", + "items": { + "$ref": "#/defs/Allowance" + }, + "description": "each allowance as removed" + }, + "said": { + "type": "boolean", + "description": "allowances-changed was said with change disallowed" + } + } + }, + "by-caller": true + }, + { + "name": "allowed", + "description": "Every allowance kept for this machine only, with its key, port, protocol, interface, source, until, why, by and at; none on an adopted node. An allowance is removed at its until by the holder, so none answered has expired. The node-engine asks it at every compose of the filter, bound 10 s.", + "class": "read", + "input": { + "type": "object", + "additionalProperties": false, + "properties": {} + }, + "answer": { + "type": "object", + "required": [ + "allowances" + ], + "properties": { + "allowances": { + "type": "array", + "items": { + "$ref": "#/defs/Allowance" + } + } + } + }, + "timeout": 10 + } + ], + "events": [ + { + "name": "allowances-changed", + "subject": "allowances-changed.", + "body": { + "$ref": "#/defs/AllowancesChanged" } } - ] + ], + "family": { + "name": "node-packet-filter.events", + "max-age-days": 7 + }, + "states": [ + { + "name": "allowances", + "template": "state", + "description": "the operator's allowances, one bucket per machine whose keys carry the node: each holder reads and writes its own node's keys only (design 33 control-verbs §9; design 47 H-A-315 (1), H-A-317)", + "key-forms": [ + { + "key": ".allow..", + "value": { + "$ref": "#/defs/AllowanceValue" + }, + "description": "the default set: every input interface that is neither the private network's tunnel nor an outward link" + }, + { + "key": ".allow...", + "value": { + "$ref": "#/defs/AllowanceValue" + }, + "description": "one named input interface: every token after the fourth, since a name may hold a dot" + } + ], + "history": 1 + } + ], + "defs": { + "AllowanceValue": { + "type": "object", + "description": "one allowance as the holder keeps it", + "required": [ + "port", + "protocol", + "why", + "by", + "at" + ], + "properties": { + "port": { + "type": "integer" + }, + "protocol": { + "type": "string", + "enum": [ + "tcp", + "udp" + ] + }, + "interface": { + "type": "string", + "description": "the one input interface it is opened on; absent: every input interface that is neither the private network's tunnel nor an outward link" + }, + "source": { + "type": "string", + "description": "the IPv4 or IPv6 CIDR it is opened to; absent: any" + }, + "until": { + "type": "string", + "description": "when it expires, RFC 3339; absent: never" + }, + "why": { + "type": "string" + }, + "by": { + "type": "string", + "description": "the caller as the bus named it on the request" + }, + "at": { + "type": "string", + "description": "when it was written, RFC 3339, the holder's clock" + } + } + }, + "Allowance": { + "type": "object", + "description": "one allowance: a port opened by hand on this machine, with its key", + "required": [ + "key", + "port", + "protocol", + "why", + "by", + "at" + ], + "properties": { + "key": { + "type": "string", + "description": "its key, allow..[.]: its key in the holder's state without the node" + }, + "port": { + "type": "integer" + }, + "protocol": { + "type": "string", + "enum": [ + "tcp", + "udp" + ] + }, + "interface": { + "type": "string", + "description": "the one input interface it is opened on; absent: every input interface that is neither the private network's tunnel nor an outward link" + }, + "source": { + "type": "string", + "description": "the IPv4 or IPv6 CIDR it is opened to; absent: any" + }, + "until": { + "type": "string", + "description": "when it expires, RFC 3339; absent: never" + }, + "why": { + "type": "string" + }, + "by": { + "type": "string", + "description": "the caller as the bus named it on the request" + }, + "at": { + "type": "string", + "description": "when it was written, RFC 3339, the holder's clock" + } + } + }, + "Kept": { + "type": "object", + "description": "one allowance as allow kept it, with what it replaced", + "required": [ + "key", + "port", + "protocol", + "why", + "by", + "at" + ], + "properties": { + "key": { + "type": "string", + "description": "its key, allow..[.]: its key in the holder's state without the node" + }, + "port": { + "type": "integer" + }, + "protocol": { + "type": "string", + "enum": [ + "tcp", + "udp" + ] + }, + "interface": { + "type": "string", + "description": "the one input interface it is opened on; absent: every input interface that is neither the private network's tunnel nor an outward link" + }, + "source": { + "type": "string", + "description": "the IPv4 or IPv6 CIDR it is opened to; absent: any" + }, + "until": { + "type": "string", + "description": "when it expires, RFC 3339; absent: never" + }, + "why": { + "type": "string" + }, + "by": { + "type": "string", + "description": "the caller as the bus named it on the request" + }, + "at": { + "type": "string", + "description": "when it was written, RFC 3339, the holder's clock" + }, + "outward": { + "type": "string", + "description": "the outward link this allowance opens, when its named interface is one of the outward links the node-engine's converged answered for this call; absent: it opens none" + }, + "replaced": { + "$ref": "#/defs/Allowance" + } + } + }, + "Loaded": { + "type": "object", + "description": "one allowance, marked loaded only when a rule of the mesh's table carries the comment allowance with an equal at", + "required": [ + "key", + "port", + "protocol", + "why", + "by", + "at", + "loaded" + ], + "properties": { + "key": { + "type": "string", + "description": "its key, allow..[.]: its key in the holder's state without the node" + }, + "port": { + "type": "integer" + }, + "protocol": { + "type": "string", + "enum": [ + "tcp", + "udp" + ] + }, + "interface": { + "type": "string", + "description": "the one input interface it is opened on; absent: every input interface that is neither the private network's tunnel nor an outward link" + }, + "source": { + "type": "string", + "description": "the IPv4 or IPv6 CIDR it is opened to; absent: any" + }, + "until": { + "type": "string", + "description": "when it expires, RFC 3339; absent: never" + }, + "why": { + "type": "string" + }, + "by": { + "type": "string", + "description": "the caller as the bus named it on the request" + }, + "at": { + "type": "string", + "description": "when it was written, RFC 3339, the holder's clock" + }, + "loaded": { + "type": "boolean" + } + } + }, + "AllowancesChanged": { + "type": "object", + "required": [ + "node", + "change", + "allowances", + "at" + ], + "properties": { + "node": { + "type": "string" + }, + "change": { + "type": "string", + "enum": [ + "allowed", + "disallowed", + "expired", + "started" + ] + }, + "allowances": { + "type": "array", + "items": { + "$ref": "#/defs/Allowance" + }, + "description": "the allowances concerned; all of them for started" + }, + "by": { + "type": "string", + "description": "who, for allowed and disallowed" + }, + "why": { + "type": "string", + "description": "why, for allowed and disallowed" + }, + "at": { + "type": "string", + "description": "when it was said, RFC 3339" + } + } + }, + "LoadedNotKept": { + "type": "object", + "description": "one allowance comment allowance of the mesh's table whose key is not kept", + "required": [ + "key", + "at" + ], + "properties": { + "key": { + "type": "string", + "description": "the key the comment names, allow..[.]" + }, + "at": { + "type": "string", + "description": "the at the comment names" + } + } + } + } } diff --git a/go/testdata/beside/CAPTURED b/go/testdata/beside/CAPTURED index b4eb72eb..fc6021f8 100644 --- a/go/testdata/beside/CAPTURED +++ b/go/testdata/beside/CAPTURED @@ -25,6 +25,8 @@ mesh-delivery d2d3ebbf44fbf0362edaf78d991615f564644615 modules/mesh-delivery-co mesh-contracts e6ed560e48216024a0ab6851074c134e69a9bc2b seats/node-engine/seat.json, taken again as seat.json.captured (milestone 47/H2, branch feat/47-H2, H-A-452) mesh-delivery 80ff1afacca4c1d2e61b0e31139b140645c8088b modules/mesh-delivery-contracts/seats/mesh-delivery/seat.json, taken again as seat.json.captured (milestone 47/H2, branch feat/47-H2, H-A-452) mesh-delivery 5e94328066198d72cf4fd5d6f1c57b6ad1c8e967 modules/mesh-delivery-contracts/seats/mesh-catalog/seat.json, taken again as seat.json.captured (milestone 47/H2, branch feat/47-H2-i, its form 5, H-A-452) +mesh-contracts 8f2bed18e5ae219489573984fdfddee2d9550288 seats/node-engine/seat.json, taken again as seat.json.captured (milestone 47/H2, branch feat/47-H2, its form 4, H-A-452) +mesh-delivery abfe37e690885956a16fca7c31a5792849e40818 modules/mesh-delivery-contracts/seats/mesh-delivery/seat.json, taken again as seat.json.captured (milestone 47/H2, branch feat/47-H2, H-A-452) mesh-host cdcba9ca73755854d21e4e657d7e46c32b9b5265 internal/apply/placement_guard.go The two seat copies are put back the same way (git show : > .captured, the path kept). To move the others, from this repository's go/ directory, with the two repositories checked out beside mesh-sdk: diff --git a/go/testdata/beside/mesh-contracts/seats/node-engine/seat.json.captured b/go/testdata/beside/mesh-contracts/seats/node-engine/seat.json.captured index a5aac3a6..4711ce8f 100644 --- a/go/testdata/beside/mesh-contracts/seats/node-engine/seat.json.captured +++ b/go/testdata/beside/mesh-contracts/seats/node-engine/seat.json.captured @@ -1,6 +1,6 @@ { "format": 1, - "form": 3, + "form": 4, "seat": "node-engine", "scope": "node", "grain": "whole", @@ -456,6 +456,32 @@ }, "description": "every resource that differs from what runs, when asked" }, + "drift": { + "type": "array", + "description": "when the diff is asked, each directory entry of what runs that the mesh made, as its record holds, whose owner or mode on disk differ from it (H-A-392 (b), H-A-458 (2)): read-only; the engine sets it right at its next start or apply of the module", + "items": { + "type": "object", + "required": [ + "id", + "path", + "drift" + ], + "properties": { + "id": { + "type": "string", + "description": "the directory entry's id in the composition" + }, + "path": { + "type": "string", + "description": "its path on the machine" + }, + "drift": { + "type": "string", + "description": "how its owner or mode on disk differ, in words" + } + } + } + }, "own": { "type": "object", "properties": { @@ -1334,6 +1360,10 @@ "type": "string", "description": "the composition run's pipeline sequence, in decimal, the module was applied from (design 47 H2 §813 (1), H-A-388): a restarted engine applies no older run again" }, + "pipeline": { + "type": "string", + "description": "the pipeline of the want the module was applied from, its key ., beside its run (H-A-429 (1), H-A-458 (1)): a want's run is compared with this run only when the want names the same; absent for a want in none" + }, "kept": { "type": "array", "items": { diff --git a/go/testdata/beside/mesh-delivery/modules/mesh-delivery-contracts/seats/mesh-delivery/seat.json.captured b/go/testdata/beside/mesh-delivery/modules/mesh-delivery-contracts/seats/mesh-delivery/seat.json.captured index eb8d844e..08e74ab4 100644 --- a/go/testdata/beside/mesh-delivery/modules/mesh-delivery-contracts/seats/mesh-delivery/seat.json.captured +++ b/go/testdata/beside/mesh-delivery/modules/mesh-delivery-contracts/seats/mesh-delivery/seat.json.captured @@ -649,6 +649,10 @@ "type": "string", "format": "date-time", "description": "when the gate first said it" + }, + "record": { + "type": "string", + "description": "the delivery record the act is for, by its source revision, .; absent on an act said before it was named, which bridge_owed_again by record never finds (design 47 H2 §807, H-A-432)" } }, "required": [