zcatalyst-cli 1.13.3 → 1.14.0

package/lib/endpoints/lib/env.js

@@ -16,12 +16,15 @@ const error_1 = __importDefault(require("../../error"));
 const api_1 = __importDefault(require("../../internal/api"));
 const logger_1 = require("../../util_modules/logger");
 class Env {
-    constructor(opts) {
+    constructor(opts, org) {
         this.opts = opts;
+        this.envId = org;
     }
     getEnvs(projectId) {
         return __awaiter(this, void 0, void 0, function* () {
-            const res = yield new api_1.default(this.opts).get('/baas/v1/project/' + projectId + '/environment');
+            const res = yield new api_1.default(this.opts).get('/baas/v1/project/' + projectId + '/environment', {
+                envId: this.envId
+            });
             if (res.body && res.body.data) {
                 return res.body.data;
             }

package/lib/endpoints/lib/functions.js

@@ -43,6 +43,36 @@ class Functions {
             });
         });
     }
+    getFunction(fnId) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const res = yield new api_1.default(this.opts).get(`/baas/v1/project/${this.projectId}/function/${fnId}`);
+            if (res.body && res.body.data) {
+                return res.body.data;
+            }
+            (0, logger_1.debug)('Get function response from server  : ' + res.body);
+            throw new error_1.default('Server Error: Unexpected Response from server.', {
+                exit: 2
+            });
+        });
+    }
+    updateConfig(functionId, env) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const res = yield new api_1.default(this.opts).post(`/baas/v1/project/${this.projectId}/function/${functionId}/configuration`, {
+                body: {
+                    environment: {
+                        variables: env
+                    }
+                }
+            });
+            if (res.body && res.body.data) {
+                return res.body.data;
+            }
+            (0, logger_1.debug)('Update configuration response from server  : ' + res.body);
+            throw new error_1.default('Server Error: Unexpected Response from server.', {
+                exit: 2
+            });
+        });
+    }
     deploy(sourceFsStream, { stack, name, type, memory }) {
         return __awaiter(this, void 0, void 0, function* () {
             const formData = {

package/lib/endpoints/lib/org.js

@@ -0,0 +1,35 @@
+'use strict';
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const error_1 = __importDefault(require("../../error"));
+const api_1 = __importDefault(require("../../internal/api"));
+const logger_1 = require("../../util_modules/logger");
+class OrgAPI {
+    constructor(opts) {
+        this.opts = opts;
+    }
+    getAllOrgs() {
+        return __awaiter(this, void 0, void 0, function* () {
+            const res = yield new api_1.default(this.opts).get('/baas/v1/orgs');
+            if (res.body && res.body.data) {
+                return res.body.data;
+            }
+            (0, logger_1.debug)('get all orgs response from server : ' + res.body);
+            throw new error_1.default('Server Error: Unexpected Response from server.', {
+                exit: 2
+            });
+        });
+    }
+}
+exports.default = OrgAPI;

package/lib/endpoints/lib/project.js

@@ -16,12 +16,15 @@ const error_1 = __importDefault(require("../../error"));
 const api_1 = __importDefault(require("../../internal/api"));
 const logger_1 = require("../../util_modules/logger");
 class ProjectAPI {
-    constructor(opts) {
+    constructor(opts, org) {
         this.opts = opts;
+        this.envId = org;
     }
     getProject(projectId) {
         return __awaiter(this, void 0, void 0, function* () {
-            const res = yield new api_1.default(this.opts).get('/baas/v1/project/' + projectId);
+            const res = yield new api_1.default(this.opts).get('/baas/v1/project/' + projectId, {
+                envId: this.envId
+            });
             if (res.body && res.body.data) {
                 return res.body.data;
             }
@@ -33,7 +36,7 @@ class ProjectAPI {
     }
     getAllProjects() {
         return __awaiter(this, void 0, void 0, function* () {
-            const res = yield new api_1.default(this.opts).get('/baas/v1/project');
+            const res = yield new api_1.default(this.opts).get('/baas/v1/project', { envId: this.envId });
             if (res.body && res.body.data) {
                 return res.body.data;
             }
@@ -46,6 +49,7 @@ class ProjectAPI {
     createProject(name) {
         return __awaiter(this, void 0, void 0, function* () {
             const res = yield new api_1.default(this.opts).post('/baas/v1/project', {
+                envId: this.envId,
                 body: {
                     project_name: name
                 }

package/lib/express_middlewares/unknownReqProxy.js

@@ -28,7 +28,10 @@ exports.default = (proxyInstance, customProxyUrl) => (req, res) => {
         proxyInstance.web(req, res, {
             target: `https://${req.headers['x-zc-project-domain']}`,
             changeOrigin: true,
-            ws: true
+            ws: true,
+            headers: req.url.match(/accounts\/p\/[0-9]+\/webclient\/v1\/captcha/g)
+                ? { origin: `https://${req.headers['x-zc-project-domain']}` }
+                : undefined
         });
     }
 };

package/lib/fn-utils/index.js

@@ -27,8 +27,10 @@ exports.fnUtils = void 0;
 const common = __importStar(require("./lib/common"));
 const java = __importStar(require("./lib/java"));
 const node = __importStar(require("./lib/node"));
+const python = __importStar(require("./lib/python"));
 exports.fnUtils = {
     node,
     java,
+    python,
     common
 };

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

@@ -12,7 +12,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.updateFnConfig = exports.getSDK = exports.deleteFunctionLocal = exports.resolveAllFnPorts = exports.findAndReplaceConfigProps = exports.generateUrlForTarget = exports.pack = exports.executeHook = exports.refineTargets = exports.validate = void 0;
+exports.copyModDirPerm = exports.updateFnConfig = exports.getSDK = exports.deleteFunctionLocal = exports.resolveAllFnPorts = exports.findAndReplaceConfigProps = exports.generateUrlForTarget = exports.pack = exports.executeHook = exports.refineTargets = exports.validate = void 0;
 const ansi_colors_1 = require("ansi-colors");
 const path_1 = require("path");
 const archiver_1 = __importDefault(require("../../archiver"));
@@ -32,6 +32,9 @@ const js_1 = require("../../util_modules/js");
 const logger_1 = require("../../util_modules/logger");
 const option_1 = require("../../util_modules/option");
 const project_1 = require("../../util_modules/project");
+const fs_2 = require("fs");
+const os_1 = require("os");
+const pip_install_1 = require("../../init/dependencies/python/pip-install");
 function validate() {
     return __awaiter(this, void 0, void 0, function* () {
         const sourceDir = (0, project_1.resolveProjectPath)(config_1.functionsConfig.source());
@@ -222,7 +225,8 @@ function refineTargets(rawTargets, mapRemoteFn = true) {
                 index: js_1.JS.get(catalystJson, 'execution.main'),
                 source: fnPath,
                 valid: true,
-                integ_config: js_1.JS.get(catalystJson, 'deployment.integration_config')
+                integ_config: js_1.JS.get(catalystJson, 'deployment.integration_config'),
+                env_var: refineEnvVariables(js_1.JS.get(catalystJson, 'deployment.env_variables'))
             };
             if (mapRemoteFn && remoteFnIdMap[fnTarget.name] !== undefined) {
                 fnTarget.id = remoteFnIdMap[fnTarget.name];
@@ -232,6 +236,13 @@ function refineTargets(rawTargets, mapRemoteFn = true) {
     });
 }
 exports.refineTargets = refineTargets;
+function refineEnvVariables(vars) {
+    return Object.entries(vars || {}).reduce((envObj, curEntry) => {
+        envObj[curEntry[0]] =
+            typeof curEntry[1] === 'object' ? JSON.stringify(curEntry[1]) : curEntry[1];
+        return envObj;
+    }, {});
+}
 function executeHook({ prefix, command }) {
     if ((0, option_1.getOptionValue)('ignoreScripts', false)) {
         (0, logger_1.debug)(`skipping ${prefix + command} hook`);
@@ -245,7 +256,7 @@ function executeHook({ prefix, command }) {
 }
 exports.executeHook = executeHook;
 function pack(target) {
-    var _a;
+    var _a, _b;
     return __awaiter(this, void 0, void 0, function* () {
         try {
             let source = target.source;
@@ -270,7 +281,7 @@ function pack(target) {
             }
             const zip = new archiver_1.default(target.name);
             if ((_a = target.stack) === null || _a === void 0 ? void 0 : _a.startsWith(runtime_1.default.language.java)) {
-                const outputFolder = (0, path_1.join)(source, '.output');
+                const outputFolder = (0, path_1.join)(source, constants_1.FOLDERNAME.output);
                 const outputFiles = yield fs_1.ASYNC.walk(outputFolder);
                 outputFiles.forEach((file) => {
                     zip.add(file.replace(outputFolder + path_1.sep, ''), fs_1.SYNC.getReadStream(file));
@@ -278,11 +289,25 @@ function pack(target) {
             }
             else {
                 const exclude = config_1.functionsConfig.ignore(source);
-                const files = yield fs_1.ASYNC.walk(source, { exclude });
+                const files = yield fs_1.ASYNC.walk(source, { filter: { exclude, excludeDir: true } });
                 files.forEach((file) => {
                     zip.add(file.replace(source + path_1.sep, ''), fs_1.SYNC.getReadStream(file));
                 });
             }
+            if ((_b = target.stack) === null || _b === void 0 ? void 0 : _b.startsWith(runtime_1.default.language.python)) {
+                const reqFile = (0, path_1.join)(target.source, constants_1.FILENAME.functions.python_requirements);
+                const requirementsExists = yield fs_1.ASYNC.readFile(reqFile);
+                if (requirementsExists) {
+                    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_', ''), true);
+                    const files = yield fs_1.ASYNC.walk(tmpDir);
+                    files.forEach((file) => {
+                        zip.add(file.replace(tmpDir + path_1.sep, ''), fs_1.SYNC.getReadStream(file));
+                    });
+                }
+            }
             const finalizer = yield zip.finalize();
             const zipFsStream = yield finalizer.fsStream();
             target.valid = true;
@@ -324,6 +349,7 @@ function findAndReplaceConfigProps(dir, { stack, type, integ_config }) {
 }
 exports.findAndReplaceConfigProps = findAndReplaceConfigProps;
 function resolveAllFnPorts(targets, idx = 0) {
+    var _a;
     return __awaiter(this, void 0, void 0, function* () {
         if (targets.length < idx + 1) {
             return;
@@ -337,7 +363,9 @@ function resolveAllFnPorts(targets, idx = 0) {
         let debugPort = -1;
         switch ((0, option_1.getCurrentCommand)()) {
             case 'serve':
-                httpPort = yield port_resolver_1.default.getPort(constants_1.REMOTE_REF.functions.type[currentTargetType], 'http', currentTarget.name, currentTargetType === constants_1.FN_TYPE.advanced);
+                const isPyBio = currentTargetType === constants_1.FN_TYPE.basic &&
+                    ((_a = currentTarget.stack) === null || _a === void 0 ? void 0 : _a.startsWith(runtime_1.default.language.python));
+                httpPort = yield port_resolver_1.default.getPort(constants_1.REMOTE_REF.functions.type[currentTargetType], 'http', currentTarget.name, currentTargetType === constants_1.FN_TYPE.advanced, isPyBio);
                 runtime_store_1.default.set('context.port.http.functions.' + currentTarget.name, httpPort);
                 const debugOptValue = (0, option_1.getOptionValue)('debug', false);
                 if (debugOptValue &&
@@ -347,7 +375,7 @@ function resolveAllFnPorts(targets, idx = 0) {
                     debugPort = yield port_resolver_1.default.getPort(constants_1.REMOTE_REF.functions.type[currentTargetType], 'debug', currentTarget.name, currentTargetType === constants_1.FN_TYPE.advanced);
                     runtime_store_1.default.set('context.port.debug.functions.' + currentTarget.name, debugPort);
                 }
-                if (currentTargetType === constants_1.FN_TYPE.basic) {
+                if (currentTargetType === constants_1.FN_TYPE.basic && !isPyBio) {
                     runtime_store_1.default.set('context.port.http.' + constants_1.REMOTE_REF.functions.type[constants_1.FN_TYPE.basic], httpPort);
                     runtime_store_1.default.set('context.port.debug.' + constants_1.REMOTE_REF.functions.type[constants_1.FN_TYPE.basic], debugPort);
                 }
@@ -478,3 +506,36 @@ function updateFnConfig(target) {
     });
 }
 exports.updateFnConfig = updateFnConfig;
+function copyModDirPerm(src, dest, perm, { replace = true } = {}) {
+    return __awaiter(this, void 0, void 0, function* () {
+        const srcContents = yield fs_1.ASYNC.walk(src, { includeDirPaths: true, depth: 1 });
+        srcContents.shift();
+        yield Promise.all(srcContents.map((content) => {
+            return new Promise((res, rej) => __awaiter(this, void 0, void 0, function* () {
+                try {
+                    const isDir = yield fs_1.ASYNC.dirExists(content);
+                    if (isDir) {
+                        const destFolder = (0, path_1.join)(dest, (0, path_1.basename)(content));
+                        yield fs_1.ASYNC.ensureDir(destFolder);
+                        yield copyModDirPerm(content, destFolder, perm);
+                        return res();
+                    }
+                    const destFile = (0, path_1.join)(dest, (0, path_1.basename)(content));
+                    yield fs_1.ASYNC.copyFile(content, destFile, replace ? fs_2.constants.COPYFILE_FICLONE : fs_2.constants.COPYFILE_EXCL).catch((err) => {
+                        if (!replace && err.code === 'EEXIST') {
+                            return;
+                        }
+                        throw err;
+                    });
+                    yield fs_1.ASYNC.chmod(destFile, perm);
+                    return res();
+                }
+                catch (e) {
+                    rej(e);
+                }
+            }));
+        }));
+        return fs_1.ASYNC.chmod(dest, perm);
+    });
+}
+exports.copyModDirPerm = copyModDirPerm;

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

@@ -79,34 +79,38 @@ function copyIntegHandlers(templatePath, targetPath, lang) {
             case constants_1.INTEG.services.cliq:
                 const handlers = runtime_store_1.default.get('context.function.integration.cliq.handlers', []);
                 if (lang === runtime_1.default.language.nodejs) {
-                    const filePaths = constants_1.CLIQ.node_template_contents_initial_copy.map((path) => {
-                        return (0, path_1.join)(templatePath, path);
-                    });
+                    const filePaths = constants_1.CLIQ.node_template_contents_initial_copy.map((path) => (0, path_1.join)(templatePath, path));
                     yield fs_1.ASYNC.copyFiles(filePaths, targetPath);
                     const integHandlerConfig = {};
                     const handlerPaths = handlers.map((handler) => {
-                        integHandlerConfig[handler] =
-                            constants_1.CLIQ.node_handlers_path + constants_1.CLIQ.node_handler_file_mapping[handler];
+                        integHandlerConfig[handler] = (0, path_1.join)(constants_1.CLIQ.node_handlers_path, constants_1.CLIQ.node_handler_file_mapping[handler]);
                         return (0, path_1.join)(templatePath, constants_1.CLIQ.node_handlers_template_dir, constants_1.CLIQ.node_handler_file_mapping[handler]);
                     });
                     yield fs_1.ASYNC.copyFiles(handlerPaths, (0, path_1.join)(targetPath, constants_1.CLIQ.node_handlers_template_dir));
                     integ_config.handlers = integHandlerConfig;
                 }
                 else if (lang === runtime_1.default.language.java) {
-                    const filePaths = constants_1.CLIQ.java_template_contents_initial_copy.map((path) => {
-                        return (0, path_1.join)(templatePath, path);
-                    });
+                    const filePaths = constants_1.CLIQ.java_template_contents_initial_copy.map((path) => (0, path_1.join)(templatePath, path));
                     yield fs_1.ASYNC.copyFiles(filePaths, targetPath);
                     const integHandlerConfig = {};
                     const handlerPaths = handlers.map((handler) => {
-                        integHandlerConfig[handler] =
-                            constants_1.CLIQ.java_handlers_path +
-                                constants_1.CLIQ.java_handler_file_mapping[handler].replace('.java', '');
+                        integHandlerConfig[handler] = (0, path_1.join)(constants_1.CLIQ.java_handlers_path, constants_1.CLIQ.java_handler_file_mapping[handler].replace('.java', ''));
                         return (0, path_1.join)(templatePath, constants_1.CLIQ.java_handlers_template_dir, constants_1.CLIQ.java_handler_file_mapping[handler]);
                     });
                     yield fs_1.ASYNC.copyFiles(handlerPaths, (0, path_1.join)(targetPath, constants_1.CLIQ.java_handlers_template_dir));
                     integ_config.handlers = integHandlerConfig;
                 }
+                else if (lang === runtime_1.default.language.python) {
+                    const filePaths = constants_1.CLIQ.python_template_contents_initial_copy.map((path) => (0, path_1.join)(templatePath, path));
+                    yield fs_1.ASYNC.copyFiles(filePaths, targetPath);
+                    const integHandlerConfig = {};
+                    const handlerPaths = handlers.map((handler) => {
+                        integHandlerConfig[handler] = (0, path_1.join)(constants_1.CLIQ.python_handlers_path, constants_1.CLIQ.python_handler_file_mapping[handler]);
+                        return (0, path_1.join)(templatePath, constants_1.CLIQ.python_handlers_template_dir, constants_1.CLIQ.python_handler_file_mapping[handler]);
+                    });
+                    yield fs_1.ASYNC.copyFiles(handlerPaths, (0, path_1.join)(targetPath, constants_1.CLIQ.python_handlers_template_dir));
+                    integ_config.handlers = integHandlerConfig;
+                }
                 break;
             default:
                 break;

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

@@ -115,7 +115,9 @@ function rewriteClasspath(pth, libPth) {
         if (content === undefined) {
             throw new error_1.default('Content of ' + pth + ' is not defined', { exit: 2 });
         }
-        const files = yield fs_1.ASYNC.walk((0, path_1.dirname)(libPth), { exclude: ['**/.output'] });
+        const files = yield fs_1.ASYNC.walk((0, path_1.dirname)(libPth), {
+            filter: { exclude: ['**/.output'], excludeDir: true }
+        });
         const result = yield xml2js_1.default.parseStringPromise(content);
         const classPathEntries = js_1.JS.chain(files)
             .filter((jarPth) => (0, path_1.extname)(jarPth) === '.jar')
@@ -195,7 +197,7 @@ function compileTarget(target) {
     var _a;
     return __awaiter(this, void 0, void 0, function* () {
         const targetSource = target.source;
-        const outputFolder = (0, path_1.join)(targetSource, '.output');
+        const outputFolder = (0, path_1.join)(targetSource, constants_1.FOLDERNAME.output);
         const integ = target.integ_config;
         const entries = [(0, path_1.join)(targetSource, ((_a = target.index) === null || _a === void 0 ? void 0 : _a.replace(/\./g, path_1.sep)) + '.java')];
         if (integ && integ.length > 0) {
@@ -209,7 +211,9 @@ function compileTarget(target) {
         yield fs_1.ASYNC.ensureDir(outputFolder);
         yield fs_1.ASYNC.emptyDir(outputFolder);
         const ignore = config_1.functionsConfig.ignore(targetSource);
-        const allFiles = yield fs_1.ASYNC.walk(targetSource, { exclude: ['**/.output', ...ignore] });
+        const allFiles = yield fs_1.ASYNC.walk(targetSource, {
+            filter: { exclude: ['**/.output', ...ignore], excludeDir: true }
+        });
         const cleanUpFiles = [...allFiles];
         while (allFiles.length > 0) {
             const limit = allFiles.length < 20 ? allFiles.length : 20;

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

@@ -0,0 +1,121 @@
+'use strict';
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.removeRequirements = exports.validate = void 0;
+const ansi_colors_1 = require("ansi-colors");
+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");
+const pip_install_1 = require("../../init/dependencies/python/pip-install");
+const constants_1 = require("../../util_modules/constants");
+const fs_1 = require("../../util_modules/fs");
+const js_1 = require("../../util_modules/js");
+const validationResults = {};
+function validate(targets, idx) {
+    return __awaiter(this, void 0, void 0, function* () {
+        if (targets.length < idx + 1) {
+            return;
+        }
+        const currentTarget = targets[idx];
+        const stack = currentTarget.stack;
+        try {
+            if (!stack) {
+                throw new error_1.default('unknown function stack', {
+                    exit: 1
+                });
+            }
+            const catalystFile = (0, path_1.join)(currentTarget.source, constants_1.FILENAME.catalyst_config);
+            const data = yield fs_1.ASYNC.readJSONFile(catalystFile, { checkpath: true });
+            if (data === undefined) {
+                throw new error_1.default('no ' + constants_1.FILENAME.catalyst_config + ' file found', {
+                    exit: 1
+                });
+            }
+            const indexFile = (0, path_1.join)(currentTarget.source, js_1.JS.get(data, 'execution.main', 'main.py'));
+            currentTarget.index = indexFile;
+            const indexFileExists = yield fs_1.ASYNC.fileExists(indexFile);
+            if (!indexFileExists) {
+                throw new error_1.default('Entry point file does not exists', {
+                    errorId: 'PYTHON-1',
+                    exit: 1,
+                    arg: [
+                        (0, ansi_colors_1.bold)(currentTarget.index || 'undefined'),
+                        (0, ansi_colors_1.bold)(constants_1.FILENAME.catalyst_config),
+                        (0, ansi_colors_1.bold)(currentTarget.name)
+                    ]
+                });
+            }
+            if (!(stack in validationResults)) {
+                yield (0, ensure_python_1.ensurePythonWithPip)(stack.replace('python_', '').replace('_', '.'));
+                validationResults[stack] = { valid: true };
+            }
+            if (!validationResults[stack]['valid']) {
+                currentTarget.valid = validationResults[stack]['valid'];
+                currentTarget.failure_reason = validationResults[stack]['message'];
+            }
+            else {
+                currentTarget.valid = true;
+            }
+            return validate(targets, ++idx);
+        }
+        catch (e) {
+            const err = error_1.default.getErrorInstance(e);
+            currentTarget.valid = false;
+            currentTarget.failure_reason = err.message;
+            if (stack) {
+                validationResults[stack] = { valid: false, message: err.message };
+            }
+            return validate(targets, ++idx);
+        }
+    });
+}
+exports.validate = validate;
+function removeRequirements(reqFile, target) {
+    var _a;
+    return __awaiter(this, void 0, void 0, function* () {
+        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_', ''), 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)));
+        })));
+    });
+}
+exports.removeRequirements = removeRequirements;

package/lib/fn-watcher.js

@@ -8,16 +8,23 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 const chokidar_1 = require("chokidar");
+const path_1 = require("path");
+const runtime_store_1 = __importDefault(require("./runtime-store"));
 const languages_1 = require("./shell/prepare/languages");
+const constants_1 = require("./util_modules/constants");
+const fs_1 = require("./util_modules/fs");
 const logger_1 = require("./util_modules/logger");
 exports.default = (target) => __awaiter(void 0, void 0, void 0, function* () {
     return new Promise((res) => {
         let paused = false;
         let latestEvent;
         const watcher = (0, chokidar_1.watch)(target.source, {
-            ignored: [/(^|[\/\\])\../, 'node_modules/**/*', '/**/*.jar'],
+            ignored: [/(^|[\/\\])\../, 'node_modules/**/*', '/**/*.jar', 'catalyst-debug.log'],
             cwd: target.source,
             ignoreInitial: true
         });
@@ -31,7 +38,8 @@ exports.default = (target) => __awaiter(void 0, void 0, void 0, function* () {
             watcher.emit('preparing');
             target.failure_reason = undefined;
             target.valid = true;
-            yield (0, languages_1.prepareFunctions)([target]);
+            yield fs_1.ASYNC.chmod((0, path_1.join)(runtime_store_1.default.get('project.root'), constants_1.FOLDERNAME.build, constants_1.FOLDERNAME.functions, target.name), '755', { recursive: true });
+            yield (0, languages_1.prepareFunctions)([target], latestEvent);
             if (currentLatestEvent.at === latestEvent.at) {
                 latestEvent = undefined;
             }

package/lib/index.js

@@ -16,7 +16,8 @@ program.description(description);
 program.version(version, '-v, --version', 'Print the Catalyst CLI version number');
 program.option('-p, --project <name|project_id>', 'Specify the Catalyst project to be used for a command');
 program.option('--token <token>', 'Supply an authentication token for a command');
-program.option('--dc <us|eu|in>', 'Supply a data center for a command');
+program.option('--dc <us|eu|in|au>', 'Supply a data center for a command');
+program.option('--org <org_id>', 'Supply a Org ID to be used for a command');
 program.option('--verbose', 'Change the log level to verbose for debugging purposes');
 program.helpOption('-h, --help', 'Display help for a Catalyst command');
 program.showSuggestionAfterError();