@resolveio/server-lib 22.3.79 → 22.3.80
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/package.json
CHANGED
|
@@ -6,6 +6,8 @@ export interface ResolveIORunnerQaToolBundleOptions {
|
|
|
6
6
|
jobId?: string;
|
|
7
7
|
ownerId?: string;
|
|
8
8
|
runnerToken?: string;
|
|
9
|
+
mongoRuntimePath?: string;
|
|
10
|
+
qaLiveDataRequired?: boolean;
|
|
9
11
|
toolsBinPath?: string;
|
|
10
12
|
browserslistPath?: string;
|
|
11
13
|
mongodbBinaryCachePath?: string;
|
|
@@ -29,6 +29,8 @@ function buildResolveIORunnerQaEnvScript(options) {
|
|
|
29
29
|
var jobId = shellDoubleQuote(options.jobId || '');
|
|
30
30
|
var ownerId = shellDoubleQuote(options.ownerId || '');
|
|
31
31
|
var runnerToken = shellDoubleQuote(options.runnerToken || '');
|
|
32
|
+
var mongoRuntimePath = shellDoubleQuote(options.mongoRuntimePath || '');
|
|
33
|
+
var qaLiveDataRequired = options.qaLiveDataRequired === true ? 'true' : 'false';
|
|
32
34
|
var toolsBinPath = options.toolsBinPath || '';
|
|
33
35
|
var browserslistPath = options.browserslistPath || '';
|
|
34
36
|
var mongodbBinaryCachePath = options.mongodbBinaryCachePath || '';
|
|
@@ -122,6 +124,12 @@ function buildResolveIORunnerQaEnvScript(options) {
|
|
|
122
124
|
"export ".concat(envVar(altMode, 'OWNER_ID'), "=\"").concat('${' + envVar(altMode, 'OWNER_ID') + ':-${' + envVar(mode, 'OWNER_ID') + '}}', "\""),
|
|
123
125
|
"export ".concat(envVar(mode, 'RUNNER_TOKEN'), "=\"").concat('${' + envVar(mode, 'RUNNER_TOKEN') + ':-${' + envVar(altMode, 'RUNNER_TOKEN') + ':-' + runnerToken + '}}', "\""),
|
|
124
126
|
"export ".concat(envVar(altMode, 'RUNNER_TOKEN'), "=\"").concat('${' + envVar(altMode, 'RUNNER_TOKEN') + ':-${' + envVar(mode, 'RUNNER_TOKEN') + '}}', "\""),
|
|
127
|
+
mongoRuntimePath ? "export ".concat(envVar(mode, 'MONGO_RUNTIME_PATH'), "=\"").concat('${' + envVar(mode, 'MONGO_RUNTIME_PATH') + ':-${' + envVar(altMode, 'MONGO_RUNTIME_PATH') + ':-' + mongoRuntimePath + '}}', "\"") : '',
|
|
128
|
+
mongoRuntimePath ? "export ".concat(envVar(altMode, 'MONGO_RUNTIME_PATH'), "=\"").concat('${' + envVar(altMode, 'MONGO_RUNTIME_PATH') + ':-${' + envVar(mode, 'MONGO_RUNTIME_PATH') + '}}', "\"") : '',
|
|
129
|
+
mongoRuntimePath ? "export RESOLVEIO_QA_MONGO_RUNTIME_PATH=\"".concat('${RESOLVEIO_QA_MONGO_RUNTIME_PATH:-$' + envVar(mode, 'MONGO_RUNTIME_PATH') + '}', "\"") : '',
|
|
130
|
+
"export ".concat(envVar(mode, 'LIVE_DATA_REQUIRED'), "=\"").concat('${' + envVar(mode, 'LIVE_DATA_REQUIRED') + ':-${' + envVar(altMode, 'LIVE_DATA_REQUIRED') + ':-' + qaLiveDataRequired + '}}', "\""),
|
|
131
|
+
"export ".concat(envVar(altMode, 'LIVE_DATA_REQUIRED'), "=\"").concat('${' + envVar(altMode, 'LIVE_DATA_REQUIRED') + ':-${' + envVar(mode, 'LIVE_DATA_REQUIRED') + '}}', "\""),
|
|
132
|
+
"export RESOLVEIO_QA_LIVE_DATA_REQUIRED=\"".concat('${RESOLVEIO_QA_LIVE_DATA_REQUIRED:-$' + envVar(mode, 'LIVE_DATA_REQUIRED') + '}', "\""),
|
|
125
133
|
'export PUPPETEER_CACHE_DIR="${PUPPETEER_CACHE_DIR:-/var/lib/resolveio/puppeteer}"',
|
|
126
134
|
'if [ ! -d "$PUPPETEER_CACHE_DIR" ] || [ ! -w "$PUPPETEER_CACHE_DIR" ]; then',
|
|
127
135
|
' export PUPPETEER_CACHE_DIR="$RESOLVEIO_QA_TMP/puppeteer"',
|
|
@@ -712,7 +720,15 @@ function buildResolveIORunnerQaLiveDataSeederScript() {
|
|
|
712
720
|
' const envUri = process.env.RESOLVEIO_QA_LIVE_MONGO_URL || process.env.RESOLVEIO_SUPPORT_QA_LIVE_MONGO_URL || process.env.RESOLVEIO_RUNNER_QA_LIVE_MONGO_URL || "";',
|
|
713
721
|
' const envDb = process.env.RESOLVEIO_QA_LIVE_MONGO_DB || process.env.RESOLVEIO_SUPPORT_QA_LIVE_MONGO_DB || process.env.RESOLVEIO_RUNNER_QA_LIVE_MONGO_DB || "";',
|
|
714
722
|
' if (envUri) return { uri: envUri, database: envDb };',
|
|
723
|
+
' const explicitRuntimePaths = [',
|
|
724
|
+
' process.env.RESOLVEIO_QA_MONGO_RUNTIME_PATH,',
|
|
725
|
+
' process.env.RESOLVEIO_SUPPORT_QA_MONGO_RUNTIME_PATH,',
|
|
726
|
+
' process.env.RESOLVEIO_RUNNER_QA_MONGO_RUNTIME_PATH',
|
|
727
|
+
' ].map((value) => String(value || "").trim()).filter(Boolean);',
|
|
715
728
|
' const candidates = [',
|
|
729
|
+
' ...explicitRuntimePaths,',
|
|
730
|
+
' path.join(repoRoot, "mongo-context", ".mongo-runtime.json"),',
|
|
731
|
+
' path.join(projectRoot, "mongo-context", ".mongo-runtime.json"),',
|
|
716
732
|
' path.join(repoRoot, ".resolveio-support-context", "mongo-context", ".mongo-runtime.json"),',
|
|
717
733
|
' path.join(projectRoot, ".resolveio-support-context", "mongo-context", ".mongo-runtime.json"),',
|
|
718
734
|
' path.join(repoRoot, ".resolveio-context", "mongo-context", ".mongo-runtime.json"),',
|
|
@@ -733,6 +749,10 @@ function buildResolveIORunnerQaLiveDataSeederScript() {
|
|
|
733
749
|
' return /mongodb(?:\\+srv)?:\\/\\/(?:[^@/]+@)?(?:127\\.0\\.0\\.1|localhost)(?::\\d+)?\\//i.test(String(uri || ""));',
|
|
734
750
|
'}',
|
|
735
751
|
'',
|
|
752
|
+
'function isLiveDataRequired() {',
|
|
753
|
+
' return /^(true|1|yes|on)$/i.test(String(process.env.RESOLVEIO_QA_LIVE_DATA_REQUIRED || process.env.RESOLVEIO_SUPPORT_QA_LIVE_DATA_REQUIRED || process.env.RESOLVEIO_RUNNER_QA_LIVE_DATA_REQUIRED || ""));',
|
|
754
|
+
'}',
|
|
755
|
+
'',
|
|
736
756
|
'function requireMongo() {',
|
|
737
757
|
' const candidates = [',
|
|
738
758
|
' path.join(projectRoot, "server", "node_modules", "mongodb"),',
|
|
@@ -975,7 +995,7 @@ function buildResolveIORunnerQaLiveDataSeederScript() {
|
|
|
975
995
|
' const { MongoClient } = requireMongo();',
|
|
976
996
|
' const source = resolveRuntimeSource();',
|
|
977
997
|
' const targetUri = process.env.RESOLVEIO_SUPPORT_QA_MONGO_URL || process.env.RESOLVEIO_RUNNER_QA_MONGO_URL || process.env.MONGO_URL || "mongodb://127.0.0.1:3001/resolveio?directConnection=true";',
|
|
978
|
-
' if (!source.uri) writeResult({ status: "skipped", reason: "missing_live_mongo_uri", result_path: resultPath }, 0);',
|
|
998
|
+
' if (!source.uri) writeResult({ status: isLiveDataRequired() ? "failed" : "skipped", reason: "missing_live_mongo_uri", required: isLiveDataRequired(), result_path: resultPath }, isLiveDataRequired() ? 5 : 0);',
|
|
979
999
|
' if (!isLocalMongoUri(targetUri)) writeResult({ status: "failed", reason: "target_mongo_must_be_localhost", target_uri_redacted: redactUri(targetUri), result_path: resultPath }, 3);',
|
|
980
1000
|
' if (String(source.uri) === String(targetUri)) writeResult({ status: "failed", reason: "source_and_target_mongo_match", result_path: resultPath }, 3);',
|
|
981
1001
|
' const sourceClient = new MongoClient(source.uri, { readPreference: "secondaryPreferred", serverSelectionTimeoutMS: 15000 });',
|