@supersdk/supercli 0.3.8-staging.65 โ 0.3.8
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/api/analyticsClient.js +1 -1
- package/dist/api/analyticsClient.js.map +1 -1
- package/dist/api/consoleClient.js +23 -1
- package/dist/api/consoleClient.js.map +1 -1
- package/dist/api/dbClient.js +10 -10
- package/dist/api/dbClient.js.map +1 -1
- package/dist/auth/browserAuth.js +1 -1
- package/dist/auth/browserAuth.js.map +1 -1
- package/dist/auth/identityOverride.js +46 -0
- package/dist/auth/identityOverride.js.map +1 -0
- package/dist/auth/tokenAuth.js +15 -6
- package/dist/auth/tokenAuth.js.map +1 -1
- package/dist/cli.js +66 -1
- package/dist/cli.js.map +1 -1
- package/dist/commands/accounts.js +8 -3
- package/dist/commands/accounts.js.map +1 -1
- package/dist/commands/db.js +10 -2
- package/dist/commands/db.js.map +1 -1
- package/dist/commands/deploy.js +6 -87
- package/dist/commands/deploy.js.map +1 -1
- package/dist/commands/image.js +10 -28
- package/dist/commands/image.js.map +1 -1
- package/dist/commands/login.js +13 -0
- package/dist/commands/login.js.map +1 -1
- package/dist/commands/logs.js +4 -12
- package/dist/commands/logs.js.map +1 -1
- package/dist/commands/publishSite.js +2 -1
- package/dist/commands/publishSite.js.map +1 -1
- package/dist/commands/superRun.js +9 -41
- package/dist/commands/superRun.js.map +1 -1
- package/dist/config/superConfig.js.map +1 -1
- package/dist/deploy/runAdapter.js +1 -1
- package/dist/deploy/runAdapter.js.map +1 -1
- package/dist/deploy/siteAdapter.js +1 -1
- package/dist/deploy/siteAdapter.js.map +1 -1
- package/dist/publish/registryClient.js +1 -3
- package/dist/publish/registryClient.js.map +1 -1
- package/dist/publish/runClient.js +1 -2
- package/dist/publish/runClient.js.map +1 -1
- package/dist/publish/siteClient.js +7 -1
- package/dist/publish/siteClient.js.map +1 -1
- package/dist/store/accountStore.js +39 -4
- package/dist/store/accountStore.js.map +1 -1
- package/dist/template/android/supersdk-default.config.json +1 -1
- package/dist/template/web/src/js/supersdk.js +5 -1
- package/dist/template/web/src/js/supersdk.provenance.json +3 -3
- package/dist/util/deprecations.js +25 -0
- package/dist/util/deprecations.js.map +1 -0
- package/package.json +1 -1
- package/dist/publish/orgResolve.js +0 -29
- package/dist/publish/orgResolve.js.map +0 -1
|
@@ -17,7 +17,7 @@ class AnalyticsClient {
|
|
|
17
17
|
return (0, consoleClient_1.performRequest)(this.apiOrigin, 'POST', `${scopePath(scope.spid, scope.env)}/query`, {
|
|
18
18
|
body,
|
|
19
19
|
bearer: ctx.token,
|
|
20
|
-
headers:
|
|
20
|
+
headers: (0, consoleClient_1.requestIdHeaders)(ctx.requestId),
|
|
21
21
|
fetchImpl: this.fetchImpl,
|
|
22
22
|
// The CA supervisor owns a 30s execution deadline followed by bounded
|
|
23
23
|
// cancellation. Keep the CLI transport alive long enough to receive that
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"analyticsClient.js","sourceRoot":"","sources":["../../src/api/analyticsClient.ts"],"names":[],"mappings":";;;AAAA,
|
|
1
|
+
{"version":3,"file":"analyticsClient.js","sourceRoot":"","sources":["../../src/api/analyticsClient.ts"],"names":[],"mappings":";;;AAAA,mDAAuG;AAoCvG,SAAS,SAAS,CAAC,IAAY,EAAE,GAAW;IAC1C,OAAO,6BAA6B,kBAAkB,CAAC,IAAI,CAAC,SAAS,kBAAkB,CAAC,GAAG,CAAC,YAAY,CAAC;AAC3G,CAAC;AAED,sFAAsF;AACtF,MAAa,eAAe;IAEP;IACA;IAFnB,YACmB,SAAiB,EACjB,SAAqB;QADrB,cAAS,GAAT,SAAS,CAAQ;QACjB,cAAS,GAAT,SAAS,CAAY;IACrC,CAAC;IAEJ,KAAK,CACH,GAA4B,EAC5B,KAAoC,EACpC,IAAoE;QAEpE,OAAO,IAAA,8BAAc,EAAiB,IAAI,CAAC,SAAS,EAAE,MAAM,EAAE,GAAG,SAAS,CAAC,KAAK,CAAC,IAAI,EAAE,KAAK,CAAC,GAAG,CAAC,QAAQ,EAAE;YACzG,IAAI;YACJ,MAAM,EAAE,GAAG,CAAC,KAAK;YACjB,OAAO,EAAE,IAAA,gCAAgB,EAAC,GAAG,CAAC,SAAS,CAAC;YACxC,SAAS,EAAE,IAAI,CAAC,SAAS;YACzB,sEAAsE;YACtE,yEAAyE;YACzE,uEAAuE;YACvE,SAAS,EAAE,MAAM;SAClB,CAAC,CAAC;IACL,CAAC;IAED,MAAM,CAAC,GAA4B,EAAE,KAAoC;QACvE,OAAO,IAAA,8BAAc,EAAqC,IAAI,CAAC,SAAS,EAAE,KAAK,EAAE,GAAG,SAAS,CAAC,KAAK,CAAC,IAAI,EAAE,KAAK,CAAC,GAAG,CAAC,SAAS,EAAE;YAC7H,MAAM,EAAE,GAAG,CAAC,KAAK;YACjB,SAAS,EAAE,IAAI,CAAC,SAAS;SAC1B,CAAC,CAAC;IACL,CAAC;IAED,KAAK,CAAC,GAA4B,EAAE,KAAoC,EAAE,KAAa;QACrF,OAAO,IAAA,8BAAc,EAAuB,IAAI,CAAC,SAAS,EAAE,KAAK,EAAE,GAAG,SAAS,CAAC,KAAK,CAAC,IAAI,EAAE,KAAK,CAAC,GAAG,CAAC,WAAW,kBAAkB,CAAC,KAAK,CAAC,EAAE,EAAE;YAC5I,MAAM,EAAE,GAAG,CAAC,KAAK;YACjB,SAAS,EAAE,IAAI,CAAC,SAAS;SAC1B,CAAC,CAAC;IACL,CAAC;IAED,OAAO,CAAC,GAA4B,EAAE,KAAoC,EAAE,KAAa;QACvF,OAAO,IAAA,8BAAc,EAA0B,IAAI,CAAC,SAAS,EAAE,KAAK,EAAE,GAAG,SAAS,CAAC,KAAK,CAAC,IAAI,EAAE,KAAK,CAAC,GAAG,CAAC,WAAW,kBAAkB,CAAC,KAAK,CAAC,UAAU,EAAE;YACvJ,MAAM,EAAE,GAAG,CAAC,KAAK;YACjB,SAAS,EAAE,IAAI,CAAC,SAAS;SAC1B,CAAC,CAAC;IACL,CAAC;CACF;AA3CD,0CA2CC"}
|
|
@@ -14,9 +14,31 @@
|
|
|
14
14
|
// 429 -> rate_limited (creation endpoint only)
|
|
15
15
|
// 5xx / network / malformed -> infra_error (never touches local account state)
|
|
16
16
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
17
|
-
exports.ConsoleClient = void 0;
|
|
17
|
+
exports.ConsoleClient = exports.CLI_REQUEST_ID_HEADER = void 0;
|
|
18
|
+
exports.requestIdHeaders = requestIdHeaders;
|
|
18
19
|
exports.classifyEnvelope = classifyEnvelope;
|
|
19
20
|
exports.performRequest = performRequest;
|
|
21
|
+
/**
|
|
22
|
+
* The header SuperCLI puts its request id in.
|
|
23
|
+
*
|
|
24
|
+
* ๐ด **Not `x-request-id`.** A service mesh owns that name โ Envoy stamps its own trace id
|
|
25
|
+
* over whatever the client sent โ so behind the real ingress the CLI's id never reached the
|
|
26
|
+
* server, and every call to the token-only SQL routes came back `invalid x-request-id`.
|
|
27
|
+
* Keep in sync with `infra::cli_request_id::CLI_REQUEST_ID_HEADER` server-side.
|
|
28
|
+
*/
|
|
29
|
+
exports.CLI_REQUEST_ID_HEADER = 'x-supercli-request-id';
|
|
30
|
+
/**
|
|
31
|
+
* Headers carrying one CLI request id.
|
|
32
|
+
*
|
|
33
|
+
* Sends the legacy `x-request-id` too: against a server that predates the dedicated header
|
|
34
|
+
* (or a deployment with no mesh in front) that is still the one being read, and sending both
|
|
35
|
+
* costs nothing.
|
|
36
|
+
*/
|
|
37
|
+
function requestIdHeaders(requestId) {
|
|
38
|
+
if (!requestId)
|
|
39
|
+
return undefined;
|
|
40
|
+
return { [exports.CLI_REQUEST_ID_HEADER]: requestId, 'X-Request-Id': requestId };
|
|
41
|
+
}
|
|
20
42
|
/**
|
|
21
43
|
* Turn one HTTP response into a `ClientOutcome`.
|
|
22
44
|
*
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"consoleClient.js","sourceRoot":"","sources":["../../src/api/consoleClient.ts"],"names":[],"mappings":";AAAA,yEAAyE;AACzE,wEAAwE;AACxE,uCAAuC;AACvC,EAAE;AACF,0CAA0C;AAC1C,gDAAgD;AAChD,oFAAoF;AACpF,iFAAiF;AACjF,sEAAsE;AACtE,mFAAmF;AACnF,gFAAgF;AAChF,sDAAsD;AACtD,wEAAwE;AACxE,kFAAkF;;;
|
|
1
|
+
{"version":3,"file":"consoleClient.js","sourceRoot":"","sources":["../../src/api/consoleClient.ts"],"names":[],"mappings":"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"}
|
package/dist/api/dbClient.js
CHANGED
|
@@ -47,7 +47,7 @@ class DbClient {
|
|
|
47
47
|
return (0, consoleClient_1.performRequest)(this.apiOrigin, 'POST', `${databasePath(scope)}/query`, {
|
|
48
48
|
body,
|
|
49
49
|
bearer: ctx.token,
|
|
50
|
-
headers:
|
|
50
|
+
headers: (0, consoleClient_1.requestIdHeaders)(ctx.requestId),
|
|
51
51
|
fetchImpl: this.fetchImpl,
|
|
52
52
|
timeoutMs: 45_000,
|
|
53
53
|
parseServerErrorEnvelope: true,
|
|
@@ -57,7 +57,7 @@ class DbClient {
|
|
|
57
57
|
return (0, consoleClient_1.performRequest)(this.apiOrigin, 'POST', `${databasePath(scope)}/execute`, {
|
|
58
58
|
body,
|
|
59
59
|
bearer: ctx.token,
|
|
60
|
-
headers:
|
|
60
|
+
headers: (0, consoleClient_1.requestIdHeaders)(ctx.requestId),
|
|
61
61
|
fetchImpl: this.fetchImpl,
|
|
62
62
|
timeoutMs: 45_000,
|
|
63
63
|
parseServerErrorEnvelope: true,
|
|
@@ -67,7 +67,7 @@ class DbClient {
|
|
|
67
67
|
return (0, consoleClient_1.performRequest)(this.apiOrigin, 'PUT', runDatabaseBindingPath(scope, slug), {
|
|
68
68
|
body,
|
|
69
69
|
bearer: ctx.token,
|
|
70
|
-
headers:
|
|
70
|
+
headers: (0, consoleClient_1.requestIdHeaders)(ctx.requestId),
|
|
71
71
|
fetchImpl: this.fetchImpl,
|
|
72
72
|
timeoutMs: 180_000,
|
|
73
73
|
parseServerErrorEnvelope: true,
|
|
@@ -76,7 +76,7 @@ class DbClient {
|
|
|
76
76
|
unbind(ctx, scope, slug) {
|
|
77
77
|
return (0, consoleClient_1.performRequest)(this.apiOrigin, 'DELETE', runDatabaseBindingPath(scope, slug), {
|
|
78
78
|
bearer: ctx.token,
|
|
79
|
-
headers:
|
|
79
|
+
headers: (0, consoleClient_1.requestIdHeaders)(ctx.requestId),
|
|
80
80
|
fetchImpl: this.fetchImpl,
|
|
81
81
|
timeoutMs: 180_000,
|
|
82
82
|
parseServerErrorEnvelope: true,
|
|
@@ -85,7 +85,7 @@ class DbClient {
|
|
|
85
85
|
refresh(ctx, scope, slug) {
|
|
86
86
|
return (0, consoleClient_1.performRequest)(this.apiOrigin, 'POST', `${runDatabaseBindingPath(scope, slug)}/refresh`, {
|
|
87
87
|
bearer: ctx.token,
|
|
88
|
-
headers:
|
|
88
|
+
headers: (0, consoleClient_1.requestIdHeaders)(ctx.requestId),
|
|
89
89
|
fetchImpl: this.fetchImpl,
|
|
90
90
|
timeoutMs: 180_000,
|
|
91
91
|
parseServerErrorEnvelope: true,
|
|
@@ -95,7 +95,7 @@ class DbClient {
|
|
|
95
95
|
return (0, consoleClient_1.performRequest)(this.apiOrigin, 'POST', `${consoleDatabasePath(scope)}/connections`, {
|
|
96
96
|
body,
|
|
97
97
|
bearer: ctx.token,
|
|
98
|
-
headers:
|
|
98
|
+
headers: (0, consoleClient_1.requestIdHeaders)(ctx.requestId),
|
|
99
99
|
fetchImpl: this.fetchImpl,
|
|
100
100
|
timeoutMs: 45_000,
|
|
101
101
|
parseServerErrorEnvelope: true,
|
|
@@ -112,7 +112,7 @@ class DbClient {
|
|
|
112
112
|
return (0, consoleClient_1.performRequest)(this.apiOrigin, 'PUT', connectionPath(scope, conn), {
|
|
113
113
|
body,
|
|
114
114
|
bearer: ctx.token,
|
|
115
|
-
headers:
|
|
115
|
+
headers: (0, consoleClient_1.requestIdHeaders)(ctx.requestId),
|
|
116
116
|
fetchImpl: this.fetchImpl,
|
|
117
117
|
timeoutMs: 45_000,
|
|
118
118
|
parseServerErrorEnvelope: true,
|
|
@@ -121,7 +121,7 @@ class DbClient {
|
|
|
121
121
|
deleteConnection(ctx, scope, conn) {
|
|
122
122
|
return (0, consoleClient_1.performRequest)(this.apiOrigin, 'DELETE', connectionPath(scope, conn), {
|
|
123
123
|
bearer: ctx.token,
|
|
124
|
-
headers:
|
|
124
|
+
headers: (0, consoleClient_1.requestIdHeaders)(ctx.requestId),
|
|
125
125
|
fetchImpl: this.fetchImpl,
|
|
126
126
|
parseServerErrorEnvelope: true,
|
|
127
127
|
});
|
|
@@ -129,7 +129,7 @@ class DbClient {
|
|
|
129
129
|
testConnection(ctx, scope, conn) {
|
|
130
130
|
return (0, consoleClient_1.performRequest)(this.apiOrigin, 'POST', `${connectionPath(scope, conn)}/test`, {
|
|
131
131
|
bearer: ctx.token,
|
|
132
|
-
headers:
|
|
132
|
+
headers: (0, consoleClient_1.requestIdHeaders)(ctx.requestId),
|
|
133
133
|
fetchImpl: this.fetchImpl,
|
|
134
134
|
timeoutMs: 45_000,
|
|
135
135
|
parseServerErrorEnvelope: true,
|
|
@@ -179,7 +179,7 @@ class DbClient {
|
|
|
179
179
|
bindings(ctx, scope, conn) {
|
|
180
180
|
return (0, consoleClient_1.performRequest)(this.apiOrigin, 'GET', connectionBindingsPath(scope, conn), {
|
|
181
181
|
bearer: ctx.token,
|
|
182
|
-
headers:
|
|
182
|
+
headers: (0, consoleClient_1.requestIdHeaders)(ctx.requestId),
|
|
183
183
|
fetchImpl: this.fetchImpl,
|
|
184
184
|
timeoutMs: 30_000,
|
|
185
185
|
parseServerErrorEnvelope: true,
|
package/dist/api/dbClient.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"dbClient.js","sourceRoot":"","sources":["../../src/api/dbClient.ts"],"names":[],"mappings":";;;AAAA,
|
|
1
|
+
{"version":3,"file":"dbClient.js","sourceRoot":"","sources":["../../src/api/dbClient.ts"],"names":[],"mappings":"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"}
|
package/dist/auth/browserAuth.js
CHANGED
|
@@ -79,7 +79,7 @@ async function login(deps) {
|
|
|
79
79
|
return { ok: false, message: 'whoami did not return a user id; cannot establish a stable account identity' };
|
|
80
80
|
}
|
|
81
81
|
const orgId = String(who.org_id ?? issued.org_id ?? '');
|
|
82
|
-
const accountKey = (0, accountStore_1.deriveAccountKey)(env.label, env.apiOrigin, userId);
|
|
82
|
+
const accountKey = (0, accountStore_1.deriveAccountKey)(env.label, env.apiOrigin, userId, deps.label);
|
|
83
83
|
const existing = (0, accountStore_1.getAccount)(accountKey);
|
|
84
84
|
// Captured BEFORE any mutation so a failed commit can restore it exactly (TC-12).
|
|
85
85
|
// backend.get must be wrapped: the token is already minted, so any escape here
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"browserAuth.js","sourceRoot":"","sources":["../../src/auth/browserAuth.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"browserAuth.js","sourceRoot":"","sources":["../../src/auth/browserAuth.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,46 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
/**
|
|
3
|
+
* The identity chosen for THIS invocation by `--account`.
|
|
4
|
+
*
|
|
5
|
+
* # Why the precedence lives here and not in each command
|
|
6
|
+
*
|
|
7
|
+
* Every console-calling command resolves its credential the same way: `resolveEnvToken()`
|
|
8
|
+
* first, then the current stored account. If `--account` were honoured only in the second
|
|
9
|
+
* step, `SUPERCLI_TOKEN` would silently win whenever it happened to be exported โ which is
|
|
10
|
+
* precisely the CI shell where per-command identity switching matters most. Putting the
|
|
11
|
+
* override in one leaf module that BOTH `resolveEnvToken` and `getCurrentAccount` consult
|
|
12
|
+
* makes the rule true everywhere without touching a single command.
|
|
13
|
+
*
|
|
14
|
+
* # The rule
|
|
15
|
+
*
|
|
16
|
+
* `--account` (a flag typed for this one call) beats `SUPERCLI_TOKEN` (ambient environment)
|
|
17
|
+
* beats the stored `current`. Most explicit and most local wins โ the same order
|
|
18
|
+
* `gcloud --account`, `kubectl --context` and `git -c` use.
|
|
19
|
+
*
|
|
20
|
+
* ๐ด **Resolution failure must never fall back.** If `--account acme` cannot be resolved,
|
|
21
|
+
* the command aborts. Falling back to the env token or to `current` would run as an
|
|
22
|
+
* identity the caller did not ask for, which is the one outcome worth failing loudly to
|
|
23
|
+
* avoid โ far worse than any confusion about precedence.
|
|
24
|
+
*/
|
|
25
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
26
|
+
exports.setAccountOverride = setAccountOverride;
|
|
27
|
+
exports.accountOverrideKey = accountOverrideKey;
|
|
28
|
+
exports.hasAccountOverride = hasAccountOverride;
|
|
29
|
+
exports.clearAccountOverride = clearAccountOverride;
|
|
30
|
+
let overrideKey = null;
|
|
31
|
+
/** Records the account key `--account` resolved to. Only the CLI bootstrap calls this. */
|
|
32
|
+
function setAccountOverride(accountKey) {
|
|
33
|
+
overrideKey = accountKey;
|
|
34
|
+
}
|
|
35
|
+
/** The account key chosen for this invocation, or null when `--account` was not used. */
|
|
36
|
+
function accountOverrideKey() {
|
|
37
|
+
return overrideKey;
|
|
38
|
+
}
|
|
39
|
+
function hasAccountOverride() {
|
|
40
|
+
return overrideKey !== null;
|
|
41
|
+
}
|
|
42
|
+
/** Test-only reset; the real process sets this once and never clears it. */
|
|
43
|
+
function clearAccountOverride() {
|
|
44
|
+
overrideKey = null;
|
|
45
|
+
}
|
|
46
|
+
//# sourceMappingURL=identityOverride.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"identityOverride.js","sourceRoot":"","sources":["../../src/auth/identityOverride.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;;;;;;;;;GAsBG;;AAKH,gDAEC;AAGD,gDAEC;AAED,gDAEC;AAGD,oDAEC;AAnBD,IAAI,WAAW,GAAkB,IAAI,CAAC;AAEtC,0FAA0F;AAC1F,SAAgB,kBAAkB,CAAC,UAAkB;IACnD,WAAW,GAAG,UAAU,CAAC;AAC3B,CAAC;AAED,yFAAyF;AACzF,SAAgB,kBAAkB;IAChC,OAAO,WAAW,CAAC;AACrB,CAAC;AAED,SAAgB,kBAAkB;IAChC,OAAO,WAAW,KAAK,IAAI,CAAC;AAC9B,CAAC;AAED,4EAA4E;AAC5E,SAAgB,oBAAoB;IAClC,WAAW,GAAG,IAAI,CAAC;AACrB,CAAC"}
|
package/dist/auth/tokenAuth.js
CHANGED
|
@@ -1,4 +1,10 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.SUPERCLI_TOKEN_ENV = void 0;
|
|
4
|
+
exports.resolveEnvToken = resolveEnvToken;
|
|
5
|
+
exports.resolveToken = resolveToken;
|
|
6
|
+
exports.maskToken = maskToken;
|
|
7
|
+
const identityOverride_1 = require("./identityOverride");
|
|
2
8
|
// Token identity (AC-5). The CLI's single credential is one user token, minted
|
|
3
9
|
// by `supercli login` (persisted) OR supplied out-of-band by the environment.
|
|
4
10
|
//
|
|
@@ -12,14 +18,17 @@
|
|
|
12
18
|
// Auth is attached as `Authorization: Bearer <token>` (+ `X-Org-Id`, added by
|
|
13
19
|
// the request clients); a `cli_`-prefixed token routes to the user-identity
|
|
14
20
|
// (AuthedUser) arm server-side.
|
|
15
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
|
16
|
-
exports.SUPERCLI_TOKEN_ENV = void 0;
|
|
17
|
-
exports.resolveEnvToken = resolveEnvToken;
|
|
18
|
-
exports.resolveToken = resolveToken;
|
|
19
|
-
exports.maskToken = maskToken;
|
|
20
21
|
exports.SUPERCLI_TOKEN_ENV = 'SUPERCLI_TOKEN';
|
|
21
|
-
/**
|
|
22
|
+
/**
|
|
23
|
+
* The `SUPERCLI_TOKEN` value if present and non-empty, else null.
|
|
24
|
+
*
|
|
25
|
+
* ๐ด Yields to `--account`. A flag typed for this one call is a more explicit statement of
|
|
26
|
+
* intent than an environment variable inherited from the shell, and honouring the env var
|
|
27
|
+
* here would make `--account` unusable in exactly the CI job where it is worth having.
|
|
28
|
+
*/
|
|
22
29
|
function resolveEnvToken() {
|
|
30
|
+
if ((0, identityOverride_1.hasAccountOverride)())
|
|
31
|
+
return null;
|
|
23
32
|
const raw = process.env[exports.SUPERCLI_TOKEN_ENV];
|
|
24
33
|
const trimmed = raw?.trim();
|
|
25
34
|
return trimmed && trimmed.length > 0 ? trimmed : null;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tokenAuth.js","sourceRoot":"","sources":["../../src/auth/tokenAuth.ts"],"names":[],"mappings":";
|
|
1
|
+
{"version":3,"file":"tokenAuth.js","sourceRoot":"","sources":["../../src/auth/tokenAuth.ts"],"names":[],"mappings":";;;AAgCA,0CAKC;AAOD,oCAKC;AAGD,8BAKC;AAzDD,yDAAwD;AAExD,+EAA+E;AAC/E,8EAA8E;AAC9E,EAAE;AACF,4EAA4E;AAC5E,uEAAuE;AACvE,uEAAuE;AACvE,mEAAmE;AACnE,8EAA8E;AAC9E,qEAAqE;AACrE,EAAE;AACF,8EAA8E;AAC9E,4EAA4E;AAC5E,gCAAgC;AAEnB,QAAA,kBAAkB,GAAG,gBAAgB,CAAC;AASnD;;;;;;GAMG;AACH,SAAgB,eAAe;IAC7B,IAAI,IAAA,qCAAkB,GAAE;QAAE,OAAO,IAAI,CAAC;IACtC,MAAM,GAAG,GAAG,OAAO,CAAC,GAAG,CAAC,0BAAkB,CAAC,CAAC;IAC5C,MAAM,OAAO,GAAG,GAAG,EAAE,IAAI,EAAE,CAAC;IAC5B,OAAO,OAAO,IAAI,OAAO,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC;AACxD,CAAC;AAED;;;;GAIG;AACH,SAAgB,YAAY,CAAC,eAAoC;IAC/D,MAAM,QAAQ,GAAG,eAAe,EAAE,CAAC;IACnC,IAAI,QAAQ;QAAE,OAAO,EAAE,KAAK,EAAE,QAAQ,EAAE,MAAM,EAAE,KAAK,EAAE,CAAC;IACxD,MAAM,MAAM,GAAG,eAAe,EAAE,CAAC;IACjC,OAAO,MAAM,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC;AAC7D,CAAC;AAED,6EAA6E;AAC7E,SAAgB,SAAS,CAAC,KAAa;IACrC,MAAM,UAAU,GAAG,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;IACtC,MAAM,MAAM,GAAG,UAAU,GAAG,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,EAAE,UAAU,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;IACpE,MAAM,IAAI,GAAG,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;IAC7B,OAAO,GAAG,MAAM,IAAI,IAAI,EAAE,CAAC;AAC7B,CAAC"}
|
package/dist/cli.js
CHANGED
|
@@ -28,6 +28,9 @@ const update_1 = require("./commands/update");
|
|
|
28
28
|
const resultPrinter_1 = require("./output/resultPrinter");
|
|
29
29
|
const log_1 = require("./util/log");
|
|
30
30
|
const prompt_1 = require("./util/prompt");
|
|
31
|
+
const identityOverride_1 = require("./auth/identityOverride");
|
|
32
|
+
const accountStore_1 = require("./store/accountStore");
|
|
33
|
+
const log_2 = require("./util/log");
|
|
31
34
|
// package.json is always shipped alongside dist/ in an npm package (npm
|
|
32
35
|
// always includes it regardless of the "files" allowlist), so this resolves
|
|
33
36
|
// correctly both in local dev and in an installed/packed tarball.
|
|
@@ -54,6 +57,62 @@ function detectOutputMode(argv) {
|
|
|
54
57
|
function detectNoInput(argv) {
|
|
55
58
|
return argv.includes('--no-input');
|
|
56
59
|
}
|
|
60
|
+
function detectAccountSelector(argv) {
|
|
61
|
+
for (let i = 2; i < argv.length; i++) {
|
|
62
|
+
const a = argv[i];
|
|
63
|
+
if (a === '--account')
|
|
64
|
+
return argv[i + 1];
|
|
65
|
+
if (a.startsWith('--account='))
|
|
66
|
+
return a.slice('--account='.length);
|
|
67
|
+
}
|
|
68
|
+
return undefined;
|
|
69
|
+
}
|
|
70
|
+
/**
|
|
71
|
+
* Resolve `--account` to a stored account, before any command runs.
|
|
72
|
+
*
|
|
73
|
+
* ๐ด Every outcome except "resolved" aborts. Falling back to `SUPERCLI_TOKEN` or to the
|
|
74
|
+
* stored `current` would run the command as an identity the caller did not name โ the one
|
|
75
|
+
* failure worth being loud about. Ambiguity aborts too, for the same reason.
|
|
76
|
+
*/
|
|
77
|
+
function applyAccountSelector(selector, mode) {
|
|
78
|
+
if (selector === undefined)
|
|
79
|
+
return true;
|
|
80
|
+
const value = selector.trim();
|
|
81
|
+
const fail = (message) => {
|
|
82
|
+
new resultPrinter_1.ResultPrinter(mode).failure('usage_error', message);
|
|
83
|
+
return false;
|
|
84
|
+
};
|
|
85
|
+
if (!value)
|
|
86
|
+
return fail('--account requires an account selector');
|
|
87
|
+
// `--account` names a stored credential; it is not a place to paste one. The no-secrets-on-argv
|
|
88
|
+
// rule that keeps `--token` from existing applies just as much here.
|
|
89
|
+
if (/^(?:cli_|sst_)/.test(value)) {
|
|
90
|
+
return fail('--account takes an account label, email or user id โ not a token; use SUPERCLI_TOKEN to supply a token');
|
|
91
|
+
}
|
|
92
|
+
let accounts;
|
|
93
|
+
try {
|
|
94
|
+
accounts = (0, accountStore_1.listAccounts)();
|
|
95
|
+
}
|
|
96
|
+
catch (error) {
|
|
97
|
+
new resultPrinter_1.ResultPrinter(mode).failure('infra_error', `could not read the account list: ${error.message}`);
|
|
98
|
+
return false;
|
|
99
|
+
}
|
|
100
|
+
const resolution = (0, accountStore_1.resolveSelector)(accounts, value);
|
|
101
|
+
if (resolution.kind === 'not_found') {
|
|
102
|
+
return fail(`no saved account matches ${JSON.stringify(value)} โ run \`supercli accounts\` to list them`);
|
|
103
|
+
}
|
|
104
|
+
if (resolution.kind === 'ambiguous') {
|
|
105
|
+
const keys = resolution.matches.map((account) => account.accountKey).join(', ');
|
|
106
|
+
return fail(`${JSON.stringify(value)} matches several accounts (${keys}) โ name one by its account key`);
|
|
107
|
+
}
|
|
108
|
+
(0, identityOverride_1.setAccountOverride)(resolution.account.accountKey);
|
|
109
|
+
if (process.env.SUPERCLI_TOKEN?.trim()) {
|
|
110
|
+
// Not a conflict to refuse: the flag is the more explicit signal and wins. But an
|
|
111
|
+
// override of an exported token is worth saying out loud, once, on stderr.
|
|
112
|
+
log_2.log.warn(`--account ${resolution.account.accountKey} overrides SUPERCLI_TOKEN for this invocation`);
|
|
113
|
+
}
|
|
114
|
+
return true;
|
|
115
|
+
}
|
|
57
116
|
function buildProgram() {
|
|
58
117
|
const program = new commander_1.Command();
|
|
59
118
|
program
|
|
@@ -64,7 +123,8 @@ function buildProgram() {
|
|
|
64
123
|
.enablePositionalOptions()
|
|
65
124
|
.version(pkg.version, '--version', 'output the version number')
|
|
66
125
|
.option('--output <mode>', 'output mode: "json" emits a single machine-readable envelope on stdout')
|
|
67
|
-
.option('--no-input', 'never prompt for interactive input; fail fast (implied by --output json)')
|
|
126
|
+
.option('--no-input', 'never prompt for interactive input; fail fast (implied by --output json)')
|
|
127
|
+
.option('--account <selector>', 'act as one saved account for this invocation (account key, label, email or user id); overrides SUPERCLI_TOKEN');
|
|
68
128
|
(0, login_1.registerLoginCommand)(program);
|
|
69
129
|
(0, accounts_1.registerAccountsCommand)(program);
|
|
70
130
|
(0, projects_1.registerProjectsCommand)(program);
|
|
@@ -120,6 +180,9 @@ function buildProgram() {
|
|
|
120
180
|
if (!cmd.options.some((option) => option.long === '--no-input')) {
|
|
121
181
|
cmd.option('--no-input', 'never prompt for interactive input; fail fast (implied by --output json)');
|
|
122
182
|
}
|
|
183
|
+
if (!cmd.options.some((option) => option.long === '--account')) {
|
|
184
|
+
cmd.option('--account <selector>', 'act as one saved account for this invocation (account key, label, email or user id); overrides SUPERCLI_TOKEN');
|
|
185
|
+
}
|
|
123
186
|
for (const child of cmd.commands)
|
|
124
187
|
ensureAgentOptions(child);
|
|
125
188
|
};
|
|
@@ -134,6 +197,8 @@ async function run() {
|
|
|
134
197
|
(0, log_1.setLogJsonMode)(mode === 'json');
|
|
135
198
|
// json mode implies non-interactive (AC-2); --no-input is the explicit form.
|
|
136
199
|
(0, prompt_1.setNonInteractive)(mode === 'json' || noInput);
|
|
200
|
+
if (!applyAccountSelector(detectAccountSelector(argv), mode))
|
|
201
|
+
return;
|
|
137
202
|
const program = buildProgram();
|
|
138
203
|
if (mode === 'json') {
|
|
139
204
|
// In json mode a commander parse error (unknown command / missing required
|
package/dist/cli.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cli.js","sourceRoot":"","sources":["../src/cli.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"cli.js","sourceRoot":"","sources":["../src/cli.ts"],"names":[],"mappings":";;AA+GA,oCAgFC;AA/LD,yCAAoD;AACpD,kDAA8D;AAC9D,oDAAgE;AAChE,wCAAoD;AACpD,4CAAyD;AACzD,8CAA0D;AAC1D,sCAAkD;AAClD,0CAAsD;AACtD,4CAAwD;AACxD,4CAAwD;AACxD,0CAAsD;AACtD,8CAA0D;AAC1D,kDAA8D;AAC9D,wCAAoD;AACpD,wDAAoE;AACpE,0CAAsD;AACtD,kDAAmF;AACnF,kDAA8D;AAC9D,wCAAoD;AACpD,kDAA8D;AAC9D,kDAA8D;AAC9D,4DAAwE;AACxE,8CAA0D;AAC1D,0DAAwE;AACxE,oCAA4C;AAC5C,0CAAkD;AAClD,8DAA6D;AAC7D,uDAAyF;AACzF,oCAAiC;AAEjC,wEAAwE;AACxE,4EAA4E;AAC5E,kEAAkE;AAClE,8DAA8D;AAC9D,MAAM,GAAG,GAAG,OAAO,CAAC,iBAAiB,CAAwB,CAAC;AAE9D;;;;;;;GAOG;AACH,SAAS,gBAAgB,CAAC,IAAc;IACtC,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,IAAI,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;QACrC,MAAM,CAAC,GAAG,IAAI,CAAC,CAAC,CAAC,CAAC;QAClB,IAAI,CAAC,KAAK,UAAU;YAAE,OAAO,IAAI,CAAC,CAAC,GAAG,CAAC,CAAC,KAAK,MAAM,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,OAAO,CAAC;QACvE,IAAI,CAAC,CAAC,UAAU,CAAC,WAAW,CAAC;YAAE,OAAO,CAAC,CAAC,KAAK,CAAC,WAAW,CAAC,MAAM,CAAC,KAAK,MAAM,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,OAAO,CAAC;IAClG,CAAC;IACD,OAAO,OAAO,CAAC;AACjB,CAAC;AAED,SAAS,aAAa,CAAC,IAAc;IACnC,OAAO,IAAI,CAAC,QAAQ,CAAC,YAAY,CAAC,CAAC;AACrC,CAAC;AAED,SAAS,qBAAqB,CAAC,IAAc;IAC3C,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,IAAI,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;QACrC,MAAM,CAAC,GAAG,IAAI,CAAC,CAAC,CAAC,CAAC;QAClB,IAAI,CAAC,KAAK,WAAW;YAAE,OAAO,IAAI,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC;QAC1C,IAAI,CAAC,CAAC,UAAU,CAAC,YAAY,CAAC;YAAE,OAAO,CAAC,CAAC,KAAK,CAAC,YAAY,CAAC,MAAM,CAAC,CAAC;IACtE,CAAC;IACD,OAAO,SAAS,CAAC;AACnB,CAAC;AAED;;;;;;GAMG;AACH,SAAS,oBAAoB,CAAC,QAA4B,EAAE,IAAgB;IAC1E,IAAI,QAAQ,KAAK,SAAS;QAAE,OAAO,IAAI,CAAC;IACxC,MAAM,KAAK,GAAG,QAAQ,CAAC,IAAI,EAAE,CAAC;IAC9B,MAAM,IAAI,GAAG,CAAC,OAAe,EAAW,EAAE;QACxC,IAAI,6BAAa,CAAC,IAAI,CAAC,CAAC,OAAO,CAAC,aAAa,EAAE,OAAO,CAAC,CAAC;QACxD,OAAO,KAAK,CAAC;IACf,CAAC,CAAC;IACF,IAAI,CAAC,KAAK;QAAE,OAAO,IAAI,CAAC,wCAAwC,CAAC,CAAC;IAClE,gGAAgG;IAChG,qEAAqE;IACrE,IAAI,gBAAgB,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC;QACjC,OAAO,IAAI,CAAC,wGAAwG,CAAC,CAAC;IACxH,CAAC;IAED,IAAI,QAAyB,CAAC;IAC9B,IAAI,CAAC;QACH,QAAQ,GAAG,IAAA,2BAAY,GAAE,CAAC;IAC5B,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,IAAI,6BAAa,CAAC,IAAI,CAAC,CAAC,OAAO,CAAC,aAAa,EAAE,oCAAqC,KAAe,CAAC,OAAO,EAAE,CAAC,CAAC;QAC/G,OAAO,KAAK,CAAC;IACf,CAAC;IACD,MAAM,UAAU,GAAG,IAAA,8BAAe,EAAC,QAAQ,EAAE,KAAK,CAAC,CAAC;IACpD,IAAI,UAAU,CAAC,IAAI,KAAK,WAAW,EAAE,CAAC;QACpC,OAAO,IAAI,CAAC,4BAA4B,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,2CAA2C,CAAC,CAAC;IAC5G,CAAC;IACD,IAAI,UAAU,CAAC,IAAI,KAAK,WAAW,EAAE,CAAC;QACpC,MAAM,IAAI,GAAG,UAAU,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAChF,OAAO,IAAI,CAAC,GAAG,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,8BAA8B,IAAI,iCAAiC,CAAC,CAAC;IAC3G,CAAC;IACD,IAAA,qCAAkB,EAAC,UAAU,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC;IAClD,IAAI,OAAO,CAAC,GAAG,CAAC,cAAc,EAAE,IAAI,EAAE,EAAE,CAAC;QACvC,kFAAkF;QAClF,2EAA2E;QAC3E,SAAG,CAAC,IAAI,CAAC,aAAa,UAAU,CAAC,OAAO,CAAC,UAAU,+CAA+C,CAAC,CAAC;IACtG,CAAC;IACD,OAAO,IAAI,CAAC;AACd,CAAC;AAED,SAAgB,YAAY;IAC1B,MAAM,OAAO,GAAG,IAAI,mBAAO,EAAE,CAAC;IAC9B,OAAO;SACJ,IAAI,CAAC,UAAU,CAAC;SAChB,WAAW,CAAC,4FAA4F,CAAC;QAC1G,yCAAyC;QACzC,iEAAiE;SAChE,uBAAuB,EAAE;SACzB,OAAO,CAAC,GAAG,CAAC,OAAO,EAAE,WAAW,EAAE,2BAA2B,CAAC;SAC9D,MAAM,CAAC,iBAAiB,EAAE,wEAAwE,CAAC;SACnG,MAAM,CAAC,YAAY,EAAE,0EAA0E,CAAC;SAChG,MAAM,CAAC,sBAAsB,EAAE,+GAA+G,CAAC,CAAC;IAEnJ,IAAA,4BAAoB,EAAC,OAAO,CAAC,CAAC;IAC9B,IAAA,kCAAuB,EAAC,OAAO,CAAC,CAAC;IACjC,IAAA,kCAAuB,EAAC,OAAO,CAAC,CAAC;IACjC,IAAA,wBAAkB,EAAC,OAAO,CAAC,CAAC;IAC5B,IAAA,4CAA4B,EAAC,OAAO,CAAC,CAAC;IACtC,IAAA,8BAAqB,EAAC,OAAO,CAAC,CAAC;IAC/B,IAAA,8BAAqB,EAAC,OAAO,CAAC,CAAC;IAC/B,IAAA,0BAAmB,EAAC,OAAO,CAAC,CAAC;IAC7B,IAAA,4BAAoB,EAAC,OAAO,CAAC,CAAC;IAC9B,IAAA,wBAAkB,EAAC,OAAO,CAAC,CAAC;IAC5B,IAAA,kCAAuB,EAAC,OAAO,CAAC,CAAC;IACjC,IAAA,6BAAqB,EAAC,OAAO,CAAC,CAAC;IAC/B,IAAA,wCAA0B,EAAC,OAAO,CAAC,CAAC;IACpC,IAAA,0BAAmB,EAAC,OAAO,CAAC,CAAC;IAC7B,IAAA,6BAAkB,EAAC,OAAO,CAAC,CAAC;IAC5B,IAAA,mCAAwB,EAAC,OAAO,CAAC,CAAC;IAClC,IAAA,8BAAqB,EAAC,OAAO,CAAC,CAAC;IAC/B,IAAA,0BAAmB,EAAC,OAAO,CAAC,CAAC;IAC7B,IAAA,kCAAuB,EAAC,OAAO,CAAC,CAAC;IACjC,IAAA,sBAAiB,EAAC,OAAO,CAAC,CAAC;IAC3B,IAAA,oCAAwB,EAAC,OAAO,CAAC,CAAC;IAClC,IAAA,wBAAkB,EAAC,OAAO,CAAC,CAAC;IAC5B,IAAA,kCAAuB,EAAC,OAAO,CAAC,CAAC;IAEjC,wDAAwD;IACxD,kEAAkE;IAClE,+CAA+C;IAC/C,OAAO;SACJ,OAAO,CAAC,gBAAgB,CAAC;SACzB,WAAW,CAAC,4BAA4B,CAAC;SACzC,MAAM,CAAC,CAAC,IAAa,EAAE,EAAE;QACxB,IAAI,IAAI,KAAK,SAAS,EAAE,CAAC;YACvB,OAAO,CAAC,UAAU,EAAE,CAAC;YACrB,OAAO;QACT,CAAC;QACD,MAAM,MAAM,GAAG,OAAO,CAAC,QAAQ,CAAC,IAAI,CAClC,CAAC,SAAS,EAAE,EAAE,CAAC,SAAS,CAAC,IAAI,EAAE,KAAK,IAAI,IAAI,SAAS,CAAC,OAAO,EAAE,CAAC,QAAQ,CAAC,IAAI,CAAC,CAC/E,CAAC;QACF,IAAI,CAAC,MAAM,EAAE,CAAC;YACZ,OAAO,CAAC,KAAK,CAAC,8BAA8B,IAAI,GAAG,EAAE,EAAE,QAAQ,EAAE,CAAC,EAAE,IAAI,EAAE,4BAA4B,EAAE,CAAC,CAAC;YAC1G,OAAO;QACT,CAAC;QACD,MAAM,CAAC,UAAU,EAAE,CAAC;IACtB,CAAC,CAAC,CAAC;IAEL,oFAAoF;IACpF,mFAAmF;IACnF,qFAAqF;IACrF,0CAA0C;IAC1C,MAAM,kBAAkB,GAAG,CAAC,GAAY,EAAQ,EAAE;QAChD,yEAAyE;QACzE,wEAAwE;QACxE,kEAAkE;QAClE,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,IAAI,KAAK,UAAU,CAAC,EAAE,CAAC;YAC9D,GAAG,CAAC,MAAM,CAAC,iBAAiB,EAAE,wEAAwE,CAAC,CAAC;QAC1G,CAAC;QACD,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,IAAI,KAAK,YAAY,CAAC,EAAE,CAAC;YAChE,GAAG,CAAC,MAAM,CAAC,YAAY,EAAE,0EAA0E,CAAC,CAAC;QACvG,CAAC;QACD,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,IAAI,KAAK,WAAW,CAAC,EAAE,CAAC;YAC/D,GAAG,CAAC,MAAM,CAAC,sBAAsB,EAAE,+GAA+G,CAAC,CAAC;QACtJ,CAAC;QACD,KAAK,MAAM,KAAK,IAAI,GAAG,CAAC,QAAQ;YAAE,kBAAkB,CAAC,KAAK,CAAC,CAAC;IAC9D,CAAC,CAAC;IACF,KAAK,MAAM,GAAG,IAAI,OAAO,CAAC,QAAQ;QAAE,kBAAkB,CAAC,GAAG,CAAC,CAAC;IAE5D,OAAO,OAAO,CAAC;AACjB,CAAC;AAED,KAAK,UAAU,GAAG;IAChB,MAAM,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC;IAC1B,MAAM,IAAI,GAAG,gBAAgB,CAAC,IAAI,CAAC,CAAC;IACpC,MAAM,OAAO,GAAG,aAAa,CAAC,IAAI,CAAC,CAAC;IACpC,IAAA,oBAAc,EAAC,IAAI,KAAK,MAAM,CAAC,CAAC;IAChC,6EAA6E;IAC7E,IAAA,0BAAiB,EAAC,IAAI,KAAK,MAAM,IAAI,OAAO,CAAC,CAAC;IAE9C,IAAI,CAAC,oBAAoB,CAAC,qBAAqB,CAAC,IAAI,CAAC,EAAE,IAAI,CAAC;QAAE,OAAO;IAErE,MAAM,OAAO,GAAG,YAAY,EAAE,CAAC;IAE/B,IAAI,IAAI,KAAK,MAAM,EAAE,CAAC;QACpB,2EAA2E;QAC3E,yEAAyE;QACzE,4EAA4E;QAC5E,sEAAsE;QACtE,kEAAkE;QAClE,wEAAwE;QACxE,sDAAsD;QACtD,MAAM,WAAW,GAAG,CAAC,GAAY,EAAQ,EAAE;YACzC,GAAG,CAAC,YAAY,EAAE,CAAC;YACnB,KAAK,MAAM,KAAK,IAAI,GAAG,CAAC,QAAQ;gBAAE,WAAW,CAAC,KAAK,CAAC,CAAC;QACvD,CAAC,CAAC;QACF,WAAW,CAAC,OAAO,CAAC,CAAC;IACvB,CAAC;IAED,IAAI,CAAC;QACH,MAAM,OAAO,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC;IACjC,CAAC;IAAC,OAAO,GAAG,EAAE,CAAC;QACb,IAAI,GAAG,YAAY,0BAAc,EAAE,CAAC;YAClC,IAAI,GAAG,CAAC,IAAI,KAAK,yBAAyB,IAAI,GAAG,CAAC,IAAI,KAAK,mBAAmB,IAAI,GAAG,CAAC,QAAQ,KAAK,CAAC,EAAE,CAAC;gBACrG,OAAO;YACT,CAAC;YACD,IAAI,6BAAa,CAAC,IAAI,CAAC,CAAC,OAAO,CAAC,aAAa,EAAE,GAAG,CAAC,OAAO,IAAI,aAAa,CAAC,CAAC;YAC7E,OAAO;QACT,CAAC;QACD,yEAAyE;QACzE,mEAAmE;QACnE,IAAI,6BAAa,CAAC,IAAI,CAAC,CAAC,OAAO,CAAC,aAAa,EAAG,GAAa,CAAC,OAAO,IAAI,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC;IACxF,CAAC;AACH,CAAC;AAED,IAAI,OAAO,CAAC,IAAI,KAAK,MAAM,EAAE,CAAC;IAC5B,GAAG,EAAE,CAAC,KAAK,CAAC,CAAC,GAAG,EAAE,EAAE;QAClB,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,WAAY,GAAa,CAAC,OAAO,IAAI,CAAC,CAAC;QAC5D,OAAO,CAAC,QAAQ,GAAG,CAAC,CAAC;IACvB,CAAC,CAAC,CAAC;AACL,CAAC"}
|
|
@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.runAccounts = runAccounts;
|
|
4
4
|
exports.registerAccountsCommand = registerAccountsCommand;
|
|
5
5
|
const accountStore_1 = require("../store/accountStore");
|
|
6
|
+
const identityOverride_1 = require("../auth/identityOverride");
|
|
6
7
|
const credentialStore_1 = require("../store/credentialStore");
|
|
7
8
|
const tokenAuth_1 = require("../auth/tokenAuth");
|
|
8
9
|
const resultPrinter_1 = require("../output/resultPrinter");
|
|
@@ -25,7 +26,7 @@ function defaultReadCredential(account) {
|
|
|
25
26
|
}
|
|
26
27
|
const defaultDeps = {
|
|
27
28
|
listAccounts: accountStore_1.listAccounts,
|
|
28
|
-
|
|
29
|
+
persistedCurrentKey: accountStore_1.persistedCurrentKey,
|
|
29
30
|
readCredential: defaultReadCredential,
|
|
30
31
|
};
|
|
31
32
|
/**
|
|
@@ -38,7 +39,7 @@ function runAccounts(deps = defaultDeps) {
|
|
|
38
39
|
let current;
|
|
39
40
|
try {
|
|
40
41
|
accounts = deps.listAccounts();
|
|
41
|
-
current = deps.
|
|
42
|
+
current = deps.persistedCurrentKey();
|
|
42
43
|
}
|
|
43
44
|
catch (err) {
|
|
44
45
|
return { ok: false, kind: 'infra_error', message: `ๆ ๆณ่ฏปๅ่ดฆๅทๅ่กจ๏ผ${err.message}` };
|
|
@@ -65,13 +66,14 @@ function runAccounts(deps = defaultDeps) {
|
|
|
65
66
|
});
|
|
66
67
|
return {
|
|
67
68
|
ok: true,
|
|
68
|
-
result: { current:
|
|
69
|
+
result: { current, accounts: views, ...((0, identityOverride_1.accountOverrideKey)() ? { actingAs: (0, identityOverride_1.accountOverrideKey)() } : {}) },
|
|
69
70
|
humanMessage: views.length === 0
|
|
70
71
|
? 'no saved accounts โ run `supercli login` to add one'
|
|
71
72
|
: undefined,
|
|
72
73
|
};
|
|
73
74
|
}
|
|
74
75
|
function printHuman(current, views) {
|
|
76
|
+
const actingAs = (0, identityOverride_1.accountOverrideKey)();
|
|
75
77
|
if (views.length === 0) {
|
|
76
78
|
log_1.log.info('no saved accounts โ run `supercli login` to add one');
|
|
77
79
|
return;
|
|
@@ -84,6 +86,9 @@ function printHuman(current, views) {
|
|
|
84
86
|
const idLabel = v.email ?? v.credentialMasked ?? `user:${v.accountKey}`;
|
|
85
87
|
log_1.log.info(`${marker} ${v.accountKey} ${idLabel} [${v.env}]${orgLabel}${statusLabel}${healthLabel}`);
|
|
86
88
|
}
|
|
89
|
+
// `*` marks the persisted default; say separately when this call is acting as another.
|
|
90
|
+
if (actingAs)
|
|
91
|
+
log_1.log.info(`acting as ${actingAs} for this invocation (--account)`);
|
|
87
92
|
}
|
|
88
93
|
function registerAccountsCommand(program) {
|
|
89
94
|
program
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"accounts.js","sourceRoot":"","sources":["../../src/commands/accounts.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"accounts.js","sourceRoot":"","sources":["../../src/commands/accounts.ts"],"names":[],"mappings":"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"}
|
package/dist/commands/db.js
CHANGED
|
@@ -182,7 +182,15 @@ function requiredConnection(conn) {
|
|
|
182
182
|
}
|
|
183
183
|
const DB_KINDS = ['postgres', 'mysql'];
|
|
184
184
|
const DB_SSL_MODES = ['require', 'disable'];
|
|
185
|
-
|
|
185
|
+
/**
|
|
186
|
+
* Mirrors `is_valid_connection_name` server-side: 1-40 chars, lowercase alphanumerics and
|
|
187
|
+
* hyphens, and neither end may be a hyphen.
|
|
188
|
+
*
|
|
189
|
+
* ๐ด It was previously looser than the server (uppercase, underscores, 64 chars), which
|
|
190
|
+
* defeated the point of validating locally โ `My_Conn` sailed past this check and came back
|
|
191
|
+
* as a round-trip BAD_REQUEST.
|
|
192
|
+
*/
|
|
193
|
+
const CONNECTION_NAME_PATTERN = /^[a-z0-9](?:[a-z0-9-]{0,38}[a-z0-9])?$/;
|
|
186
194
|
function requiredChoice(raw, choices, flag) {
|
|
187
195
|
const value = trimmedValue(raw);
|
|
188
196
|
if (!value)
|
|
@@ -285,7 +293,7 @@ function validConnectionName(raw) {
|
|
|
285
293
|
return {
|
|
286
294
|
ok: false,
|
|
287
295
|
kind: 'usage_error',
|
|
288
|
-
message: 'connection name must
|
|
296
|
+
message: 'connection name must be 1-40 lowercase letters, digits or hyphens, and may not start or end with a hyphen',
|
|
289
297
|
};
|
|
290
298
|
}
|
|
291
299
|
return value;
|