zcatalyst-cli 1.13.3 → 1.14.1

package/lib/command_needs/rc.js

@@ -16,6 +16,7 @@ const ansi_colors_1 = require("ansi-colors");
 const endpoints_1 = require("../endpoints");
 const error_1 = __importDefault(require("../error"));
 const rc_1 = __importDefault(require("../internal/rc"));
+const prompt_1 = __importDefault(require("../prompt"));
 const runtime_store_1 = __importDefault(require("../runtime-store"));
 const constants_1 = require("../util_modules/constants");
 const project_1 = __importDefault(require("../util_modules/constants/project"));
@@ -23,15 +24,33 @@ const js_1 = require("../util_modules/js");
 const logger_1 = require("../util_modules/logger");
 const option_1 = require("../util_modules/option");
 const project_2 = require("../util_modules/project");
-exports.default = ({ optional = false, resolveOnNotFound = false } = {}) => __awaiter(void 0, void 0, void 0, function* () {
+exports.default = ({ optional = false, resolveOnNotFound = false, skipOrgCheck = true } = {}) => __awaiter(void 0, void 0, void 0, function* () {
+    const orgOpt = (0, option_1.getGlobalOptionValue)('org', null);
     const projectOpt = (0, option_1.getGlobalOptionValue)('project', null);
-    const projectApi = yield (0, endpoints_1.projectAPI)();
-    const envApi = yield (0, endpoints_1.envAPI)();
+    if (projectOpt != null && orgOpt == null) {
+        throw new error_1.default('Org option is needed when project option is supplied', {
+            exit: 2
+        });
+    }
+    const orgApi = yield (0, endpoints_1.orgAPI)();
+    if (orgOpt != null) {
+        const orgList = yield orgApi.getAllOrgs();
+        const found = orgList.find((org) => org.id + '' === orgOpt);
+        if (!found) {
+            throw new error_1.default('Invalid "org" option supplied', {
+                exit: 2
+            });
+        }
+        runtime_store_1.default.set('project.env.id', orgOpt + '');
+    }
+    let projectApi = orgOpt != null ? yield (0, endpoints_1.projectAPI)({ auth: true, org: orgOpt }) : yield (0, endpoints_1.projectAPI)();
+    let envApi = orgOpt != null ? yield (0, endpoints_1.envAPI)({ auth: true, org: orgOpt }) : yield (0, endpoints_1.envAPI)();
     const convertProjectToProperties = (project) => {
         project = (0, project_2.transformProject)(project);
         runtime_store_1.default.set('project.name', project.name);
         runtime_store_1.default.set('project.id', project.id + '');
         runtime_store_1.default.set('project.domain', project.domain);
+        runtime_store_1.default.set('project.timezone', project.timezone);
     };
     const convertEnvToProperties = (envArr) => {
         const envObj = js_1.JS.find(envArr, { env_name: constants_1.DEFAULT.env_name });
@@ -93,6 +112,26 @@ exports.default = ({ optional = false, resolveOnNotFound = false } = {}) => __aw
     });
     runtime_store_1.default.set('rc', rcInstance);
     if (!rcInstance.loaded) {
+        if (!ignoreRC && orgOpt == null && !skipOrgCheck) {
+            (0, logger_1.warning)('Not in Catalyst app directory!!!');
+            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 Catalyst org to continue: ', {
+                type: 'list',
+                choices: js_1.JS.reverse(orgChoice),
+                when: orgChoice.length > 0
+            }));
+            const selectedOrg = orgAns.org || orgList[0];
+            runtime_store_1.default.set('project.env.id', selectedOrg.id);
+        }
         if (optional || ignoreRC) {
             return;
         }
@@ -145,6 +184,10 @@ exports.default = ({ optional = false, resolveOnNotFound = false } = {}) => __aw
             arg: [(0, ansi_colors_1.bold)(constants_1.FILENAME.rc), (0, ansi_colors_1.bold)('catalyst init project'), (0, ansi_colors_1.bold)('--option')]
         });
     }
+    if (typeof finalEnvObj !== 'undefined') {
+        projectApi = yield (0, endpoints_1.projectAPI)({ auth: true, org: finalEnvObj.id });
+        envApi = yield (0, endpoints_1.envAPI)({ auth: true, org: finalEnvObj.id });
+    }
     const projectDetails = yield projectApi
         .getProject(finalProjectObj.id + '')
         .catch((err) => __awaiter(void 0, void 0, void 0, function* () {
@@ -166,10 +209,16 @@ exports.default = ({ optional = false, resolveOnNotFound = false } = {}) => __aw
         }
         throw err;
     }));
-    if (projectDetails && projectDetails.project_name !== finalProjectObj.name) {
-        finalProjectObj.name = projectDetails.project_name;
-        finalProjectObj.domain.name = projectDetails.project_domain_details.project_domain_name;
-        rcInstance.upsertProject(finalProjectObj);
+    if (projectDetails) {
+        if (projectDetails.project_name !== finalProjectObj.name) {
+            finalProjectObj.name = projectDetails.project_name;
+            finalProjectObj.domain.name = projectDetails.project_domain_details.project_domain_name;
+            rcInstance.upsertProject(finalProjectObj);
+        }
+        if (projectDetails.timezone !== finalProjectObj.timezone) {
+            finalProjectObj.timezone = projectDetails.timezone;
+            rcInstance.upsertProject(finalProjectObj);
+        }
     }
     if (finalProjectObj === undefined) {
         return;
@@ -195,5 +244,5 @@ exports.default = ({ optional = false, resolveOnNotFound = false } = {}) => __aw
             ' in order to reset.');
     }
     convertProjectToProperties(finalProjectObj);
-    runtime_store_1.default.set('project.env', finalEnvObj);
+    runtime_store_1.default.set('project.env', runtime_store_1.default.get('project.env', finalEnvObj));
 });

package/lib/commands/config/delete.js

@@ -0,0 +1,23 @@
+"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 command_1 = __importDefault(require("../../internal/command"));
+const userConfig_1 = __importDefault(require("../../userConfig"));
+const logger_1 = require("../../util_modules/logger");
+exports.default = new command_1.default('config:delete <key>')
+    .description('Delete a key from catalyst config')
+    .action((key) => __awaiter(void 0, void 0, void 0, function* () {
+    const value = userConfig_1.default.delete(key);
+    value ? (0, logger_1.success)('key deleted successfully') : (0, logger_1.error)('key not found');
+}));

package/lib/commands/config/get.js

@@ -0,0 +1,23 @@
+"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 command_1 = __importDefault(require("../../internal/command"));
+const userConfig_1 = __importDefault(require("../../userConfig"));
+const logger_1 = require("../../util_modules/logger");
+exports.default = new command_1.default('config:get <key>')
+    .description('Get catalyst config value for the specified key')
+    .action((key) => __awaiter(void 0, void 0, void 0, function* () {
+    const value = userConfig_1.default.get(key);
+    value ? (0, logger_1.info)(value) : (0, logger_1.error)('key not found');
+}));

package/lib/commands/config/list.js

@@ -0,0 +1,23 @@
+"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 command_1 = __importDefault(require("../../internal/command"));
+const userConfig_1 = __importDefault(require("../../userConfig"));
+const logger_1 = require("../../util_modules/logger");
+exports.default = new command_1.default('config:list')
+    .description('List all your catalyst configurations')
+    .action(() => __awaiter(void 0, void 0, void 0, function* () {
+    const list = userConfig_1.default.list();
+    (0, logger_1.info)(list);
+}));

package/lib/commands/config/set.js

@@ -0,0 +1,29 @@
+"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 command_1 = __importDefault(require("../../internal/command"));
+const userConfig_1 = __importDefault(require("../../userConfig"));
+const logger_1 = require("../../util_modules/logger");
+exports.default = new command_1.default('config:set <key=value>')
+    .description('Set catalyst configuration as a key value pair')
+    .action((details) => __awaiter(void 0, void 0, void 0, function* () {
+    const args = details.split('=');
+    if (args.length != 2) {
+        throw new error_1.default('Invalid parameter passed' +
+            `\nplease give the key value pairs splitted by '=' (eg. orgname=zoho) `);
+    }
+    userConfig_1.default.set(args[0], args[1]);
+    (0, logger_1.success)('config updated successfully');
+}));

package/lib/commands/console/cache.js

@@ -1 +1,31 @@
-"use strict";
+// 'use strict';
+
+// const font = require('ansi-colors');
+
+// const _ = require('../../lib/util_modules');
+// const Command = require('../../lib/internal/command');
+
+// module.exports = new Command('console:cache')
+// 	.description('Launch a shell with Catalyst Cache functionalities')
+// 	.needs('auth', [
+// 		_.CONSTANTS.SCOPE.cache_create,
+// 		_.CONSTANTS.SCOPE.cache_read,
+// 		_.CONSTANTS.SCOPE.cache_delete
+// 	])
+// 	.action(function(options) {
+// 		if (!options.project) {
+// 			return _.PROMISE.reject(
+// 				'Must have an active project to use this feature. Try ' + font.bold('catalyst use')
+// 			);
+// 		}
+// 		let setup = _.JS.set({}, 'repl.feature', 'cache');
+// 		return require('../lib/replserver')(setup, options).then(() => {
+// 			_.LOGGER.info();
+// 			_.LOGGER.info(
+// 				'Instructions for the Cache Shell can be found at: ' +
+// 					font.underline.bold(
+// 						'https://zoho.com/catalyst/help/cli-functionalities.html#Console_Cache'
+// 					)
+// 			);
+// 		});
+// 	});

package/lib/commands/console/queue.js

@@ -1 +1,31 @@
-"use strict";
+// 'use strict';
+
+// const font = require('ansi-colors');
+
+// const _ = require('../../lib/util_modules');
+// const Command = require('../../lib/internal/command');
+
+// module.exports = new Command('console:queue')
+// 	.description('Launch a shell with Catalyst Queue functionalities')
+// 	.needs('auth', [
+// 		_.CONSTANTS.SCOPE.queue,
+// 		_.CONSTANTS.SCOPE.queue_data_create,
+// 		_.CONSTANTS.SCOPE.queue_data_read
+// 	])
+// 	.action(function(options) {
+// 		if (!options.project) {
+// 			return _.PROMISE.reject(
+// 				'Must have an active project to use this feature. Try ' + font.bold('catalyst use')
+// 			);
+// 		}
+// 		let setup = _.JS.set({}, 'repl.feature', 'queue');
+// 		return require('../lib/replserver')(setup, options).then(() => {
+// 			_.LOGGER.info();
+// 			_.LOGGER.info(
+// 				'Instructions for the queue Shell can be found at: ' +
+// 					font.underline.bold(
+// 						'https://zoho.com/catalyst/help/cli-functionalities.html#Console_Queue'
+// 					)
+// 			);
+// 		});
+// 	});

package/lib/commands/console/zcql.js

@@ -1 +1,27 @@
-"use strict";
+// 'use strict';
+
+// const font = require('ansi-colors');
+
+// const _ = require('../../lib/util_modules');
+// const Command = require('../../lib/internal/command');
+
+// module.exports = new Command('console:zcql')
+// 	.description('Launch a shell with CatalystQL functionalities for Data Store')
+// 	.needs('auth', [_.CONSTANTS.SCOPE.zcql])
+// 	.action(function(options) {
+// 		if (!options.project) {
+// 			return _.PROMISE.reject(
+// 				'Must have an active project to use this feature. Try ' + font.bold('catalyst use')
+// 			);
+// 		}
+// 		let setup = _.JS.set({}, 'repl.feature', 'zcql');
+// 		return require('../lib/replserver')(setup, options).then(() => {
+// 			_.LOGGER.info();
+// 			_.LOGGER.info(
+// 				'Instructions for the Cache Shell can be found at: ' +
+// 					font.underline.bold(
+// 						'https://zoho.com/catalyst/help/cli-functionalities.html#Console_zcql'
+// 					)
+// 			);
+// 		});
+// 	});

package/lib/commands/ds/export.js

@@ -41,8 +41,8 @@ exports.default = new command_1.default('ds:export [table]')
     .option('--page <page>', 'Number which denotes the range of rows to be fetched (eg. "1")')
     .option('--production', 'flag for pointing to production environment')
     .needs('auth', [constants_1.SCOPE.projects, constants_1.SCOPE.datastore, constants_1.SCOPE.row])
-    .needs('config')
-    .needs('rc')
+    .needs('config', { optional: true })
+    .needs('rc', { optional: true })
     .action((optTable) => __awaiter(void 0, void 0, void 0, function* () {
     const env = (0, option_1.getOptionValue)('production', false) ? 'Production' : 'Development';
     const configPath = (0, option_1.getOptionValue)('config', false);

package/lib/commands/ds/import.js

@@ -12,6 +12,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+const ansi_colors_1 = require("ansi-colors");
 const path_1 = require("path");
 const endpoints_1 = require("../../endpoints");
 const error_1 = __importDefault(require("../../error"));
@@ -41,8 +42,8 @@ exports.default = new command_1.default('ds:import [file]')
     .option('--config <path>', 'Path of the configuration json file to be used for import.')
     .option('--production', 'flag for pointing to production environment')
     .needs('auth', [constants_1.SCOPE.projects, constants_1.SCOPE.datastore, constants_1.SCOPE.row])
-    .needs('config')
-    .needs('rc')
+    .needs('config', { optional: true })
+    .needs('rc', { optional: true })
     .action((uploadFile) => __awaiter(void 0, void 0, void 0, function* () {
     const env = (0, option_1.getOptionValue)('production', false) ? 'Production' : 'Development';
     const configPath = (0, option_1.getOptionValue)('config', false);
@@ -59,13 +60,32 @@ exports.default = new command_1.default('ds:import [file]')
         const allFolders = (yield fileAPI.getAllFolders());
         if (allFolders.length > 0) {
             const choices = allFolders.map((folderDetail) => prompt_1.default.choice(folderDetail.folder_name, {
-                value: folderDetail.id
+                value: folderDetail
             }));
             const folderAns = yield prompt_1.default.ask(prompt_1.default.question('folder', 'Select a folder to which you want to upload the file to : ', {
                 type: 'list',
-                choices
+                choices,
+                when: !importConfig.folder_id
             }));
-            const fileDetails = (yield fileAPI.uploadFile(folderAns.folder, fs_1.SYNC.getReadStream((0, path_1.resolve)(uploadFile))));
+            folderAns.folder =
+                folderAns.folder === undefined
+                    ? allFolders.find((folderDetails) => folderDetails.folder_name === importConfig.folder_id ||
+                        folderDetails.id === importConfig.folder_id)
+                    : folderAns.folder;
+            if (!folderAns.folder) {
+                throw new error_1.default('Folder not present', {
+                    exit: 1,
+                    errorId: 'IMP-4',
+                    arg: [
+                        ansi_colors_1.bold.red(importConfig.folder_id || ''),
+                        (0, ansi_colors_1.italic)(configPath || ''),
+                        (0, ansi_colors_1.bold)(uploadFile),
+                        (0, ansi_colors_1.bold)('Unique ID'),
+                        (0, ansi_colors_1.italic)('file_id')
+                    ]
+                });
+            }
+            const fileDetails = (yield fileAPI.uploadFile(folderAns.folder.id, fs_1.SYNC.getReadStream((0, path_1.resolve)(uploadFile))));
             importConfig.file_id = fileDetails.id;
         }
         else {

package/lib/commands/ds/status.js

@@ -171,8 +171,8 @@ exports.default = new command_1.default('ds:status <operation> [jobid]')
     .description('Display the job status of a Data Store import or export operation')
     .option('--production', 'flag for pointing to production environment.')
     .needs('auth', [constants_1.SCOPE.projects, constants_1.SCOPE.datastore, constants_1.SCOPE.row])
-    .needs('config')
-    .needs('rc')
+    .needs('config', { optional: true })
+    .needs('rc', { optional: true })
     .action((operation, jobId) => __awaiter(void 0, void 0, void 0, function* () {
     const env = (0, option_1.getOptionValue)('production', false) ? 'Production' : 'Development';
     const action = operation === 'import' ? 'write' : 'read';

package/lib/commands/iac/export.js

@@ -56,7 +56,7 @@ exports.default = new command_1.default('iac:export')
     .option('--production', 'flag for pointing to production environment')
     .needs('auth', [constants_1.SCOPE.project_export_read, constants_1.SCOPE.project_export_create])
     .needs('config', { optional: true })
-    .needs('rc', { optional: true })
+    .needs('rc', { optional: true, skipOrgCheck: false })
     .action(() => __awaiter(void 0, void 0, void 0, function* () {
     const env = (0, option_1.getOptionValue)('production', false) ? 'Production' : 'Development';
     const projectId = yield getExportProjectId();

package/lib/commands/iac/import.js

@@ -208,7 +208,7 @@ exports.default = new command_1.default('iac:import [file_path]')
     constants_1.SCOPE.project_import_delete
 ])
     .needs('config', { optional: true })
-    .needs('rc', { optional: true })
+    .needs('rc', { optional: true, skipOrgCheck: false })
     .action((filePath) => __awaiter(void 0, void 0, void 0, function* () {
     const nameOptValue = (0, option_1.getOptionValue)('name');
     if (nameOptValue && !nameOptValue.match(constants_1.REGEX.project.name)) {

package/lib/commands/iac/pack.js

@@ -58,7 +58,10 @@ exports.default = new command_1.default('iac:pack [zip_name]')
     var _a, _b;
     const config = runtime_store_1.default.get('config');
     const rootDir = (0, path_1.dirname)(config.configPath);
-    const filesAtRoot = yield fs_1.ASYNC.walk(rootDir, { excludeDir: true, depth: 1 });
+    const filesAtRoot = yield fs_1.ASYNC.walk(rootDir, {
+        filter: { excludeDir: true, exclude: [] },
+        depth: 1
+    });
     const templateFilePth = filesAtRoot.find((fileName) => fileName.match(constants_1.REGEX.project.template));
     if (templateFilePth === undefined) {
         throw new error_1.default('No template file found', { exit: 1 });
@@ -81,8 +84,8 @@ exports.default = new command_1.default('iac:pack [zip_name]')
                 const fnTargets = yield fn_utils_1.fnUtils.common.validate();
                 const refinedFns = yield fn_utils_1.fnUtils.common.refineTargets(fnTargets, false);
                 const fnNameByCodePath = {};
-                const [nodeFns, javaFns] = refinedFns.reduce((acc, fn) => {
-                    var _a, _b;
+                const [nodeFns, javaFns, pythonFns] = refinedFns.reduce((acc, fn) => {
+                    var _a, _b, _c;
                     if (!fn.valid) {
                         throw new error_1.default(`Unable to pack since "${fn.name}" is not valid. Reason: ${fn.failure_reason}`);
                     }
@@ -97,11 +100,19 @@ exports.default = new command_1.default('iac:pack [zip_name]')
                     if ((_b = fn.stack) === null || _b === void 0 ? void 0 : _b.startsWith(runtime_1.default.language.java)) {
                         acc[1].push(fn);
                     }
+                    if ((_c = fn.stack) === null || _c === void 0 ? void 0 : _c.startsWith(runtime_1.default.language.python)) {
+                        acc[2].push(fn);
+                    }
                     return acc;
-                }, [[], []]);
+                }, [[], [], []]);
                 const packedNodeFns = yield (0, languages_1.node)(nodeFns);
                 const packedJavaFns = yield (0, languages_1.java)(javaFns);
-                const packedFns = [...(packedNodeFns || []), ...(packedJavaFns || [])];
+                const packedPythonFns = yield (0, languages_1.python)(pythonFns);
+                const packedFns = [
+                    ...(packedNodeFns || []),
+                    ...(packedJavaFns || []),
+                    ...(packedPythonFns || [])
+                ];
                 packedFns.forEach((fn) => {
                     if (!fn.valid) {
                         throw new error_1.default(`Unable to pack since "${fn.name}" is not valid. Reason: ${fn.failure_reason}`);

package/lib/commands/iac/status.js

@@ -45,7 +45,7 @@ exports.default = new command_1.default('iac:status <operation>')
     .option('--production', 'flag for pointing to production environment (only for export)')
     .needs('auth', [constants_1.SCOPE.project_import_read, constants_1.SCOPE.project_export_read])
     .needs('config', { optional: true })
-    .needs('rc', { optional: true })
+    .needs('rc', { optional: true, skipOrgCheck: false })
     .action((operation) => __awaiter(void 0, void 0, void 0, function* () {
     switch (operation) {
         case 'import':

package/lib/commands/index.js

@@ -81,6 +81,10 @@ exports.default = (client) => {
         loadCommand('deploy'),
         loadCommand('help'),
         loadCommand('run'),
+        loadCommand('config:set'),
+        loadCommand('config:get'),
+        loadCommand('config:delete'),
+        loadCommand('config:list'),
         loadCommand('logout')
     ]);
 };

package/lib/commands/project/list.js

@@ -46,7 +46,7 @@ exports.default = new command_1.default('project:list')
     .description('List all the Catalyst projects you have access to')
     .needs('auth', [constants_1.SCOPE.projects])
     .needs('config', { optional: true, resolveOnNotFound: true })
-    .needs('rc', { optional: true })
+    .needs('rc', { optional: true, skipOrgCheck: false })
     .action(() => __awaiter(void 0, void 0, void 0, function* () {
     const cliTable3 = (yield Promise.resolve().then(() => __importStar(require('../../cli_table')))).default;
     const projects = (yield (yield (0, endpoints_1.projectAPI)()).getAllProjects());

package/lib/commands/project/use.js

@@ -33,7 +33,7 @@ exports.default = new command_1.default('project:use [name_or_project_id]')
     .description('Set an active Catalyst project for your working directory')
     .needs('auth', [constants_1.SCOPE.projects])
     .needs('config', { optional: true, resolveOnNotFound: true })
-    .needs('rc', { optional: true, resolveOnNotFound: true })
+    .needs('rc', { optional: true, resolveOnNotFound: true, skipOrgCheck: false })
     .action((newActive) => __awaiter(void 0, void 0, void 0, function* () {
     const currentProjectId = (0, project_2.getProjectId)(null);
     const allProjects = (yield (yield (0, endpoints_1.projectAPI)()).getAllProjects().catch(() => {

package/lib/deploy/features/client.js

@@ -21,12 +21,12 @@ exports.default = () => __awaiter(void 0, void 0, void 0, function* () {
     yield client_utils_1.clientUtils.validate();
     const readStream = yield client_utils_1.clientUtils.pack();
     const resp = (yield (yield (0, endpoints_1.clientAPI)()).deploy(readStream));
+    const homepage = runtime_store_1.default.get('context.client.homepage', '');
     runtime_store_1.default.set('payload.client.url', 'https://' +
         resp.url_prefix +
         '.' +
         constants_1.ORIGIN.app.replace('https://', '') +
-        '/app/' +
-        runtime_store_1.default.get('context.client.homepage'));
+        (homepage.startsWith('/__catalyst') ? homepage : '/app/' + homepage));
     runtime_store_1.default.set('payload.client.deploy', true);
     client_utils_1.clientUtils.executeHook({ prefix: 'post', command: 'deploy' });
 });

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

@@ -17,6 +17,7 @@ const endpoints_1 = require("../../../endpoints");
 const error_1 = __importDefault(require("../../../error"));
 const fn_utils_1 = require("../../../fn-utils");
 const runtime_store_1 = __importDefault(require("../../../runtime-store"));
+const throbber_1 = __importDefault(require("../../../throbber"));
 const constants_1 = require("../../../util_modules/constants");
 const runtime_1 = __importDefault(require("../../../util_modules/constants/lib/runtime"));
 const logger_1 = require("../../../util_modules/logger");
@@ -37,11 +38,17 @@ exports.default = () => __awaiter(void 0, void 0, void 0, function* () {
     }
     const refinedTargets = yield fn_utils_1.fnUtils.common.refineTargets(targets);
     runtime_store_1.default.set('context.functions.targets', refinedTargets);
-    const packedTargets = yield Promise.all([
+    refinedTargets
+        .filter((target) => target.valid)
+        .forEach((target) => throbber_1.default.getInstance().add('function_deploy_' + target.name, {
+        text: `packaging function [${target.name}]`
+    }));
+    const [nodeTarget, javaTarget, pythonTarget] = yield Promise.all([
         (0, languages_1.node)(refinedTargets.filter((target) => { var _a; return ((_a = target.stack) === null || _a === void 0 ? void 0 : _a.startsWith(runtime_1.default.language.nodejs)) && target.valid; })),
-        (0, languages_1.java)(refinedTargets.filter((target) => { var _a; return ((_a = target.stack) === null || _a === void 0 ? void 0 : _a.startsWith(runtime_1.default.language.java)) && target.valid; }))
+        (0, languages_1.java)(refinedTargets.filter((target) => { var _a; return ((_a = target.stack) === null || _a === void 0 ? void 0 : _a.startsWith(runtime_1.default.language.java)) && target.valid; })),
+        (0, languages_1.python)(refinedTargets.filter((target) => { var _a; return ((_a = target.stack) === null || _a === void 0 ? void 0 : _a.startsWith(runtime_1.default.language.python)) && target.valid; }))
     ]);
-    const combinedTarget = [...(packedTargets[0] || []), ...(packedTargets[1] || [])];
+    const combinedTarget = [...(nodeTarget || []), ...(javaTarget || []), ...(pythonTarget || [])];
     const batchSize = 1;
     const fnAPI = yield (0, endpoints_1.functionsAPI)();
     const appAPI = yield (0, endpoints_1.applogicAPI)();
@@ -68,6 +75,9 @@ exports.default = () => __awaiter(void 0, void 0, void 0, function* () {
                     }));
                 }
                 target.id = resp.id + '';
+                if (target.id && target.env_var && Object.keys(target.env_var).length > 0) {
+                    yield fnAPI.updateConfig(target.id, target.env_var);
+                }
                 fn_utils_1.fnUtils.common.generateUrlForTarget(target);
             }
             catch (e) {

package/lib/deploy/features/functions/languages/index.js

@@ -8,19 +8,30 @@ 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 });
-exports.java = exports.node = void 0;
+exports.python = exports.java = exports.node = void 0;
 const fn_utils_1 = require("../../../../fn-utils");
+const throbber_1 = __importDefault(require("../../../../throbber"));
 function deploy(targets, lang) {
     return __awaiter(this, void 0, void 0, function* () {
         if (targets === undefined || targets.length === 0) {
             return;
         }
+        const throbber = throbber_1.default.getInstance();
         yield fn_utils_1.fnUtils[lang].validate(targets, 0);
         return Promise.all(targets
-            .filter((target) => target.valid)
+            .filter((target) => {
+            if (!target.valid) {
+                throbber.remove('function_deploy_' + target.name);
+            }
+            return target.valid;
+        })
             .map((target) => __awaiter(this, void 0, void 0, function* () {
             yield fn_utils_1.fnUtils.common.pack(target);
+            throbber.remove('function_deploy_' + target.name);
             return target;
         })));
     });
@@ -37,3 +48,9 @@ function java(targets) {
     });
 }
 exports.java = java;
+function python(targets) {
+    return __awaiter(this, void 0, void 0, function* () {
+        return deploy(targets, 'python');
+    });
+}
+exports.python = python;

package/lib/endpoints/index.js

@@ -32,19 +32,26 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.logAPI = exports.eventBusAPI = exports.functionsAPI = exports.applogicAPI = exports.bulkDSAPI = exports.apigAPI = exports.clientAPI = exports.datastoreAPI = exports.zcqlAPI = exports.queueAPI = exports.filestoreAPI = exports.cacheAPI = exports.sdkAPI = exports.envAPI = exports.projectAPI = void 0;
+exports.logAPI = exports.eventBusAPI = exports.functionsAPI = exports.applogicAPI = exports.bulkDSAPI = exports.apigAPI = exports.clientAPI = exports.datastoreAPI = exports.zcqlAPI = exports.queueAPI = exports.filestoreAPI = exports.cacheAPI = exports.sdkAPI = exports.envAPI = exports.projectAPI = exports.orgAPI = void 0;
 const project_1 = require("../util_modules/project");
-function projectAPI({ auth = true } = {}) {
+function orgAPI({ auth = true } = {}) {
+    return __awaiter(this, void 0, void 0, function* () {
+        const org = (yield Promise.resolve().then(() => __importStar(require('./lib/org')))).default;
+        return new org({ authNeeded: auth });
+    });
+}
+exports.orgAPI = orgAPI;
+function projectAPI({ auth = true, org = (0, project_1.getEnvId)() } = {}) {
     return __awaiter(this, void 0, void 0, function* () {
         const project = (yield Promise.resolve().then(() => __importStar(require('./lib/project')))).default;
-        return new project({ authNeeded: auth });
+        return new project({ authNeeded: auth }, org);
     });
 }
 exports.projectAPI = projectAPI;
-function envAPI({ auth = true } = {}) {
+function envAPI({ auth = true, org = (0, project_1.getEnvId)() } = {}) {
     return __awaiter(this, void 0, void 0, function* () {
         const env = (yield Promise.resolve().then(() => __importStar(require('./lib/env')))).default;
-        return new env({ authNeeded: auth });
+        return new env({ authNeeded: auth }, org);
     });
 }
 exports.envAPI = envAPI;