zcatalyst-cli 1.17.6 → 1.18.0-beta.1

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/functions/shell.toml

@@ -0,0 +1,4 @@
+[FSHELL-1]
+context = '''Tunneling has not yet been configured for your project ${arg[0]}.'''
+aid = '''Please visit this link to get started: ${arg[1]}'''
+link = ''

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/shell/dependencies/tunnel-server.toml

@@ -0,0 +1,4 @@
+[TUNNEL-1]
+context = '''The port ${arg[0]} provided with the option ${arg[1]} is not available for use.'''
+aid = '''Please specify a different port with the ${arg[1]} option to start the tunneling server.'''
+link = ''

package/docs/shell/index.toml

@@ -2,3 +2,10 @@
 context = '''No valid functions to Serve!'''
 aid = '''Please rectify the above errors, if any and try once again.'''
 link = 'https://www.zoho.com/catalyst/help/cli-functions.html#Shell'
+
+[SHELL-IDX-2]
+context = '''Cannot enable Tunneling from ZCatalyst CLI.
+Reason: ${arg[0]}
+Error Code: ${arg[1]}'''
+aid = '''Please rectify the above errors and try once again.'''
+link = 'https://www.zoho.com/catalyst/help/cli-functions.html#Shell'

package/lib/appsail-utils.js

@@ -27,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);
             }
@@ -49,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);
             }
@@ -72,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'

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/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();

package/lib/commands/appsail/add.js

@@ -45,6 +45,7 @@ exports.default = new command_1.default('appsail:add')
     .needs('auth', [constants_1.SCOPE.functions])
     .needs('config')
     .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();

package/lib/commands/client/setup.js

@@ -45,6 +45,7 @@ exports.default = new command_1.default('client:setup')
     .needs('auth', [constants_1.SCOPE.webapp])
     .needs('config')
     .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/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

@@ -45,6 +45,7 @@ exports.default = new command_1.default('functions:add')
     .needs('auth', [constants_1.SCOPE.functions])
     .needs('config')
     .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;
     }));

package/lib/commands/functions/setup.js

@@ -45,6 +45,7 @@ exports.default = new command_1.default('functions:setup')
     .needs('auth', [constants_1.SCOPE.functions])
     .needs('config')
     .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();

package/lib/commands/functions/shell.js

@@ -35,24 +35,33 @@ 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 runtime_store_1 = __importDefault(require("../../runtime-store"));
 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");
 exports.default = new command_1.default('functions:shell')
     .description('Launch a node shell to test emulated functions of any stack or type, other than Advanced I/O functions')
     .option('--http [port]', 'enables http mode for the basicIO functions and start server at specified port' +
     `(default: ${constants_1.DEFAULT.serve_port.http.basicio})`)
     .option('--debug [port]', 'the functions are invoked from local environment enabling debugging options on provided port.' +
     `(default: ${constants_1.DEFAULT.serve_port.debug.basicio})`)
+    .option('--tunnel <port>', 'start tunneling functions at the specified port')
+    .option('--enable-tunnel [tunnel-url]', 'enable tunneling for this particular command execution')
     .option('--ignore-scripts', 'ignore the pre and post lifecycle scripts')
     .option('--watch', 'watch for file and directory changes and enable hot reload' +
     '\n' +
     '(deprecated: The watch mode will be enabled by default. To disable watch mode use the --no-watch option)')
     .option('--no-watch', 'disable watching the files for changes')
-    .needs('auth', [constants_1.SCOPE.functions, constants_1.SCOPE.functions_execution, constants_1.SCOPE.custom_token_generation])
+    .needs('auth', constants_1.NEEDED_SCOPES.SERVE)
     .needs('config')
     .needs('rc')
+    .ci(false)
     .action(() => __awaiter(void 0, void 0, void 0, function* () {
     const httpOpt = (0, option_1.getOptionValue)('http', false);
     if (httpOpt && typeof httpOpt !== 'boolean') {
@@ -62,5 +71,93 @@ exports.default = new command_1.default('functions:shell')
     if (debugOpt && typeof debugOpt !== 'boolean') {
         runtime_store_1.default.set('context.port.debug.bio', debugOpt);
     }
+    const tunnelOpt = (0, option_1.getOptionValue)('tunnel', false);
+    if (tunnelOpt && typeof tunnelOpt !== 'boolean') {
+        runtime_store_1.default.set('context.port.tunnel', tunnelOpt);
+    }
+    const enableTunnelOpt = (0, option_1.getOptionValue)('enableTunnel', false);
+    if (!tunnelOpt && enableTunnelOpt) {
+        throw new error_1.default('Invalid Command. Use --enable-tunnel option with the -—tunnel option.', { exit: 1 });
+    }
+    if (enableTunnelOpt) {
+        const _tunnelAPI = yield (0, endpoints_1.tunnelAPI)();
+        const tunnelDetails = yield _tunnelAPI.getTunnel().catch((er) => {
+            const _er = error_1.default.getErrorInstance(er);
+            if (_er.status === 404) {
+                throw new error_1.default('Tunneling not configured', {
+                    exit: 1,
+                    errorId: 'FSHELL-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#/settings/project/tunneling`)
+                    ]
+                });
+            }
+            throw _er;
+        });
+        if (tunnelDetails.tunnel_status === 'Disabled') {
+            runtime_store_1.default.set('context.fn_shell.enable_tunnel', enableTunnelOpt);
+            (0, logger_1.info)();
+            (0, logger_1.info)((0, ansi_colors_1.yellow)('Tunneling will be disabled at the end of this command execution'));
+            (0, logger_1.info)();
+        }
+        else {
+            (0, logger_1.info)();
+            (0, logger_1.info)(`Tunneling is already enabled for the project ${(0, ansi_colors_1.bold)((0, project_1.getProjectName)())}(${(0, project_1.getProjectId)()}) with the configurations below:`);
+            (0, logger_1.info)();
+            (0, logger_1.info)((0, ansi_colors_1.bold)('Tunneling URL: ') + ansi_colors_1.italic.underline(tunnelDetails.tunnel_url));
+            (0, logger_1.info)((0, ansi_colors_1.bold)('Tunneled functions: '));
+            tunnelDetails.function_details.forEach((fn) => {
+                (0, logger_1.info)('* ' + fn.name);
+            });
+            (0, logger_1.info)((0, ansi_colors_1.bold)('Enabled by: ') + (0, ansi_colors_1.italic)(tunnelDetails.created_by.email_id));
+            (0, logger_1.info)((0, ansi_colors_1.bold)('Enabled on: ') + tunnelDetails.enabled_time);
+            (0, logger_1.info)();
+            if (typeof enableTunnelOpt === 'boolean') {
+                const continueAsIs = yield prompt_1.default.ask(prompt_1.default.question('consent', 'Do you wish to continue ?', {
+                    type: 'list',
+                    choices: [
+                        prompt_1.default.choice('continue', { value: true, short: 'continue' }),
+                        prompt_1.default.choice('abort', { value: false, short: 'aborted' })
+                    ]
+                }));
+                if (continueAsIs.consent === false) {
+                    return;
+                }
+                (0, logger_1.info)();
+                (0, logger_1.info)('Ignoring `--enable-tunnel` option since tunneling is already enabled');
+                (0, logger_1.info)();
+            }
+            else if (enableTunnelOpt !== tunnelDetails.tunnel_url) {
+                (0, logger_1.info)('Tunneling has already been enabled with a different tunneling URL.');
+                (0, logger_1.info)('Do you wish to update the tunnel request with the tunneling URL entered in the --enable-tunnel option?');
+                (0, logger_1.info)();
+                (0, logger_1.info)((0, ansi_colors_1.red)('- ' + tunnelDetails.tunnel_url));
+                (0, logger_1.info)((0, ansi_colors_1.green)('+ ' + enableTunnelOpt));
+                (0, logger_1.info)();
+                const updateCont = yield prompt_1.default.ask(prompt_1.default.question('consent', 'Do you wish to update and continue', {
+                    type: 'list',
+                    choices: [
+                        prompt_1.default.choice('continue', { value: true, short: 'continue' }),
+                        prompt_1.default.choice('abort', { value: false, short: 'aborted' })
+                    ]
+                }));
+                if (updateCont.consent === false) {
+                    return;
+                }
+                yield (yield (0, endpoints_1.tunnelAPI)()).disableTunnel();
+                runtime_store_1.default.set('context.fn_shell.enable_tunnel', enableTunnelOpt);
+                (0, logger_1.info)();
+                (0, logger_1.info)((0, ansi_colors_1.yellow)('Tunneling will be disabled at the end of this command execution'));
+                (0, logger_1.info)();
+            }
+            else {
+                (0, logger_1.info)();
+                (0, logger_1.info)('Ignoring `--enable-tunnel` option since a tunnel already exists with the same tunnel url provided: ' +
+                    ansi_colors_1.italic.underline(enableTunnelOpt));
+                (0, logger_1.info)();
+            }
+        }
+    }
     return (yield Promise.resolve().then(() => __importStar(require('../../shell')))).default();
 }));

package/lib/commands/index.js

@@ -80,6 +80,7 @@ exports.default = (client) => {
         loadCommand('codelib:install'),
         loadCommand('event:generate'),
         loadCommand('event:generate:integ'),
+        loadCommand('event:generate:job'),
         loadCommand('serve'),
         loadCommand('deploy'),
         loadCommand('help'),

package/lib/commands/init.js

@@ -56,14 +56,10 @@ exports.default = new command_1.default('init [feature]')
     .description('Initialize a Catalyst project, function, and client resources in the local directory')
     .option('--force', 'force initialise a project for this directory')
     .ignore(['project'])
-    .needs('auth', [
-    constants_1.SCOPE.projects,
-    constants_1.SCOPE.stratus_create,
-    constants_1.SCOPE.stratus_read,
-    constants_1.SCOPE.project_import_create
-])
+    .needs('auth', [constants_1.SCOPE.projects, constants_1.SCOPE.project_import_create])
     .needs('config', { optional: true })
     .needs('rc', { optional: true, resolveOnNotFound: true })
+    .ci(false)
     .action((feature) => __awaiter(void 0, void 0, void 0, function* () {
     var _a;
     const config = runtime_store_1.default.get('config');

package/lib/commands/login.js

@@ -40,6 +40,7 @@ exports.default = new command_1.default('login')
     .description('Log the CLI in to your Catalyst account')
     .option('--no-localhost', 'login without browser')
     .option('--force', 'force reauthentication')
+    .ci(false)
     .action(() => __awaiter(void 0, void 0, void 0, function* () {
     const auth = yield Promise.resolve().then(() => __importStar(require('../authentication')));
     return auth.login();

package/lib/commands/logout.js

@@ -38,6 +38,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const command_1 = __importDefault(require("../internal/command"));
 exports.default = new command_1.default('logout')
     .description('Log the CLI out of your Catalyst account')
+    .ci(false)
     .action(() => __awaiter(void 0, void 0, void 0, function* () {
     const auth = yield Promise.resolve().then(() => __importStar(require('../authentication')));
     return auth.logout();

package/lib/commands/pull.js

@@ -50,6 +50,7 @@ exports.default = new command_1.default('pull [feature]')
     .needs('auth', [constants_1.SCOPE.functions, constants_1.SCOPE.webapp])
     .needs('config', { optional: true })
     .needs('rc')
+    .ci(false)
     .action((feature) => __awaiter(void 0, void 0, void 0, function* () {
     const config = runtime_store_1.default.get('config');
     const homeDir = (yield Promise.resolve().then(() => __importStar(require('os')))).homedir();

package/lib/commands/serve.js

@@ -47,15 +47,9 @@ exports.default = new command_1.default('serve')
     .option('--only <targets>', 'only serve specified, comma-separated targets (e.g. "client,functions:f1")')
     .option('--no-watch', 'disable watching the files for changes')
     .option('--except <targets>', 'serve all targets except specified (e.g. "client")')
-    .option('--ignore-scripts', 'ignore the pre and post lifescycle scripts')
+    .option('--ignore-scripts', 'ignore the pre and post lifecycle scripts')
     .option('--no-open', 'disable opening the client automatically when served')
-    .needs('auth', [
-    constants_1.SCOPE.functions,
-    constants_1.SCOPE.functions_execution,
-    constants_1.SCOPE.webapp,
-    constants_1.SCOPE.pdf_shot,
-    constants_1.SCOPE.custom_token_generation
-])
+    .needs('auth', constants_1.NEEDED_SCOPES.SERVE)
     .needs('config')
     .needs('rc')
     .action(() => __awaiter(void 0, void 0, void 0, function* () {

package/lib/commands/whoami.js

@@ -19,6 +19,7 @@ const command_1 = __importDefault(require("../internal/command"));
 const logger_1 = require("../util_modules/logger");
 exports.default = new command_1.default('whoami')
     .description('Print the email address of the user currently logged in')
+    .ci(false)
     .action(() => __awaiter(void 0, void 0, void 0, function* () {
     const activeDC = (0, dc_1.getActiveDC)();
     const user = config_store_1.default.get(`${activeDC}.user`);

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

@@ -57,7 +57,7 @@ function getConfigJsonInputs() {
             when: () => optValues.build_path === false,
             rootPath: cwd,
             validate: ({ value }) => __awaiter(this, void 0, void 0, function* () {
-                const pathRes = (0, utils_1.validateBuildPath)(value);
+                const pathRes = yield (0, utils_1.validateBuildPath)(value);
                 if (!pathRes) {
                     return `Invalid path: ${value}`;
                 }
@@ -142,7 +142,9 @@ function getStandAloneTarget() {
             configJson.stack = configJson.stack.runtime;
         }
         return {
-            appSail: Object.assign({ name: nameOpt === false ? appSailName.name : nameOpt, source: cwd }, configJson),
+            name: nameOpt === false ? appSailName.name : nameOpt,
+            source: cwd,
+            config: configJson,
             validity: { valid: true }
         };
     });
@@ -157,15 +159,15 @@ exports.default = (standAlone = false) => __awaiter(void 0, void 0, void 0, func
     const filtered = (0, appsail_utils_1.filterTargets)(targets);
     let pythonPrompt = false;
     const validTargets = (0, appsail_utils_1.validateAppSail)(filtered).filter((targ) => {
-        var _a, _b;
+        var _a;
         if (targ.validity.valid) {
             if (!pythonPrompt &&
-                ((_a = targ.appSail) === null || _a === void 0 ? void 0 : _a.stack.startsWith(constants_1.RUNTIME.language.python.value))) {
+                ((_a = targ.config) === null || _a === void 0 ? void 0 : _a.stack.startsWith(constants_1.RUNTIME.language.python.value))) {
                 pythonPrompt = true;
             }
             return targ;
         }
-        (0, logger_1.labeled)('AppSail: ', 'Invalid AppSail service ' + (0, ansi_colors_1.bold)(((_b = targ.appSail) === null || _b === void 0 ? void 0 : _b.name) || 'Unknown')).ERROR();
+        (0, logger_1.labeled)('AppSail: ', 'Invalid AppSail service ' + (0, ansi_colors_1.bold)(targ.name || 'Unknown')).ERROR();
         (0, logger_1.error)('Reason: ' + targ.validity.reason);
         (0, logger_1.info)();
         return false;
@@ -179,20 +181,19 @@ exports.default = (standAlone = false) => __awaiter(void 0, void 0, void 0, func
     const throbber = throbber_1.default.getInstance();
     const deployRes = yield validTargets.reduce((result, _targ) => __awaiter(void 0, void 0, void 0, function* () {
         var _a, _b;
-        const targ = _targ.appSail;
+        const targ = _targ.config;
         const prevRes = yield result;
         try {
             if ((_a = targ.scripts) === null || _a === void 0 ? void 0 : _a.predeploy) {
-                executeHook(targ.scripts.predeploy, 'predeploy', targ.source);
+                executeHook(targ.scripts.predeploy, 'predeploy', _targ.source);
             }
-            const throbberName = `prepare_appsail_${targ.name}`;
+            const throbberName = `prepare_appsail_${_targ.name}`;
             throbber.add(throbberName, {
-                text: `Preparing AppSail[${targ.name}]`
+                text: `Preparing AppSail[${_targ.name}]`
             });
             const zip = new archiver_1.default();
-            const buildPath = targ.buildPath ? targ.buildPath : targ.build_path;
-            const folderPath = (0, project_1.resolveProjectPath)(buildPath);
-            const ignoreFile = yield fs_1.ASYNC.readFile((0, path_1.join)(folderPath, constants_1.FILENAME.catalyst_ignore));
+            const ignoreFile = yield fs_1.ASYNC.readFile((0, path_1.join)(_targ.source, constants_1.FILENAME.catalyst_ignore));
+            const folderPath = targ.build_path;
             const folderContents = yield fs_1.ASYNC.walk(folderPath, {
                 filter: {
                     exclude: [
@@ -215,19 +216,21 @@ exports.default = (standAlone = false) => __awaiter(void 0, void 0, void 0, func
             const finalized = yield zip.finalize();
             const zipStream = yield finalized.fsStream();
             throbber.remove(throbberName);
-            const { stack, name, command, memory, platform, env_variables } = targ;
+            const { stack, command, memory, platform, env_variables, catalyst_auth, login_redirect } = targ;
             const apiRes = yield sailAPI.deploy(zipStream.stream, {
                 stack,
-                name,
+                name: _targ.name,
                 memory,
                 platform,
                 command,
+                catalystAuth: catalyst_auth,
+                loginRedirect: login_redirect,
                 envVariables: env_variables,
                 contentLength: zipStream.length
             });
             _targ.url = apiRes.url;
             if ((_b = targ.scripts) === null || _b === void 0 ? void 0 : _b.postdeploy) {
-                executeHook(targ.scripts.postdeploy, 'postdeploy', targ.source);
+                executeHook(targ.scripts.postdeploy, 'postdeploy', _targ.source);
             }
         }
         catch (err) {
@@ -241,10 +244,9 @@ exports.default = (standAlone = false) => __awaiter(void 0, void 0, void 0, func
         return Promise.resolve(prevRes);
     }), Promise.resolve([]));
     const deployedValidTargets = deployRes.filter((targ) => {
-        var _a;
         if (!targ.validity.valid) {
             (0, logger_1.warning)('Deploy of AppSail [' +
-                ((_a = targ.appSail) === null || _a === void 0 ? void 0 : _a.name) +
+                targ.name +
                 '] was unsuccessful since ' +
                 targ.validity.reason);
         }

package/lib/deploy/features/appsail/utils.js

@@ -36,10 +36,10 @@ function validateOptions(validationFn, option, ...args) {
 exports.validateOptions = validateOptions;
 function validateBuildPath(path) {
     return __awaiter(this, void 0, void 0, function* () {
-        const cwd = process.cwd();
+        const cwd = runtime_store_1.default.get('cwd');
         if (path) {
             const buildPath = (0, path_1.isAbsolute)(path) ? path : (0, path_1.resolve)(cwd, path);
-            return (yield fs_1.ASYNC.dirExists(buildPath)) ? path : false;
+            return (yield fs_1.ASYNC.isPathExists(buildPath)) ? path : false;
         }
         return false;
     });
@@ -79,11 +79,10 @@ exports.validateName = validateName;
 function urlLogger() {
     const deployTargets = runtime_store_1.default.get('payload.appsail.targets', []);
     deployTargets.forEach((sail) => {
-        var _a, _b;
         if (sail.url !== undefined) {
-            (0, logger_1.labeled)(`AppSail(${(_a = sail.appSail) === null || _a === void 0 ? void 0 : _a.name})`, 'URL => ' + sail.url).MESSAGE();
+            (0, logger_1.labeled)(`AppSail(${sail.name})`, 'URL => ' + sail.url).MESSAGE();
         }
-        (0, logger_1.labeled)(`AppSail(${(_b = sail.appSail) === null || _b === void 0 ? void 0 : _b.name})`, 'deploy successful').SUCCESS();
+        (0, logger_1.labeled)(`AppSail(${sail.name})`, 'deploy successful').SUCCESS();
         (0, logger_1.info)();
     });
     return deployTargets;

package/lib/endpoints/index.js

@@ -32,7 +32,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.commonAPI = exports.codeDeck = exports.gitHubAPI = exports.appSailAPI = 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;
+exports.tunnelAPI = exports.commonAPI = exports.jobScheduling = exports.codeDeck = exports.gitHubAPI = exports.appSailAPI = 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 orgAPI({ auth = true } = {}) {
     return __awaiter(this, void 0, void 0, function* () {
@@ -170,6 +170,13 @@ function codeDeck() {
     });
 }
 exports.codeDeck = codeDeck;
+function jobScheduling({ auth = true, projectId = (0, project_1.getProjectId)() } = {}) {
+    return __awaiter(this, void 0, void 0, function* () {
+        const jobScheduling = (yield Promise.resolve().then(() => __importStar(require('./lib/job-scheduling')))).default;
+        return new jobScheduling(projectId, { authNeeded: auth });
+    });
+}
+exports.jobScheduling = jobScheduling;
 function commonAPI() {
     return __awaiter(this, void 0, void 0, function* () {
         const common = (yield Promise.resolve().then(() => __importStar(require('./lib/common')))).default;
@@ -177,3 +184,10 @@ function commonAPI() {
     });
 }
 exports.commonAPI = commonAPI;
+function tunnelAPI({ auth = true, projectId = (0, project_1.getProjectId)() } = {}) {
+    return __awaiter(this, void 0, void 0, function* () {
+        const tunnel = (yield Promise.resolve().then(() => __importStar(require('./lib/tunnel')))).default;
+        return new tunnel(projectId, { authNeeded: auth });
+    });
+}
+exports.tunnelAPI = tunnelAPI;

package/lib/endpoints/lib/appsail.js

@@ -21,7 +21,7 @@ class AppSail {
         this.opts = opts;
         this.projectId = projectId;
     }
-    deploy(sourceFsStream, { stack, name, contentLength, command, memory, platform, envVariables = {} }) {
+    deploy(sourceFsStream, { stack, name, contentLength, command, memory, platform, envVariables = {}, catalystAuth, loginRedirect }) {
         return __awaiter(this, void 0, void 0, function* () {
             const formData = {
                 stack,
@@ -43,6 +43,12 @@ class AppSail {
                     variables: envVariables
                 };
             }
+            if (typeof catalystAuth === 'boolean') {
+                configuration.catalyst_auth = catalystAuth;
+                if (typeof loginRedirect === 'string') {
+                    configuration.login_redirect = loginRedirect;
+                }
+            }
             if (Object.keys(configuration).length > 0) {
                 formData.configuration = JSON.stringify(configuration);
             }