@elisra-devops/docgen-data-provider 1.15.0 → 1.17.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.
- package/bin/helpers/tfs.js +24 -5
- package/bin/helpers/tfs.js.map +1 -1
- package/bin/modules/GitDataProvider.d.ts +5 -3
- package/bin/modules/GitDataProvider.js +77 -20
- package/bin/modules/GitDataProvider.js.map +1 -1
- package/package.json +1 -1
- package/src/helpers/tfs.ts +25 -7
- package/src/modules/GitDataProvider.ts +95 -21
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, _d, _e, _f, _g, _h;
|
|
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:
|
|
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,8 +94,16 @@ class TFSServices {
|
|
|
92
94
|
return json;
|
|
93
95
|
}
|
|
94
96
|
catch (e) {
|
|
97
|
+
logger_1.default.warn(`error fetching item content from azure devops at ${url}`);
|
|
98
|
+
logger_1.default.warn(`error: ${JSON.stringify((_b = (_a = e.response) === null || _a === void 0 ? void 0 : _a.data) === null || _b === void 0 ? void 0 : _b.message)}`);
|
|
99
|
+
if ((_d = (_c = e.response) === null || _c === void 0 ? void 0 : _c.data) === null || _d === void 0 ? void 0 : _d.message.includes('could not be found')) {
|
|
100
|
+
logger_1.default.info(`File does not exist, or you do not have permissions to read it.`);
|
|
101
|
+
return undefined;
|
|
102
|
+
}
|
|
95
103
|
attempts++;
|
|
96
|
-
if (e.message.includes('ETIMEDOUT') ||
|
|
104
|
+
if (e.message.includes('ETIMEDOUT') ||
|
|
105
|
+
e.message.includes('timeout') ||
|
|
106
|
+
(((_g = (_f = (_e = e.response) === null || _e === void 0 ? void 0 : _e.data) === null || _f === void 0 ? void 0 : _f.message) === null || _g === void 0 ? void 0 : _g.includes('timeout')) && attempts < maxAttempts)) {
|
|
97
107
|
logger_1.default.warn(`Request timed out. Retrying attempt ${attempts} of ${maxAttempts}...`);
|
|
98
108
|
continue;
|
|
99
109
|
}
|
|
@@ -102,7 +112,7 @@ class TFSServices {
|
|
|
102
112
|
// Log detailed error information including the URL
|
|
103
113
|
logger_1.default.error(`Error making request to Azure DevOps at ${url}: ${e.message}`);
|
|
104
114
|
logger_1.default.error(`Status: ${e.response.status}`);
|
|
105
|
-
logger_1.default.error(`Response Data: ${JSON.stringify(e.response.data)}`);
|
|
115
|
+
logger_1.default.error(`Response Data: ${JSON.stringify((_h = e.response.data) === null || _h === void 0 ? void 0 : _h.message)}`);
|
|
106
116
|
}
|
|
107
117
|
else {
|
|
108
118
|
// Handle other errors (network, etc.)
|
|
@@ -141,6 +151,7 @@ class TFSServices {
|
|
|
141
151
|
return json;
|
|
142
152
|
}
|
|
143
153
|
static async postRequest(url, pat, requestMethod = 'post', data, customHeaders = { headers: { 'Content-Type': 'application/json' } }) {
|
|
154
|
+
var _a;
|
|
144
155
|
let config = {
|
|
145
156
|
headers: customHeaders,
|
|
146
157
|
method: requestMethod,
|
|
@@ -158,8 +169,16 @@ class TFSServices {
|
|
|
158
169
|
result = await (0, axios_1.default)(url, config);
|
|
159
170
|
}
|
|
160
171
|
catch (e) {
|
|
161
|
-
|
|
162
|
-
|
|
172
|
+
if (e.response) {
|
|
173
|
+
// Log detailed error information including the URL
|
|
174
|
+
logger_1.default.error(`Error making request to Azure DevOps at ${url}: ${e.message}`);
|
|
175
|
+
logger_1.default.error(`Status: ${e.response.status}`);
|
|
176
|
+
logger_1.default.error(`Response Data: ${JSON.stringify((_a = e.response.data) === null || _a === void 0 ? void 0 : _a.message)}`);
|
|
177
|
+
}
|
|
178
|
+
else {
|
|
179
|
+
// Handle other errors (network, etc.)
|
|
180
|
+
logger_1.default.error(`Error making request to Azure DevOps at ${url}: ${e.message}`);
|
|
181
|
+
}
|
|
163
182
|
}
|
|
164
183
|
return result;
|
|
165
184
|
}
|
package/bin/helpers/tfs.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tfs.js","sourceRoot":"","sources":["../../src/helpers/tfs.ts"],"names":[],"mappings":";;;AAAA,iCAA0B;AAC1B,4CAAqC;AAErC,MAAa,WAAW;IACf,MAAM,CAAC,KAAK,CAAC,eAAe,CAAC,GAAW,EAAE,GAAW;QAC1D,IAAI,CAAC;YACH,IAAI,GAAG,GAAG,MAAM,eAAK,CAAC,OAAO,CAAC;gBAC5B,GAAG,EAAE,GAAG;gBACR,OAAO,EAAE,EAAE,cAAc,EAAE,iBAAiB,EAAE;gBAC9C,IAAI,EAAE;oBACJ,QAAQ,EAAE,EAAE;oBACZ,QAAQ,EAAE,GAAG;iBACd;aACF,CAAC,CAAC;YACH,OAAO,GAAG,CAAC;QACb,CAAC;QAAC,OAAO,CAAC,EAAE,CAAC;YACX,gBAAM,CAAC,KAAK,CAAC,mCAAmC,GAAG,EAAE,CAAC,CAAC;YACvD,MAAM,IAAI,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC;QAC7B,CAAC;IACH,CAAC;IAEM,MAAM,CAAC,KAAK,CAAC,6BAA6B,CAC/C,GAAW,EACX,GAAW,EACX,gBAAwB,KAAK,EAC7B,OAAY,EAAE,EACd,gBAAqB,EAAE,EACvB,aAAsB,IAAI;QAE1B,IAAI,MAAM,GAAQ;YAChB,OAAO,EAAE,aAAa;YACtB,MAAM,EAAE,aAAa;YACrB,IAAI,EAAE;gBACJ,QAAQ,EAAE,EAAE;gBACZ,QAAQ,EAAE,GAAG;aACd;YACD,IAAI,EAAE,IAAI;YACV,YAAY,EAAE,aAAa,EAAE,4BAA4B;YACzD,OAAO,EAAE,IAAI,EAAE,2BAA2B;SAC3C,CAAC;QACF,IAAI,IAAI,CAAC;QACT,IAAI,QAAQ,GAAG,CAAC,CAAC;QACjB,MAAM,WAAW,GAAG,CAAC,CAAC;QAEtB,gBAAM,CAAC,KAAK,CAAC;WACN,GAAG;cACA,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;QAEpC,OAAO,QAAQ,GAAG,WAAW,EAAE,CAAC;YAC9B,IAAI,CAAC;gBACH,MAAM,QAAQ,GAAG,MAAM,IAAA,eAAK,EAAC,GAAG,EAAE,MAAM,CAAC,CAAC;gBAE1C,gCAAgC;gBAChC,MAAM,YAAY,GAAG,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC;gBAC7E,MAAM,WAAW,GAAG,QAAQ,CAAC,OAAO,CAAC,cAAc,CAAC,CAAC,CAAC,qCAAqC;gBAC3F,MAAM,QAAQ,GAAG,WAAW,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC,uBAAuB;gBAC1E,OAAO,QAAQ,QAAQ,WAAW,YAAY,EAAE,CAAC;YACnD,CAAC;YAAC,OAAO,CAAM,EAAE,CAAC;gBAChB,QAAQ,EAAE,CAAC;gBACX,IAAI,CAAC,CAAC,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAC,IAAI,QAAQ,GAAG,WAAW,EAAE,CAAC;oBAC9D,gBAAM,CAAC,IAAI,CAAC,uCAAuC,QAAQ,OAAO,WAAW,KAAK,CAAC,CAAC;oBACpF,SAAS;gBACX,CAAC;gBACD,IAAI,UAAU,EAAE,CAAC;oBACf,IAAI,CAAC,CAAC,QAAQ,EAAE,CAAC;wBACf,gBAAM,CAAC,KAAK,CAAC,6CAA6C,GAAG,KAAK,CAAC,CAAC,OAAO,EAAE,CAAC,CAAC;wBAC/E,gBAAM,CAAC,KAAK,CAAC,WAAW,CAAC,CAAC,QAAQ,CAAC,MAAM,EAAE,CAAC,CAAC;wBAC7C,gBAAM,CAAC,KAAK,CAAC,kBAAkB,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;oBACpE,CAAC;yBAAM,CAAC;wBACN,gBAAM,CAAC,KAAK,CAAC,6CAA6C,GAAG,KAAK,CAAC,CAAC,OAAO,EAAE,CAAC,CAAC;oBACjF,CAAC;gBACH,CAAC;gBACD,MAAM,CAAC,CAAC;YACV,CAAC;QACH,CAAC;IACH,CAAC;IAEM,MAAM,CAAC,KAAK,CAAC,cAAc,CAChC,GAAW,EACX,GAAW,EACX,gBAAwB,KAAK,EAC7B,OAAY,EAAE,EACd,gBAAqB,EAAE,EACvB,aAAsB,IAAI
|
|
1
|
+
{"version":3,"file":"tfs.js","sourceRoot":"","sources":["../../src/helpers/tfs.ts"],"names":[],"mappings":"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"}
|
|
@@ -8,7 +8,8 @@ export default class GitDataProvider {
|
|
|
8
8
|
GetTeamProjectGitReposList(teamProject: string): Promise<any>;
|
|
9
9
|
GetGitRepoFromRepoId(repoId: string): Promise<any>;
|
|
10
10
|
GetJsonFileFromGitRepo(projectName: string, repoName: string, filePath: string): Promise<any>;
|
|
11
|
-
GetFileFromGitRepo(projectName: string, repoId: string, fileName: string, version: GitVersionDescriptor): Promise<any>;
|
|
11
|
+
GetFileFromGitRepo(projectName: string, repoId: string, fileName: string, version: GitVersionDescriptor, gitRepoUrl?: string): Promise<any>;
|
|
12
|
+
CheckIfItemExist(gitApiUrl: string, itemPath: string, version: GitVersionDescriptor): Promise<boolean>;
|
|
12
13
|
GetGitRepoFromPrId(pullRequestId: number): Promise<any>;
|
|
13
14
|
GetPullRequestCommits(repositoryId: string, pullRequestId: number): Promise<any>;
|
|
14
15
|
GetPullRequestsLinkedItemsInCommitRange(projectId: string, repositoryId: string, commitRangeArray: any): Promise<any>;
|
|
@@ -22,10 +23,11 @@ export default class GitDataProvider {
|
|
|
22
23
|
GetCommitsInCommitRange(projectId: string, repositoryId: string, fromSha: string, toSha: string): Promise<any>;
|
|
23
24
|
CreatePullRequestComment(projectName: string, repoID: string, pullRequestID: number, threads: any): Promise<any>;
|
|
24
25
|
GetPullRequestComments(projectName: string, repoID: string, pullRequestID: number): Promise<any>;
|
|
25
|
-
GetCommitsForRepo(projectName: string, repoID: string,
|
|
26
|
+
GetCommitsForRepo(projectName: string, repoID: string, versionIdentifier?: string): Promise<any>;
|
|
26
27
|
GetPullRequestsForRepo(projectName: string, repoID: string): Promise<any>;
|
|
27
28
|
GetItemsInPullRequestRange(projectId: string, repositoryId: string, pullRequestIDs: any): Promise<any>;
|
|
28
29
|
GetRepoBranches(projectName: string, repoID: string): Promise<any>;
|
|
29
|
-
|
|
30
|
+
GetRepoReferences(projectId: string, repoId: string, gitObjectType: string): Promise<any>;
|
|
31
|
+
GetCommitBatch(gitUrl: string, itemVersion: GitVersionDescriptor, compareVersion: GitVersionDescriptor, specificItemPath?: string): Promise<any[]>;
|
|
30
32
|
getSubmodulesData(projectName: string, repoId: string, targetVersion: GitVersionDescriptor, sourceVersion: GitVersionDescriptor, allCommitsExtended: any[]): Promise<any[]>;
|
|
31
33
|
}
|
|
@@ -27,7 +27,7 @@ class GitDataProvider {
|
|
|
27
27
|
let jsonObject = JSON.parse(res.content);
|
|
28
28
|
return jsonObject;
|
|
29
29
|
} //GetJsonFileFromGitRepo
|
|
30
|
-
async GetFileFromGitRepo(projectName, repoId, fileName, version) {
|
|
30
|
+
async GetFileFromGitRepo(projectName, repoId, fileName, version, gitRepoUrl = '') {
|
|
31
31
|
// get a single tag
|
|
32
32
|
let versionFix = '';
|
|
33
33
|
try {
|
|
@@ -37,7 +37,8 @@ class GitDataProvider {
|
|
|
37
37
|
versionFix = version.version;
|
|
38
38
|
}
|
|
39
39
|
try {
|
|
40
|
-
let
|
|
40
|
+
let urlPrefix = gitRepoUrl !== '' ? gitRepoUrl : `${this.orgUrl}${projectName}/_apis/git/repositories/${repoId}`;
|
|
41
|
+
let url = `${urlPrefix}/items` +
|
|
41
42
|
`?path=${fileName}&download=true&includeContent=true&recursionLevel=none` +
|
|
42
43
|
`&versionDescriptor.version=${versionFix}` +
|
|
43
44
|
`&versionDescriptor.versionType=${version.versionType}` +
|
|
@@ -51,10 +52,30 @@ class GitDataProvider {
|
|
|
51
52
|
return undefined;
|
|
52
53
|
}
|
|
53
54
|
catch (err) {
|
|
54
|
-
logger_1.default.
|
|
55
|
+
logger_1.default.warn(`File ${fileName} could not be read: ${err.message}`);
|
|
55
56
|
return undefined;
|
|
56
57
|
}
|
|
57
58
|
}
|
|
59
|
+
async CheckIfItemExist(gitApiUrl, itemPath, version) {
|
|
60
|
+
let versionFixed = '';
|
|
61
|
+
try {
|
|
62
|
+
versionFixed = version.version.replace('/', '%2F').replace('#', '%23');
|
|
63
|
+
}
|
|
64
|
+
catch (_a) {
|
|
65
|
+
versionFixed = version.version;
|
|
66
|
+
}
|
|
67
|
+
let url = `${gitApiUrl}/items?path=${itemPath}` +
|
|
68
|
+
`&download=false&recursionLevel=none` +
|
|
69
|
+
`&versionDescriptor.version=${versionFixed}` +
|
|
70
|
+
`&versionDescriptor.versionType=${version.versionType}`;
|
|
71
|
+
try {
|
|
72
|
+
let res = await tfs_1.TFSServices.getItemContent(url, this.token, 'get', {}, {}, false);
|
|
73
|
+
return res ? true : false;
|
|
74
|
+
}
|
|
75
|
+
catch (_b) {
|
|
76
|
+
return false;
|
|
77
|
+
}
|
|
78
|
+
}
|
|
58
79
|
async GetGitRepoFromPrId(pullRequestId) {
|
|
59
80
|
let url = `${this.orgUrl}_apis/git/pullrequests/${pullRequestId}`;
|
|
60
81
|
let res = await tfs_1.TFSServices.getItemContent(url, this.token, 'get');
|
|
@@ -264,16 +285,22 @@ class GitDataProvider {
|
|
|
264
285
|
let url = `${this.orgUrl}${projectName}/_apis/git/repositories/${repoID}/pullRequests/${pullRequestID}/threads`;
|
|
265
286
|
return tfs_1.TFSServices.getItemContent(url, this.token, 'get', null, null);
|
|
266
287
|
}
|
|
267
|
-
async GetCommitsForRepo(projectName, repoID,
|
|
288
|
+
async GetCommitsForRepo(projectName, repoID, versionIdentifier) {
|
|
268
289
|
let url;
|
|
269
|
-
if (typeof
|
|
270
|
-
url = `${this.orgUrl}${projectName}/_apis/git/repositories/${repoID}/commits?searchCriteria.$top=2000&searchCriteria.itemVersion.version=${
|
|
290
|
+
if (typeof versionIdentifier !== 'undefined' || versionIdentifier !== '') {
|
|
291
|
+
url = `${this.orgUrl}${projectName}/_apis/git/repositories/${repoID}/commits?searchCriteria.$top=2000&searchCriteria.itemVersion.version=${versionIdentifier}`;
|
|
271
292
|
}
|
|
272
293
|
else {
|
|
273
294
|
url = `${this.orgUrl}${projectName}/_apis/git/repositories/${repoID}/commits?searchCriteria.$top=2000`;
|
|
274
295
|
}
|
|
275
296
|
let res = await tfs_1.TFSServices.getItemContent(url, this.token, 'get', null, null);
|
|
276
|
-
|
|
297
|
+
if (res.count === 0) {
|
|
298
|
+
return [];
|
|
299
|
+
}
|
|
300
|
+
return res.value.map((commit) => ({
|
|
301
|
+
name: `${commit.commitId.slice(0, 7)} - ${commit.comment}`,
|
|
302
|
+
value: commit.commitId,
|
|
303
|
+
}));
|
|
277
304
|
}
|
|
278
305
|
async GetPullRequestsForRepo(projectName, repoID) {
|
|
279
306
|
let url = `${this.orgUrl}${projectName}/_apis/git/repositories/${repoID}/pullrequests?status=completed&includeLinks=true&$top=2000}`;
|
|
@@ -327,18 +354,47 @@ class GitDataProvider {
|
|
|
327
354
|
let res = await tfs_1.TFSServices.getItemContent(url, this.token, 'get', null, null);
|
|
328
355
|
return res;
|
|
329
356
|
}
|
|
330
|
-
async
|
|
357
|
+
async GetRepoReferences(projectId, repoId, gitObjectType) {
|
|
358
|
+
let url = '';
|
|
359
|
+
switch (gitObjectType) {
|
|
360
|
+
case 'tag':
|
|
361
|
+
url = `${this.orgUrl}${projectId}/_apis/git/repositories/${repoId}/refs/tags?api-version=5.1`;
|
|
362
|
+
break;
|
|
363
|
+
case 'branch':
|
|
364
|
+
url = `${this.orgUrl}${projectId}/_apis/git/repositories/${repoId}/refs/heads?api-version=5.1`;
|
|
365
|
+
break;
|
|
366
|
+
default:
|
|
367
|
+
throw new Error(`Unsupported git object type: ${gitObjectType}`);
|
|
368
|
+
}
|
|
369
|
+
const res = await tfs_1.TFSServices.getItemContent(url, this.token, 'get');
|
|
370
|
+
if (res.count === 0) {
|
|
371
|
+
return [];
|
|
372
|
+
}
|
|
373
|
+
return res.value.map((refItem) => ({
|
|
374
|
+
name: refItem.name.replace('refs/heads/', '').replace('refs/tags/', ''),
|
|
375
|
+
value: refItem.name,
|
|
376
|
+
}));
|
|
377
|
+
}
|
|
378
|
+
async GetCommitBatch(gitUrl, itemVersion, compareVersion, specificItemPath = '') {
|
|
331
379
|
const allCommitsExtended = [];
|
|
332
380
|
let skipping = 0;
|
|
333
381
|
let chunkSize = 100;
|
|
334
382
|
let commitCounter = 0;
|
|
335
383
|
let logToConsoleAfterCommits = 500;
|
|
336
384
|
try {
|
|
337
|
-
let body =
|
|
338
|
-
|
|
339
|
-
|
|
340
|
-
|
|
341
|
-
|
|
385
|
+
let body = specificItemPath === ''
|
|
386
|
+
? {
|
|
387
|
+
itemVersion,
|
|
388
|
+
compareVersion,
|
|
389
|
+
includeWorkItems: true,
|
|
390
|
+
}
|
|
391
|
+
: {
|
|
392
|
+
itemVersion,
|
|
393
|
+
compareVersion,
|
|
394
|
+
includeWorkItems: true,
|
|
395
|
+
itemPath: specificItemPath,
|
|
396
|
+
historyMode: 'fullHistory',
|
|
397
|
+
};
|
|
342
398
|
let url = `${gitUrl}/commitsbatch?$skip=${skipping}&$top=${chunkSize}&api-version=5.1`;
|
|
343
399
|
let commitsResponse = await tfs_1.TFSServices.postRequest(url, this.token, undefined, body);
|
|
344
400
|
let commits = commitsResponse.data;
|
|
@@ -388,11 +444,11 @@ class GitDataProvider {
|
|
|
388
444
|
? gitModulesFile.split('\r\n')
|
|
389
445
|
: gitModulesFile.split('\n');
|
|
390
446
|
logger_1.default.info(`generating submodules data for ${repoId}`);
|
|
391
|
-
let
|
|
447
|
+
let gitSubModuleName = '';
|
|
392
448
|
let gitSubPointerPath = '';
|
|
393
449
|
for (const gitModuleLine of gitModulesFileLines) {
|
|
394
450
|
if (gitModuleLine.startsWith('[submodule')) {
|
|
395
|
-
|
|
451
|
+
gitSubModuleName = gitModuleLine
|
|
396
452
|
.replace('[submodule "', '')
|
|
397
453
|
.replace('"]', '')
|
|
398
454
|
.replace('/', '_')
|
|
@@ -431,7 +487,7 @@ class GitDataProvider {
|
|
|
431
487
|
checkCommit = allCommitsExtended[checkCommitIndex].commitId;
|
|
432
488
|
}
|
|
433
489
|
if (!checkCommit) {
|
|
434
|
-
logger_1.default.warn(`commit not found for ${
|
|
490
|
+
logger_1.default.warn(`commit not found for ${gitSubModuleName}`);
|
|
435
491
|
continue;
|
|
436
492
|
}
|
|
437
493
|
sourceSha1 = await this.GetFileFromGitRepo(projectName, repoId, gitSubPointerPath, Object.assign(Object.assign({}, sourceVersion), { version: checkCommit }));
|
|
@@ -442,22 +498,23 @@ class GitDataProvider {
|
|
|
442
498
|
}
|
|
443
499
|
}
|
|
444
500
|
if (!sourceSha1) {
|
|
445
|
-
logger_1.default.warn(`${
|
|
501
|
+
logger_1.default.warn(`${gitSubModuleName} pointer not exist in source version ${sourceVersion.versionType} ${sourceVersion.version} in repository ${gitRepoUrl}`);
|
|
446
502
|
continue;
|
|
447
503
|
}
|
|
448
504
|
if (!targetSha1) {
|
|
449
|
-
logger_1.default.warn(`${
|
|
505
|
+
logger_1.default.warn(`${gitSubModuleName} pointer not exist in target version ${targetVersion.versionType} ${targetVersion.version} in repository ${gitRepoUrl}`);
|
|
450
506
|
continue;
|
|
451
507
|
}
|
|
452
508
|
if (sourceSha1 === targetSha1) {
|
|
453
|
-
logger_1.default.warn(`${
|
|
509
|
+
logger_1.default.warn(`${gitSubModuleName} pointer is the same in source and target version in repository ${gitRepoUrl}`);
|
|
454
510
|
continue;
|
|
455
511
|
}
|
|
456
512
|
let subModule = {
|
|
457
513
|
sourceSha1,
|
|
458
514
|
targetSha1,
|
|
459
515
|
gitSubRepoUrl,
|
|
460
|
-
gitSubRepoName,
|
|
516
|
+
gitSubRepoName: decodeURIComponent((gitSubRepoUrl === null || gitSubRepoUrl === void 0 ? void 0 : gitSubRepoUrl.split('/').pop()) || ''),
|
|
517
|
+
gitSubModuleName,
|
|
461
518
|
};
|
|
462
519
|
submodules.push(subModule);
|
|
463
520
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"GitDataProvider.js","sourceRoot":"","sources":["../../src/modules/GitDataProvider.ts"],"names":[],"mappings":";;AAAA,wCAA6C;AAC7C,+DAAwD;AACxD,4CAAqC;AAErC,MAAqB,eAAe;IAKlC,YAAY,MAAc,EAAE,KAAa;QAJzC,WAAM,GAAW,EAAE,CAAC;QACpB,UAAK,GAAW,EAAE,CAAC;QAIjB,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;QACrB,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC;QACnB,IAAI,CAAC,mBAAmB,GAAG,IAAI,6BAAmB,CAAC,IAAI,CAAC,MAAM,EAAE,IAAI,CAAC,KAAK,CAAC,CAAC;IAC9E,CAAC;IACD,KAAK,CAAC,0BAA0B,CAAC,WAAmB;QAClD,gBAAM,CAAC,KAAK,CAAC,0CAA0C,WAAW,EAAE,CAAC,CAAC;QACtE,IAAI,GAAG,GAAG,GAAG,IAAI,CAAC,MAAM,IAAI,WAAW,yBAAyB,CAAC;QACjE,OAAO,iBAAW,CAAC,cAAc,CAAC,GAAG,EAAE,IAAI,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC;IAC5D,CAAC,CAAC,oBAAoB;IAEtB,KAAK,CAAC,oBAAoB,CAAC,MAAc;QACvC,gBAAM,CAAC,KAAK,CAAC,8BAA8B,MAAM,EAAE,CAAC,CAAC;QACrD,IAAI,GAAG,GAAG,GAAG,IAAI,CAAC,MAAM,0BAA0B,MAAM,EAAE,CAAC;QAC3D,OAAO,iBAAW,CAAC,cAAc,CAAC,GAAG,EAAE,IAAI,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC;IAC5D,CAAC,CAAC,oBAAoB;IAEtB,KAAK,CAAC,sBAAsB,CAAC,WAAmB,EAAE,QAAgB,EAAE,QAAgB;QAClF,IAAI,GAAG,GAAG,GAAG,IAAI,CAAC,MAAM,GAAG,WAAW,2BAA2B,QAAQ,eAAe,QAAQ,sBAAsB,CAAC;QACvH,IAAI,GAAG,GAAG,MAAM,iBAAW,CAAC,cAAc,CAAC,GAAG,EAAE,IAAI,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC;QACnE,IAAI,UAAU,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;QACzC,OAAO,UAAU,CAAC;IACpB,CAAC,CAAC,wBAAwB;IAE1B,KAAK,CAAC,kBAAkB,CACtB,WAAmB,EACnB,MAAc,EACd,QAAgB,EAChB,OAA6B;QAE7B,mBAAmB;QACnB,IAAI,UAAU,GAAG,EAAE,CAAC;QACpB,IAAI,CAAC;YACH,UAAU,GAAG,OAAO,CAAC,OAAO,CAAC,OAAO,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC,OAAO,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC;QACvE,CAAC;QAAC,WAAM,CAAC;YACP,UAAU,GAAG,OAAO,CAAC,OAAO,CAAC;QAC/B,CAAC;QACD,IAAI,CAAC;YACH,IAAI,GAAG,GACL,GAAG,IAAI,CAAC,MAAM,GAAG,WAAW,2BAA2B,MAAM,QAAQ;gBACrE,SAAS,QAAQ,wDAAwD;gBACzE,8BAA8B,UAAU,EAAE;gBAC1C,kCAAkC,OAAO,CAAC,WAAW,EAAE;gBACvD,kBAAkB,CAAC;YACrB,IAAI,GAAG,GAAG,MAAM,iBAAW,CAAC,cAAc,CAAC,GAAG,EAAE,IAAI,CAAC,KAAK,EAAE,KAAK,EAAE,EAAE,EAAE,EAAE,EAAE,KAAK,CAAC,CAAC;YAClF,IAAI,GAAG,IAAI,GAAG,CAAC,OAAO,EAAE,CAAC;gBACvB,MAAM,WAAW,GAAG,GAAG,CAAC,OAAO,CAAC;gBAChC,oDAAoD;gBACpD,OAAO,WAAW,CAAC;YACrB,CAAC;YACD,OAAO,SAAS,CAAC;QACnB,CAAC;QAAC,OAAO,GAAQ,EAAE,CAAC;YAClB,gBAAM,CAAC,KAAK,CAAC,QAAQ,QAAQ,uBAAuB,GAAG,CAAC,OAAO,EAAE,CAAC,CAAC;YACnE,OAAO,SAAS,CAAC;QACnB,CAAC;IACH,CAAC;IAED,KAAK,CAAC,kBAAkB,CAAC,aAAqB;QAC5C,IAAI,GAAG,GAAG,GAAG,IAAI,CAAC,MAAM,0BAA0B,aAAa,EAAE,CAAC;QAClE,IAAI,GAAG,GAAG,MAAM,iBAAW,CAAC,cAAc,CAAC,GAAG,EAAE,IAAI,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC;QACnE,OAAO,GAAG,CAAC;IACb,CAAC,CAAC,oBAAoB;IAEtB,KAAK,CAAC,qBAAqB,CAAC,YAAoB,EAAE,aAAqB;QACrE,IAAI,GAAG,GAAG,GAAG,IAAI,CAAC,MAAM,0BAA0B,YAAY,iBAAiB,aAAa,UAAU,CAAC;QACvG,IAAI,GAAG,GAAG,MAAM,iBAAW,CAAC,cAAc,CAAC,GAAG,EAAE,IAAI,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC;QACnE,OAAO,GAAG,CAAC;IACb,CAAC,CAAC,oBAAoB;IAEtB,KAAK,CAAC,uCAAuC,CAC3C,SAAiB,EACjB,YAAoB,EACpB,gBAAqB;QAErB,IAAI,yBAAyB,GAAQ,EAAE,CAAC;QACxC,IAAI,eAAe,GAAQ,EAAE,CAAC;QAC9B,0BAA0B;QAC1B,IAAI,GAAG,GAAG,GAAG,IAAI,CAAC,MAAM,GAAG,SAAS,2BAA2B,YAAY,6DAA6D,CAAC;QACzI,gBAAM,CAAC,KAAK,CAAC,gBAAgB,GAAG,EAAE,CAAC,CAAC;QACpC,IAAI,iBAAiB,GAAG,MAAM,iBAAW,CAAC,cAAc,CAAC,GAAG,EAAE,IAAI,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC;QACjF,gBAAM,CAAC,IAAI,CAAC,OAAO,iBAAiB,CAAC,KAAK,2BAA2B,YAAY,EAAE,CAAC,CAAC;QACrF,qDAAqD;QACrD,iBAAiB,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,EAAO,EAAE,EAAE;YAC1C,gBAAgB,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,MAAW,EAAE,EAAE;gBAC7C,IAAI,EAAE,CAAC,eAAe,CAAC,QAAQ,IAAI,MAAM,CAAC,QAAQ,EAAE,CAAC;oBACnD,yBAAyB,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;gBACrC,CAAC;YACH,CAAC,CAAC,CAAC;QACL,CAAC,CAAC,CAAC;QACH,gBAAM,CAAC,IAAI,CACT,4BAA4B,yBAAyB,CAAC,MAAM,2BAA2B,YAAY,EAAE,CACtG,CAAC;QACF,gDAAgD;QAChD,MAAM,OAAO,CAAC,GAAG,CACf,yBAAyB,CAAC,GAAG,CAAC,KAAK,EAAE,EAAO,EAAE,EAAE;YAC9C,IAAI,WAAW,GAAQ,EAAE,CAAC;YAC1B,IAAI,CAAC;gBACH,IAAI,EAAE,CAAC,MAAM,CAAC,SAAS,CAAC,IAAI,EAAE,CAAC;oBAC7B,4BAA4B;oBAC5B,IAAI,GAAG,GAAW,EAAE,CAAC,MAAM,CAAC,SAAS,CAAC,IAAI,CAAC;oBAC3C,WAAW,GAAG,MAAM,iBAAW,CAAC,cAAc,CAAC,GAAG,EAAE,IAAI,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC;oBACvE,gBAAM,CAAC,IAAI,CAAC,OAAO,WAAW,CAAC,KAAK,uBAAuB,EAAE,CAAC,aAAa,EAAE,CAAC,CAAC;oBAC/E,MAAM,OAAO,CAAC,GAAG,CACf,WAAW,CAAC,KAAK,CAAC,GAAG,CAAC,KAAK,EAAE,IAAS,EAAE,EAAE;wBACxC,IAAI,aAAa,GAAG,MAAM,IAAI,CAAC,mBAAmB,CAAC,WAAW,CAAC,SAAS,EAAE,IAAI,CAAC,EAAE,CAAC,CAAC;wBACnF,IAAI,SAAS,GAAQ;4BACnB,QAAQ,EAAE,aAAa;4BACvB,WAAW,EAAE,EAAE;yBAChB,CAAC;wBACF,eAAe,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;oBAClC,CAAC,CAAC,CACH,CAAC;gBACJ,CAAC;YACH,CAAC;YAAC,OAAO,KAAK,EAAE,CAAC;gBACf,gBAAM,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;YACtB,CAAC;QACH,CAAC,CAAC,CACH,CAAC;QACF,OAAO,eAAe,CAAC;IACzB,CAAC,CAAC,8BAA8B;IAEhC,KAAK,CAAC,qBAAqB,CAAC,SAAiB,EAAE,YAAoB,EAAE,WAAgB;QACnF,iCAAiC;QACjC,IAAI,GAAG,GAAQ,EAAE,CAAC;QAClB,IAAI,kBAAkB,GAAQ,EAAE,CAAC;QACjC,gDAAgD;QAChD,KAAK,MAAM,MAAM,IAAI,WAAW,CAAC,KAAK,EAAE,CAAC;YACvC,IAAI,MAAM,CAAC,SAAS,EAAE,CAAC;gBACrB,KAAK,MAAM,EAAE,IAAI,MAAM,CAAC,SAAS,EAAE,CAAC;oBAClC,IAAI,aAAa,GAAG,MAAM,IAAI,CAAC,mBAAmB,CAAC,WAAW,CAAC,SAAS,EAAE,EAAE,CAAC,EAAE,CAAC,CAAC;oBACjF,IAAI,SAAS,GAAQ,EAAE,QAAQ,EAAE,aAAa,EAAE,MAAM,EAAE,MAAM,EAAE,CAAC;oBACjE,kBAAkB,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;gBACrC,CAAC;YACH,CAAC;QACH,CAAC;QACD,gFAAgF;QAChF,IAAI,wBAAwB,GAAG,MAAM,IAAI,CAAC,uCAAuC,CAC/E,SAAS,EACT,YAAY,EACZ,WAAW,CACZ,CAAC;QACF,kCAAkC;QAClC,gBAAM,CAAC,IAAI,CAAC,OAAO,wBAAwB,CAAC,MAAM,sBAAsB,CAAC,CAAC;QAC1E,GAAG,GAAG,CAAC,GAAG,kBAAkB,EAAE,GAAG,wBAAwB,CAAC,CAAC;QAC3D,IAAI,WAAW,GAAQ,EAAE,CAAC;QAC1B,KAAK,IAAI,KAAK,GAAG,CAAC,EAAE,KAAK,GAAG,GAAG,CAAC,MAAM,EAAE,KAAK,EAAE,EAAE,CAAC;YAChD,IAAI,WAAW,CAAC,QAAQ,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,QAAQ,CAAC,EAAE,CAAC,EAAE,CAAC;gBACjD,GAAG,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC;gBACrB,KAAK,EAAE,CAAC;YACV,CAAC;iBAAM,CAAC;gBACN,WAAW,CAAC,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC;YAC3C,CAAC;QACH,CAAC;QACD,OAAO,GAAG,CAAC;IACb,CAAC,CAAC,uBAAuB;IAEzB,KAAK,CAAC,8CAA8C,CAClD,SAAiB,EACjB,YAAoB,EACpB,gBAAqB;QAErB,IAAI,yBAAyB,GAAU,EAAE,CAAC;QAE1C,4CAA4C;QAC5C,IAAI,OAAO,GAAG,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,GAAG,EAAE,CAAC;QAE3D,8BAA8B;QAC9B,IAAI,GAAG,GAAG,GAAG,IAAI,CAAC,MAAM,GAAG,SAAS,2BAA2B,YAAY,6DAA6D,CAAC;QACzI,gBAAM,CAAC,KAAK,CAAC,gBAAgB,GAAG,EAAE,CAAC,CAAC;QACpC,IAAI,iBAAiB,GAAG,MAAM,iBAAW,CAAC,cAAc,CAAC,GAAG,EAAE,IAAI,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC;QACjF,gBAAM,CAAC,IAAI,CAAC,OAAO,iBAAiB,CAAC,KAAK,2BAA2B,YAAY,EAAE,CAAC,CAAC;QAErF,uDAAuD;QACvD,iBAAiB,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,EAAO,EAAE,EAAE;YAC1C,gBAAgB,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,MAAW,EAAE,EAAE;gBAC7C,IAAI,EAAE,CAAC,eAAe,CAAC,QAAQ,IAAI,MAAM,CAAC,QAAQ,EAAE,CAAC;oBACnD,iCAAiC;oBACjC,MAAM,KAAK,GAAG,yBAAyB,OAAO,IAAI,SAAS,SAAS,YAAY,gBAAgB,EAAE,CAAC,aAAa,EAAE,CAAC;oBAEnH,kDAAkD;oBAClD,MAAM,cAAc,GAAG;wBACrB,aAAa,EAAE,EAAE,CAAC,aAAa;wBAC/B,SAAS,EAAE,EAAE,CAAC,SAAS,CAAC,WAAW;wBACnC,YAAY,EAAE,EAAE,CAAC,YAAY;wBAC7B,UAAU,EAAE,EAAE,CAAC,UAAU;wBACzB,KAAK,EAAE,EAAE,CAAC,KAAK;wBACf,WAAW,EAAE,EAAE,CAAC,WAAW;wBAC3B,GAAG,EAAE,KAAK,EAAE,+BAA+B;qBAC5C,CAAC;oBACF,yBAAyB,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC;gBACjD,CAAC;YACH,CAAC,CAAC,CAAC;QACL,CAAC,CAAC,CAAC;QACH,gBAAM,CAAC,IAAI,CACT,4BAA4B,yBAAyB,CAAC,MAAM,2BAA2B,YAAY,EAAE,CACtG,CAAC;QAEF,OAAO,yBAAyB,CAAC;IACnC,CAAC,CAAC,iDAAiD;IAEnD,KAAK,CAAC,mBAAmB,CAAC,SAAiB,EAAE,YAAoB,EAAE,SAAiB;QAClF,IAAI,GAAG,GAAG,GAAG,IAAI,CAAC,MAAM,GAAG,SAAS,2BAA2B,YAAY,YAAY,SAAS,EAAE,CAAC;QACnG,OAAO,iBAAW,CAAC,cAAc,CAAC,GAAG,EAAE,IAAI,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC;IAC5D,CAAC;IAED,KAAK,CAAC,oBAAoB,CAAC,SAAiB,EAAE,OAAe;QAC3D,IAAI,GAAG,GAAG,GAAG,IAAI,CAAC,MAAM,GAAG,SAAS,uBAAuB,OAAO,EAAE,CAAC;QACrE,IAAI,GAAG,GAAG,MAAM,iBAAW,CAAC,cAAc,CAAC,GAAG,EAAE,IAAI,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC;QACnE,OAAO,GAAG,CAAC,aAAa,CAAC;IAC3B,CAAC,CAAC,sBAAsB;IAExB,wBAAwB;IACxB,KAAK,CAAC,yBAAyB,CAAC,SAAiB,EAAE,WAAmB,EAAE,SAAiB;QACvF,IAAI,gBAAgB,GAAQ,EAAE,CAAC;QAC/B,IAAI,GAAG,GAAG,GAAG,IAAI,CAAC,MAAM,GAAG,SAAS,sCAAsC,WAAW,cAAc,SAAS,YAAY,CAAC;QACzH,IAAI,GAAG,GAAG,MAAM,iBAAW,CAAC,cAAc,CAAC,GAAG,EAAE,IAAI,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC;QACnE,gBAAM,CAAC,IAAI,CAAC,YAAY,GAAG,CAAC,KAAK,yBAAyB,WAAW,IAAI,SAAS,EAAE,CAAC,CAAC;QACtF,MAAM,OAAO,CAAC,GAAG,CACf,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,KAAK,EAAE,EAAO,EAAE,EAAE;YAC9B,IAAI,aAAa,GAAG,MAAM,IAAI,CAAC,mBAAmB,CAAC,WAAW,CAAC,SAAS,EAAE,EAAE,CAAC,EAAE,CAAC,CAAC;YACjF,IAAI,SAAS,GAAQ,EAAE,QAAQ,EAAE,aAAa,EAAE,KAAK,EAAE,SAAS,EAAE,CAAC;YACnE,gBAAgB,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;QACnC,CAAC,CAAC,CACH,CAAC;QACF,OAAO,gBAAgB,CAAC;IAC1B,CAAC,CAAC,sBAAsB;IAExB,EAAE;IACF,KAAK,CAAC,wBAAwB,CAC5B,WAAmB,EACnB,eAAsB,EACtB,UAAe,EACf,oBAAiC;;QAEjC,IAAI,kBAAkB,GAAU,EAAE,CAAC;QACnC,IAAI,CAAC;YACH,IAAI,CAAA,eAAe,aAAf,eAAe,uBAAf,eAAe,CAAE,MAAM,MAAK,CAAC,EAAE,CAAC;gBAClC,MAAM,IAAI,KAAK,CAAC,kCAAkC,CAAC,CAAC;YACtD,CAAC;YACD,8BAA8B;YAC9B,IAAI,UAAU,CAAC,GAAG,EAAE,CAAC;gBACnB,MAAM,QAAQ,GAAG,MAAM,iBAAW,CAAC,cAAc,CAAC,UAAU,CAAC,GAAG,EAAE,IAAI,CAAC,KAAK,CAAC,CAAC;gBAC9E,MAAM,UAAU,GAAG,MAAA,QAAQ,CAAC,MAAM,0CAAE,GAAG,CAAC,IAAI,CAAC;gBAC7C,MAAM,mBAAmB,GAAG,MAAA,QAAQ,CAAC,OAAO,0CAAE,EAAE,CAAC;gBACjD,IAAI,UAAU,EAAE,CAAC;oBACf,UAAU,CAAC,KAAK,CAAC,GAAG,UAAU,CAAC;oBAC/B,UAAU,CAAC,WAAW,CAAC,GAAG,mBAAmB,aAAnB,mBAAmB,cAAnB,mBAAmB,GAAI,WAAW,CAAC;gBAC/D,CAAC;YACH,CAAC;YACD,yDAAyD;YACzD,KAAK,MAAM,cAAc,IAAI,eAAe,EAAE,CAAC;gBAC7C,MAAM,EAAE,MAAM,EAAE,GAAG,cAAc,CAAC;gBAClC,IAAI,CAAC,MAAM,CAAC,SAAS,EAAE,CAAC;oBACtB,MAAM,IAAI,KAAK,CAAC,UAAU,MAAM,CAAC,QAAQ,2BAA2B,CAAC,CAAC;gBACxE,CAAC;gBACD,KAAK,MAAM,EAAE,IAAI,MAAM,CAAC,SAAS,EAAE,CAAC;oBAClC,MAAM,iBAAiB,GAAG,MAAM,IAAI,CAAC,mBAAmB,CAAC,WAAW,CAClE,UAAU,CAAC,WAAW,CAAC,EACvB,EAAE,CAAC,EAAE,CACN,CAAC;oBACF,IAAI,SAAS,GAAQ,EAAE,QAAQ,EAAE,iBAAiB,EAAE,MAAM,EAAE,MAAM,EAAE,UAAU,EAAE,CAAC;oBACjF,IAAI,CAAC,oBAAoB,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC;wBACrC,oBAAoB,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC;wBAChC,kBAAkB,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;oBACrC,CAAC;gBACH,CAAC;YACH,CAAC;YAED,IAAI,WAAW,GAAQ,EAAE,CAAC;YAC1B,KAAK,IAAI,KAAK,GAAG,CAAC,EAAE,KAAK,GAAG,kBAAkB,CAAC,MAAM,EAAE,KAAK,EAAE,EAAE,CAAC;gBAC/D,IAAI,WAAW,CAAC,QAAQ,CAAC,kBAAkB,CAAC,KAAK,CAAC,CAAC,QAAQ,CAAC,EAAE,CAAC,EAAE,CAAC;oBAChE,kBAAkB,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC;oBACpC,KAAK,EAAE,CAAC;gBACV,CAAC;qBAAM,CAAC;oBACN,WAAW,CAAC,IAAI,CAAC,kBAAkB,CAAC,KAAK,CAAC,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC;gBAC1D,CAAC;YACH,CAAC;QACH,CAAC;QAAC,OAAO,KAAU,EAAE,CAAC;YACpB,gBAAM,CAAC,KAAK,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;QAC9B,CAAC;QAED,OAAO,kBAAkB,CAAC;IAC5B,CAAC;IAED,KAAK,CAAC,qBAAqB,CACzB,SAAiB,EACjB,YAAoB,EACpB,QAAgB,EAChB,MAAc,EACd,UAAmB;QAEnB,IAAI,GAAW,CAAC;QAChB,IAAI,OAAO,UAAU,KAAK,WAAW,EAAE,CAAC;YACtC,GAAG,GAAG,GAAG,IAAI,CAAC,MAAM,GAAG,SAAS,2BAA2B,YAAY,oCAAoC,QAAQ,0BAA0B,MAAM,qGAAqG,UAAU,EAAE,CAAC;QACvQ,CAAC;aAAM,CAAC;YACN,GAAG,GAAG,GAAG,IAAI,CAAC,MAAM,GAAG,SAAS,2BAA2B,YAAY,oCAAoC,QAAQ,0BAA0B,MAAM,gEAAgE,CAAC;QACtN,CAAC;QACD,OAAO,iBAAW,CAAC,cAAc,CAAC,GAAG,EAAE,IAAI,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC;IAC5D,CAAC,CAAC,uBAAuB;IAEzB,KAAK,CAAC,uBAAuB,CAAC,SAAiB,EAAE,YAAoB,EAAE,OAAe,EAAE,KAAa;QACnG,IAAI,GAAG,GAAG,GAAG,IAAI,CAAC,MAAM,GAAG,SAAS,2BAA2B,YAAY,wCAAwC,OAAO,8BAA8B,KAAK,gEAAgE,CAAC;QAC9N,OAAO,iBAAW,CAAC,cAAc,CAAC,GAAG,EAAE,IAAI,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC;IAC5D,CAAC,CAAC,0CAA0C;IAE5C,KAAK,CAAC,wBAAwB,CAAC,WAAmB,EAAE,MAAc,EAAE,aAAqB,EAAE,OAAY;QACrG,IAAI,GAAG,GAAW,GAAG,IAAI,CAAC,MAAM,GAAG,WAAW,2BAA2B,MAAM,iBAAiB,aAAa,0BAA0B,CAAC;QACxI,IAAI,GAAG,GAAQ,MAAM,iBAAW,CAAC,cAAc,CAAC,GAAG,EAAE,IAAI,CAAC,KAAK,EAAE,MAAM,EAAE,OAAO,EAAE,IAAI,CAAC,CAAC;QACxF,OAAO,GAAG,CAAC;IACb,CAAC;IAED,KAAK,CAAC,sBAAsB,CAAC,WAAmB,EAAE,MAAc,EAAE,aAAqB;QACrF,IAAI,GAAG,GAAW,GAAG,IAAI,CAAC,MAAM,GAAG,WAAW,2BAA2B,MAAM,iBAAiB,aAAa,UAAU,CAAC;QACxH,OAAO,iBAAW,CAAC,cAAc,CAAC,GAAG,EAAE,IAAI,CAAC,KAAK,EAAE,KAAK,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC;IACxE,CAAC;IAED,KAAK,CAAC,iBAAiB,CAAC,WAAmB,EAAE,MAAc,EAAE,UAAmB;QAC9E,IAAI,GAAW,CAAC;QAChB,IAAI,OAAO,UAAU,KAAK,WAAW,EAAE,CAAC;YACtC,GAAG,GAAG,GAAG,IAAI,CAAC,MAAM,GAAG,WAAW,2BAA2B,MAAM,wEAAwE,UAAU,EAAE,CAAC;QAC1J,CAAC;aAAM,CAAC;YACN,GAAG,GAAG,GAAG,IAAI,CAAC,MAAM,GAAG,WAAW,2BAA2B,MAAM,mCAAmC,CAAC;QACzG,CAAC;QACD,IAAI,GAAG,GAAQ,MAAM,iBAAW,CAAC,cAAc,CAAC,GAAG,EAAE,IAAI,CAAC,KAAK,EAAE,KAAK,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC;QACpF,OAAO,GAAG,CAAC;IACb,CAAC;IAED,KAAK,CAAC,sBAAsB,CAAC,WAAmB,EAAE,MAAc;QAC9D,IAAI,GAAG,GAAW,GAAG,IAAI,CAAC,MAAM,GAAG,WAAW,2BAA2B,MAAM,6DAA6D,CAAC;QAE7I,IAAI,GAAG,GAAQ,MAAM,iBAAW,CAAC,cAAc,CAAC,GAAG,EAAE,IAAI,CAAC,KAAK,EAAE,KAAK,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC;QACpF,OAAO,GAAG,CAAC;IACb,CAAC;IAED,KAAK,CAAC,0BAA0B,CAAC,SAAiB,EAAE,YAAoB,EAAE,cAAmB;QAC3F,IAAI,yBAAyB,GAAQ,EAAE,CAAC;QACxC,IAAI,eAAe,GAAQ,EAAE,CAAC;QAC9B,0BAA0B;QAC1B,IAAI,GAAG,GAAG,GAAG,IAAI,CAAC,MAAM,GAAG,SAAS,2BAA2B,YAAY,6DAA6D,CAAC;QACzI,gBAAM,CAAC,KAAK,CAAC,gBAAgB,GAAG,EAAE,CAAC,CAAC;QACpC,IAAI,iBAAiB,GAAG,MAAM,iBAAW,CAAC,cAAc,CAAC,GAAG,EAAE,IAAI,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC;QACjF,gBAAM,CAAC,IAAI,CAAC,OAAO,iBAAiB,CAAC,KAAK,2BAA2B,YAAY,EAAE,CAAC,CAAC;QACrF,qDAAqD;QACrD,iBAAiB,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,EAAO,EAAE,EAAE;YAC1C,cAAc,CAAC,OAAO,CAAC,CAAC,IAAS,EAAE,EAAE;gBACnC,IAAI,IAAI,IAAI,EAAE,CAAC,aAAa,EAAE,CAAC;oBAC7B,yBAAyB,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;gBACrC,CAAC;YACH,CAAC,CAAC,CAAC;QACL,CAAC,CAAC,CAAC;QACH,gBAAM,CAAC,IAAI,CACT,0BAA0B,yBAAyB,CAAC,MAAM,2BAA2B,YAAY,EAAE,CACpG,CAAC;QACF,gDAAgD;QAChD,MAAM,OAAO,CAAC,GAAG,CACf,yBAAyB,CAAC,GAAG,CAAC,KAAK,EAAE,EAAO,EAAE,EAAE;YAC9C,IAAI,WAAW,GAAQ,EAAE,CAAC;YAC1B,IAAI,CAAC;gBACH,IAAI,EAAE,CAAC,MAAM,CAAC,SAAS,CAAC,IAAI,EAAE,CAAC;oBAC7B,4BAA4B;oBAC5B,IAAI,GAAG,GAAW,EAAE,CAAC,MAAM,CAAC,SAAS,CAAC,IAAI,CAAC;oBAC3C,WAAW,GAAG,MAAM,iBAAW,CAAC,cAAc,CAAC,GAAG,EAAE,IAAI,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC;oBACvE,gBAAM,CAAC,IAAI,CAAC,OAAO,WAAW,CAAC,KAAK,uBAAuB,EAAE,CAAC,aAAa,EAAE,CAAC,CAAC;oBAC/E,MAAM,OAAO,CAAC,GAAG,CACf,WAAW,CAAC,KAAK,CAAC,GAAG,CAAC,KAAK,EAAE,IAAS,EAAE,EAAE;wBACxC,IAAI,aAAa,GAAG,MAAM,IAAI,CAAC,mBAAmB,CAAC,WAAW,CAAC,SAAS,EAAE,IAAI,CAAC,EAAE,CAAC,CAAC;wBACnF,IAAI,SAAS,GAAQ;4BACnB,QAAQ,EAAE,aAAa;4BACvB,WAAW,EAAE,EAAE;yBAChB,CAAC;wBACF,eAAe,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;oBAClC,CAAC,CAAC,CACH,CAAC;gBACJ,CAAC;YACH,CAAC;YAAC,OAAO,KAAK,EAAE,CAAC;gBACf,gBAAM,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;YACtB,CAAC;QACH,CAAC,CAAC,CACH,CAAC;QACF,OAAO,eAAe,CAAC;IACzB,CAAC;IAED,KAAK,CAAC,eAAe,CAAC,WAAmB,EAAE,MAAc;QACvD,IAAI,GAAG,GAAW,GAAG,IAAI,CAAC,MAAM,GAAG,WAAW,2BAA2B,MAAM,6CAA6C,CAAC;QAC7H,IAAI,GAAG,GAAQ,MAAM,iBAAW,CAAC,cAAc,CAAC,GAAG,EAAE,IAAI,CAAC,KAAK,EAAE,KAAK,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC;QACpF,OAAO,GAAG,CAAC;IACb,CAAC;IAED,KAAK,CAAC,cAAc,CAClB,MAAc,EACd,WAAiC,EACjC,cAAoC;QAEpC,MAAM,kBAAkB,GAAU,EAAE,CAAC;QACrC,IAAI,QAAQ,GAAG,CAAC,CAAC;QACjB,IAAI,SAAS,GAAG,GAAG,CAAC;QACpB,IAAI,aAAa,GAAG,CAAC,CAAC;QACtB,IAAI,wBAAwB,GAAG,GAAG,CAAC;QACnC,IAAI,CAAC;YACH,IAAI,IAAI,GAAG;gBACT,WAAW;gBACX,cAAc;gBACd,gBAAgB,EAAE,IAAI;aACvB,CAAC;YAEF,IAAI,GAAG,GAAG,GAAG,MAAM,uBAAuB,QAAQ,SAAS,SAAS,kBAAkB,CAAC;YACvF,IAAI,eAAe,GAAG,MAAM,iBAAW,CAAC,WAAW,CAAC,GAAG,EAAE,IAAI,CAAC,KAAK,EAAE,SAAS,EAAE,IAAI,CAAC,CAAC;YACtF,IAAI,OAAO,GAAG,eAAe,CAAC,IAAI,CAAC;YACnC,OAAO,OAAO,CAAC,KAAK,GAAG,CAAC,EAAE,CAAC;gBACzB,KAAK,MAAM,MAAM,IAAI,OAAO,CAAC,KAAK,EAAE,CAAC;oBACnC,IAAI,CAAC;wBACH,IAAI,aAAa,GAAG,wBAAwB,KAAK,CAAC,EAAE,CAAC;4BACnD,gBAAM,CAAC,KAAK,CAAC,iBAAiB,aAAa,GAAG,CAAC,EAAE,CAAC,CAAC;wBACrD,CAAC;wBAED,IAAI,cAAc,GAAQ,EAAE,CAAC;wBAE7B,cAAc,CAAC,QAAQ,CAAC,GAAG,MAAM,CAAC;wBAElC,IAAI,aAAa,GAAG,MAAM,CAAC,SAAS,CAAC,IAAI,CAAC;wBAC1C,IAAI,UAAU,GAAG,MAAM,CAAC,SAAS,CAAC,IAAI,CAAC,QAAQ,EAAE,CAAC,KAAK,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;wBAC/D,cAAc,CAAC,eAAe,CAAC,GAAG,aAAa,CAAC;wBAChD,cAAc,CAAC,YAAY,CAAC,GAAG,UAAU,CAAC;wBAE1C,kBAAkB,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC;oBAC1C,CAAC;oBAAC,OAAO,GAAQ,EAAE,CAAC;wBAClB,MAAM,MAAM,GAAG,8BAA8B,GAAG,CAAC,OAAO,EAAE,CAAC;wBAC3D,MAAM,IAAI,KAAK,CAAC,MAAM,CAAC,CAAC;oBAC1B,CAAC;4BAAS,CAAC;wBACT,aAAa,EAAE,CAAC;oBAClB,CAAC;gBACH,CAAC;gBAED,QAAQ,IAAI,SAAS,CAAC;gBACtB,IAAI,GAAG,GAAG,GAAG,MAAM,uBAAuB,QAAQ,SAAS,SAAS,kBAAkB,CAAC;gBACvF,eAAe,GAAG,MAAM,iBAAW,CAAC,WAAW,CAAC,GAAG,EAAE,IAAI,CAAC,KAAK,EAAE,SAAS,EAAE,IAAI,CAAC,CAAC;gBAClF,OAAO,GAAG,eAAe,CAAC,IAAI,CAAC;YACjC,CAAC;QACH,CAAC;QAAC,OAAO,KAAU,EAAE,CAAC;YACpB,gBAAM,CAAC,KAAK,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;QAC9B,CAAC;QACD,OAAO,kBAAkB,CAAC;IAC5B,CAAC;IAED,KAAK,CAAC,iBAAiB,CACrB,WAAmB,EACnB,MAAc,EACd,aAAmC,EACnC,aAAmC,EACnC,kBAAyB;QAEzB,IAAI,UAAU,GAAU,EAAE,CAAC;QAC3B,IAAI,CAAC;YACH,MAAM,cAAc,GAAG,MAAM,IAAI,CAAC,kBAAkB,CAAC,WAAW,EAAE,MAAM,EAAE,aAAa,EAAE,aAAa,CAAC,CAAC;YACxG,IAAI,UAAU,GAAG,GAAG,IAAI,CAAC,MAAM,GAAG,WAAW,2BAA2B,MAAM,EAAE,CAAC;YACjF,IAAI,CAAC,cAAc,EAAE,CAAC;gBACpB,sBAAsB;gBACtB,OAAO,UAAU,CAAC;YACpB,CAAC;YACD,MAAM,mBAAmB,GAAG,cAAc,CAAC,QAAQ,CAAC,MAAM,CAAC;gBACzD,CAAC,CAAC,cAAc,CAAC,KAAK,CAAC,MAAM,CAAC;gBAC9B,CAAC,CAAC,cAAc,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;YAE/B,gBAAM,CAAC,IAAI,CAAC,kCAAkC,MAAM,EAAE,CAAC,CAAC;YAExD,IAAI,cAAc,GAAG,EAAE,CAAC;YACxB,IAAI,iBAAiB,GAAG,EAAE,CAAC;YAE3B,KAAK,MAAM,aAAa,IAAI,mBAAmB,EAAE,CAAC;gBAChD,IAAI,aAAa,CAAC,UAAU,CAAC,YAAY,CAAC,EAAE,CAAC;oBAC3C,cAAc,GAAG,aAAa;yBAC3B,OAAO,CAAC,cAAc,EAAE,EAAE,CAAC;yBAC3B,OAAO,CAAC,IAAI,EAAE,EAAE,CAAC;yBACjB,OAAO,CAAC,GAAG,EAAE,GAAG,CAAC;yBACjB,IAAI,EAAE,CAAC;oBACV,SAAS;gBACX,CAAC;gBACD,IAAI,aAAa,CAAC,QAAQ,CAAC,SAAS,CAAC,EAAE,CAAC;oBACtC,iBAAiB,GAAG,aAAa,CAAC,OAAO,CAAC,SAAS,EAAE,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC;gBAClE,CAAC;gBACD,IAAI,CAAC,aAAa,CAAC,QAAQ,CAAC,QAAQ,CAAC,EAAE,CAAC;oBACtC,gDAAgD;oBAChD,SAAS;gBACX,CAAC;gBAED,IAAI,aAAa,GAAG,aAAa,CAAC,OAAO,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC;gBAC/D,IAAI,aAAa,CAAC,UAAU,CAAC,KAAK,CAAC,EAAE,CAAC;oBACpC,MAAM,aAAa,GAAG,aAAa,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC;oBACrD,IAAI,aAAa,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;wBAC7B,IAAI,kBAAkB,GAAG,UAAU,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;wBAC/C,IAAI,mBAAmB,GAAG,kBAAkB;6BACzC,KAAK,CAAC,CAAC,EAAE,kBAAkB,CAAC,MAAM,GAAG,aAAa,CAAC,MAAM,CAAC;6BAC1D,IAAI,CAAC,GAAG,CAAC,CAAC;wBACb,aAAa,GAAG,mBAAmB,GAAG,GAAG,GAAG,aAAa,CAAC,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC;oBAC/E,CAAC;gBACH,CAAC;gBACD,IAAI,UAAU,GAAG,MAAM,IAAI,CAAC,kBAAkB,CAAC,WAAW,EAAE,MAAM,EAAE,iBAAiB,EAAE,aAAa,CAAC,CAAC;gBACtG,IAAI,UAAU,GAAG,MAAM,IAAI,CAAC,kBAAkB,CAAC,WAAW,EAAE,MAAM,EAAE,iBAAiB,EAAE,aAAa,CAAC,CAAC;gBACtG,IAAI,CAAC,UAAU,EAAE,CAAC;oBAChB,KACE,IAAI,gBAAgB,GAAG,kBAAkB,CAAC,MAAM,GAAG,CAAC,EACpD,gBAAgB,GAAG,CAAC,EACpB,gBAAgB,EAAE,EAClB,CAAC;wBACD,IAAI,WAAW,GAAG,IAAI,CAAC;wBACvB,MAAM,EAAE,MAAM,EAAE,GAAG,kBAAkB,CAAC,gBAAgB,CAAC,CAAC;wBACxD,IAAI,MAAM,EAAE,CAAC;4BACX,WAAW,GAAG,MAAM,CAAC,QAAQ,CAAC;wBAChC,CAAC;wBACD,+BAA+B;6BAC1B,IAAI,kBAAkB,CAAC,gBAAgB,CAAC,CAAC,QAAQ,EAAE,CAAC;4BACvD,WAAW,GAAG,kBAAkB,CAAC,gBAAgB,CAAC,CAAC,QAAQ,CAAC;wBAC9D,CAAC;wBACD,IAAI,CAAC,WAAW,EAAE,CAAC;4BACjB,gBAAM,CAAC,IAAI,CAAC,wBAAwB,cAAc,EAAE,CAAC,CAAC;4BACtD,SAAS;wBACX,CAAC;wBACD,UAAU,GAAG,MAAM,IAAI,CAAC,kBAAkB,CAAC,WAAW,EAAE,MAAM,EAAE,iBAAiB,kCAC5E,aAAa,KAChB,OAAO,EAAE,WAAW,IACpB,CAAC;wBACH,IAAI,UAAU,EAAE,CAAC;4BACf,OAAO;4BACP,MAAM;wBACR,CAAC;oBACH,CAAC;gBACH,CAAC;gBAED,IAAI,CAAC,UAAU,EAAE,CAAC;oBAChB,gBAAM,CAAC,IAAI,CACT,GAAG,cAAc,wCAAwC,aAAa,CAAC,WAAW,IAAI,aAAa,CAAC,OAAO,kBAAkB,UAAU,EAAE,CAC1I,CAAC;oBACF,SAAS;gBACX,CAAC;gBAED,IAAI,CAAC,UAAU,EAAE,CAAC;oBAChB,gBAAM,CAAC,IAAI,CACT,GAAG,cAAc,wCAAwC,aAAa,CAAC,WAAW,IAAI,aAAa,CAAC,OAAO,kBAAkB,UAAU,EAAE,CAC1I,CAAC;oBACF,SAAS;gBACX,CAAC;gBACD,IAAI,UAAU,KAAK,UAAU,EAAE,CAAC;oBAC9B,gBAAM,CAAC,IAAI,CACT,GAAG,cAAc,mEAAmE,UAAU,EAAE,CACjG,CAAC;oBACF,SAAS;gBACX,CAAC;gBAED,IAAI,SAAS,GAAG;oBACd,UAAU;oBACV,UAAU;oBACV,aAAa;oBACb,cAAc;iBACf,CAAC;gBACF,UAAU,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;YAC7B,CAAC;QACH,CAAC;QAAC,OAAO,KAAU,EAAE,CAAC;YACpB,gBAAM,CAAC,KAAK,CAAC,+BAA+B,KAAK,CAAC,OAAO,EAAE,CAAC,CAAC;QAC/D,CAAC;gBAAS,CAAC;YACT,OAAO,UAAU,CAAC;QACpB,CAAC;IACH,CAAC;CACF;AAvjBD,kCAujBC"}
|
|
1
|
+
{"version":3,"file":"GitDataProvider.js","sourceRoot":"","sources":["../../src/modules/GitDataProvider.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
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:
|
|
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,8 +107,19 @@ export class TFSServices {
|
|
|
107
107
|
json = JSON.parse(JSON.stringify(result.data));
|
|
108
108
|
return json;
|
|
109
109
|
} catch (e: any) {
|
|
110
|
+
logger.warn(`error fetching item content from azure devops at ${url}`);
|
|
111
|
+
logger.warn(`error: ${JSON.stringify(e.response?.data?.message)}`);
|
|
112
|
+
if (e.response?.data?.message.includes('could not be found')) {
|
|
113
|
+
logger.info(`File does not exist, or you do not have permissions to read it.`);
|
|
114
|
+
return undefined;
|
|
115
|
+
}
|
|
116
|
+
|
|
110
117
|
attempts++;
|
|
111
|
-
if (
|
|
118
|
+
if (
|
|
119
|
+
e.message.includes('ETIMEDOUT') ||
|
|
120
|
+
e.message.includes('timeout') ||
|
|
121
|
+
(e.response?.data?.message?.includes('timeout') && attempts < maxAttempts)
|
|
122
|
+
) {
|
|
112
123
|
logger.warn(`Request timed out. Retrying attempt ${attempts} of ${maxAttempts}...`);
|
|
113
124
|
continue;
|
|
114
125
|
}
|
|
@@ -117,7 +128,7 @@ export class TFSServices {
|
|
|
117
128
|
// Log detailed error information including the URL
|
|
118
129
|
logger.error(`Error making request to Azure DevOps at ${url}: ${e.message}`);
|
|
119
130
|
logger.error(`Status: ${e.response.status}`);
|
|
120
|
-
logger.error(`Response Data: ${JSON.stringify(e.response.data)}`);
|
|
131
|
+
logger.error(`Response Data: ${JSON.stringify(e.response.data?.message)}`);
|
|
121
132
|
} else {
|
|
122
133
|
// Handle other errors (network, etc.)
|
|
123
134
|
logger.error(`Error making request to Azure DevOps at ${url}: ${e.message}`);
|
|
@@ -177,9 +188,16 @@ export class TFSServices {
|
|
|
177
188
|
config: ${JSON.stringify(config)}`);
|
|
178
189
|
try {
|
|
179
190
|
result = await axios(url, config);
|
|
180
|
-
} catch (e) {
|
|
181
|
-
|
|
182
|
-
|
|
191
|
+
} catch (e: any) {
|
|
192
|
+
if (e.response) {
|
|
193
|
+
// Log detailed error information including the URL
|
|
194
|
+
logger.error(`Error making request to Azure DevOps at ${url}: ${e.message}`);
|
|
195
|
+
logger.error(`Status: ${e.response.status}`);
|
|
196
|
+
logger.error(`Response Data: ${JSON.stringify(e.response.data?.message)}`);
|
|
197
|
+
} else {
|
|
198
|
+
// Handle other errors (network, etc.)
|
|
199
|
+
logger.error(`Error making request to Azure DevOps at ${url}: ${e.message}`);
|
|
200
|
+
}
|
|
183
201
|
}
|
|
184
202
|
return result;
|
|
185
203
|
}
|
|
@@ -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 = '';
|
|
@@ -35,7 +35,8 @@ export default class GitDataProvider {
|
|
|
35
35
|
projectName: string,
|
|
36
36
|
repoId: string,
|
|
37
37
|
fileName: string,
|
|
38
|
-
version: GitVersionDescriptor
|
|
38
|
+
version: GitVersionDescriptor,
|
|
39
|
+
gitRepoUrl: string = ''
|
|
39
40
|
) {
|
|
40
41
|
// get a single tag
|
|
41
42
|
let versionFix = '';
|
|
@@ -45,12 +46,16 @@ export default class GitDataProvider {
|
|
|
45
46
|
versionFix = version.version;
|
|
46
47
|
}
|
|
47
48
|
try {
|
|
49
|
+
let urlPrefix =
|
|
50
|
+
gitRepoUrl !== '' ? gitRepoUrl : `${this.orgUrl}${projectName}/_apis/git/repositories/${repoId}`;
|
|
51
|
+
|
|
48
52
|
let url =
|
|
49
|
-
`${
|
|
53
|
+
`${urlPrefix}/items` +
|
|
50
54
|
`?path=${fileName}&download=true&includeContent=true&recursionLevel=none` +
|
|
51
55
|
`&versionDescriptor.version=${versionFix}` +
|
|
52
56
|
`&versionDescriptor.versionType=${version.versionType}` +
|
|
53
57
|
`&api-version=5.1`;
|
|
58
|
+
|
|
54
59
|
let res = await TFSServices.getItemContent(url, this.token, 'get', {}, {}, false);
|
|
55
60
|
if (res && res.content) {
|
|
56
61
|
const fileContent = res.content;
|
|
@@ -59,11 +64,36 @@ export default class GitDataProvider {
|
|
|
59
64
|
}
|
|
60
65
|
return undefined;
|
|
61
66
|
} catch (err: any) {
|
|
62
|
-
logger.
|
|
67
|
+
logger.warn(`File ${fileName} could not be read: ${err.message}`);
|
|
63
68
|
return undefined;
|
|
64
69
|
}
|
|
65
70
|
}
|
|
66
71
|
|
|
72
|
+
async CheckIfItemExist(
|
|
73
|
+
gitApiUrl: string,
|
|
74
|
+
itemPath: string,
|
|
75
|
+
version: GitVersionDescriptor
|
|
76
|
+
): Promise<boolean> {
|
|
77
|
+
let versionFixed = '';
|
|
78
|
+
try {
|
|
79
|
+
versionFixed = version.version.replace('/', '%2F').replace('#', '%23');
|
|
80
|
+
} catch {
|
|
81
|
+
versionFixed = version.version;
|
|
82
|
+
}
|
|
83
|
+
|
|
84
|
+
let url =
|
|
85
|
+
`${gitApiUrl}/items?path=${itemPath}` +
|
|
86
|
+
`&download=false&recursionLevel=none` +
|
|
87
|
+
`&versionDescriptor.version=${versionFixed}` +
|
|
88
|
+
`&versionDescriptor.versionType=${version.versionType}`;
|
|
89
|
+
try {
|
|
90
|
+
let res = await TFSServices.getItemContent(url, this.token, 'get', {}, {}, false);
|
|
91
|
+
return res ? true : false;
|
|
92
|
+
} catch {
|
|
93
|
+
return false;
|
|
94
|
+
}
|
|
95
|
+
}
|
|
96
|
+
|
|
67
97
|
async GetGitRepoFromPrId(pullRequestId: number) {
|
|
68
98
|
let url = `${this.orgUrl}_apis/git/pullrequests/${pullRequestId}`;
|
|
69
99
|
let res = await TFSServices.getItemContent(url, this.token, 'get');
|
|
@@ -323,15 +353,22 @@ export default class GitDataProvider {
|
|
|
323
353
|
return TFSServices.getItemContent(url, this.token, 'get', null, null);
|
|
324
354
|
}
|
|
325
355
|
|
|
326
|
-
async GetCommitsForRepo(projectName: string, repoID: string,
|
|
356
|
+
async GetCommitsForRepo(projectName: string, repoID: string, versionIdentifier?: string) {
|
|
327
357
|
let url: string;
|
|
328
|
-
if (typeof
|
|
329
|
-
url = `${this.orgUrl}${projectName}/_apis/git/repositories/${repoID}/commits?searchCriteria.$top=2000&searchCriteria.itemVersion.version=${
|
|
358
|
+
if (typeof versionIdentifier !== 'undefined' || versionIdentifier !== '') {
|
|
359
|
+
url = `${this.orgUrl}${projectName}/_apis/git/repositories/${repoID}/commits?searchCriteria.$top=2000&searchCriteria.itemVersion.version=${versionIdentifier}`;
|
|
330
360
|
} else {
|
|
331
361
|
url = `${this.orgUrl}${projectName}/_apis/git/repositories/${repoID}/commits?searchCriteria.$top=2000`;
|
|
332
362
|
}
|
|
333
363
|
let res: any = await TFSServices.getItemContent(url, this.token, 'get', null, null);
|
|
334
|
-
|
|
364
|
+
if (res.count === 0) {
|
|
365
|
+
return [];
|
|
366
|
+
}
|
|
367
|
+
|
|
368
|
+
return res.value.map((commit: any) => ({
|
|
369
|
+
name: `${commit.commitId.slice(0, 7)} - ${commit.comment}`,
|
|
370
|
+
value: commit.commitId,
|
|
371
|
+
}));
|
|
335
372
|
}
|
|
336
373
|
|
|
337
374
|
async GetPullRequestsForRepo(projectName: string, repoID: string) {
|
|
@@ -395,10 +432,36 @@ export default class GitDataProvider {
|
|
|
395
432
|
return res;
|
|
396
433
|
}
|
|
397
434
|
|
|
435
|
+
async GetRepoReferences(projectId: string, repoId: string, gitObjectType: string) {
|
|
436
|
+
let url: string = '';
|
|
437
|
+
switch (gitObjectType) {
|
|
438
|
+
case 'tag':
|
|
439
|
+
url = `${this.orgUrl}${projectId}/_apis/git/repositories/${repoId}/refs/tags?api-version=5.1`;
|
|
440
|
+
break;
|
|
441
|
+
case 'branch':
|
|
442
|
+
url = `${this.orgUrl}${projectId}/_apis/git/repositories/${repoId}/refs/heads?api-version=5.1`;
|
|
443
|
+
break;
|
|
444
|
+
default:
|
|
445
|
+
throw new Error(`Unsupported git object type: ${gitObjectType}`);
|
|
446
|
+
}
|
|
447
|
+
|
|
448
|
+
const res = await TFSServices.getItemContent(url, this.token, 'get');
|
|
449
|
+
|
|
450
|
+
if (res.count === 0) {
|
|
451
|
+
return [];
|
|
452
|
+
}
|
|
453
|
+
|
|
454
|
+
return res.value.map((refItem: any) => ({
|
|
455
|
+
name: refItem.name.replace('refs/heads/', '').replace('refs/tags/', ''),
|
|
456
|
+
value: refItem.name,
|
|
457
|
+
}));
|
|
458
|
+
}
|
|
459
|
+
|
|
398
460
|
async GetCommitBatch(
|
|
399
461
|
gitUrl: string,
|
|
400
462
|
itemVersion: GitVersionDescriptor,
|
|
401
|
-
compareVersion: GitVersionDescriptor
|
|
463
|
+
compareVersion: GitVersionDescriptor,
|
|
464
|
+
specificItemPath: string = ''
|
|
402
465
|
) {
|
|
403
466
|
const allCommitsExtended: any[] = [];
|
|
404
467
|
let skipping = 0;
|
|
@@ -406,11 +469,20 @@ export default class GitDataProvider {
|
|
|
406
469
|
let commitCounter = 0;
|
|
407
470
|
let logToConsoleAfterCommits = 500;
|
|
408
471
|
try {
|
|
409
|
-
let body =
|
|
410
|
-
|
|
411
|
-
|
|
412
|
-
|
|
413
|
-
|
|
472
|
+
let body =
|
|
473
|
+
specificItemPath === ''
|
|
474
|
+
? {
|
|
475
|
+
itemVersion,
|
|
476
|
+
compareVersion,
|
|
477
|
+
includeWorkItems: true,
|
|
478
|
+
}
|
|
479
|
+
: {
|
|
480
|
+
itemVersion,
|
|
481
|
+
compareVersion,
|
|
482
|
+
includeWorkItems: true,
|
|
483
|
+
itemPath: specificItemPath,
|
|
484
|
+
historyMode: 'fullHistory',
|
|
485
|
+
};
|
|
414
486
|
|
|
415
487
|
let url = `${gitUrl}/commitsbatch?$skip=${skipping}&$top=${chunkSize}&api-version=5.1`;
|
|
416
488
|
let commitsResponse = await TFSServices.postRequest(url, this.token, undefined, body);
|
|
@@ -472,12 +544,12 @@ export default class GitDataProvider {
|
|
|
472
544
|
|
|
473
545
|
logger.info(`generating submodules data for ${repoId}`);
|
|
474
546
|
|
|
475
|
-
let
|
|
547
|
+
let gitSubModuleName = '';
|
|
476
548
|
let gitSubPointerPath = '';
|
|
477
549
|
|
|
478
550
|
for (const gitModuleLine of gitModulesFileLines) {
|
|
479
551
|
if (gitModuleLine.startsWith('[submodule')) {
|
|
480
|
-
|
|
552
|
+
gitSubModuleName = gitModuleLine
|
|
481
553
|
.replace('[submodule "', '')
|
|
482
554
|
.replace('"]', '')
|
|
483
555
|
.replace('/', '_')
|
|
@@ -503,6 +575,7 @@ export default class GitDataProvider {
|
|
|
503
575
|
gitSubRepoUrl = gitSubRepoUrlPrefix + '/' + gitSubRepoUrl.replace('../', '');
|
|
504
576
|
}
|
|
505
577
|
}
|
|
578
|
+
|
|
506
579
|
let targetSha1 = await this.GetFileFromGitRepo(projectName, repoId, gitSubPointerPath, targetVersion);
|
|
507
580
|
let sourceSha1 = await this.GetFileFromGitRepo(projectName, repoId, gitSubPointerPath, sourceVersion);
|
|
508
581
|
if (!sourceSha1) {
|
|
@@ -521,7 +594,7 @@ export default class GitDataProvider {
|
|
|
521
594
|
checkCommit = allCommitsExtended[checkCommitIndex].commitId;
|
|
522
595
|
}
|
|
523
596
|
if (!checkCommit) {
|
|
524
|
-
logger.warn(`commit not found for ${
|
|
597
|
+
logger.warn(`commit not found for ${gitSubModuleName}`);
|
|
525
598
|
continue;
|
|
526
599
|
}
|
|
527
600
|
sourceSha1 = await this.GetFileFromGitRepo(projectName, repoId, gitSubPointerPath, {
|
|
@@ -537,20 +610,20 @@ export default class GitDataProvider {
|
|
|
537
610
|
|
|
538
611
|
if (!sourceSha1) {
|
|
539
612
|
logger.warn(
|
|
540
|
-
`${
|
|
613
|
+
`${gitSubModuleName} pointer not exist in source version ${sourceVersion.versionType} ${sourceVersion.version} in repository ${gitRepoUrl}`
|
|
541
614
|
);
|
|
542
615
|
continue;
|
|
543
616
|
}
|
|
544
617
|
|
|
545
618
|
if (!targetSha1) {
|
|
546
619
|
logger.warn(
|
|
547
|
-
`${
|
|
620
|
+
`${gitSubModuleName} pointer not exist in target version ${targetVersion.versionType} ${targetVersion.version} in repository ${gitRepoUrl}`
|
|
548
621
|
);
|
|
549
622
|
continue;
|
|
550
623
|
}
|
|
551
624
|
if (sourceSha1 === targetSha1) {
|
|
552
625
|
logger.warn(
|
|
553
|
-
`${
|
|
626
|
+
`${gitSubModuleName} pointer is the same in source and target version in repository ${gitRepoUrl}`
|
|
554
627
|
);
|
|
555
628
|
continue;
|
|
556
629
|
}
|
|
@@ -559,7 +632,8 @@ export default class GitDataProvider {
|
|
|
559
632
|
sourceSha1,
|
|
560
633
|
targetSha1,
|
|
561
634
|
gitSubRepoUrl,
|
|
562
|
-
gitSubRepoName,
|
|
635
|
+
gitSubRepoName: decodeURIComponent(gitSubRepoUrl?.split('/').pop() || ''),
|
|
636
|
+
gitSubModuleName,
|
|
563
637
|
};
|
|
564
638
|
submodules.push(subModule);
|
|
565
639
|
}
|