@terreno/admin-backend 57.4.0 → 57.6.1
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 +3 -3
- package/dist/adminApp.js +1219 -1936
- package/dist/adminConfigIdentity.js +26 -50
- package/dist/adminMigrations.js +83 -168
- package/dist/adminScriptJob.js +142 -300
- package/dist/adminTextSearch.js +21 -78
- package/dist/adminUiV2.js +49 -146
- package/dist/aggregateAdmin.js +102 -227
- package/dist/documentStorageApp.js +184 -325
- package/dist/enrichAdminListFilters.js +4 -15
- package/dist/filterParser.js +158 -238
- package/dist/legacy.js +21 -25
- package/dist/resolvedAdminModel.js +22 -78
- package/dist/routePath.js +3 -3
- package/dist/scriptCli.js +161 -307
- package/dist/tests/bunSetup.js +1 -1
- package/package.json +7 -7
- package/src/adminApp.models.test.ts +89 -3
- package/src/adminApp.ts +31 -8
- package/tsconfig.json +6 -21
package/dist/scriptCli.js
CHANGED
|
@@ -1,79 +1,7 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
-
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
|
|
3
|
-
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
|
|
4
|
-
return new (P || (P = Promise))(function (resolve, reject) {
|
|
5
|
-
function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
|
|
6
|
-
function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
|
|
7
|
-
function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
|
|
8
|
-
step((generator = generator.apply(thisArg, _arguments || [])).next());
|
|
9
|
-
});
|
|
10
|
-
};
|
|
11
|
-
var __generator = (this && this.__generator) || function (thisArg, body) {
|
|
12
|
-
var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g = Object.create((typeof Iterator === "function" ? Iterator : Object).prototype);
|
|
13
|
-
return g.next = verb(0), g["throw"] = verb(1), g["return"] = verb(2), typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
|
|
14
|
-
function verb(n) { return function (v) { return step([n, v]); }; }
|
|
15
|
-
function step(op) {
|
|
16
|
-
if (f) throw new TypeError("Generator is already executing.");
|
|
17
|
-
while (g && (g = 0, op[0] && (_ = 0)), _) try {
|
|
18
|
-
if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
|
|
19
|
-
if (y = 0, t) op = [op[0] & 2, t.value];
|
|
20
|
-
switch (op[0]) {
|
|
21
|
-
case 0: case 1: t = op; break;
|
|
22
|
-
case 4: _.label++; return { value: op[1], done: false };
|
|
23
|
-
case 5: _.label++; y = op[1]; op = [0]; continue;
|
|
24
|
-
case 7: op = _.ops.pop(); _.trys.pop(); continue;
|
|
25
|
-
default:
|
|
26
|
-
if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
|
|
27
|
-
if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
|
|
28
|
-
if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
|
|
29
|
-
if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
|
|
30
|
-
if (t[2]) _.ops.pop();
|
|
31
|
-
_.trys.pop(); continue;
|
|
32
|
-
}
|
|
33
|
-
op = body.call(thisArg, _);
|
|
34
|
-
} catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
|
|
35
|
-
if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
|
|
36
|
-
}
|
|
37
|
-
};
|
|
38
|
-
var __values = (this && this.__values) || function(o) {
|
|
39
|
-
var s = typeof Symbol === "function" && Symbol.iterator, m = s && o[s], i = 0;
|
|
40
|
-
if (m) return m.call(o);
|
|
41
|
-
if (o && typeof o.length === "number") return {
|
|
42
|
-
next: function () {
|
|
43
|
-
if (o && i >= o.length) o = void 0;
|
|
44
|
-
return { value: o && o[i++], done: !o };
|
|
45
|
-
}
|
|
46
|
-
};
|
|
47
|
-
throw new TypeError(s ? "Object is not iterable." : "Symbol.iterator is not defined.");
|
|
48
|
-
};
|
|
49
|
-
var __read = (this && this.__read) || function (o, n) {
|
|
50
|
-
var m = typeof Symbol === "function" && o[Symbol.iterator];
|
|
51
|
-
if (!m) return o;
|
|
52
|
-
var i = m.call(o), r, ar = [], e;
|
|
53
|
-
try {
|
|
54
|
-
while ((n === void 0 || n-- > 0) && !(r = i.next()).done) ar.push(r.value);
|
|
55
|
-
}
|
|
56
|
-
catch (error) { e = { error: error }; }
|
|
57
|
-
finally {
|
|
58
|
-
try {
|
|
59
|
-
if (r && !r.done && (m = i["return"])) m.call(i);
|
|
60
|
-
}
|
|
61
|
-
finally { if (e) throw e.error; }
|
|
62
|
-
}
|
|
63
|
-
return ar;
|
|
64
|
-
};
|
|
65
|
-
var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
|
|
66
|
-
if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) {
|
|
67
|
-
if (ar || !(i in from)) {
|
|
68
|
-
if (!ar) ar = Array.prototype.slice.call(from, 0, i);
|
|
69
|
-
ar[i] = from[i];
|
|
70
|
-
}
|
|
71
|
-
}
|
|
72
|
-
return to.concat(ar || Array.prototype.slice.call(from));
|
|
73
|
-
};
|
|
74
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
75
3
|
exports.runScriptCli = exports.RESERVED_SCRIPT_FLAGS = void 0;
|
|
76
|
-
|
|
4
|
+
const api_1 = require("@terreno/api");
|
|
77
5
|
/**
|
|
78
6
|
* Flag names reserved by the script runner itself. They control how a script is
|
|
79
7
|
* invoked (CLI flags and the HTTP `wetRun` query) and are stripped from the
|
|
@@ -82,31 +10,28 @@ var api_1 = require("@terreno/api");
|
|
|
82
10
|
* and keep `ctx.args` identical across CLI and HTTP invocations.
|
|
83
11
|
*/
|
|
84
12
|
exports.RESERVED_SCRIPT_FLAGS = ["help", "h", "list", "json", "wet", "wetRun", "dry"];
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
return arg.required ? base : "[".concat(base, "]");
|
|
13
|
+
const formatArgUsage = (arg) => {
|
|
14
|
+
const type = arg.type ?? "string";
|
|
15
|
+
const base = type === "boolean" ? `--${arg.name}` : `--${arg.name} <${type}>`;
|
|
16
|
+
return arg.required ? base : `[${base}]`;
|
|
90
17
|
};
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
var parts = [" --".concat(arg.name)];
|
|
18
|
+
const describeArg = (arg) => {
|
|
19
|
+
const parts = [` --${arg.name}`];
|
|
94
20
|
if (arg.aliases && arg.aliases.length > 0) {
|
|
95
|
-
parts.push(
|
|
21
|
+
parts.push(`(-${arg.aliases.join(", -")})`);
|
|
96
22
|
}
|
|
97
|
-
parts.push(
|
|
98
|
-
parts.push(
|
|
23
|
+
parts.push(`[${arg.type ?? "string"}${arg.required ? ", required" : ""}]`);
|
|
24
|
+
parts.push(`- ${arg.description}`);
|
|
99
25
|
if (arg.default !== undefined) {
|
|
100
|
-
parts.push(
|
|
26
|
+
parts.push(`(default: ${String(arg.default)})`);
|
|
101
27
|
}
|
|
102
28
|
if (arg.example !== undefined) {
|
|
103
|
-
parts.push(
|
|
29
|
+
parts.push(`(e.g. ${arg.example})`);
|
|
104
30
|
}
|
|
105
31
|
return parts.join(" ");
|
|
106
32
|
};
|
|
107
|
-
|
|
108
|
-
|
|
109
|
-
write("Usage: ".concat(programName, " <script> [--wet] [args...]"));
|
|
33
|
+
const printGeneralHelp = (scripts, programName, write) => {
|
|
34
|
+
write(`Usage: ${programName} <script> [--wet] [args...]`);
|
|
110
35
|
write("");
|
|
111
36
|
write("Runs a registered admin script. Defaults to a dry run; pass --wet to apply changes.");
|
|
112
37
|
write("");
|
|
@@ -122,45 +47,23 @@ var printGeneralHelp = function (scripts, programName, write) {
|
|
|
122
47
|
return;
|
|
123
48
|
}
|
|
124
49
|
write("Available scripts:");
|
|
125
|
-
|
|
126
|
-
|
|
127
|
-
var script = scripts_1_1.value;
|
|
128
|
-
write(" ".concat(script.name, " - ").concat(script.description));
|
|
129
|
-
}
|
|
130
|
-
}
|
|
131
|
-
catch (e_1_1) { e_1 = { error: e_1_1 }; }
|
|
132
|
-
finally {
|
|
133
|
-
try {
|
|
134
|
-
if (scripts_1_1 && !scripts_1_1.done && (_a = scripts_1.return)) _a.call(scripts_1);
|
|
135
|
-
}
|
|
136
|
-
finally { if (e_1) throw e_1.error; }
|
|
50
|
+
for (const script of scripts) {
|
|
51
|
+
write(` ${script.name} - ${script.description}`);
|
|
137
52
|
}
|
|
138
53
|
write("");
|
|
139
|
-
write(
|
|
54
|
+
write(`Run "${programName} <script> --help" for a script's arguments.`);
|
|
140
55
|
};
|
|
141
|
-
|
|
142
|
-
|
|
143
|
-
|
|
144
|
-
|
|
145
|
-
var usageArgs = args.map(formatArgUsage).join(" ");
|
|
146
|
-
write("Usage: ".concat(programName, " ").concat(script.name, " [--wet] ").concat(usageArgs).trimEnd());
|
|
56
|
+
const printScriptHelp = (script, programName, write) => {
|
|
57
|
+
const args = script.args ?? [];
|
|
58
|
+
const usageArgs = args.map(formatArgUsage).join(" ");
|
|
59
|
+
write(`Usage: ${programName} ${script.name} [--wet] ${usageArgs}`.trimEnd());
|
|
147
60
|
write("");
|
|
148
61
|
write(script.description);
|
|
149
62
|
if (args.length > 0) {
|
|
150
63
|
write("");
|
|
151
64
|
write("Arguments:");
|
|
152
|
-
|
|
153
|
-
|
|
154
|
-
var arg = args_1_1.value;
|
|
155
|
-
write(describeArg(arg));
|
|
156
|
-
}
|
|
157
|
-
}
|
|
158
|
-
catch (e_2_1) { e_2 = { error: e_2_1 }; }
|
|
159
|
-
finally {
|
|
160
|
-
try {
|
|
161
|
-
if (args_1_1 && !args_1_1.done && (_a = args_1.return)) _a.call(args_1);
|
|
162
|
-
}
|
|
163
|
-
finally { if (e_2) throw e_2.error; }
|
|
65
|
+
for (const arg of args) {
|
|
66
|
+
write(describeArg(arg));
|
|
164
67
|
}
|
|
165
68
|
}
|
|
166
69
|
};
|
|
@@ -173,192 +76,143 @@ var printScriptHelp = function (script, programName, write) {
|
|
|
173
76
|
* The caller is responsible for any environment setup the scripts need (typically
|
|
174
77
|
* connecting to MongoDB) before calling this, and for tearing it down afterwards.
|
|
175
78
|
*/
|
|
176
|
-
|
|
177
|
-
|
|
178
|
-
|
|
179
|
-
|
|
180
|
-
|
|
181
|
-
|
|
182
|
-
|
|
183
|
-
|
|
184
|
-
|
|
185
|
-
write = (_h = options.write) !== null && _h !== void 0 ? _h : (function (line) { return process.stdout.write("".concat(line, "\n")); });
|
|
186
|
-
shouldExit = options.exit !== false;
|
|
187
|
-
programName = (_j = options.programName) !== null && _j !== void 0 ? _j : "script";
|
|
188
|
-
finish = function (result) {
|
|
189
|
-
if (shouldExit) {
|
|
190
|
-
process.exit(result.exitCode);
|
|
191
|
-
}
|
|
192
|
-
return result;
|
|
193
|
-
};
|
|
194
|
-
wantsHelp = argv.includes("--help") || argv.includes("-h");
|
|
195
|
-
wantsList = argv.includes("--list");
|
|
196
|
-
wantsJson = argv.includes("--json");
|
|
197
|
-
scriptName = argv.find(function (token) { return !token.startsWith("-"); });
|
|
198
|
-
if (wantsList || (!scriptName && !wantsHelp)) {
|
|
199
|
-
printGeneralHelp(scripts, programName, write);
|
|
200
|
-
return [2 /*return*/, finish({ errors: [], exitCode: 0, results: [], success: true, wetRun: false })];
|
|
201
|
-
}
|
|
202
|
-
if (!scriptName) {
|
|
203
|
-
printGeneralHelp(scripts, programName, write);
|
|
204
|
-
return [2 /*return*/, finish({ errors: [], exitCode: 0, results: [], success: true, wetRun: false })];
|
|
205
|
-
}
|
|
206
|
-
script = scripts.find(function (s) { return s.name === scriptName; });
|
|
207
|
-
if (!script) {
|
|
208
|
-
available = scripts.map(function (s) { return s.name; }).join(", ") || "(none)";
|
|
209
|
-
message = "Unknown script: ".concat(scriptName, ". Available scripts: ").concat(available);
|
|
210
|
-
write(message);
|
|
211
|
-
return [2 /*return*/, finish({
|
|
212
|
-
errors: [message],
|
|
213
|
-
exitCode: 1,
|
|
214
|
-
results: [],
|
|
215
|
-
script: scriptName,
|
|
216
|
-
success: false,
|
|
217
|
-
wetRun: false,
|
|
218
|
-
})];
|
|
219
|
-
}
|
|
220
|
-
if (wantsHelp) {
|
|
221
|
-
printScriptHelp(script, programName, write);
|
|
222
|
-
return [2 /*return*/, finish({
|
|
223
|
-
errors: [],
|
|
224
|
-
exitCode: 0,
|
|
225
|
-
results: [],
|
|
226
|
-
script: script.name,
|
|
227
|
-
success: true,
|
|
228
|
-
wetRun: false,
|
|
229
|
-
})];
|
|
230
|
-
}
|
|
231
|
-
nameIndex = argv.indexOf(scriptName);
|
|
232
|
-
argTokens = __spreadArray(__spreadArray([], __read(argv.slice(0, nameIndex)), false), __read(argv.slice(nameIndex + 1)), false);
|
|
233
|
-
_a = (0, api_1.parseScriptArgs)(argTokens, (_k = script.args) !== null && _k !== void 0 ? _k : []), args = _a.args, errors = _a.errors;
|
|
234
|
-
dryRequested = args.getBoolean("dry");
|
|
235
|
-
wetRequested = args.getBoolean("wet") || args.getBoolean("wetRun");
|
|
236
|
-
wetRun = wetRequested && !dryRequested;
|
|
237
|
-
try {
|
|
238
|
-
for (RESERVED_SCRIPT_FLAGS_1 = __values(exports.RESERVED_SCRIPT_FLAGS), RESERVED_SCRIPT_FLAGS_1_1 = RESERVED_SCRIPT_FLAGS_1.next(); !RESERVED_SCRIPT_FLAGS_1_1.done; RESERVED_SCRIPT_FLAGS_1_1 = RESERVED_SCRIPT_FLAGS_1.next()) {
|
|
239
|
-
reserved = RESERVED_SCRIPT_FLAGS_1_1.value;
|
|
240
|
-
delete args.raw[reserved];
|
|
241
|
-
}
|
|
242
|
-
}
|
|
243
|
-
catch (e_3_1) { e_3 = { error: e_3_1 }; }
|
|
244
|
-
finally {
|
|
245
|
-
try {
|
|
246
|
-
if (RESERVED_SCRIPT_FLAGS_1_1 && !RESERVED_SCRIPT_FLAGS_1_1.done && (_d = RESERVED_SCRIPT_FLAGS_1.return)) _d.call(RESERVED_SCRIPT_FLAGS_1);
|
|
247
|
-
}
|
|
248
|
-
finally { if (e_3) throw e_3.error; }
|
|
249
|
-
}
|
|
250
|
-
if (errors.length > 0) {
|
|
251
|
-
try {
|
|
252
|
-
for (errors_1 = __values(errors), errors_1_1 = errors_1.next(); !errors_1_1.done; errors_1_1 = errors_1.next()) {
|
|
253
|
-
error = errors_1_1.value;
|
|
254
|
-
write(error);
|
|
255
|
-
}
|
|
256
|
-
}
|
|
257
|
-
catch (e_4_1) { e_4 = { error: e_4_1 }; }
|
|
258
|
-
finally {
|
|
259
|
-
try {
|
|
260
|
-
if (errors_1_1 && !errors_1_1.done && (_e = errors_1.return)) _e.call(errors_1);
|
|
261
|
-
}
|
|
262
|
-
finally { if (e_4) throw e_4.error; }
|
|
263
|
-
}
|
|
264
|
-
write("");
|
|
265
|
-
printScriptHelp(script, programName, write);
|
|
266
|
-
return [2 /*return*/, finish({
|
|
267
|
-
errors: errors,
|
|
268
|
-
exitCode: 1,
|
|
269
|
-
results: [],
|
|
270
|
-
script: script.name,
|
|
271
|
-
success: false,
|
|
272
|
-
wetRun: wetRun,
|
|
273
|
-
})];
|
|
274
|
-
}
|
|
275
|
-
ctx = {
|
|
276
|
-
addLog: function (level, message) { return __awaiter(void 0, void 0, void 0, function () {
|
|
277
|
-
return __generator(this, function (_a) {
|
|
278
|
-
if (!wantsJson) {
|
|
279
|
-
write("[".concat(level, "] ").concat(message));
|
|
280
|
-
}
|
|
281
|
-
return [2 /*return*/];
|
|
282
|
-
});
|
|
283
|
-
}); },
|
|
284
|
-
args: args,
|
|
285
|
-
checkCancellation: function () { return __awaiter(void 0, void 0, void 0, function () {
|
|
286
|
-
return __generator(this, function (_a) {
|
|
287
|
-
return [2 /*return*/];
|
|
288
|
-
});
|
|
289
|
-
}); },
|
|
290
|
-
updateProgress: function (percentage, stage, message) { return __awaiter(void 0, void 0, void 0, function () {
|
|
291
|
-
var suffix;
|
|
292
|
-
return __generator(this, function (_a) {
|
|
293
|
-
if (!wantsJson) {
|
|
294
|
-
suffix = [stage, message].filter(Boolean).join(" - ");
|
|
295
|
-
write("[progress] ".concat(percentage, "%").concat(suffix ? " ".concat(suffix) : ""));
|
|
296
|
-
}
|
|
297
|
-
return [2 /*return*/];
|
|
298
|
-
});
|
|
299
|
-
}); },
|
|
300
|
-
};
|
|
301
|
-
if (!wantsJson) {
|
|
302
|
-
write("Running \"".concat(script.name, "\" (").concat(wetRun ? "wet run" : "dry run", ")..."));
|
|
303
|
-
}
|
|
304
|
-
_l.label = 1;
|
|
305
|
-
case 1:
|
|
306
|
-
_l.trys.push([1, 3, , 4]);
|
|
307
|
-
return [4 /*yield*/, script.runner(wetRun, ctx)];
|
|
308
|
-
case 2:
|
|
309
|
-
result = _l.sent();
|
|
310
|
-
if (wantsJson) {
|
|
311
|
-
write(JSON.stringify({
|
|
312
|
-
results: result.results,
|
|
313
|
-
script: script.name,
|
|
314
|
-
success: result.success,
|
|
315
|
-
wetRun: wetRun,
|
|
316
|
-
}));
|
|
317
|
-
}
|
|
318
|
-
else {
|
|
319
|
-
try {
|
|
320
|
-
for (_b = __values(result.results), _c = _b.next(); !_c.done; _c = _b.next()) {
|
|
321
|
-
line = _c.value;
|
|
322
|
-
write(line);
|
|
323
|
-
}
|
|
324
|
-
}
|
|
325
|
-
catch (e_5_1) { e_5 = { error: e_5_1 }; }
|
|
326
|
-
finally {
|
|
327
|
-
try {
|
|
328
|
-
if (_c && !_c.done && (_f = _b.return)) _f.call(_b);
|
|
329
|
-
}
|
|
330
|
-
finally { if (e_5) throw e_5.error; }
|
|
331
|
-
}
|
|
332
|
-
write(result.success ? "Done." : "Script reported failure.");
|
|
333
|
-
}
|
|
334
|
-
return [2 /*return*/, finish({
|
|
335
|
-
errors: [],
|
|
336
|
-
exitCode: result.success ? 0 : 1,
|
|
337
|
-
results: result.results,
|
|
338
|
-
script: script.name,
|
|
339
|
-
success: result.success,
|
|
340
|
-
wetRun: wetRun,
|
|
341
|
-
})];
|
|
342
|
-
case 3:
|
|
343
|
-
err_1 = _l.sent();
|
|
344
|
-
message = err_1 instanceof Error ? err_1.message : String(err_1);
|
|
345
|
-
api_1.logger.error("Script ".concat(script.name, " failed: ").concat(message));
|
|
346
|
-
if (wantsJson) {
|
|
347
|
-
write(JSON.stringify({ error: message, script: script.name, success: false, wetRun: wetRun }));
|
|
348
|
-
}
|
|
349
|
-
else {
|
|
350
|
-
write("Error: ".concat(message));
|
|
351
|
-
}
|
|
352
|
-
return [2 /*return*/, finish({
|
|
353
|
-
errors: [message],
|
|
354
|
-
exitCode: 1,
|
|
355
|
-
results: [],
|
|
356
|
-
script: script.name,
|
|
357
|
-
success: false,
|
|
358
|
-
wetRun: wetRun,
|
|
359
|
-
})];
|
|
360
|
-
case 4: return [2 /*return*/];
|
|
79
|
+
const runScriptCli = async (options) => {
|
|
80
|
+
const { scripts } = options;
|
|
81
|
+
const argv = options.argv ?? process.argv.slice(2);
|
|
82
|
+
const write = options.write ?? ((line) => process.stdout.write(`${line}\n`));
|
|
83
|
+
const shouldExit = options.exit !== false;
|
|
84
|
+
const programName = options.programName ?? "script";
|
|
85
|
+
const finish = (result) => {
|
|
86
|
+
if (shouldExit) {
|
|
87
|
+
process.exit(result.exitCode);
|
|
361
88
|
}
|
|
362
|
-
|
|
363
|
-
}
|
|
89
|
+
return result;
|
|
90
|
+
};
|
|
91
|
+
const wantsHelp = argv.includes("--help") || argv.includes("-h");
|
|
92
|
+
const wantsList = argv.includes("--list");
|
|
93
|
+
const wantsJson = argv.includes("--json");
|
|
94
|
+
const scriptName = argv.find((token) => !token.startsWith("-"));
|
|
95
|
+
if (wantsList || (!scriptName && !wantsHelp)) {
|
|
96
|
+
printGeneralHelp(scripts, programName, write);
|
|
97
|
+
return finish({ errors: [], exitCode: 0, results: [], success: true, wetRun: false });
|
|
98
|
+
}
|
|
99
|
+
if (!scriptName) {
|
|
100
|
+
printGeneralHelp(scripts, programName, write);
|
|
101
|
+
return finish({ errors: [], exitCode: 0, results: [], success: true, wetRun: false });
|
|
102
|
+
}
|
|
103
|
+
const script = scripts.find((s) => s.name === scriptName);
|
|
104
|
+
if (!script) {
|
|
105
|
+
const available = scripts.map((s) => s.name).join(", ") || "(none)";
|
|
106
|
+
const message = `Unknown script: ${scriptName}. Available scripts: ${available}`;
|
|
107
|
+
write(message);
|
|
108
|
+
return finish({
|
|
109
|
+
errors: [message],
|
|
110
|
+
exitCode: 1,
|
|
111
|
+
results: [],
|
|
112
|
+
script: scriptName,
|
|
113
|
+
success: false,
|
|
114
|
+
wetRun: false,
|
|
115
|
+
});
|
|
116
|
+
}
|
|
117
|
+
if (wantsHelp) {
|
|
118
|
+
printScriptHelp(script, programName, write);
|
|
119
|
+
return finish({
|
|
120
|
+
errors: [],
|
|
121
|
+
exitCode: 0,
|
|
122
|
+
results: [],
|
|
123
|
+
script: script.name,
|
|
124
|
+
success: true,
|
|
125
|
+
wetRun: false,
|
|
126
|
+
});
|
|
127
|
+
}
|
|
128
|
+
// Everything after removing the script name is treated as arguments.
|
|
129
|
+
const nameIndex = argv.indexOf(scriptName);
|
|
130
|
+
const argTokens = [...argv.slice(0, nameIndex), ...argv.slice(nameIndex + 1)];
|
|
131
|
+
const { args, errors } = (0, api_1.parseScriptArgs)(argTokens, script.args ?? []);
|
|
132
|
+
// Reserved flags control the CLI; resolve them, then strip from the script's args.
|
|
133
|
+
const dryRequested = args.getBoolean("dry");
|
|
134
|
+
const wetRequested = args.getBoolean("wet") || args.getBoolean("wetRun");
|
|
135
|
+
const wetRun = wetRequested && !dryRequested;
|
|
136
|
+
for (const reserved of exports.RESERVED_SCRIPT_FLAGS) {
|
|
137
|
+
delete args.raw[reserved];
|
|
138
|
+
}
|
|
139
|
+
if (errors.length > 0) {
|
|
140
|
+
for (const error of errors) {
|
|
141
|
+
write(error);
|
|
142
|
+
}
|
|
143
|
+
write("");
|
|
144
|
+
printScriptHelp(script, programName, write);
|
|
145
|
+
return finish({
|
|
146
|
+
errors,
|
|
147
|
+
exitCode: 1,
|
|
148
|
+
results: [],
|
|
149
|
+
script: script.name,
|
|
150
|
+
success: false,
|
|
151
|
+
wetRun,
|
|
152
|
+
});
|
|
153
|
+
}
|
|
154
|
+
const ctx = {
|
|
155
|
+
addLog: async (level, message) => {
|
|
156
|
+
if (!wantsJson) {
|
|
157
|
+
write(`[${level}] ${message}`);
|
|
158
|
+
}
|
|
159
|
+
},
|
|
160
|
+
args,
|
|
161
|
+
checkCancellation: async () => {
|
|
162
|
+
// No background task to cancel against when running from the CLI.
|
|
163
|
+
},
|
|
164
|
+
updateProgress: async (percentage, stage, message) => {
|
|
165
|
+
if (!wantsJson) {
|
|
166
|
+
const suffix = [stage, message].filter(Boolean).join(" - ");
|
|
167
|
+
write(`[progress] ${percentage}%${suffix ? ` ${suffix}` : ""}`);
|
|
168
|
+
}
|
|
169
|
+
},
|
|
170
|
+
};
|
|
171
|
+
if (!wantsJson) {
|
|
172
|
+
write(`Running "${script.name}" (${wetRun ? "wet run" : "dry run"})...`);
|
|
173
|
+
}
|
|
174
|
+
try {
|
|
175
|
+
const result = await script.runner(wetRun, ctx);
|
|
176
|
+
if (wantsJson) {
|
|
177
|
+
write(JSON.stringify({
|
|
178
|
+
results: result.results,
|
|
179
|
+
script: script.name,
|
|
180
|
+
success: result.success,
|
|
181
|
+
wetRun,
|
|
182
|
+
}));
|
|
183
|
+
}
|
|
184
|
+
else {
|
|
185
|
+
for (const line of result.results) {
|
|
186
|
+
write(line);
|
|
187
|
+
}
|
|
188
|
+
write(result.success ? "Done." : "Script reported failure.");
|
|
189
|
+
}
|
|
190
|
+
return finish({
|
|
191
|
+
errors: [],
|
|
192
|
+
exitCode: result.success ? 0 : 1,
|
|
193
|
+
results: result.results,
|
|
194
|
+
script: script.name,
|
|
195
|
+
success: result.success,
|
|
196
|
+
wetRun,
|
|
197
|
+
});
|
|
198
|
+
}
|
|
199
|
+
catch (err) {
|
|
200
|
+
const message = err instanceof Error ? err.message : String(err);
|
|
201
|
+
api_1.logger.error(`Script ${script.name} failed: ${message}`);
|
|
202
|
+
if (wantsJson) {
|
|
203
|
+
write(JSON.stringify({ error: message, script: script.name, success: false, wetRun }));
|
|
204
|
+
}
|
|
205
|
+
else {
|
|
206
|
+
write(`Error: ${message}`);
|
|
207
|
+
}
|
|
208
|
+
return finish({
|
|
209
|
+
errors: [message],
|
|
210
|
+
exitCode: 1,
|
|
211
|
+
results: [],
|
|
212
|
+
script: script.name,
|
|
213
|
+
success: false,
|
|
214
|
+
wetRun,
|
|
215
|
+
});
|
|
216
|
+
}
|
|
217
|
+
};
|
|
364
218
|
exports.runScriptCli = runScriptCli;
|
package/dist/tests/bunSetup.js
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
|
|
3
|
+
const test_1 = require("@terreno/test");
|
|
4
4
|
process.env.TERRENO_TEST_USE_MEMORY_MONGO = "true";
|
|
5
5
|
(0, test_1.registerSimpleMongoPreload)({
|
|
6
6
|
testEnv: {
|
package/package.json
CHANGED
|
@@ -1,12 +1,12 @@
|
|
|
1
1
|
{
|
|
2
2
|
"author": "Josh Gachnang",
|
|
3
3
|
"bugs": {
|
|
4
|
-
"url": "https://github.com/
|
|
4
|
+
"url": "https://github.com/TerrenoLabs/terreno/issues"
|
|
5
5
|
},
|
|
6
6
|
"dependencies": {
|
|
7
7
|
"@google-cloud/storage": "^7.15.0",
|
|
8
|
-
"@terreno/api": "57.
|
|
9
|
-
"@terreno/jobs": "57.
|
|
8
|
+
"@terreno/api": "57.6.1",
|
|
9
|
+
"@terreno/jobs": "57.6.1",
|
|
10
10
|
"express": "^5.2.1",
|
|
11
11
|
"luxon": "^3.7.2",
|
|
12
12
|
"multer": "2.2.0"
|
|
@@ -14,7 +14,7 @@
|
|
|
14
14
|
"description": "Admin panel backend plugin for @terreno/api — part of Terreno, the batteries-included TypeScript framework for universal apps.",
|
|
15
15
|
"devDependencies": {
|
|
16
16
|
"@biomejs/biome": "^2.3.6",
|
|
17
|
-
"@terreno/test": "57.
|
|
17
|
+
"@terreno/test": "57.6.1",
|
|
18
18
|
"@types/bun": "^1.4.0",
|
|
19
19
|
"@types/express": "^5.0.6",
|
|
20
20
|
"@types/luxon": "^3.7.1",
|
|
@@ -23,7 +23,7 @@
|
|
|
23
23
|
"supertest": "^7.2.2",
|
|
24
24
|
"typescript": "~6.0.3"
|
|
25
25
|
},
|
|
26
|
-
"homepage": "https://github.com/
|
|
26
|
+
"homepage": "https://github.com/TerrenoLabs/terreno#readme",
|
|
27
27
|
"keywords": [
|
|
28
28
|
"admin",
|
|
29
29
|
"api",
|
|
@@ -41,7 +41,7 @@
|
|
|
41
41
|
},
|
|
42
42
|
"repository": {
|
|
43
43
|
"type": "git",
|
|
44
|
-
"url": "git+ssh://git@github.com/
|
|
44
|
+
"url": "git+ssh://git@github.com/TerrenoLabs/terreno.git"
|
|
45
45
|
},
|
|
46
46
|
"scripts": {
|
|
47
47
|
"compile": "node ../.github/scripts/compile-workspace-deps.js && bun tsc",
|
|
@@ -55,5 +55,5 @@
|
|
|
55
55
|
"test:coverage": "bun run ../scripts/check-coverage.ts"
|
|
56
56
|
},
|
|
57
57
|
"types": "dist/index.d.ts",
|
|
58
|
-
"version": "57.
|
|
58
|
+
"version": "57.6.1"
|
|
59
59
|
}
|