Skip to content

Regenerate the Action bundle for reconcile --plan-json #67

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
lex00 merged 1 commit into from
Oct 5, 2026
Merged

Regenerate the Action bundle for reconcile --plan-json #67

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
41 changes: 33 additions & 8 deletions action/index.mjs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1235,6 +1235,7 @@ function ownedPredicate(owned) {
}
async function runReconcile2(opts) {
drainNotes();
const changeSets = [];
const result = await runReconcile({
client: opts.client,
scopes: opts.config.orgs,
Expand All @@ -1245,11 +1246,15 @@ async function runReconcile2(opts) {
// removalDeltaCap) on each change set it returns, so every guardrail
// evaluation carries its own live counts — no side channel between the
// diff and guardrail callbacks.
diff: (scopeId, desired, live, dopts) => diff(scopeId, desired, live, {
...dopts,
isOwned: dopts.isOwned ?? ownedPredicate(opts.config.orgs[scopeId]?.owned),
nowMs: dopts.nowMs ?? Date.now()
}),
diff: (scopeId, desired, live, dopts) => {
const changeSet = diff(scopeId, desired, live, {
...dopts,
isOwned: dopts.isOwned ?? ownedPredicate(opts.config.orgs[scopeId]?.owned),
nowMs: dopts.nowMs ?? Date.now()
});
changeSets.push(changeSet);
return changeSet;
},
guardrails: (changeSet, live) => runGuardrails(changeSet, live, opts.guardrails ?? {}),
diffOptions: opts.diffOptions,
allowGuardrailOverride: opts.allowGuardrailOverride,
Expand All @@ -1260,7 +1265,7 @@ async function runReconcile2(opts) {
if (cr) cr.plan = `${cr.plan}
${n.note}`;
}
return result;
return { ...result, changeSets };
}
var init_runner = __esm({
"src/reconcile/runner.ts"() {
Expand Down Expand Up @@ -254473,7 +254478,8 @@ function parseReconcileArgs(argv) {
installationIdEnv: void 0,
tokenEnv: void 0,
allowGuardrailOverride: false,
removalCapFraction: void 0
removalCapFraction: void 0,
planJson: void 0
};
const knownFlags = /* @__PURE__ */ new Set([
"--config",
Expand All @@ -254483,7 +254489,8 @@ function parseReconcileArgs(argv) {
"--installation-id-env",
"--token-env",
"--allow-guardrail-override",
"--removal-cap-fraction"
"--removal-cap-fraction",
"--plan-json"
]);
let i = 0;
while (i < argv.length) {
Expand Down Expand Up @@ -254556,10 +254563,20 @@ function parseReconcileArgs(argv) {
args.removalCapFraction = fraction;
break;
}
case "--plan-json": {
const val = argv[++i];
if (val === void 0 || val.startsWith("--"))
throw new CliError(2, "--plan-json requires a value");
args.planJson = val;
break;
}
}
i++;
}
if (!args.config) throw new CliError(2, "--config is required");
if (args.planJson !== void 0 && args.mode === "apply") {
throw new CliError(2, "--plan-json writes a plan without applying it; it cannot be combined with --mode apply");
}
const hasTokenAuth = !!args.tokenEnv;
const hasAppAuth = !!(args.appIdEnv && args.installationIdEnv);
if (!hasTokenAuth && !hasAppAuth) {
Expand Down Expand Up @@ -254879,6 +254896,14 @@ async function main(argv = process.argv.slice(2)) {
} catch (err) {
die(3, `reconcile failed: ${errMsg2(err)}`);
}
if (args.planJson !== void 0) {
try {
writeFileSync4(args.planJson, `${JSON.stringify(result.changeSets, null, 2)}
`, "utf-8");
} catch (err) {
die(3, `failed to write plan to "${args.planJson}": ${errMsg2(err)}`);
}
}
for (const cr of result.cycles) {
process.stdout.write(`
=== ${cr.name} @ ${cr.org} ===
Expand Down
Loading