layerbase 1.5.0 → 2.0.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 +42 -2
- package/dist/cli.js +17 -0
- package/dist/cli.js.map +1 -1
- package/dist/commands/clone.js +3 -2
- package/dist/commands/clone.js.map +1 -1
- package/dist/commands/cloud-branch.js +2 -2
- package/dist/commands/cloud-branch.js.map +1 -1
- package/dist/commands/cloud-write.js +2 -2
- package/dist/commands/cloud-write.js.map +1 -1
- package/dist/commands/connect.js +3 -2
- package/dist/commands/connect.js.map +1 -1
- package/dist/commands/connection-string.js +6 -0
- package/dist/commands/connection-string.js.map +1 -1
- package/dist/commands/interactive.js +2 -1
- package/dist/commands/interactive.js.map +1 -1
- package/dist/commands/ls.js +5 -2
- package/dist/commands/ls.js.map +1 -1
- package/dist/commands/promote.js +103 -6
- package/dist/commands/promote.js.map +1 -1
- package/dist/lib/cli-output.js +29 -4
- package/dist/lib/cli-output.js.map +1 -1
- package/dist/lib/cloud-api.js +21 -0
- package/dist/lib/cloud-api.js.map +1 -1
- package/dist/lib/engine-versions.js +206 -0
- package/dist/lib/engine-versions.js.map +1 -0
- package/dist/lib/format.js +13 -3
- package/dist/lib/format.js.map +1 -1
- package/dist/lib/promote-source.js +11 -0
- package/dist/lib/promote-source.js.map +1 -1
- package/dist/lib/redact.js +103 -0
- package/dist/lib/redact.js.map +1 -1
- package/package.json +1 -1
- package/skills/layerbase/SKILL.md +14 -1
package/README.md
CHANGED
|
@@ -94,12 +94,24 @@ These are the only verbs layerbase owns; everything else is spindb.
|
|
|
94
94
|
`<db>` accepts a cloud database id or its name. Add `--print` to
|
|
95
95
|
`cloud connect` to show the connection details instead of launching a client.
|
|
96
96
|
|
|
97
|
+
**Connection strings print redacted.** Anywhere the CLI prints one - `cloud ls
|
|
98
|
+
--json`, `cloud create`, `cloud branch`, `promote`, error messages - the
|
|
99
|
+
password is replaced with `****` (`postgresql://shop:****@host:5432/shop`), so a
|
|
100
|
+
transcript, a CI log or a support paste carries no working credential. Pass
|
|
101
|
+
`--show-secrets` (alias `--reveal`) to print them in full. The same masking
|
|
102
|
+
covers the discrete credential fields the API returns beside a connection
|
|
103
|
+
string (`password`, `restToken`, `psPassword`). The one exception is
|
|
104
|
+
`cloud connection-string` (alias `url`), the deliberate escape hatch for piping
|
|
105
|
+
a credential into an app: it always prints in full.
|
|
106
|
+
|
|
97
107
|
`cloud ls` lists databases **and their branches** in one table. When the account
|
|
98
108
|
has branches, a `PARENT` column names each branch's parent database (`-` on a
|
|
99
109
|
primary) and a footer splits the rows, because branches do not count toward your
|
|
100
110
|
plan's database limit: never read the row count as your database count. In
|
|
101
111
|
`--json`, a branch is any row with `parentId` set (`parentName` names its
|
|
102
|
-
parent); rows are passed through from the API
|
|
112
|
+
parent); rows are passed through from the API with the connection-string
|
|
113
|
+
password and the discrete credential fields (`password`, `restToken`,
|
|
114
|
+
`psPassword`) masked as `****` (`--show-secrets` keeps the real values).
|
|
103
115
|
`lbase cloud` with no subcommand prints the cloud help. Cloud mutation commands
|
|
104
116
|
(`create`, `delete`, `start`, `stop`, `branch`) run against the cloud API and
|
|
105
117
|
need an API key (see [Headless auth](#headless-auth-ci-and-agents)); every one
|
|
@@ -163,6 +175,29 @@ database, the connection string, the dashboard URL, and the bytes uploaded.
|
|
|
163
175
|
database is created, promote says the database exists and is empty and prints the
|
|
164
176
|
exact retry and delete commands; it never deletes anything on your behalf.
|
|
165
177
|
|
|
178
|
+
**The cloud database runs your local version**, not whatever the cloud happens to
|
|
179
|
+
default to. A spindb container reports the exact binary it installed (`18.6.0`),
|
|
180
|
+
and the cloud offers the identifiers it will create (`18`, `11.4`, `3`,
|
|
181
|
+
`19.0.0-beta.3`), so promote matches the local version against the engine's real
|
|
182
|
+
offer list and names the result before it creates anything:
|
|
183
|
+
|
|
184
|
+
```
|
|
185
|
+
Local PostgreSQL 18.6.0 maps to cloud PostgreSQL 18: Layerbase Cloud names its
|
|
186
|
+
versions by release line, so this is the same line at its current release.
|
|
187
|
+
```
|
|
188
|
+
|
|
189
|
+
When your version is no longer offered, promote says so and uses the newest
|
|
190
|
+
stable version on offer (never a prerelease, unless you are running one
|
|
191
|
+
yourself):
|
|
192
|
+
|
|
193
|
+
```
|
|
194
|
+
Local PostgreSQL 15.4 is no longer offered in cloud; creating PostgreSQL 18.
|
|
195
|
+
Check your app against it before you switch over.
|
|
196
|
+
```
|
|
197
|
+
|
|
198
|
+
A source with no version of its own (a bare `.sqlite`/`.duckdb` file, a `.sql`
|
|
199
|
+
dump) is left to the cloud default, silently, as before.
|
|
200
|
+
|
|
166
201
|
The create request records how the database was made: `promote` (with the kind
|
|
167
202
|
of source it came from, one of `sqlite`, `duckdb`, `sql-dump`, `spindb`) or a
|
|
168
203
|
plain `cli` create. That is the whole payload - your file paths, filenames, and
|
|
@@ -257,7 +292,9 @@ env:
|
|
|
257
292
|
steps:
|
|
258
293
|
- run: npm i -g layerbase
|
|
259
294
|
- run: |
|
|
260
|
-
|
|
295
|
+
# --show-secrets: without it connectionString comes back with the
|
|
296
|
+
# password masked (****) and is not connectable.
|
|
297
|
+
DB=$(lbase cloud create "ci-$GITHUB_RUN_ID" --engine postgresql --ttl 2h --json --show-secrets)
|
|
261
298
|
echo "DATABASE_URL=$(echo "$DB" | jq -r .connectionString)" >> "$GITHUB_ENV"
|
|
262
299
|
- run: npm test
|
|
263
300
|
- if: always()
|
|
@@ -322,6 +359,9 @@ deleted on exit. The password is never an argv value.
|
|
|
322
359
|
| Redis / Valkey | `REDISCLI_AUTH` environment variable |
|
|
323
360
|
| Other engines | `layerbase cloud connection-string` / `--print` |
|
|
324
361
|
|
|
362
|
+
Everything the CLI PRINTS is redacted by default for the same reason: see
|
|
363
|
+
[Connection strings print redacted](#cloud-account) above.
|
|
364
|
+
|
|
325
365
|
Connecting requires the engine's native client (`psql`, `mysql`, `redis-cli`)
|
|
326
366
|
on your `PATH`.
|
|
327
367
|
|
package/dist/cli.js
CHANGED
|
@@ -10,6 +10,7 @@ import { runSpindb } from './lib/run-spindb.js';
|
|
|
10
10
|
import { registeredCommandNames } from './lib/commands.js';
|
|
11
11
|
import { getVersion } from './lib/version.js';
|
|
12
12
|
import { configureCloudAuth } from './lib/cloud-api.js';
|
|
13
|
+
import { setRevealSecrets } from './lib/cli-output.js';
|
|
13
14
|
import { runWhoami } from './commands/whoami-run.js';
|
|
14
15
|
import { runKeyLogin } from './commands/key-login.js';
|
|
15
16
|
import { runCreate, runDestroy, runStart, runStop, } from './commands/cloud-write.js';
|
|
@@ -51,6 +52,11 @@ const UNIFIED_HELP = `
|
|
|
51
52
|
browser: calls go straight to the cloud API. "layerbase login --api-key
|
|
52
53
|
<key>" saves it. Create a key at https://layerbase.com/cloud/settings.
|
|
53
54
|
|
|
55
|
+
Secrets
|
|
56
|
+
Connection strings and passwords print redacted (user:****@host). Pass
|
|
57
|
+
--show-secrets (alias --reveal) to print them in full. "cloud
|
|
58
|
+
connection-string" is the deliberate escape hatch and always prints in full.
|
|
59
|
+
|
|
54
60
|
Notes
|
|
55
61
|
bare = spindb, cloud = "lbase cloud <verb>"
|
|
56
62
|
"lbase --help" / "--version" show this help / the layerbase version.
|
|
@@ -86,6 +92,10 @@ const CLOUD_HELP = `
|
|
|
86
92
|
|
|
87
93
|
"<db>" accepts a cloud database id or its name. Set LAYERBASE_API_KEY (or pass
|
|
88
94
|
--api-key) to run these headlessly with no browser login.
|
|
95
|
+
|
|
96
|
+
Connection strings print with the password redacted (user:****@host). Pass
|
|
97
|
+
--show-secrets (alias --reveal) to print them in full. "cloud
|
|
98
|
+
connection-string" is the deliberate escape hatch and always prints in full.
|
|
89
99
|
`;
|
|
90
100
|
const MIGRATE_HELP = `
|
|
91
101
|
layerbase migrate - import an external database INTO a cloud database
|
|
@@ -341,11 +351,18 @@ const cli = meow(UNIFIED_HELP, {
|
|
|
341
351
|
token: { type: 'string' },
|
|
342
352
|
url: { type: 'string' },
|
|
343
353
|
dbPassword: { type: 'string' },
|
|
354
|
+
// Print connection strings with their password instead of the default
|
|
355
|
+
// `****` (issue #53). `--reveal` is the short alias.
|
|
356
|
+
showSecrets: { type: 'boolean', default: false },
|
|
357
|
+
reveal: { type: 'boolean', default: false },
|
|
344
358
|
},
|
|
345
359
|
});
|
|
346
360
|
// The --api-key flag wins over LAYERBASE_API_KEY and the stored key, and
|
|
347
361
|
// --api-url over the stored host. Set once before any cloud command runs.
|
|
348
362
|
configureCloudAuth({ apiKey: cli.flags.apiKey, apiUrl: cli.flags.apiUrl });
|
|
363
|
+
// Redaction is the default for everything printed from here on; this is the
|
|
364
|
+
// single opt-out, set before any command runs (see lib/cli-output).
|
|
365
|
+
setRevealSecrets(Boolean(cli.flags.showSecrets || cli.flags.reveal));
|
|
349
366
|
const EXEC_COMMANDS = new Set(['psql', 'redis-cli', 'mysql']);
|
|
350
367
|
const [command = '', ...rest] = cli.input;
|
|
351
368
|
if (command === 'help') {
|
package/dist/cli.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cli.js","sourceRoot":"","sources":["../src/cli.tsx"],"names":[],"mappings":";AAAA,OAAO,IAAI,MAAM,MAAM,CAAA;AACvB,OAAO,EAAE,MAAM,EAAE,MAAM,KAAK,CAAA;AAC5B,OAAO,EAAE,GAAG,EAAE,MAAM,UAAU,CAAA;AAC9B,OAAO,EAAE,OAAO,EAAE,MAAM,oBAAoB,CAAA;AAC5C,OAAO,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAA;AACvD,OAAO,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAA;AAC3C,OAAO,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAA;AAC5C,OAAO,EAAE,sBAAsB,EAAE,MAAM,gBAAgB,CAAA;AACvD,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAA;AAC1C,OAAO,EAAE,kBAAkB,EAAE,MAAM,iBAAiB,CAAA;AACpD,OAAO,EAAE,SAAS,EAAE,MAAM,uBAAuB,CAAA;AACjD,OAAO,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAA;AAClD,OAAO,EACL,SAAS,EACT,UAAU,EACV,QAAQ,EACR,OAAO,GACR,MAAM,wBAAwB,CAAA;AAC/B,OAAO,EAAE,SAAS,EAAE,MAAM,yBAAyB,CAAA;AACnD,OAAO,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAA;AACpD,OAAO,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAA;AAC/C,OAAO,EAAE,SAAS,EAAE,MAAM,mBAAmB,CAAA;AAC7C,OAAO,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAA;AAG/C,MAAM,OAAO,GAAG,UAAU,EAAE,CAAA;AAE5B,MAAM,YAAY,GAAG;cACP,OAAO
|
|
1
|
+
{"version":3,"file":"cli.js","sourceRoot":"","sources":["../src/cli.tsx"],"names":[],"mappings":"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"}
|
package/dist/commands/clone.js
CHANGED
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import { getConnectionInfo } from '../lib/cloud-api.js';
|
|
2
2
|
import { buildConnectionString } from '../lib/format.js';
|
|
3
3
|
import { runSpindb, spindbExists } from '../lib/run-spindb.js';
|
|
4
|
+
import { forOutput } from '../lib/cli-output.js';
|
|
4
5
|
// spindb reads the remote connection string from this env var (--from-env), so
|
|
5
6
|
// the password is never on argv / in shell history.
|
|
6
7
|
const CLONE_ENV = 'LAYERBASE_CLONE_URL';
|
|
@@ -16,7 +17,7 @@ export async function runClone(options) {
|
|
|
16
17
|
info = await getConnectionInfo(dbRef);
|
|
17
18
|
}
|
|
18
19
|
catch (error) {
|
|
19
|
-
process.stderr.write(`${error.message}\n`);
|
|
20
|
+
process.stderr.write(`${forOutput(error.message)}\n`);
|
|
20
21
|
return 1;
|
|
21
22
|
}
|
|
22
23
|
let connectionString;
|
|
@@ -24,7 +25,7 @@ export async function runClone(options) {
|
|
|
24
25
|
connectionString = buildConnectionString(info);
|
|
25
26
|
}
|
|
26
27
|
catch (error) {
|
|
27
|
-
process.stderr.write(`${error.message}\n`);
|
|
28
|
+
process.stderr.write(`${forOutput(error.message)}\n`);
|
|
28
29
|
return 1;
|
|
29
30
|
}
|
|
30
31
|
const localName = options.localName ?? info.database ?? dbRef;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"clone.js","sourceRoot":"","sources":["../../src/commands/clone.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,iBAAiB,CAAA;AACnD,OAAO,EAAE,qBAAqB,EAAE,MAAM,cAAc,CAAA;AACpD,OAAO,EAAE,SAAS,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAA;
|
|
1
|
+
{"version":3,"file":"clone.js","sourceRoot":"","sources":["../../src/commands/clone.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { createBranch, deleteBranch, listBranches, resetBranch, resolveDatabaseId, } from '../lib/cloud-api.js';
|
|
2
|
-
import { reportError, writeJson } from '../lib/cli-output.js';
|
|
2
|
+
import { forOutput, reportError, writeJson } from '../lib/cli-output.js';
|
|
3
3
|
const BRANCH_USAGE = 'Usage:\n' +
|
|
4
4
|
' layerbase cloud branch <db> <branch-name> Create/reuse a branch\n' +
|
|
5
5
|
' layerbase cloud branch reset <db> <name> Re-fork a branch from parent\n' +
|
|
@@ -8,7 +8,7 @@ const BRANCH_USAGE = 'Usage:\n' +
|
|
|
8
8
|
function printBranch(branch) {
|
|
9
9
|
process.stdout.write(`${branch.name} (${branch.status})\n`);
|
|
10
10
|
if (branch.connectionString) {
|
|
11
|
-
process.stdout.write(`${branch.connectionString}\n`);
|
|
11
|
+
process.stdout.write(`${forOutput(branch.connectionString)}\n`);
|
|
12
12
|
}
|
|
13
13
|
}
|
|
14
14
|
async function runBranchCreate(db, name, json, action) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cloud-branch.js","sourceRoot":"","sources":["../../src/commands/cloud-branch.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,YAAY,EACZ,YAAY,EACZ,YAAY,EACZ,WAAW,EACX,iBAAiB,GAClB,MAAM,iBAAiB,CAAA;AAGxB,OAAO,EAAE,WAAW,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAA;
|
|
1
|
+
{"version":3,"file":"cloud-branch.js","sourceRoot":"","sources":["../../src/commands/cloud-branch.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { createDatabase, destroyDatabase, resolveDatabaseId, startDatabase, stopDatabase, } from '../lib/cloud-api.js';
|
|
2
2
|
import { parseTtlToHours } from '../lib/duration.js';
|
|
3
|
-
import { reportError, writeJson } from '../lib/cli-output.js';
|
|
3
|
+
import { forOutput, reportError, writeJson } from '../lib/cli-output.js';
|
|
4
4
|
import { confirm } from '../lib/confirm.js';
|
|
5
5
|
function expiresAtOf(result) {
|
|
6
6
|
return result.expiresAt ?? result.expires_at ?? null;
|
|
@@ -58,7 +58,7 @@ export async function runCreate(options) {
|
|
|
58
58
|
process.stdout.write(`Expires: ${expiresAt}\n`);
|
|
59
59
|
}
|
|
60
60
|
if (result.connectionString) {
|
|
61
|
-
process.stdout.write(`\n${result.connectionString}\n`);
|
|
61
|
+
process.stdout.write(`\n${forOutput(result.connectionString)}\n`);
|
|
62
62
|
}
|
|
63
63
|
return 0;
|
|
64
64
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cloud-write.js","sourceRoot":"","sources":["../../src/commands/cloud-write.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,cAAc,EACd,eAAe,EACf,iBAAiB,EACjB,aAAa,EACb,YAAY,GACb,MAAM,iBAAiB,CAAA;AAExB,OAAO,EAAE,eAAe,EAAE,MAAM,gBAAgB,CAAA;AAChD,OAAO,EAAE,WAAW,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAA;
|
|
1
|
+
{"version":3,"file":"cloud-write.js","sourceRoot":"","sources":["../../src/commands/cloud-write.ts"],"names":[],"mappings":"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"}
|
package/dist/commands/connect.js
CHANGED
|
@@ -5,6 +5,7 @@ import { getConnectionInfo } from '../lib/cloud-api.js';
|
|
|
5
5
|
import { buildLaunchPlan } from '../lib/engines.js';
|
|
6
6
|
import { runClient } from '../lib/launch.js';
|
|
7
7
|
import { printConnectionInfo } from '../lib/format.js';
|
|
8
|
+
import { forOutput } from '../lib/cli-output.js';
|
|
8
9
|
// Resolve a database and hand the TTY to its native client. Returns the client's
|
|
9
10
|
// exit code (or 1 on a resolve/launch error) WITHOUT exiting the process, so it
|
|
10
11
|
// is reusable from both the CLI path and the interactive menu. Ink renders only
|
|
@@ -19,7 +20,7 @@ export async function connectToDatabase(options) {
|
|
|
19
20
|
}
|
|
20
21
|
catch (error) {
|
|
21
22
|
spinner.unmount();
|
|
22
|
-
process.stderr.write(`${error.message}\n`);
|
|
23
|
+
process.stderr.write(`${forOutput(error.message)}\n`);
|
|
23
24
|
return 1;
|
|
24
25
|
}
|
|
25
26
|
spinner.unmount();
|
|
@@ -32,7 +33,7 @@ export async function connectToDatabase(options) {
|
|
|
32
33
|
plan = buildLaunchPlan({ info, command });
|
|
33
34
|
}
|
|
34
35
|
catch (error) {
|
|
35
|
-
process.stderr.write(`${error.message}\n`);
|
|
36
|
+
process.stderr.write(`${forOutput(error.message)}\n`);
|
|
36
37
|
return 1;
|
|
37
38
|
}
|
|
38
39
|
return runClient(plan);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"connect.js","sourceRoot":"","sources":["../../src/commands/connect.tsx"],"names":[],"mappings":";AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,KAAK,CAAA;AAC5B,OAAO,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAA;AAC5C,OAAO,EAAE,iBAAiB,EAAE,MAAM,iBAAiB,CAAA;AACnD,OAAO,EAAE,eAAe,EAAE,MAAM,eAAe,CAAA;AAC/C,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAA;AACxC,OAAO,EAAE,mBAAmB,EAAE,MAAM,cAAc,CAAA;
|
|
1
|
+
{"version":3,"file":"connect.js","sourceRoot":"","sources":["../../src/commands/connect.tsx"],"names":[],"mappings":";AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,KAAK,CAAA;AAC5B,OAAO,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAA;AAC5C,OAAO,EAAE,iBAAiB,EAAE,MAAM,iBAAiB,CAAA;AACnD,OAAO,EAAE,eAAe,EAAE,MAAM,eAAe,CAAA;AAC/C,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAA;AACxC,OAAO,EAAE,mBAAmB,EAAE,MAAM,cAAc,CAAA;AAElD,OAAO,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAA;AAQ5C,iFAAiF;AACjF,gFAAgF;AAChF,gFAAgF;AAChF,+EAA+E;AAC/E,2BAA2B;AAC3B,MAAM,CAAC,KAAK,UAAU,iBAAiB,CAAC,OAIvC;IACC,MAAM,EAAE,KAAK,EAAE,OAAO,EAAE,KAAK,EAAE,GAAG,OAAO,CAAA;IAEzC,MAAM,OAAO,GAAG,MAAM,CAAC,KAAC,UAAU,IAAC,KAAK,EAAE,aAAa,KAAK,KAAK,GAAI,CAAC,CAAA;IACtE,IAAI,IAAI,CAAA;IACR,IAAI,CAAC;QACH,IAAI,GAAG,MAAM,iBAAiB,CAAC,KAAK,CAAC,CAAA;IACvC,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,OAAO,CAAC,OAAO,EAAE,CAAA;QACjB,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,GAAG,SAAS,CAAE,KAAe,CAAC,OAAO,CAAC,IAAI,CAAC,CAAA;QAChE,OAAO,CAAC,CAAA;IACV,CAAC;IACD,OAAO,CAAC,OAAO,EAAE,CAAA;IAEjB,IAAI,KAAK,EAAE,CAAC;QACV,mBAAmB,CAAC,IAAI,CAAC,CAAA;QACzB,OAAO,CAAC,CAAA;IACV,CAAC;IAED,IAAI,IAAI,CAAA;IACR,IAAI,CAAC;QACH,IAAI,GAAG,eAAe,CAAC,EAAE,IAAI,EAAE,OAAO,EAAE,CAAC,CAAA;IAC3C,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,GAAG,SAAS,CAAE,KAAe,CAAC,OAAO,CAAC,IAAI,CAAC,CAAA;QAChE,OAAO,CAAC,CAAA;IACV,CAAC;IAED,OAAO,SAAS,CAAC,IAAI,CAAC,CAAA;AACxB,CAAC;AAED,gFAAgF;AAChF,MAAM,CAAC,KAAK,UAAU,OAAO,CAAC,OAAoB;IAChD,MAAM,EAAE,OAAO,EAAE,KAAK,EAAE,GAAG,OAAO,CAAA;IAClC,MAAM,KAAK,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAA;IAE7B,IAAI,CAAC,KAAK,EAAE,CAAC;QACX,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,oBAAoB,OAAO,SAAS,CAAC,CAAA;QAC1D,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAA;IACjB,CAAC;IAED,MAAM,IAAI,GAAG,MAAM,iBAAiB,CAAC,EAAE,KAAK,EAAE,OAAO,EAAE,KAAK,EAAE,KAAK,CAAC,KAAK,EAAE,CAAC,CAAA;IAC5E,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;AACpB,CAAC"}
|
|
@@ -6,6 +6,12 @@ import { reportError } from '../lib/cli-output.js';
|
|
|
6
6
|
// Opt-in escape hatch: prints the full connection string (with password) to
|
|
7
7
|
// stdout for piping into an app. With --json it prints { connectionString }.
|
|
8
8
|
// The secure path is `layerbase connect`.
|
|
9
|
+
//
|
|
10
|
+
// This is the ONE surface exempt from the default redaction added for issue
|
|
11
|
+
// #53: the user typed the command whose entire contract is "hand me the
|
|
12
|
+
// credential", and `printConnectionInfo` points them here for exactly that.
|
|
13
|
+
// Everything else redacts, which is why this writes stdout directly instead of
|
|
14
|
+
// going through writeJson - do not "tidy" it onto the shared writer.
|
|
9
15
|
export function ConnectionString({ dbRef, json, }) {
|
|
10
16
|
const { exit } = useApp();
|
|
11
17
|
const [state, setState] = useState({ kind: 'loading' });
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"connection-string.js","sourceRoot":"","sources":["../../src/commands/connection-string.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAA;AAC3C,OAAO,EAAE,MAAM,EAAE,MAAM,KAAK,CAAA;AAC5B,OAAO,EAAE,iBAAiB,EAAE,MAAM,iBAAiB,CAAA;AACnD,OAAO,EAAE,qBAAqB,EAAE,MAAM,cAAc,CAAA;AACpD,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAA;AAI9C,4EAA4E;AAC5E,6EAA6E;AAC7E,0CAA0C;AAC1C,MAAM,UAAU,gBAAgB,CAAC,EAC/B,KAAK,EACL,IAAI,GAIL;IACC,MAAM,EAAE,IAAI,EAAE,GAAG,MAAM,EAAE,CAAA;IACzB,MAAM,CAAC,KAAK,EAAE,QAAQ,CAAC,GAAG,QAAQ,CAAQ,EAAE,IAAI,EAAE,SAAS,EAAE,CAAC,CAAA;IAE9D,SAAS,CAAC,GAAG,EAAE;QACb,KAAK,UAAU,6BAA6B;YAC1C,IAAI,CAAC,KAAK,EAAE,CAAC;gBACX,OAAO,CAAC,QAAQ,GAAG,WAAW,CAC5B,IAAI,KAAK,CAAC,+CAA+C,CAAC,EAC1D,IAAI,CACL,CAAA;gBACD,QAAQ,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,CAAC,CAAA;gBAC1B,OAAM;YACR,CAAC;YACD,IAAI,CAAC;gBACH,MAAM,IAAI,GAAG,MAAM,iBAAiB,CAAC,KAAK,CAAC,CAAA;gBAC3C,MAAM,gBAAgB,GAAG,qBAAqB,CAAC,IAAI,CAAC,CAAA;gBACpD,IAAI,IAAI,EAAE,CAAC;oBACT,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,GAAG,IAAI,CAAC,SAAS,CAAC,EAAE,gBAAgB,EAAE,CAAC,IAAI,CAAC,CAAA;gBACnE,CAAC;qBAAM,CAAC;oBACN,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,GAAG,gBAAgB,IAAI,CAAC,CAAA;gBAC/C,CAAC;gBACD,QAAQ,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,CAAC,CAAA;YAC5B,CAAC;YAAC,OAAO,KAAK,EAAE,CAAC;gBACf,OAAO,CAAC,QAAQ,GAAG,WAAW,CAAC,KAAK,EAAE,IAAI,CAAC,CAAA;gBAC3C,QAAQ,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,CAAC,CAAA;YAC5B,CAAC;QACH,CAAC;QACD,6BAA6B,EAAE,CAAA;IACjC,CAAC,EAAE,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC,CAAA;IAEjB,SAAS,CAAC,GAAG,EAAE;QACb,IAAI,KAAK,CAAC,IAAI,KAAK,SAAS,EAAE,CAAC;YAC7B,IAAI,EAAE,CAAA;QACR,CAAC;IACH,CAAC,EAAE,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC,CAAA;IAEjB,OAAO,IAAI,CAAA;AACb,CAAC"}
|
|
1
|
+
{"version":3,"file":"connection-string.js","sourceRoot":"","sources":["../../src/commands/connection-string.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAA;AAC3C,OAAO,EAAE,MAAM,EAAE,MAAM,KAAK,CAAA;AAC5B,OAAO,EAAE,iBAAiB,EAAE,MAAM,iBAAiB,CAAA;AACnD,OAAO,EAAE,qBAAqB,EAAE,MAAM,cAAc,CAAA;AACpD,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAA;AAI9C,4EAA4E;AAC5E,6EAA6E;AAC7E,0CAA0C;AAC1C,EAAE;AACF,4EAA4E;AAC5E,wEAAwE;AACxE,4EAA4E;AAC5E,+EAA+E;AAC/E,qEAAqE;AACrE,MAAM,UAAU,gBAAgB,CAAC,EAC/B,KAAK,EACL,IAAI,GAIL;IACC,MAAM,EAAE,IAAI,EAAE,GAAG,MAAM,EAAE,CAAA;IACzB,MAAM,CAAC,KAAK,EAAE,QAAQ,CAAC,GAAG,QAAQ,CAAQ,EAAE,IAAI,EAAE,SAAS,EAAE,CAAC,CAAA;IAE9D,SAAS,CAAC,GAAG,EAAE;QACb,KAAK,UAAU,6BAA6B;YAC1C,IAAI,CAAC,KAAK,EAAE,CAAC;gBACX,OAAO,CAAC,QAAQ,GAAG,WAAW,CAC5B,IAAI,KAAK,CAAC,+CAA+C,CAAC,EAC1D,IAAI,CACL,CAAA;gBACD,QAAQ,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,CAAC,CAAA;gBAC1B,OAAM;YACR,CAAC;YACD,IAAI,CAAC;gBACH,MAAM,IAAI,GAAG,MAAM,iBAAiB,CAAC,KAAK,CAAC,CAAA;gBAC3C,MAAM,gBAAgB,GAAG,qBAAqB,CAAC,IAAI,CAAC,CAAA;gBACpD,IAAI,IAAI,EAAE,CAAC;oBACT,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,GAAG,IAAI,CAAC,SAAS,CAAC,EAAE,gBAAgB,EAAE,CAAC,IAAI,CAAC,CAAA;gBACnE,CAAC;qBAAM,CAAC;oBACN,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,GAAG,gBAAgB,IAAI,CAAC,CAAA;gBAC/C,CAAC;gBACD,QAAQ,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,CAAC,CAAA;YAC5B,CAAC;YAAC,OAAO,KAAK,EAAE,CAAC;gBACf,OAAO,CAAC,QAAQ,GAAG,WAAW,CAAC,KAAK,EAAE,IAAI,CAAC,CAAA;gBAC3C,QAAQ,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,CAAC,CAAA;YAC5B,CAAC;QACH,CAAC;QACD,6BAA6B,EAAE,CAAA;IACjC,CAAC,EAAE,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC,CAAA;IAEjB,SAAS,CAAC,GAAG,EAAE;QACb,IAAI,KAAK,CAAC,IAAI,KAAK,SAAS,EAAE,CAAC;YAC7B,IAAI,EAAE,CAAA;QACR,CAAC;IACH,CAAC,EAAE,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC,CAAA;IAEjB,OAAO,IAAI,CAAA;AACb,CAAC"}
|
|
@@ -13,6 +13,7 @@ import { runSpindb } from '../lib/run-spindb.js';
|
|
|
13
13
|
import { connectToDatabase } from '../commands/connect.js';
|
|
14
14
|
import { runClone } from '../commands/clone.js';
|
|
15
15
|
import { App } from '../ui/app.js';
|
|
16
|
+
import { forOutput } from '../lib/cli-output.js';
|
|
16
17
|
const ACCENT_ANSI = '\x1b[38;2;124;156;255m';
|
|
17
18
|
const DIM = '\x1b[2m';
|
|
18
19
|
const RESET = '\x1b[0m';
|
|
@@ -75,7 +76,7 @@ async function selectDatabase() {
|
|
|
75
76
|
}
|
|
76
77
|
catch (error) {
|
|
77
78
|
spinner.unmount();
|
|
78
|
-
process.stderr.write(`${error.message}\n`);
|
|
79
|
+
process.stderr.write(`${forOutput(error.message)}\n`);
|
|
79
80
|
return null;
|
|
80
81
|
}
|
|
81
82
|
spinner.unmount();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"interactive.js","sourceRoot":"","sources":["../../src/commands/interactive.tsx"],"names":[],"mappings":";AAAA,OAAO,EAAE,MAAM,EAAE,GAAG,EAAE,IAAI,EAAE,MAAM,KAAK,CAAA;AACvC,OAAO,EAAE,MAAM,EAAE,MAAM,aAAa,CAAA;AACpC,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAA;AAEhC,OAAO,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAA;AAC5C,OAAO,EAAE,OAAO,EAAE,MAAM,eAAe,CAAA;AACvC,OAAO,EAAE,eAAe,EAAE,MAAM,cAAc,CAAA;AAE9C,OAAO,EAAE,iBAAiB,EAAE,MAAM,aAAa,CAAA;AAC/C,OAAO,EAAE,YAAY,EAAE,iBAAiB,EAAE,MAAM,gBAAgB,CAAA;AAChE,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAA;AAE/C,OAAO,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAA;AAChD,OAAO,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAA;AAC5C,OAAO,EAAE,iBAAiB,EAAE,MAAM,oBAAoB,CAAA;AACtD,OAAO,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAA;AAC3C,OAAO,EAAE,GAAG,EAAE,MAAM,UAAU,CAAA;
|
|
1
|
+
{"version":3,"file":"interactive.js","sourceRoot":"","sources":["../../src/commands/interactive.tsx"],"names":[],"mappings":"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"}
|
package/dist/commands/ls.js
CHANGED
|
@@ -3,7 +3,7 @@ import { useEffect, useState } from 'react';
|
|
|
3
3
|
import { Box, Text, useApp } from 'ink';
|
|
4
4
|
import Spinner from 'ink-spinner';
|
|
5
5
|
import { listDatabases } from '../lib/cloud-api.js';
|
|
6
|
-
import { reportError } from '../lib/cli-output.js';
|
|
6
|
+
import { reportError, writeJson } from '../lib/cli-output.js';
|
|
7
7
|
import { hasBranches, parentLabel, summaryLine } from '../lib/database-list.js';
|
|
8
8
|
const STATUS_COLOR = {
|
|
9
9
|
running: 'green',
|
|
@@ -45,7 +45,10 @@ export function List({ json }) {
|
|
|
45
45
|
try {
|
|
46
46
|
const databases = await listDatabases();
|
|
47
47
|
if (json) {
|
|
48
|
-
|
|
48
|
+
// writeJson, not a raw stringify: the cloud list carries each
|
|
49
|
+
// database's connection string, password and all, and this is the
|
|
50
|
+
// output issue #53 was filed about.
|
|
51
|
+
writeJson(databases);
|
|
49
52
|
}
|
|
50
53
|
setState({ kind: 'ready', databases });
|
|
51
54
|
}
|
package/dist/commands/ls.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ls.js","sourceRoot":"","sources":["../../src/commands/ls.tsx"],"names":[],"mappings":";AAAA,OAAO,EAAE,SAAS,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAA;AAC3C,OAAO,EAAE,GAAG,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,KAAK,CAAA;AACvC,OAAO,OAAO,MAAM,aAAa,CAAA;AACjC,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAA;AAE/C,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAA;
|
|
1
|
+
{"version":3,"file":"ls.js","sourceRoot":"","sources":["../../src/commands/ls.tsx"],"names":[],"mappings":"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"}
|
package/dist/commands/promote.js
CHANGED
|
@@ -1,13 +1,14 @@
|
|
|
1
1
|
import { mkdtempSync, rmSync, statSync } from 'node:fs';
|
|
2
2
|
import { tmpdir } from 'node:os';
|
|
3
3
|
import { join, resolve } from 'node:path';
|
|
4
|
-
import { createDatabase, getConnectionInfo, listDatabases, webAppBaseUrl, } from '../lib/cloud-api.js';
|
|
4
|
+
import { CloudApiError, createDatabase, getConnectionInfo, listDatabases, listEngines, webAppBaseUrl, } from '../lib/cloud-api.js';
|
|
5
5
|
import { captureSpindb, parseLastJson } from '../lib/run-spindb.js';
|
|
6
6
|
import { confirm, decideConfirmation } from '../lib/confirm.js';
|
|
7
|
-
import { reportError, writeJson } from '../lib/cli-output.js';
|
|
7
|
+
import { forOutput, reportError, writeJson } from '../lib/cli-output.js';
|
|
8
8
|
import { formatBytes, uploadAndImport } from '../commands/import.js';
|
|
9
9
|
import { writeEnvAssignment } from '../lib/env-file.js';
|
|
10
|
-
import { classifySource, deriveDatabaseName, describeSource, mapTargetEngine, parseSqliteTarget, probePath, } from '../lib/promote-source.js';
|
|
10
|
+
import { classifySource, deriveDatabaseName, describeSource, mapTargetEngine, parseSqliteTarget, probePath, sourceEngineVersion, } from '../lib/promote-source.js';
|
|
11
|
+
import { creatableVersions, isUnsupportedVersionMessage, parseSupportedVersionsFromError, promoteVersionLine, resolvePromoteVersion, versionMajor, } from '../lib/engine-versions.js';
|
|
11
12
|
// Free-tier posture of a promoted database (plan decision: promoted databases
|
|
12
13
|
// get plain free-tier rules, nothing special).
|
|
13
14
|
const WHAT_HAPPENS_NEXT = 'Free tier: it sleeps after an hour idle and wakes on your next connection.';
|
|
@@ -62,6 +63,76 @@ async function backupSpindbInstance(options) {
|
|
|
62
63
|
}
|
|
63
64
|
return path;
|
|
64
65
|
}
|
|
66
|
+
// Resolve the local version against what the cloud will actually create.
|
|
67
|
+
//
|
|
68
|
+
// Best-effort by design, and this is where the CLI parts company with the
|
|
69
|
+
// desktop app: the desktop stops the promote on an unreadable catalog because
|
|
70
|
+
// it can show the user a dialog, while a promote that works today must not
|
|
71
|
+
// start failing here over a catalog request. An unreadable catalog sends no
|
|
72
|
+
// version (the pre-existing behavior) and is reported after the create.
|
|
73
|
+
async function planCloudVersion(options) {
|
|
74
|
+
const { engine, localVersion } = options;
|
|
75
|
+
// A source with no version of its own (a bare .sqlite/.duckdb file, a SQL
|
|
76
|
+
// dump) has nothing to resolve: keep the cloud default and stay quiet.
|
|
77
|
+
if (!localVersion)
|
|
78
|
+
return { unresolved: false, engineLabel: engine };
|
|
79
|
+
let entry;
|
|
80
|
+
try {
|
|
81
|
+
const engines = await listEngines();
|
|
82
|
+
entry = engines.find((candidate) => candidate.id === engine &&
|
|
83
|
+
candidate.status === 'supported' &&
|
|
84
|
+
candidate.hostedServiceAllowed);
|
|
85
|
+
}
|
|
86
|
+
catch {
|
|
87
|
+
return { unresolved: true, engineLabel: engine };
|
|
88
|
+
}
|
|
89
|
+
const engineLabel = entry?.name || engine;
|
|
90
|
+
const supportedVersions = entry?.supportedVersions ?? [];
|
|
91
|
+
if (supportedVersions.length === 0) {
|
|
92
|
+
return { unresolved: true, engineLabel };
|
|
93
|
+
}
|
|
94
|
+
const resolution = resolvePromoteVersion({
|
|
95
|
+
localVersion,
|
|
96
|
+
offeredVersions: creatableVersions({ engine, supportedVersions }),
|
|
97
|
+
});
|
|
98
|
+
if (!resolution)
|
|
99
|
+
return { unresolved: true, engineLabel };
|
|
100
|
+
return {
|
|
101
|
+
version: resolution.version,
|
|
102
|
+
line: promoteVersionLine({ resolution, engineLabel }) ?? undefined,
|
|
103
|
+
unresolved: false,
|
|
104
|
+
engineLabel,
|
|
105
|
+
};
|
|
106
|
+
}
|
|
107
|
+
// Create the database, and heal the one failure the version can cause.
|
|
108
|
+
//
|
|
109
|
+
// The sunset list in engine-versions.ts is a mirror of a cloud-side gate that
|
|
110
|
+
// /v1/engines does not publish, so it can drift. When it has, the cloud names
|
|
111
|
+
// the versions it WILL create in its own rejection: re-resolve against that
|
|
112
|
+
// list and retry once. Nothing was created by the rejected call, so the retry
|
|
113
|
+
// is a plain create, not a cleanup.
|
|
114
|
+
async function createWithVersion(options) {
|
|
115
|
+
const { name, engine, version, localVersion, engineLabel, source, say } = options;
|
|
116
|
+
try {
|
|
117
|
+
return await createDatabase({ name, engine, version, source });
|
|
118
|
+
}
|
|
119
|
+
catch (error) {
|
|
120
|
+
if (!version ||
|
|
121
|
+
!(error instanceof CloudApiError) ||
|
|
122
|
+
!isUnsupportedVersionMessage(error.message)) {
|
|
123
|
+
throw error;
|
|
124
|
+
}
|
|
125
|
+
const offeredVersions = parseSupportedVersionsFromError(error.message);
|
|
126
|
+
const retry = offeredVersions
|
|
127
|
+
? resolvePromoteVersion({ localVersion, offeredVersions })
|
|
128
|
+
: undefined;
|
|
129
|
+
say(`Cloud does not create ${engineLabel} ${version} any more; creating ` +
|
|
130
|
+
(retry
|
|
131
|
+
? `${engineLabel} ${retry.version} instead.`
|
|
132
|
+
: `the default ${engineLabel} version instead.`));
|
|
133
|
+
return createDatabase({ name, engine, version: retry?.version, source });
|
|
134
|
+
}
|
|
135
|
+
}
|
|
65
136
|
async function waitForRunning(id) {
|
|
66
137
|
const deadline = Date.now() + RUNNING_TIMEOUT_MS;
|
|
67
138
|
let status = 'provisioning';
|
|
@@ -174,17 +245,42 @@ export async function runPromote(options) {
|
|
|
174
245
|
if (size === 0) {
|
|
175
246
|
throw new Error(`Nothing to promote: ${dumpPath} is empty.`);
|
|
176
247
|
}
|
|
177
|
-
// 4.
|
|
248
|
+
// 4. Work out which version the cloud will run, then create the database
|
|
249
|
+
// and wait for it to be importable. The version is resolved against the
|
|
250
|
+
// cloud's own offer list rather than sent raw or left blank: a local
|
|
251
|
+
// PostgreSQL 15 container silently landing on 18 is the behavior this
|
|
252
|
+
// replaces.
|
|
253
|
+
const localVersion = sourceEngineVersion(source);
|
|
254
|
+
const plan = await planCloudVersion({
|
|
255
|
+
engine: target.engine,
|
|
256
|
+
localVersion,
|
|
257
|
+
});
|
|
258
|
+
if (plan.line)
|
|
259
|
+
say(plan.line);
|
|
178
260
|
say(`Creating cloud database "${name}" (${target.engine})...`);
|
|
179
261
|
// The source KIND only ('sqlite' | 'duckdb' | 'sql-dump' | 'spindb'), so
|
|
180
262
|
// graduated prototypes are countable. Never the path or the container name:
|
|
181
263
|
// those are the user's filesystem, not our metric. cloud-api sanitizes this
|
|
182
264
|
// again on the way out as a backstop.
|
|
183
|
-
const created = await
|
|
265
|
+
const created = await createWithVersion({
|
|
184
266
|
name,
|
|
185
267
|
engine: target.engine,
|
|
268
|
+
version: plan.version,
|
|
269
|
+
localVersion,
|
|
270
|
+
engineLabel: plan.engineLabel,
|
|
186
271
|
source: { via: 'promote', kind: source.kind },
|
|
272
|
+
say,
|
|
187
273
|
});
|
|
274
|
+
// No offer list was readable, so the cloud picked the version. Say which
|
|
275
|
+
// one it picked when it is not the local major, instead of leaving the user
|
|
276
|
+
// to discover a major upgrade on their own.
|
|
277
|
+
if (plan.unresolved &&
|
|
278
|
+
localVersion &&
|
|
279
|
+
created.version &&
|
|
280
|
+
versionMajor(created.version) !== versionMajor(localVersion)) {
|
|
281
|
+
say(`Note: local ${plan.engineLabel} ${localVersion} promoted into cloud ` +
|
|
282
|
+
`${plan.engineLabel} ${created.version}.`);
|
|
283
|
+
}
|
|
188
284
|
if (created.status !== 'running') {
|
|
189
285
|
say('Waiting for the database to come up...');
|
|
190
286
|
const status = await waitForRunning(created.id);
|
|
@@ -252,6 +348,7 @@ export async function runPromote(options) {
|
|
|
252
348
|
id: created.id,
|
|
253
349
|
name: created.name,
|
|
254
350
|
engine: created.engine,
|
|
351
|
+
version: created.version,
|
|
255
352
|
status: 'running',
|
|
256
353
|
},
|
|
257
354
|
connectionString,
|
|
@@ -264,7 +361,7 @@ export async function runPromote(options) {
|
|
|
264
361
|
process.stdout.write(`\nPromoted ${describeSource(source)} into "${created.name}" ` +
|
|
265
362
|
`(${formatBytes(imported.bytesUploaded)}).\n\n`);
|
|
266
363
|
if (connectionString)
|
|
267
|
-
process.stdout.write(`${connectionString}\n\n`);
|
|
364
|
+
process.stdout.write(`${forOutput(connectionString)}\n\n`);
|
|
268
365
|
process.stdout.write(`Dashboard: ${url}\n`);
|
|
269
366
|
process.stdout.write(`${WHAT_HAPPENS_NEXT}\n`);
|
|
270
367
|
if (envAction) {
|