From f928b0b330eb76f24d27022561296bc9aa4c1cc6 Mon Sep 17 00:00:00 2001 From: lex00 <121451605+lex00@users.noreply.github.com> Date: Tue, 17 Nov 2026 09:37:56 -0700 Subject: [PATCH 01/12] feat(compare): one state-file page for choudoufu and plunge, with a cell diagram --- astro.config.mjs | 3 +- src/components/Landing.astro | 2 +- src/components/StateCells.astro | 197 ++++++++++++++++++ .../compare/choudoufu-and-terraform-state.mdx | 15 -- src/content/docs/compare/state-file.mdx | 27 +++ src/content/docs/tools.mdx | 4 +- src/data/compare-choudoufu-state.mjs | 4 + src/data/compare-plunge-state.mjs | 77 +++++++ src/data/rooms.mjs | 2 +- 9 files changed, 311 insertions(+), 20 deletions(-) create mode 100644 src/components/StateCells.astro delete mode 100644 src/content/docs/compare/choudoufu-and-terraform-state.mdx create mode 100644 src/content/docs/compare/state-file.mdx create mode 100644 src/data/compare-plunge-state.mjs diff --git a/astro.config.mjs b/astro.config.mjs index 20c2dcd..2f1d154 100644 --- a/astro.config.mjs +++ b/astro.config.mjs @@ -11,6 +11,7 @@ export default defineConfig({ redirects: { // The compare index only repeated the sidebar; its URL lands on the main comparison. '/compare/': '/compare/terraform-platforms/', + '/compare/choudoufu-and-terraform-state/': '/compare/state-file/', '/compare/control-planes/': '/compare/terraform-platforms/', // chant, CDK and Pulumi is argued on the blog and in chant's docs. '/compare/chant-cdk-and-pulumi/': 'https://intentius.io/chant/', @@ -87,7 +88,7 @@ export default defineConfig({ { label: 'Compare', collapsed: true, - items: ['compare/terraform-platforms', 'compare/choudoufu-and-terraform-state'], + items: ['compare/terraform-platforms', 'compare/state-file'], }, { label: 'About', diff --git a/src/components/Landing.astro b/src/components/Landing.astro index edab700..464617d 100644 --- a/src/components/Landing.astro +++ b/src/components/Landing.astro @@ -16,7 +16,7 @@ const { part = 'top' } = Astro.props; // One row of cards under the header, each straight into a page of the site. const cards = [ { title: 'Comparing Intentius to the rest', body: "Free, against each vendor's top tier.", href: '/compare/terraform-platforms/' }, - { title: 'choudoufu and the state file', body: 'The owner on the resource, no state lock.', href: '/compare/choudoufu-and-terraform-state/' }, + { title: 'choudoufu, plunge and the state file', body: 'The owner on the resource, for OpenTofu and Pulumi.', href: '/compare/state-file/' }, { title: 'Move off another runner', body: 'Atlantis, Terraform Cloud or Spacelift, one repo at a time.', href: '/for/moving/' }, { title: 'Carve up a large estate', body: 'Hundreds of roots, or one state file shared by too many teams.', href: '/for/estate/' }, ]; diff --git a/src/components/StateCells.astro b/src/components/StateCells.astro new file mode 100644 index 0000000..5d57f50 --- /dev/null +++ b/src/components/StateCells.astro @@ -0,0 +1,197 @@ +--- +// The state model as cells. Rows are the three jobs a state file does +// (identity, values, writes) and a fourth for the estate. The stock column +// is one tall cell, one file under one lock; choudoufu and plunge each give +// every job its own cell; the estate row joins the two into one cell, an +// estate named by a label on the resources. Pure HTML and CSS, so it reads +// without script and in both themes. +const C = 'https://intentius.io/choudoufu'; +const P = 'https://intentius.io/plunge'; +--- +
+
+
+
One state fileterraform.tfstate or a Pulumi checkpoint, under one lock
+ choudoufufor OpenTofu + plungefor Pulumi + +
Identitywhich live object is which
+
Valueswhat a read can't give back
+
Writestwo runs at once
+ +
+
Identityaddress to object, in the file
+
Valuesin the file
+
Writesone lock on the file
+ +
+ + + tofu-estate = prod-networking + tofu-address = aws_vpc.main +

A marker on the resource itself, written by the create call.

+
+ + plunge-stack = payments/prod + plunge-urn = …Bucket::receipts +

The same, keyed by stack and URN. Labels carry a digest.

+
+ + + +

A record per resource holds only what a read leaves out, such as a generated password. The state file stays on as a cache you can delete.

+
+ + +

A record per resource holds its full state, secrets as ciphertext. There is no checkpoint to keep.

+
+ + + +

No lock. Each record write is conditional, so applies on different resources both land and a clash is refused by name.

+
+ + +

No stack lock. Updates on different resources both land, and a stale saved plan is refused naming the record that moved.

+
+ +
Estatewhat belongs together
+

The list inside the state file. Only the tool holding it can say what is owned.

+
+ +
    +
  • List it with any tool that filters by tag or label, no state file needed.
  • +
  • Fence it with an IAM condition on the label, so a role reaches one estate.
  • +
  • Run both in one chant workspace, an OpenTofu root beside a Pulumi stack.
  • +
+
+
+
A stock state file holds identity, values and writes together, under one lock. choudoufu and plunge give each job its own place: the identity on the resource, the values in a record per resource, and a conditional write per record in place of the lock. With the owner on the resource, an estate is whatever carries its label.
+
+ + diff --git a/src/content/docs/compare/choudoufu-and-terraform-state.mdx b/src/content/docs/compare/choudoufu-and-terraform-state.mdx deleted file mode 100644 index c38d77e..0000000 --- a/src/content/docs/compare/choudoufu-and-terraform-state.mdx +++ /dev/null @@ -1,15 +0,0 @@ ---- -title: "choudoufu and the Terraform state file" -wide: true -tableOfContents: false -description: "Same HCL, same providers, same plan. Ownership moves onto the resource." ---- - -import Arenas from '../../../components/Arenas.astro'; -import * as data from '../../../data/compare-choudoufu-state.mjs'; - -A state file does three jobs. It says which live resource an address refers to, holds values the cloud cannot, and records that an effect happened. [choudoufu](https://intentius.io/choudoufu/) takes them apart, and the state file becomes a cache you may lose. - -Everything else is stock OpenTofu. - - diff --git a/src/content/docs/compare/state-file.mdx b/src/content/docs/compare/state-file.mdx new file mode 100644 index 0000000..78d37c8 --- /dev/null +++ b/src/content/docs/compare/state-file.mdx @@ -0,0 +1,27 @@ +--- +title: "choudoufu, plunge and the state file" +wide: true +tableOfContents: false +description: "A state file holds identity, values and writes in one file under one lock. choudoufu for OpenTofu and plunge for Pulumi split them, and an estate becomes whatever carries its label." +--- + +import Arenas from '../../../components/Arenas.astro'; +import StateCells from '../../../components/StateCells.astro'; +import * as cdf from '../../../data/compare-choudoufu-state.mjs'; +import * as pl from '../../../data/compare-plunge-state.mjs'; + +A Terraform state file and a Pulumi checkpoint do three jobs in one file. They say which live object an address refers to, hold the values the cloud can't give back, and keep two runs from writing over each other. One lock covers all of it. [choudoufu](https://intentius.io/choudoufu/) and [plunge](https://intentius.io/plunge/) split those jobs apart and leave your configuration and programs as they are. + + + +## choudoufu and the Terraform state file + +Same HCL, same providers, same plan. Everything else is stock OpenTofu. + + + +## plunge and the Pulumi checkpoint + +Your Pulumi programs, SDKs and providers run unchanged. + + diff --git a/src/content/docs/tools.mdx b/src/content/docs/tools.mdx index 9081c0c..4d3318b 100644 --- a/src/content/docs/tools.mdx +++ b/src/content/docs/tools.mdx @@ -34,13 +34,13 @@ Declares an agent's sandbox, its secrets and its schedule as ordinary infrastruc , and the engine terragucci can run with `binary: choudoufu`. Every resource records who owns it on the resource itself, as tags or labels on the three big clouds and Kubernetes. The state file becomes a copy you are allowed to lose. -[Docs](https://intentius.io/choudoufu/) · [Source](https://github.com/INTENTIUS/choudoufu) · [Compare](/compare/choudoufu-and-terraform-state/) +[Docs](https://intentius.io/choudoufu/) · [Source](https://github.com/INTENTIUS/choudoufu) · [Compare](/compare/state-file/) ## plunge , and the engine plywood can run with `engine: plunge`. This fork of Pulumi has a drop-in CLI that runs your programs as they are. plunge keeps one record per resource in place of one state file per stack and writes two ownership tags on each cloud object, so two runs that change different resources of one stack do not wait for each other. -[Docs](https://intentius.io/plunge/) · [Source](https://github.com/INTENTIUS/plunge) · [Compare](/compare/terraform-platforms/) +[Docs](https://intentius.io/plunge/) · [Source](https://github.com/INTENTIUS/plunge) · [Compare](/compare/state-file/) ## plywood diff --git a/src/data/compare-choudoufu-state.mjs b/src/data/compare-choudoufu-state.mjs index dc058ed..ba3352e 100644 --- a/src/data/compare-choudoufu-state.mjs +++ b/src/data/compare-choudoufu-state.mjs @@ -7,6 +7,10 @@ export const LABEL = 'choudoufu and the Terraform state file compared'; export const READ_ON = '2026-10-25'; +export const PREFIX = 'cdf-'; + +export const LEVEL = 3; + export const TRADEMARKS = 'Terraform is a trademark of HashiCorp, an IBM Company. OpenTofu is a trademark of The Linux Foundation.'; export const VENDORS = [ diff --git a/src/data/compare-plunge-state.mjs b/src/data/compare-plunge-state.mjs new file mode 100644 index 0000000..e0ab611 --- /dev/null +++ b/src/data/compare-plunge-state.mjs @@ -0,0 +1,77 @@ +// plunge against the stock Pulumi checkpoint, as arenas for Arenas.astro. +// Same shape as compare-choudoufu-state.mjs. plunge cells state only what +// plunge's published docs describe. + +export const LABEL = 'plunge and the Pulumi checkpoint compared'; + +export const READ_ON = '2026-11-17'; + +export const PREFIX = 'pl-'; + +export const HEAD = false; + +export const LEVEL = 3; + +export const TRADEMARKS = 'Pulumi and the Pulumi logo are trademarks of Pulumi Corporation, and plunge has no tie to it.'; + +export const VENDORS = [ + { id: 'pl', name: 'plunge', logo: { dark: '/brand/vendors/plunge.png', light: '/brand/vendors/plunge.png' }, named: true, link: true, color: '#4a9fd0', href: 'https://intentius.io/plunge/' }, + { id: 'pu', name: 'Pulumi', logo: { dark: '/brand/vendors/pulumi-on-dark.svg', light: '/brand/vendors/pulumi-on-light.svg' }, icon: true, color: '#a35dc9', href: 'https://www.pulumi.com/docs/iac/concepts/state-and-backends/' }, +]; + +const P = 'https://intentius.io/plunge'; +const S = 'https://www.pulumi.com/docs/iac/concepts/state-and-backends/'; + +export const ARENAS = [ + { + id: 'access', title: 'Who can touch what', + rows: [ + { q: 'The permission unit', + pl: ['good', 'one resource', `${P}/how-it-works/identity/`], + pu: ['warn', 'one stack', S] }, + { q: 'Narrowing access', + pl: ['good', 'an IAM condition on the plunge-stack tag', `${P}/aws/gate/`], + pu: ['warn', 'split the stack', S] }, + ], + }, + { + id: 'failure', title: 'When something breaks', + blurb: 'A crash, a killed run, a delete nobody meant.', + rows: [ + { q: 'A create that already landed', + pl: ['good', 'the next create lists by marker and binds it', `${P}/how-it-works/concurrency/`], + pu: ['warn', 'a pending operation to resolve', S] }, + { q: 'A run that would delete an object', + pl: ['good', 'checks the live marker first', `${P}/how-it-works/deletes/`], + pu: ['warn', 'deletes what the checkpoint lists', S] }, + { q: 'Losing the store', + pl: ['warn', 'records hold full state; bucket versioning keeps their versions', `${P}/how-it-works/records/`], + pu: ['warn', 'restore the checkpoint from a backup', S] }, + ], + }, + { + id: 'concurrency', title: 'Two changes at once', + rows: [ + { q: 'What one update holds', + pl: ['good', 'no stack lock; each record is its own write', `${P}/how-it-works/concurrency/`], + pu: ['warn', 'the stack lock', S] }, + { q: 'Updates on different resources', + pl: ['good', 'both land', `${P}/how-it-works/concurrency/`], + pu: ['warn', 'one at a time per stack', S] }, + { q: 'A saved plan another run made stale', + pl: ['good', 'refused, naming the moved record', `${P}/how-it-works/concurrency/`], + pu: ['warn', 'checked against the plan\'s constraints', 'https://www.pulumi.com/docs/iac/concepts/update-plans/'] }, + ], + }, + { + id: 'reach', title: 'Where it runs', + rows: [ + { q: 'Platforms', + pl: ['warn', 'AWS, Kubernetes, GCP and Azure', `${P}/`], + pu: ['good', 'every provider', S] }, + { q: 'Stack history', + pl: ['warn', 'not kept; record versions stay in the bucket', `${P}/how-it-works/`], + pu: ['good', 'kept', S] }, + ], + }, +]; diff --git a/src/data/rooms.mjs b/src/data/rooms.mjs index 73a3d0f..4c45ea4 100644 --- a/src/data/rooms.mjs +++ b/src/data/rooms.mjs @@ -36,7 +36,7 @@ export const ROOMS = [ ], read: [ { label: 'Fractional retainer', href: '/work/#fractional-devops-retainer-from-8000-a-month' }, - { label: 'choudoufu and the state file', href: '/compare/choudoufu-and-terraform-state/' }, + { label: 'choudoufu, plunge and the state file', href: '/compare/state-file/' }, ], }, { From cb2d993b990142b676834477795efd1ae1e2bda2 Mon Sep 17 00:00:00 2001 From: lex00 <121451605+lex00@users.noreply.github.com> Date: Tue, 17 Nov 2026 09:42:04 -0700 Subject: [PATCH 02/12] docs(compare): positive, shorter wording on the state-file page --- src/components/StateCells.astro | 32 ++++++++++++------------- src/content/docs/compare/state-file.mdx | 2 +- src/data/compare-choudoufu-state.mjs | 14 +++++------ src/data/compare-plunge-state.mjs | 10 ++++---- 4 files changed, 29 insertions(+), 29 deletions(-) diff --git a/src/components/StateCells.astro b/src/components/StateCells.astro index 5d57f50..9c1bffb 100644 --- a/src/components/StateCells.astro +++ b/src/components/StateCells.astro @@ -11,16 +11,16 @@ const P = 'https://intentius.io/plunge';
-
One state fileterraform.tfstate or a Pulumi checkpoint, under one lock
+
One state fileterraform.tfstate or a Pulumi checkpoint, one lock
choudoufufor OpenTofu plungefor Pulumi -
Identitywhich live object is which
-
Valueswhat a read can't give back
-
Writestwo runs at once
+
Identityaddress to live object
+
Valuespasswords, random names
+
Writesruns side by side
-
Identityaddress to object, in the file
+
Identityin the file
Valuesin the file
Writesone lock on the file
@@ -29,34 +29,34 @@ const P = 'https://intentius.io/plunge'; tofu-estate = prod-networking tofu-address = aws_vpc.main -

A marker on the resource itself, written by the create call.

+

A marker on the resource, written at create.

plunge-stack = payments/prod plunge-urn = …Bucket::receipts -

The same, keyed by stack and URN. Labels carry a digest.

+

Keyed by stack and URN, as a digest on labels.

-

A record per resource holds only what a read leaves out, such as a generated password. The state file stays on as a cache you can delete.

+

A record per resource for generated values. The state file becomes a local cache.

-

A record per resource holds its full state, secrets as ciphertext. There is no checkpoint to keep.

+

A record per resource with its full state, secrets encrypted.

-

No lock. Each record write is conditional, so applies on different resources both land and a clash is refused by name.

+

A conditional write per record. Applies on different resources land together.

-

No stack lock. Updates on different resources both land, and a stale saved plan is refused naming the record that moved.

+

A conditional write per record. Updates on different resources land together.

-
Estatewhat belongs together
-

The list inside the state file. Only the tool holding it can say what is owned.

+
Estateresources that belong together
+

The resource list inside the state file.

    -
  • List it with any tool that filters by tag or label, no state file needed.
  • -
  • Fence it with an IAM condition on the label, so a role reaches one estate.
  • +
  • List it with any tool that filters by tag or label.
  • +
  • Fence it with an IAM condition on the label.
  • Run both in one chant workspace, an OpenTofu root beside a Pulumi stack.
-
A stock state file holds identity, values and writes together, under one lock. choudoufu and plunge give each job its own place: the identity on the resource, the values in a record per resource, and a conditional write per record in place of the lock. With the owner on the resource, an estate is whatever carries its label.
+
A stock state file holds identity, values and writes in one file under one lock. choudoufu and plunge give each its own place: identity on the resource, values in a record per resource, and a conditional write per record. An estate is whatever carries its label.
diff --git a/src/components/StateCells.astro b/src/components/StateCells.astro index 9c1bffb..ba753f9 100644 --- a/src/components/StateCells.astro +++ b/src/components/StateCells.astro @@ -39,7 +39,7 @@ const P = 'https://intentius.io/plunge'; -

A record per resource for generated values. The state file becomes a local cache.

+

A record per resource for generated values.

diff --git a/src/content/docs/compare/state-file.mdx b/src/content/docs/compare/state-file.mdx index 880c92f..a49ecc5 100644 --- a/src/content/docs/compare/state-file.mdx +++ b/src/content/docs/compare/state-file.mdx @@ -2,15 +2,20 @@ title: "choudoufu, plunge and the state file" wide: true tableOfContents: false -description: "A state file holds identity, values and writes in one file under one lock. choudoufu for OpenTofu and plunge for Pulumi split them, and an estate becomes whatever carries its label." +description: "Terraform and Pulumi set state boundaries with a lock. choudoufu for OpenTofu and plunge for Pulumi let the resources draw them, with a record and a conditional write per resource." --- import Arenas from '../../../components/Arenas.astro'; +import Boundaries from '../../../components/Boundaries.astro'; import StateCells from '../../../components/StateCells.astro'; import * as cdf from '../../../data/compare-choudoufu-state.mjs'; import * as pl from '../../../data/compare-plunge-state.mjs'; -A Terraform state file and a Pulumi checkpoint do three jobs in one file. They map each address to a live object, hold generated values, and order writes. One lock covers all of it. [choudoufu](https://intentius.io/choudoufu/) and [plunge](https://intentius.io/plunge/) split those jobs apart and run your configuration and programs as they are. +Terraform and Pulumi each sew identity, values and writes into one file behind one lock, and that lock sets the state boundary. [choudoufu](https://intentius.io/choudoufu/) and [plunge](https://intentius.io/plunge/) unravel both. The resources' own labels draw the estates, and the storage service's conditional writes handle two runs at once. + + + +## Part by part diff --git a/src/data/compare-choudoufu-state.mjs b/src/data/compare-choudoufu-state.mjs index e71ddc0..d185763 100644 --- a/src/data/compare-choudoufu-state.mjs +++ b/src/data/compare-choudoufu-state.mjs @@ -44,7 +44,7 @@ export const ARENAS = [ cdf: ['good', 'the next run starts at once', `${C}/`], tf: ['warn', 'on S3, GCS or azurerm, a lock to force-unlock', `${H}/cli/commands/force-unlock`] }, { q: 'Losing the state file', - cdf: ['good', 'it was a cache; the next plan rebuilds it', `${C}/docs/model/cache/`], + cdf: ['good', 'the next plan reads the resources and records', `${C}/docs/model/cache/`], tf: ['bad', 're-import every resource', `${H}/language/import`] }, ], }, From d4cb982878cd2544c75cfd5b6723844c08857f0a Mon Sep 17 00:00:00 2001 From: lex00 <121451605+lex00@users.noreply.github.com> Date: Tue, 17 Nov 2026 09:52:01 -0700 Subject: [PATCH 04/12] feat(compare): two accounts in one cloud, one record store, an estate across accounts --- src/components/Boundaries.astro | 129 ++++++++++++++++++-------------- 1 file changed, 72 insertions(+), 57 deletions(-) diff --git a/src/components/Boundaries.astro b/src/components/Boundaries.astro index 459847f..df11f30 100644 --- a/src/components/Boundaries.astro +++ b/src/components/Boundaries.astro @@ -1,26 +1,24 @@ --- -// The zoomed-out picture: one cloud account, drawn twice. On the left each -// tool's file sews identity, values and writes together behind one lock, and -// the lock draws the boundary around its resources. On the right the -// resources carry their estate's label and draw the boundaries themselves; -// each resource has its own record, written with the store's own -// conditional write (a small lock per record). Same resources, same places, -// so the eye compares the boundaries. +// The zoomed-out picture: one cloud with two accounts, drawn twice. On the +// left a state file (Terraform's or Pulumi's, they behave alike here) sews +// identity, values and writes together behind one lock, and the lock draws +// the boundary around its account's resources. On the right one record store +// serves both accounts; the resources carry their estate's label and draw the +// estates themselves, one of them across both accounts. Each record has its +// own small lock, the store's conditional write. Same resources in the same +// places, so the eye compares the boundaries. -// Resource grid shared by both panels. -const COLS = [30, 150, 270, 390]; -const ROWS = [286, 346]; -const PW = 100, PH = 32; +const COLS = [26, 142, 280, 392]; +const ROWS = [300, 356]; +const PW = 96, PH = 32; const RES = [ { n: 'vpc', c: 0, r: 0, e: 'net' }, { n: 'subnet', c: 1, r: 0, e: 'net' }, - { n: 'bucket', c: 2, r: 0, e: 'pay' }, { n: 'queue', c: 3, r: 0, e: 'pay' }, - { n: 'sg', c: 0, r: 1, e: 'net' }, { n: 'db', c: 1, r: 1, e: 'data' }, - { n: 'function', c: 2, r: 1, e: 'pay' }, { n: 'dns', c: 3, r: 1, e: 'pay' }, -]; -const FILES = [ - { x: 20, name: 'terraform.tfstate', cx: 138 }, - { x: 280, name: 'Pulumi checkpoint', cx: 382 }, + { n: 'queue', c: 2, r: 0, e: 'pay' }, { n: 'function', c: 3, r: 0, e: 'pay' }, + { n: 'sg', c: 0, r: 1, e: 'net' }, { n: 'bucket', c: 1, r: 1, e: 'logs' }, + { n: 'bucket', c: 2, r: 1, e: 'logs' }, { n: 'dns', c: 3, r: 1, e: 'pay' }, ]; +const ACCOUNTS = [{ x: 12, name: 'ACCOUNT A' }, { x: 262, name: 'ACCOUNT B' }]; +const FILES = [{ x: 20, cx: 135 }, { x: 280, cx: 385 }]; const STRIPES = [['Identity', 'id'], ['Values', 'val'], ['Writes', 'wr']]; const lock = (x, y, s = 1) => `M${x - 5 * s} ${y - 1 * s}h${10 * s}v${8 * s}h${-10 * s}z M${x - 3 * s} ${y - 1 * s}v${-3 * s}a${3 * s} ${3 * s} 0 0 1 ${6 * s} 0v${3 * s}`; --- @@ -28,31 +26,38 @@ const lock = (x, y, s = 1) => `M${x - 5 * s} ${y - 1 * s}h${10 * s}v${8 * s}h${-

Terraform and PulumiThe lock draws the boundary

- + {FILES.map((f) => ( - - {f.name} + + terraform.tfstate + or a Pulumi checkpoint {STRIPES.map(([t, k], i) => ( - - - {t} + + + {t} ))} - + + + ))} + + CLOUD + {ACCOUNTS.map((a) => ( + + + {a.name} ))} - - CLOUD ACCOUNT - - + + {FILES.map((f) => ( - - + + ))} {RES.map((r) => ( @@ -62,47 +67,55 @@ const lock = (x, y, s = 1) => `M${x - 5 * s} ${y - 1 * s}h${10 * s}v${8 * s}h${- ))} -

Each tool sews identity, values and writes into one file behind one lock. A state boundary is whatever that lock covers.

+

Each state file sews identity, values and writes together behind one lock, in Terraform and Pulumi alike. A state boundary is whatever that lock covers.

choudoufu and plungeThe resources draw the boundary

- - - RECORD STORE · S3, GCS, AZURE BLOB, KUBERNETES + + + ONE RECORD STORE · S3, GCS, AZURE BLOB, KUBERNETES {RES.map((r) => ( - - {r.n} - + + {r.n} + + + ))} + + + + CLOUD + {ACCOUNTS.map((a) => ( + + + {a.name} ))} - - CLOUD ACCOUNT - - - + + + {RES.map((r) => ( {r.n} - + ))} - tofu-estate = network - plunge-stack = payments/prod - tofu-estate = data + tofu-estate = network + plunge-stack = payments/prod + tofu-estate = logs -

Each resource carries its estate's label, and the labels draw the estates. Every record has its own lock: the storage service's conditional write.

+

One record store serves every account. The labels draw the estates, across accounts when a resource is named in your code, and every record has its own lock: the storage service's conditional write.

-
Same account, same resources. With Terraform and Pulumi the lock sets the boundary; with choudoufu and plunge the resources do.
+
Same cloud, same accounts, same resources. With Terraform and Pulumi the lock sets the boundary; with choudoufu and plunge the resources do.
From 6290e31b817d74b479b8aad3aa263bc00e7abcf4 Mon Sep 17 00:00:00 2001 From: lex00 <121451605+lex00@users.noreply.github.com> Date: Tue, 17 Nov 2026 09:56:14 -0700 Subject: [PATCH 06/12] feat(compare): two models only, lock as boundary and labels as boundary --- src/components/Boundaries.astro | 149 +++++++++++++------------------- 1 file changed, 59 insertions(+), 90 deletions(-) diff --git a/src/components/Boundaries.astro b/src/components/Boundaries.astro index fbd5337..0c3e9e4 100644 --- a/src/components/Boundaries.astro +++ b/src/components/Boundaries.astro @@ -1,15 +1,11 @@ --- -// The zoomed-out picture: one cloud with two accounts, drawn twice. On the -// left a state file (Terraform's or Pulumi's, they behave alike here) sews -// identity, values and writes together behind one lock, and the lock draws -// the boundary around its account's resources. On the right one record store -// serves both accounts; the resources carry their estate's label and draw the -// estates themselves, one of them across both accounts. Each record has its -// own small lock, the store's conditional write. Same resources in the same -// places, so the eye compares the boundaries. +// Two models of a boundary, side by side, nothing else. Left: a state file's +// lock draws the boundary around a block of resources. Right: the same +// resources carry labels, and resources sharing a label form an estate, +// across accounts too. No product names; the page around it names them. const COLS = [26, 142, 280, 392]; -const ROWS = [300, 356]; +const ROWS = [178, 234]; const PW = 96, PH = 32; const RES = [ { n: 'vpc', c: 0, r: 0, e: 'net' }, { n: 'subnet', c: 1, r: 0, e: 'net' }, @@ -18,46 +14,38 @@ const RES = [ { n: 'bucket', c: 2, r: 1, e: 'logs' }, { n: 'dns', c: 3, r: 1, e: 'pay' }, ]; const ACCOUNTS = [{ x: 12, name: 'ACCOUNT A' }, { x: 262, name: 'ACCOUNT B' }]; -const FILES = [{ x: 20, cx: 135 }, { x: 280, cx: 385 }]; -const STRIPES = [['Identity', 'id'], ['Values', 'val'], ['Writes', 'wr']]; +const FILES = [135, 385]; +const TAGS = [{ e: 'net', t: 'network', x: 70 }, { e: 'logs', t: 'logs', x: 220 }, { e: 'pay', t: 'payments', x: 350 }]; const lock = (x, y, s = 1) => `M${x - 5 * s} ${y - 1 * s}h${10 * s}v${8 * s}h${-10 * s}z M${x - 3 * s} ${y - 1 * s}v${-3 * s}a${3 * s} ${3 * s} 0 0 1 ${6 * s} 0v${3 * s}`; ---
-

Terraform and PulumiThe lock draws the boundary

- - {FILES.map((f) => ( +

Lock as boundary

+ + {FILES.map((cx) => ( - - terraform.tfstate - or a Pulumi checkpoint - {STRIPES.map(([t, k], i) => ( - - - - {t} - - ))} - - - + + + + + + ))} - - CLOUD + {ACCOUNTS.map((a) => ( - - {a.name} + + {a.name} ))} - - - {FILES.map((f) => ( + + + {FILES.map((cx) => ( - - + + ))} {RES.map((r) => ( @@ -67,97 +55,78 @@ const lock = (x, y, s = 1) => `M${x - 5 * s} ${y - 1 * s}h${10 * s}v${8 * s}h${- ))} -

Each state file sews identity, values and writes together behind one lock, in Terraform and Pulumi alike. A state boundary is whatever that lock covers.

+

One state file, one lock. Whatever the lock covers is one boundary.

-

choudoufu and plungeThe resources draw the boundary

- - - ONE RECORD STORE · S3, GCS, AZURE BLOB, KUBERNETES - {RES.map((r) => ( - - - {r.n} - +

Labels as boundary

+ + {TAGS.map((t) => ( + + + + {t.t} ))} - - - - CLOUD + {ACCOUNTS.map((a) => ( - - {a.name} + + {a.name} ))} - - - + + + {RES.map((r) => ( {r.n} - + ))} - tofu-estate = network - plunge-stack = payments/prod - tofu-estate = logs -

One record store serves every account. The labels draw the estates, across accounts when a resource is named in your code, and every record has its own lock: the storage service's conditional write.

+

Each resource carries a label. Resources with the same label are one estate, in any account.

-
Same cloud, same accounts, same resources. With Terraform and Pulumi the lock sets the boundary; with choudoufu and plunge the resources do.
+
The same cloud under each model.
From aa7c5e81009e50799e3eb1c0ac9e62c2623985f6 Mon Sep 17 00:00:00 2001 From: lex00 <121451605+lex00@users.noreply.github.com> Date: Tue, 17 Nov 2026 09:59:21 -0700 Subject: [PATCH 07/12] feat(compare): show each backend in the boundary diagram --- src/components/Boundaries.astro | 42 +++++++++++++++++++++------------ 1 file changed, 27 insertions(+), 15 deletions(-) diff --git a/src/components/Boundaries.astro b/src/components/Boundaries.astro index 0c3e9e4..585f01f 100644 --- a/src/components/Boundaries.astro +++ b/src/components/Boundaries.astro @@ -1,5 +1,5 @@ --- -// Two models of a boundary, side by side, nothing else. Left: a state file's +// Two models of an estate boundary, side by side, with each backend. Left: a state file's // lock draws the boundary around a block of resources. Right: the same // resources carry labels, and resources sharing a label form an estate, // across accounts too. No product names; the page around it names them. @@ -15,14 +15,13 @@ const RES = [ ]; const ACCOUNTS = [{ x: 12, name: 'ACCOUNT A' }, { x: 262, name: 'ACCOUNT B' }]; const FILES = [135, 385]; -const TAGS = [{ e: 'net', t: 'network', x: 70 }, { e: 'logs', t: 'logs', x: 220 }, { e: 'pay', t: 'payments', x: 350 }]; const lock = (x, y, s = 1) => `M${x - 5 * s} ${y - 1 * s}h${10 * s}v${8 * s}h${-10 * s}z M${x - 3 * s} ${y - 1 * s}v${-3 * s}a${3 * s} ${3 * s} 0 0 1 ${6 * s} 0v${3 * s}`; ---
-

Lock as boundary

- +

Estate boundaries as application locks

+ {FILES.map((cx) => ( @@ -30,6 +29,7 @@ const lock = (x, y, s = 1) => `M${x - 5 * s} ${y - 1 * s}h${10 * s}v${8 * s}h${- + state file ))} @@ -46,6 +46,7 @@ const lock = (x, y, s = 1) => `M${x - 5 * s} ${y - 1 * s}h${10 * s}v${8 * s}h${- + application lock ))} {RES.map((r) => ( @@ -55,19 +56,23 @@ const lock = (x, y, s = 1) => `M${x - 5 * s} ${y - 1 * s}h${10 * s}v${8 * s}h${- ))} -

One state file, one lock. Whatever the lock covers is one boundary.

+

The tool keeps an estate in one state file behind its own lock. Whatever that lock covers is the estate.

-

Labels as boundary

- - {TAGS.map((t) => ( - - - - {t.t} +

Estate boundaries as resource labels

+ + + record store + one record per resource, each with a native lock + {RES.map((r, i) => ( + + + + ))} + {ACCOUNTS.map((a) => ( @@ -85,8 +90,11 @@ const lock = (x, y, s = 1) => `M${x - 5 * s} ${y - 1 * s}h${10 * s}v${8 * s}h${- ))} + network + payments + logs -

Each resource carries a label. Resources with the same label are one estate, in any account.

+

Each resource carries a label, and resources with the same label are one estate, in any account. Each gets its own record, guarded by the storage service's native lock.

The same cloud under each model.
@@ -125,8 +133,12 @@ const lock = (x, y, s = 1) => `M${x - 5 * s} ${y - 1 * s}h${10 * s}v${8 * s}h${- .bd-logs { stroke: var(--logs); fill: color-mix(in srgb, var(--logs) 11%, transparent); } .bd-pay { stroke: var(--pay); fill: color-mix(in srgb, var(--pay) 9%, transparent); } .bd-net-f { fill: var(--net); } .bd-logs-f { fill: var(--logs); } .bd-pay-f { fill: var(--pay); } - .bd-tag text { font-size: 13px; font-weight: 700; fill: #14110b; } - .bd-hole { fill: var(--sl-color-black); } + .bd-chip text { font-size: 11px; font-weight: 700; fill: #14110b; } + .bd-lbl { font-size: 13px; font-weight: 600; fill: var(--sl-color-gray-1); } + .bd-lbl-sm { font-size: 11px; font-weight: 500; fill: var(--sl-color-gray-3); } + .bd-store { fill: color-mix(in srgb, var(--sl-color-gray-3) 6%, transparent); stroke: var(--sl-color-gray-5); } + .bd-rec { fill: var(--sl-color-gray-6); stroke: var(--sl-color-gray-4); } + .bd-lock-sm { fill: var(--sl-color-gray-2); stroke: var(--sl-color-gray-2); stroke-width: 1.3; } @media (max-width: 60rem) { .bd-panels { grid-template-columns: 1fr; } .bd-divider { width: auto; height: 1px; background: var(--sl-color-gray-5); } } From e37b535bf8d56a4f79803e8a9a9bbf2eb5618d6a Mon Sep 17 00:00:00 2001 From: lex00 <121451605+lex00@users.noreply.github.com> Date: Tue, 17 Nov 2026 10:01:17 -0700 Subject: [PATCH 08/12] feat(compare): two applies under each model, padlocks, object storage --- src/components/Boundaries.astro | 145 ++++++++++++++++++++------------ 1 file changed, 93 insertions(+), 52 deletions(-) diff --git a/src/components/Boundaries.astro b/src/components/Boundaries.astro index 585f01f..05fd7d6 100644 --- a/src/components/Boundaries.astro +++ b/src/components/Boundaries.astro @@ -1,8 +1,10 @@ --- -// Two models of an estate boundary, side by side, with each backend. Left: a state file's -// lock draws the boundary around a block of resources. Right: the same -// resources carry labels, and resources sharing a label form an estate, -// across accounts too. No product names; the page around it names them. +// Two models of an estate boundary, side by side, each with its backend and +// two applies to one estate. Left: the state file's application lock is the +// boundary, so apply 2 waits for apply 1 even on another resource. Right: +// each resource carries its estate's label and has its own record with its +// own lock, so apply 1 on vpc and apply 2 on sg run together. No product +// names; the page around it names them. const COLS = [26, 142, 280, 392]; const ROWS = [178, 234]; @@ -14,25 +16,45 @@ const RES = [ { n: 'bucket', c: 2, r: 1, e: 'logs' }, { n: 'dns', c: 3, r: 1, e: 'pay' }, ]; const ACCOUNTS = [{ x: 12, name: 'ACCOUNT A' }, { x: 262, name: 'ACCOUNT B' }]; -const FILES = [135, 385]; -const lock = (x, y, s = 1) => `M${x - 5 * s} ${y - 1 * s}h${10 * s}v${8 * s}h${-10 * s}z M${x - 3 * s} ${y - 1 * s}v${-3 * s}a${3 * s} ${3 * s} 0 0 1 ${6 * s} 0v${3 * s}`; +const FILES = [200, 385]; +// Records in the store, laid out like the resources: two rows of four. +const RX = (c) => 160 + c * 89, RY = (r) => 20 + r * 34, RW = 80, RH = 28; +// A padlock centred on (x, y): shackle above, body below, keyhole. +const pad = (x, y, s = 1) => ({ + shackle: `M${x - 4.2 * s} ${y - 1 * s} V${y - 4.5 * s} a${4.2 * s} ${4.2 * s} 0 0 1 ${8.4 * s} 0 V${y - 1 * s}`, + body: { x: x - 7 * s, y: y - 1.5 * s, w: 14 * s, h: 11 * s, rx: 2.2 * s }, + hole: { cx: x, cy: y + 3.6 * s, r: 1.5 * s }, + sw: 2.4 * s, +}); +const held = new Set(['vpc', 'sg']); ---

Estate boundaries as application locks

- - {FILES.map((cx) => ( - - - - - - - state file - - - ))} + + apply 1 · vpcruns + apply 2 · sgwaits + + + {FILES.map((cx, i) => { + const p = pad(cx + 22, 22, 1.25); + return ( + + + + + + + + + + + + + ); + })} + application lock {ACCOUNTS.map((a) => ( @@ -42,42 +64,44 @@ const lock = (x, y, s = 1) => `M${x - 5 * s} ${y - 1 * s}h${10 * s}v${8 * s}h${- ))} - {FILES.map((cx) => ( - - - - application lock - - ))} {RES.map((r) => ( - + {r.n} ))} -

The tool keeps an estate in one state file behind its own lock. Whatever that lock covers is the estate.

+

An estate is one state file behind the tool's own lock. Apply 2 waits for apply 1, though they touch different resources.

Estate boundaries as resource labels

- - - record store - one record per resource, each with a native lock - {RES.map((r, i) => ( - - - - - - ))} - - + + apply 1 · vpcruns + apply 2 · sgruns + + + + {RES.map((r) => { + const x = RX(r.c), y = RY(r.r), on = held.has(r.n); + const p = pad(x + RW - 11, y + 13, 0.8); + return ( + + + + {r.n} + + + + + ); + })} + object storage: one record and one lock per resource + {ACCOUNTS.map((a) => ( - - {a.name} + + {a.name} ))} @@ -85,7 +109,7 @@ const lock = (x, y, s = 1) => `M${x - 5 * s} ${y - 1 * s}h${10 * s}v${8 * s}h${- {RES.map((r) => ( - + {r.n} @@ -94,15 +118,16 @@ const lock = (x, y, s = 1) => `M${x - 5 * s} ${y - 1 * s}h${10 * s}v${8 * s}h${- payments logs -

Each resource carries a label, and resources with the same label are one estate, in any account. Each gets its own record, guarded by the storage service's native lock.

+

Resources with the same label are one estate, in any account. Each resource has its own record and lock, so apply 1 and apply 2 run together.

-
The same cloud under each model.
+
The same cloud and the same two applies under each model.
From 9ddb325c6f7464f11673fe18ec90992b4abd5eee Mon Sep 17 00:00:00 2001 From: lex00 <121451605+lex00@users.noreply.github.com> Date: Tue, 17 Nov 2026 10:02:36 -0700 Subject: [PATCH 09/12] feat(compare): State locking page opens on the diagram --- astro.config.mjs | 4 ++-- src/components/Landing.astro | 2 +- src/components/PageTitle.astro | 4 ++-- src/content.config.ts | 3 +++ .../docs/compare/{state-file.mdx => state-locking.mdx} | 5 ++--- src/content/docs/tools.mdx | 4 ++-- src/data/rooms.mjs | 2 +- 7 files changed, 13 insertions(+), 11 deletions(-) rename src/content/docs/compare/{state-file.mdx => state-locking.mdx} (68%) diff --git a/astro.config.mjs b/astro.config.mjs index 2f1d154..5249f7d 100644 --- a/astro.config.mjs +++ b/astro.config.mjs @@ -11,7 +11,7 @@ export default defineConfig({ redirects: { // The compare index only repeated the sidebar; its URL lands on the main comparison. '/compare/': '/compare/terraform-platforms/', - '/compare/choudoufu-and-terraform-state/': '/compare/state-file/', + '/compare/choudoufu-and-terraform-state/': '/compare/state-locking/', '/compare/control-planes/': '/compare/terraform-platforms/', // chant, CDK and Pulumi is argued on the blog and in chant's docs. '/compare/chant-cdk-and-pulumi/': 'https://intentius.io/chant/', @@ -88,7 +88,7 @@ export default defineConfig({ { label: 'Compare', collapsed: true, - items: ['compare/terraform-platforms', 'compare/state-file'], + items: ['compare/terraform-platforms', 'compare/state-locking'], }, { label: 'About', diff --git a/src/components/Landing.astro b/src/components/Landing.astro index 464617d..10263fc 100644 --- a/src/components/Landing.astro +++ b/src/components/Landing.astro @@ -16,7 +16,7 @@ const { part = 'top' } = Astro.props; // One row of cards under the header, each straight into a page of the site. const cards = [ { title: 'Comparing Intentius to the rest', body: "Free, against each vendor's top tier.", href: '/compare/terraform-platforms/' }, - { title: 'choudoufu, plunge and the state file', body: 'The owner on the resource, for OpenTofu and Pulumi.', href: '/compare/state-file/' }, + { title: 'State locking', body: 'Application locks or resource labels, for OpenTofu and Pulumi.', href: '/compare/state-locking/' }, { title: 'Move off another runner', body: 'Atlantis, Terraform Cloud or Spacelift, one repo at a time.', href: '/for/moving/' }, { title: 'Carve up a large estate', body: 'Hundreds of roots, or one state file shared by too many teams.', href: '/for/estate/' }, ]; diff --git a/src/components/PageTitle.astro b/src/components/PageTitle.astro index e2aa938..cb61984 100644 --- a/src/components/PageTitle.astro +++ b/src/components/PageTitle.astro @@ -5,10 +5,10 @@ import Default from '@astrojs/starlight/components/PageTitle.astro'; const { entry } = Astro.locals.starlightRoute; -const { description, wide } = entry.data; +const { description, wide, lead = true } = entry.data; --- -{description &&

{description}

} +{lead && description &&

{description}

} {wide &&
-
-
-
One state fileterraform.tfstate or a Pulumi checkpoint, one lock
-
choudoufufor OpenTofu - plungefor Pulumi - -
Identityaddress to live object
-
Valuespasswords, random names
-
Writesruns side by side
- -
-
Identityin the file
-
Valuesin the file
-
Writesone lock on the file
- -
- - - tofu-estate = prod-networking - tofu-address = aws_vpc.main -

A marker on the resource, written at create.

-
- - plunge-stack = payments/prod - plunge-urn = …Bucket::receipts -

Keyed by stack and URN, as a digest on labels.

-
- - - -

A record per resource for generated values.

-
- - -

A record per resource with its full state, secrets encrypted.

-
- - - -

A conditional write per record. Applies on different resources land together.

-
- - -

A conditional write per record. Updates on different resources land together.

-
- -
Estateresources that belong together
-

The resource list inside the state file.

-
- -
    -
  • List it with any tool that filters by tag or label.
  • -
  • Fence it with an IAM condition on the label.
  • -
  • Run both in one chant workspace, an OpenTofu root beside a Pulumi stack.
  • -
-
-
-
A stock state file holds identity, values and writes in one file under one lock. choudoufu and plunge give each its own place: identity on the resource, values in a record per resource, and a conditional write per record. An estate is whatever carries its label.
-
- - diff --git a/src/components/StateOp.astro b/src/components/StateOp.astro new file mode 100644 index 0000000..55fd41d --- /dev/null +++ b/src/components/StateOp.astro @@ -0,0 +1,266 @@ +--- +// One infrastructure operation, drawn twice and stacked: on top with a +// backend per boundary, underneath with one backend and boundaries by label. +// The steps down the right carry the comparison. `op` picks the operation: +// apply - two applies at once +// move - move a resource to another estate +// killed - an apply killed part way +// new - start a new estate +// protects - what the lock protects: the file, not the change. Both +// models end on the last write; a reviewed plan catches it. +const { op = 'apply', title } = Astro.props; + +const CW = 76, CH = 60, GX = 90, GY = 80; +const ICON = { + globe: 'M-10 0a10 10 0 1 0 20 0a10 10 0 1 0 -20 0 M-4 0a4 10 0 1 0 8 0a4 10 0 1 0 -8 0 M-10 0H10', + shield: 'M0 -10 L9 -6.5 V0.5 C9 6 4.5 9.5 0 11 C-4.5 9.5 -9 6 -9 0.5 V-6.5 Z', + network: 'M-3 -8a3 3 0 1 0 6 0a3 3 0 1 0 -6 0 M-10 7a3 3 0 1 0 6 0a3 3 0 1 0 -6 0 M4 7a3 3 0 1 0 6 0a3 3 0 1 0 -6 0 M-1.5 -5.5 L-5.5 4.5 M1.5 -5.5 L5.5 4.5 M-4 7 H4', + key: 'M-9 0a5 5 0 1 0 10 0a5 5 0 1 0 -10 0 M1 0 H10 M7 0 V4 M10 0 V3', + bucket: 'M-10 -6 L-7 9 H7 L10 -6 M-10 -6a10 3 0 1 0 20 0a10 3 0 1 0 -20 0', + logs: 'M-8 -9 H8 V9 H-8 Z M-4 -4 H4 M-4 0 H4 M-4 4 H1', + queue: 'M-10 -4 H-4 V4 H-10 Z M-3 -4 H3 V4 H-3 Z M4 -4 H10 V4 H4 Z', + db: 'M-8 -6 V6 M8 -6 V6 M-8 6a8 3 0 0 0 16 0 M-8 0a8 3 0 0 0 16 0 M-8 -6a8 3 0 1 0 16 0a8 3 0 1 0 -16 0', +}; +const pad = (x, y, s = 1) => ({ + shackle: `M${x - 4.2 * s} ${y - 1 * s} V${y - 4.5 * s} a${4.2 * s} ${4.2 * s} 0 0 1 ${8.4 * s} 0 V${y - 1 * s}`, + body: { x: x - 7 * s, y: y - 1.5 * s, w: 14 * s, h: 11 * s, rx: 2.2 * s }, + hole: { cx: x, cy: y + 3.6 * s, r: 1.5 * s }, + sw: 2.4 * s, +}); +const chipW = (t) => t.length * 7.4 + 30; + +// The estates, one per column. A new estate takes the third column. +const third = op === 'new' ? { e: 'new', cells: ['queue', 'db'], fresh: true } : { e: 'logs', cells: ['bucket', 'logs'] }; +const COLS = [{ e: 'edge', cells: ['globe', op === 'protects' ? 'db' : 'key'] }, { e: 'net', cells: ['network', 'shield'] }, third]; + +// Per-op state. Cell states: on (written, green), wait (dashed grey), +// dead (a killed apply's resource), moving. Lock states: held, stuck. +const S = { + apply: { + topLock: { edge: 'held' }, topCell: { globe: 'on', key: 'wait' }, + botCell: { globe: 'on', key: 'on' }, + top: ['run 1 applies', 'run 2 waits', 'run 2 applies'], bot: ['runs 1 and 2 apply'], + }, + move: { + topLock: { edge: 'held', net: 'held' }, topCell: { shield: 'moving' }, + botCell: { shield: 'on' }, + top: ['lock both backends', 'move the state', 'move the code'], bot: ['edit the label'], + }, + killed: { + topLock: { edge: 'stuck' }, topCell: { key: 'dead' }, + botCell: { key: 'dead' }, + top: ['find the held lock', 'clear the lock', 'run again'], bot: ['run again'], + }, + protects: { + topLock: { edge: 'held' }, topCell: { db: 'on' }, + botCell: { db: 'on' }, + top: ['run 1 sets small', 'run 2 waits', 'run 2 sets large'], bot: ['runs 1 and 2 write', 'the last write stands'], + }, + new: { + topLock: {}, topCell: {}, + botCell: {}, + top: ['create a backend', 'configure its lock', 'add the root'], bot: ['add the root'], + }, +}[op]; + +const Y0 = 86, Y1 = 386; +const cy = (r) => Y0 + r * GY, cyB = (r) => Y1 + r * GY; +const LX = [90, 202, 314]; +const RX = (c) => 90 + c * GX; +const SX = 432; +const BOT = Y0 + GY + CH + 14; +// The edge estate grows around the firewall after a move. +const edgePath = op === 'move' + ? `M${RX(0) - 8} ${Y1 - 8} H${RX(0) + CW + 8} V${cyB(1) - 8} H${RX(1) + CW + 8} V${cyB(1) + CH + 8} H${RX(0) - 8} Z` + : null; +const where = (g) => { + for (let c = 0; c < 3; c++) { const r = COLS[c].cells.indexOf(g); if (r >= 0) return { c, r }; } +}; +const X = (x, y, s = 7) => `M${x - s} ${y - s} L${x + s} ${y + s} M${x + s} ${y - s} L${x - s} ${y + s}`; +--- +
+ {title &&

{title}

} + + + a backend per boundary + {COLS.map((b, c) => { + const x = LX[c]; + const ls = S.topLock[b.e]; + const p = pad(x + CW / 2, Y0 - 16, 1.35); + return ( + + + + + + + {b.cells.map((g, r) => { + const st = S.topCell[g]; + return ( + + + + {st === 'dead' && } + {op === 'protects' && g === 'db' && large} + + ); + })} + + + + {b.e} + + + ); + })} + {(op === 'apply' || op === 'protects') && ( + <> + + + 1 + 2 + + )} + {op === 'move' && ( + <> + + + + )} + {op === 'killed' && ( + + )} + {S.top.map((t, i) => ( + + + {i + 1} + {t} + + ))} + + + + + boundaries by label + + {edgePath + ? + : } + + + {COLS.map((b, c) => ( + + + + {b.e} + + ))} + {COLS.map((b, c) => b.cells.map((g, r) => { + const st = S.botCell[g]; + const p = pad(RX(c) + CW - 13, cyB(r) + 15, 0.95); + const held = st === 'on'; + return ( + + + + + + + {st === 'dead' && } + {op === 'protects' && g === 'db' && large} + + ); + }))} + {op === 'apply' && [0, 1].map((r) => ( + + + {r + 1} + + ))} + {op === 'protects' && [0, 1].map((r) => ( + + + {r + 1} + + ))} + {op === 'killed' && ( + + )} + {S.bot.map((t, i) => ( + + + {i + 1} + {t} + + ))} + {op === 'protects' && ( + + + + + a reviewed plan catches the conflict + + )} + +
+ + diff --git a/src/content/docs/compare/coordinating-changes.mdx b/src/content/docs/compare/coordinating-changes.mdx new file mode 100644 index 0000000..6aff542 --- /dev/null +++ b/src/content/docs/compare/coordinating-changes.mdx @@ -0,0 +1,34 @@ +--- +title: "Coordinating changes" +lead: false +wide: true +tableOfContents: false +description: "How resources are grouped and locked decides the operations a team lives with. A backend per boundary against one backend with boundaries by label, compared operation by operation." +--- + +import Arenas from '../../../components/Arenas.astro'; +import Op from '../../../components/StateOp.astro'; +import * as cdf from '../../../data/compare-choudoufu-state.mjs'; +import * as pl from '../../../data/compare-plunge-state.mjs'; + + + + + + + + + + + +## choudoufu and the Terraform state file + +Same HCL, same providers, same plan. Everything else is stock OpenTofu. + + + +## plunge and the Pulumi checkpoint + +Your Pulumi programs, SDKs and providers run unchanged. + + diff --git a/src/content/docs/compare/state-locking.mdx b/src/content/docs/compare/state-locking.mdx deleted file mode 100644 index 81ff9db..0000000 --- a/src/content/docs/compare/state-locking.mdx +++ /dev/null @@ -1,31 +0,0 @@ ---- -title: "State locking" -lead: false -wide: true -tableOfContents: false -description: "Terraform and Pulumi set state boundaries with a lock. choudoufu for OpenTofu and plunge for Pulumi let the resources draw them, with a record and a conditional write per resource." ---- - -import Arenas from '../../../components/Arenas.astro'; -import Boundaries from '../../../components/Boundaries.astro'; -import StateCells from '../../../components/StateCells.astro'; -import * as cdf from '../../../data/compare-choudoufu-state.mjs'; -import * as pl from '../../../data/compare-plunge-state.mjs'; - - - -## Part by part - - - -## choudoufu and the Terraform state file - -Same HCL, same providers, same plan. Everything else is stock OpenTofu. - - - -## plunge and the Pulumi checkpoint - -Your Pulumi programs, SDKs and providers run unchanged. - - diff --git a/src/content/docs/tools.mdx b/src/content/docs/tools.mdx index 5fa00e9..a876496 100644 --- a/src/content/docs/tools.mdx +++ b/src/content/docs/tools.mdx @@ -34,13 +34,13 @@ Declares an agent's sandbox, its secrets and its schedule as ordinary infrastruc , and the engine terragucci can run with `binary: choudoufu`. Every resource records who owns it on the resource itself, as tags or labels on the three big clouds and Kubernetes. The state file becomes a copy you are allowed to lose. -[Docs](https://intentius.io/choudoufu/) · [Source](https://github.com/INTENTIUS/choudoufu) · [Compare](/compare/state-locking/) +[Docs](https://intentius.io/choudoufu/) · [Source](https://github.com/INTENTIUS/choudoufu) · [Compare](/compare/coordinating-changes/) ## plunge , and the engine plywood can run with `engine: plunge`. This fork of Pulumi has a drop-in CLI that runs your programs as they are. plunge keeps one record per resource in place of one state file per stack and writes two ownership tags on each cloud object, so two runs that change different resources of one stack do not wait for each other. -[Docs](https://intentius.io/plunge/) · [Source](https://github.com/INTENTIUS/plunge) · [Compare](/compare/state-locking/) +[Docs](https://intentius.io/plunge/) · [Source](https://github.com/INTENTIUS/plunge) · [Compare](/compare/coordinating-changes/) ## plywood diff --git a/src/data/rooms.mjs b/src/data/rooms.mjs index 94f4804..c3b6d61 100644 --- a/src/data/rooms.mjs +++ b/src/data/rooms.mjs @@ -36,7 +36,7 @@ export const ROOMS = [ ], read: [ { label: 'Fractional retainer', href: '/work/#fractional-devops-retainer-from-8000-a-month' }, - { label: 'State locking', href: '/compare/state-locking/' }, + { label: 'Coordinating changes', href: '/compare/coordinating-changes/' }, ], }, { From cddab7d604f428a3116bce2468ff9a0d71624426 Mon Sep 17 00:00:00 2001 From: lex00 <121451605+lex00@users.noreply.github.com> Date: Tue, 17 Nov 2026 11:10:58 -0700 Subject: [PATCH 11/12] fix(compare): name the change in the first card, 2 CPU then 4 CPU --- src/components/StateOp.astro | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/components/StateOp.astro b/src/components/StateOp.astro index 55fd41d..933ae6d 100644 --- a/src/components/StateOp.astro +++ b/src/components/StateOp.astro @@ -54,7 +54,7 @@ const S = { protects: { topLock: { edge: 'held' }, topCell: { db: 'on' }, botCell: { db: 'on' }, - top: ['run 1 sets small', 'run 2 waits', 'run 2 sets large'], bot: ['runs 1 and 2 write', 'the last write stands'], + top: ['run 1 sets db to 2 CPU', 'run 2 waits', 'run 2 sets db to 4 CPU'], bot: ['runs 1 and 2 write db', 'the last write stands'], }, new: { topLock: {}, topCell: {}, @@ -67,7 +67,7 @@ const Y0 = 86, Y1 = 386; const cy = (r) => Y0 + r * GY, cyB = (r) => Y1 + r * GY; const LX = [90, 202, 314]; const RX = (c) => 90 + c * GX; -const SX = 432; +const SX = 426; const BOT = Y0 + GY + CH + 14; // The edge estate grows around the firewall after a move. const edgePath = op === 'move' @@ -101,7 +101,7 @@ const X = (x, y, s = 7) => `M${x - s} ${y - s} L${x + s} ${y + s} M${x + s} ${y {st === 'dead' && } - {op === 'protects' && g === 'db' && large} + {op === 'protects' && g === 'db' && 4 CPU} ); })} @@ -132,7 +132,7 @@ const X = (x, y, s = 7) => `M${x - s} ${y - s} L${x + s} ${y + s} M${x + s} ${y )} {S.top.map((t, i) => ( - + {i + 1} {t} @@ -167,7 +167,7 @@ const X = (x, y, s = 7) => `M${x - s} ${y - s} L${x + s} ${y + s} M${x + s} ${y {st === 'dead' && } - {op === 'protects' && g === 'db' && large} + {op === 'protects' && g === 'db' && 4 CPU} ); }))} @@ -188,7 +188,7 @@ const X = (x, y, s = 7) => `M${x - s} ${y - s} L${x + s} ${y + s} M${x + s} ${y )} {S.bot.map((t, i) => ( - + {i + 1} {t} From 5cd775a223a06de6915fdb00ff14376f940843e8 Mon Sep 17 00:00:00 2001 From: lex00 <121451605+lex00@users.noreply.github.com> Date: Tue, 17 Nov 2026 11:18:56 -0700 Subject: [PATCH 12/12] docs(compare): opening line and one-line intro per card --- src/components/StateOp.astro | 4 +++- src/content/docs/compare/coordinating-changes.mdx | 12 +++++++----- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/src/components/StateOp.astro b/src/components/StateOp.astro index 933ae6d..3075960 100644 --- a/src/components/StateOp.astro +++ b/src/components/StateOp.astro @@ -8,7 +8,7 @@ // new - start a new estate // protects - what the lock protects: the file, not the change. Both // models end on the last write; a reviewed plan catches it. -const { op = 'apply', title } = Astro.props; +const { op = 'apply', title, intro } = Astro.props; const CW = 76, CH = 60, GX = 90, GY = 80; const ICON = { @@ -80,6 +80,7 @@ const X = (x, y, s = 7) => `M${x - s} ${y - s} L${x + s} ${y + s} M${x + s} ${y ---
{title &&

{title}

} + {intro &&

{intro}

} a backend per boundary @@ -207,6 +208,7 @@ const X = (x, y, s = 7) => `M${x - s} ${y - s} L${x + s} ${y + s} M${x + s} ${y

Coordinating applies comes down to ownership and boundaries, and the way you implement them shapes every operation below.

- + - + - + - + + + ## choudoufu and the Terraform state file