zcatalyst-cli 1.20.1 → 1.20.2

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 (7) hide show
  1. package/lib/fn-utils/lib/common.js +5 -2
  2. package/lib/serve/features/appsail.js +3 -1
  3. package/lib/serve/features/index.js +4 -1
  4. package/lib/serve/features/slate.js +3 -1
  5. package/lib/util_modules/constants/lib/default.js +3 -0
  6. package/package.json +1 -1
  7. package/scripts/send-notification.js +5 -2
package/lib/fn-utils/lib/common.js CHANGED
@@ -414,7 +414,9 @@ function resolveAllFnServePort(targets) {
414
414
  }
415
415
  const httpPort = yield port_resolver_1.default.getPort(curTargetType, 'http', {
416
416
  name: target.name,
417
- duplicateCheck: curTargetType === constants_1.FN_TYPE.advanced || curTargetType === constants_1.FN_TYPE.browserLogic
417
+ duplicateCheck: curTargetType === constants_1.FN_TYPE.advanced ||
418
+ curTargetType === constants_1.FN_TYPE.browserLogic,
419
+ searchSpan: constants_1.DEFAULT.serve_port.search_span.http_port
418
420
  });
419
421
  if (curTargetType === constants_1.FN_TYPE.basic) {
420
422
  runtime_store_1.default.set('context.port.http.' + constants_1.FN_TYPE.basic, httpPort);
@@ -445,7 +447,8 @@ function resolveAllFnPorts(targets) {
445
447
  case 'functions:shell': {
446
448
  if (runtime_store_1.default.get('context.port.http.' + constants_1.FN_TYPE.basic, false)) {
447
449
  const bioHttpPort = yield port_resolver_1.default.getPort('bio', 'http', {
448
- duplicateCheck: false
450
+ duplicateCheck: false,
451
+ searchSpan: constants_1.DEFAULT.serve_port.search_span.http_port
449
452
  });
450
453
  runtime_store_1.default.set('context.port.http.' + constants_1.FN_TYPE.basic, bioHttpPort);
451
454
  }
package/lib/serve/features/appsail.js CHANGED
@@ -17,6 +17,7 @@ const error_1 = __importDefault(require("../../error"));
17
17
  const port_resolver_1 = __importDefault(require("../../port-resolver"));
18
18
  const runtime_store_1 = __importDefault(require("../../runtime-store"));
19
19
  const config_1 = require("../../util_modules/config");
20
+ const constants_1 = require("../../util_modules/constants");
20
21
  const logger_1 = require("../../util_modules/logger");
21
22
  exports.default = () => __awaiter(void 0, void 0, void 0, function* () {
22
23
  const allTargets = yield config_1.appSailConfig.getAllTargetDetails();
@@ -39,7 +40,8 @@ exports.default = () => __awaiter(void 0, void 0, void 0, function* () {
39
40
  });
40
41
  const appsailPort = yield port_resolver_1.default.getPort('appsail', 'http', {
41
42
  name: targ.name + '_proxy',
42
- server: 'service'
43
+ server: 'service',
44
+ searchSpan: constants_1.DEFAULT.serve_port.search_span.http_port
43
45
  });
44
46
  return Object.assign(Object.assign({}, targ), { port: { appsail: appsailPort, proxy: proxyPort }, trigger: { kill: false } });
45
47
  })));
package/lib/serve/features/index.js CHANGED
@@ -55,7 +55,10 @@ function client() {
55
55
  return;
56
56
  }
57
57
  const clientName = runtime_store_1.default.get('context.client.name');
58
- const finalPort = yield port_resolver_1.default.getPort('client', 'http', { name: clientName });
58
+ const finalPort = yield port_resolver_1.default.getPort('client', 'http', {
59
+ name: clientName,
60
+ searchSpan: constants_1.DEFAULT.serve_port.search_span.http_port
61
+ });
59
62
  runtime_store_1.default.set('context.port.http.client.' + clientName, finalPort);
60
63
  });
61
64
  }
package/lib/serve/features/slate.js CHANGED
@@ -17,6 +17,7 @@ const port_resolver_1 = __importDefault(require("../../port-resolver"));
17
17
  const runtime_store_1 = __importDefault(require("../../runtime-store"));
18
18
  const slate_utils_1 = require("../../slate-utils");
19
19
  const config_1 = require("../../util_modules/config");
20
+ const constants_1 = require("../../util_modules/constants");
20
21
  const logger_1 = require("../../util_modules/logger");
21
22
  exports.default = () => __awaiter(void 0, void 0, void 0, function* () {
22
23
  const allTargets = yield config_1.slateConfig.getAllTargetDetails();
@@ -39,7 +40,8 @@ exports.default = () => __awaiter(void 0, void 0, void 0, function* () {
39
40
  });
40
41
  const slatePort = yield port_resolver_1.default.getPort('slate', 'http', {
41
42
  name: targ.name + '_proxy',
42
- server: 'service'
43
+ server: 'service',
44
+ searchSpan: constants_1.DEFAULT.serve_port.search_span.http_port
43
45
  });
44
46
  return Object.assign(Object.assign({}, targ), { port: { slate: slatePort, proxy: proxyPort }, trigger: { kill: false } });
45
47
  })));
package/lib/util_modules/constants/lib/default.js CHANGED
@@ -32,6 +32,9 @@ exports.default = Object.freeze({
32
32
  browser_logic: 8400,
33
33
  appsail: -1,
34
34
  client: -1
35
+ },
36
+ search_span: {
37
+ http_port: 200
35
38
  }
36
39
  },
37
40
  event_bus: {
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "zcatalyst-cli",
3
- "version": "1.20.1",
3
+ "version": "1.20.2",
4
4
  "description": "Command Line Tool for CATALYST",
5
5
  "main": "./lib/index.js",
6
6
  "bin": {
package/scripts/send-notification.js CHANGED
@@ -8,7 +8,6 @@ const NPM_REGISTRY_LINK = process.env.NPM_REGISTRY_LINK;
8
8
  const RELEASE_NOTES_LINK = process.env.RELEASE_NOTES_LINK;
9
9
  const API_KEY = process.env.API_KEY;
10
10
  const MERGE_REQUEST_ID = process.env.CI_MERGE_REQUEST_IID;
11
- const BOT_NAME = 'dxupdates';
12
11
 
13
12
  const INSTALL_COMMAND = `npm install -g zcatalyst-cli@${VERSION}`;
14
13
  const CHANNEL_NAMES = (process.env.CHANNEL_NAMES || '').split(',');
@@ -23,6 +22,10 @@ const notify = async () => {
23
22
  }
24
23
  const message = {
25
24
  text,
25
+ bot: {
26
+ name: 'Dx Tools Update',
27
+ image: 'https://www.zohowebstatic.com/sites/default/files/catalyst/catalyst-logo.svg'
28
+ },
26
29
  card: {
27
30
  title: 'Announcement',
28
31
  thumbnail: 'https://public-catlab-development.zohostratus.in/megaphone.gif',
@@ -53,7 +56,7 @@ const notify = async () => {
53
56
  try {
54
57
  const reqOpts = {
55
58
  hostname: 'cliq.zoho.com',
56
- path: `/company/64396901/api/v2/channelsbyname/${channel}/message?zapikey=${API_KEY}&bot_unique_name=${BOT_NAME}`,
59
+ path: `/company/64396901/api/v2/channelsbyname/${channel}/message?zapikey=${API_KEY}`,
57
60
  qs: {},
58
61
  method: 'POST',
59
62
  headers: {