@rcpooley/concord 0.6.3 → 0.7.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/README.md CHANGED
@@ -392,8 +392,8 @@ makes up a missed one.
392
392
  **`cloudflare`** — a declared zone is shared. Every record the module writes
393
393
  carries a comment marked `concord:<id>`, and only marked records are ever
394
394
  edited or deleted; anything else in the zone is reported once per run and left
395
- alone. It is the systemd sweeper's rule (`X-Concord=1`) rather than the docker
396
- sweeper's: the module can only ever remove what it created.
395
+ alone. It is the sweepers' rule (`X-Concord=1` on units, the `dev.concord.app`
396
+ label on containers): the module can only ever remove what it created.
397
397
 
398
398
  That is what lets a human co-own a zone — add a record in the dashboard and
399
399
  Concord will not touch it. The cost is that Concord will not adopt one either:
@@ -2,21 +2,24 @@ import { Module } from '../../module.js';
2
2
  import type { DockerOp } from './index.js';
3
3
  import type { HostConfig } from '../../schema.js';
4
4
  /**
5
- * End-of-run host-truth enforcement for containers — the porkbun rule applied
6
- * to hosts: the declared set is the WHOLE truth, because nothing runs a
7
- * container outside Concord (schema 8).
5
+ * End-of-run host-truth enforcement for the containers Concord created: a
6
+ * container carrying Concord's project label (`dev.concord.app`) that no docker
7
+ * module on the host declares any more is removed within a cycle. That is how
8
+ * deleting an app file, or moving it to another host, takes its container
9
+ * down. What it will NEVER remove: volumes. Containers are reproducible; the
10
+ * data under them is not.
8
11
  *
9
- * Unlike the systemd sweeper, which can only remove what carries the tag
10
- * Concord wrote, this removes ANY live container no docker module on the host
11
- * declares — labelled or not. That is deliberate and approved: an unowned
12
- * container is drift whether Concord created it or a hand-run `docker run`
13
- * did, and it is removed within a cycle. What it will NEVER remove: volumes.
14
- * Containers are reproducible; the data under them is not.
12
+ * By default (`containerSweep: 'labelled'`, since 0.7.0) this is the systemd
13
+ * sweeper's rule: Concord removes only what it created. A container with no
14
+ * Concord label (a hand-run `docker run`, or another deployer such as
15
+ * Bellwether sharing the host under its own `dev.bellwether.*` labels) is not
16
+ * Concord's to judge, and is left alone. Every container Concord starts gets
17
+ * the label, because the docker module's rendered compose project always
18
+ * writes it (render.ts), so nothing Concord made escapes the sweep.
15
19
  *
16
- * The exception is per HOST, not per container: a host declaring
17
- * `containerSweep: 'labelled'` (a dev machine, where hand-run containers are
18
- * the work) gets a sweeper that only removes containers carrying Concord's
19
- * label. Concord still cleans up its own orphans there.
20
+ * A host may opt back into the old rule, `containerSweep: 'all'`: ANY live
21
+ * container no module declares is removed, labelled or not, for a host where
22
+ * nothing but Concord may run a container. It was the default until 0.7.0.
20
23
  *
21
24
  * Never declared in config. The loader synthesizes one per registry host and
22
25
  * appends it after every declared module, so removals run last: a moved app
@@ -1 +1 @@
1
- {"version":3,"file":"sweeper.d.ts","sourceRoot":"","sources":["../../../src/modules/docker/sweeper.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,MAAM,EAAE,MAAM,iBAAiB,CAAA;AAGxC,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAA;AAC1C,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAA;AAEjD;;;;;;;;;;;;;;;;;;;;GAoBG;AAEH;;;;;;GAMG;AACH,MAAM,WAAW,gBAAgB;IAC/B,IAAI,EAAE,MAAM,CAAA;IACZ,OAAO,EAAE,MAAM,GAAG,IAAI,CAAA;IACtB,KAAK,EAAE,MAAM,CAAA;IACb,MAAM,EAAE,MAAM,CAAA;CACf;AAED,MAAM,WAAW,gBAAgB;IAC/B,OAAO,EAAE,gBAAgB,EAAE,CAAA;CAC5B;AAED,4DAA4D;AAC5D,MAAM,MAAM,cAAc,GAAG,UAAU,CAAC,gBAAgB,CAAC,CAAA;AAKzD;;;;;;;GAOG;AACH,wBAAgB,YAAY,CAC1B,MAAM,EAAE,MAAM,EACd,IAAI,EAAE,WAAW,CAAC,MAAM,CAAC,EACzB,IAAI,GAAE,cAAsB,GAC3B,gBAAgB,EAAE,CAcpB;AAED,qBAAa,aAAc,SAAQ,MAAM,CAAC,gBAAgB,EAAE,QAAQ,CAAC;IAKjE,OAAO,CAAC,QAAQ,CAAC,IAAI;IACrB,OAAO,CAAC,QAAQ,CAAC,IAAI;IALvB,SAAkB,IAAI,YAAW;gBAG/B,IAAI,EAAE,MAAM,EACK,IAAI,EAAE,WAAW,CAAC,MAAM,CAAC,EACzB,IAAI,GAAE,cAAsB;IAKzC,OAAO,IAAI,OAAO,CAAC,gBAAgB,CAAC;IAI1C;8EAC0E;IACpE,IAAI,IAAI,OAAO,CAAC,gBAAgB,CAAC;IAUvC,IAAI,CAAC,MAAM,EAAE,gBAAgB,EAAE,QAAQ,EAAE,gBAAgB,GAAG,QAAQ,EAAE;IAkBhE,KAAK,CAAC,GAAG,EAAE,QAAQ,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;CAoB5C"}
1
+ {"version":3,"file":"sweeper.d.ts","sourceRoot":"","sources":["../../../src/modules/docker/sweeper.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,MAAM,EAAE,MAAM,iBAAiB,CAAA;AAGxC,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAA;AAC1C,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAA;AAEjD;;;;;;;;;;;;;;;;;;;;;;;GAuBG;AAEH;;;;;;GAMG;AACH,MAAM,WAAW,gBAAgB;IAC/B,IAAI,EAAE,MAAM,CAAA;IACZ,OAAO,EAAE,MAAM,GAAG,IAAI,CAAA;IACtB,KAAK,EAAE,MAAM,CAAA;IACb,MAAM,EAAE,MAAM,CAAA;CACf;AAED,MAAM,WAAW,gBAAgB;IAC/B,OAAO,EAAE,gBAAgB,EAAE,CAAA;CAC5B;AAED,4DAA4D;AAC5D,MAAM,MAAM,cAAc,GAAG,UAAU,CAAC,gBAAgB,CAAC,CAAA;AAKzD;;;;;;;GAOG;AACH,wBAAgB,YAAY,CAC1B,MAAM,EAAE,MAAM,EACd,IAAI,EAAE,WAAW,CAAC,MAAM,CAAC,EACzB,IAAI,GAAE,cAA2B,GAChC,gBAAgB,EAAE,CAepB;AAED,qBAAa,aAAc,SAAQ,MAAM,CAAC,gBAAgB,EAAE,QAAQ,CAAC;IAKjE,OAAO,CAAC,QAAQ,CAAC,IAAI;IACrB,OAAO,CAAC,QAAQ,CAAC,IAAI;IALvB,SAAkB,IAAI,YAAW;gBAG/B,IAAI,EAAE,MAAM,EACK,IAAI,EAAE,WAAW,CAAC,MAAM,CAAC,EACzB,IAAI,GAAE,cAA2B;IAK9C,OAAO,IAAI,OAAO,CAAC,gBAAgB,CAAC;IAI1C;8EAC0E;IACpE,IAAI,IAAI,OAAO,CAAC,gBAAgB,CAAC;IAUvC,IAAI,CAAC,MAAM,EAAE,gBAAgB,EAAE,QAAQ,EAAE,gBAAgB,GAAG,QAAQ,EAAE;IAkBhE,KAAK,CAAC,GAAG,EAAE,QAAQ,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;CAoB5C"}
@@ -12,7 +12,7 @@ const sq = (s) => `'${s.replace(/'/g, `'\\''`)}'`;
12
12
  * name is treated as no project at all: the container is still removed, just
13
13
  * directly rather than via compose (and never through a path built from it).
14
14
  */
15
- export function parseUnowned(stdout, keep, mode = 'all') {
15
+ export function parseUnowned(stdout, keep, mode = 'labelled') {
16
16
  const strays = [];
17
17
  for (const line of stdout.split('\n')) {
18
18
  if (!line.trim())
@@ -20,8 +20,9 @@ export function parseUnowned(stdout, keep, mode = 'all') {
20
20
  const [name, label, image, status] = line.split('\t');
21
21
  if (!name)
22
22
  continue;
23
- // `labelled`: a container with no Concord label is not Concord's to judge.
24
- // Keyed on the RAW label, so a forged-but-present value is still swept.
23
+ // `labelled` (the default): a container with no Concord label is not
24
+ // Concord's to judge — someone else started it. Keyed on the RAW label,
25
+ // so a forged-but-present value is still swept.
25
26
  if (mode === 'labelled' && !label)
26
27
  continue;
27
28
  const project = label && /^[a-z0-9][a-z0-9-]*$/.test(label) ? label : null;
@@ -35,7 +36,7 @@ export class DockerSweeper extends Module {
35
36
  keep;
36
37
  mode;
37
38
  kind = 'docker';
38
- constructor(host, keep, mode = 'all') {
39
+ constructor(host, keep, mode = 'labelled') {
39
40
  super('sweep', host);
40
41
  this.keep = keep;
41
42
  this.mode = mode;
@@ -1 +1 @@
1
- {"version":3,"file":"sweeper.js","sourceRoot":"","sources":["../../../src/modules/docker/sweeper.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"sweeper.js","sourceRoot":"","sources":["../../../src/modules/docker/sweeper.ts"],"names":[],"mappings":"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"}
package/dist/schema.d.ts CHANGED
@@ -67,6 +67,9 @@ export type HostRegistry = z.input<typeof HostRegistrySchema>;
67
67
  * appears. What did NOT change: the docker sweeper still removes ANY
68
68
  * undeclared container, labelled or not — unlike the
69
69
  * systemd sweeper, which only ever removes what carries Concord's tag.
70
+ * (Since 0.7.0 the default host `containerSweep` is `labelled`, so by
71
+ * default the docker sweeper follows systemd's rule too. Not a shape
72
+ * change, so no bump: `all` is still accepted, as an opt-in.)
70
73
  * 7: systemd units became HOST-TRUTH, the way containers did in 6 — but as a
71
74
  * property of the module KIND, not of the config. Every rendered unit
72
75
  * carries `X-Concord=1`; the loader synthesizes one sweeper per host that
@@ -1 +1 @@
1
- {"version":3,"file":"schema.d.ts","sourceRoot":"","sources":["../src/schema.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAA;AAGvB;;;;;;;;;;GAUG;AACH,eAAO,MAAM,UAAU;;;;;;;;;;;;;;;kBAiCZ,CAAA;AAEX,wEAAwE;AACxE,eAAO,MAAM,kBAAkB;;;;;;;;;;;;;;;mBAc3B,CAAA;AAEJ,MAAM,MAAM,UAAU,GAAG,CAAC,CAAC,MAAM,CAAC,OAAO,UAAU,CAAC,CAAA;AACpD,MAAM,MAAM,YAAY,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,kBAAkB,CAAC,CAAA;AAU7D;;;;;;;;;;GAUG;AACH;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA6CG;AACH,eAAO,MAAM,cAAc,IAAI,CAAA;AAE/B;;;;;;;GAOG;AACH,eAAO,MAAM,kBAAkB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;4BAS7B,CAAA;AAEF;;GAEG;AACH,MAAM,MAAM,YAAY,GAAG,CAAC,CAAC,MAAM,CAAC,OAAO,kBAAkB,CAAC,CAAA;AAE9D;;;;;;GAMG;AACH,MAAM,MAAM,iBAAiB,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,kBAAkB,CAAC,CAAA;AAElE;;;;;;;GAOG;AACH,eAAO,MAAM,cAAc;;;;kBAuBhB,CAAA;AAEX,MAAM,MAAM,QAAQ,GAAG,CAAC,CAAC,MAAM,CAAC,OAAO,cAAc,CAAC,CAAA;AAEtD,eAAO,MAAM,mBAAmB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;kBAYrB,CAAA;AAEX;;;;;;;;;;;;;GAaG;AACH;;;;GAIG;AACH,KAAK,QAAQ,CAAC,CAAC,EAAE,CAAC,SAAS,MAAM,IAAI,CAAC,SAAS;IAAE,IAAI,EAAE,MAAM,CAAA;CAAE,GAC3D,IAAI,CAAC,CAAC,EAAE,MAAM,CAAC,GAAG;IAAE,IAAI,EAAE,CAAC,CAAA;CAAE,GAC7B,CAAC,CAAA;AAEL,MAAM,MAAM,aAAa,CAAC,EAAE,SAAS,YAAY,GAAG,YAAY,IAAI;IAClE,aAAa,EAAE,OAAO,cAAc,CAAA;IACpC,KAAK,EAAE,EAAE,CAAA;IACT,QAAQ,CAAC,EAAE,CAAC,CAAC,KAAK,CAAC,OAAO,cAAc,CAAC,CAAA;IACzC,OAAO,EAAE,QAAQ,CAAC,iBAAiB,EAAE,OAAO,CAAC,MAAM,EAAE,EAAE,MAAM,CAAC,CAAC,EAAE,CAAA;CAClE,CAAA"}
1
+ {"version":3,"file":"schema.d.ts","sourceRoot":"","sources":["../src/schema.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAA;AAGvB;;;;;;;;;;GAUG;AACH,eAAO,MAAM,UAAU;;;;;;;;;;;;;;;kBAyCZ,CAAA;AAEX,wEAAwE;AACxE,eAAO,MAAM,kBAAkB;;;;;;;;;;;;;;;mBAc3B,CAAA;AAEJ,MAAM,MAAM,UAAU,GAAG,CAAC,CAAC,MAAM,CAAC,OAAO,UAAU,CAAC,CAAA;AACpD,MAAM,MAAM,YAAY,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,kBAAkB,CAAC,CAAA;AAU7D;;;;;;;;;;GAUG;AACH;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAgDG;AACH,eAAO,MAAM,cAAc,IAAI,CAAA;AAE/B;;;;;;;GAOG;AACH,eAAO,MAAM,kBAAkB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;4BAS7B,CAAA;AAEF;;GAEG;AACH,MAAM,MAAM,YAAY,GAAG,CAAC,CAAC,MAAM,CAAC,OAAO,kBAAkB,CAAC,CAAA;AAE9D;;;;;;GAMG;AACH,MAAM,MAAM,iBAAiB,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,kBAAkB,CAAC,CAAA;AAElE;;;;;;;GAOG;AACH,eAAO,MAAM,cAAc;;;;kBAuBhB,CAAA;AAEX,MAAM,MAAM,QAAQ,GAAG,CAAC,CAAC,MAAM,CAAC,OAAO,cAAc,CAAC,CAAA;AAEtD,eAAO,MAAM,mBAAmB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;kBAYrB,CAAA;AAEX;;;;;;;;;;;;;GAaG;AACH;;;;GAIG;AACH,KAAK,QAAQ,CAAC,CAAC,EAAE,CAAC,SAAS,MAAM,IAAI,CAAC,SAAS;IAAE,IAAI,EAAE,MAAM,CAAA;CAAE,GAC3D,IAAI,CAAC,CAAC,EAAE,MAAM,CAAC,GAAG;IAAE,IAAI,EAAE,CAAC,CAAA;CAAE,GAC7B,CAAC,CAAA;AAEL,MAAM,MAAM,aAAa,CAAC,EAAE,SAAS,YAAY,GAAG,YAAY,IAAI;IAClE,aAAa,EAAE,OAAO,cAAc,CAAA;IACpC,KAAK,EAAE,EAAE,CAAA;IACT,QAAQ,CAAC,EAAE,CAAC,CAAC,KAAK,CAAC,OAAO,cAAc,CAAC,CAAA;IACzC,OAAO,EAAE,QAAQ,CAAC,iBAAiB,EAAE,OAAO,CAAC,MAAM,EAAE,EAAE,MAAM,CAAC,CAAC,EAAE,CAAA;CAClE,CAAA"}
package/dist/schema.js CHANGED
@@ -35,14 +35,22 @@ export const HostSchema = z
35
35
  */
36
36
  skipIfUnreachable: z.boolean().default(false),
37
37
  /**
38
- * What this host's docker sweep may remove. `all` (the default) removes ANY container no module declares,
39
- * labelled or not. `labelled` removes only containers carrying Concord's
40
- * project label: Concord still cleans up after itself, but containers
41
- * something else started are left alone. For a development machine, where
42
- * sessions run `docker run` / `compose up` by hand and those containers
43
- * are the work, not drift. A property of the MACHINE, like the flag above.
38
+ * What this host's docker sweep may remove. `labelled` (the default)
39
+ * removes only containers carrying Concord's project label
40
+ * (`dev.concord.app`) that no module declares: Concord cleans up after
41
+ * itself, and containers something else started (a hand-run `docker run`,
42
+ * another deployer sharing the host) are left alone. `all` removes ANY
43
+ * container no module declares, labelled or not, for a host where nothing
44
+ * but Concord may run a container. Opt-in only: it would remove every
45
+ * container another deployer runs there. A property of the MACHINE, like
46
+ * the flag above.
47
+ *
48
+ * The default was `all` until 0.7.0. Flipping it removed nothing: every
49
+ * container Concord starts goes through the docker module's rendered
50
+ * compose project, which always carries the label, so `labelled` only
51
+ * ever spares containers Concord did not create.
44
52
  */
45
- containerSweep: z.enum(['all', 'labelled']).default('all'),
53
+ containerSweep: z.enum(['all', 'labelled']).default('labelled'),
46
54
  })
47
55
  .strict();
48
56
  /** Hosts by name. Module `host` fields are typed against these keys. */
@@ -91,6 +99,9 @@ import { CloudflareConfigSchema } from './modules/cloudflare/schema.js';
91
99
  * appears. What did NOT change: the docker sweeper still removes ANY
92
100
  * undeclared container, labelled or not — unlike the
93
101
  * systemd sweeper, which only ever removes what carries Concord's tag.
102
+ * (Since 0.7.0 the default host `containerSweep` is `labelled`, so by
103
+ * default the docker sweeper follows systemd's rule too. Not a shape
104
+ * change, so no bump: `all` is still accepted, as an opt-in.)
94
105
  * 7: systemd units became HOST-TRUTH, the way containers did in 6 — but as a
95
106
  * property of the module KIND, not of the config. Every rendered unit
96
107
  * carries `X-Concord=1`; the loader synthesizes one sweeper per host that
@@ -1 +1 @@
1
- {"version":3,"file":"schema.js","sourceRoot":"","sources":["../src/schema.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"schema.js","sourceRoot":"","sources":["../src/schema.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@rcpooley/concord",
3
- "version": "0.6.3",
3
+ "version": "0.7.0",
4
4
  "description": "Declarative config reconciler: edit a typed config repo, push it, and your hosts converge. Also exports the schema library config repos import.",
5
5
  "license": "MIT",
6
6
  "homepage": "https://github.com/rcpooley/concord#readme",