@intentic/cli 1.326.0 → 1.327.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 +7 -4
- package/dist/adopt/adopt.command.d.ts.map +1 -1
- package/dist/adopt/adopt.command.js +13 -6
- package/dist/adopt/adopt.command.js.map +1 -1
- package/dist/adopt/adopt.d.ts +5 -1
- package/dist/adopt/adopt.d.ts.map +1 -1
- package/dist/adopt/adopt.js +28 -3
- package/dist/adopt/adopt.js.map +1 -1
- package/dist/apply/apply-lock.d.ts +12 -0
- package/dist/apply/apply-lock.d.ts.map +1 -1
- package/dist/apply/apply-lock.js +50 -1
- package/dist/apply/apply-lock.js.map +1 -1
- package/dist/apply/apply.command.d.ts.map +1 -1
- package/dist/apply/apply.command.js +126 -48
- package/dist/apply/apply.command.js.map +1 -1
- package/dist/apply/baseline.d.ts +38 -0
- package/dist/apply/baseline.d.ts.map +1 -0
- package/dist/apply/baseline.js +108 -0
- package/dist/apply/baseline.js.map +1 -0
- package/dist/apply/prune-phase.d.ts +21 -0
- package/dist/apply/prune-phase.d.ts.map +1 -0
- package/dist/apply/prune-phase.js +46 -0
- package/dist/apply/prune-phase.js.map +1 -0
- package/dist/apply/retired-hosts.d.ts +18 -0
- package/dist/apply/retired-hosts.d.ts.map +1 -0
- package/dist/apply/retired-hosts.js +54 -0
- package/dist/apply/retired-hosts.js.map +1 -0
- package/dist/demo.js +2 -1
- package/dist/demo.js.map +1 -1
- package/dist/destroy/destroy.command.d.ts.map +1 -1
- package/dist/destroy/destroy.command.js +18 -6
- package/dist/destroy/destroy.command.js.map +1 -1
- package/dist/host-ssh-tunnel/host-ssh-tunnel.d.ts.map +1 -1
- package/dist/host-ssh-tunnel/host-ssh-tunnel.js +10 -5
- package/dist/host-ssh-tunnel/host-ssh-tunnel.js.map +1 -1
- package/dist/init/init.d.ts.map +1 -1
- package/dist/init/init.js +2 -1
- package/dist/init/init.js.map +1 -1
- package/dist/init/scaffold-app.js +1 -1
- package/dist/lib/cf-tunnel.d.ts +0 -1
- package/dist/lib/cf-tunnel.d.ts.map +1 -1
- package/dist/lib/cf-tunnel.js +12 -15
- package/dist/lib/cf-tunnel.js.map +1 -1
- package/dist/lib/flags.d.ts +2 -0
- package/dist/lib/flags.d.ts.map +1 -0
- package/dist/lib/flags.js +8 -0
- package/dist/lib/flags.js.map +1 -0
- package/dist/lib/known-hosts.d.ts +2 -1
- package/dist/lib/known-hosts.d.ts.map +1 -1
- package/dist/lib/known-hosts.js +2 -0
- package/dist/lib/known-hosts.js.map +1 -1
- package/dist/lib/output.d.ts.map +1 -1
- package/dist/lib/output.js +16 -5
- package/dist/lib/output.js.map +1 -1
- package/dist/lib/tables.d.ts +14 -0
- package/dist/lib/tables.d.ts.map +1 -1
- package/dist/lib/tables.js +42 -0
- package/dist/lib/tables.js.map +1 -1
- package/dist/logs/logs.command.d.ts.map +1 -1
- package/dist/logs/logs.command.js +6 -5
- package/dist/logs/logs.command.js.map +1 -1
- package/dist/pipelines/adopt-pipelines.d.ts +1 -0
- package/dist/pipelines/adopt-pipelines.d.ts.map +1 -1
- package/dist/pipelines/adopt-pipelines.js +6 -1
- package/dist/pipelines/adopt-pipelines.js.map +1 -1
- package/dist/plan/plan.command.d.ts +13 -0
- package/dist/plan/plan.command.d.ts.map +1 -1
- package/dist/plan/plan.command.js +94 -12
- package/dist/plan/plan.command.js.map +1 -1
- package/dist/resolve/resolve.command.d.ts.map +1 -1
- package/dist/resolve/resolve.command.js +10 -2
- package/dist/resolve/resolve.command.js.map +1 -1
- package/dist/resolve/resolve.d.ts +5 -1
- package/dist/resolve/resolve.d.ts.map +1 -1
- package/dist/resolve/resolve.js +31 -2
- package/dist/resolve/resolve.js.map +1 -1
- package/dist/restore/restore.command.js +3 -3
- package/dist/restore/restore.command.js.map +1 -1
- package/dist/secrets/generated-secrets.d.ts +1 -0
- package/dist/secrets/generated-secrets.d.ts.map +1 -1
- package/dist/secrets/generated-secrets.js +22 -0
- package/dist/secrets/generated-secrets.js.map +1 -1
- package/package.json +13 -14
- package/templates/workflows/apply.yaml.eta +26 -6
package/dist/init/init.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"init.d.ts","sourceRoot":"","sources":["../../src/init/init.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"init.d.ts","sourceRoot":"","sources":["../../src/init/init.ts"],"names":[],"mappings":"AAgBA,eAAO,MAAM,gBAAgB,SAAU,MAAM,GAAG,SAAS,KAAG,MAC6B,CAAC;AAI1F,eAAO,MAAM,QAAQ,QACZ,MAAM,WACF,MAAM,QACT,OAAO,WACJ,MAAM,GAAG,SAAS,YACjB,OAAO,QACX,MAAM,GAAG,SAAS,WACf,OAAO,KACjB,OAAO,CAAC;IAAE,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,MAAM,EAAE,MAAM,GAAG,SAAS,CAAA;CAAE,CA4BzG,CAAC"}
|
package/dist/init/init.js
CHANGED
|
@@ -2,7 +2,8 @@ import { execFile } from "node:child_process";
|
|
|
2
2
|
import { rm, writeFile } from "node:fs/promises";
|
|
3
3
|
import { join } from "node:path";
|
|
4
4
|
import { promisify } from "node:util";
|
|
5
|
-
import {
|
|
5
|
+
import { INTENT_GITIGNORE, INTENT_TSCONFIG, intentPackageJson, libsLinkSpec, scaffoldDeployConfig, TARGET_GITIGNORE } from "@intentic/scaffold";
|
|
6
|
+
import { gitInit } from "@intentic/base/git";
|
|
6
7
|
import { APP_DIR, CONFIG_FILE, INTENT_DIR, TARGET_DIR } from "../lib/artifact.js";
|
|
7
8
|
import { renderTemplate } from "../lib/templates.js";
|
|
8
9
|
import { scaffoldApp } from "./scaffold-app.js";
|
package/dist/init/init.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"init.js","sourceRoot":"","sources":["../../src/init/init.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,oBAAoB,CAAC;AAC9C,OAAO,EAAE,EAAE,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AACjD,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AACjC,OAAO,EAAE,SAAS,EAAE,MAAM,WAAW,CAAC;AACtC,OAAO,
|
|
1
|
+
{"version":3,"file":"init.js","sourceRoot":"","sources":["../../src/init/init.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { writeFile } from "node:fs/promises";
|
|
2
2
|
import { basename, dirname, join } from "node:path";
|
|
3
|
-
import { gitClone, gitInit } from "@intentic/
|
|
3
|
+
import { gitClone, gitInit } from "@intentic/base/git";
|
|
4
4
|
import { renderTemplate } from "../lib/templates.js";
|
|
5
5
|
const APP_GITIGNORE = "node_modules/\n";
|
|
6
6
|
const STARTER_APP_PACKAGE = `${JSON.stringify({
|
package/dist/lib/cf-tunnel.d.ts
CHANGED
|
@@ -4,5 +4,4 @@ export declare const resolveZone: (api: CloudflareApi, apiToken: string, overrid
|
|
|
4
4
|
name: string;
|
|
5
5
|
accountId: string;
|
|
6
6
|
}>;
|
|
7
|
-
export declare const upsertCname: (api: CloudflareApi, apiToken: string, zoneId: string, name: string, cname: string, comment: string) => Promise<void>;
|
|
8
7
|
//# sourceMappingURL=cf-tunnel.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cf-tunnel.d.ts","sourceRoot":"","sources":["../../src/lib/cf-tunnel.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"cf-tunnel.d.ts","sourceRoot":"","sources":["../../src/lib/cf-tunnel.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AAMzD,eAAO,MAAM,WAAW,QACf,aAAa,YACR,MAAM,YACN,MAAM,GAAG,SAAS,KAC7B,OAAO,CAAC;IAAE,EAAE,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,MAAM,CAAC;IAAC,SAAS,EAAE,MAAM,CAAA;CAAE,CAyBzD,CAAC"}
|
package/dist/lib/cf-tunnel.js
CHANGED
|
@@ -1,3 +1,5 @@
|
|
|
1
|
+
import { errorMessage } from "@intentic/base/errors";
|
|
2
|
+
import { selectZone } from "@intentic/state-resolver";
|
|
1
3
|
export const resolveZone = async (api, apiToken, override) => {
|
|
2
4
|
if (override !== undefined && override !== "") {
|
|
3
5
|
const found = await api.getZone({ apiToken, zone: override });
|
|
@@ -7,23 +9,18 @@ export const resolveZone = async (api, apiToken, override) => {
|
|
|
7
9
|
return { id: found.id, name: override, accountId: found.accountId };
|
|
8
10
|
}
|
|
9
11
|
const zones = await api.listZones({ apiToken });
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
12
|
+
let name;
|
|
13
|
+
try {
|
|
14
|
+
name = selectZone(zones.map((zone) => zone.name), []);
|
|
13
15
|
}
|
|
14
|
-
|
|
15
|
-
const
|
|
16
|
-
throw new Error(
|
|
16
|
+
catch (error) {
|
|
17
|
+
const hint = zones.length > 1 ? `: set the ZONE env var or pass --zone to choose one, e.g. --zone ${zones[0]?.name ?? ""}` : "";
|
|
18
|
+
throw new Error(`${errorMessage(error)}${hint}`, { cause: error });
|
|
17
19
|
}
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
const record = await api.findDnsRecord({ apiToken, zoneId, name });
|
|
22
|
-
if (record === undefined) {
|
|
23
|
-
await api.createDnsRecord({ apiToken, zoneId, name, content: cname, comment });
|
|
24
|
-
}
|
|
25
|
-
else {
|
|
26
|
-
await api.updateDnsRecord({ apiToken, zoneId, recordId: record.id, name, content: cname, comment });
|
|
20
|
+
const chosen = zones.find((zone) => zone.name === name);
|
|
21
|
+
if (chosen === undefined) {
|
|
22
|
+
throw new Error(`Cloudflare zone "${name}" vanished from the token's listing`);
|
|
27
23
|
}
|
|
24
|
+
return chosen;
|
|
28
25
|
};
|
|
29
26
|
//# sourceMappingURL=cf-tunnel.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cf-tunnel.js","sourceRoot":"","sources":["../../src/lib/cf-tunnel.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"cf-tunnel.js","sourceRoot":"","sources":["../../src/lib/cf-tunnel.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAC;AAErD,OAAO,EAAE,UAAU,EAAE,MAAM,0BAA0B,CAAC;AAKtD,MAAM,CAAC,MAAM,WAAW,GAAG,KAAK,EAC5B,GAAkB,EAClB,QAAgB,EAChB,QAA4B,EAC4B,EAAE;IAC1D,IAAI,QAAQ,KAAK,SAAS,IAAI,QAAQ,KAAK,EAAE,EAAE,CAAC;QAC5C,MAAM,KAAK,GAAG,MAAM,GAAG,CAAC,OAAO,CAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,QAAQ,EAAE,CAAC,CAAC;QAC9D,IAAI,KAAK,KAAK,SAAS,EAAE,CAAC;YACtB,MAAM,IAAI,KAAK,CAAC,oBAAoB,QAAQ,gCAAgC,CAAC,CAAC;QAClF,CAAC;QACD,OAAO,EAAE,EAAE,EAAE,KAAK,CAAC,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,SAAS,EAAE,KAAK,CAAC,SAAS,EAAE,CAAC;IACxE,CAAC;IACD,MAAM,KAAK,GAAG,MAAM,GAAG,CAAC,SAAS,CAAC,EAAE,QAAQ,EAAE,CAAC,CAAC;IAChD,IAAI,IAAY,CAAC;IACjB,IAAI,CAAC;QACD,IAAI,GAAG,UAAU,CACb,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,EAC9B,EAAE,CACL,CAAC;IACN,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QAEb,MAAM,IAAI,GAAG,KAAK,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,oEAAoE,KAAK,CAAC,CAAC,CAAC,EAAE,IAAI,IAAI,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;QAChI,MAAM,IAAI,KAAK,CAAC,GAAG,YAAY,CAAC,KAAK,CAAC,GAAG,IAAI,EAAE,EAAE,EAAE,KAAK,EAAE,KAAK,EAAE,CAAC,CAAC;IACvE,CAAC;IACD,MAAM,MAAM,GAAG,KAAK,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,IAAI,KAAK,IAAI,CAAC,CAAC;IACxD,IAAI,MAAM,KAAK,SAAS,EAAE,CAAC;QACvB,MAAM,IAAI,KAAK,CAAC,oBAAoB,IAAI,qCAAqC,CAAC,CAAC;IACnF,CAAC;IACD,OAAO,MAAM,CAAC;AAClB,CAAC,CAAC"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"flags.d.ts","sourceRoot":"","sources":["../../src/lib/flags.ts"],"names":[],"mappings":"AAKA,eAAO,MAAM,YAAY,QACf,MAAM,WACN,MAAM,KAAG,MAMd,CAAC"}
|
|
@@ -0,0 +1,8 @@
|
|
|
1
|
+
export const countAtLeast = (min) => (raw) => {
|
|
2
|
+
const value = Number(raw);
|
|
3
|
+
if (raw.trim() === "" || !Number.isSafeInteger(value) || value < min) {
|
|
4
|
+
throw new Error(`expected a whole number of at least ${min}, got "${raw}"`);
|
|
5
|
+
}
|
|
6
|
+
return value;
|
|
7
|
+
};
|
|
8
|
+
//# sourceMappingURL=flags.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"flags.js","sourceRoot":"","sources":["../../src/lib/flags.ts"],"names":[],"mappings":"AAKA,MAAM,CAAC,MAAM,YAAY,GACrB,CAAC,GAAW,EAAE,EAAE,CAChB,CAAC,GAAW,EAAU,EAAE;IACpB,MAAM,KAAK,GAAG,MAAM,CAAC,GAAG,CAAC,CAAC;IAC1B,IAAI,GAAG,CAAC,IAAI,EAAE,KAAK,EAAE,IAAI,CAAC,MAAM,CAAC,aAAa,CAAC,KAAK,CAAC,IAAI,KAAK,GAAG,GAAG,EAAE,CAAC;QACnE,MAAM,IAAI,KAAK,CAAC,uCAAuC,GAAG,UAAU,GAAG,GAAG,CAAC,CAAC;IAChF,CAAC;IACD,OAAO,KAAK,CAAC;AACjB,CAAC,CAAC"}
|
|
@@ -1,3 +1,4 @@
|
|
|
1
|
-
import type
|
|
1
|
+
import { type HostKeyStore, type SshExecutor } from "@intentic/providers";
|
|
2
2
|
export declare const createKnownHostsStore: (dir: string) => HostKeyStore;
|
|
3
|
+
export declare const pinnedSshExecutor: (dir: string) => SshExecutor;
|
|
3
4
|
//# sourceMappingURL=known-hosts.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"known-hosts.d.ts","sourceRoot":"","sources":["../../src/lib/known-hosts.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,
|
|
1
|
+
{"version":3,"file":"known-hosts.d.ts","sourceRoot":"","sources":["../../src/lib/known-hosts.ts"],"names":[],"mappings":"AAGA,OAAO,EAAqB,KAAK,YAAY,EAAE,KAAK,WAAW,EAAE,MAAM,qBAAqB,CAAC;AAQ7F,eAAO,MAAM,qBAAqB,QAAS,MAAM,KAAG,YAYnD,CAAC;AAIF,eAAO,MAAM,iBAAiB,QAAS,MAAM,KAAG,WAA4D,CAAC"}
|
package/dist/lib/known-hosts.js
CHANGED
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import { existsSync } from "node:fs";
|
|
2
2
|
import { readFile, writeFile } from "node:fs/promises";
|
|
3
3
|
import { join } from "node:path";
|
|
4
|
+
import { createSshExecutor } from "@intentic/providers";
|
|
4
5
|
import { KNOWN_HOSTS_FILE } from "./artifact.js";
|
|
5
6
|
const hostKeyId = (host, port) => `${host}:${port}`;
|
|
6
7
|
export const createKnownHostsStore = (dir) => {
|
|
@@ -15,4 +16,5 @@ export const createKnownHostsStore = (dir) => {
|
|
|
15
16
|
},
|
|
16
17
|
};
|
|
17
18
|
};
|
|
19
|
+
export const pinnedSshExecutor = (dir) => createSshExecutor(createKnownHostsStore(dir));
|
|
18
20
|
//# sourceMappingURL=known-hosts.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"known-hosts.js","sourceRoot":"","sources":["../../src/lib/known-hosts.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,SAAS,CAAC;AACrC,OAAO,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AACvD,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;
|
|
1
|
+
{"version":3,"file":"known-hosts.js","sourceRoot":"","sources":["../../src/lib/known-hosts.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,SAAS,CAAC;AACrC,OAAO,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AACvD,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AACjC,OAAO,EAAE,iBAAiB,EAAuC,MAAM,qBAAqB,CAAC;AAC7F,OAAO,EAAE,gBAAgB,EAAE,MAAM,eAAe,CAAC;AAKjD,MAAM,SAAS,GAAG,CAAC,IAAY,EAAE,IAAY,EAAU,EAAE,CAAC,GAAG,IAAI,IAAI,IAAI,EAAE,CAAC;AAE5E,MAAM,CAAC,MAAM,qBAAqB,GAAG,CAAC,GAAW,EAAgB,EAAE;IAC/D,MAAM,IAAI,GAAG,IAAI,CAAC,GAAG,EAAE,gBAAgB,CAAC,CAAC;IACzC,MAAM,IAAI,GAAG,KAAK,IAAqC,EAAE,CACrD,UAAU,CAAC,IAAI,CAAC,CAAC,CAAC,CAAE,IAAI,CAAC,KAAK,CAAC,MAAM,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC,CAA4B,CAAC,CAAC,CAAC,EAAE,CAAC;IACjG,OAAO;QACH,GAAG,EAAE,KAAK,EAAE,IAAI,EAAE,IAAI,EAAE,EAAE,CAAC,CAAC,MAAM,IAAI,EAAE,CAAC,CAAC,SAAS,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;QAChE,GAAG,EAAE,KAAK,EAAE,IAAI,EAAE,IAAI,EAAE,GAAG,EAAE,EAAE;YAC3B,MAAM,KAAK,GAAG,MAAM,IAAI,EAAE,CAAC;YAC3B,KAAK,CAAC,SAAS,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC,GAAG,GAAG,CAAC;YACnC,MAAM,SAAS,CAAC,IAAI,EAAE,GAAG,IAAI,CAAC,SAAS,CAAC,KAAK,EAAE,SAAS,EAAE,CAAC,CAAC,IAAI,EAAE,EAAE,IAAI,EAAE,KAAK,EAAE,CAAC,CAAC;QACvF,CAAC;KACJ,CAAC;AACN,CAAC,CAAC;AAIF,MAAM,CAAC,MAAM,iBAAiB,GAAG,CAAC,GAAW,EAAe,EAAE,CAAC,iBAAiB,CAAC,qBAAqB,CAAC,GAAG,CAAC,CAAC,CAAC"}
|
package/dist/lib/output.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"output.d.ts","sourceRoot":"","sources":["../../src/lib/output.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,
|
|
1
|
+
{"version":3,"file":"output.d.ts","sourceRoot":"","sources":["../../src/lib/output.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAc,MAAM,kBAAkB,CAAC;AAIhE,MAAM,MAAM,UAAU,GAAG,MAAM,GAAG,MAAM,GAAG,QAAQ,CAAC;AAEpD,MAAM,WAAW,IAAI;IACjB,QAAQ,CAAC,KAAK,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,IAAI,CAAC;CAC3C;AAqBD,eAAO,MAAM,cAAc,QAAO;IAC9B,QAAQ,CAAC,IAAI,EAAE,CAAC,IAAI,EAAE,IAAI,KAAK,IAAI,CAAC;IACpC,QAAQ,CAAC,GAAG,EAAE,CAAC,MAAM,EAAE,SAAS,CAAC,MAAM,GAAG,SAAS,CAAC,EAAE,KAAK,IAAI,CAAC;IAChE,QAAQ,CAAC,KAAK,EAAE,MAAM,IAAI,CAAC;CAyC9B,CAAC;AAKF,eAAO,MAAM,OAAO,SAAU,SAAS,CAAC,SAAS,MAAM,EAAE,CAAC,EAAE,KAAG,MAAM,EAapE,CAAC;AAIF,MAAM,WAAW,MAAM;IACnB,QAAQ,CAAC,IAAI,EAAE,UAAU,CAAC;IAC1B,QAAQ,CAAC,OAAO,EAAE,CAAC,KAAK,EAAE,WAAW,KAAK,IAAI,CAAC;IAC/C,QAAQ,CAAC,GAAG,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,IAAI,CAAC;IACxC,QAAQ,CAAC,IAAI,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,CAAC;IACtC,QAAQ,CAAC,MAAM,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,KAAK,IAAI,CAAC;CAC9D;AAyCD,eAAO,MAAM,YAAY,SAAU,IAAI,QAAQ,UAAU,KAAG,MAsC3D,CAAC;AAIF,eAAO,MAAM,SAAS,YAAa,MAAM,WAAW,SAAS,MAAM,EAAE,KAAG,MAyBvE,CAAC"}
|
package/dist/lib/output.js
CHANGED
|
@@ -58,9 +58,17 @@ export const columns = (rows) => {
|
|
|
58
58
|
widths[at] = Math.max(widths[at] ?? 0, [...cell].length);
|
|
59
59
|
}
|
|
60
60
|
}
|
|
61
|
-
return rows.map((row) => row
|
|
61
|
+
return rows.map((row) => row
|
|
62
|
+
.map((cell, at) => (at === row.length - 1 ? cell : cell.padEnd(widths[at] ?? 0)))
|
|
63
|
+
.join(" ")
|
|
64
|
+
.trimEnd());
|
|
62
65
|
};
|
|
63
66
|
const named = (id, type) => (id === type ? id : `${id} (${type})`);
|
|
67
|
+
const SKIP_WHY = {
|
|
68
|
+
"no-delete": "removed from desired state, but its provider has no delete",
|
|
69
|
+
protected: "it is protected; remove it by hand if it is no longer wanted",
|
|
70
|
+
"missing-secret": "its delete needs a secret that is no longer set; it stays pending until the secret is back",
|
|
71
|
+
};
|
|
64
72
|
const eventText = (event) => {
|
|
65
73
|
if (event.kind === "node" && event.phase === "apply") {
|
|
66
74
|
if (event.state === "start") {
|
|
@@ -73,12 +81,15 @@ const eventText = (event) => {
|
|
|
73
81
|
return event.state === "waiting" ? `waiting for ${event.id} at ${event.url}` : `${event.id} ready`;
|
|
74
82
|
}
|
|
75
83
|
if (event.kind === "prune") {
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
84
|
+
if (event.state === "deleted") {
|
|
85
|
+
return `deleted ${named(event.id, event.type)}`;
|
|
86
|
+
}
|
|
87
|
+
return `left ${named(event.id, event.type)} in place: ${SKIP_WHY[event.reason ?? "no-delete"]}`;
|
|
79
88
|
}
|
|
80
89
|
if (event.kind === "orphan") {
|
|
81
|
-
return
|
|
90
|
+
return event.ownership === "unowned"
|
|
91
|
+
? `unowned ${named(event.id, event.type)}: stamped without an owner and not in the desired graph; adopt it by declaring it, or remove it by hand`
|
|
92
|
+
: `orphan ${named(event.id, event.type)}: exists on the host but is not in the desired graph`;
|
|
82
93
|
}
|
|
83
94
|
return undefined;
|
|
84
95
|
};
|
package/dist/lib/output.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"output.js","sourceRoot":"","sources":["../../src/lib/output.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"output.js","sourceRoot":"","sources":["../../src/lib/output.ts"],"names":[],"mappings":"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"}
|
package/dist/lib/tables.d.ts
CHANGED
|
@@ -10,4 +10,18 @@ export interface Teardown extends Named {
|
|
|
10
10
|
}
|
|
11
11
|
export declare const teardownTable: (order: readonly Teardown[]) => string[];
|
|
12
12
|
export declare const planSummary: (steps: readonly Step[], orphans: readonly Named[]) => string[];
|
|
13
|
+
export declare const unownedBlock: (unowned: readonly Named[]) => string[];
|
|
14
|
+
export declare const pendingBlock: (pending: readonly Named[]) => string[];
|
|
15
|
+
export interface RetiredReport {
|
|
16
|
+
readonly id: string;
|
|
17
|
+
readonly address: string;
|
|
18
|
+
readonly leftovers: readonly Named[];
|
|
19
|
+
readonly unowned: readonly Named[];
|
|
20
|
+
readonly error?: string;
|
|
21
|
+
}
|
|
22
|
+
export declare const retiredBlock: (hosts: readonly RetiredReport[]) => string[];
|
|
23
|
+
export declare const scanGapBlock: (skipped: readonly {
|
|
24
|
+
readonly source: string;
|
|
25
|
+
readonly reason: string;
|
|
26
|
+
}[]) => string[];
|
|
13
27
|
//# sourceMappingURL=tables.d.ts.map
|
package/dist/lib/tables.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tables.d.ts","sourceRoot":"","sources":["../../src/lib/tables.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,kBAAkB,CAAC;AAQ7C,MAAM,WAAW,KAAK;IAClB,QAAQ,CAAC,EAAE,EAAE,MAAM,CAAC;IACpB,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;CACzB;AAMD,eAAO,MAAM,SAAS,UAAW,SAAS,IAAI,EAAE,KAAG,MAAM,EASxD,CAAC;AAGF,eAAO,MAAM,aAAa,WAAY,MAAM,aAAa,SAAS,KAAK,EAAE,KAAG,MAAM,EACS,CAAC;AAG5F,MAAM,WAAW,QAAS,SAAQ,KAAK;IACnC,QAAQ,CAAC,SAAS,EAAE,OAAO,CAAC;CAC/B;AAKD,eAAO,MAAM,aAAa,UAAW,SAAS,QAAQ,EAAE,KAAG,MAAM,EAmBhE,CAAC;AA6CF,eAAO,MAAM,WAAW,UAAW,SAAS,IAAI,EAAE,WAAW,SAAS,KAAK,EAAE,KAAG,MAAM,EAGrF,CAAC"}
|
|
1
|
+
{"version":3,"file":"tables.d.ts","sourceRoot":"","sources":["../../src/lib/tables.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,kBAAkB,CAAC;AAQ7C,MAAM,WAAW,KAAK;IAClB,QAAQ,CAAC,EAAE,EAAE,MAAM,CAAC;IACpB,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;CACzB;AAMD,eAAO,MAAM,SAAS,UAAW,SAAS,IAAI,EAAE,KAAG,MAAM,EASxD,CAAC;AAGF,eAAO,MAAM,aAAa,WAAY,MAAM,aAAa,SAAS,KAAK,EAAE,KAAG,MAAM,EACS,CAAC;AAG5F,MAAM,WAAW,QAAS,SAAQ,KAAK;IACnC,QAAQ,CAAC,SAAS,EAAE,OAAO,CAAC;CAC/B;AAKD,eAAO,MAAM,aAAa,UAAW,SAAS,QAAQ,EAAE,KAAG,MAAM,EAmBhE,CAAC;AA6CF,eAAO,MAAM,WAAW,UAAW,SAAS,IAAI,EAAE,WAAW,SAAS,KAAK,EAAE,KAAG,MAAM,EAGrF,CAAC;AAIF,eAAO,MAAM,YAAY,YAAa,SAAS,KAAK,EAAE,KAAG,MAAM,EAW9D,CAAC;AAIF,eAAO,MAAM,YAAY,YAAa,SAAS,KAAK,EAAE,KAAG,MAAM,EAW9D,CAAC;AAGF,MAAM,WAAW,aAAa;IAC1B,QAAQ,CAAC,EAAE,EAAE,MAAM,CAAC;IACpB,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;IACzB,QAAQ,CAAC,SAAS,EAAE,SAAS,KAAK,EAAE,CAAC;IACrC,QAAQ,CAAC,OAAO,EAAE,SAAS,KAAK,EAAE,CAAC;IAEnC,QAAQ,CAAC,KAAK,CAAC,EAAE,MAAM,CAAC;CAC3B;AAED,eAAO,MAAM,YAAY,UAAW,SAAS,aAAa,EAAE,KAAG,MAAM,EAiB/D,CAAC;AAGP,eAAO,MAAM,YAAY,YAAa,SAAS;IAAE,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAA;CAAE,EAAE,KAAG,MAAM,EACsB,CAAC"}
|
package/dist/lib/tables.js
CHANGED
|
@@ -67,4 +67,46 @@ export const planSummary = (steps, orphans) => {
|
|
|
67
67
|
const counts = stepCounts(steps);
|
|
68
68
|
return [...(counts.length > 0 ? ["", ...counts] : []), ...orphanBlock(orphans)];
|
|
69
69
|
};
|
|
70
|
+
export const unownedBlock = (unowned) => {
|
|
71
|
+
if (unowned.length === 0) {
|
|
72
|
+
return [];
|
|
73
|
+
}
|
|
74
|
+
const them = unowned.length === 1 ? "it" : "them";
|
|
75
|
+
return [
|
|
76
|
+
"",
|
|
77
|
+
`${plural(unowned.length, "stamped resource")} with no owner stamp, not in the desired graph (made before owner stamps, never pruned):`,
|
|
78
|
+
...columns(unowned.map((resource) => [` ${resource.id}`, resource.type])),
|
|
79
|
+
`Unowned: adopt ${them} by declaring ${them} (the next apply stamps ${them}), or remove ${them} by hand.`,
|
|
80
|
+
];
|
|
81
|
+
};
|
|
82
|
+
export const pendingBlock = (pending) => {
|
|
83
|
+
if (pending.length === 0) {
|
|
84
|
+
return [];
|
|
85
|
+
}
|
|
86
|
+
const them = pending.length === 1 ? "it" : "them";
|
|
87
|
+
return [
|
|
88
|
+
"",
|
|
89
|
+
`${plural(pending.length, "resource")} removed from the desired graph, pending deletion:`,
|
|
90
|
+
...columns(pending.map((resource) => [` ${resource.id}`, resource.type])),
|
|
91
|
+
`Delete ${them} with \`intentic deploy apply --yes\`.`,
|
|
92
|
+
];
|
|
93
|
+
};
|
|
94
|
+
export const retiredBlock = (hosts) => hosts.flatMap((host) => {
|
|
95
|
+
const name = `old host ${host.id} (${host.address}), retired by a migration`;
|
|
96
|
+
if (host.error !== undefined) {
|
|
97
|
+
return ["", `${name}: not scanned (${host.error}); it stays on the list until a scan finds it clean.`];
|
|
98
|
+
}
|
|
99
|
+
if (host.leftovers.length === 0 && host.unowned.length === 0) {
|
|
100
|
+
return ["", `${name}: clean, nothing of this intent left on it.`];
|
|
101
|
+
}
|
|
102
|
+
return [
|
|
103
|
+
"",
|
|
104
|
+
`${name}, still runs:`,
|
|
105
|
+
...columns([
|
|
106
|
+
...host.leftovers.map((resource) => [` ${resource.id}`, resource.type, "this intent's: deleted by `apply --yes`"]),
|
|
107
|
+
...host.unowned.map((resource) => [` ${resource.id}`, resource.type, "unowned: remove by hand"]),
|
|
108
|
+
]),
|
|
109
|
+
];
|
|
110
|
+
});
|
|
111
|
+
export const scanGapBlock = (skipped) => skipped.length === 0 ? [] : ["", "The orphan scan is incomplete:", ...skipped.map((skip) => ` ${skip.source}: ${skip.reason}`)];
|
|
70
112
|
//# sourceMappingURL=tables.js.map
|
package/dist/lib/tables.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tables.js","sourceRoot":"","sources":["../../src/lib/tables.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"tables.js","sourceRoot":"","sources":["../../src/lib/tables.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"logs.command.d.ts","sourceRoot":"","sources":["../../src/logs/logs.command.ts"],"names":[],"mappings":"AAIA,OAAO,EAAgB,KAAK,cAAc,
|
|
1
|
+
{"version":3,"file":"logs.command.d.ts","sourceRoot":"","sources":["../../src/logs/logs.command.ts"],"names":[],"mappings":"AAIA,OAAO,EAAgB,KAAK,cAAc,EAAE,MAAM,eAAe,CAAC;AA4ClE,eAAO,MAAM,WAAW,iDAiEtB,CAAC"}
|
|
@@ -1,10 +1,11 @@
|
|
|
1
1
|
import { dirname } from "node:path";
|
|
2
2
|
import { createStore, resolveInputs } from "@intentic/engine";
|
|
3
|
-
import {
|
|
4
|
-
import { buildCommand
|
|
3
|
+
import { sshSchema, sshTarget } from "@intentic/providers";
|
|
4
|
+
import { buildCommand } from "@stricli/core";
|
|
5
5
|
import { loadConfig } from "../env.config.js";
|
|
6
6
|
import { ARTIFACT_PATH, loadEnvFile, readArtifact } from "../lib/artifact.js";
|
|
7
|
-
import {
|
|
7
|
+
import { countAtLeast } from "../lib/flags.js";
|
|
8
|
+
import { pinnedSshExecutor } from "../lib/known-hosts.js";
|
|
8
9
|
import { columns, createOutput } from "../lib/output.js";
|
|
9
10
|
import { withRunLog } from "../lib/run-log.js";
|
|
10
11
|
const DEFAULT_TAIL = 200;
|
|
@@ -33,7 +34,7 @@ export const logsCommand = buildCommand({
|
|
|
33
34
|
parameters: {
|
|
34
35
|
flags: {
|
|
35
36
|
artifact: { kind: "parsed", parse: String, optional: true, brief: `Path to the artifact (default: ${ARTIFACT_PATH})` },
|
|
36
|
-
tail: { kind: "parsed", parse:
|
|
37
|
+
tail: { kind: "parsed", parse: countAtLeast(1), optional: true, brief: `Lines per container (default ${DEFAULT_TAIL})` },
|
|
37
38
|
},
|
|
38
39
|
positional: {
|
|
39
40
|
kind: "tuple",
|
|
@@ -66,7 +67,7 @@ export const logsCommand = buildCommand({
|
|
|
66
67
|
if (!parsedSsh.success) {
|
|
67
68
|
throw new Error(`"${id}" (type "${node.type}") has no host SSH target: its runtime logs are not host-fetchable`);
|
|
68
69
|
}
|
|
69
|
-
const ssh =
|
|
70
|
+
const ssh = pinnedSshExecutor(dir);
|
|
70
71
|
const session = await ssh.connect(sshTarget(parsedSsh.data));
|
|
71
72
|
try {
|
|
72
73
|
let pending = "";
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"logs.command.js","sourceRoot":"","sources":["../../src/logs/logs.command.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AACpC,OAAO,EAAE,WAAW,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AAE9D,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"logs.command.js","sourceRoot":"","sources":["../../src/logs/logs.command.ts"],"names":[],"mappings":"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"}
|
|
@@ -3,6 +3,7 @@ import type { ForgejoAdmin, ForgejoApi } from "@intentic/providers";
|
|
|
3
3
|
export declare const GIT_USER_SECRET = "INTENTIC_GIT_USER";
|
|
4
4
|
export declare const GIT_TOKEN_SECRET = "INTENTIC_GIT_TOKEN";
|
|
5
5
|
export declare const GIT_TOKEN_ENV = "GIT_TOKEN";
|
|
6
|
+
export declare const APPLIED_TAG = "intentic-applied";
|
|
6
7
|
export declare const INTENT_WORKFLOW_PATH = ".forgejo/workflows/resolve.yaml";
|
|
7
8
|
export declare const APPLY_WORKFLOW_PATH = ".forgejo/workflows/apply.yaml";
|
|
8
9
|
export declare const forgejoSecretName: (key: string) => string;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"adopt-pipelines.d.ts","sourceRoot":"","sources":["../../src/pipelines/adopt-pipelines.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"adopt-pipelines.d.ts","sourceRoot":"","sources":["../../src/pipelines/adopt-pipelines.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,iBAAiB,CAAC;AACzD,OAAO,KAAK,EAAE,YAAY,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAC;AAKpE,eAAO,MAAM,eAAe,sBAAsB,CAAC;AACnD,eAAO,MAAM,gBAAgB,uBAAuB,CAAC;AAIrD,eAAO,MAAM,aAAa,cAAc,CAAC;AAMzC,eAAO,MAAM,WAAW,qBAAqB,CAAC;AAK9C,eAAO,MAAM,oBAAoB,oCAAoC,CAAC;AACtE,eAAO,MAAM,mBAAmB,kCAAkC,CAAC;AAInE,eAAO,MAAM,iBAAiB,QAAS,MAAM,KAAG,MAC+C,CAAC;AAEhG,MAAM,WAAW,cAAc;IAE3B,QAAQ,CAAC,UAAU,EAAE,MAAM,CAAC;IAE5B,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IAEtB,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;IAExB,QAAQ,CAAC,UAAU,EAAE,MAAM,CAAC;IAC5B,QAAQ,CAAC,YAAY,EAAE,MAAM,CAAC;IAE9B,QAAQ,CAAC,UAAU,EAAE,MAAM,CAAC;IAC5B,QAAQ,CAAC,gBAAgB,EAAE,MAAM,CAAC;IAElC,QAAQ,CAAC,eAAe,EAAE,SAAS,MAAM,EAAE,CAAC;IAE5C,QAAQ,CAAC,kBAAkB,EAAE,MAAM,CAAC;CACvC;AAMD,eAAO,MAAM,kBAAkB,WAAY,cAAc,KAAG,MAatD,CAAC;AAKP,eAAO,MAAM,iBAAiB,WAAY,cAAc,KAAG,MAYrD,CAAC;AAGP,eAAO,MAAM,aAAa,YAAmB,MAAM,gBAAgB,MAAM,WAAW,MAAM,KAAG,OAAO,CAAC,IAAI,CAIxG,CAAC;AAGF,eAAO,MAAM,0BAA0B,cAAqB,MAAM,aAAa,MAAM,UAAU,cAAc,KAAG,OAAO,CAAC,IAAI,CAG3H,CAAC;AAIF,eAAO,MAAM,mBAAmB,UACrB,iBAAiB,OACnB,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,SAAS,CAAC,CAAC,mBAChC,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,KAClD,MAAM,CAAC,MAAM,EAAE,MAAM,CAgBvB,CAAC;AAGF,eAAO,MAAM,cAAc,SACjB,YAAY,GAAG;IACjB,QAAQ,CAAC,GAAG,EAAE,UAAU,CAAC;IACzB,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC;IACvB,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,OAAO,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAAC;CACtD,KACF,OAAO,CAAC,IAAI,CAYd,CAAC"}
|
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import { mkdir, writeFile } from "node:fs/promises";
|
|
2
2
|
import { dirname, join } from "node:path";
|
|
3
|
+
import { LAST_APPLIED_FILE } from "@intentic/scaffold";
|
|
3
4
|
import { renderTemplate } from "../lib/templates.js";
|
|
4
5
|
import { collectSecrets } from "../secrets/secrets.js";
|
|
5
6
|
export const GIT_USER_SECRET = "INTENTIC_GIT_USER";
|
|
@@ -7,7 +8,8 @@ export const GIT_TOKEN_SECRET = "INTENTIC_GIT_TOKEN";
|
|
|
7
8
|
const GIT_USER_ENV = "GIT_USER";
|
|
8
9
|
export const GIT_TOKEN_ENV = "GIT_TOKEN";
|
|
9
10
|
const CLI_PACKAGE = "@intentic/cli";
|
|
10
|
-
const APPLIED_TAG = "intentic-applied";
|
|
11
|
+
export const APPLIED_TAG = "intentic-applied";
|
|
12
|
+
const DRIFT_CRON = "17 5 * * *";
|
|
11
13
|
export const INTENT_WORKFLOW_PATH = ".forgejo/workflows/resolve.yaml";
|
|
12
14
|
export const APPLY_WORKFLOW_PATH = ".forgejo/workflows/apply.yaml";
|
|
13
15
|
const RESERVED_SECRET_PREFIXES = ["GITHUB_", "GITEA_", "FORGEJO_"];
|
|
@@ -28,11 +30,14 @@ export const intentWorkflowYaml = (inputs) => renderTemplate("workflows/resolve.
|
|
|
28
30
|
});
|
|
29
31
|
export const applyWorkflowYaml = (inputs) => renderTemplate("workflows/apply.yaml", {
|
|
30
32
|
artifactFile: inputs.artifactFile,
|
|
33
|
+
baselineFile: join(dirname(inputs.artifactFile), LAST_APPLIED_FILE),
|
|
31
34
|
envEntries: inputs.applySecretKeys.map((key) => ({ env: key, secret: forgejoSecretName(key) })),
|
|
32
35
|
appliedTag: APPLIED_TAG,
|
|
36
|
+
driftCron: DRIFT_CRON,
|
|
33
37
|
cliPackage: CLI_PACKAGE,
|
|
34
38
|
cliVersion: inputs.cliVersion,
|
|
35
39
|
user: inputs.user,
|
|
40
|
+
domain: inputs.domain,
|
|
36
41
|
forgejoPasswordKey: inputs.forgejoPasswordKey,
|
|
37
42
|
});
|
|
38
43
|
export const writeWorkflow = async (repoDir, workflowPath, content) => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"adopt-pipelines.js","sourceRoot":"","sources":["../../src/pipelines/adopt-pipelines.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AACpD,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;
|
|
1
|
+
{"version":3,"file":"adopt-pipelines.js","sourceRoot":"","sources":["../../src/pipelines/adopt-pipelines.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,3 +1,16 @@
|
|
|
1
1
|
import { type CommandContext } from "@stricli/core";
|
|
2
|
+
import { type Named, type RetiredReport } from "../lib/tables.js";
|
|
3
|
+
export interface DriftFindings {
|
|
4
|
+
readonly steps: readonly {
|
|
5
|
+
readonly action: string;
|
|
6
|
+
}[];
|
|
7
|
+
readonly orphans: readonly Named[];
|
|
8
|
+
readonly unowned: readonly Named[];
|
|
9
|
+
readonly pending: readonly Named[];
|
|
10
|
+
readonly retired: readonly RetiredReport[];
|
|
11
|
+
readonly scanSkipped: readonly unknown[];
|
|
12
|
+
readonly baselineError?: string;
|
|
13
|
+
}
|
|
14
|
+
export declare const driftReasons: (findings: DriftFindings) => string[];
|
|
2
15
|
export declare const planCommand: import("@stricli/core").Command<CommandContext>;
|
|
3
16
|
//# sourceMappingURL=plan.command.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"plan.command.d.ts","sourceRoot":"","sources":["../../src/plan/plan.command.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"plan.command.d.ts","sourceRoot":"","sources":["../../src/plan/plan.command.ts"],"names":[],"mappings":"AAMA,OAAO,EAAgB,KAAK,cAAc,EAAE,MAAM,eAAe,CAAC;AASlE,OAAO,EAAE,KAAK,KAAK,EAAwC,KAAK,aAAa,EAA4C,MAAM,kBAAkB,CAAC;AAiBlJ,MAAM,WAAW,aAAa;IAC1B,QAAQ,CAAC,KAAK,EAAE,SAAS;QAAE,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAA;KAAE,EAAE,CAAC;IACvD,QAAQ,CAAC,OAAO,EAAE,SAAS,KAAK,EAAE,CAAC;IACnC,QAAQ,CAAC,OAAO,EAAE,SAAS,KAAK,EAAE,CAAC;IACnC,QAAQ,CAAC,OAAO,EAAE,SAAS,KAAK,EAAE,CAAC;IACnC,QAAQ,CAAC,OAAO,EAAE,SAAS,aAAa,EAAE,CAAC;IAC3C,QAAQ,CAAC,WAAW,EAAE,SAAS,OAAO,EAAE,CAAC;IACzC,QAAQ,CAAC,aAAa,CAAC,EAAE,MAAM,CAAC;CACnC;AAED,eAAO,MAAM,YAAY,aAAc,aAAa,KAAG,MAAM,EAc5D,CAAC;AAEF,eAAO,MAAM,WAAW,iDA4JtB,CAAC"}
|