@intentius/chant-lexicon-terraform 0.124.32 → 0.124.33

package/dist/composites/terraform-adopt-op.d.ts

@@ -137,6 +137,8 @@ export interface TerraformAdoptOpConfig {
      */
     compensate?: boolean | {
         command?: string;
+        /** Run the rollback command in a container pinned by digest (#4015), as `shell()`'s `image` does. */
+        image?: string;
     };
 }
 export interface TerraformAdoptOpResources {

package/dist/composites/terraform-adopt-op.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"terraform-adopt-op.d.ts","sourceRoot":"","sources":["../../src/composites/terraform-adopt-op.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA2FG;AAEH,OAAO,EAA6B,UAAU,EAAE,MAAM,qBAAqB,CAAC;AAQ5E,MAAM,WAAW,sBAAsB;IACrC,qEAAqE;IACrE,IAAI,EAAE,MAAM,CAAC;IACb,wGAAwG;IACxG,IAAI,EAAE,MAAM,CAAC;IACb;;;;OAIG;IACH,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,8EAA8E;IAC9E,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB;;;OAGG;IACH,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,qGAAqG;IACrG,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,2DAA2D;IAC3D,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB;;;;OAIG;IACH,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB;;;;OAIG;IACH,GAAG,CAAC,EAAE,MAAM,CAAC;IACb;;;;;;;;;OASG;IACH,UAAU,CAAC,EAAE,OAAO,GAAG;QAAE,OAAO,CAAC,EAAE,MAAM,CAAA;KAAE,CAAC;CAC7C;AAED,MAAM,WAAW,yBAAyB;IACxC,wEAAwE;IACxE,EAAE,EAAE,YAAY,CAAC,OAAO,UAAU,CAAC,CAAC;CACrC;AAED,wBAAgB,gBAAgB,CAAC,MAAM,EAAE,sBAAsB,GAAG,yBAAyB,CAkE1F"}
+{"version":3,"file":"terraform-adopt-op.d.ts","sourceRoot":"","sources":["../../src/composites/terraform-adopt-op.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA2FG;AAEH,OAAO,EAA6B,UAAU,EAAE,MAAM,qBAAqB,CAAC;AAQ5E,MAAM,WAAW,sBAAsB;IACrC,qEAAqE;IACrE,IAAI,EAAE,MAAM,CAAC;IACb,wGAAwG;IACxG,IAAI,EAAE,MAAM,CAAC;IACb;;;;OAIG;IACH,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,8EAA8E;IAC9E,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB;;;OAGG;IACH,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,qGAAqG;IACrG,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,2DAA2D;IAC3D,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB;;;;OAIG;IACH,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB;;;;OAIG;IACH,GAAG,CAAC,EAAE,MAAM,CAAC;IACb;;;;;;;;;OASG;IACH,UAAU,CAAC,EAAE,OAAO,GAAG;QACrB,OAAO,CAAC,EAAE,MAAM,CAAC;QACjB,qGAAqG;QACrG,KAAK,CAAC,EAAE,MAAM,CAAC;KAChB,CAAC;CACH;AAED,MAAM,WAAW,yBAAyB;IACxC,wEAAwE;IACxE,EAAE,EAAE,YAAY,CAAC,OAAO,UAAU,CAAC,CAAC;CACrC;AAED,wBAAgB,gBAAgB,CAAC,MAAM,EAAE,sBAAsB,GAAG,yBAAyB,CAmE1F"}

package/dist/composites/terraform-adopt-op.js

@@ -94,6 +94,7 @@ import { Op, phase, gate, activity } from "@intentius/chant/op";
 import { terraformInit as initStep, choudoufuLiveCheck as checkStep, choudoufuLivePlan as ledgerStep, choudoufuAdopt as adoptStep, } from "../op/builders.js";
 export function TerraformAdoptOp(config) {
     const compensateCommand = typeof config.compensate === "object" ? config.compensate.command : undefined;
+    const compensateImage = typeof config.compensate === "object" ? config.compensate.image : undefined;
     if (config.compensate !== undefined && config.compensate !== false && compensateCommand === undefined) {
         throw new Error(`TerraformAdoptOp "${config.name}": compensate is enabled, but there is no automatic undo for an ` +
             `adoption — un-adopting is untag, removing this estate's ownership marker from a live resource, ` +
@@ -145,7 +146,7 @@ export function TerraformAdoptOp(config) {
             phase("Adopt", [adopt]),
         ],
         ...(compensateCommand
-            ? { onFailure: [phase("Rollback", [activity("shellCmd", { cmd: compensateCommand })])] }
+            ? { onFailure: [phase("Rollback", [activity("shellCmd", { cmd: compensateCommand, ...(compensateImage ? { image: compensateImage } : {}) })])] }
             : {}),
     });
     return { op };

package/dist/composites/terraform-apply-op.d.ts

@@ -148,6 +148,8 @@ export interface TerraformApplyOpConfig {
      */
     compensate?: boolean | {
         command?: string;
+        /** Run the rollback command in a container pinned by digest (#4015), as `shell()`'s `image` does. */
+        image?: string;
     };
 }
 export interface TerraformApplyOpResources {

package/dist/composites/terraform-apply-op.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"terraform-apply-op.d.ts","sourceRoot":"","sources":["../../src/composites/terraform-apply-op.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAgFG;AAEH,OAAO,EAA6B,UAAU,EAAE,KAAK,YAAY,EAAE,MAAM,qBAAqB,CAAC;AAW/F;;;;;;;;;;;GAWG;AACH,MAAM,MAAM,iBAAiB,GAAG,YAAY,GAAG,QAAQ,GAAG,OAAO,CAAC;AAElE,MAAM,WAAW,sBAAsB;IACrC,qEAAqE;IACrE,IAAI,EAAE,MAAM,CAAC;IACb,+GAA+G;IAC/G,IAAI,EAAE,MAAM,CAAC;IACb,0GAA0G;IAC1G,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB;;;;OAIG;IACH,IAAI,CAAC,EAAE,iBAAiB,CAAC;IACzB,qEAAqE;IACrE,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB;;;;OAIG;IACH,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,qGAAqG;IACrG,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,2DAA2D;IAC3D,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB;;;;;OAKG;IACH,YAAY,CAAC,EAAE,YAAY,CAAC;IAC5B,4EAA4E;IAC5E,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB;;;;;OAKG;IACH,GAAG,CAAC,EAAE,MAAM,CAAC;IACb;;;;;;;;;;;OAWG;IACH,UAAU,CAAC,EAAE,OAAO,GAAG;QAAE,OAAO,CAAC,EAAE,MAAM,CAAA;KAAE,CAAC;CAC7C;AAED,MAAM,WAAW,yBAAyB;IACxC,mEAAmE;IACnE,EAAE,EAAE,YAAY,CAAC,OAAO,UAAU,CAAC,CAAC;CACrC;AAED,wBAAgB,gBAAgB,CAAC,MAAM,EAAE,sBAAsB,GAAG,yBAAyB,CAiH1F"}
+{"version":3,"file":"terraform-apply-op.d.ts","sourceRoot":"","sources":["../../src/composites/terraform-apply-op.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAgFG;AAEH,OAAO,EAA6B,UAAU,EAAE,KAAK,YAAY,EAAE,MAAM,qBAAqB,CAAC;AAW/F;;;;;;;;;;;GAWG;AACH,MAAM,MAAM,iBAAiB,GAAG,YAAY,GAAG,QAAQ,GAAG,OAAO,CAAC;AAElE,MAAM,WAAW,sBAAsB;IACrC,qEAAqE;IACrE,IAAI,EAAE,MAAM,CAAC;IACb,+GAA+G;IAC/G,IAAI,EAAE,MAAM,CAAC;IACb,0GAA0G;IAC1G,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB;;;;OAIG;IACH,IAAI,CAAC,EAAE,iBAAiB,CAAC;IACzB,qEAAqE;IACrE,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB;;;;OAIG;IACH,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,qGAAqG;IACrG,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,2DAA2D;IAC3D,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB;;;;;OAKG;IACH,YAAY,CAAC,EAAE,YAAY,CAAC;IAC5B,4EAA4E;IAC5E,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB;;;;;OAKG;IACH,GAAG,CAAC,EAAE,MAAM,CAAC;IACb;;;;;;;;;;;OAWG;IACH,UAAU,CAAC,EAAE,OAAO,GAAG;QACrB,OAAO,CAAC,EAAE,MAAM,CAAC;QACjB,qGAAqG;QACrG,KAAK,CAAC,EAAE,MAAM,CAAC;KAChB,CAAC;CACH;AAED,MAAM,WAAW,yBAAyB;IACxC,mEAAmE;IACnE,EAAE,EAAE,YAAY,CAAC,OAAO,UAAU,CAAC,CAAC;CACrC;AAED,wBAAgB,gBAAgB,CAAC,MAAM,EAAE,sBAAsB,GAAG,yBAAyB,CAkH1F"}

package/dist/composites/terraform-apply-op.js

@@ -91,6 +91,7 @@ export function TerraformApplyOp(config) {
     // fails here, at build time, with the Op named — not as a warning when the
     // apply has already half-run. Same shape as ApplyOp's refusal (#1449).
     const compensateCommand = typeof config.compensate === "object" ? config.compensate.command : undefined;
+    const compensateImage = typeof config.compensate === "object" ? config.compensate.image : undefined;
     if (config.compensate !== undefined && config.compensate !== false && compensateCommand === undefined) {
         throw new Error(`TerraformApplyOp "${config.name}": compensate is enabled, but terraform has no automatic ` +
             `rollback — undoing a partial apply means planning and applying the inverse, which is a ` +
@@ -176,7 +177,7 @@ export function TerraformApplyOp(config) {
         },
         phases,
         ...(compensateCommand
-            ? { onFailure: [phase("Rollback", [activity("shellCmd", { cmd: compensateCommand })])] }
+            ? { onFailure: [phase("Rollback", [activity("shellCmd", { cmd: compensateCommand, ...(compensateImage ? { image: compensateImage } : {}) })])] }
             : {}),
     });
     return { op };

package/dist/integrity.json

@@ -1,7 +1,7 @@
 {
   "algorithm": "sha256",
   "artifacts": {
-    "manifest.json": "a5897bba742d07d4ca58b354e2b739e0e2a56675d23771a5f9abc3e1aaa3dd64",
+    "manifest.json": "2329226993611ddb7dea4d88c01532b50c0d464c7a4463656e622038b5fddee0",
     "meta.json": "ca3d163bab055381827226140568f3bef7eaac187cebd76878e0b63e9e442356",
     "types/index.d.ts": "022927e6a7b351cc4cf52d5f973f60ccd140e5810e17b32fb8868965aa1db161",
     "rules/plan-before-apply.ts": "7c10245b2c3335253b48ee7d8b075d89f43116bde20313a5d1031b343fef1282",
@@ -56,5 +56,5 @@
     "rules/tf045.ts": "760b1f4f385fbe7a86897efe3078fdeac11bcc9bfb806285d63db50488174b7b",
     "skills/chant-terraform.md": "d9ca7b7c28aed0038ce775a3491150298492eed2858fd3651ed9bfca0e577ae8"
   },
-  "composite": "50dacdccb0421ca5ba3994072257c04477565eab99be70a7bf7b82add19786ff"
+  "composite": "d5e75d03804113ac7407605461f333d1cdb8840b93405b1dc808bc0d3ece1dde"
 }

package/dist/manifest.json

@@ -1,6 +1,6 @@
 {
   "name": "terraform",
-  "version": "0.124.32",
+  "version": "0.124.33",
   "chantVersion": ">=0.1.0",
   "namespace": "Terraform"
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@intentius/chant-lexicon-terraform",
-  "version": "0.124.32",
+  "version": "0.124.33",
   "type": "module",
   "files": [
     "src/",
@@ -67,7 +67,7 @@
     "access": "public"
   },
   "peerDependencies": {
-    "@intentius/chant": "^0.124.32",
+    "@intentius/chant": "^0.124.33",
     "zod": "^4.3.6"
   },
   "description": "terraform lexicon for chant, existing Terraform root modules as declarable entities",

package/src/composites/terraform-adopt-op.test.ts

@@ -176,6 +176,12 @@ describe("TerraformAdoptOp compensation (#2105)", () => {
     expect((op.onFailure![0].steps[0] as ActivityStep).args?.cmd).toBe("./untag.sh");
   });
 
+  test("a supplied image runs the rollback in that container (#4015)", () => {
+    const image = `alpine:3.20@sha256:${"b".repeat(64)}`;
+    const op = props({ ...base, compensate: { command: "./untag.sh", image } });
+    expect((op.onFailure![0].steps[0] as ActivityStep).args).toEqual({ cmd: "./untag.sh", image });
+  });
+
   test("compensate: false and omitting it both leave no onFailure", () => {
     expect(props(base).onFailure).toBeUndefined();
     expect(props({ ...base, compensate: false }).onFailure).toBeUndefined();

package/src/composites/terraform-adopt-op.ts

@@ -143,7 +143,11 @@ export interface TerraformAdoptOpConfig {
    * object with no `command`, throws when the Op is built, naming the Op,
    * rather than warning at the moment a rollback is already wanted.
    */
-  compensate?: boolean | { command?: string };
+  compensate?: boolean | {
+    command?: string;
+    /** Run the rollback command in a container pinned by digest (#4015), as `shell()`'s `image` does. */
+    image?: string;
+  };
 }
 
 export interface TerraformAdoptOpResources {
@@ -153,6 +157,7 @@ export interface TerraformAdoptOpResources {
 
 export function TerraformAdoptOp(config: TerraformAdoptOpConfig): TerraformAdoptOpResources {
   const compensateCommand = typeof config.compensate === "object" ? config.compensate.command : undefined;
+  const compensateImage = typeof config.compensate === "object" ? config.compensate.image : undefined;
   if (config.compensate !== undefined && config.compensate !== false && compensateCommand === undefined) {
     throw new Error(
       `TerraformAdoptOp "${config.name}": compensate is enabled, but there is no automatic undo for an ` +
@@ -212,7 +217,7 @@ export function TerraformAdoptOp(config: TerraformAdoptOpConfig): TerraformAdopt
       phase("Adopt", [adopt]),
     ],
     ...(compensateCommand
-      ? { onFailure: [phase("Rollback", [activity("shellCmd", { cmd: compensateCommand })])] }
+      ? { onFailure: [phase("Rollback", [activity("shellCmd", { cmd: compensateCommand, ...(compensateImage ? { image: compensateImage } : {}) })])] }
       : {}),
   });
 

package/src/composites/terraform-apply-op.test.ts

@@ -179,6 +179,12 @@ describe("TerraformApplyOp compensation — total or refused (#2086)", () => {
       args: { cmd: "terraform apply -input=false rollback.tfplan" },
     });
   });
+
+  test("compensate: { command, image } runs the rollback in that image (#4015)", () => {
+    const image = `hashicorp/terraform:1.9@sha256:${"a".repeat(64)}`;
+    const op = props({ name: "a", root: "app", compensate: { command: "terraform apply rollback.tfplan", image } });
+    expect(op.onFailure![0].steps[0]).toMatchObject({ fn: "shellCmd", args: { cmd: "terraform apply rollback.tfplan", image } });
+  });
 });
 
 describe("TerraformApplyOp on the local executor (#2086, gate-as-fact #2119)", () => {

package/src/composites/terraform-apply-op.ts

@@ -158,7 +158,11 @@ export interface TerraformApplyOpConfig {
    * rollback is already needed. Supply `compensate: { command: "..." }` with a
    * rollback of your own, or leave it unset.
    */
-  compensate?: boolean | { command?: string };
+  compensate?: boolean | {
+    command?: string;
+    /** Run the rollback command in a container pinned by digest (#4015), as `shell()`'s `image` does. */
+    image?: string;
+  };
 }
 
 export interface TerraformApplyOpResources {
@@ -174,6 +178,7 @@ export function TerraformApplyOp(config: TerraformApplyOpConfig): TerraformApply
   // fails here, at build time, with the Op named — not as a warning when the
   // apply has already half-run. Same shape as ApplyOp's refusal (#1449).
   const compensateCommand = typeof config.compensate === "object" ? config.compensate.command : undefined;
+  const compensateImage = typeof config.compensate === "object" ? config.compensate.image : undefined;
   if (config.compensate !== undefined && config.compensate !== false && compensateCommand === undefined) {
     throw new Error(
       `TerraformApplyOp "${config.name}": compensate is enabled, but terraform has no automatic ` +
@@ -274,7 +279,7 @@ export function TerraformApplyOp(config: TerraformApplyOpConfig): TerraformApply
     },
     phases,
     ...(compensateCommand
-      ? { onFailure: [phase("Rollback", [activity("shellCmd", { cmd: compensateCommand })])] }
+      ? { onFailure: [phase("Rollback", [activity("shellCmd", { cmd: compensateCommand, ...(compensateImage ? { image: compensateImage } : {}) })])] }
       : {}),
   });