zcatalyst-cli 1.13.2 → 1.14.0

package/lib/init/features/project.js

@@ -33,7 +33,8 @@ const fn_utils_1 = require("../../fn-utils");
 const client_utils_1 = require("../../client-utils");
 exports.default = () => __awaiter(void 0, void 0, void 0, function* () {
     var _a, _b;
-    const projectAPI = yield (0, endpoints_1.projectAPI)();
+    const orgAPI = yield (0, endpoints_1.orgAPI)();
+    const projectAPIWithoutOrg = yield (0, endpoints_1.projectAPI)();
     const defaultRCProjectName = (0, project_1.getDefaultProjectName)(null);
     const defaultRCProjectId = (0, project_1.getDefaultProjectId)(null);
     if (defaultRCProjectName !== null &&
@@ -41,7 +42,7 @@ exports.default = () => __awaiter(void 0, void 0, void 0, function* () {
         !(0, option_1.getOptionValue)('force', false)) {
         (0, logger_1.message)(constants_1.FILENAME.rc + ' already has ' + (0, ansi_colors_1.bold)(defaultRCProjectName) + ' as a default project.');
         try {
-            yield projectAPI.getProject(defaultRCProjectId);
+            yield projectAPIWithoutOrg.getProject(defaultRCProjectId);
             throw new error_1.default('Skipping project setup, since project directory contains a default project. To overwrite use --force option');
         }
         catch (err) {
@@ -54,7 +55,24 @@ exports.default = () => __awaiter(void 0, void 0, void 0, function* () {
             yield (0, project_1.removeProject)(defaultRCProjectId + '');
         }
     }
+    const orgList = yield orgAPI.getAllOrgs();
+    if (orgList.length === 0) {
+        throw new error_1.default('Visit ' +
+            (0, ansi_colors_1.underline)(constants_1.ORIGIN.console) +
+            ' for creation of your first project before you continue.', { exit: 1 });
+    }
+    const orgChoice = orgList.map((org) => prompt_1.default.choice(org.name + ' (' + org.id + ')', {
+        value: org,
+        short: org.name
+    }));
+    const orgAns = yield prompt_1.default.ask(prompt_1.default.question('org', 'Select a default Catalyst portal for this directory: ', {
+        type: 'list',
+        choices: js_1.JS.reverse(orgChoice),
+        when: orgChoice.length > 0
+    }));
+    const selectedOrg = orgAns.org || orgList[0];
     (0, logger_1.message)('Setting up a new default project for this folder\n');
+    const projectAPI = yield (0, endpoints_1.projectAPI)({ auth: true, org: selectedOrg.id });
     const allProjects = (yield projectAPI.getAllProjects());
     if (allProjects.length === 0) {
         throw new error_1.default('Visit ' +
@@ -83,14 +101,14 @@ exports.default = () => __awaiter(void 0, void 0, void 0, function* () {
     }));
     let selectedProject = projectAns.project;
     if (typeof selectedProject !== 'number') {
-        return (0, project_2.fillProjectPayload)(selectedProject);
+        return (0, project_2.fillProjectPayload)(selectedOrg, selectedProject);
     }
     if (selectedProject === 0) {
         const projectNameAns = yield prompt_1.default.ask(prompt_1.default.question('projectName', 'Provide a name for your new project:', {
             validate: (ans) => (ans.match(constants_1.REGEX.project.name) ? true : 'Invalid project name')
         }));
         selectedProject = yield projectAPI.createProject(projectNameAns.projectName);
-        return (0, project_2.fillProjectPayload)(selectedProject, true);
+        return (0, project_2.fillProjectPayload)(selectedOrg, selectedProject, true);
     }
     const [zipArchive, template, importRes] = yield (0, import_1.iacImport)();
     yield zipArchive
@@ -108,7 +126,9 @@ exports.default = () => __awaiter(void 0, void 0, void 0, function* () {
             ? fn_utils_1.fnUtils.node
             : stack.startsWith(runtime_1.default.language.java)
                 ? fn_utils_1.fnUtils.java
-                : null;
+                : stack.startsWith(runtime_1.default.language.python)
+                    ? fn_utils_1.fnUtils.python
+                    : null;
         if (fnUtil === null) {
             (0, logger_1.warning)(`skipping setup of function(${refinedTargets[0].name}) since provided stack ${stack} is not supported.`);
             return;
@@ -131,5 +151,5 @@ exports.default = () => __awaiter(void 0, void 0, void 0, function* () {
         (0, client_1.fillClientInitPayload)(source, properties.app_name);
     }
     const projectDetails = yield projectAPI.getProject(importRes.project_details.id);
-    return (0, project_2.fillProjectPayload)(projectDetails, true, true);
+    return (0, project_2.fillProjectPayload)(selectedOrg, projectDetails, true, true);
 });

package/lib/init/util/project.js

@@ -18,10 +18,10 @@ const error_1 = __importDefault(require("../../error"));
 const runtime_store_1 = __importDefault(require("../../runtime-store"));
 const constants_1 = require("../../util_modules/constants");
 const project_1 = require("../../util_modules/project");
-const fillProjectPayload = (selectedProject, isNew = false, isImport = false) => __awaiter(void 0, void 0, void 0, function* () {
+const fillProjectPayload = (selectedOrg, selectedProject, isNew = false, isImport = false) => __awaiter(void 0, void 0, void 0, function* () {
     runtime_store_1.default.set('payload.project', selectedProject);
     runtime_store_1.default.set('project', (0, project_1.transformProject)(selectedProject));
-    const envAPI = yield (0, endpoints_1.envAPI)();
+    const envAPI = yield (0, endpoints_1.envAPI)({ auth: true, org: selectedOrg.id });
     const envArr = (yield envAPI.getEnvs((0, project_1.getProjectId)()));
     const envObj = envArr.find((env) => env.env_name === constants_1.DEFAULT.env_name);
     if (envObj === undefined) {

package/lib/internal/api.js

@@ -43,6 +43,7 @@ const runtime_store_1 = __importDefault(require("../runtime-store"));
 const constants_1 = require("../util_modules/constants");
 const js_1 = require("../util_modules/js");
 const logger_1 = require("../util_modules/logger");
+const project_1 = require("../util_modules/project");
 class API {
     constructor({ authNeeded = true, resolveOnError = false, maxRetry = 3, env = constants_1.DEFAULT.env_name, log = {}, headers = {} } = {}) {
         this.requestOpts = {
@@ -208,6 +209,7 @@ class API {
             this.logOpts = js_1.JS.get(options, 'log', this.logOpts);
             this.requestOpts = js_1.JS.defaultsDeep(js_1.JS.omit(options, ['origin', 'auth', 'maxRetry', 'resolveOnError', 'log']), this.requestOpts);
             this.requestOpts.url = js_1.JS.get(options, 'origin', constants_1.ORIGIN.admin) + path;
+            js_1.JS.set(this.requestOpts, 'headers.CATALYST-ORG', js_1.JS.get(options, 'envId', (0, project_1.getEnvId)()));
             this.requestOpts.method = method;
             if (this.authNeeded) {
                 yield this._addAuthHeader();

package/lib/internal/command.js

@@ -190,5 +190,5 @@ class Command {
         });
     }
 }
-Command.globalOpts = ['project', 'token', 'dc'];
+Command.globalOpts = ['project', 'token', 'dc', 'org'];
 exports.default = Command;

package/lib/internal/rc.js

@@ -122,6 +122,7 @@ class RC {
                 id: project.id + '',
                 name: project.name,
                 domain: project.domain,
+                timezone: project.timezone,
                 env: []
             });
             projIdx = lastIdx;
@@ -140,6 +141,7 @@ class RC {
                 id: mergedProject.id + '',
                 name: mergedProject.name,
                 domain: mergedProject.domain,
+                timezone: mergedProject.timezone,
                 env: mergedProject.env
             });
             projIdx = mergedProject.idx;

package/lib/port-resolver.js

@@ -25,7 +25,7 @@ class PortResolver {
     static getFreePort(startPort, searchSpan, dupCheck) {
         return __awaiter(this, void 0, void 0, function* () {
             if (searchSpan < 0) {
-                throw new Error('unable find port. searchSpan has reached the bottom line');
+                throw new Error('unable to find port. searchSpan has reached the bottom line');
             }
             const port = yield (0, portfinder_1.getPortPromise)({
                 port: startPort,
@@ -41,9 +41,10 @@ class PortResolver {
             return port;
         });
     }
-    static getPort(feature, type, name = '', duplicateCheck = true, searchSpan = 20, fallbackNeeded = true) {
+    static getPort(feature, type, name = '', duplicateCheck = true, pythonBio = false, searchSpan = 20, fallbackNeeded = true) {
         return __awaiter(this, void 0, void 0, function* () {
             let port = parseInt(runtime_store_1.default.get(`context.port.${type}.${feature}.${name}`), 10);
+            feature = pythonBio ? 'advancedio' : feature;
             port = isNaN(port) ? parseInt(runtime_store_1.default.get(`context.port.${type}.${feature}`), 10) : port;
             if (isNaN(port)) {
                 if (type === 'debug' && feature === 'client') {
@@ -64,7 +65,7 @@ class PortResolver {
             }
             let finalPort = port;
             try {
-                finalPort = yield PortResolver.getFreePort(port, searchSpan, duplicateCheck);
+                finalPort = yield PortResolver.getFreePort(port, searchSpan, duplicateCheck || pythonBio);
             }
             catch (e) {
                 if (searchSpan === 0) {

package/lib/prompt/types/file-path.js

@@ -19,7 +19,7 @@ const fs_1 = require("../../util_modules/fs");
 const ansi_colors_1 = require("ansi-colors");
 function getPaths(rootPath, pattern, exclude, defaultItem) {
     return __awaiter(this, void 0, void 0, function* () {
-        const nodeList = yield fs_1.ASYNC.walk(rootPath, { exclude, excludeDir: false });
+        const nodeList = yield fs_1.ASYNC.walk(rootPath, { filter: { exclude, excludeDir: false } });
         const filteredNodes = fuzzy_1.default.filter(pattern || '', nodeList).map((e) => e.string);
         if (!pattern && defaultItem) {
             filteredNodes.unshift(defaultItem);

package/lib/pull/features/functions/index.js

@@ -27,6 +27,8 @@ const logger_1 = require("../../../util_modules/logger");
 const project_1 = require("../../../util_modules/project");
 const runtime_1 = __importDefault(require("../../../util_modules/constants/lib/runtime"));
 const error_1 = __importDefault(require("../../../error"));
+const python_1 = require("../../../fn-utils/lib/python");
+const throbber_1 = __importDefault(require("../../../throbber"));
 exports.default = () => __awaiter(void 0, void 0, void 0, function* () {
     const fnAPI = yield (0, endpoints_1.functionsAPI)();
     const fnDirName = config_1.functionsConfig.source();
@@ -99,14 +101,18 @@ exports.default = () => __awaiter(void 0, void 0, void 0, function* () {
     if (js_1.JS.isEmpty(targets)) {
         return;
     }
+    const throbber = throbber_1.default.getInstance();
     targets.forEach((fn) => __awaiter(void 0, void 0, void 0, function* () {
         if (dirOverwriteAns[fn.name]) {
             yield fs_1.ASYNC.deleteDir(fn.source);
         }
+        throbber.add('function_pull_' + fn.name, {
+            text: `extracting function [${fn.name}]`
+        });
     }));
     runtime_store_1.default.set('context.functions.targets', targets);
     targets = yield Promise.all(targets.map((fn) => __awaiter(void 0, void 0, void 0, function* () {
-        var _a, _b;
+        var _a, _b, _c;
         yield fs_1.ASYNC.ensureDir(fn.source);
         const buffer = (yield fnAPI.download(fn.id));
         yield new archiver_1.default().load(buffer).extract((0, path_1.join)(fnDirPath, fn.name)).finalize();
@@ -116,14 +122,41 @@ exports.default = () => __awaiter(void 0, void 0, void 0, function* () {
         else if ((_b = fn.stack) === null || _b === void 0 ? void 0 : _b.startsWith(runtime_1.default.language.java)) {
             yield (0, languages_1.java)(fn);
         }
+        else if ((_c = fn.stack) === null || _c === void 0 ? void 0 : _c.startsWith(runtime_1.default.language.python)) {
+            yield (0, languages_1.python)(fn);
+            const reqFile = (0, path_1.join)(fn.source, constants_1.FILENAME.functions.python_requirements);
+            const requirementsExists = yield fs_1.ASYNC.readFile(reqFile);
+            if (requirementsExists && fn.valid) {
+                try {
+                    yield (0, python_1.removeRequirements)(reqFile, fn);
+                }
+                catch (e) {
+                    const err = error_1.default.getErrorInstance(e);
+                    (fn.valid = false), (fn.failure_reason = err.message);
+                }
+            }
+        }
+        const catalystJsonPth = (0, path_1.join)(fn.source, constants_1.FILENAME.catalyst_config);
+        const catalystJson = yield fs_1.ASYNC.readJSONFile(catalystJsonPth);
+        const fnDetails = (yield fnAPI.getFunction(fn.id));
+        const envVariables = js_1.JS.get(fnDetails, 'configuration.environment.variables', false);
+        if (catalystJson && envVariables) {
+            catalystJson.deployment.env_variables = envVariables;
+            yield fs_1.ASYNC.writeJSONFile(catalystJsonPth, catalystJson);
+        }
+        throbber.remove('function_pull_' + fn.name);
         return fn;
     })));
     targets = targets.filter((target) => {
-        if (!target.valid) {
+        var _a, _b;
+        if (!target.valid && !((_a = target.failure_reason) === null || _a === void 0 ? void 0 : _a.startsWith('unable to locate python'))) {
             (0, logger_1.debug)('Invalid target : ' + target.name + ' reason : ' + target.failure_reason);
             (0, logger_1.warning)(`skipping pull of function(${target.name}) since the package is invalid. \nContact catalyst support with debug log.`);
             new error_1.default('invalid package: ' + target.name, { exit: 2 });
         }
+        else if (!target.valid && ((_b = target.failure_reason) === null || _b === void 0 ? void 0 : _b.startsWith('unable to locate python'))) {
+            (0, logger_1.warning)(`skipping pull of function(${target.name}) since ${target.failure_reason}`);
+        }
         return target.valid;
     });
     runtime_store_1.default.set('payload.functions.targets', targets);

package/lib/pull/features/functions/languages.js

@@ -9,7 +9,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.java = exports.node = void 0;
+exports.python = exports.java = exports.node = void 0;
 const fn_utils_1 = require("../../../fn-utils");
 const js_1 = require("../../../util_modules/js");
 function node(target) {
@@ -26,3 +26,10 @@ function java(target) {
     });
 }
 exports.java = java;
+function python(target) {
+    return __awaiter(this, void 0, void 0, function* () {
+        const refinedTargets = yield fn_utils_1.fnUtils.common.refineTargets([target.source]);
+        yield fn_utils_1.fnUtils.python.validate([js_1.JS.assignIn(target, refinedTargets[0])], 0);
+    });
+}
+exports.python = python;

package/lib/readLineUtils.js

@@ -1 +1,37 @@
-"use strict";
+// 'use strict';
+
+// var _ = require('lodash');
+// var clc = require('ansi-colors');
+
+// var utils = require('./utils');
+
+// module.exports = {
+// 	splitLineIntoArray: function(line) {
+// 		var lineArr = [];
+// 		var words = line.split(' ');
+// 		if (!words.length) {
+// 			return lineArr;
+// 		}
+// 		var fullWord = '';
+// 		var pushReady = true;
+// 		_.forEach(words, function(value) {
+// 			if (value.startsWith('"')) {
+// 				pushReady = false;
+// 			}
+// 			if (value.endsWith('"')) {
+// 				pushReady = true;
+// 			}
+// 			var word = _.replace(value, /"/g, '');
+// 			fullWord =
+// 				(word !== ' ' || word !== '') && fullWord === '' ? word : fullWord + ' ' + word;
+// 			if (pushReady && fullWord) {
+// 				lineArr.push(fullWord);
+// 				fullWord = '';
+// 			}
+// 		});
+// 		return lineArr;
+// 	},
+// 	displayHelp: function(message) {
+// 		utils.logWarning('Anomaly Detected. ' + clc.redBright(message));
+// 	}
+// };

package/lib/readline/features/cache.js

@@ -1 +1,175 @@
-"use strict";
+// 'use strict';
+
+// var _ = require('lodash');
+// var clc = require('cli-color');
+// var readline = require('readline');
+
+// var endpoints = require('../../endpoints');
+// var logger = require('../../logger');
+// var utils = require('../../utils');
+// var readlineUtil = require('../../readLineUtils');
+
+// var outputStream = process.stdout;
+// var inputStream = process.stdin;
+
+// module.exports = function(options) {
+// 	var state = 0;
+// 	var segment = '';
+// 	const cacheAPI = endpoints(options).cache();
+// 	return new Promise(function(resolve) {
+// 		var prompt = clc.cyanBright('cache > ');
+
+// 		function completer(line) {
+// 			var completions = 'list use set get'.split(' ');
+// 			var hits = completions.filter(function(c) {
+// 				c.startsWith(line);
+// 			});
+// 			// show all completions if none found
+// 			return [hits.length ? hits : completions, line];
+// 		}
+// 		// function completer(line) {
+// 		//     var completions = ['use ', 'GET '];
+// 		//     var lineArr = line.trim().split(' ');
+// 		//     if (lineArr[(lineArr.length) - 1] !== '') {
+// 		//         switch (lineArr[(lineArr.length) - 1]) {
+// 		//             case 'use':
+// 		//                 // completions[0] = completions[0] + 'segment ';
+// 		//                 completions.pop();
+// 		//                 completions.push('segment ');
+// 		//                 break;
+// 		//             default:
+// 		//                 completions = [];
+// 		//         }
+// 		//         var hits = completions.filter((c) => line.startsWith(c) || line.endsWith(c));
+// 		//         return [hits, line];
+// 		//     }
+// 		//     return [completions, line];
+// 		// }
+// 		var rl = readline.createInterface({
+// 			input: inputStream,
+// 			output: outputStream,
+// 			prompt: prompt,
+// 			completer: completer
+// 		});
+
+// 		rl.prompt();
+
+// 		rl.on('line', function(line) {
+// 			var originalLine = line.trim();
+// 			var lineArr = readlineUtil.splitLineIntoArray(originalLine);
+// 			return new Promise(function(resolve) {
+// 				switch (true) {
+// 					case /^exit/i.test(originalLine):
+// 					case /\\q/i.test(originalLine):
+// 						rl.close();
+// 						break;
+// 					case /^list/i.test(originalLine):
+// 						return cacheAPI
+// 							.listSegments(options.project)
+// 							.then(function(data) {
+// 								_.forEach(data, function(segment, index) {
+// 									logger.info(
+// 										index +
+// 											1 +
+// 											'. ' +
+// 											clc.bold(segment.segment_name) +
+// 											' ( ' +
+// 											segment.id +
+// 											' )'
+// 									);
+// 								});
+// 								return resolve();
+// 							})
+// 							.catch(function(err) {
+// 								logger.debug('There was an error processing the request.' + err);
+// 								logger.info(clc.redBright("couldn't fetch segment details"));
+// 								return resolve();
+// 							});
+// 					case /^use/i.test(originalLine):
+// 						var segmentID = lineArr[lineArr.length - 1];
+// 						if ((lineArr.length = 2 && /^[0-9]*$/gm.test(segmentID))) {
+// 							segment = segmentID;
+// 							state = 1;
+// 							rl.setPrompt(clc.cyanBright('cache:' + segment + ' > '));
+// 							return resolve();
+// 						} else {
+// 							readlineUtil.displayHelp('Segment ID not valid.');
+// 							return resolve();
+// 						}
+// 					case /^get/i.test(line):
+// 						if (state === 0) {
+// 							utils.logWarning('Trying to get data from default segment', 'info');
+// 						}
+// 						if (lineArr.length === 2) {
+// 							var cachekey = lineArr[lineArr.length - 1];
+// 							return cacheAPI
+// 								.get(options.project, segment, cachekey)
+// 								.then(function(data) {
+// 									data.cache_value
+// 										? logger.info('"' + clc.greenBright(data.cache_value) + '"')
+// 										: logger.info('(' + clc.redBright('nil') + ')');
+// 									return resolve();
+// 								})
+// 								.catch(function(err) {
+// 									logger.error(
+// 										'There was an error processing the request.' + err
+// 									);
+// 									logger.info('(' + clc.redBright('error') + ')');
+// 									return resolve();
+// 								});
+// 						} else {
+// 							readlineUtil.displayHelp('Key Name not valid.');
+// 							return resolve();
+// 						}
+// 					case /^set/i.test(line):
+// 						if (state === 0) {
+// 							utils.logWarning('Trying to put data to default segment', 'info');
+// 						}
+// 						if (lineArr.length === 3) {
+// 							var data = {};
+// 							data.key = lineArr[lineArr.length - 2];
+// 							data.value = lineArr[lineArr.length - 1];
+// 							return cacheAPI
+// 								.put(options.project, segment, data)
+// 								.then(function(data) {
+// 									if (data) {
+// 										logger.info(clc.greenBright('OK'));
+// 									}
+// 									return resolve();
+// 								})
+// 								.catch(function(err) {
+// 									logger.debug(
+// 										'There was an error processing the request.' + err
+// 									);
+// 									logger.info('(' + clc.redBright('error') + ')');
+// 									return resolve();
+// 								});
+// 						} else {
+// 							readlineUtil.displayHelp('Key or Value not valid.');
+// 							return resolve();
+// 						}
+// 					case /^help/i.test(originalLine):
+// 					case /^\\h/i.test(originalLine):
+// 						utils.logBullet(
+// 							'Available commands :\t ' + clc.bold('list, use, get, set, exit')
+// 						);
+// 						return resolve();
+// 					default:
+// 						logger.info(
+// 							`We might have heard '${clc.bold(
+// 								line.trim()
+// 							)}'\n which is an unknown command!! Use '${clc.bold(
+// 								'help'
+// 							)}' for the list of commands you can use.`
+// 						);
+// 						return resolve();
+// 				}
+// 			}).then(function() {
+// 				rl.prompt();
+// 			});
+// 		}).on('close', function() {
+// 			logger.info('Have a great day!');
+// 			return resolve();
+// 		});
+// 	});
+// };

package/lib/readline/features/index.js

@@ -1 +1,7 @@
-"use strict";
+// 'use strict';
+
+// module.exports = {
+// 	cache: require('./cache'),
+// 	queue: require('./queue'),
+// 	zcql: require('./zcql')
+// };