@cat-factory/cli 0.10.2 → 0.10.4
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/dist/io.d.ts +35 -0
- package/dist/io.d.ts.map +1 -1
- package/dist/io.js +40 -9
- package/dist/io.js.map +1 -1
- package/dist/k3s.d.ts.map +1 -1
- package/dist/k3s.js +23 -7
- package/dist/k3s.js.map +1 -1
- package/package.json +3 -3
package/dist/io.d.ts
CHANGED
|
@@ -20,6 +20,41 @@ export interface Io {
|
|
|
20
20
|
/** Open a URL in the user's default browser (best-effort; resolves even if it can't). */
|
|
21
21
|
openBrowser(url: string): Promise<void>;
|
|
22
22
|
}
|
|
23
|
+
/** How to spawn the OS's URL opener: the command, its argv, and Windows' verbatim-argv flag. */
|
|
24
|
+
export interface OpenBrowserCommand {
|
|
25
|
+
cmd: string;
|
|
26
|
+
args: string[];
|
|
27
|
+
/**
|
|
28
|
+
* Windows only: hand the joined argv to `CreateProcess` unchanged instead of re-quoting each
|
|
29
|
+
* argument for `CommandLineToArgvW`, whose rules `cmd` does not follow.
|
|
30
|
+
*/
|
|
31
|
+
windowsVerbatimArguments?: boolean;
|
|
32
|
+
}
|
|
33
|
+
/**
|
|
34
|
+
* The OS-appropriate command for opening a URL in the default browser.
|
|
35
|
+
*
|
|
36
|
+
* Windows goes through `cmd`, and cmd splits an UNQUOTED command line on `&` before the `start`
|
|
37
|
+
* builtin ever sees it. Every URL we open carries more than one query parameter, so this used to
|
|
38
|
+
* open the browser at everything up to the first `&` and then try to RUN each remaining parameter
|
|
39
|
+
* as a command: `cat-factory k3s` landed on a bare `?infraSetup=local-k3s` with none of the values
|
|
40
|
+
* the connect form prefills from, and the PAT links dropped their `scopes`.
|
|
41
|
+
*
|
|
42
|
+
* So the URL is quoted, which is also why `start`'s first argument is an empty quoted window title
|
|
43
|
+
* (it reads a leading quoted token as one). The quotes have to reach cmd verbatim, hence the flag.
|
|
44
|
+
*
|
|
45
|
+
* The quoting holds only while the URL carries no `"` of its own, so this SERIALIZES the input
|
|
46
|
+
* rather than trusting the caller to have done it: WHATWG serialization percent-encodes `"` in
|
|
47
|
+
* every component that can carry one and rejects it in a host, so no argument can close the quote
|
|
48
|
+
* and have cmd read the rest as a second command. Input that is not a URL at all throws, rather
|
|
49
|
+
* than reaching a shell as a command line whose meaning nobody has checked; `openBrowser` is
|
|
50
|
+
* best-effort and both call sites print the link before opening it. Inside the quotes cmd still
|
|
51
|
+
* expands a `%NAME%` reference, but the expansion is literal text there: quotes make `&` and its
|
|
52
|
+
* friends inert, and no Windows environment value can contain a `"` to close them, so the worst
|
|
53
|
+
* case is a wrong URL, never a second command.
|
|
54
|
+
*
|
|
55
|
+
* @throws {TypeError} if `url` is not a parsable absolute URL.
|
|
56
|
+
*/
|
|
57
|
+
export declare function openCommand(url: string, platform: NodeJS.Platform): OpenBrowserCommand;
|
|
23
58
|
/** The real, console-backed {@link Io}, implemented with `@clack/prompts`. */
|
|
24
59
|
export declare function createConsoleIo(): Io;
|
|
25
60
|
//# sourceMappingURL=io.d.ts.map
|
package/dist/io.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"io.d.ts","sourceRoot":"","sources":["../src/io.ts"],"names":[],"mappings":"AAYA;;;;GAIG;AACH,MAAM,WAAW,EAAE;IACjB,IAAI,CAAC,OAAO,EAAE,MAAM,GAAG,IAAI,CAAA;IAC3B,IAAI,CAAC,OAAO,EAAE,MAAM,GAAG,IAAI,CAAA;IAC3B,gFAAgF;IAChF,QAAQ,CAAC,MAAM,EAAE,MAAM,EAAE,YAAY,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAAA;IAChE,+DAA+D;IAC/D,MAAM,CAAC,CAAC,SAAS,MAAM,EACrB,MAAM,EAAE,MAAM,EACd,OAAO,EAAE,SAAS;QAAE,KAAK,EAAE,CAAC,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE,EAAE,EAC/C,YAAY,EAAE,CAAC,GACd,OAAO,CAAC,CAAC,CAAC,CAAA;IACb,yFAAyF;IACzF,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAAA;IACvC,qBAAqB;IACrB,OAAO,CAAC,MAAM,EAAE,MAAM,EAAE,YAAY,EAAE,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC,CAAA;IAChE,yFAAyF;IACzF,WAAW,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAA;CACxC;
|
|
1
|
+
{"version":3,"file":"io.d.ts","sourceRoot":"","sources":["../src/io.ts"],"names":[],"mappings":"AAYA;;;;GAIG;AACH,MAAM,WAAW,EAAE;IACjB,IAAI,CAAC,OAAO,EAAE,MAAM,GAAG,IAAI,CAAA;IAC3B,IAAI,CAAC,OAAO,EAAE,MAAM,GAAG,IAAI,CAAA;IAC3B,gFAAgF;IAChF,QAAQ,CAAC,MAAM,EAAE,MAAM,EAAE,YAAY,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAAA;IAChE,+DAA+D;IAC/D,MAAM,CAAC,CAAC,SAAS,MAAM,EACrB,MAAM,EAAE,MAAM,EACd,OAAO,EAAE,SAAS;QAAE,KAAK,EAAE,CAAC,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE,EAAE,EAC/C,YAAY,EAAE,CAAC,GACd,OAAO,CAAC,CAAC,CAAC,CAAA;IACb,yFAAyF;IACzF,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAAA;IACvC,qBAAqB;IACrB,OAAO,CAAC,MAAM,EAAE,MAAM,EAAE,YAAY,EAAE,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC,CAAA;IAChE,yFAAyF;IACzF,WAAW,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAA;CACxC;AAED,gGAAgG;AAChG,MAAM,WAAW,kBAAkB;IACjC,GAAG,EAAE,MAAM,CAAA;IACX,IAAI,EAAE,MAAM,EAAE,CAAA;IACd;;;OAGG;IACH,wBAAwB,CAAC,EAAE,OAAO,CAAA;CACnC;AAED;;;;;;;;;;;;;;;;;;;;;;;GAuBG;AACH,wBAAgB,WAAW,CAAC,GAAG,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,CAAC,QAAQ,GAAG,kBAAkB,CActF;AAWD,8EAA8E;AAC9E,wBAAgB,eAAe,IAAI,EAAE,CA4DpC"}
|
package/dist/io.js
CHANGED
|
@@ -1,15 +1,42 @@
|
|
|
1
1
|
import { spawn } from 'node:child_process';
|
|
2
2
|
import { cancel, confirm as clackConfirm, isCancel, log, password, select as clackSelect, text, } from '@clack/prompts';
|
|
3
|
-
/**
|
|
4
|
-
|
|
5
|
-
|
|
3
|
+
/**
|
|
4
|
+
* The OS-appropriate command for opening a URL in the default browser.
|
|
5
|
+
*
|
|
6
|
+
* Windows goes through `cmd`, and cmd splits an UNQUOTED command line on `&` before the `start`
|
|
7
|
+
* builtin ever sees it. Every URL we open carries more than one query parameter, so this used to
|
|
8
|
+
* open the browser at everything up to the first `&` and then try to RUN each remaining parameter
|
|
9
|
+
* as a command: `cat-factory k3s` landed on a bare `?infraSetup=local-k3s` with none of the values
|
|
10
|
+
* the connect form prefills from, and the PAT links dropped their `scopes`.
|
|
11
|
+
*
|
|
12
|
+
* So the URL is quoted, which is also why `start`'s first argument is an empty quoted window title
|
|
13
|
+
* (it reads a leading quoted token as one). The quotes have to reach cmd verbatim, hence the flag.
|
|
14
|
+
*
|
|
15
|
+
* The quoting holds only while the URL carries no `"` of its own, so this SERIALIZES the input
|
|
16
|
+
* rather than trusting the caller to have done it: WHATWG serialization percent-encodes `"` in
|
|
17
|
+
* every component that can carry one and rejects it in a host, so no argument can close the quote
|
|
18
|
+
* and have cmd read the rest as a second command. Input that is not a URL at all throws, rather
|
|
19
|
+
* than reaching a shell as a command line whose meaning nobody has checked; `openBrowser` is
|
|
20
|
+
* best-effort and both call sites print the link before opening it. Inside the quotes cmd still
|
|
21
|
+
* expands a `%NAME%` reference, but the expansion is literal text there: quotes make `&` and its
|
|
22
|
+
* friends inert, and no Windows environment value can contain a `"` to close them, so the worst
|
|
23
|
+
* case is a wrong URL, never a second command.
|
|
24
|
+
*
|
|
25
|
+
* @throws {TypeError} if `url` is not a parsable absolute URL.
|
|
26
|
+
*/
|
|
27
|
+
export function openCommand(url, platform) {
|
|
28
|
+
const href = new URL(url).href;
|
|
29
|
+
switch (platform) {
|
|
6
30
|
case 'darwin':
|
|
7
|
-
return { cmd: 'open', args: [
|
|
31
|
+
return { cmd: 'open', args: [href] };
|
|
8
32
|
case 'win32':
|
|
9
|
-
|
|
10
|
-
|
|
33
|
+
return {
|
|
34
|
+
cmd: 'cmd',
|
|
35
|
+
args: ['/c', 'start', '""', `"${href}"`],
|
|
36
|
+
windowsVerbatimArguments: true,
|
|
37
|
+
};
|
|
11
38
|
default:
|
|
12
|
-
return { cmd: 'xdg-open', args: [
|
|
39
|
+
return { cmd: 'xdg-open', args: [href] };
|
|
13
40
|
}
|
|
14
41
|
}
|
|
15
42
|
/** A clack prompt resolved to a cancel symbol (Ctrl-C / Esc): print a notice and exit cleanly. */
|
|
@@ -58,8 +85,12 @@ export function createConsoleIo() {
|
|
|
58
85
|
openBrowser(url) {
|
|
59
86
|
return new Promise((resolve) => {
|
|
60
87
|
try {
|
|
61
|
-
const { cmd, args } = openCommand(url);
|
|
62
|
-
const child = spawn(cmd, args, {
|
|
88
|
+
const { cmd, args, windowsVerbatimArguments } = openCommand(url, process.platform);
|
|
89
|
+
const child = spawn(cmd, args, {
|
|
90
|
+
stdio: 'ignore',
|
|
91
|
+
detached: true,
|
|
92
|
+
windowsVerbatimArguments,
|
|
93
|
+
});
|
|
63
94
|
child.on('error', () => resolve());
|
|
64
95
|
child.unref();
|
|
65
96
|
resolve();
|
package/dist/io.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"io.js","sourceRoot":"","sources":["../src/io.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,oBAAoB,CAAA;AAC1C,OAAO,EACL,MAAM,EACN,OAAO,IAAI,YAAY,EACvB,QAAQ,EACR,GAAG,EAEH,QAAQ,EACR,MAAM,IAAI,WAAW,EACrB,IAAI,GACL,MAAM,gBAAgB,CAAA;
|
|
1
|
+
{"version":3,"file":"io.js","sourceRoot":"","sources":["../src/io.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,oBAAoB,CAAA;AAC1C,OAAO,EACL,MAAM,EACN,OAAO,IAAI,YAAY,EACvB,QAAQ,EACR,GAAG,EAEH,QAAQ,EACR,MAAM,IAAI,WAAW,EACrB,IAAI,GACL,MAAM,gBAAgB,CAAA;AAqCvB;;;;;;;;;;;;;;;;;;;;;;;GAuBG;AACH,MAAM,UAAU,WAAW,CAAC,GAAW,EAAE,QAAyB;IAChE,MAAM,IAAI,GAAG,IAAI,GAAG,CAAC,GAAG,CAAC,CAAC,IAAI,CAAA;IAC9B,QAAQ,QAAQ,EAAE,CAAC;QACjB,KAAK,QAAQ;YACX,OAAO,EAAE,GAAG,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC,IAAI,CAAC,EAAE,CAAA;QACtC,KAAK,OAAO;YACV,OAAO;gBACL,GAAG,EAAE,KAAK;gBACV,IAAI,EAAE,CAAC,IAAI,EAAE,OAAO,EAAE,IAAI,EAAE,IAAI,IAAI,GAAG,CAAC;gBACxC,wBAAwB,EAAE,IAAI;aAC/B,CAAA;QACH;YACE,OAAO,EAAE,GAAG,EAAE,UAAU,EAAE,IAAI,EAAE,CAAC,IAAI,CAAC,EAAE,CAAA;IAC5C,CAAC;AACH,CAAC;AAED,kGAAkG;AAClG,SAAS,eAAe,CAAI,KAAiB;IAC3C,IAAI,QAAQ,CAAC,KAAK,CAAC,EAAE,CAAC;QACpB,MAAM,CAAC,YAAY,CAAC,CAAA;QACpB,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,CAAA;IACnB,CAAC;IACD,OAAO,KAAK,CAAA;AACd,CAAC;AAED,8EAA8E;AAC9E,MAAM,UAAU,eAAe;IAC7B,OAAO;QACL,IAAI,CAAC,OAAO;YACV,4FAA4F;YAC5F,0DAA0D;YAC1D,GAAG,CAAC,OAAO,CAAC,OAAO,CAAC,OAAO,CAAC,YAAY,EAAE,EAAE,CAAC,CAAC,CAAA;QAChD,CAAC;QACD,IAAI,CAAC,OAAO;YACV,GAAG,CAAC,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,YAAY,EAAE,EAAE,CAAC,CAAC,CAAA;QAC7C,CAAC;QACD,KAAK,CAAC,QAAQ,CAAC,MAAM,EAAE,YAAY;YACjC,MAAM,KAAK,GAAG,eAAe,CAC3B,MAAM,IAAI,CAAC,EAAE,OAAO,EAAE,MAAM,EAAE,WAAW,EAAE,YAAY,EAAE,YAAY,EAAE,CAAC,CACzE,CAAA;YACD,MAAM,OAAO,GAAG,CAAC,KAAK,IAAI,EAAE,CAAC,CAAC,IAAI,EAAE,CAAA;YACpC,OAAO,OAAO,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,YAAY,IAAI,EAAE,CAAC,CAAA;QAC5D,CAAC;QACD,KAAK,CAAC,MAAM,CACV,MAAc,EACd,OAA+C,EAC/C,YAAe;YAEf,oFAAoF;YACpF,0FAA0F;YAC1F,wDAAwD;YACxD,MAAM,KAAK,GAAG,eAAe,CAC3B,MAAM,WAAW,CAAI;gBACnB,OAAO,EAAE,MAAM;gBACf,OAAO,EAAE,CAAC,GAAG,OAAO,CAAgB;gBACpC,YAAY,EAAE,YAAY;aAC3B,CAAC,CACH,CAAA;YACD,OAAO,KAAK,CAAA;QACd,CAAC;QACD,KAAK,CAAC,MAAM,CAAC,MAAM;YACjB,iFAAiF;YACjF,MAAM,KAAK,GAAG,eAAe,CAAC,MAAM,QAAQ,CAAC,EAAE,OAAO,EAAE,MAAM,EAAE,CAAC,CAAC,CAAA;YAClE,OAAO,CAAC,KAAK,IAAI,EAAE,CAAC,CAAC,IAAI,EAAE,CAAA;QAC7B,CAAC;QACD,KAAK,CAAC,OAAO,CAAC,MAAM,EAAE,YAAY;YAChC,OAAO,eAAe,CAAC,MAAM,YAAY,CAAC,EAAE,OAAO,EAAE,MAAM,EAAE,YAAY,EAAE,YAAY,EAAE,CAAC,CAAC,CAAA;QAC7F,CAAC;QACD,WAAW,CAAC,GAAG;YACb,OAAO,IAAI,OAAO,CAAO,CAAC,OAAO,EAAE,EAAE;gBACnC,IAAI,CAAC;oBACH,MAAM,EAAE,GAAG,EAAE,IAAI,EAAE,wBAAwB,EAAE,GAAG,WAAW,CAAC,GAAG,EAAE,OAAO,CAAC,QAAQ,CAAC,CAAA;oBAClF,MAAM,KAAK,GAAG,KAAK,CAAC,GAAG,EAAE,IAAI,EAAE;wBAC7B,KAAK,EAAE,QAAQ;wBACf,QAAQ,EAAE,IAAI;wBACd,wBAAwB;qBACzB,CAAC,CAAA;oBACF,KAAK,CAAC,EAAE,CAAC,OAAO,EAAE,GAAG,EAAE,CAAC,OAAO,EAAE,CAAC,CAAA;oBAClC,KAAK,CAAC,KAAK,EAAE,CAAA;oBACb,OAAO,EAAE,CAAA;gBACX,CAAC;gBAAC,MAAM,CAAC;oBACP,OAAO,EAAE,CAAA;gBACX,CAAC;YACH,CAAC,CAAC,CAAA;QACJ,CAAC;KACF,CAAA;AACH,CAAC"}
|
package/dist/k3s.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"k3s.d.ts","sourceRoot":"","sources":["../src/k3s.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,UAAU,EAAmB,MAAM,WAAW,CAAA;AAE5D,OAAO,EAAmB,KAAK,SAAS,EAAE,MAAM,iBAAiB,CAAA;AACjE,OAAO,EAAmB,KAAK,EAAE,EAAE,MAAM,SAAS,CAAA;AAClD,OAAO,EAAE,KAAK,SAAS,EAAc,KAAK,OAAO,EAAa,MAAM,gBAAgB,CAAA;AACpF,OAAO,EAIL,KAAK,kBAAkB,
|
|
1
|
+
{"version":3,"file":"k3s.d.ts","sourceRoot":"","sources":["../src/k3s.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,UAAU,EAAmB,MAAM,WAAW,CAAA;AAE5D,OAAO,EAAmB,KAAK,SAAS,EAAE,MAAM,iBAAiB,CAAA;AACjE,OAAO,EAAmB,KAAK,EAAE,EAAE,MAAM,SAAS,CAAA;AAClD,OAAO,EAAE,KAAK,SAAS,EAAc,KAAK,OAAO,EAAa,MAAM,gBAAgB,CAAA;AACpF,OAAO,EAIL,KAAK,kBAAkB,EAExB,MAAM,oBAAoB,CAAA;AAE3B,gGAAgG;AAChG,MAAM,WAAW,OAAO;IACtB,EAAE,CAAC,EAAE,EAAE,CAAA;IACP,KAAK,CAAC,EAAE,SAAS,CAAA;IACjB,qFAAqF;IACrF,QAAQ,CAAC,EAAE,MAAM,CAAC,QAAQ,CAAA;CAC3B;AAED,qFAAqF;AACrF,MAAM,WAAW,SAAS;IACxB,KAAK,EAAE,SAAS,CAAA;IAChB,MAAM,EAAE,OAAO,CAAA;IACf,gGAAgG;IAChG,UAAU,CAAC,EAAE,kBAAkB,CAAA;CAChC;AAED,wFAAwF;AACxF,eAAO,MAAM,mBAAmB,wCAAwC,CAAA;AAExE;;;;;;;;GAQG;AACH,wBAAsB,QAAQ,CAAC,OAAO,EAAE,UAAU,EAAE,IAAI,GAAE,OAAY,GAAG,OAAO,CAAC,SAAS,CAAC,CAqC1F"}
|
package/dist/k3s.js
CHANGED
|
@@ -3,7 +3,7 @@ import { buildK3sHandler, buildK3sSetupUrl } from './k3s-handler.js';
|
|
|
3
3
|
import { createNodeShell } from './host-shell.js';
|
|
4
4
|
import { createConsoleIo } from './io.js';
|
|
5
5
|
import { probeHost } from './k3s-probe.js';
|
|
6
|
-
import { CAT_FACTORY_NAMESPACE, provisionCluster, ProvisionError, } from './k3s-provision.js';
|
|
6
|
+
import { CAT_FACTORY_NAMESPACE, provisionCluster, ProvisionError, SERVICE_ACCOUNT_NAME, } from './k3s-provision.js';
|
|
7
7
|
/** The one-liner k3s install command (needs sudo — printed, never run for the user). */
|
|
8
8
|
export const K3S_INSTALL_COMMAND = 'curl -sfL https://get.k3s.io | sh -';
|
|
9
9
|
/**
|
|
@@ -156,7 +156,7 @@ function printInstallGuidance(state, io, platform) {
|
|
|
156
156
|
if (platform !== 'linux') {
|
|
157
157
|
const osName = platform === 'win32' ? 'Windows' : platform === 'darwin' ? 'macOS' : platform;
|
|
158
158
|
const install = platform === 'win32'
|
|
159
|
-
? 'Install k3d (needs Docker Desktop running)
|
|
159
|
+
? 'Install k3d (needs Docker Desktop running): https://www.catfactory.ai/deploy/kubernetes-windows.html, then:'
|
|
160
160
|
: 'Install k3d (needs Docker running), e.g. `brew install k3d`, then:';
|
|
161
161
|
io.info([
|
|
162
162
|
'',
|
|
@@ -182,9 +182,17 @@ function printInstallGuidance(state, io, platform) {
|
|
|
182
182
|
}
|
|
183
183
|
/**
|
|
184
184
|
* Print the resolved connection so the user can wire it into the Settings → Infrastructure →
|
|
185
|
-
* Local k3s form (Test → Save)
|
|
186
|
-
*
|
|
187
|
-
*
|
|
185
|
+
* Local k3s form (Test → Save), as the fallback for anyone who does not follow the deep-link
|
|
186
|
+
* {@link handOff} prints next. The apiserver token is shown ONCE here (the user's own local
|
|
187
|
+
* cluster credential, to paste); it is never written to disk or a log by cat-factory.
|
|
188
|
+
*
|
|
189
|
+
* The values are split into what the operator TYPES and what merely explains where the token came
|
|
190
|
+
* from. The ServiceAccount used to sit in the first list, which is wrong twice over: there is no
|
|
191
|
+
* such field on the form (the bearer token IS the identity, so the apiserver resolves the
|
|
192
|
+
* ServiceAccount from the token and nothing client-side ever names it), and someone who went
|
|
193
|
+
* looking for the field could only conclude the setup was incomplete. It is still worth printing,
|
|
194
|
+
* because it is the coordinate you need to mint a REPLACEMENT token later, so it is printed as
|
|
195
|
+
* exactly that.
|
|
188
196
|
*/
|
|
189
197
|
function printConnectionSummary(connection, io) {
|
|
190
198
|
io.info([
|
|
@@ -199,13 +207,21 @@ function printConnectionSummary(connection, io) {
|
|
|
199
207
|
` • Namespace template: cf-env-{{pullNumber}}`,
|
|
200
208
|
` • Environment URL source: Ingress host template`,
|
|
201
209
|
` • Host template: {{branch}}.127.0.0.1.nip.io`,
|
|
202
|
-
` • ServiceAccount: ${CAT_FACTORY_NAMESPACE}/${CAT_FACTORY_NAMESPACE}`,
|
|
203
210
|
'',
|
|
204
211
|
'Then paste this ServiceAccount token into the "ServiceAccount token" field and click Test → Save:',
|
|
205
212
|
'',
|
|
206
213
|
` ${connection.apiToken}`,
|
|
207
214
|
'',
|
|
208
|
-
'
|
|
215
|
+
'Paste it as ONE line: a token copied across a wrapped terminal line carries a hidden line',
|
|
216
|
+
'break, which the connect form rejects and no cluster would ever accept.',
|
|
217
|
+
'',
|
|
218
|
+
`The token belongs to ServiceAccount ${CAT_FACTORY_NAMESPACE}/${SERVICE_ACCOUNT_NAME}, which the form`,
|
|
219
|
+
'does not ask for (the token itself carries that identity). You need it only to mint a',
|
|
220
|
+
'replacement, either by re-running `cat-factory k3s` or with:',
|
|
221
|
+
'',
|
|
222
|
+
` kubectl create token ${SERVICE_ACCOUNT_NAME} -n ${CAT_FACTORY_NAMESPACE} --duration=720h`,
|
|
223
|
+
'',
|
|
224
|
+
'Keep the token private: it grants access to your local cluster.',
|
|
209
225
|
].join('\n'));
|
|
210
226
|
}
|
|
211
227
|
//# sourceMappingURL=k3s.js.map
|
package/dist/k3s.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"k3s.js","sourceRoot":"","sources":["../src/k3s.ts"],"names":[],"mappings":"AAAA,OAAO,EAAmB,eAAe,EAAE,MAAM,WAAW,CAAA;AAC5D,OAAO,EAAE,eAAe,EAAE,gBAAgB,EAAE,MAAM,kBAAkB,CAAA;AACpE,OAAO,EAAE,eAAe,EAAkB,MAAM,iBAAiB,CAAA;AACjE,OAAO,EAAE,eAAe,EAAW,MAAM,SAAS,CAAA;AAClD,OAAO,EAA4C,SAAS,EAAE,MAAM,gBAAgB,CAAA;AACpF,OAAO,EACL,qBAAqB,EACrB,gBAAgB,EAChB,cAAc,
|
|
1
|
+
{"version":3,"file":"k3s.js","sourceRoot":"","sources":["../src/k3s.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@cat-factory/cli",
|
|
3
|
-
"version": "0.10.
|
|
3
|
+
"version": "0.10.4",
|
|
4
4
|
"description": "Bootstrap CLI for the Agent Architecture Board: scaffold a local-mode deployment (Node/local backend + frontend SPA) on your own machine — generates the crypto secrets, populates and gitignores the .env files, and mints a GitHub/GitLab personal access token by opening the browser at the right pre-scoped URL.",
|
|
5
5
|
"keywords": [
|
|
6
6
|
"bootstrap",
|
|
@@ -41,8 +41,8 @@
|
|
|
41
41
|
"typescript": "7.0.2",
|
|
42
42
|
"valibot": "^1.4.2",
|
|
43
43
|
"vitest": "^4.1.10",
|
|
44
|
-
"@cat-factory/contracts": "0.
|
|
45
|
-
"@cat-factory/kernel": "0.
|
|
44
|
+
"@cat-factory/contracts": "0.292.1",
|
|
45
|
+
"@cat-factory/kernel": "0.285.2"
|
|
46
46
|
},
|
|
47
47
|
"scripts": {
|
|
48
48
|
"build": "tsc -b tsconfig.build.json",
|