@sasjs/cli 2.38.6 → 3.0.0

package/build/commands/job/{execute.js → internal/execute/viya.js}

@@ -39,16 +39,16 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getContextName = exports.execute = void 0;
-var displayResult_1 = require("../../utils/displayResult");
-var file_1 = require("../../utils/file");
-var utils_1 = require("../../utils/utils");
-var fetchLogFileContent_1 = require("../shared/fetchLogFileContent");
+exports.getContextName = exports.executeJobViya = void 0;
+var displayResult_1 = require("../../../../utils/displayResult");
+var file_1 = require("../../../../utils/file");
+var fetchLogFileContent_1 = require("../../../shared/fetchLogFileContent");
 var path_1 = __importDefault(require("path"));
 var node_1 = require("@sasjs/adapter/node");
-var utils_2 = require("@sasjs/utils");
-var command_1 = require("../../types/command");
-var utils_3 = require("../../utils");
+var utils_1 = require("@sasjs/utils");
+var utils_2 = require("../../../../utils/");
+var command_1 = require("../../../../types/command");
+var utils_3 = require("../utils");
 /**
  * Triggers existing job for execution.
  * @param {object} sasjs - configuration object of SAS adapter.
@@ -64,7 +64,7 @@ var utils_3 = require("../../utils");
  * @param {string | undefined} source - an optional path to a JSON file containing macro variables.
  * @param {boolean} streamLog - a flag indicating if the logs should be streamed to the supplied log path during job execution. This is useful for getting feedback on long running jobs.
  */
-function execute(sasjs, authConfig, jobPath, target, waitForJob, output, logFile, statusFile, returnStatusOnly, ignoreWarnings, source, streamLog) {
+function executeJobViya(sasjs, authConfig, jobPath, target, waitForJob, output, logFile, statusFile, returnStatusOnly, ignoreWarnings, source, streamLog) {
     var _a, _b;
     return __awaiter(this, void 0, void 0, function () {
         var pollOptions, result, startTime, contextName, macroVars, submittedJob, endTime, sessionLink, outputJson, currentDirPath, outputPath, folderPath, parentFolderPath, logObj, logUrl, logCount, logData, error_1;
@@ -92,18 +92,18 @@ function execute(sasjs, authConfig, jobPath, target, waitForJob, output, logFile
                     if (!source) return [3 /*break*/, 5];
                     if (!file_1.isJsonFile(source))
                         throw 'Source file has to be JSON.';
-                    return [4 /*yield*/, utils_2.fileExists(source).catch(function (_) {
+                    return [4 /*yield*/, utils_1.fileExists(source).catch(function (_) {
                             throw 'Error while checking if source file exists.';
                         })];
                 case 3:
                     _c.sent();
-                    return [4 /*yield*/, utils_2.readFile(source).catch(function (_) {
+                    return [4 /*yield*/, utils_1.readFile(source).catch(function (_) {
                             throw 'Error while reading source file.';
                         })];
                 case 4:
                     source = _c.sent();
                     macroVars = JSON.parse(source);
-                    if (!utils_2.isMacroVars(macroVars)) {
+                    if (!utils_1.isMacroVars(macroVars)) {
                         throw "Provided source is not valid. An example of valid source:\n{ macroVars: { name1: 'value1', name2: 'value2' } }";
                     }
                     _c.label = 5;
@@ -120,23 +120,23 @@ function execute(sasjs, authConfig, jobPath, target, waitForJob, output, logFile
                                     return [4 /*yield*/, fetchLogFileContent_1.fetchLogFileContent(sasjs, authConfig.access_token, err.logUrl, 100000)];
                                 case 1:
                                     logData = _b.sent();
-                                    return [4 /*yield*/, saveLog(logData, logFile, jobPath, returnStatusOnly)];
+                                    return [4 /*yield*/, utils_3.saveLog(logData, logFile, jobPath, returnStatusOnly)];
                                 case 2:
                                     _b.sent();
                                     _b.label = 3;
                                 case 3:
                                     displayResult_1.displayError(err);
-                                    terminateProcess(2);
+                                    utils_2.terminateProcess(2);
                                     _b.label = 4;
                                 case 4:
                                     if (!(err === null || err === void 0 ? void 0 : err.log)) return [3 /*break*/, 6];
-                                    return [4 /*yield*/, saveLog(err.log, logFile, jobPath, returnStatusOnly)];
+                                    return [4 /*yield*/, utils_3.saveLog(err.log, logFile, jobPath, returnStatusOnly)];
                                 case 5:
                                     _b.sent();
                                     _b.label = 6;
                                 case 6:
                                     if (returnStatusOnly)
-                                        terminateProcess(2);
+                                        utils_2.terminateProcess(2);
                                     if ((err === null || err === void 0 ? void 0 : err.name) === 'NotFoundError') {
                                         throw new Error("Job located at '" + jobPath + "' was not found.");
                                     }
@@ -191,14 +191,14 @@ function execute(sasjs, authConfig, jobPath, target, waitForJob, output, logFile
                     folderPath = outputPath.split(path_1.default.sep);
                     folderPath.pop();
                     parentFolderPath = folderPath.join(path_1.default.sep);
-                    return [4 /*yield*/, utils_2.folderExists(parentFolderPath)];
+                    return [4 /*yield*/, utils_1.folderExists(parentFolderPath)];
                 case 10:
                     if (!!(_c.sent())) return [3 /*break*/, 12];
-                    return [4 /*yield*/, utils_2.createFolder(parentFolderPath)];
+                    return [4 /*yield*/, utils_1.createFolder(parentFolderPath)];
                 case 11:
                     _c.sent();
                     _c.label = 12;
-                case 12: return [4 /*yield*/, utils_2.createFile(outputPath, outputJson)];
+                case 12: return [4 /*yield*/, utils_1.createFile(outputPath, outputJson)];
                 case 13:
                     _c.sent();
                     if (!returnStatusOnly)
@@ -219,7 +219,7 @@ function execute(sasjs, authConfig, jobPath, target, waitForJob, output, logFile
                     return [4 /*yield*/, fetchLogFileContent_1.fetchLogFileContent(sasjs, authConfig.access_token, logUrl, logCount)];
                 case 16:
                     logData = _c.sent();
-                    return [4 /*yield*/, saveLog(logData, logFile, jobPath, returnStatusOnly)];
+                    return [4 /*yield*/, utils_3.saveLog(logData, logFile, jobPath, returnStatusOnly)];
                 case 17:
                     _c.sent();
                     _c.label = 18;
@@ -237,11 +237,11 @@ function execute(sasjs, authConfig, jobPath, target, waitForJob, output, logFile
                     if (waitForJob && returnStatusOnly && submittedJob.state) {
                         switch (submittedJob.state) {
                             case 'completed':
-                                terminateProcess(0);
+                                utils_2.terminateProcess(0);
                             case 'warning':
-                                terminateProcess(ignoreWarnings ? 0 : 1);
+                                utils_2.terminateProcess(ignoreWarnings ? 0 : 1);
                             case 'error':
-                                terminateProcess(2);
+                                utils_2.terminateProcess(2);
                             default:
                                 break;
                         }
@@ -249,7 +249,7 @@ function execute(sasjs, authConfig, jobPath, target, waitForJob, output, logFile
                     return [3 /*break*/, 22];
                 case 21:
                     if (returnStatusOnly && result === 2) {
-                        terminateProcess(2);
+                        utils_2.terminateProcess(2);
                     }
                     _c.label = 22;
                 case 22:
@@ -261,12 +261,12 @@ function execute(sasjs, authConfig, jobPath, target, waitForJob, output, logFile
         });
     });
 }
-exports.execute = execute;
+exports.executeJobViya = executeJobViya;
 // REFACTOR: should be a utility
 function getContextName(target, returnStatusOnly) {
     var _a;
     if (returnStatusOnly === void 0) { returnStatusOnly = false; }
-    var defaultContextName = utils_3.contextName;
+    var defaultContextName = utils_2.contextName;
     if (target === null || target === void 0 ? void 0 : target.contextName)
         return target.contextName;
     if (!returnStatusOnly) {
@@ -297,14 +297,14 @@ function displayStatus(submittedJob, statusFile, error, displayStatusFilePath) {
                     folderPath = statusFile.split(path_1.default.sep);
                     folderPath.pop();
                     parentFolderPath = folderPath.join(path_1.default.sep);
-                    return [4 /*yield*/, utils_2.folderExists(parentFolderPath)];
+                    return [4 /*yield*/, utils_1.folderExists(parentFolderPath)];
                 case 1:
                     if (!!(_a.sent())) return [3 /*break*/, 3];
-                    return [4 /*yield*/, utils_2.createFolder(parentFolderPath)];
+                    return [4 /*yield*/, utils_1.createFolder(parentFolderPath)];
                 case 2:
                     _a.sent();
                     _a.label = 3;
-                case 3: return [4 /*yield*/, utils_2.createFile(statusFile, status)];
+                case 3: return [4 /*yield*/, utils_1.createFile(statusFile, status)];
                 case 4:
                     _a.sent();
                     if (displayStatusFilePath)
@@ -315,42 +315,3 @@ function displayStatus(submittedJob, statusFile, error, displayStatusFilePath) {
         });
     });
 }
-var saveLog = function (logData, logFile, jobPath, returnStatusOnly) { return __awaiter(void 0, void 0, void 0, function () {
-    var logPath, folderPath, parentFolderPath, logLines;
-    var _a;
-    return __generator(this, function (_b) {
-        switch (_b.label) {
-            case 0:
-                if (logFile) {
-                    logPath = logFile;
-                }
-                else {
-                    logPath = path_1.default.join(process.projectDir, jobPath.split('/').slice(-1).pop() + ".log");
-                }
-                folderPath = logPath.split(path_1.default.sep);
-                folderPath.pop();
-                parentFolderPath = folderPath.join(path_1.default.sep);
-                return [4 /*yield*/, utils_2.folderExists(parentFolderPath)];
-            case 1:
-                if (!!(_b.sent())) return [3 /*break*/, 3];
-                return [4 /*yield*/, utils_2.createFolder(parentFolderPath)];
-            case 2:
-                _b.sent();
-                _b.label = 3;
-            case 3:
-                logLines = typeof logData === 'object' ? utils_1.parseLogLines(logData) : logData;
-                (_a = process.logger) === null || _a === void 0 ? void 0 : _a.info("Creating log file at " + logPath + " .");
-                return [4 /*yield*/, utils_2.createFile(logPath, logLines)];
-            case 4:
-                _b.sent();
-                if (!returnStatusOnly)
-                    displayResult_1.displaySuccess("Log saved to " + logPath);
-                return [2 /*return*/];
-        }
-    });
-}); };
-var terminateProcess = function (status) {
-    var _a;
-    (_a = process.logger) === null || _a === void 0 ? void 0 : _a.info("Process will be terminated with the status code " + status + ".");
-    process.exit(status);
-};

package/build/commands/job/internal/utils.d.ts

@@ -0,0 +1 @@
+export declare const saveLog: (logData: any, logFile: string | undefined, jobPath: string, returnStatusOnly: boolean) => Promise<void>;

package/build/commands/job/internal/utils.js

@@ -0,0 +1,81 @@
+"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 __generator = (this && this.__generator) || function (thisArg, body) {
+    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
+    return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
+    function verb(n) { return function (v) { return step([n, v]); }; }
+    function step(op) {
+        if (f) throw new TypeError("Generator is already executing.");
+        while (_) try {
+            if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
+            if (y = 0, t) op = [op[0] & 2, t.value];
+            switch (op[0]) {
+                case 0: case 1: t = op; break;
+                case 4: _.label++; return { value: op[1], done: false };
+                case 5: _.label++; y = op[1]; op = [0]; continue;
+                case 7: op = _.ops.pop(); _.trys.pop(); continue;
+                default:
+                    if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
+                    if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
+                    if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
+                    if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
+                    if (t[2]) _.ops.pop();
+                    _.trys.pop(); continue;
+            }
+            op = body.call(thisArg, _);
+        } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
+        if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
+    }
+};
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.saveLog = void 0;
+var path_1 = __importDefault(require("path"));
+var utils_1 = require("@sasjs/utils");
+var utils_2 = require("../../../utils/utils");
+var displayResult_1 = require("../../../utils/displayResult");
+var saveLog = function (logData, logFile, jobPath, returnStatusOnly) { return __awaiter(void 0, void 0, void 0, function () {
+    var logPath, folderPath, parentFolderPath, logLines;
+    var _a;
+    return __generator(this, function (_b) {
+        switch (_b.label) {
+            case 0:
+                if (logFile) {
+                    logPath = logFile;
+                }
+                else {
+                    logPath = path_1.default.join(process.projectDir, jobPath.split('/').slice(-1).pop() + ".log");
+                }
+                folderPath = logPath.split(path_1.default.sep);
+                folderPath.pop();
+                parentFolderPath = folderPath.join(path_1.default.sep);
+                return [4 /*yield*/, utils_1.folderExists(parentFolderPath)];
+            case 1:
+                if (!!(_b.sent())) return [3 /*break*/, 3];
+                return [4 /*yield*/, utils_1.createFolder(parentFolderPath)];
+            case 2:
+                _b.sent();
+                _b.label = 3;
+            case 3:
+                logLines = typeof logData === 'object' ? utils_2.parseLogLines(logData) : logData;
+                (_a = process.logger) === null || _a === void 0 ? void 0 : _a.info("Creating log file at " + logPath + " .");
+                return [4 /*yield*/, utils_1.createFile(logPath, logLines)];
+            case 4:
+                _b.sent();
+                if (!returnStatusOnly)
+                    displayResult_1.displaySuccess("Log saved to " + logPath);
+                return [2 /*return*/];
+        }
+    });
+}); };
+exports.saveLog = saveLog;

package/build/commands/job/jobCommand.d.ts

@@ -5,5 +5,6 @@ import { TargetCommand } from '../../types/command/targetCommand';
 export declare class JobCommand extends TargetCommand {
     constructor(args: string[]);
     execute(): Promise<ReturnCode>;
-    executeJob(target: Target, sasjs: SASjs, authConfig: AuthConfig): Promise<ReturnCode>;
+    executeJobSasjs(sasjs: SASjs, target: Target): Promise<ReturnCode>;
+    executeJobViya(target: Target, sasjs: SASjs, authConfig: AuthConfig): Promise<ReturnCode>;
 }

package/build/commands/job/jobCommand.js

@@ -62,7 +62,7 @@ var command_1 = require("../../types/command");
 var targetCommand_1 = require("../../types/command/targetCommand");
 var utils_2 = require("../../utils");
 var prefixAppLoc_1 = require("../../utils/prefixAppLoc");
-var execute_1 = require("./execute");
+var execute_1 = require("./internal/execute");
 var JobSubCommand;
 (function (JobSubCommand) {
     JobSubCommand["Execute"] = "execute";
@@ -137,19 +137,22 @@ var JobCommand = /** @class */ (function (_super) {
     JobCommand.prototype.execute = function () {
         var _a;
         return __awaiter(this, void 0, void 0, function () {
-            var target, sasjs, authConfig, _b;
-            return __generator(this, function (_c) {
-                switch (_c.label) {
+            var target, sasjs, _b, authConfig, _c, _d;
+            return __generator(this, function (_e) {
+                switch (_e.label) {
                     case 0: return [4 /*yield*/, this.getTargetInfo()];
                     case 1:
-                        target = (_c.sent()).target;
-                        if (target.serverType !== utils_1.ServerType.SasViya) {
-                            (_a = process.logger) === null || _a === void 0 ? void 0 : _a.error("This command is only supported for SAS Viya targets.\nPlease try again with a different target.");
-                            return [2 /*return*/, command_1.ReturnCode.InternalError];
+                        target = (_e.sent()).target;
+                        _b = target.serverType;
+                        switch (_b) {
+                            case utils_1.ServerType.SasViya: return [3 /*break*/, 2];
+                            case utils_1.ServerType.Sasjs: return [3 /*break*/, 7];
                         }
+                        return [3 /*break*/, 11];
+                    case 2:
                         sasjs = new node_1.default({
                             serverUrl: target.serverUrl,
-                            allowInsecureRequests: target.allowInsecureRequests,
+                            httpsAgentOptions: target.httpsAgentOptions,
                             appLoc: target.appLoc,
                             serverType: target.serverType,
                             debug: true
@@ -159,25 +162,64 @@ var JobCommand = /** @class */ (function (_super) {
                                 (_a = process.logger) === null || _a === void 0 ? void 0 : _a.error('Unable to execute job. Error fetching auth config: ', err);
                                 return null;
                             })];
-                    case 2:
-                        authConfig = _c.sent();
-                        if (!authConfig) {
-                            return [2 /*return*/, command_1.ReturnCode.InternalError];
-                        }
-                        if (!(this.parsed.subCommand === JobSubCommand.Execute)) return [3 /*break*/, 4];
-                        return [4 /*yield*/, this.executeJob(target, sasjs, authConfig)];
                     case 3:
-                        _b = _c.sent();
-                        return [3 /*break*/, 5];
+                        authConfig = _e.sent();
+                        if (!authConfig)
+                            return [2 /*return*/, command_1.ReturnCode.InternalError];
+                        if (!(this.parsed.subCommand === JobSubCommand.Execute)) return [3 /*break*/, 5];
+                        return [4 /*yield*/, this.executeJobViya(target, sasjs, authConfig)];
                     case 4:
-                        _b = command_1.ReturnCode.InvalidCommand;
-                        _c.label = 5;
-                    case 5: return [2 /*return*/, _b];
+                        _c = _e.sent();
+                        return [3 /*break*/, 6];
+                    case 5:
+                        _c = command_1.ReturnCode.InvalidCommand;
+                        _e.label = 6;
+                    case 6: return [2 /*return*/, _c];
+                    case 7:
+                        sasjs = new node_1.default({
+                            serverType: target.serverType,
+                            serverUrl: target.serverUrl
+                        });
+                        if (typeof this.parsed.jobPath !== 'string')
+                            return [2 /*return*/, command_1.ReturnCode.InvalidCommand];
+                        if (!(this.parsed.subCommand === JobSubCommand.Execute)) return [3 /*break*/, 9];
+                        return [4 /*yield*/, this.executeJobSasjs(sasjs, target)];
+                    case 8:
+                        _d = _e.sent();
+                        return [3 /*break*/, 10];
+                    case 9:
+                        _d = command_1.ReturnCode.InvalidCommand;
+                        _e.label = 10;
+                    case 10: return [2 /*return*/, _d];
+                    case 11:
+                        (_a = process.logger) === null || _a === void 0 ? void 0 : _a.error("This command is only supported for SAS Viya targets.\nPlease try again with a different target.");
+                        return [2 /*return*/, command_1.ReturnCode.InternalError];
+                }
+            });
+        });
+    };
+    JobCommand.prototype.executeJobSasjs = function (sasjs, target) {
+        return __awaiter(this, void 0, void 0, function () {
+            var jobPath, returnCode;
+            return __generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0:
+                        jobPath = prefixAppLoc_1.prefixAppLoc(target.appLoc, this.parsed.jobPath);
+                        return [4 /*yield*/, execute_1.executeJobSasjs(sasjs, jobPath, this.parsed.log)
+                                .then(function () { return command_1.ReturnCode.Success; })
+                                .catch(function (err) {
+                                var _a;
+                                (_a = process.logger) === null || _a === void 0 ? void 0 : _a.error('Error executing job: ', err);
+                                return command_1.ReturnCode.InternalError;
+                            })];
+                    case 1:
+                        returnCode = _a.sent();
+                        return [2 /*return*/, returnCode];
                 }
             });
         });
     };
-    JobCommand.prototype.executeJob = function (target, sasjs, authConfig) {
+    JobCommand.prototype.executeJobViya = function (target, sasjs, authConfig) {
         var _a, _b, _c;
         return __awaiter(this, void 0, void 0, function () {
             var jobPath, log, wait, output, statusFile, returnStatusOnly, ignoreWarnings, source, streamLog, returnCode;
@@ -202,7 +244,7 @@ var JobCommand = /** @class */ (function (_super) {
                         if (ignoreWarnings && !returnStatusOnly) {
                             (_c = process.logger) === null || _c === void 0 ? void 0 : _c.warn("Using the 'ignoreWarnings' flag without 'returnStatusOnly' flag will not affect the sasjs job execute command.");
                         }
-                        return [4 /*yield*/, execute_1.execute(sasjs, authConfig, jobPath, target, wait, output, log, statusFile, returnStatusOnly, ignoreWarnings, source, streamLog)
+                        return [4 /*yield*/, execute_1.executeJobViya(sasjs, authConfig, jobPath, target, wait, output, log, statusFile, returnStatusOnly, ignoreWarnings, source, streamLog)
                                 .then(function () {
                                 return command_1.ReturnCode.Success;
                             })

package/build/commands/job/spec/execute.spec.js

@@ -44,42 +44,33 @@ var utils_1 = require("@sasjs/utils");
 var types_1 = require("@sasjs/utils/types");
 var path_1 = __importDefault(require("path"));
 var utils_2 = require("../../../utils");
-var execute_1 = require("../execute");
+var execute_1 = require("../internal/execute");
 var mocks_1 = require("./mocks");
 var sasjs = new node_1.default();
 var target = new types_1.Target({
     name: 'test',
-    serverType: types_1.ServerType.SasViya,
+    serverType: types_1.ServerType.Sasjs,
     appLoc: '/test',
     contextName: 'Mock Context'
 });
 var statusFile;
-describe('execute', function () {
+describe('executeJobViya', function () {
     beforeEach(function () { return __awaiter(void 0, void 0, void 0, function () {
         return __generator(this, function (_a) {
             switch (_a.label) {
-                case 0: return [4 /*yield*/, setupMocks()];
-                case 1:
-                    _a.sent();
-                    statusFile = path_1.default.join(process.projectDir, 'test');
-                    return [2 /*return*/];
-            }
-        });
-    }); });
-    afterEach(function () { return __awaiter(void 0, void 0, void 0, function () {
-        return __generator(this, function (_a) {
-            switch (_a.label) {
-                case 0: return [4 /*yield*/, utils_1.deleteFile(statusFile)];
+                case 0: return [4 /*yield*/, setupMocks(types_1.ServerType.SasViya)];
                 case 1:
                     _a.sent();
                     return [2 /*return*/];
             }
         });
     }); });
+    var testFilePath = path_1.default.join(__dirname, 'test');
+    var testLogsPath = path_1.default.join(__dirname, 'logs');
     it('should set streamLog to true when the flag is passed in', function () { return __awaiter(void 0, void 0, void 0, function () {
         return __generator(this, function (_a) {
             switch (_a.label) {
-                case 0: return [4 /*yield*/, execute_1.execute(sasjs, mocks_1.mockAuthConfig, 'test/job', target, false, false, path_1.default.join(process.projectDir, 'logs'), statusFile, false, false, undefined, true)];
+                case 0: return [4 /*yield*/, execute_1.executeJobViya(sasjs, mocks_1.mockAuthConfig, 'test/job', target, false, false, testLogsPath, testFilePath, false, false, undefined, true)];
                 case 1:
                     _a.sent();
                     expect(sasjs.startComputeJob).toHaveBeenCalledWith('test/job', null, {
@@ -88,8 +79,11 @@ describe('execute', function () {
                         maxPollCount: 24 * 60 * 60,
                         pollInterval: 1000,
                         streamLog: true,
-                        logFolderPath: path_1.default.join(process.projectDir, 'logs')
+                        logFolderPath: testLogsPath
                     }, true, undefined);
+                    return [4 /*yield*/, utils_1.deleteFile(testFilePath)];
+                case 2:
+                    _a.sent();
                     return [2 /*return*/];
             }
         });
@@ -97,7 +91,7 @@ describe('execute', function () {
     it('should set streamLog to false when the flag is false', function () { return __awaiter(void 0, void 0, void 0, function () {
         return __generator(this, function (_a) {
             switch (_a.label) {
-                case 0: return [4 /*yield*/, execute_1.execute(sasjs, mocks_1.mockAuthConfig, 'test/job', target, false, false, path_1.default.join(process.projectDir, 'logs'), statusFile, false, false, undefined, false)];
+                case 0: return [4 /*yield*/, execute_1.executeJobViya(sasjs, mocks_1.mockAuthConfig, 'test/job', target, false, false, testLogsPath, testFilePath, false, false, undefined, false)];
                 case 1:
                     _a.sent();
                     expect(sasjs.startComputeJob).toHaveBeenCalledWith('test/job', null, {
@@ -106,14 +100,40 @@ describe('execute', function () {
                         maxPollCount: 24 * 60 * 60,
                         pollInterval: 1000,
                         streamLog: false,
-                        logFolderPath: path_1.default.join(process.projectDir, 'logs')
+                        logFolderPath: testLogsPath
                     }, true, undefined);
+                    return [4 /*yield*/, utils_1.deleteFile(testFilePath)];
+                case 2:
+                    _a.sent();
+                    return [2 /*return*/];
+            }
+        });
+    }); });
+});
+describe('executeJobSasjs', function () {
+    beforeEach(function () { return __awaiter(void 0, void 0, void 0, function () {
+        return __generator(this, function (_a) {
+            switch (_a.label) {
+                case 0: return [4 /*yield*/, setupMocks(types_1.ServerType.Sasjs)];
+                case 1:
+                    _a.sent();
+                    return [2 /*return*/];
+            }
+        });
+    }); });
+    it('should pass job pass as a _program parameter', function () { return __awaiter(void 0, void 0, void 0, function () {
+        return __generator(this, function (_a) {
+            switch (_a.label) {
+                case 0: return [4 /*yield*/, execute_1.executeJobSasjs(sasjs, 'test/job', path_1.default.join(process.projectDir, 'logs'))];
+                case 1:
+                    _a.sent();
+                    expect(sasjs.executeJobSASjs).toHaveBeenCalledWith({ _program: 'test/job' });
                     return [2 /*return*/];
             }
         });
     }); });
 });
-var setupMocks = function () { return __awaiter(void 0, void 0, void 0, function () {
+var setupMocks = function (serverType) { return __awaiter(void 0, void 0, void 0, function () {
     return __generator(this, function (_a) {
         switch (_a.label) {
             case 0:
@@ -124,7 +144,7 @@ var setupMocks = function () { return __awaiter(void 0, void 0, void 0, function
                 jest.restoreAllMocks();
                 jest.mock('@sasjs/adapter');
                 jest
-                    .spyOn(sasjs, 'startComputeJob')
+                    .spyOn(sasjs, serverType === types_1.ServerType.SasViya ? 'startComputeJob' : 'executeJobSASjs')
                     .mockImplementation(function () { return Promise.resolve(); });
                 return [2 /*return*/];
         }

package/build/commands/job/spec/getContextName.spec.js

@@ -37,7 +37,7 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 var utils_1 = require("../../../utils");
-var execute_1 = require("../execute");
+var execute_1 = require("../internal/execute");
 describe('getContextName', function () {
     it('should return the context name if specified in the target', function () { return __awaiter(void 0, void 0, void 0, function () {
         var target;

package/build/commands/job/spec/job.spec.server.js

@@ -65,7 +65,7 @@ var config_1 = require("../../../utils/config");
 var test_1 = require("../../../utils/test");
 var node_1 = __importStar(require("@sasjs/adapter/node"));
 var utils_2 = require("../../../utils");
-var execute_1 = require("../execute");
+var execute_1 = require("../internal/execute");
 var prefixAppLoc_1 = require("../../../utils/prefixAppLoc");
 var build_1 = require("../../build/build");
 var deploy_1 = require("../../deploy/deploy");
@@ -92,7 +92,7 @@ describe('sasjs job execute', function () {
                     _a.sent();
                     sasjs = new node_1.default({
                         serverUrl: target.serverUrl,
-                        allowInsecureRequests: target.allowInsecureRequests,
+                        httpsAgentOptions: target.httpsAgentOptions,
                         appLoc: target.appLoc,
                         serverType: target.serverType,
                         debug: true
@@ -530,7 +530,7 @@ describe('sasjs job execute', function () {
                 case 0:
                     adapter = new node_1.default({
                         serverUrl: target.serverUrl,
-                        allowInsecureRequests: target.allowInsecureRequests,
+                        httpsAgentOptions: target.httpsAgentOptions,
                         appLoc: target.appLoc,
                         serverType: target.serverType
                     });
@@ -611,7 +611,7 @@ var executeWrapper = function (_a) {
     var _b = _a.adapter, adapter = _b === void 0 ? sasjs : _b, jobPath = _a.jobPath, _c = _a.waitForJob, waitForJob = _c === void 0 ? false : _c, _d = _a.output, output = _d === void 0 ? false : _d, _e = _a.logFile, logFile = _e === void 0 ? undefined : _e, _f = _a.statusFile, statusFile = _f === void 0 ? undefined : _f, _g = _a.returnStatusOnly, returnStatusOnly = _g === void 0 ? false : _g, _h = _a.ignoreWarnings, ignoreWarnings = _h === void 0 ? false : _h, _j = _a.source, source = _j === void 0 ? undefined : _j, _k = _a.streamLog, streamLog = _k === void 0 ? false : _k;
     return __awaiter(void 0, void 0, void 0, function () {
         return __generator(this, function (_l) {
-            return [2 /*return*/, execute_1.execute(adapter, authConfig, jobPath, target, waitForJob, output, logFile, statusFile, returnStatusOnly, ignoreWarnings, source, streamLog)];
+            return [2 /*return*/, execute_1.executeJobViya(adapter, authConfig, jobPath, target, waitForJob, output, logFile, statusFile, returnStatusOnly, ignoreWarnings, source, streamLog)];
         });
     });
 };