@dbos-inc/dbos-sdk 1.31.20-preview → 1.31.22-preview
Sign up to get free protection for your applications and to get access to all the features.
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"db_wizard.d.ts","sourceRoot":"","sources":["../../../src/dbos-runtime/db_wizard.ts"],"names":[],"mappings":"AAAA,OAAO,EAAQ,UAAU,EAAE,MAAM,IAAI,CAAC;
|
|
1
|
+
{"version":3,"file":"db_wizard.d.ts","sourceRoot":"","sources":["../../../src/dbos-runtime/db_wizard.ts"],"names":[],"mappings":"AAAA,OAAO,EAAQ,UAAU,EAAE,MAAM,IAAI,CAAC;AAYtC,wBAAsB,SAAS,CAAC,UAAU,EAAE,UAAU,GAAG,OAAO,CAAC,UAAU,CAAC,CAmF3E"}
|
|
@@ -6,13 +6,14 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
6
6
|
exports.db_wizard = void 0;
|
|
7
7
|
const pg_1 = require("pg");
|
|
8
8
|
const error_1 = require("../error");
|
|
9
|
-
const dockerode_1 = __importDefault(require("dockerode"));
|
|
10
9
|
const utils_1 = require("../utils");
|
|
11
10
|
const config_1 = require("./config");
|
|
12
11
|
const yaml_1 = __importDefault(require("yaml"));
|
|
13
12
|
const cloudutils_1 = require("./cloudutils/cloudutils");
|
|
14
13
|
const databases_1 = require("./cloudutils/databases");
|
|
15
|
-
const
|
|
14
|
+
const util_1 = require("util");
|
|
15
|
+
const prompts_1 = require("@inquirer/prompts");
|
|
16
|
+
const child_process_1 = require("child_process");
|
|
16
17
|
async function db_wizard(poolConfig) {
|
|
17
18
|
const logger = (0, cloudutils_1.getLogger)();
|
|
18
19
|
// 1. Check the connectivity to the database. Return if successful. If cannot connect, continue to the following steps.
|
|
@@ -54,8 +55,10 @@ async function db_wizard(poolConfig) {
|
|
|
54
55
|
poolConfig.port = db.Port;
|
|
55
56
|
if (db.SupabaseReference) {
|
|
56
57
|
poolConfig.user = `postgres.${db.SupabaseReference}`;
|
|
57
|
-
|
|
58
|
-
|
|
58
|
+
poolConfig.password = await (0, prompts_1.password)({
|
|
59
|
+
message: "Enter your Supabase database password: ",
|
|
60
|
+
mask: "*"
|
|
61
|
+
});
|
|
59
62
|
}
|
|
60
63
|
else {
|
|
61
64
|
const dbCredentials = await (0, databases_1.getUserDBCredentials)(logger, cloudutils_1.DBOSCloudHost, cred, db.PostgresInstanceName);
|
|
@@ -111,30 +114,23 @@ async function checkDbConnectivity(config) {
|
|
|
111
114
|
await pool.end();
|
|
112
115
|
}
|
|
113
116
|
}
|
|
117
|
+
const execAsync = (0, util_1.promisify)(child_process_1.exec);
|
|
114
118
|
async function startDockerPostgres(logger, poolConfig) {
|
|
115
119
|
logger.info("Starting a Postgres Docker container...");
|
|
116
|
-
const docker = new dockerode_1.default();
|
|
117
120
|
poolConfig.password = "dbos";
|
|
118
121
|
const containerName = "dbos-db";
|
|
119
122
|
const pgData = "/var/lib/postgresql/data";
|
|
120
123
|
try {
|
|
121
124
|
// Create and start the container
|
|
122
|
-
const
|
|
123
|
-
|
|
124
|
-
|
|
125
|
-
|
|
126
|
-
|
|
127
|
-
|
|
128
|
-
|
|
129
|
-
|
|
130
|
-
|
|
131
|
-
"5432/tcp": [{ HostPort: poolConfig.port.toString() }]
|
|
132
|
-
},
|
|
133
|
-
Binds: [`${pgData}:${pgData}:rw`],
|
|
134
|
-
AutoRemove: true
|
|
135
|
-
}
|
|
136
|
-
});
|
|
137
|
-
await container.start();
|
|
125
|
+
const dockerCmd = `docker run -d \
|
|
126
|
+
--name ${containerName} \
|
|
127
|
+
-e POSTGRES_PASSWORD=${poolConfig.password} \
|
|
128
|
+
-e PGDATA=${pgData} \
|
|
129
|
+
-p ${poolConfig.port}:5432 \
|
|
130
|
+
-v ${pgData}:${pgData}:rw \
|
|
131
|
+
--rm \
|
|
132
|
+
pgvector/pgvector:pg16`;
|
|
133
|
+
await execAsync(dockerCmd);
|
|
138
134
|
// Wait for PostgreSQL to be ready
|
|
139
135
|
let attempts = 30;
|
|
140
136
|
while (attempts > 0) {
|
|
@@ -157,8 +153,7 @@ async function startDockerPostgres(logger, poolConfig) {
|
|
|
157
153
|
}
|
|
158
154
|
async function checkDockerInstalled() {
|
|
159
155
|
try {
|
|
160
|
-
|
|
161
|
-
await docker.ping();
|
|
156
|
+
await execAsync('docker --version');
|
|
162
157
|
return true;
|
|
163
158
|
}
|
|
164
159
|
catch (error) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"db_wizard.js","sourceRoot":"","sources":["../../../src/dbos-runtime/db_wizard.ts"],"names":[],"mappings":";;;;;;AAAA,2BAAsC;AACtC,oCAAmD;AAEnD,
|
|
1
|
+
{"version":3,"file":"db_wizard.js","sourceRoot":"","sources":["../../../src/dbos-runtime/db_wizard.ts"],"names":[],"mappings":"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"}
|