@elisra-devops/docgen-data-provider 1.7.0 → 1.7.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.
Files changed (4) hide show
  1. package/bin/modules/JfrogDataProvider.js +16 -15
  2. package/bin/modules/JfrogDataProvider.js.map +1 -1
  3. package/package.json +1 -1
  4. package/src/modules/JfrogDataProvider.ts +19 -19
package/bin/modules/JfrogDataProvider.js CHANGED
@@ -19,29 +19,30 @@ class JfrogDataProvider {
19
19
  }
20
20
  async getCiDataFromJfrog(jfrogUrl, buildName, buildVersion) {
21
21
  let jfrogHeader = {};
22
- if (this.jfrogToken !== '') {
23
- jfrogHeader['Authorization'] = `Bearer ${this.jfrogToken}`;
24
- }
25
- if (!buildName.startsWith('/')) {
26
- const currentBuildName = buildName;
27
- buildName = '/' + currentBuildName;
28
- }
29
- if (!buildVersion.startsWith('/')) {
30
- const currentBuildVersion = buildVersion;
31
- buildVersion = '/' + currentBuildVersion;
32
- }
33
- let getCiRequestUrl = `${jfrogUrl}/api/build${buildName}${buildVersion}`;
34
- logger_1.default.info(`Querying Jfrog using url ${getCiRequestUrl}`);
35
22
  try {
23
+ if (this.jfrogToken !== '') {
24
+ jfrogHeader['Authorization'] = `Bearer ${this.jfrogToken}`;
25
+ }
26
+ if (!buildName.startsWith('/')) {
27
+ const currentBuildName = buildName;
28
+ buildName = '/' + currentBuildName;
29
+ }
30
+ if (!buildVersion.startsWith('/')) {
31
+ const currentBuildVersion = buildVersion;
32
+ buildVersion = '/' + currentBuildVersion;
33
+ }
34
+ let getCiRequestUrl = `${jfrogUrl}/api/build${buildName}${buildVersion}`;
35
+ logger_1.default.info(`Querying Jfrog using url ${getCiRequestUrl}`);
36
36
  const getCiResponse = this.jfrogToken !== ''
37
37
  ? await tfs_1.TFSServices.getJfrogRequest(getCiRequestUrl, jfrogHeader)
38
38
  : await tfs_1.TFSServices.getJfrogRequest(getCiRequestUrl);
39
39
  logger_1.default.debug(`CI Url from JFROG: ${getCiResponse.buildInfo.url}`);
40
+ return getCiResponse.buildInfo.url;
40
41
  }
41
42
  catch (err) {
42
- logger_1.default.error('Error occurred during querying JFrog using');
43
+ logger_1.default.error(`Error occurred during querying JFrog using: ${err.message}`);
44
+ return '';
43
45
  }
44
- return '';
45
46
  }
46
47
  }
47
48
  exports.default = JfrogDataProvider;
package/bin/modules/JfrogDataProvider.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"JfrogDataProvider.js","sourceRoot":"","sources":["../../src/modules/JfrogDataProvider.ts"],"names":[],"mappings":";;AAAA,wCAA6C;AAE7C,4CAAqC;AAErC,MAAqB,iBAAiB;IAKpC,YAAY,MAAc,EAAE,QAAgB,EAAE,UAAkB;QAJhE,WAAM,GAAW,EAAE,CAAC;QACpB,aAAQ,GAAW,EAAE,CAAC;QACtB,eAAU,GAAW,EAAE,CAAC;QAGtB,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;QACrB,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAC;QACzB,IAAI,CAAC,UAAU,GAAG,UAAU,CAAC;IAC/B,CAAC;IAED,KAAK,CAAC,qCAAqC,CAAC,WAAmB,EAAE,YAAoB;QACnF,IAAI,GAAG,GAAG,GAAG,IAAI,CAAC,MAAM,GAAG,WAAW,oCAAoC,YAAY,gBAAgB,CAAC;QACvG,MAAM,yBAAyB,GAAG,MAAM,iBAAW,CAAC,cAAc,CAAC,GAAG,EAAE,IAAI,CAAC,QAAQ,CAAC,CAAC;QACvF,gBAAM,CAAC,KAAK,CAAC,0BAA0B,IAAI,CAAC,SAAS,CAAC,yBAAyB,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;QACxF,OAAO,yBAAyB,CAAC,GAAG,CAAC;IACvC,CAAC;IAED,KAAK,CAAC,kBAAkB,CAAC,QAAgB,EAAE,SAAiB,EAAE,YAAoB;QAChF,IAAI,WAAW,GAAQ,EAAE,CAAC;QAC1B,IAAI,IAAI,CAAC,UAAU,KAAK,EAAE,EAAE,CAAC;YAC3B,WAAW,CAAC,eAAe,CAAC,GAAG,UAAU,IAAI,CAAC,UAAU,EAAE,CAAC;QAC7D,CAAC;QAED,IAAI,CAAC,SAAS,CAAC,UAAU,CAAC,GAAG,CAAC,EAAE,CAAC;YAC/B,MAAM,gBAAgB,GAAG,SAAS,CAAC;YACnC,SAAS,GAAG,GAAG,GAAG,gBAAgB,CAAC;QACrC,CAAC;QAED,IAAI,CAAC,YAAY,CAAC,UAAU,CAAC,GAAG,CAAC,EAAE,CAAC;YAClC,MAAM,mBAAmB,GAAG,YAAY,CAAC;YACzC,YAAY,GAAG,GAAG,GAAG,mBAAmB,CAAC;QAC3C,CAAC;QACD,IAAI,eAAe,GAAG,GAAG,QAAQ,aAAa,SAAS,GAAG,YAAY,EAAE,CAAC;QACzE,gBAAM,CAAC,IAAI,CAAC,4BAA4B,eAAe,EAAE,CAAC,CAAC;QAE3D,IAAI,CAAC;YACH,MAAM,aAAa,GACjB,IAAI,CAAC,UAAU,KAAK,EAAE;gBACpB,CAAC,CAAC,MAAM,iBAAW,CAAC,eAAe,CAAC,eAAe,EAAE,WAAW,CAAC;gBACjE,CAAC,CAAC,MAAM,iBAAW,CAAC,eAAe,CAAC,eAAe,CAAC,CAAC;YACzD,gBAAM,CAAC,KAAK,CAAC,sBAAsB,aAAa,CAAC,SAAS,CAAC,GAAG,EAAE,CAAC,CAAC;QACpE,CAAC;QAAC,OAAO,GAAQ,EAAE,CAAC;YAClB,gBAAM,CAAC,KAAK,CAAC,4CAA4C,CAAC,CAAC;QAC7D,CAAC;QACD,OAAO,EAAE,CAAC;IACZ,CAAC;CACF;AA/CD,oCA+CC"}
1
+ {"version":3,"file":"JfrogDataProvider.js","sourceRoot":"","sources":["../../src/modules/JfrogDataProvider.ts"],"names":[],"mappings":";;AAAA,wCAA6C;AAE7C,4CAAqC;AAErC,MAAqB,iBAAiB;IAKpC,YAAY,MAAc,EAAE,QAAgB,EAAE,UAAkB;QAJhE,WAAM,GAAW,EAAE,CAAC;QACpB,aAAQ,GAAW,EAAE,CAAC;QACtB,eAAU,GAAW,EAAE,CAAC;QAGtB,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;QACrB,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAC;QACzB,IAAI,CAAC,UAAU,GAAG,UAAU,CAAC;IAC/B,CAAC;IAED,KAAK,CAAC,qCAAqC,CAAC,WAAmB,EAAE,YAAoB;QACnF,IAAI,GAAG,GAAG,GAAG,IAAI,CAAC,MAAM,GAAG,WAAW,oCAAoC,YAAY,gBAAgB,CAAC;QACvG,MAAM,yBAAyB,GAAG,MAAM,iBAAW,CAAC,cAAc,CAAC,GAAG,EAAE,IAAI,CAAC,QAAQ,CAAC,CAAC;QACvF,gBAAM,CAAC,KAAK,CAAC,0BAA0B,IAAI,CAAC,SAAS,CAAC,yBAAyB,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;QACxF,OAAO,yBAAyB,CAAC,GAAG,CAAC;IACvC,CAAC;IAED,KAAK,CAAC,kBAAkB,CAAC,QAAgB,EAAE,SAAiB,EAAE,YAAoB;QAChF,IAAI,WAAW,GAAQ,EAAE,CAAC;QAC1B,IAAI,CAAC;YACH,IAAI,IAAI,CAAC,UAAU,KAAK,EAAE,EAAE,CAAC;gBAC3B,WAAW,CAAC,eAAe,CAAC,GAAG,UAAU,IAAI,CAAC,UAAU,EAAE,CAAC;YAC7D,CAAC;YACD,IAAI,CAAC,SAAS,CAAC,UAAU,CAAC,GAAG,CAAC,EAAE,CAAC;gBAC/B,MAAM,gBAAgB,GAAG,SAAS,CAAC;gBACnC,SAAS,GAAG,GAAG,GAAG,gBAAgB,CAAC;YACrC,CAAC;YAED,IAAI,CAAC,YAAY,CAAC,UAAU,CAAC,GAAG,CAAC,EAAE,CAAC;gBAClC,MAAM,mBAAmB,GAAG,YAAY,CAAC;gBACzC,YAAY,GAAG,GAAG,GAAG,mBAAmB,CAAC;YAC3C,CAAC;YACD,IAAI,eAAe,GAAG,GAAG,QAAQ,aAAa,SAAS,GAAG,YAAY,EAAE,CAAC;YACzE,gBAAM,CAAC,IAAI,CAAC,4BAA4B,eAAe,EAAE,CAAC,CAAC;YAE3D,MAAM,aAAa,GACjB,IAAI,CAAC,UAAU,KAAK,EAAE;gBACpB,CAAC,CAAC,MAAM,iBAAW,CAAC,eAAe,CAAC,eAAe,EAAE,WAAW,CAAC;gBACjE,CAAC,CAAC,MAAM,iBAAW,CAAC,eAAe,CAAC,eAAe,CAAC,CAAC;YACzD,gBAAM,CAAC,KAAK,CAAC,sBAAsB,aAAa,CAAC,SAAS,CAAC,GAAG,EAAE,CAAC,CAAC;YAClE,OAAO,aAAa,CAAC,SAAS,CAAC,GAAG,CAAC;QACrC,CAAC;QAAC,OAAO,GAAQ,EAAE,CAAC;YAClB,gBAAM,CAAC,KAAK,CAAC,+CAA+C,GAAG,CAAC,OAAO,EAAE,CAAC,CAAC;YAC3E,OAAO,EAAE,CAAC;QACZ,CAAC;IACH,CAAC;CACF;AA/CD,oCA+CC"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@elisra-devops/docgen-data-provider",
3
- "version": "1.7.0",
3
+ "version": "1.7.1",
4
4
  "description": "A document generator data provider, aimed to retrive data from azure devops",
5
5
  "repository": {
6
6
  "type": "git",
package/src/modules/JfrogDataProvider.ts CHANGED
@@ -20,33 +20,33 @@ export default class JfrogDataProvider {
20
20
  return serviceConnectionResponse.url;
21
21
  }
22
22
 
23
- async getCiDataFromJfrog(jfrogUrl: string, buildName: string, buildVersion: string) {
23
+ async getCiDataFromJfrog(jfrogUrl: string, buildName: string, buildVersion: string): Promise<string> {
24
24
  let jfrogHeader: any = {};
25
- if (this.jfrogToken !== '') {
26
- jfrogHeader['Authorization'] = `Bearer ${this.jfrogToken}`;
27
- }
28
-
29
- if (!buildName.startsWith('/')) {
30
- const currentBuildName = buildName;
31
- buildName = '/' + currentBuildName;
32
- }
33
-
34
- if (!buildVersion.startsWith('/')) {
35
- const currentBuildVersion = buildVersion;
36
- buildVersion = '/' + currentBuildVersion;
37
- }
38
- let getCiRequestUrl = `${jfrogUrl}/api/build${buildName}${buildVersion}`;
39
- logger.info(`Querying Jfrog using url ${getCiRequestUrl}`);
40
-
41
25
  try {
26
+ if (this.jfrogToken !== '') {
27
+ jfrogHeader['Authorization'] = `Bearer ${this.jfrogToken}`;
28
+ }
29
+ if (!buildName.startsWith('/')) {
30
+ const currentBuildName = buildName;
31
+ buildName = '/' + currentBuildName;
32
+ }
33
+
34
+ if (!buildVersion.startsWith('/')) {
35
+ const currentBuildVersion = buildVersion;
36
+ buildVersion = '/' + currentBuildVersion;
37
+ }
38
+ let getCiRequestUrl = `${jfrogUrl}/api/build${buildName}${buildVersion}`;
39
+ logger.info(`Querying Jfrog using url ${getCiRequestUrl}`);
40
+
42
41
  const getCiResponse =
43
42
  this.jfrogToken !== ''
44
43
  ? await TFSServices.getJfrogRequest(getCiRequestUrl, jfrogHeader)
45
44
  : await TFSServices.getJfrogRequest(getCiRequestUrl);
46
45
  logger.debug(`CI Url from JFROG: ${getCiResponse.buildInfo.url}`);
46
+ return getCiResponse.buildInfo.url;
47
47
  } catch (err: any) {
48
- logger.error('Error occurred during querying JFrog using');
48
+ logger.error(`Error occurred during querying JFrog using: ${err.message}`);
49
+ return '';
49
50
  }
50
- return '';
51
51
  }
52
52
  }