@elisra-devops/docgen-data-provider 1.139.0 → 1.141.0

package/bin/modules/TicketsDataProvider.d.ts

@@ -10,7 +10,7 @@ export default class TicketsDataProvider {
     token: string;
     queriesList: Array<any>;
     private limit;
-    private historicalFieldsOverride;
+    private historicalTestPhaseFieldByProject;
     constructor(orgUrl: string, token: string);
     /**
      * Extracts the Azure DevOps project name from a WIQL URL.
@@ -235,8 +235,8 @@ export default class TicketsDataProvider {
     private historicalErrorMessage;
     private isHistoricalMissingWorkItemError;
     private isHistoricalUnknownFieldError;
-    private extractHistoricalUnknownFieldName;
-    private fetchHistoricalFieldsBatchAttempt;
+    private resolveHistoricalTestPhaseField;
+    private discoverHistoricalTestPhaseField;
     private fetchHistoricalFieldsBatch;
     private fetchHistoricalWorkItemsBatch;
     private executeHistoricalQueryAtAsOf;

package/bin/modules/TicketsDataProvider.js

@@ -46,9 +46,11 @@ class TicketsDataProvider {
         this.token = '';
         this.queriesList = new Array();
         this.limit = pLimit(10);
-        // Set once a workitemsbatch call reports one of HISTORICAL_OPTIONAL_WORK_ITEM_FIELDS
-        // as unknown for this project, so only the first chunk pays the retry cost.
-        this.historicalFieldsOverride = null;
+        // Resolved once per project via resolveHistoricalTestPhaseField, so a
+        // compare's baseline and compareTo snapshots (and repeated queries against
+        // the same provider instance) only pay the discovery call once. Value is
+        // the real reference name, or null if the project defines no such field.
+        this.historicalTestPhaseFieldByProject = new Map();
         this.orgUrl = orgUrl;
         this.token = token;
     }
@@ -611,8 +613,7 @@ class TicketsDataProvider {
                 : null;
         }
         catch (err) {
-            logger_1.default.error(`Error occurred while constructing the customer query list ${err.message} with query ${JSON.stringify(rootQuery)}`);
-            logger_1.default.error(`Error stack ${err.message}`);
+            logger_1.default.error(`Error occurred while constructing the customer query list with query ${JSON.stringify(rootQuery)}`, err);
             return null;
         }
     }
@@ -1636,59 +1637,80 @@ class TicketsDataProvider {
         const message = this.historicalErrorMessage(error);
         return /TF51535|Cannot find field/i.test(message);
     }
-    // ADO's TF51535 names the specific field it couldn't find, e.g.
-    // "TF51535: Cannot find field 'Elisra.TestPhase'." — different networks
-    // define this optional field under different reference names (Elisra.* vs
-    // Custom.*), so drop only the one ADO actually rejected rather than every
-    // optional field, or a network that defines Custom.TestPhase but not
-    // Elisra.TestPhase would lose Test Phase comparison entirely for no reason.
-    extractHistoricalUnknownFieldName(error) {
-        const message = this.historicalErrorMessage(error);
-        const quoted = message.match(/Cannot find field\s*'([^']+)'/i);
-        if (quoted === null || quoted === void 0 ? void 0 : quoted[1])
-            return quoted[1];
-        return HISTORICAL_OPTIONAL_WORK_ITEM_FIELDS.find((field) => message.includes(field)) || null;
+    // Different networks define the "Test Phase" custom field under different
+    // reference names (Elisra.TestPhase vs Custom.TestPhase, or something else
+    // entirely on a third network) — hardcoding candidate names and guessing is
+    // inherently fragile. Resolve the project's real field list once (Fields -
+    // List: GET {org}/{project}/_apis/wit/fields, supported since old TFS API
+    // versions) and use whichever reference name actually matches, by
+    // reference name or by friendly name. Resolves to null if the project
+    // defines no such field at all.
+    //
+    // Caches the in-flight promise, not just the resolved value: a compare's
+    // baseline and compareTo snapshots run concurrently against the same
+    // provider instance, and both would otherwise read the cache before either
+    // had a value to store, issuing the discovery request twice.
+    resolveHistoricalTestPhaseField(project, apiVersion) {
+        const cached = this.historicalTestPhaseFieldByProject.get(project);
+        if (cached)
+            return cached;
+        const promise = this.discoverHistoricalTestPhaseField(project, apiVersion);
+        this.historicalTestPhaseFieldByProject.set(project, promise);
+        return promise;
+    }
+    async discoverHistoricalTestPhaseField(project, apiVersion) {
+        const fieldsUrl = this.appendApiVersion(`${this.orgUrl}${project}/_apis/wit/fields`, apiVersion);
+        try {
+            const response = await tfs_1.TFSServices.getItemContent(fieldsUrl, this.token);
+            const fields = Array.isArray(response === null || response === void 0 ? void 0 : response.value) ? response.value : [];
+            const match = fields.find((field) => HISTORICAL_OPTIONAL_WORK_ITEM_FIELDS.some((candidate) => String((field === null || field === void 0 ? void 0 : field.referenceName) || '').toLowerCase() === candidate.toLowerCase())) || fields.find((field) => /test\s*phase/i.test(String((field === null || field === void 0 ? void 0 : field.name) || '')));
+            const resolved = (match === null || match === void 0 ? void 0 : match.referenceName) ? String(match.referenceName) : null;
+            if (!resolved) {
+                logger_1.default.warn(`[historical-workitems] no Test Phase field defined for project '${project}'`);
+            }
+            return resolved;
+        }
+        catch (error) {
+            logger_1.default.warn(`[historical-workitems] could not list fields for project '${project}' to resolve the ` +
+                `Test Phase field name, omitting it: ${this.historicalErrorMessage(error)}`);
+            return null;
+        }
     }
-    fetchHistoricalFieldsBatchAttempt(workItemsBatchUrl, idChunk, asOf, fieldsForRequest, attemptsRemaining) {
+    fetchHistoricalFieldsBatch(workItemsBatchUrl, idChunk, asOf, project, fieldsForRequest) {
         return this.limit(() => tfs_1.TFSServices.getItemContent(workItemsBatchUrl, this.token, 'post', {
             ids: idChunk,
             asOf,
             fields: fieldsForRequest,
             errorPolicy: 'Omit',
         })).catch((error) => {
-            if (attemptsRemaining <= 0 || !this.isHistoricalUnknownFieldError(error)) {
+            // Defensive net: the resolved field name came from the project's own
+            // field list, so this shouldn't fire, but if it somehow still does,
+            // fall back to the required fields and poison the cache so later
+            // chunks/queries for this project stop requesting it too.
+            const hasOptionalField = HISTORICAL_OPTIONAL_WORK_ITEM_FIELDS.some((f) => fieldsForRequest.includes(f))
+                || fieldsForRequest.some((f) => !HISTORICAL_REQUIRED_WORK_ITEM_FIELDS.includes(f));
+            if (!hasOptionalField || !this.isHistoricalUnknownFieldError(error)) {
                 throw error;
             }
-            const unknownField = this.extractHistoricalUnknownFieldName(error);
-            // Only strip fields this call actually recognizes as droppable
-            // (named explicitly, or one of the known optional fields as a
-            // last-resort fallback if the message doesn't parse) — never strip a
-            // required field, so an unrelated schema issue still surfaces as an
-            // error instead of silently losing data.
-            const reducedFields = unknownField
-                ? fieldsForRequest.filter((field) => field !== unknownField)
-                : fieldsForRequest.filter((field) => !HISTORICAL_OPTIONAL_WORK_ITEM_FIELDS.includes(field));
-            if (reducedFields.length === fieldsForRequest.length) {
-                throw error;
-            }
-            // Concurrent chunks can each discover a different bad field before any
-            // of them updates the shared override — intersect rather than
-            // overwrite, so one chunk's retry never re-requests a field another
-            // chunk already proved invalid for this project.
-            this.historicalFieldsOverride = this.historicalFieldsOverride
-                ? this.historicalFieldsOverride.filter((field) => reducedFields.includes(field))
-                : reducedFields;
-            logger_1.default.warn(`[historical-workitems] field${unknownField ? ` '${unknownField}'` : '(s)'} not defined ` +
-                `for this project; retrying workitemsbatch without it: ${this.historicalErrorMessage(error)}`);
-            return this.fetchHistoricalFieldsBatchAttempt(workItemsBatchUrl, idChunk, asOf, reducedFields, attemptsRemaining - 1);
+            logger_1.default.warn(`[historical-workitems] resolved Test Phase field was rejected by workitemsbatch for ` +
+                `project '${project}'; retrying without it: ${this.historicalErrorMessage(error)}`);
+            this.historicalTestPhaseFieldByProject.set(project, Promise.resolve(null));
+            return this.limit(() => tfs_1.TFSServices.getItemContent(workItemsBatchUrl, this.token, 'post', {
+                ids: idChunk,
+                asOf,
+                fields: HISTORICAL_REQUIRED_WORK_ITEM_FIELDS,
+                errorPolicy: 'Omit',
+            }));
         });
     }
-    fetchHistoricalFieldsBatch(workItemsBatchUrl, idChunk, asOf) {
-        const fieldsForRequest = this.historicalFieldsOverride || HISTORICAL_WORK_ITEM_FIELDS;
-        return this.fetchHistoricalFieldsBatchAttempt(workItemsBatchUrl, idChunk, asOf, fieldsForRequest, HISTORICAL_OPTIONAL_WORK_ITEM_FIELDS.length);
-    }
     async fetchHistoricalWorkItemsBatch(project, ids, asOf, apiVersion) {
         const workItemsBatchUrl = this.appendApiVersion(`${this.orgUrl}${project}/_apis/wit/workitemsbatch`, apiVersion);
+        // Resolved once per project, before any chunk starts, so every chunk
+        // shares the same field list — no per-request guessing or retry race.
+        const testPhaseField = await this.resolveHistoricalTestPhaseField(project, apiVersion);
+        const fieldsForRequest = testPhaseField
+            ? [...HISTORICAL_REQUIRED_WORK_ITEM_FIELDS, testPhaseField]
+            : HISTORICAL_REQUIRED_WORK_ITEM_FIELDS;
         const idChunks = this.chunkHistoricalWorkItemIds(ids);
         try {
             const chunkResults = await Promise.all(idChunks.map((idChunk) => 
@@ -1704,7 +1726,7 @@ class TicketsDataProvider {
             // two units against the shared concurrency cap, not one — otherwise
             // the real ceiling on simultaneous ADO calls would silently double.
             Promise.all([
-                this.fetchHistoricalFieldsBatch(workItemsBatchUrl, idChunk, asOf),
+                this.fetchHistoricalFieldsBatch(workItemsBatchUrl, idChunk, asOf, project, fieldsForRequest),
                 this.limit(() => tfs_1.TFSServices.getItemContent(workItemsBatchUrl, this.token, 'post', {
                     ids: idChunk,
                     asOf,
@@ -2112,8 +2134,10 @@ class TicketsDataProvider {
                 res.push(...subRes.value);
             }
             catch (error) {
-                logger_1.default.error(`error populating workitems array`);
-                logger_1.default.error(JSON.stringify(error));
+                // JSON.stringify(error) on an AxiosError calls its own .toJSON(), which serializes
+                // config.auth.password / config.headers.Authorization — the PAT, in plaintext. Pass
+                // the error as meta instead and let the logger's redact format scrub it.
+                logger_1.default.error(`error populating workitems array`, error);
                 return [];
             }
         }
@@ -2124,8 +2148,10 @@ class TicketsDataProvider {
                 res.push(...subRes.value);
             }
             catch (error) {
-                logger_1.default.error(`error populating workitems array`);
-                logger_1.default.error(JSON.stringify(error));
+                // JSON.stringify(error) on an AxiosError calls its own .toJSON(), which serializes
+                // config.auth.password / config.headers.Authorization — the PAT, in plaintext. Pass
+                // the error as meta instead and let the logger's redact format scrub it.
+                logger_1.default.error(`error populating workitems array`, error);
                 return [];
             }
         }
@@ -2249,8 +2275,9 @@ class TicketsDataProvider {
             return attachmentList;
         }
         catch (e) {
-            logger_1.default.error(`error fetching attachments for work item ${id}`);
-            logger_1.default.error(`${JSON.stringify(e)}`);
+            // JSON.stringify(e) on an Error returns "{}" — own enumerable props only, message/stack
+            // are non-enumerable — so this logged literally nothing useful. Pass it as meta instead.
+            logger_1.default.error(`error fetching attachments for work item ${id}`, e);
             return [];
         }
     }
@@ -2470,8 +2497,7 @@ class TicketsDataProvider {
             return { tree1: tree1Node, tree2: tree2Node };
         }
         catch (err) {
-            logger_1.default.error(`Error occurred while constructing the query list ${err.message} with query ${JSON.stringify(rootQuery)}`);
-            logger_1.default.error(`Error stack ${err.message}`);
+            logger_1.default.error(`Error occurred while constructing the query list with query ${JSON.stringify(rootQuery)}`, err);
         }
     }
     /**