zcatalyst-cli 1.18.0-beta.0 → 1.18.0-beta.10

package/docs/command_needs/rc.toml

@@ -1,7 +1,7 @@
 [RC-1]
 context = '''The project(${arg[0]}) provided with the ${arg[1]} option is not available is not available in the ${arg[3]} org.'''
 aid = '''Please use one of the available projects with the ${arg[1]} option or specify the correct org \nThe available projects in the ${arg[3]} org are: \n${arg[2]}'''
-link = 'https://www.zoho.com/catalyst/help/cli-options.html#Project'
+link = 'https://docs.catalyst.zoho.com/en/cli/v1/initialize-resources/initialize-new-project/'
 
 [RC-2]
 context = '''Unable to load the ${arg[0]} file.'''
@@ -10,18 +10,18 @@ link = ''
 
 [RC-3]
 context = '''Oops!!! It looks like you're not inside a Catalyst app directory because we are unable to locate the ${arg[0]} file.'''
-aid = '''Please run the ${arg[1]} command to initialise or specify a valid project with the ${arg[2]} option.'''
-link = 'https://www.zoho.com/catalyst/help/cli-init.html#Initialize_All'
+aid = '''Please run the ${arg[1]} command to initialize or specify a valid project with the ${arg[2]} option.'''
+link = 'https://docs.catalyst.zoho.com/en/cli/v1/initialize-resources/introduction/#Initialize_Alll'
 
 [RC-4]
 context = '''The ${arg[0]} file is corrupted.'''
-aid = '''Please delete the ${arg[0]} file in the Catalyst app directory and initialise the project with the ${arg[1]} command or \nSpecify a valid project with the ${arg[2]} option.'''
-link = 'https://www.zoho.com/catalyst/help/cli-init.html#Options'
+aid = '''Please delete the ${arg[0]} file in the Catalyst app directory and initialize the project with the ${arg[1]} command or \nSpecify a valid project with the ${arg[2]} option.'''
+link = 'https://docs.catalyst.zoho.com/en/cli/v1/initialize-resources/initialize-options/#--force'
 
 [RC-5]
-context = '''The project which is currently active doesn't seems to be present in Catalyst remote console.'''
-aid = '''Use the ${arg[0]} command in order to change the existing active project.'''
-link = 'https://www.zoho.com/catalyst/help/cli-projects.html#Use'
+context = '''Oops!!! It looks like you don't have access to the currently initialized project ${arg[0]}.'''
+aid = '''Please contact the owner or an administrator of the project.\nIf you would like to initialize a new project for this directory, please use the below command\n${arg[1]}'''
+link = 'https://docs.catalyst.zoho.com/en/cli/v1/initialize-resources/initialize-options/#--force'
 
 [RC-6]
 context = '''The Catalyst portal initialized in the current project directory is not accessible with the currently logged in user.\n

package/docs/commands/ds/import.toml

@@ -6,15 +6,15 @@ link = 'https://www.zoho.com/catalyst/help/cli-import-export.html#Import'
 [IMP-2]
 context = '''File needed for import! A CSV file is mandatory for executing this command.'''
 aid = '''Please provide the path of the CSV file present in the local machine with the command, or 
-provide the file_id of the file that is already uploaded to the File Store in the config json.'''
+provide the object_details of the file that is already uploaded to the Stratus in the config json.'''
 link = 'https://www.zoho.com/catalyst/help/cli-import-export.html#CSV'
 
 [IMP-3]
-context = '''No Folders present in the File Store! You must have atleast one folder in the File Store to upload the CSV file.'''
-aid = '''Please create atleast one folder in the Catalyst File Store to proceed.'''
+context = '''No Buckets present in the Stratus! You must have atleast one bucket in the Stratus to upload the CSV file.'''
+aid = '''Please create atleast one bucket in the Catalyst Stratus to proceed.'''
 link = 'https://www.zoho.com/catalyst/help/file-store.html#Creating'
 
 [IMP-4]
-context = '''The folder ${arg[0]} specified in the ${arg[1]} config file does not exists in the Catalyst file store.'''
-aid = '''Please specify the name of a folder that's already present in Catalyst file store. Alternatively, you can try uploading the ${arg[2]} file to a folder in the Catalyst file store and specify it's ${arg[3]} as ${arg[4]} in the ${arg[1]} config file.'''
+context = '''The bucket ${arg[0]} specified in the ${arg[1]} config file does not exists in the Catalyst Stratus.'''
+aid = '''Please specify the name of a bucket that's already present in Catalyst Stratus. Alternatively, you can try uploading the ${arg[2]} file to a bucket in the Catalyst Stratus and specify it's ${arg[3]} as ${arg[4]} in the ${arg[1]} config file.'''
 link = 'https://catalyst.zoho.com/help/cli-import-export.html#Import_File_Format'

package/docs/commands/event/generate/job.toml

@@ -0,0 +1,7 @@
+[JOB-1]
+context = '''No Jobpools were present in the development environment for project ${arg[0]}'''
+aid = '''Please visit the below link to create your first jobpool\n${arg[1]}'''
+
+[JOB-2]
+context = '''No function Jobpools were present in the development environment for project ${arg[0]}'''
+aid = '''Please visit the below link to create a functions jobpool\n${arg[1]}'''

package/docs/commands/zest/generate/index.toml

@@ -0,0 +1,4 @@
+[ZEST-GEN-1]
+context = '''Oops! It's looks like you haven't created any specification.'''
+aid = '''Please visit the below link to add a zest specifications.'''
+link = 'https://docs-ea.catalyst.localzoho.com/en/zest/help/introduction/'

package/docs/endpoints/lib/job-scheduling.toml

@@ -0,0 +1,3 @@
+[JOB-SCHEDULING-1]
+context = '''The Jobpool ${arg[0]} is not available in the Catalyst Development environment'''
+aid = '''Please select from one of the Jobpools listed below:\n${arg[1]}'''

package/docs/internal/command.toml

@@ -2,3 +2,8 @@
 context = '''Too many arguments specified with the command: ${arg[0]}.'''
 aid = '''Use ${arg[1]} command to get the usage instructions.'''
 link = 'https://www.zoho.com/catalyst/help/cli-help.html'
+
+[CMD-2]
+context = '''The command ${arg[0]} provided is not supported in CI enviroment.'''
+aid = '''Use '${arg[1]}' to know the commands supported in CI.'''
+link = ''

package/docs/serve/server/lib/appsail/index.toml

@@ -1,4 +1,25 @@
 [SERVE-APPSAIL-1]
-context = '''The provided build path (${arg[0]}) for the AppSail ${arg[1]} does not exists.'''
+context = '''The provided build path ${arg[0]} for the AppSail ${arg[1]} does not exists.'''
 aid = '''Please provide a valid build path'''
 link = ''
+
+[SERVE-APPSAIL-2]
+context = '''The build path resolved from the provided relative path "${arg[0]}" does not exists.
+Source path   : ${arg[1]}
+Build path    : ${arg[2]}
+Resolved Path : ${arg[3]}'''
+aid = '''Please provide a valid relative path as build path'''
+link = ''
+
+[SERVE-APPSAIL-3]
+context = '''Unable to start the ${arg[0]} AppSail server with the below parameters.
+Command    : ${arg[1]}
+Build path : ${arg[2]}
+Runtime    : ${arg[3]}'''
+aid = '''Please fix the errors if any'''
+link = ''
+
+[SERVE-APPSAIL-4]
+context = '''Invalid AppSail Stack/Runtime for AppSail ${arg[0]}: ${arg[1]}'''
+aid = '''Please use a supported Stack/Runtime from the below list: \n${arg[2]}'''
+link = ''

package/lib/appsail-utils.js

@@ -3,13 +3,12 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getDomainPrefix = exports.validateAppSail = exports.filterTargets = void 0;
+exports.validateAppSail = exports.filterTargets = void 0;
 const ansi_colors_1 = require("ansi-colors");
 const error_1 = __importDefault(require("./error"));
 const constants_1 = require("./util_modules/constants");
 const logger_1 = require("./util_modules/logger");
 const option_1 = require("./util_modules/option");
-const project_1 = require("./util_modules/project");
 function getAppSailFilters(targetStr) {
     return targetStr.split(',').reduce((filterArr, target) => {
         const opts = target.split(':');
@@ -28,7 +27,7 @@ function filterTargets(allTargets) {
             return allTargets;
         }
         const refined = onlyTargs.reduce((filtered, filter) => {
-            const targDetailsIdx = allTargets.findIndex((targ) => { var _a; return ((_a = targ.appSail) === null || _a === void 0 ? void 0 : _a.name) === filter; });
+            const targDetailsIdx = allTargets.findIndex((targ) => targ.name === filter);
             if (targDetailsIdx === -1) {
                 filtered.unmatched.push(filter);
             }
@@ -50,7 +49,7 @@ function filterTargets(allTargets) {
     if (except !== undefined) {
         const exceptTargs = getAppSailFilters(except);
         const refined = exceptTargs.reduce((filtered, filter) => {
-            const targDetailsIdx = allTargets.findIndex((targ) => { var _a; return ((_a = targ.appSail) === null || _a === void 0 ? void 0 : _a.name) === filter; });
+            const targDetailsIdx = allTargets.findIndex((targ) => targ.name === filter);
             if (targDetailsIdx === -1) {
                 filtered.unmatched.push(filter);
             }
@@ -73,7 +72,7 @@ exports.filterTargets = filterTargets;
 function validateAppSail(targDetails) {
     targDetails.forEach((targ) => {
         var _a, _b;
-        if (targ.validity.valid && ((_a = targ.appSail) === null || _a === void 0 ? void 0 : _a.platform) !== 'war' && !((_b = targ.appSail) === null || _b === void 0 ? void 0 : _b.command)) {
+        if (targ.validity.valid && ((_a = targ.config) === null || _a === void 0 ? void 0 : _a.platform) !== 'war' && !((_b = targ.config) === null || _b === void 0 ? void 0 : _b.command)) {
             targ.validity = {
                 valid: false,
                 reason: 'Start-up command missing'
@@ -83,8 +82,3 @@ function validateAppSail(targDetails) {
     return targDetails;
 }
 exports.validateAppSail = validateAppSail;
-function getDomainPrefix(targetDetail) {
-    var _a;
-    return `${(_a = targetDetail.appSail) === null || _a === void 0 ? void 0 : _a.name}-${(0, project_1.getDomainKey)()}.development`;
-}
-exports.getDomainPrefix = getDomainPrefix;

package/lib/authentication/index.js

@@ -113,6 +113,7 @@ function login() {
         const token = config_store_1.default.get(`${activeDC}.credential`);
         if (user && token && !(0, option_1.getOptionValue)('force', false)) {
             (0, logger_1.message)('No need to login. Already logged as: ' + ansi_colors_1.default.cyan.bold(user.Email));
+            (0, dc_1.updateActiveDC)(activeDC);
             return;
         }
         const ans = yield prompt_1.default.ask(prompt_1.default.question('collectUsage', 'Allow Catalyst to collect CLI error reporting information?', {

package/lib/authentication/login.js

@@ -33,11 +33,15 @@ const logger_1 = require("../util_modules/logger");
 const option_1 = require("../util_modules/option");
 const crypto_1 = require("crypto");
 exports.missingScopes = {
-    [constants_1.DC_TYPE.in.value]: ['dataverse'],
-    [constants_1.DC_TYPE.eu.value]: ['quick_ml', 'dataverse'],
-    [constants_1.DC_TYPE.au.value]: ['dataverse'],
-    [constants_1.DC_TYPE.ca.value]: ['quick_ml', 'dataverse']
+    [constants_1.DC_TYPE.in.value]: getScopes(['zest', 'dataverse']),
+    [constants_1.DC_TYPE.eu.value]: getScopes(['zest', 'quick_ml', 'dataverse']),
+    [constants_1.DC_TYPE.au.value]: getScopes(['zest', 'dataverse']),
+    [constants_1.DC_TYPE.ca.value]: getScopes(['zest', 'quick_ml', 'dataverse']),
+    [constants_1.DC_TYPE.sa.value]: getScopes(['zest', 'quick_ml', 'dataverse'])
 };
+function getScopes(keys) {
+    return Object.keys(constants_1.SCOPE).filter((scope) => keys.some((prefix) => scope.startsWith(prefix)));
+}
 class Login {
     constructor(localhost = true, user = true) {
         this.localhost = localhost;

package/lib/bin/catalyst.js

@@ -44,7 +44,7 @@ const errorOut_1 = __importDefault(require("../errorOut"));
 (0, logger_1.debug)(js_1.JS.repeat('-', 70));
 (0, logger_1.debug)();
 process.on('beforeExit', (code) => __awaiter(void 0, void 0, void 0, function* () {
-    code = process.exitCode || code;
+    code = Number(process.exitCode) || code;
     if (code > 0 && process.stdout.isTTY) {
         const lastError = config_store_1.default.get('lastError', 0);
         const timestamp = Date.now();

package/lib/code-deck.js

@@ -20,6 +20,7 @@ const prompt_1 = __importDefault(require("./prompt"));
 const tree_1 = require("./prompt/types/tree");
 const runtime_store_1 = __importDefault(require("./runtime-store"));
 const logger_1 = require("./util_modules/logger");
+const project_1 = require("./util_modules/project");
 const shell_1 = require("./util_modules/shell");
 function listenDeploy(id, gitUrl) {
     return __awaiter(this, void 0, void 0, function* () {
@@ -27,21 +28,20 @@ function listenDeploy(id, gitUrl) {
             const allGlobalOpts = runtime_store_1.default.get('opts.globalOpts', {});
             const optsArr = Object.keys(allGlobalOpts).reduce((arr, key) => {
                 arr.push('--' + key);
-                if (allGlobalOpts[key]) {
+                if (typeof allGlobalOpts[key] === 'string') {
                     arr.push(allGlobalOpts[key]);
                 }
                 return arr;
-            }, ['--id', id]);
-            const childRes = yield (0, shell_1.spawn)('catalyst', ['iac:status', 'import', ...optsArr], {
+            }, ['--id', id, '--org', (0, project_1.getEnvId)() || '']);
+            yield (0, shell_1.spawn)('catalyst', ['iac:status', 'import', ...optsArr], {
                 shell: true,
                 stdio: ['inherit', 'inherit', 'inherit', 'ipc'],
                 env: { PARENT_COMMAND: 'codedeck', GIT_URL: gitUrl }
-            })
-                .ASYNC()
-                .catch((err) => (0, logger_1.debug)(err));
-            return (childRes === null || childRes === void 0 ? void 0 : childRes.message) === 'success';
+            }).ASYNC();
+            return true;
         }
         catch (err) {
+            (0, logger_1.debug)('Error when listening for iac:status ', err);
             return false;
         }
     });

package/lib/command_needs/rc.js

@@ -33,7 +33,7 @@ exports.default = ({ optional = false, resolveOnNotFound = false, skipOrgCheck =
     const globProjectOpt = (0, option_1.getGlobalOptionValue)('project', null);
     const projectOpt = globProjectOpt
         ? globProjectOpt
-        : (0, env_1.getEnvVariable)('CATALYST_PROJECT', null);
+        : (0, env_1.getEnvVariable)('CATALYST_PROJECT_ID', (0, env_1.getEnvVariable)('CATALYST_PROJECT', null));
     const orgApi = yield (0, endpoints_1.orgAPI)();
     if (orgOpt !== null) {
         const orgList = yield orgApi.getAllOrgs();
@@ -192,7 +192,7 @@ exports.default = ({ optional = false, resolveOnNotFound = false, skipOrgCheck =
         });
     }
     if (typeof finalEnvObj !== 'undefined') {
-        projectApi = yield (0, endpoints_1.projectAPI)({ auth: true, org: finalEnvObj.id });
+        projectApi = yield (0, endpoints_1.projectAPI)({ auth: true, org: finalEnvObj.id, printError: false });
         envApi = yield (0, endpoints_1.envAPI)({ auth: true, org: finalEnvObj.id });
     }
     const projectDetails = yield projectApi
@@ -200,19 +200,19 @@ exports.default = ({ optional = false, resolveOnNotFound = false, skipOrgCheck =
         .catch((err) => __awaiter(void 0, void 0, void 0, function* () {
         if (js_1.JS.hasIn(err, 'context.response.statusCode')) {
             switch (err.context.response.statusCode) {
+                case 401:
                 case 404: {
-                    (0, logger_1.message)('cleaning up ' +
-                        constants_1.FILENAME.rc +
-                        ' since the current active project for this folder is not found in remote');
-                    yield (0, project_2.removeProject)(finalProjectObj.id + '');
                     if (resolveOnNotFound) {
                         finalProjectObj = undefined;
                         return;
                     }
-                    throw new error_1.default('active project not found in remote', {
+                    throw new error_1.default('no access to project: ' + (finalProjectObj === null || finalProjectObj === void 0 ? void 0 : finalProjectObj.id), {
                         exit: 1,
                         errorId: 'RC-5',
-                        arg: [(0, ansi_colors_1.bold)('catalyst project:use')]
+                        arg: [
+                            (0, ansi_colors_1.bold)(`${finalProjectObj === null || finalProjectObj === void 0 ? void 0 : finalProjectObj.name}(${finalProjectObj === null || finalProjectObj === void 0 ? void 0 : finalProjectObj.id})`),
+                            (0, ansi_colors_1.bold)((0, ansi_colors_1.cyan)('command: ') + 'catalyst init --force')
+                        ]
                     });
                 }
                 case 403: {

package/lib/commands/appsail/add.js

@@ -43,13 +43,14 @@ const logger_1 = require("../../util_modules/logger");
 exports.default = new command_1.default('appsail:add')
     .description('Link an already existing AppSail service to Catalyst Project')
     .needs('auth', [constants_1.SCOPE.functions])
-    .needs('config')
+    .needs('config', { optional: true })
     .needs('rc')
+    .ci(false)
     .action(() => __awaiter(void 0, void 0, void 0, function* () {
     const config = runtime_store_1.default.get('config');
     yield (yield Promise.resolve().then(() => __importStar(require('../../init/features')))).appsail();
     yield config.save();
-    (0, logger_1.message)((0, ansi_colors_1.bold)(constants_1.FILENAME.config) + ' file has been successfully updated with functions details.');
+    (0, logger_1.message)((0, ansi_colors_1.bold)(constants_1.FILENAME.config) + ' file has been successfully updated with appsail details.');
     (0, logger_1.info)();
     (0, logger_1.success)('AppSail service successfully linked');
 }));

package/lib/commands/client/setup.js

@@ -43,8 +43,9 @@ const logger_1 = require("../../util_modules/logger");
 exports.default = new command_1.default('client:setup')
     .description('Set up and configure the client directory in your project directory')
     .needs('auth', [constants_1.SCOPE.webapp])
-    .needs('config')
+    .needs('config', { optional: true })
     .needs('rc')
+    .ci(false)
     .action(() => __awaiter(void 0, void 0, void 0, function* () {
     const config = runtime_store_1.default.get('config');
     yield (yield Promise.resolve().then(() => __importStar(require('../../init/features')))).client();

package/lib/commands/codelib/install.js

@@ -32,7 +32,7 @@ exports.default = new command_1.default('codelib:install [git-url]')
     .description('Install the code library functionalities into your project')
     .option('-c, --continue <install-id>', 'Continue CodeLib install')
     .needs('auth', [constants_1.SCOPE.project_import_create])
-    .needs('config')
+    .needs('config', { optional: true })
     .needs('rc')
     .action((gitUrl) => __awaiter(void 0, void 0, void 0, function* () {
     var _a;
@@ -72,7 +72,10 @@ exports.default = new command_1.default('codelib:install [git-url]')
         if (!gitUrl) {
             throw new error_1.default('Invalid code lib', { exit: 2 });
         }
-        return;
+        throw new error_1.default(`Error while downloading codelib.`, {
+            exit: 2,
+            original: `Occurred while processing ${gitUrl}`
+        });
     }
     const templateFile = yield (0, code_deck_1.getTemplateFile)(deckZip);
     const templateJson = JSON.parse(templateFile || '');
@@ -134,6 +137,7 @@ exports.default = new command_1.default('codelib:install [git-url]')
     }
     const templateFns = (((_a = templateJson.components) === null || _a === void 0 ? void 0 : _a.Functions) || []);
     if (templateFns.length > 0) {
+        yield new Promise((res) => setTimeout(res, 5000));
         yield (0, functions_1.default)(templateFns.map((fn) => fn.name));
         (0, features_1.setCatalystConfig)('functions', true);
         const config = runtime_store_1.default.get('config');

package/lib/commands/ds/import.js

@@ -45,6 +45,7 @@ exports.default = new command_1.default('ds:import [file]')
     .needs('config', { optional: true })
     .needs('rc', { optional: true })
     .action((uploadFile) => __awaiter(void 0, void 0, void 0, function* () {
+    var _a, _b, _c;
     const env = (0, option_1.getOptionValue)('production', false) ? 'Production' : 'Development';
     const configPath = (0, option_1.getOptionValue)('config', false);
     const importConfig = configPath ? yield getWriteConfigFromPath(configPath) : {};
@@ -52,44 +53,59 @@ exports.default = new command_1.default('ds:import [file]')
     if (!tableId) {
         throw new error_1.default('Table identifier missing', { exit: 0, errorId: 'IMP-1' });
     }
-    if (!importConfig.file_id) {
+    if (!importConfig.file_id && !((_a = importConfig.object_details) === null || _a === void 0 ? void 0 : _a.object_key)) {
         if (!uploadFile) {
             throw new error_1.default('No CSV file provided', { exit: 0, errorId: 'IMP-2' });
         }
-        const fileAPI = yield (0, endpoints_1.filestoreAPI)({ env });
-        const allFolders = (yield fileAPI.getAllFolders());
-        if (allFolders.length > 0) {
-            const choices = allFolders.map((folderDetail) => prompt_1.default.choice(folderDetail.folder_name, {
-                value: folderDetail
+        const bucketAPI = yield (0, endpoints_1.stratusAPI)({ env });
+        const allBuckets = (yield bucketAPI.getAllBuckets());
+        if (allBuckets.length > 0) {
+            const choices = allBuckets.map((bucketDetail) => prompt_1.default.choice(bucketDetail.bucket_name, {
+                value: bucketDetail
             }));
-            const folderAns = yield prompt_1.default.ask(prompt_1.default.question('folder', 'Select a folder to which you want to upload the file to : ', {
+            const bucketAns = yield prompt_1.default.ask(prompt_1.default.question('bucket', 'Select a bucket to which you want to upload the object to : ', {
                 type: 'list',
                 choices,
-                when: !importConfig.folder_id
+                when: !((_b = importConfig.object_details) === null || _b === void 0 ? void 0 : _b.bucket_name)
             }));
-            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', {
+            const bucket = bucketAns.bucket;
+            const bucketName = bucket.bucket_name === undefined
+                ? allBuckets.find((bucketDetails) => {
+                    var _a;
+                    return bucketDetails.bucket_name ===
+                        ((_a = importConfig.object_details) === null || _a === void 0 ? void 0 : _a.bucket_name);
+                })
+                : bucket.bucket_name;
+            if (!bucketName) {
+                throw new error_1.default('Bucket not present', {
                     exit: 1,
                     errorId: 'IMP-4',
                     arg: [
-                        ansi_colors_1.bold.red(importConfig.folder_id || ''),
+                        ansi_colors_1.bold.red(((_c = importConfig.object_details) === null || _c === void 0 ? void 0 : _c.bucket_name) || ''),
                         (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')
+                        (0, ansi_colors_1.bold)('Details(bucket_name and object_key)'),
+                        (0, ansi_colors_1.italic)('object_details')
                     ]
                 });
             }
-            const fileDetails = (yield fileAPI.uploadFile(folderAns.folder.id, fs_1.SYNC.getReadStream((0, path_1.resolve)(uploadFile))));
-            importConfig.file_id = fileDetails.id;
+            try {
+                yield bucketAPI.uploadObject(bucketName, uploadFile, 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', {
+                    exit: 1,
+                    original: err
+                });
+            }
+            const objDetail = {
+                bucket_name: bucketName,
+                object_key: uploadFile
+            };
+            importConfig.object_details = objDetail;
         }
         else {
-            throw new error_1.default('folder needed', { exit: 0, errorId: 'IMP-3' });
+            throw new error_1.default('bucket needed', { exit: 0, errorId: 'IMP-3' });
         }
     }
     const bulkAPI = yield (0, endpoints_1.bulkDSAPI)({ env });

package/lib/commands/event/generate/index.js

@@ -54,6 +54,7 @@ exports.default = new command_1.default('event:generate <source> <action>')
     .needs('auth')
     .action(function generate(source, action) {
     return __awaiter(this, void 0, void 0, function* () {
+        var _a;
         const unknownArgs = (0, option_1.getUnknownOpts)([]);
         if (unknownArgs.length % 2 !== 0) {
             throw new error_1.default('Unknown options are not provided as key value pairs', {
@@ -148,10 +149,22 @@ exports.default = new command_1.default('event:generate <source> <action>')
                     break;
                 case 'action':
                     const eventRefArr = constants_1.EVENT_REF[remoteSourceName];
-                    const remoteRefAction = action.charAt(0).toUpperCase() + action.slice(1);
+                    const remoteRefAction = action
+                        .split('_')
+                        .map((act) => act.charAt(0).toUpperCase() + act.slice(1))
+                        .join(' ');
                     (0, logger_1.debug)(`action provided is : ${remoteRefAction}`);
                     const indexOfAction = eventRefArr.indexOf(remoteRefAction);
                     if (indexOfAction < 0) {
+                        const availableActions = eventRefArr
+                            .map((act) => {
+                            act = act
+                                .split(' ')
+                                .map((act) => act.charAt(0).toUpperCase() + act.slice(1))
+                                .join('_');
+                            return '* ' + act;
+                        })
+                            .join('\n');
                         throw new error_1.default('Action incompatible with the source ' + eventRefArr, {
                             exit: 1,
                             errorId: 'IDX-6',
@@ -159,7 +172,7 @@ exports.default = new command_1.default('event:generate <source> <action>')
                                 (0, ansi_colors_1.bold)(action),
                                 ansi_colors_1.bold.red('X'),
                                 (0, ansi_colors_1.bold)(source),
-                                (0, ansi_colors_1.bold)(eventRefArr.map((act) => '* ' + act).join('\n'))
+                                (0, ansi_colors_1.bold)(availableActions)
                             ]
                         });
                     }
@@ -175,7 +188,7 @@ exports.default = new command_1.default('event:generate <source> <action>')
                     break;
             }
         });
-        const sourceModule = (yield Promise.resolve().then(() => __importStar(require('../../../event_generate/' + source)))).default;
+        const sourceModule = (yield (_a = '../../../event_generate/' + source, Promise.resolve().then(() => __importStar(require(_a))))).default;
         eventJsonContent = yield sourceModule(eventJsonContent, optionMap, action);
         const jsonContent = JSON.parse(eventJsonContent);
         Object.keys(jsonContent).forEach((key) => {

package/lib/commands/event/generate/integ.js

@@ -46,6 +46,7 @@ exports.default = new command_1.default('event:generate:integ <service>')
     .needs('rc')
     .needs('auth')
     .action((service) => __awaiter(void 0, void 0, void 0, function* () {
+    var _a;
     const availableServices = Object.keys(constants_1.INTEG.service_map);
     if (!availableServices.includes(service)) {
         throw new error_1.default('Unknown service requested', {
@@ -56,7 +57,7 @@ exports.default = new command_1.default('event:generate:integ <service>')
     }
     const inputs = (0, option_1.getOptionValue)('inputs', '');
     const serviceValue = constants_1.INTEG.service_map[service];
-    const serviceModule = (yield Promise.resolve().then(() => __importStar(require(`../../../event_generate/integration/${serviceValue}`))))
+    const serviceModule = (yield (_a = `../../../event_generate/integration/${serviceValue}`, Promise.resolve().then(() => __importStar(require(_a)))))
         .default;
     const payload = yield serviceModule(inputs);
     process.stdout.write(payload + '\n');

package/lib/commands/event/generate/job.js

@@ -0,0 +1,82 @@
+"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 ansi_colors_1 = require("ansi-colors");
+const endpoints_1 = require("../../../endpoints");
+const error_1 = __importDefault(require("../../../error"));
+const command_1 = __importDefault(require("../../../internal/command"));
+const prompt_1 = __importDefault(require("../../../prompt"));
+const constants_1 = require("../../../util_modules/constants");
+const fs_1 = require("../../../util_modules/fs");
+const project_1 = require("../../../util_modules/project");
+exports.default = new command_1.default('event:generate:job [jobpool_id]')
+    .description('Generate sample payloads for job functions')
+    .needs('rc')
+    .needs('auth')
+    .action((jobpoolId) => __awaiter(void 0, void 0, void 0, function* () {
+    if (!fs_1.ASYNC.fileExists(constants_1.TEMPLATE.job_data)) {
+        throw new error_1.default('Could not read request template', { exit: 2 });
+    }
+    const jobData = yield fs_1.ASYNC.readFile(constants_1.TEMPLATE.job_data);
+    const jobDataJson = JSON.parse(jobData || '');
+    const jobpoolAPI = yield (0, endpoints_1.jobScheduling)();
+    const jobpoolDetails = jobpoolId
+        ? yield jobpoolAPI.getJobpoolDetails(jobpoolId)
+        : yield (() => __awaiter(void 0, void 0, void 0, function* () {
+            const allJobpoolDetails = yield jobpoolAPI.getJobpoolDetails();
+            if (allJobpoolDetails.length === 0) {
+                throw new error_1.default('No jobpool present in development environment', {
+                    exit: 1,
+                    errorId: 'JOB-1',
+                    arg: [
+                        (0, ansi_colors_1.bold)(`${(0, project_1.getProjectName)()} (${(0, project_1.getProjectId)()})`),
+                        ansi_colors_1.italic.underline(`${constants_1.ORIGIN.console}/baas/${(0, project_1.getEnvId)()}/project/${(0, project_1.getProjectId)()}/Development#/jobscheduling/jobpool`)
+                    ]
+                });
+            }
+            const jobpoolChoices = allJobpoolDetails.reduce((poolChoices, _pool) => {
+                if (_pool.type !== 'Function') {
+                    return poolChoices;
+                }
+                poolChoices.push(prompt_1.default.choice(`${_pool.name} [${_pool.id}]`, {
+                    value: _pool,
+                    short: _pool.name
+                }));
+                return poolChoices;
+            }, []);
+            if (jobpoolChoices.length === 0) {
+                throw new error_1.default('No valid function jobpool available in the development environment', {
+                    exit: 1,
+                    errorId: 'JOB-2',
+                    arg: [
+                        (0, ansi_colors_1.bold)(`${(0, project_1.getProjectName)()} (${(0, project_1.getProjectId)()})`),
+                        ansi_colors_1.italic.underline(`${constants_1.ORIGIN.console}/baas/${(0, project_1.getEnvId)()}/project/${(0, project_1.getProjectId)()}/Development#/jobscheduling/jobpool`)
+                    ]
+                });
+            }
+            const jobpoolQuestion = yield prompt_1.default.ask(prompt_1.default.question('details', "Please choose one of the function jobpool's to generate the data", {
+                type: 'list',
+                choices: jobpoolChoices
+            }));
+            return jobpoolQuestion.details;
+        }))();
+    if (jobpoolDetails.type !== 'Function') {
+        throw new error_1.default(`The jobpool ${jobpoolId || jobpoolDetails.name || jobpoolDetails.id} is not a function jobpool`, {
+            exit: 1
+        });
+    }
+    jobDataJson.job_details.job_meta_details.jobpool_id = jobpoolDetails.id;
+    jobDataJson.job_details.job_meta_details.jobpool_details = jobpoolDetails;
+    process.stdout.write(JSON.stringify(jobDataJson, null, '  ') + '\n');
+}));

package/lib/commands/functions/add.js

@@ -43,8 +43,9 @@ const logger_1 = require("../../util_modules/logger");
 exports.default = new command_1.default('functions:add')
     .description('Add a function of the required stack to the function directory')
     .needs('auth', [constants_1.SCOPE.functions])
-    .needs('config')
+    .needs('config', { optional: true })
     .needs('rc')
+    .ci(false)
     .action(() => __awaiter(void 0, void 0, void 0, function* () {
     const config = runtime_store_1.default.get('config');
     yield (yield Promise.resolve().then(() => __importStar(require('../../init/features')))).functions(true);

package/lib/commands/functions/delete.js

@@ -199,10 +199,8 @@ exports.default = new command_1.default('functions:delete [function_name_or_id]'
         if (fn.location === remote && fn.id !== undefined) {
             return fnApi.delete(fn.id + '');
         }
-        else {
-            if (fn.source) {
-                return (0, common_1.deleteFunctionLocal)(fn.source);
-            }
+        if (fn.source) {
+            return (0, common_1.deleteFunctionLocal)(fn.source);
         }
         return;
     }));