@intentic/engine 1.326.0 → 1.328.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 +4 -1
- package/dist/index.d.ts +2 -2
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +1 -1
- package/dist/index.js.map +1 -1
- package/dist/provider.d.ts +4 -0
- package/dist/provider.d.ts.map +1 -1
- package/dist/providers/fake.d.ts +1 -0
- package/dist/providers/fake.d.ts.map +1 -1
- package/dist/providers/fake.js +5 -3
- package/dist/providers/fake.js.map +1 -1
- package/dist/reconcile/apply.d.ts.map +1 -1
- package/dist/reconcile/apply.js +6 -5
- package/dist/reconcile/apply.js.map +1 -1
- package/dist/reconcile/moves.d.ts.map +1 -1
- package/dist/reconcile/moves.js +6 -5
- package/dist/reconcile/moves.js.map +1 -1
- package/dist/reconcile/orphans.d.ts +6 -3
- package/dist/reconcile/orphans.d.ts.map +1 -1
- package/dist/reconcile/orphans.js +42 -16
- package/dist/reconcile/orphans.js.map +1 -1
- package/dist/reconcile/plan.js +5 -5
- package/dist/reconcile/plan.js.map +1 -1
- package/dist/reconcile/prune.d.ts.map +1 -1
- package/dist/reconcile/prune.js +49 -23
- package/dist/reconcile/prune.js.map +1 -1
- package/dist/reconcile/reconcile.d.ts +11 -3
- package/dist/reconcile/reconcile.d.ts.map +1 -1
- package/dist/reconcile/reconcile.js +30 -7
- package/dist/reconcile/reconcile.js.map +1 -1
- package/dist/resolve-inputs.d.ts +2 -0
- package/dist/resolve-inputs.d.ts.map +1 -1
- package/dist/resolve-inputs.js +5 -0
- package/dist/resolve-inputs.js.map +1 -1
- package/dist/types.d.ts +21 -2
- package/dist/types.d.ts.map +1 -1
- package/package.json +6 -6
package/README.md
CHANGED
|
@@ -16,6 +16,8 @@ flowchart LR
|
|
|
16
16
|
- There is no state file. A provider finds its resource by the `intentic.id` stamp; a stamped `intentic.hash` that differs from the node's inputs forces an update before the provider's own `diff` is consulted.
|
|
17
17
|
- `apply` walks the graph in dependency order, one node at a time, and stores each node's outputs so later `$ref` inputs resolve. `plan` does the same reads without mutating. `reconcile` alternates the two until a plan reads all noop, bounded by `maxIterations`.
|
|
18
18
|
- `prune` deletes what the previous artifact declared and the current one lacks, in reverse order with the old inputs. `collectOrphans` and `pruneOrphans` catch stamped resources no graph mentions. `applyMoves` re-stamps renamed resources first so they are not recreated.
|
|
19
|
+
- Ownership (2026-10-05). `EngineConfig.owner` is stamped on everything. The scan splits what it finds by owner: only this intent's own orphans are ever pruned, resources with no owner stamp are reported as unowned and left alone, and another intent's are only counted. A provider that reads its owner stamp back gets an unowned resource of the graph adopted (an update that re-stamps it) and one stamped by another intent refused with an error.
|
|
20
|
+
- Deleting needs less than creating (2026-10-05): a removed node's secret that is no longer set resolves to a placeholder instead of failing the prune, and only if its delete then fails is the node skipped as `missing-secret`, for the caller to keep pending. `EngineConfig.signal` stops apply and prune before their next change, which is how the CLI halts a run whose lock was lost.
|
|
19
21
|
- The engine constructs no providers. Callers pass a `Providers` map from [providers](../providers), or `createFakeProviders` for an in-memory world in tests.
|
|
20
22
|
- Progress leaves as structured `EngineEvent`s; the CLI renders them and the daemon tails them.
|
|
21
23
|
|
|
@@ -24,8 +26,9 @@ flowchart LR
|
|
|
24
26
|
- [src/provider.ts](src/provider.ts) — the `Provider` contract: `read`, `diff`, `apply`, and optional `list`, `delete`, `restamp`.
|
|
25
27
|
- [src/reconcile/apply.ts](src/reconcile/apply.ts) — one converge pass over the graph.
|
|
26
28
|
- [src/reconcile/reconcile-loop.ts](src/reconcile/reconcile-loop.ts) — apply then plan until nothing is left to do.
|
|
27
|
-
- [src/reconcile/reconcile.ts](src/reconcile/reconcile.ts) — provider lookup and the stamped-hash drift
|
|
29
|
+
- [src/reconcile/reconcile.ts](src/reconcile/reconcile.ts) — provider lookup, and the owner and stamped-hash drift checks.
|
|
28
30
|
- [src/reconcile/prune.ts](src/reconcile/prune.ts) — removal of dropped nodes and orphans.
|
|
31
|
+
- [src/reconcile/orphans.ts](src/reconcile/orphans.ts) — the stamped scan and its split by owner.
|
|
29
32
|
- [src/providers/fake.ts](src/providers/fake.ts) — in-memory providers that prove a second apply is a noop.
|
|
30
33
|
|
|
31
34
|
## Commands
|
package/dist/index.d.ts
CHANGED
|
@@ -10,8 +10,8 @@ export { plan } from "./reconcile/plan.js";
|
|
|
10
10
|
export { prune, pruneOrphans } from "./reconcile/prune.js";
|
|
11
11
|
export type { ConvergeResult } from "./reconcile/reconcile-loop.js";
|
|
12
12
|
export { reconcile } from "./reconcile/reconcile-loop.js";
|
|
13
|
-
export { resolveInputs } from "./resolve-inputs.js";
|
|
13
|
+
export { MISSING_SECRET, resolveInputs } from "./resolve-inputs.js";
|
|
14
14
|
export type { OutputStore } from "./store.js";
|
|
15
15
|
export { createStore } from "./store.js";
|
|
16
|
-
export type { Action, ApplyOutcome, EngineConfig, EngineEvent, Orphan, OrphanEntry, PlanOutcome, PrunedResource, PruneOutcome, ResolvedInputs, Step, } from "./types.js";
|
|
16
|
+
export type { Action, ApplyOutcome, EngineConfig, EngineEvent, Orphan, OrphanEntry, OrphanScan, PlanOutcome, PrunedResource, PruneOutcome, ResolvedInputs, ScanSkip, SkippedResource, SkipReason, Step, } from "./types.js";
|
|
17
17
|
//# sourceMappingURL=index.d.ts.map
|
package/dist/index.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,YAAY,EAAE,UAAU,EAAE,cAAc,EAAE,QAAQ,EAAE,QAAQ,EAAE,eAAe,EAAE,SAAS,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAC5H,YAAY,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAC;AACrD,OAAO,EAAE,mBAAmB,EAAE,MAAM,qBAAqB,CAAC;AAC1D,YAAY,EAAE,cAAc,EAAE,MAAM,gBAAgB,CAAC;AACrD,OAAO,EAAE,SAAS,EAAE,aAAa,EAAE,qBAAqB,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;AAC5F,OAAO,EAAE,KAAK,EAAE,MAAM,sBAAsB,CAAC;AAC7C,OAAO,EAAE,UAAU,EAAE,oBAAoB,EAAE,MAAM,sBAAsB,CAAC;AACxE,OAAO,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAC;AACxD,OAAO,EAAE,IAAI,EAAE,MAAM,qBAAqB,CAAC;AAC3C,OAAO,EAAE,KAAK,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AAC3D,YAAY,EAAE,cAAc,EAAE,MAAM,+BAA+B,CAAC;AACpE,OAAO,EAAE,SAAS,EAAE,MAAM,+BAA+B,CAAC;AAC1D,OAAO,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,YAAY,EAAE,UAAU,EAAE,cAAc,EAAE,QAAQ,EAAE,QAAQ,EAAE,eAAe,EAAE,SAAS,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAC5H,YAAY,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAC;AACrD,OAAO,EAAE,mBAAmB,EAAE,MAAM,qBAAqB,CAAC;AAC1D,YAAY,EAAE,cAAc,EAAE,MAAM,gBAAgB,CAAC;AACrD,OAAO,EAAE,SAAS,EAAE,aAAa,EAAE,qBAAqB,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;AAC5F,OAAO,EAAE,KAAK,EAAE,MAAM,sBAAsB,CAAC;AAC7C,OAAO,EAAE,UAAU,EAAE,oBAAoB,EAAE,MAAM,sBAAsB,CAAC;AACxE,OAAO,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAC;AACxD,OAAO,EAAE,IAAI,EAAE,MAAM,qBAAqB,CAAC;AAC3C,OAAO,EAAE,KAAK,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AAC3D,YAAY,EAAE,cAAc,EAAE,MAAM,+BAA+B,CAAC;AACpE,OAAO,EAAE,SAAS,EAAE,MAAM,+BAA+B,CAAC;AAC1D,OAAO,EAAE,cAAc,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AACpE,YAAY,EAAE,WAAW,EAAE,MAAM,YAAY,CAAC;AAC9C,OAAO,EAAE,WAAW,EAAE,MAAM,YAAY,CAAC;AACzC,YAAY,EACR,MAAM,EACN,YAAY,EACZ,YAAY,EACZ,WAAW,EACX,MAAM,EACN,WAAW,EACX,UAAU,EACV,WAAW,EACX,cAAc,EACd,YAAY,EACZ,cAAc,EACd,QAAQ,EACR,eAAe,EACf,UAAU,EACV,IAAI,GACP,MAAM,YAAY,CAAC"}
|
package/dist/index.js
CHANGED
|
@@ -6,6 +6,6 @@ export { collectOrphans } from "./reconcile/orphans.js";
|
|
|
6
6
|
export { plan } from "./reconcile/plan.js";
|
|
7
7
|
export { prune, pruneOrphans } from "./reconcile/prune.js";
|
|
8
8
|
export { reconcile } from "./reconcile/reconcile-loop.js";
|
|
9
|
-
export { resolveInputs } from "./resolve-inputs.js";
|
|
9
|
+
export { MISSING_SECRET, resolveInputs } from "./resolve-inputs.js";
|
|
10
10
|
export { createStore } from "./store.js";
|
|
11
11
|
//# sourceMappingURL=index.js.map
|
package/dist/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,mBAAmB,EAAE,MAAM,qBAAqB,CAAC;AAE1D,OAAO,EAAE,SAAS,EAAE,aAAa,EAAE,qBAAqB,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;AAC5F,OAAO,EAAE,KAAK,EAAE,MAAM,sBAAsB,CAAC;AAC7C,OAAO,EAAE,UAAU,EAAE,oBAAoB,EAAE,MAAM,sBAAsB,CAAC;AACxE,OAAO,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAC;AACxD,OAAO,EAAE,IAAI,EAAE,MAAM,qBAAqB,CAAC;AAC3C,OAAO,EAAE,KAAK,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AAE3D,OAAO,EAAE,SAAS,EAAE,MAAM,+BAA+B,CAAC;AAC1D,OAAO,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,mBAAmB,EAAE,MAAM,qBAAqB,CAAC;AAE1D,OAAO,EAAE,SAAS,EAAE,aAAa,EAAE,qBAAqB,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;AAC5F,OAAO,EAAE,KAAK,EAAE,MAAM,sBAAsB,CAAC;AAC7C,OAAO,EAAE,UAAU,EAAE,oBAAoB,EAAE,MAAM,sBAAsB,CAAC;AACxE,OAAO,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAC;AACxD,OAAO,EAAE,IAAI,EAAE,MAAM,qBAAqB,CAAC;AAC3C,OAAO,EAAE,KAAK,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AAE3D,OAAO,EAAE,SAAS,EAAE,MAAM,+BAA+B,CAAC;AAC1D,OAAO,EAAE,cAAc,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AAEpE,OAAO,EAAE,WAAW,EAAE,MAAM,YAAY,CAAC"}
|
package/dist/provider.d.ts
CHANGED
|
@@ -4,6 +4,7 @@ export interface Observed {
|
|
|
4
4
|
readonly outputs: Readonly<Record<string, unknown>>;
|
|
5
5
|
readonly detail?: Readonly<Record<string, unknown>>;
|
|
6
6
|
readonly stampHash?: string;
|
|
7
|
+
readonly stampOwner?: string;
|
|
7
8
|
}
|
|
8
9
|
export type DiffResult = {
|
|
9
10
|
readonly action: "noop";
|
|
@@ -20,6 +21,7 @@ export interface ListedResource {
|
|
|
20
21
|
readonly id: string;
|
|
21
22
|
readonly inputs: ResolvedInputs;
|
|
22
23
|
readonly protected?: boolean;
|
|
24
|
+
readonly owner?: string;
|
|
23
25
|
}
|
|
24
26
|
export interface ProviderContext {
|
|
25
27
|
readonly env: Readonly<Record<string, string | undefined>>;
|
|
@@ -27,6 +29,8 @@ export interface ProviderContext {
|
|
|
27
29
|
readonly id: string;
|
|
28
30
|
readonly output: (id: string, name: string) => unknown;
|
|
29
31
|
readonly inputsHash?: string;
|
|
32
|
+
readonly owner?: string;
|
|
33
|
+
readonly skipped?: (source: string, reason: string) => void;
|
|
30
34
|
}
|
|
31
35
|
export interface Provider {
|
|
32
36
|
readonly read: (inputs: ResolvedInputs, ctx: ProviderContext) => Promise<Observed | undefined>;
|
package/dist/provider.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"provider.d.ts","sourceRoot":"","sources":["../src/provider.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAC;AACxD,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,YAAY,CAAC;AAGjD,MAAM,WAAW,QAAQ;IACrB,QAAQ,CAAC,OAAO,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CAAC;IAEpD,QAAQ,CAAC,MAAM,CAAC,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CAAC;IAEpD,QAAQ,CAAC,SAAS,CAAC,EAAE,MAAM,CAAC;
|
|
1
|
+
{"version":3,"file":"provider.d.ts","sourceRoot":"","sources":["../src/provider.ts"],"names":[],"mappings":"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"}
|
package/dist/providers/fake.d.ts
CHANGED
|
@@ -4,6 +4,7 @@ import type { ResolvedInputs } from "../types.js";
|
|
|
4
4
|
interface WorldEntry {
|
|
5
5
|
readonly type: ResourceType;
|
|
6
6
|
readonly inputs: ResolvedInputs;
|
|
7
|
+
readonly owner?: string;
|
|
7
8
|
}
|
|
8
9
|
export type FakeWorld = Map<string, WorldEntry>;
|
|
9
10
|
export declare const createFakeProviders: (world?: FakeWorld) => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"fake.d.ts","sourceRoot":"","sources":["../../src/providers/fake.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAC;AAExD,OAAO,KAAK,EAAsB,SAAS,EAAE,MAAM,gBAAgB,CAAC;AACpE,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,aAAa,CAAC;AAElD,UAAU,UAAU;IAChB,QAAQ,CAAC,IAAI,EAAE,YAAY,CAAC;IAC5B,QAAQ,CAAC,MAAM,EAAE,cAAc,CAAC;
|
|
1
|
+
{"version":3,"file":"fake.d.ts","sourceRoot":"","sources":["../../src/providers/fake.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAC;AAExD,OAAO,KAAK,EAAsB,SAAS,EAAE,MAAM,gBAAgB,CAAC;AACpE,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,aAAa,CAAC;AAElD,UAAU,UAAU;IAChB,QAAQ,CAAC,IAAI,EAAE,YAAY,CAAC;IAC5B,QAAQ,CAAC,MAAM,EAAE,cAAc,CAAC;IAEhC,QAAQ,CAAC,KAAK,CAAC,EAAE,MAAM,CAAC;CAC3B;AAID,MAAM,MAAM,SAAS,GAAG,GAAG,CAAC,MAAM,EAAE,UAAU,CAAC,CAAC;AAqChD,eAAO,MAAM,mBAAmB,WAAW,SAAS,KAAe;IAAE,QAAQ,CAAC,SAAS,EAAE,SAAS,CAAC;IAAC,QAAQ,CAAC,KAAK,EAAE,SAAS,CAAA;CAM5H,CAAC"}
|
package/dist/providers/fake.js
CHANGED
|
@@ -12,14 +12,16 @@ const fakeProvider = (type, world) => ({
|
|
|
12
12
|
if (!world.has(ctx.id)) {
|
|
13
13
|
return undefined;
|
|
14
14
|
}
|
|
15
|
-
return { outputs: fakeOutputs(ctx.id, type) };
|
|
15
|
+
return { outputs: fakeOutputs(ctx.id, type), stampOwner: world.get(ctx.id)?.owner ?? "" };
|
|
16
16
|
},
|
|
17
17
|
diff: () => ({ action: "noop" }),
|
|
18
18
|
apply: async (inputs, _observed, ctx) => {
|
|
19
|
-
world.set(ctx.id, { type, inputs });
|
|
19
|
+
world.set(ctx.id, { type, inputs, ...(ctx.owner !== undefined ? { owner: ctx.owner } : {}) });
|
|
20
20
|
return fakeOutputs(ctx.id, type);
|
|
21
21
|
},
|
|
22
|
-
list: async () => [...world]
|
|
22
|
+
list: async () => [...world]
|
|
23
|
+
.filter(([, entry]) => entry.type === type)
|
|
24
|
+
.map(([id, entry]) => ({ id, inputs: entry.inputs, ...(entry.owner !== undefined ? { owner: entry.owner } : {}) })),
|
|
23
25
|
delete: async (_inputs, ctx) => {
|
|
24
26
|
world.delete(ctx.id);
|
|
25
27
|
},
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"fake.js","sourceRoot":"","sources":["../../src/providers/fake.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAC;
|
|
1
|
+
{"version":3,"file":"fake.js","sourceRoot":"","sources":["../../src/providers/fake.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAC;AAiB9C,MAAM,cAAc,GAAG,MAAM,CAAC,IAAI,CAAC,OAAO,CAAmB,CAAC;AAI9D,MAAM,WAAW,GAAG,CAAC,EAAU,EAAE,IAAkB,EAA2B,EAAE;IAC5E,MAAM,OAAO,GAA4B,EAAE,CAAC;IAC5C,KAAK,MAAM,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC,EAAE,CAAC;QAC/B,OAAO,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC,WAAW,EAAE,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,WAAW,EAAE,cAAc,IAAI,EAAE,CAAC,CAAC,CAAC,GAAG,EAAE,KAAK,IAAI,EAAE,CAAC;IAC9G,CAAC;IACD,OAAO,OAAO,CAAC;AACnB,CAAC,CAAC;AAEF,MAAM,YAAY,GAAG,CAAC,IAAkB,EAAE,KAAgB,EAAY,EAAE,CAAC,CAAC;IACtE,IAAI,EAAE,KAAK,EAAE,OAAO,EAAE,GAAG,EAAE,EAAE;QACzB,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,CAAC;YACrB,OAAO,SAAS,CAAC;QACrB,CAAC;QACD,OAAO,EAAE,OAAO,EAAE,WAAW,CAAC,GAAG,CAAC,EAAE,EAAE,IAAI,CAAC,EAAE,UAAU,EAAE,KAAK,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,KAAK,IAAI,EAAE,EAAqB,CAAC;IACjH,CAAC;IACD,IAAI,EAAE,GAAG,EAAE,CAAC,CAAC,EAAE,MAAM,EAAE,MAAM,EAAE,CAAC;IAChC,KAAK,EAAE,KAAK,EAAE,MAAM,EAAE,SAAS,EAAE,GAAG,EAAE,EAAE;QACpC,KAAK,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,GAAG,CAAC,GAAG,CAAC,KAAK,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,GAAG,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC;QAC9F,OAAO,WAAW,CAAC,GAAG,CAAC,EAAE,EAAE,IAAI,CAAC,CAAC;IACrC,CAAC;IACD,IAAI,EAAE,KAAK,IAAI,EAAE,CACb,CAAC,GAAG,KAAK,CAAC;SACL,MAAM,CAAC,CAAC,CAAC,EAAE,KAAK,CAAC,EAAE,EAAE,CAAC,KAAK,CAAC,IAAI,KAAK,IAAI,CAAC;SAC1C,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,KAAK,CAAC,EAAE,EAAE,CAAC,CAAC,EAAE,EAAE,EAAE,MAAM,EAAE,KAAK,CAAC,MAAM,EAAE,GAAG,CAAC,KAAK,CAAC,KAAK,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,KAAK,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC;IAC3H,MAAM,EAAE,KAAK,EAAE,OAAO,EAAE,GAAG,EAAE,EAAE;QAC3B,KAAK,CAAC,MAAM,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;IACzB,CAAC;CACJ,CAAC,CAAC;AAEH,MAAM,CAAC,MAAM,mBAAmB,GAAG,CAAC,KAAK,GAAc,IAAI,GAAG,EAAE,EAAgE,EAAE;IAC9H,MAAM,SAAS,GAAc,EAAE,CAAC;IAChC,KAAK,MAAM,IAAI,IAAI,cAAc,EAAE,CAAC;QAChC,SAAS,CAAC,IAAI,CAAC,GAAG,YAAY,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;IAChD,CAAC;IACD,OAAO,EAAE,SAAS,EAAE,KAAK,EAAE,CAAC;AAChC,CAAC,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"apply.d.ts","sourceRoot":"","sources":["../../src/reconcile/apply.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,iBAAiB,CAAC;AAMzD,OAAO,KAAK,EAAU,YAAY,EAAE,YAAY,EAAQ,MAAM,aAAa,CAAC;AAO5E,eAAO,MAAM,KAAK,UAAiB,iBAAiB,UAAU,YAAY,KAAG,OAAO,CAAC,YAAY,
|
|
1
|
+
{"version":3,"file":"apply.d.ts","sourceRoot":"","sources":["../../src/reconcile/apply.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,iBAAiB,CAAC;AAMzD,OAAO,KAAK,EAAU,YAAY,EAAE,YAAY,EAAQ,MAAM,aAAa,CAAC;AAO5E,eAAO,MAAM,KAAK,UAAiB,iBAAiB,UAAU,YAAY,KAAG,OAAO,CAAC,YAAY,CAkEhG,CAAC"}
|
package/dist/reconcile/apply.js
CHANGED
|
@@ -3,10 +3,10 @@ import { httpProbe, waitReady } from "../readiness.js";
|
|
|
3
3
|
import { resolveInputs } from "../resolve-inputs.js";
|
|
4
4
|
import { createStore } from "../store.js";
|
|
5
5
|
import { validateOutputs } from "./outputs-check.js";
|
|
6
|
-
import { decideDiff, makeContext, narratedRead, requireProvider } from "./reconcile.js";
|
|
6
|
+
import { checkSignal, decideDiff, makeContext, narratedRead, requireProvider, runScope } from "./reconcile.js";
|
|
7
7
|
export const apply = async (graph, config) => {
|
|
8
|
-
const
|
|
9
|
-
const
|
|
8
|
+
const scope = runScope(config);
|
|
9
|
+
const { env, log } = scope;
|
|
10
10
|
const emit = config.onEvent ?? (() => { });
|
|
11
11
|
const probe = config.probe ?? httpProbe;
|
|
12
12
|
const store = createStore();
|
|
@@ -18,9 +18,10 @@ export const apply = async (graph, config) => {
|
|
|
18
18
|
continue;
|
|
19
19
|
}
|
|
20
20
|
const type = node.type;
|
|
21
|
+
checkSignal(config);
|
|
21
22
|
emit({ kind: "node", phase: "apply", state: "start", id, type });
|
|
22
23
|
const provider = requireProvider(config.providers, type, id);
|
|
23
|
-
const ctx = makeContext(id, store,
|
|
24
|
+
const ctx = makeContext(id, store, scope, hashInputs(node.inputs));
|
|
24
25
|
const inputs = resolveInputs(node.inputs, store, env, { lenient: false });
|
|
25
26
|
const observed = await narratedRead(provider, inputs, ctx, id, log);
|
|
26
27
|
let action;
|
|
@@ -31,7 +32,7 @@ export const apply = async (graph, config) => {
|
|
|
31
32
|
produced = await provider.apply(inputs, undefined, ctx);
|
|
32
33
|
}
|
|
33
34
|
else {
|
|
34
|
-
const result = decideDiff(provider, node, inputs, observed);
|
|
35
|
+
const result = decideDiff(provider, node, inputs, observed, scope.owner);
|
|
35
36
|
if (result.action === "update") {
|
|
36
37
|
action = "update";
|
|
37
38
|
reason = result.reason;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"apply.js","sourceRoot":"","sources":["../../src/reconcile/apply.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,UAAU,EAAE,SAAS,EAAE,MAAM,EAAE,MAAM,iBAAiB,CAAC;AAEhE,OAAO,EAAE,SAAS,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AACvD,OAAO,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;AACrD,OAAO,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAE1C,OAAO,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAC;AACrD,OAAO,EAAE,UAAU,EAAE,WAAW,EAAE,YAAY,EAAE,eAAe,EAAE,MAAM,gBAAgB,CAAC;
|
|
1
|
+
{"version":3,"file":"apply.js","sourceRoot":"","sources":["../../src/reconcile/apply.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"moves.d.ts","sourceRoot":"","sources":["../../src/reconcile/moves.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,iBAAiB,EAAE,IAAI,EAAgB,MAAM,iBAAiB,CAAC;AAI7E,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAOhD,eAAO,MAAM,UAAU,UAAiB,iBAAiB,UAAU,YAAY,KAAG,OAAO,CAAC,IAAI,EAAE,
|
|
1
|
+
{"version":3,"file":"moves.d.ts","sourceRoot":"","sources":["../../src/reconcile/moves.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,iBAAiB,EAAE,IAAI,EAAgB,MAAM,iBAAiB,CAAC;AAI7E,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAOhD,eAAO,MAAM,UAAU,UAAiB,iBAAiB,UAAU,YAAY,KAAG,OAAO,CAAC,IAAI,EAAE,CAoC/F,CAAC;AAKF,eAAO,MAAM,oBAAoB,aAAc,iBAAiB,SAAS,SAAS,IAAI,EAAE,KAAG,iBAW1F,CAAC"}
|
package/dist/reconcile/moves.js
CHANGED
|
@@ -1,13 +1,13 @@
|
|
|
1
1
|
import { resolveInputs } from "../resolve-inputs.js";
|
|
2
2
|
import { createStore } from "../store.js";
|
|
3
|
-
import { makeContext, requireProvider } from "./reconcile.js";
|
|
3
|
+
import { checkSignal, makeContext, requireProvider, runScope } from "./reconcile.js";
|
|
4
4
|
export const applyMoves = async (graph, config) => {
|
|
5
5
|
const moves = graph.moved ?? [];
|
|
6
6
|
if (moves.length === 0) {
|
|
7
7
|
return [];
|
|
8
8
|
}
|
|
9
|
-
const
|
|
10
|
-
const
|
|
9
|
+
const scope = runScope(config);
|
|
10
|
+
const { env, log } = scope;
|
|
11
11
|
const store = createStore();
|
|
12
12
|
const applied = [];
|
|
13
13
|
for (const move of moves) {
|
|
@@ -27,8 +27,9 @@ export const applyMoves = async (graph, config) => {
|
|
|
27
27
|
log(`moved: ${type} cannot rename in place, "${move.from}" → "${move.to}" will be recreated (its data is NOT preserved)`);
|
|
28
28
|
continue;
|
|
29
29
|
}
|
|
30
|
-
const ctx = makeContext(move.to, store,
|
|
30
|
+
const ctx = makeContext(move.to, store, scope);
|
|
31
31
|
const inputs = resolveInputs(node.inputs, store, env, { lenient: true });
|
|
32
|
+
checkSignal(config);
|
|
32
33
|
await provider.restamp(move.from, inputs, ctx);
|
|
33
34
|
log(`moved: re-stamped ${type} "${move.from}" → "${move.to}" in place`);
|
|
34
35
|
applied.push(move);
|
|
@@ -45,6 +46,6 @@ export const rewriteGraphForMoves = (previous, moves) => {
|
|
|
45
46
|
const newId = rename.get(id) ?? id;
|
|
46
47
|
resources[newId] = { ...node, id: newId, dependsOn: node.dependsOn.map((dep) => rename.get(dep) ?? dep) };
|
|
47
48
|
}
|
|
48
|
-
return { version: 1, resources };
|
|
49
|
+
return { version: 1, ...(previous.owner !== undefined ? { owner: previous.owner } : {}), resources };
|
|
49
50
|
};
|
|
50
51
|
//# sourceMappingURL=moves.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"moves.js","sourceRoot":"","sources":["../../src/reconcile/moves.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;AACrD,OAAO,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAE1C,OAAO,EAAE,WAAW,EAAE,eAAe,EAAE,MAAM,gBAAgB,CAAC;
|
|
1
|
+
{"version":3,"file":"moves.js","sourceRoot":"","sources":["../../src/reconcile/moves.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,7 @@
|
|
|
1
|
-
import type { DesiredStateGraph } from "@intentic/graph";
|
|
2
|
-
import type {
|
|
3
|
-
|
|
1
|
+
import type { DesiredStateGraph, Ownership } from "@intentic/graph";
|
|
2
|
+
import type { ListedResource } from "../provider.js";
|
|
3
|
+
import type { EngineConfig, OrphanScan } from "../types.js";
|
|
4
|
+
export type ListedVerdict = "declared" | Exclude<Ownership, "mine"> | "orphan";
|
|
5
|
+
export declare const classifyListed: (listed: ListedResource, declared: ReadonlySet<string>, owner: string | undefined) => ListedVerdict;
|
|
6
|
+
export declare const collectOrphans: (graph: DesiredStateGraph, config: EngineConfig) => Promise<OrphanScan>;
|
|
4
7
|
//# sourceMappingURL=orphans.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"orphans.d.ts","sourceRoot":"","sources":["../../src/reconcile/orphans.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,iBAAiB,CAAC;
|
|
1
|
+
{"version":3,"file":"orphans.d.ts","sourceRoot":"","sources":["../../src/reconcile/orphans.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,iBAAiB,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAGpE,OAAO,KAAK,EAAE,cAAc,EAAc,MAAM,gBAAgB,CAAC;AAGjE,OAAO,KAAK,EAAE,YAAY,EAAuB,UAAU,EAAY,MAAM,aAAa,CAAC;AAK3F,MAAM,MAAM,aAAa,GAAG,UAAU,GAAG,OAAO,CAAC,SAAS,EAAE,MAAM,CAAC,GAAG,QAAQ,CAAC;AAE/E,eAAO,MAAM,cAAc,WAAY,cAAc,YAAY,WAAW,CAAC,MAAM,CAAC,SAAS,MAAM,GAAG,SAAS,KAAG,aASjH,CAAC;AAQF,eAAO,MAAM,cAAc,UAAiB,iBAAiB,UAAU,YAAY,KAAG,OAAO,CAAC,UAAU,CA8CvG,CAAC"}
|
|
@@ -1,36 +1,62 @@
|
|
|
1
|
+
import { ownershipOf } from "@intentic/graph";
|
|
1
2
|
import { resolveInputs } from "../resolve-inputs.js";
|
|
2
3
|
import { createStore } from "../store.js";
|
|
3
|
-
import { makeContext } from "./reconcile.js";
|
|
4
|
+
import { makeContext, runScope } from "./reconcile.js";
|
|
5
|
+
export const classifyListed = (listed, declared, owner) => {
|
|
6
|
+
const ownership = ownershipOf(listed.owner, owner);
|
|
7
|
+
if (ownership === "theirs") {
|
|
8
|
+
return "theirs";
|
|
9
|
+
}
|
|
10
|
+
if (declared.has(listed.id)) {
|
|
11
|
+
return "declared";
|
|
12
|
+
}
|
|
13
|
+
return ownership === "mine" ? "orphan" : "unowned";
|
|
14
|
+
};
|
|
4
15
|
export const collectOrphans = async (graph, config) => {
|
|
5
|
-
const
|
|
6
|
-
const log = config.log ?? console.log;
|
|
16
|
+
const scope = runScope(config);
|
|
7
17
|
const emit = config.onEvent ?? (() => { });
|
|
8
18
|
const store = createStore();
|
|
9
19
|
const sources = Object.values(graph.resources).map((node) => ({
|
|
10
20
|
id: node.id,
|
|
11
21
|
type: node.type,
|
|
12
|
-
inputs: resolveInputs(node.inputs, store, env, { lenient: true }),
|
|
22
|
+
inputs: resolveInputs(node.inputs, store, scope.env, { lenient: true }),
|
|
13
23
|
}));
|
|
14
|
-
const
|
|
15
|
-
const
|
|
24
|
+
const skips = new Map();
|
|
25
|
+
const ctx = {
|
|
26
|
+
...makeContext("", store, scope),
|
|
27
|
+
skipped: (source, reason) => {
|
|
28
|
+
skips.set(`${source}\0${reason}`, { source, reason });
|
|
29
|
+
},
|
|
30
|
+
};
|
|
31
|
+
const declared = new Set(Object.keys(graph.resources));
|
|
16
32
|
const orphans = [];
|
|
33
|
+
const unowned = [];
|
|
34
|
+
let foreign = 0;
|
|
35
|
+
let owned = 0;
|
|
17
36
|
for (const [type, provider] of Object.entries(config.providers)) {
|
|
18
37
|
if (provider?.list === undefined) {
|
|
19
38
|
continue;
|
|
20
39
|
}
|
|
21
|
-
log(`orphan scan: ${type}`);
|
|
40
|
+
scope.log(`orphan scan: ${type}`);
|
|
22
41
|
for (const listed of await provider.list(sources, ctx)) {
|
|
23
|
-
if (
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
});
|
|
42
|
+
if (ownershipOf(listed.owner, scope.owner) === "mine") {
|
|
43
|
+
owned += 1;
|
|
44
|
+
}
|
|
45
|
+
const verdict = classifyListed(listed, declared, scope.owner);
|
|
46
|
+
const kind = type;
|
|
47
|
+
if (verdict === "orphan") {
|
|
48
|
+
emit({ kind: "orphan", id: listed.id, type: kind, ownership: "mine" });
|
|
49
|
+
orphans.push({ id: listed.id, type: kind, inputs: listed.inputs, ...(listed.protected === true ? { protected: true } : {}) });
|
|
50
|
+
}
|
|
51
|
+
else if (verdict === "unowned") {
|
|
52
|
+
emit({ kind: "orphan", id: listed.id, type: kind, ownership: "unowned" });
|
|
53
|
+
unowned.push({ id: listed.id, type: kind });
|
|
54
|
+
}
|
|
55
|
+
else if (verdict === "theirs") {
|
|
56
|
+
foreign += 1;
|
|
31
57
|
}
|
|
32
58
|
}
|
|
33
59
|
}
|
|
34
|
-
return orphans;
|
|
60
|
+
return { orphans, unowned, foreign, owned, skipped: [...skips.values()] };
|
|
35
61
|
};
|
|
36
62
|
//# sourceMappingURL=orphans.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"orphans.js","sourceRoot":"","sources":["../../src/reconcile/orphans.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"orphans.js","sourceRoot":"","sources":["../../src/reconcile/orphans.ts"],"names":[],"mappings":"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"}
|
package/dist/reconcile/plan.js
CHANGED
|
@@ -2,7 +2,7 @@ import { linearize, refKey } from "@intentic/graph";
|
|
|
2
2
|
import { OUTPUTS } from "@intentic/resources";
|
|
3
3
|
import { resolveInputs } from "../resolve-inputs.js";
|
|
4
4
|
import { createStore, PENDING } from "../store.js";
|
|
5
|
-
import { decideDiff, makeContext, narratedRead, requireProvider } from "./reconcile.js";
|
|
5
|
+
import { decideDiff, makeContext, narratedRead, requireProvider, runScope } from "./reconcile.js";
|
|
6
6
|
const seedPendingRefs = (graph, store, prefix) => {
|
|
7
7
|
for (const refNode of Object.values(graph.resources)) {
|
|
8
8
|
JSON.stringify(refNode.inputs, (_k, v) => {
|
|
@@ -14,8 +14,8 @@ const seedPendingRefs = (graph, store, prefix) => {
|
|
|
14
14
|
}
|
|
15
15
|
};
|
|
16
16
|
export const plan = async (graph, config) => {
|
|
17
|
-
const
|
|
18
|
-
const
|
|
17
|
+
const scope = runScope(config);
|
|
18
|
+
const { env, log } = scope;
|
|
19
19
|
const emit = config.onEvent ?? (() => { });
|
|
20
20
|
const store = createStore();
|
|
21
21
|
const steps = [];
|
|
@@ -26,7 +26,7 @@ export const plan = async (graph, config) => {
|
|
|
26
26
|
}
|
|
27
27
|
const type = node.type;
|
|
28
28
|
const provider = requireProvider(config.providers, type, id);
|
|
29
|
-
const ctx = makeContext(id, store,
|
|
29
|
+
const ctx = makeContext(id, store, scope);
|
|
30
30
|
emit({ kind: "node", phase: "plan", state: "start", id, type });
|
|
31
31
|
const inputs = resolveInputs(node.inputs, store, env, { lenient: true });
|
|
32
32
|
const observed = await narratedRead(provider, inputs, ctx, id, log);
|
|
@@ -44,7 +44,7 @@ export const plan = async (graph, config) => {
|
|
|
44
44
|
}
|
|
45
45
|
continue;
|
|
46
46
|
}
|
|
47
|
-
const result = decideDiff(provider, node, inputs, observed);
|
|
47
|
+
const result = decideDiff(provider, node, inputs, observed, scope.owner);
|
|
48
48
|
steps.push(result.action === "update" ? { id, type, action: "update", reason: result.reason } : { id, type, action: "noop" });
|
|
49
49
|
emit(result.action === "update"
|
|
50
50
|
? { kind: "node", phase: "plan", state: "done", id, type, action: "update", reason: result.reason }
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"plan.js","sourceRoot":"","sources":["../../src/reconcile/plan.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,SAAS,EAAE,MAAM,EAAE,MAAM,iBAAiB,CAAC;AAEpD,OAAO,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAC;AAC9C,OAAO,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;AACrD,OAAO,EAAE,WAAW,EAAoB,OAAO,EAAE,MAAM,aAAa,CAAC;AAErE,OAAO,EAAE,UAAU,EAAE,WAAW,EAAE,YAAY,EAAE,eAAe,EAAE,MAAM,gBAAgB,CAAC;
|
|
1
|
+
{"version":3,"file":"plan.js","sourceRoot":"","sources":["../../src/reconcile/plan.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"prune.d.ts","sourceRoot":"","sources":["../../src/reconcile/prune.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,iBAAiB,EAAgB,MAAM,iBAAiB,CAAC;
|
|
1
|
+
{"version":3,"file":"prune.d.ts","sourceRoot":"","sources":["../../src/reconcile/prune.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,iBAAiB,EAAgB,MAAM,iBAAiB,CAAC;AAOvE,OAAO,KAAK,EAAE,YAAY,EAAE,WAAW,EAAkB,YAAY,EAAmB,MAAM,aAAa,CAAC;AAsD5G,eAAO,MAAM,KAAK,aAAoB,iBAAiB,WAAW,iBAAiB,UAAU,YAAY,KAAG,OAAO,CAAC,YAAY,CAuD/H,CAAC;AAKF,eAAO,MAAM,YAAY,YAAmB,SAAS,WAAW,EAAE,UAAU,YAAY,KAAG,OAAO,CAAC,YAAY,CAwB9G,CAAC"}
|
package/dist/reconcile/prune.js
CHANGED
|
@@ -1,25 +1,38 @@
|
|
|
1
1
|
import { linearize, refKey } from "@intentic/graph";
|
|
2
2
|
import { OUTPUTS } from "@intentic/resources";
|
|
3
|
+
import { errorMessage } from "@intentic/base/errors";
|
|
3
4
|
import { resolveInputs } from "../resolve-inputs.js";
|
|
4
5
|
import { createStore, PENDING } from "../store.js";
|
|
5
|
-
import { makeContext, requireProvider } from "./reconcile.js";
|
|
6
|
-
const
|
|
7
|
-
const
|
|
8
|
-
|
|
6
|
+
import { checkSignal, makeContext, requireProvider, runScope } from "./reconcile.js";
|
|
7
|
+
const seedPending = (node, store) => {
|
|
8
|
+
for (const name of OUTPUTS[node.type]) {
|
|
9
|
+
store.set(refKey(node.id, name), PENDING);
|
|
10
|
+
}
|
|
11
|
+
};
|
|
12
|
+
const seedOutputs = async (nodes, config, scope, store) => {
|
|
9
13
|
for (const node of nodes) {
|
|
10
14
|
if (store.has(node.id)) {
|
|
11
15
|
continue;
|
|
12
16
|
}
|
|
13
17
|
const type = node.type;
|
|
14
18
|
const provider = requireProvider(config.providers, type, node.id);
|
|
15
|
-
const ctx = makeContext(node.id, store,
|
|
16
|
-
const
|
|
17
|
-
const
|
|
19
|
+
const ctx = makeContext(node.id, store, scope);
|
|
20
|
+
const missing = new Set();
|
|
21
|
+
const inputs = resolveInputs(node.inputs, store, scope.env, { lenient: true, missingSecrets: missing });
|
|
22
|
+
let observed;
|
|
23
|
+
try {
|
|
24
|
+
observed = await provider.read(inputs, ctx);
|
|
25
|
+
}
|
|
26
|
+
catch (error) {
|
|
27
|
+
if (missing.size === 0) {
|
|
28
|
+
throw error;
|
|
29
|
+
}
|
|
30
|
+
scope.log(`prune: could not read ${node.id} without ${[...missing].join(", ")}, treating its outputs as unknown: ${errorMessage(error)}`);
|
|
31
|
+
observed = undefined;
|
|
32
|
+
}
|
|
18
33
|
store.set(node.id, node.id);
|
|
19
34
|
if (observed === undefined) {
|
|
20
|
-
|
|
21
|
-
store.set(refKey(node.id, name), PENDING);
|
|
22
|
-
}
|
|
35
|
+
seedPending(node, store);
|
|
23
36
|
continue;
|
|
24
37
|
}
|
|
25
38
|
for (const [name, value] of Object.entries(observed.outputs)) {
|
|
@@ -33,8 +46,7 @@ const inOrder = (graph) => linearize(graph)
|
|
|
33
46
|
.map((id) => graph.resources[id])
|
|
34
47
|
.filter((node) => node !== undefined);
|
|
35
48
|
export const prune = async (previous, current, config) => {
|
|
36
|
-
const
|
|
37
|
-
const log = config.log ?? console.log;
|
|
49
|
+
const scope = runScope(config);
|
|
38
50
|
const emit = config.onEvent ?? (() => { });
|
|
39
51
|
const kept = new Set(Object.keys(current.resources));
|
|
40
52
|
const removed = new Set(Object.keys(previous.resources).filter((id) => !kept.has(id)));
|
|
@@ -42,7 +54,7 @@ export const prune = async (previous, current, config) => {
|
|
|
42
54
|
return { deleted: [], skipped: [] };
|
|
43
55
|
}
|
|
44
56
|
const store = createStore();
|
|
45
|
-
await seedOutputs([...inOrder(current), ...inOrder(previous)], config, store);
|
|
57
|
+
await seedOutputs([...inOrder(current), ...inOrder(previous)], config, scope, store);
|
|
46
58
|
const deleted = [];
|
|
47
59
|
const skipped = [];
|
|
48
60
|
for (const id of [...linearize(previous)].toReversed()) {
|
|
@@ -57,25 +69,38 @@ export const prune = async (previous, current, config) => {
|
|
|
57
69
|
const provider = requireProvider(config.providers, type, id);
|
|
58
70
|
if (node.inputs["protect"] === true) {
|
|
59
71
|
emit({ kind: "prune", state: "skipped", id, type, reason: "protected" });
|
|
60
|
-
skipped.push({ id, type });
|
|
72
|
+
skipped.push({ id, type, reason: "protected" });
|
|
61
73
|
continue;
|
|
62
74
|
}
|
|
63
75
|
if (provider.delete === undefined) {
|
|
64
76
|
emit({ kind: "prune", state: "skipped", id, type, reason: "no-delete" });
|
|
65
|
-
skipped.push({ id, type });
|
|
77
|
+
skipped.push({ id, type, reason: "no-delete" });
|
|
78
|
+
continue;
|
|
79
|
+
}
|
|
80
|
+
checkSignal(config);
|
|
81
|
+
const ctx = makeContext(id, store, scope);
|
|
82
|
+
const missing = new Set();
|
|
83
|
+
const inputs = resolveInputs(node.inputs, store, scope.env, { lenient: true, missingSecrets: missing });
|
|
84
|
+
try {
|
|
85
|
+
await provider.delete(inputs, ctx);
|
|
86
|
+
}
|
|
87
|
+
catch (error) {
|
|
88
|
+
if (missing.size === 0) {
|
|
89
|
+
throw error;
|
|
90
|
+
}
|
|
91
|
+
const keys = [...missing].toSorted();
|
|
92
|
+
scope.log(`prune: could not delete ${id} without ${keys.join(", ")} (set it to retry): ${errorMessage(error)}`);
|
|
93
|
+
emit({ kind: "prune", state: "skipped", id, type, reason: "missing-secret" });
|
|
94
|
+
skipped.push({ id, type, reason: "missing-secret", missing: keys });
|
|
66
95
|
continue;
|
|
67
96
|
}
|
|
68
|
-
const ctx = makeContext(id, store, env, log);
|
|
69
|
-
const inputs = resolveInputs(node.inputs, store, env, { lenient: true });
|
|
70
|
-
await provider.delete(inputs, ctx);
|
|
71
97
|
emit({ kind: "prune", state: "deleted", id, type });
|
|
72
98
|
deleted.push({ id, type });
|
|
73
99
|
}
|
|
74
100
|
return { deleted, skipped };
|
|
75
101
|
};
|
|
76
102
|
export const pruneOrphans = async (orphans, config) => {
|
|
77
|
-
const
|
|
78
|
-
const log = config.log ?? console.log;
|
|
103
|
+
const scope = runScope(config);
|
|
79
104
|
const emit = config.onEvent ?? (() => { });
|
|
80
105
|
const deleted = [];
|
|
81
106
|
const skipped = [];
|
|
@@ -83,15 +108,16 @@ export const pruneOrphans = async (orphans, config) => {
|
|
|
83
108
|
const provider = requireProvider(config.providers, orphan.type, orphan.id);
|
|
84
109
|
if (orphan.protected === true) {
|
|
85
110
|
emit({ kind: "prune", state: "skipped", id: orphan.id, type: orphan.type, reason: "protected" });
|
|
86
|
-
skipped.push({ id: orphan.id, type: orphan.type });
|
|
111
|
+
skipped.push({ id: orphan.id, type: orphan.type, reason: "protected" });
|
|
87
112
|
continue;
|
|
88
113
|
}
|
|
89
114
|
if (provider.delete === undefined) {
|
|
90
115
|
emit({ kind: "prune", state: "skipped", id: orphan.id, type: orphan.type, reason: "no-delete" });
|
|
91
|
-
skipped.push({ id: orphan.id, type: orphan.type });
|
|
116
|
+
skipped.push({ id: orphan.id, type: orphan.type, reason: "no-delete" });
|
|
92
117
|
continue;
|
|
93
118
|
}
|
|
94
|
-
|
|
119
|
+
checkSignal(config);
|
|
120
|
+
const ctx = makeContext(orphan.id, createStore(), scope);
|
|
95
121
|
await provider.delete(orphan.inputs, ctx);
|
|
96
122
|
emit({ kind: "prune", state: "deleted", id: orphan.id, type: orphan.type });
|
|
97
123
|
deleted.push({ id: orphan.id, type: orphan.type });
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"prune.js","sourceRoot":"","sources":["../../src/reconcile/prune.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,SAAS,EAAE,MAAM,EAAE,MAAM,iBAAiB,CAAC;AAEpD,OAAO,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAC;AAC9C,OAAO,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;AACrD,OAAO,EAAE,WAAW,EAAoB,OAAO,EAAE,MAAM,aAAa,CAAC;AAErE,OAAO,EAAE,WAAW,EAAE,eAAe,EAAE,MAAM,gBAAgB,CAAC;
|
|
1
|
+
{"version":3,"file":"prune.js","sourceRoot":"","sources":["../../src/reconcile/prune.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,9 +2,17 @@ import type { ResourceNode } from "@intentic/graph";
|
|
|
2
2
|
import type { ResourceType } from "@intentic/resources";
|
|
3
3
|
import type { DiffResult, Observed, Provider, ProviderContext, Providers } from "../provider.js";
|
|
4
4
|
import type { OutputStore } from "../store.js";
|
|
5
|
-
import type { ResolvedInputs } from "../types.js";
|
|
5
|
+
import type { EngineConfig, ResolvedInputs } from "../types.js";
|
|
6
6
|
export declare const requireProvider: (providers: Providers, type: ResourceType, id: string) => Provider;
|
|
7
|
-
export
|
|
7
|
+
export interface RunScope {
|
|
8
|
+
readonly env: Readonly<Record<string, string | undefined>>;
|
|
9
|
+
readonly log: (message: string) => void;
|
|
10
|
+
readonly owner?: string;
|
|
11
|
+
}
|
|
12
|
+
export declare const runScope: (config: EngineConfig) => RunScope;
|
|
13
|
+
export declare const makeContext: (id: string, store: OutputStore, scope: RunScope, inputsHash?: string) => ProviderContext;
|
|
14
|
+
export declare const checkSignal: (config: EngineConfig) => void;
|
|
8
15
|
export declare const narratedRead: (provider: Provider, inputs: ResolvedInputs, ctx: ProviderContext, id: string, log: (message: string) => void) => Promise<Observed | undefined>;
|
|
9
|
-
export declare const
|
|
16
|
+
export declare const ownerDrift: (id: string, observed: Observed, owner: string | undefined) => DiffResult | undefined;
|
|
17
|
+
export declare const decideDiff: (provider: Provider, node: ResourceNode, inputs: ResolvedInputs, observed: Observed, owner?: string) => DiffResult;
|
|
10
18
|
//# sourceMappingURL=reconcile.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"reconcile.d.ts","sourceRoot":"","sources":["../../src/reconcile/reconcile.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAEpD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAC;AACxD,OAAO,KAAK,EAAE,UAAU,EAAE,QAAQ,EAAE,QAAQ,EAAE,eAAe,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;AACjG,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAC/C,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,aAAa,CAAC;
|
|
1
|
+
{"version":3,"file":"reconcile.d.ts","sourceRoot":"","sources":["../../src/reconcile/reconcile.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAEpD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAC;AACxD,OAAO,KAAK,EAAE,UAAU,EAAE,QAAQ,EAAE,QAAQ,EAAE,eAAe,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;AACjG,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAC/C,OAAO,KAAK,EAAE,YAAY,EAAE,cAAc,EAAE,MAAM,aAAa,CAAC;AAEhE,eAAO,MAAM,eAAe,cAAe,SAAS,QAAQ,YAAY,MAAM,MAAM,KAAG,QAMtF,CAAC;AAGF,MAAM,WAAW,QAAQ;IACrB,QAAQ,CAAC,GAAG,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,SAAS,CAAC,CAAC,CAAC;IAC3D,QAAQ,CAAC,GAAG,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,IAAI,CAAC;IACxC,QAAQ,CAAC,KAAK,CAAC,EAAE,MAAM,CAAC;CAC3B;AAED,eAAO,MAAM,QAAQ,WAAY,YAAY,KAAG,QAI9C,CAAC;AAEH,eAAO,MAAM,WAAW,OAAQ,MAAM,SAAS,WAAW,SAAS,QAAQ,eAAe,MAAM,KAAG,eAOjG,CAAC;AAGH,eAAO,MAAM,WAAW,WAAY,YAAY,KAAG,IAElD,CAAC;AASF,eAAO,MAAM,YAAY,aACX,QAAQ,UACV,cAAc,OACjB,eAAe,MAChB,MAAM,OACL,CAAC,OAAO,EAAE,MAAM,KAAK,IAAI,KAC/B,OAAO,CAAC,QAAQ,GAAG,SAAS,CAS9B,CAAC;AAKF,eAAO,MAAM,UAAU,OAAQ,MAAM,YAAY,QAAQ,SAAS,MAAM,GAAG,SAAS,KAAG,UAAU,GAAG,SAcnG,CAAC;AAMF,eAAO,MAAM,UAAU,aAAc,QAAQ,QAAQ,YAAY,UAAU,cAAc,YAAY,QAAQ,UAAU,MAAM,KAAG,UAItF,CAAC"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { hashInputs, refKey } from "@intentic/graph";
|
|
1
|
+
import { hashInputs, ownershipOf, refKey } from "@intentic/graph";
|
|
2
2
|
export const requireProvider = (providers, type, id) => {
|
|
3
3
|
const provider = providers[type];
|
|
4
4
|
if (provider === undefined) {
|
|
@@ -6,13 +6,22 @@ export const requireProvider = (providers, type, id) => {
|
|
|
6
6
|
}
|
|
7
7
|
return provider;
|
|
8
8
|
};
|
|
9
|
-
export const
|
|
10
|
-
env,
|
|
11
|
-
log,
|
|
9
|
+
export const runScope = (config) => ({
|
|
10
|
+
env: config.env ?? process.env,
|
|
11
|
+
log: config.log ?? console.log,
|
|
12
|
+
...(config.owner !== undefined ? { owner: config.owner } : {}),
|
|
13
|
+
});
|
|
14
|
+
export const makeContext = (id, store, scope, inputsHash) => ({
|
|
15
|
+
env: scope.env,
|
|
16
|
+
log: scope.log,
|
|
12
17
|
id,
|
|
13
18
|
output: (depId, name) => store.get(refKey(depId, name), { lenient: false }),
|
|
14
19
|
...(inputsHash !== undefined ? { inputsHash } : {}),
|
|
20
|
+
...(scope.owner !== undefined ? { owner: scope.owner } : {}),
|
|
15
21
|
});
|
|
22
|
+
export const checkSignal = (config) => {
|
|
23
|
+
config.signal?.throwIfAborted();
|
|
24
|
+
};
|
|
16
25
|
const READ_NARRATE_INTERVAL_MS = 15_000;
|
|
17
26
|
export const narratedRead = async (provider, inputs, ctx, id, log) => {
|
|
18
27
|
const started = Date.now();
|
|
@@ -25,7 +34,21 @@ export const narratedRead = async (provider, inputs, ctx, id, log) => {
|
|
|
25
34
|
clearInterval(narrator);
|
|
26
35
|
}
|
|
27
36
|
};
|
|
28
|
-
export const
|
|
29
|
-
|
|
30
|
-
|
|
37
|
+
export const ownerDrift = (id, observed, owner) => {
|
|
38
|
+
if (owner === undefined || observed.stampOwner === undefined) {
|
|
39
|
+
return undefined;
|
|
40
|
+
}
|
|
41
|
+
const ownership = ownershipOf(observed.stampOwner, owner);
|
|
42
|
+
if (ownership === "mine") {
|
|
43
|
+
return undefined;
|
|
44
|
+
}
|
|
45
|
+
if (ownership === "unowned") {
|
|
46
|
+
return { action: "update", reason: `adopting: stamp it as owned by intent ${owner}` };
|
|
47
|
+
}
|
|
48
|
+
throw new Error(`"${id}" is live but stamped as owned by intent "${observed.stampOwner}", not this one ("${owner}"): two intents declare the same resource on a shared host or zone. Rename it in one of them, or remove it there first.`);
|
|
49
|
+
};
|
|
50
|
+
export const decideDiff = (provider, node, inputs, observed, owner) => ownerDrift(node.id, observed, owner) ??
|
|
51
|
+
(observed.stampHash !== undefined && observed.stampHash !== hashInputs(node.inputs)
|
|
52
|
+
? { action: "update", reason: "authored inputs changed since last stamped apply" }
|
|
53
|
+
: provider.diff(inputs, observed));
|
|
31
54
|
//# sourceMappingURL=reconcile.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"reconcile.js","sourceRoot":"","sources":["../../src/reconcile/reconcile.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,UAAU,EAAE,MAAM,EAAE,MAAM,iBAAiB,CAAC;
|
|
1
|
+
{"version":3,"file":"reconcile.js","sourceRoot":"","sources":["../../src/reconcile/reconcile.ts"],"names":[],"mappings":"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"}
|
package/dist/resolve-inputs.d.ts
CHANGED
|
@@ -1,6 +1,8 @@
|
|
|
1
1
|
import type { SerializedValue } from "@intentic/graph";
|
|
2
2
|
import type { OutputStore } from "./store.js";
|
|
3
|
+
export declare const MISSING_SECRET = "intentic-missing-secret";
|
|
3
4
|
export declare const resolveInputs: (inputs: Readonly<Record<string, SerializedValue>>, store: OutputStore, env: Readonly<Record<string, string | undefined>>, options: {
|
|
4
5
|
readonly lenient: boolean;
|
|
6
|
+
readonly missingSecrets?: Set<string>;
|
|
5
7
|
}) => Record<string, unknown>;
|
|
6
8
|
//# sourceMappingURL=resolve-inputs.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"resolve-inputs.d.ts","sourceRoot":"","sources":["../src/resolve-inputs.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAgB,eAAe,EAAE,MAAM,iBAAiB,CAAC;AACrE,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,YAAY,CAAC;
|
|
1
|
+
{"version":3,"file":"resolve-inputs.d.ts","sourceRoot":"","sources":["../src/resolve-inputs.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAgB,eAAe,EAAE,MAAM,iBAAiB,CAAC;AACrE,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,YAAY,CAAC;AAU9C,eAAO,MAAM,cAAc,4BAA4B,CAAC;AAExD,eAAO,MAAM,aAAa,WACd,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,eAAe,CAAC,CAAC,SAC1C,WAAW,OACb,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,SAAS,CAAC,CAAC,WACxC;IACL,QAAQ,CAAC,OAAO,EAAE,OAAO,CAAC;IAE1B,QAAQ,CAAC,cAAc,CAAC,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC;CACzC,KACF,MAAM,CAAC,MAAM,EAAE,OAAO,CAmCxB,CAAC"}
|
package/dist/resolve-inputs.js
CHANGED
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
const isSecretNode = (value) => "$secret" in value;
|
|
2
2
|
const isRefNode = (value) => "$ref" in value;
|
|
3
|
+
export const MISSING_SECRET = "intentic-missing-secret";
|
|
3
4
|
export const resolveInputs = (inputs, store, env, options) => {
|
|
4
5
|
const walk = (value) => {
|
|
5
6
|
if (Array.isArray(value)) {
|
|
@@ -9,6 +10,10 @@ export const resolveInputs = (inputs, store, env, options) => {
|
|
|
9
10
|
if (isSecretNode(value)) {
|
|
10
11
|
const secret = env[value.$secret.key];
|
|
11
12
|
if (secret === undefined) {
|
|
13
|
+
if (options.missingSecrets !== undefined) {
|
|
14
|
+
options.missingSecrets.add(value.$secret.key);
|
|
15
|
+
return MISSING_SECRET;
|
|
16
|
+
}
|
|
12
17
|
throw new Error(`missing secret env var "${value.$secret.key}"`);
|
|
13
18
|
}
|
|
14
19
|
return secret;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"resolve-inputs.js","sourceRoot":"","sources":["../src/resolve-inputs.ts"],"names":[],"mappings":"AAKA,MAAM,YAAY,GAAG,CAAC,KAAa,EAA0F,EAAE,CAAC,SAAS,IAAI,KAAK,CAAC;AACnJ,MAAM,SAAS,GAAG,CAAC,KAAa,EAAsC,EAAE,CAAC,MAAM,IAAI,KAAK,CAAC;
|
|
1
|
+
{"version":3,"file":"resolve-inputs.js","sourceRoot":"","sources":["../src/resolve-inputs.ts"],"names":[],"mappings":"AAKA,MAAM,YAAY,GAAG,CAAC,KAAa,EAA0F,EAAE,CAAC,SAAS,IAAI,KAAK,CAAC;AACnJ,MAAM,SAAS,GAAG,CAAC,KAAa,EAAsC,EAAE,CAAC,MAAM,IAAI,KAAK,CAAC;AAKzF,MAAM,CAAC,MAAM,cAAc,GAAG,yBAAyB,CAAC;AAExD,MAAM,CAAC,MAAM,aAAa,GAAG,CACzB,MAAiD,EACjD,KAAkB,EAClB,GAAiD,EACjD,OAIC,EACsB,EAAE;IACzB,MAAM,IAAI,GAAG,CAAC,KAAsB,EAAW,EAAE;QAC7C,IAAI,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE,CAAC;YACvB,OAAO,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;QAC3B,CAAC;QACD,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAI,KAAK,KAAK,IAAI,EAAE,CAAC;YAC9C,IAAI,YAAY,CAAC,KAAK,CAAC,EAAE,CAAC;gBACtB,MAAM,MAAM,GAAG,GAAG,CAAC,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;gBACtC,IAAI,MAAM,KAAK,SAAS,EAAE,CAAC;oBACvB,IAAI,OAAO,CAAC,cAAc,KAAK,SAAS,EAAE,CAAC;wBACvC,OAAO,CAAC,cAAc,CAAC,GAAG,CAAC,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;wBAC9C,OAAO,cAAc,CAAC;oBAC1B,CAAC;oBACD,MAAM,IAAI,KAAK,CAAC,2BAA2B,KAAK,CAAC,OAAO,CAAC,GAAG,GAAG,CAAC,CAAC;gBACrE,CAAC;gBACD,OAAO,MAAM,CAAC;YAClB,CAAC;YACD,IAAI,SAAS,CAAC,KAAK,CAAC,EAAE,CAAC;gBAEnB,OAAO,KAAK,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,EAAE,EAAE,OAAO,EAAE,OAAO,CAAC,OAAO,EAAE,CAAC,CAAC;YAC/D,CAAC;YACD,MAAM,MAAM,GAA4B,EAAE,CAAC;YAC3C,KAAK,MAAM,CAAC,GAAG,EAAE,KAAK,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE,CAAC;gBAC/C,MAAM,CAAC,GAAG,CAAC,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC;YAC9B,CAAC;YACD,OAAO,MAAM,CAAC;QAClB,CAAC;QACD,OAAO,KAAK,CAAC;IACjB,CAAC,CAAC;IAEF,MAAM,QAAQ,GAA4B,EAAE,CAAC;IAC7C,KAAK,MAAM,CAAC,GAAG,EAAE,KAAK,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,CAAC;QAChD,QAAQ,CAAC,GAAG,CAAC,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC;IAChC,CAAC;IACD,OAAO,QAAQ,CAAC;AACpB,CAAC,CAAC"}
|
package/dist/types.d.ts
CHANGED
|
@@ -17,6 +17,17 @@ export interface OrphanEntry extends Orphan {
|
|
|
17
17
|
readonly inputs: Readonly<Record<string, unknown>>;
|
|
18
18
|
readonly protected?: boolean;
|
|
19
19
|
}
|
|
20
|
+
export interface ScanSkip {
|
|
21
|
+
readonly source: string;
|
|
22
|
+
readonly reason: string;
|
|
23
|
+
}
|
|
24
|
+
export interface OrphanScan {
|
|
25
|
+
readonly orphans: readonly OrphanEntry[];
|
|
26
|
+
readonly unowned: readonly Orphan[];
|
|
27
|
+
readonly foreign: number;
|
|
28
|
+
readonly owned: number;
|
|
29
|
+
readonly skipped: readonly ScanSkip[];
|
|
30
|
+
}
|
|
20
31
|
export interface PlanOutcome {
|
|
21
32
|
readonly steps: readonly Step[];
|
|
22
33
|
}
|
|
@@ -28,9 +39,14 @@ export interface PrunedResource {
|
|
|
28
39
|
readonly id: string;
|
|
29
40
|
readonly type: ResourceType;
|
|
30
41
|
}
|
|
42
|
+
export type SkipReason = "no-delete" | "protected" | "missing-secret";
|
|
43
|
+
export interface SkippedResource extends PrunedResource {
|
|
44
|
+
readonly reason: SkipReason;
|
|
45
|
+
readonly missing?: readonly string[];
|
|
46
|
+
}
|
|
31
47
|
export interface PruneOutcome {
|
|
32
48
|
readonly deleted: readonly PrunedResource[];
|
|
33
|
-
readonly skipped: readonly
|
|
49
|
+
readonly skipped: readonly SkippedResource[];
|
|
34
50
|
}
|
|
35
51
|
export type EngineEvent = {
|
|
36
52
|
readonly kind: "node";
|
|
@@ -54,14 +70,17 @@ export type EngineEvent = {
|
|
|
54
70
|
readonly state: "deleted" | "skipped";
|
|
55
71
|
readonly id: string;
|
|
56
72
|
readonly type: ResourceType;
|
|
57
|
-
readonly reason?:
|
|
73
|
+
readonly reason?: SkipReason;
|
|
58
74
|
} | {
|
|
59
75
|
readonly kind: "orphan";
|
|
60
76
|
readonly id: string;
|
|
61
77
|
readonly type: ResourceType;
|
|
78
|
+
readonly ownership: "mine" | "unowned";
|
|
62
79
|
};
|
|
63
80
|
export interface EngineConfig {
|
|
64
81
|
readonly providers: Providers;
|
|
82
|
+
readonly owner?: string;
|
|
83
|
+
readonly signal?: AbortSignal;
|
|
65
84
|
readonly env?: Readonly<Record<string, string | undefined>>;
|
|
66
85
|
readonly probe?: ReadinessProbe;
|
|
67
86
|
readonly log?: (message: string) => void;
|
package/dist/types.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAC;AACxD,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,eAAe,CAAC;AAC/C,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,gBAAgB,CAAC;AAIrD,MAAM,MAAM,cAAc,GAAG,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CAAC;AAE/D,MAAM,MAAM,MAAM,GAAG,QAAQ,GAAG,QAAQ,GAAG,MAAM,CAAC;AAElD,MAAM,WAAW,IAAI;IACjB,QAAQ,CAAC,EAAE,EAAE,MAAM,CAAC;IACpB,QAAQ,CAAC,IAAI,EAAE,YAAY,CAAC;IAC5B,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;IACxB,QAAQ,CAAC,MAAM,CAAC,EAAE,MAAM,CAAC;CAC5B;AAED,MAAM,WAAW,MAAM;IACnB,QAAQ,CAAC,EAAE,EAAE,MAAM,CAAC;IACpB,QAAQ,CAAC,IAAI,EAAE,YAAY,CAAC;CAC/B;AAGD,MAAM,WAAW,WAAY,SAAQ,MAAM;IACvC,QAAQ,CAAC,MAAM,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CAAC;IACnD,QAAQ,CAAC,SAAS,CAAC,EAAE,OAAO,CAAC;CAChC;AAED,MAAM,WAAW,WAAW;IACxB,QAAQ,CAAC,KAAK,EAAE,SAAS,IAAI,EAAE,CAAC;CACnC;AAED,MAAM,WAAW,YAAY;IACzB,QAAQ,CAAC,KAAK,EAAE,SAAS,IAAI,EAAE,CAAC;IAChC,QAAQ,CAAC,OAAO,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC;CACjF;AAED,MAAM,WAAW,cAAc;IAC3B,QAAQ,CAAC,EAAE,EAAE,MAAM,CAAC;IACpB,QAAQ,CAAC,IAAI,EAAE,YAAY,CAAC;CAC/B;AAED,MAAM,WAAW,YAAY;IAEzB,QAAQ,CAAC,OAAO,EAAE,SAAS,cAAc,EAAE,CAAC;IAE5C,QAAQ,CAAC,OAAO,EAAE,SAAS,
|
|
1
|
+
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@intentic/engine",
|
|
3
|
-
"version": "1.
|
|
3
|
+
"version": "1.328.0",
|
|
4
4
|
"description": "Stateless reconcile engine: plan/apply, the Provider SPI, and the reconcile loop.",
|
|
5
5
|
"license": "MIT",
|
|
6
6
|
"type": "module",
|
|
@@ -30,17 +30,17 @@
|
|
|
30
30
|
}
|
|
31
31
|
},
|
|
32
32
|
"dependencies": {
|
|
33
|
-
"@intentic/base": "1.
|
|
34
|
-
"@intentic/graph": "1.
|
|
35
|
-
"@intentic/resources": "1.
|
|
33
|
+
"@intentic/base": "1.328.0",
|
|
34
|
+
"@intentic/graph": "1.328.0",
|
|
35
|
+
"@intentic/resources": "1.328.0",
|
|
36
36
|
"tslib": "2.8.1"
|
|
37
37
|
},
|
|
38
38
|
"devDependencies": {
|
|
39
|
-
"@intentic/sdk": "1.
|
|
39
|
+
"@intentic/sdk": "1.328.0",
|
|
40
40
|
"@intentic/testing": "0.0.0",
|
|
41
41
|
"@intentic/tsconfig": "0.0.0",
|
|
42
42
|
"@types/bun": "1.4.2",
|
|
43
|
-
"@types/node": "24.
|
|
43
|
+
"@types/node": "24.19.1",
|
|
44
44
|
"@typescript/native-preview": "7.0.0-dev.20260707.2"
|
|
45
45
|
},
|
|
46
46
|
"scripts": {
|