zcatalyst-cli 1.20.0 → 1.20.2

package/lib/commands/ds/import.js

@@ -49,7 +49,7 @@ exports.default = new command_1.default('ds:import [file]')
     const env = (0, option_1.getOptionValue)('production', false) ? 'Production' : 'Development';
     const configPath = (0, option_1.getOptionValue)('config', false);
     const importConfig = configPath ? yield getWriteConfigFromPath(configPath) : {};
-    const tableId = (0, option_1.getOptionValue)('table', importConfig.table_identifier + '');
+    const tableId = (0, option_1.getOptionValue)('table', importConfig.table_identifier);
     if (!tableId) {
         throw new error_1.default('Table identifier missing', { exit: 0, errorId: 'IMP-1' });
     }
@@ -89,8 +89,9 @@ exports.default = new command_1.default('ds:import [file]')
                     ]
                 });
             }
+            const fileName = uploadFile ? (0, path_1.basename)(uploadFile) : '';
             try {
-                yield bucketAPI.uploadObject(bucketName, uploadFile, fs_1.SYNC.getReadStream((0, path_1.resolve)(uploadFile)));
+                yield bucketAPI.uploadObject(bucketName, fileName, fs_1.SYNC.getReadStream((0, path_1.resolve)(uploadFile)));
             }
             catch (err) {
                 throw new error_1.default('Error while uploading the object to the stratus. Use --verbose for error details', {
@@ -100,7 +101,7 @@ exports.default = new command_1.default('ds:import [file]')
             }
             const objDetail = {
                 bucket_name: bucketName,
-                object_key: uploadFile
+                object_key: fileName
             };
             importConfig.object_details = objDetail;
         }
@@ -109,7 +110,7 @@ exports.default = new command_1.default('ds:import [file]')
         }
     }
     const bulkAPI = yield (0, endpoints_1.bulkDSAPI)({ env });
-    const writeResponse = (yield bulkAPI.write(tableId, importConfig));
+    const writeResponse = (yield bulkAPI.write(tableId + '', importConfig));
     (0, logger_1.info)();
     (0, logger_1.success)(`Successfully scheduled import job for table "${tableId}" with jobid "${writeResponse.job_id}"`);
     if ((0, env_1.isPrimaryShell)()) {

package/lib/fn-utils/lib/common.js

@@ -317,7 +317,7 @@ function pack(target) {
                     const tmpDir = (0, path_1.join)((0, os_1.tmpdir)(), '.catalyst', 'python', target.name + Date.now().toString());
                     yield fs_1.ASYNC.ensureDir(tmpDir);
                     yield fs_1.ASYNC.emptyDir(tmpDir);
-                    yield (0, pip_install_1.installRequirements)(reqFile, tmpDir, target.stack.replace('python_', ''), (0, os_1.platform)() === 'linux');
+                    yield (0, pip_install_1.installRequirements)(reqFile, tmpDir, target.stack.replace('python_', ''), true);
                     const files = yield fs_1.ASYNC.walk(tmpDir);
                     files.forEach((file) => {
                         zip.add(file.path.replace(tmpDir + path_1.sep, ''), file.stats.isSymbolicLink()
@@ -414,7 +414,9 @@ function resolveAllFnServePort(targets) {
             }
             const httpPort = yield port_resolver_1.default.getPort(curTargetType, 'http', {
                 name: target.name,
-                duplicateCheck: curTargetType === constants_1.FN_TYPE.advanced || curTargetType === constants_1.FN_TYPE.browserLogic
+                duplicateCheck: curTargetType === constants_1.FN_TYPE.advanced ||
+                    curTargetType === constants_1.FN_TYPE.browserLogic,
+                searchSpan: constants_1.DEFAULT.serve_port.search_span.http_port
             });
             if (curTargetType === constants_1.FN_TYPE.basic) {
                 runtime_store_1.default.set('context.port.http.' + constants_1.FN_TYPE.basic, httpPort);
@@ -445,7 +447,8 @@ function resolveAllFnPorts(targets) {
             case 'functions:shell': {
                 if (runtime_store_1.default.get('context.port.http.' + constants_1.FN_TYPE.basic, false)) {
                     const bioHttpPort = yield port_resolver_1.default.getPort('bio', 'http', {
-                        duplicateCheck: false
+                        duplicateCheck: false,
+                        searchSpan: constants_1.DEFAULT.serve_port.search_span.http_port
                     });
                     runtime_store_1.default.set('context.port.http.' + constants_1.FN_TYPE.basic, bioHttpPort);
                 }

package/lib/fn-utils/lib/python.js

@@ -37,7 +37,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.removeRequirements = exports.validate = void 0;
 const ansi_colors_1 = require("ansi-colors");
-const os_1 = __importStar(require("os"));
+const os_1 = require("os");
 const path_1 = __importStar(require("path"));
 const error_1 = __importDefault(require("../../error"));
 const ensure_python_1 = require("../../init/dependencies/python/ensure-python");
@@ -111,7 +111,7 @@ function removeRequirements(reqFile, target) {
         const tmpDir = (0, path_1.join)((0, os_1.tmpdir)(), '.catalyst', 'python', Date.now().toString());
         yield fs_1.ASYNC.ensureDir(tmpDir);
         yield fs_1.ASYNC.emptyDir(tmpDir);
-        yield (0, pip_install_1.installRequirements)(reqFile, tmpDir, (_a = target.stack) === null || _a === void 0 ? void 0 : _a.replace('python_', ''), os_1.default.platform() === 'linux');
+        yield (0, pip_install_1.installRequirements)(reqFile, tmpDir, (_a = target.stack) === null || _a === void 0 ? void 0 : _a.replace('python_', ''), true);
         const files = yield fs_1.ASYNC.walk(tmpDir, { depth: 1, includeDirPaths: true });
         yield Promise.all(files.map((file) => __awaiter(this, void 0, void 0, function* () {
             yield fs_1.ASYNC.deleteFile((0, path_1.join)(target.source, path_1.default.basename(file.path)));

package/lib/serve/features/appsail.js

@@ -17,6 +17,7 @@ const error_1 = __importDefault(require("../../error"));
 const port_resolver_1 = __importDefault(require("../../port-resolver"));
 const runtime_store_1 = __importDefault(require("../../runtime-store"));
 const config_1 = require("../../util_modules/config");
+const constants_1 = require("../../util_modules/constants");
 const logger_1 = require("../../util_modules/logger");
 exports.default = () => __awaiter(void 0, void 0, void 0, function* () {
     const allTargets = yield config_1.appSailConfig.getAllTargetDetails();
@@ -39,7 +40,8 @@ exports.default = () => __awaiter(void 0, void 0, void 0, function* () {
         });
         const appsailPort = yield port_resolver_1.default.getPort('appsail', 'http', {
             name: targ.name + '_proxy',
-            server: 'service'
+            server: 'service',
+            searchSpan: constants_1.DEFAULT.serve_port.search_span.http_port
         });
         return Object.assign(Object.assign({}, targ), { port: { appsail: appsailPort, proxy: proxyPort }, trigger: { kill: false } });
     })));

package/lib/serve/features/index.js

@@ -55,7 +55,10 @@ function client() {
             return;
         }
         const clientName = runtime_store_1.default.get('context.client.name');
-        const finalPort = yield port_resolver_1.default.getPort('client', 'http', { name: clientName });
+        const finalPort = yield port_resolver_1.default.getPort('client', 'http', {
+            name: clientName,
+            searchSpan: constants_1.DEFAULT.serve_port.search_span.http_port
+        });
         runtime_store_1.default.set('context.port.http.client.' + clientName, finalPort);
     });
 }

package/lib/serve/features/slate.js

@@ -17,6 +17,7 @@ const port_resolver_1 = __importDefault(require("../../port-resolver"));
 const runtime_store_1 = __importDefault(require("../../runtime-store"));
 const slate_utils_1 = require("../../slate-utils");
 const config_1 = require("../../util_modules/config");
+const constants_1 = require("../../util_modules/constants");
 const logger_1 = require("../../util_modules/logger");
 exports.default = () => __awaiter(void 0, void 0, void 0, function* () {
     const allTargets = yield config_1.slateConfig.getAllTargetDetails();
@@ -39,7 +40,8 @@ exports.default = () => __awaiter(void 0, void 0, void 0, function* () {
         });
         const slatePort = yield port_resolver_1.default.getPort('slate', 'http', {
             name: targ.name + '_proxy',
-            server: 'service'
+            server: 'service',
+            searchSpan: constants_1.DEFAULT.serve_port.search_span.http_port
         });
         return Object.assign(Object.assign({}, targ), { port: { slate: slatePort, proxy: proxyPort }, trigger: { kill: false } });
     })));

package/lib/util_modules/constants/lib/default.js

@@ -32,6 +32,9 @@ exports.default = Object.freeze({
             browser_logic: 8400,
             appsail: -1,
             client: -1
+        },
+        search_span: {
+            http_port: 200
         }
     },
     event_bus: {

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "zcatalyst-cli",
-	"version": "1.20.0",
+	"version": "1.20.2",
 	"description": "Command Line Tool for CATALYST",
 	"main": "./lib/index.js",
 	"bin": {

package/scripts/send-notification.js

@@ -7,13 +7,21 @@ const VERSION = PACKAGE_JSON.version;
 const NPM_REGISTRY_LINK = process.env.NPM_REGISTRY_LINK;
 const RELEASE_NOTES_LINK = process.env.RELEASE_NOTES_LINK;
 const API_KEY = process.env.API_KEY;
+const MERGE_REQUEST_ID = process.env.CI_MERGE_REQUEST_IID;
 
 const INSTALL_COMMAND = `npm install -g zcatalyst-cli@${VERSION}`;
 const CHANNEL_NAMES = (process.env.CHANNEL_NAMES || '').split(',');
 
 const notify = async () => {
+	let text = `Hey Team, we've released a new version of [ZCatalyst-CLI](${NPM_REGISTRY_LINK}) :fireworks: \n\n *Version:* \`v${VERSION}\``;
+
+	if (MERGE_REQUEST_ID) {
+		text =
+			text +
+			`\n* [Pipeline status](https://git.csez.zohocorpin.com/BaaS/ZCatalyst-CLI/-/merge_requests/${MERGE_REQUEST_ID}/pipelines)`;
+	}
 	const message = {
-		text: `Hey Team, we've released a new version of [ZCatalyst-CLI](${NPM_REGISTRY_LINK}) :fireworks: \n\n *Version:* \`v${VERSION}\``,
+		text,
 		bot: {
 			name: 'Dx Tools Update',
 			image: 'https://www.zohowebstatic.com/sites/default/files/catalyst/catalyst-logo.svg'