@elisra-devops/docgen-data-provider 1.15.0 → 1.16.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.
Files changed (8) hide show
  1. package/bin/helpers/tfs.js +18 -4
  2. package/bin/helpers/tfs.js.map +1 -1
  3. package/bin/modules/GitDataProvider.d.ts +2 -1
  4. package/bin/modules/GitDataProvider.js +39 -11
  5. package/bin/modules/GitDataProvider.js.map +1 -1
  6. package/package.json +1 -1
  7. package/src/helpers/tfs.ts +17 -6
  8. package/src/modules/GitDataProvider.ts +46 -12
package/bin/helpers/tfs.js CHANGED
@@ -69,6 +69,7 @@ class TFSServices {
69
69
  }
70
70
  }
71
71
  static async getItemContent(url, pat, requestMethod = 'get', data = {}, customHeaders = {}, printError = true) {
72
+ var _a, _b, _c;
72
73
  let config = {
73
74
  headers: customHeaders,
74
75
  method: requestMethod,
@@ -77,11 +78,12 @@ class TFSServices {
77
78
  password: pat,
78
79
  },
79
80
  data: data,
80
- timeout: 2000, // Set timeout to 2 seconds
81
+ timeout: 3000, // Set timeout to 3 seconds
81
82
  };
82
83
  let json;
83
84
  let attempts = 0;
84
85
  const maxAttempts = 3;
86
+ url = url.replace(/ /g, '%20');
85
87
  logger_1.default.silly(`making request:
86
88
  url: ${url}
87
89
  config: ${JSON.stringify(config)}`);
@@ -92,6 +94,9 @@ class TFSServices {
92
94
  return json;
93
95
  }
94
96
  catch (e) {
97
+ logger_1.default.error(`error fetching item content from azure devops at ${url}`);
98
+ //Print all the fields of error:
99
+ logger_1.default.error(`error: ${JSON.stringify((_b = (_a = e.response) === null || _a === void 0 ? void 0 : _a.data) === null || _b === void 0 ? void 0 : _b.message)}`);
95
100
  attempts++;
96
101
  if (e.message.includes('ETIMEDOUT') || (e.message.includes('timeout') && attempts < maxAttempts)) {
97
102
  logger_1.default.warn(`Request timed out. Retrying attempt ${attempts} of ${maxAttempts}...`);
@@ -102,7 +107,7 @@ class TFSServices {
102
107
  // Log detailed error information including the URL
103
108
  logger_1.default.error(`Error making request to Azure DevOps at ${url}: ${e.message}`);
104
109
  logger_1.default.error(`Status: ${e.response.status}`);
105
- logger_1.default.error(`Response Data: ${JSON.stringify(e.response.data)}`);
110
+ logger_1.default.error(`Response Data: ${JSON.stringify((_c = e.response.data) === null || _c === void 0 ? void 0 : _c.message)}`);
106
111
  }
107
112
  else {
108
113
  // Handle other errors (network, etc.)
@@ -141,6 +146,7 @@ class TFSServices {
141
146
  return json;
142
147
  }
143
148
  static async postRequest(url, pat, requestMethod = 'post', data, customHeaders = { headers: { 'Content-Type': 'application/json' } }) {
149
+ var _a;
144
150
  let config = {
145
151
  headers: customHeaders,
146
152
  method: requestMethod,
@@ -158,8 +164,16 @@ class TFSServices {
158
164
  result = await (0, axios_1.default)(url, config);
159
165
  }
160
166
  catch (e) {
161
- logger_1.default.error(`error making post request to azure devops`);
162
- console.log(e);
167
+ if (e.response) {
168
+ // Log detailed error information including the URL
169
+ logger_1.default.error(`Error making request to Azure DevOps at ${url}: ${e.message}`);
170
+ logger_1.default.error(`Status: ${e.response.status}`);
171
+ logger_1.default.error(`Response Data: ${JSON.stringify((_a = e.response.data) === null || _a === void 0 ? void 0 : _a.message)}`);
172
+ }
173
+ else {
174
+ // Handle other errors (network, etc.)
175
+ logger_1.default.error(`Error making request to Azure DevOps at ${url}: ${e.message}`);
176
+ }
163
177
  }
164
178
  return result;
165
179
  }
package/bin/helpers/tfs.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"tfs.js","sourceRoot":"","sources":["../../src/helpers/tfs.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"tfs.js","sourceRoot":"","sources":["../../src/helpers/tfs.ts"],"names":[],"mappings":"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"}
package/bin/modules/GitDataProvider.d.ts CHANGED
@@ -22,10 +22,11 @@ export default class GitDataProvider {
22
22
  GetCommitsInCommitRange(projectId: string, repositoryId: string, fromSha: string, toSha: string): Promise<any>;
23
23
  CreatePullRequestComment(projectName: string, repoID: string, pullRequestID: number, threads: any): Promise<any>;
24
24
  GetPullRequestComments(projectName: string, repoID: string, pullRequestID: number): Promise<any>;
25
- GetCommitsForRepo(projectName: string, repoID: string, branchName?: string): Promise<any>;
25
+ GetCommitsForRepo(projectName: string, repoID: string, versionIdentifier?: string): Promise<any>;
26
26
  GetPullRequestsForRepo(projectName: string, repoID: string): Promise<any>;
27
27
  GetItemsInPullRequestRange(projectId: string, repositoryId: string, pullRequestIDs: any): Promise<any>;
28
28
  GetRepoBranches(projectName: string, repoID: string): Promise<any>;
29
+ GetRepoReferences(projectId: string, repoId: string, gitObjectType: string): Promise<any>;
29
30
  GetCommitBatch(gitUrl: string, itemVersion: GitVersionDescriptor, compareVersion: GitVersionDescriptor): Promise<any[]>;
30
31
  getSubmodulesData(projectName: string, repoId: string, targetVersion: GitVersionDescriptor, sourceVersion: GitVersionDescriptor, allCommitsExtended: any[]): Promise<any[]>;
31
32
  }
package/bin/modules/GitDataProvider.js CHANGED
@@ -264,16 +264,22 @@ class GitDataProvider {
264
264
  let url = `${this.orgUrl}${projectName}/_apis/git/repositories/${repoID}/pullRequests/${pullRequestID}/threads`;
265
265
  return tfs_1.TFSServices.getItemContent(url, this.token, 'get', null, null);
266
266
  }
267
- async GetCommitsForRepo(projectName, repoID, branchName) {
267
+ async GetCommitsForRepo(projectName, repoID, versionIdentifier) {
268
268
  let url;
269
- if (typeof branchName !== 'undefined') {
270
- url = `${this.orgUrl}${projectName}/_apis/git/repositories/${repoID}/commits?searchCriteria.$top=2000&searchCriteria.itemVersion.version=${branchName}`;
269
+ if (typeof versionIdentifier !== 'undefined' || versionIdentifier !== '') {
270
+ url = `${this.orgUrl}${projectName}/_apis/git/repositories/${repoID}/commits?searchCriteria.$top=2000&searchCriteria.itemVersion.version=${versionIdentifier}`;
271
271
  }
272
272
  else {
273
273
  url = `${this.orgUrl}${projectName}/_apis/git/repositories/${repoID}/commits?searchCriteria.$top=2000`;
274
274
  }
275
275
  let res = await tfs_1.TFSServices.getItemContent(url, this.token, 'get', null, null);
276
- return res;
276
+ if (res.count === 0) {
277
+ return [];
278
+ }
279
+ return res.value.map((commit) => ({
280
+ name: `${commit.commitId.slice(0, 7)} - ${commit.comment}`,
281
+ value: commit.commitId,
282
+ }));
277
283
  }
278
284
  async GetPullRequestsForRepo(projectName, repoID) {
279
285
  let url = `${this.orgUrl}${projectName}/_apis/git/repositories/${repoID}/pullrequests?status=completed&includeLinks=true&$top=2000}`;
@@ -327,6 +333,27 @@ class GitDataProvider {
327
333
  let res = await tfs_1.TFSServices.getItemContent(url, this.token, 'get', null, null);
328
334
  return res;
329
335
  }
336
+ async GetRepoReferences(projectId, repoId, gitObjectType) {
337
+ let url = '';
338
+ switch (gitObjectType) {
339
+ case 'tag':
340
+ url = `${this.orgUrl}${projectId}/_apis/git/repositories/${repoId}/refs/tags?api-version=5.1`;
341
+ break;
342
+ case 'branch':
343
+ url = `${this.orgUrl}${projectId}/_apis/git/repositories/${repoId}/refs/heads?api-version=5.1`;
344
+ break;
345
+ default:
346
+ throw new Error(`Unsupported git object type: ${gitObjectType}`);
347
+ }
348
+ const res = await tfs_1.TFSServices.getItemContent(url, this.token, 'get');
349
+ if (res.count === 0) {
350
+ return [];
351
+ }
352
+ return res.value.map((refItem) => ({
353
+ name: refItem.name.replace('refs/heads/', '').replace('refs/tags/', ''),
354
+ value: refItem.name,
355
+ }));
356
+ }
330
357
  async GetCommitBatch(gitUrl, itemVersion, compareVersion) {
331
358
  const allCommitsExtended = [];
332
359
  let skipping = 0;
@@ -388,11 +415,11 @@ class GitDataProvider {
388
415
  ? gitModulesFile.split('\r\n')
389
416
  : gitModulesFile.split('\n');
390
417
  logger_1.default.info(`generating submodules data for ${repoId}`);
391
- let gitSubRepoName = '';
418
+ let gitSubModuleName = '';
392
419
  let gitSubPointerPath = '';
393
420
  for (const gitModuleLine of gitModulesFileLines) {
394
421
  if (gitModuleLine.startsWith('[submodule')) {
395
- gitSubRepoName = gitModuleLine
422
+ gitSubModuleName = gitModuleLine
396
423
  .replace('[submodule "', '')
397
424
  .replace('"]', '')
398
425
  .replace('/', '_')
@@ -431,7 +458,7 @@ class GitDataProvider {
431
458
  checkCommit = allCommitsExtended[checkCommitIndex].commitId;
432
459
  }
433
460
  if (!checkCommit) {
434
- logger_1.default.warn(`commit not found for ${gitSubRepoName}`);
461
+ logger_1.default.warn(`commit not found for ${gitSubModuleName}`);
435
462
  continue;
436
463
  }
437
464
  sourceSha1 = await this.GetFileFromGitRepo(projectName, repoId, gitSubPointerPath, Object.assign(Object.assign({}, sourceVersion), { version: checkCommit }));
@@ -442,22 +469,23 @@ class GitDataProvider {
442
469
  }
443
470
  }
444
471
  if (!sourceSha1) {
445
- logger_1.default.warn(`${gitSubRepoName} pointer not exist in source version ${sourceVersion.versionType} ${sourceVersion.version} in repository ${gitRepoUrl}`);
472
+ logger_1.default.warn(`${gitSubModuleName} pointer not exist in source version ${sourceVersion.versionType} ${sourceVersion.version} in repository ${gitRepoUrl}`);
446
473
  continue;
447
474
  }
448
475
  if (!targetSha1) {
449
- logger_1.default.warn(`${gitSubRepoName} pointer not exist in target version ${targetVersion.versionType} ${targetVersion.version} in repository ${gitRepoUrl}`);
476
+ logger_1.default.warn(`${gitSubModuleName} pointer not exist in target version ${targetVersion.versionType} ${targetVersion.version} in repository ${gitRepoUrl}`);
450
477
  continue;
451
478
  }
452
479
  if (sourceSha1 === targetSha1) {
453
- logger_1.default.warn(`${gitSubRepoName} pointer is the same in source and target version in repository ${gitRepoUrl}`);
480
+ logger_1.default.warn(`${gitSubModuleName} pointer is the same in source and target version in repository ${gitRepoUrl}`);
454
481
  continue;
455
482
  }
456
483
  let subModule = {
457
484
  sourceSha1,
458
485
  targetSha1,
459
486
  gitSubRepoUrl,
460
- gitSubRepoName,
487
+ gitSubRepoName: decodeURIComponent((gitSubRepoUrl === null || gitSubRepoUrl === void 0 ? void 0 : gitSubRepoUrl.split('/').pop()) || ''),
488
+ gitSubModuleName,
461
489
  };
462
490
  submodules.push(subModule);
463
491
  }
package/bin/modules/GitDataProvider.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"GitDataProvider.js","sourceRoot":"","sources":["../../src/modules/GitDataProvider.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"GitDataProvider.js","sourceRoot":"","sources":["../../src/modules/GitDataProvider.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@elisra-devops/docgen-data-provider",
3
- "version": "1.15.0",
3
+ "version": "1.16.0",
4
4
  "description": "A document generator data provider, aimed to retrive data from azure devops",
5
5
  "repository": {
6
6
  "type": "git",
package/src/helpers/tfs.ts CHANGED
@@ -91,12 +91,12 @@ export class TFSServices {
91
91
  password: pat,
92
92
  },
93
93
  data: data,
94
- timeout: 2000, // Set timeout to 2 seconds
94
+ timeout: 3000, // Set timeout to 3 seconds
95
95
  };
96
96
  let json;
97
97
  let attempts = 0;
98
98
  const maxAttempts = 3;
99
-
99
+ url = url.replace(/ /g, '%20');
100
100
  logger.silly(`making request:
101
101
  url: ${url}
102
102
  config: ${JSON.stringify(config)}`);
@@ -107,6 +107,10 @@ export class TFSServices {
107
107
  json = JSON.parse(JSON.stringify(result.data));
108
108
  return json;
109
109
  } catch (e: any) {
110
+ logger.error(`error fetching item content from azure devops at ${url}`);
111
+ //Print all the fields of error:
112
+
113
+ logger.error(`error: ${JSON.stringify(e.response?.data?.message)}`);
110
114
  attempts++;
111
115
  if (e.message.includes('ETIMEDOUT') || (e.message.includes('timeout') && attempts < maxAttempts)) {
112
116
  logger.warn(`Request timed out. Retrying attempt ${attempts} of ${maxAttempts}...`);
@@ -117,7 +121,7 @@ export class TFSServices {
117
121
  // Log detailed error information including the URL
118
122
  logger.error(`Error making request to Azure DevOps at ${url}: ${e.message}`);
119
123
  logger.error(`Status: ${e.response.status}`);
120
- logger.error(`Response Data: ${JSON.stringify(e.response.data)}`);
124
+ logger.error(`Response Data: ${JSON.stringify(e.response.data?.message)}`);
121
125
  } else {
122
126
  // Handle other errors (network, etc.)
123
127
  logger.error(`Error making request to Azure DevOps at ${url}: ${e.message}`);
@@ -177,9 +181,16 @@ export class TFSServices {
177
181
  config: ${JSON.stringify(config)}`);
178
182
  try {
179
183
  result = await axios(url, config);
180
- } catch (e) {
181
- logger.error(`error making post request to azure devops`);
182
- console.log(e);
184
+ } catch (e: any) {
185
+ if (e.response) {
186
+ // Log detailed error information including the URL
187
+ logger.error(`Error making request to Azure DevOps at ${url}: ${e.message}`);
188
+ logger.error(`Status: ${e.response.status}`);
189
+ logger.error(`Response Data: ${JSON.stringify(e.response.data?.message)}`);
190
+ } else {
191
+ // Handle other errors (network, etc.)
192
+ logger.error(`Error making request to Azure DevOps at ${url}: ${e.message}`);
193
+ }
183
194
  }
184
195
  return result;
185
196
  }
package/src/modules/GitDataProvider.ts CHANGED
@@ -1,7 +1,7 @@
1
1
  import { TFSServices } from '../helpers/tfs';
2
2
  import TicketsDataProvider from './TicketsDataProvider';
3
3
  import logger from '../utils/logger';
4
- import { GitVersionDescriptor } from '../models/tfs-data';
4
+ import { GitVersionDescriptor, value } from '../models/tfs-data';
5
5
  export default class GitDataProvider {
6
6
  orgUrl: string = '';
7
7
  token: string = '';
@@ -323,15 +323,22 @@ export default class GitDataProvider {
323
323
  return TFSServices.getItemContent(url, this.token, 'get', null, null);
324
324
  }
325
325
 
326
- async GetCommitsForRepo(projectName: string, repoID: string, branchName?: string) {
326
+ async GetCommitsForRepo(projectName: string, repoID: string, versionIdentifier?: string) {
327
327
  let url: string;
328
- if (typeof branchName !== 'undefined') {
329
- url = `${this.orgUrl}${projectName}/_apis/git/repositories/${repoID}/commits?searchCriteria.$top=2000&searchCriteria.itemVersion.version=${branchName}`;
328
+ if (typeof versionIdentifier !== 'undefined' || versionIdentifier !== '') {
329
+ url = `${this.orgUrl}${projectName}/_apis/git/repositories/${repoID}/commits?searchCriteria.$top=2000&searchCriteria.itemVersion.version=${versionIdentifier}`;
330
330
  } else {
331
331
  url = `${this.orgUrl}${projectName}/_apis/git/repositories/${repoID}/commits?searchCriteria.$top=2000`;
332
332
  }
333
333
  let res: any = await TFSServices.getItemContent(url, this.token, 'get', null, null);
334
- return res;
334
+ if (res.count === 0) {
335
+ return [];
336
+ }
337
+
338
+ return res.value.map((commit: any) => ({
339
+ name: `${commit.commitId.slice(0, 7)} - ${commit.comment}`,
340
+ value: commit.commitId,
341
+ }));
335
342
  }
336
343
 
337
344
  async GetPullRequestsForRepo(projectName: string, repoID: string) {
@@ -395,6 +402,31 @@ export default class GitDataProvider {
395
402
  return res;
396
403
  }
397
404
 
405
+ async GetRepoReferences(projectId: string, repoId: string, gitObjectType: string) {
406
+ let url: string = '';
407
+ switch (gitObjectType) {
408
+ case 'tag':
409
+ url = `${this.orgUrl}${projectId}/_apis/git/repositories/${repoId}/refs/tags?api-version=5.1`;
410
+ break;
411
+ case 'branch':
412
+ url = `${this.orgUrl}${projectId}/_apis/git/repositories/${repoId}/refs/heads?api-version=5.1`;
413
+ break;
414
+ default:
415
+ throw new Error(`Unsupported git object type: ${gitObjectType}`);
416
+ }
417
+
418
+ const res = await TFSServices.getItemContent(url, this.token, 'get');
419
+
420
+ if (res.count === 0) {
421
+ return [];
422
+ }
423
+
424
+ return res.value.map((refItem: any) => ({
425
+ name: refItem.name.replace('refs/heads/', '').replace('refs/tags/', ''),
426
+ value: refItem.name,
427
+ }));
428
+ }
429
+
398
430
  async GetCommitBatch(
399
431
  gitUrl: string,
400
432
  itemVersion: GitVersionDescriptor,
@@ -472,12 +504,12 @@ export default class GitDataProvider {
472
504
 
473
505
  logger.info(`generating submodules data for ${repoId}`);
474
506
 
475
- let gitSubRepoName = '';
507
+ let gitSubModuleName = '';
476
508
  let gitSubPointerPath = '';
477
509
 
478
510
  for (const gitModuleLine of gitModulesFileLines) {
479
511
  if (gitModuleLine.startsWith('[submodule')) {
480
- gitSubRepoName = gitModuleLine
512
+ gitSubModuleName = gitModuleLine
481
513
  .replace('[submodule "', '')
482
514
  .replace('"]', '')
483
515
  .replace('/', '_')
@@ -503,6 +535,7 @@ export default class GitDataProvider {
503
535
  gitSubRepoUrl = gitSubRepoUrlPrefix + '/' + gitSubRepoUrl.replace('../', '');
504
536
  }
505
537
  }
538
+
506
539
  let targetSha1 = await this.GetFileFromGitRepo(projectName, repoId, gitSubPointerPath, targetVersion);
507
540
  let sourceSha1 = await this.GetFileFromGitRepo(projectName, repoId, gitSubPointerPath, sourceVersion);
508
541
  if (!sourceSha1) {
@@ -521,7 +554,7 @@ export default class GitDataProvider {
521
554
  checkCommit = allCommitsExtended[checkCommitIndex].commitId;
522
555
  }
523
556
  if (!checkCommit) {
524
- logger.warn(`commit not found for ${gitSubRepoName}`);
557
+ logger.warn(`commit not found for ${gitSubModuleName}`);
525
558
  continue;
526
559
  }
527
560
  sourceSha1 = await this.GetFileFromGitRepo(projectName, repoId, gitSubPointerPath, {
@@ -537,20 +570,20 @@ export default class GitDataProvider {
537
570
 
538
571
  if (!sourceSha1) {
539
572
  logger.warn(
540
- `${gitSubRepoName} pointer not exist in source version ${sourceVersion.versionType} ${sourceVersion.version} in repository ${gitRepoUrl}`
573
+ `${gitSubModuleName} pointer not exist in source version ${sourceVersion.versionType} ${sourceVersion.version} in repository ${gitRepoUrl}`
541
574
  );
542
575
  continue;
543
576
  }
544
577
 
545
578
  if (!targetSha1) {
546
579
  logger.warn(
547
- `${gitSubRepoName} pointer not exist in target version ${targetVersion.versionType} ${targetVersion.version} in repository ${gitRepoUrl}`
580
+ `${gitSubModuleName} pointer not exist in target version ${targetVersion.versionType} ${targetVersion.version} in repository ${gitRepoUrl}`
548
581
  );
549
582
  continue;
550
583
  }
551
584
  if (sourceSha1 === targetSha1) {
552
585
  logger.warn(
553
- `${gitSubRepoName} pointer is the same in source and target version in repository ${gitRepoUrl}`
586
+ `${gitSubModuleName} pointer is the same in source and target version in repository ${gitRepoUrl}`
554
587
  );
555
588
  continue;
556
589
  }
@@ -559,7 +592,8 @@ export default class GitDataProvider {
559
592
  sourceSha1,
560
593
  targetSha1,
561
594
  gitSubRepoUrl,
562
- gitSubRepoName,
595
+ gitSubRepoName: decodeURIComponent(gitSubRepoUrl?.split('/').pop() || ''),
596
+ gitSubModuleName,
563
597
  };
564
598
  submodules.push(subModule);
565
599
  }