@sasjs/cli 3.19.6 → 3.20.1

package/build/commands/job/jobCommand.js

@@ -55,7 +55,6 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.JobCommand = void 0;
-var node_1 = __importDefault(require("@sasjs/adapter/node"));
 var utils_1 = require("@sasjs/utils");
 var path_1 = __importDefault(require("path"));
 var command_1 = require("../../types/command");
@@ -141,106 +140,61 @@ var JobCommand = /** @class */ (function (_super) {
         return _this;
     }
     JobCommand.prototype.execute = function () {
-        var _a, _b;
+        var _a;
         return __awaiter(this, void 0, void 0, function () {
-            var target, sasjs, authConfig, _c, _d, username, password, _e, e_1, _f;
-            return __generator(this, function (_g) {
-                switch (_g.label) {
+            var target, _b, _c, _d, _e;
+            return __generator(this, function (_f) {
+                switch (_f.label) {
                     case 0: return [4 /*yield*/, this.getTargetInfo()];
                     case 1:
-                        target = (_g.sent()).target;
-                        sasjs = new node_1.default({
-                            serverUrl: target.serverUrl,
-                            httpsAgentOptions: target.httpsAgentOptions,
-                            appLoc: target.appLoc,
-                            serverType: target.serverType,
-                            debug: true
-                        });
-                        _c = target.serverType;
-                        switch (_c) {
+                        target = (_f.sent()).target;
+                        _b = target.serverType;
+                        switch (_b) {
                             case utils_1.ServerType.SasViya: return [3 /*break*/, 2];
-                            case utils_1.ServerType.Sas9: return [3 /*break*/, 7];
-                            case utils_1.ServerType.Sasjs: return [3 /*break*/, 11];
+                            case utils_1.ServerType.Sas9: return [3 /*break*/, 6];
+                            case utils_1.ServerType.Sasjs: return [3 /*break*/, 10];
                         }
-                        return [3 /*break*/, 19];
-                    case 2: return [4 /*yield*/, (0, utils_2.getAuthConfig)(target).catch(function (err) {
-                            var _a;
-                            (_a = process.logger) === null || _a === void 0 ? void 0 : _a.error('Unable to execute job. Error fetching auth config: ', err);
-                            return undefined;
-                        })];
+                        return [3 /*break*/, 14];
+                    case 2:
+                        if (!this.jobSubCommands.includes(this.parsed.subCommand)) return [3 /*break*/, 4];
+                        return [4 /*yield*/, this.executeJobViya(target)];
                     case 3:
-                        authConfig = _g.sent();
-                        if (!authConfig)
-                            return [2 /*return*/, command_1.ReturnCode.InternalError];
-                        if (!this.jobSubCommands.includes(this.parsed.subCommand)) return [3 /*break*/, 5];
-                        return [4 /*yield*/, this.executeJobViya(target, sasjs, authConfig)];
+                        _c = _f.sent();
+                        return [3 /*break*/, 5];
                     case 4:
-                        _d = _g.sent();
-                        return [3 /*break*/, 6];
-                    case 5:
-                        _d = command_1.ReturnCode.InvalidCommand;
-                        _g.label = 6;
-                    case 6: return [2 /*return*/, _d];
+                        _c = command_1.ReturnCode.InvalidCommand;
+                        _f.label = 5;
+                    case 5: return [2 /*return*/, _c];
+                    case 6:
+                        if (!this.jobSubCommands.includes(this.parsed.subCommand)) return [3 /*break*/, 8];
+                        return [4 /*yield*/, this.executeJobSas9(target)];
                     case 7:
-                        username = void 0;
-                        password = void 0;
-                        if (target.authConfigSas9) {
-                            username = target.authConfigSas9.userName;
-                            password = target.authConfigSas9.password;
-                        }
-                        else {
-                            username = process.env.SAS_USERNAME;
-                            password = process.env.SAS_PASSWORD;
-                        }
-                        if (!username || !password) {
-                            (_a = process.logger) === null || _a === void 0 ? void 0 : _a.error('Unable to execute job. username and password not found');
-                            return [2 /*return*/, command_1.ReturnCode.InternalError];
-                        }
-                        password = (0, utils_1.decodeFromBase64)(password);
-                        if (!this.jobSubCommands.includes(this.parsed.subCommand)) return [3 /*break*/, 9];
-                        return [4 /*yield*/, this.executeJobSas9(sasjs, target, { username: username, password: password })];
+                        _d = _f.sent();
+                        return [3 /*break*/, 9];
                     case 8:
-                        _e = _g.sent();
-                        return [3 /*break*/, 10];
-                    case 9:
-                        _e = command_1.ReturnCode.InvalidCommand;
-                        _g.label = 10;
-                    case 10: return [2 /*return*/, _e];
-                    case 11:
-                        sasjs = new node_1.default({
-                            serverType: target.serverType,
-                            serverUrl: target.serverUrl
-                        });
+                        _d = command_1.ReturnCode.InvalidCommand;
+                        _f.label = 9;
+                    case 9: return [2 /*return*/, _d];
+                    case 10:
                         if (typeof this.parsed.jobPath !== 'string')
                             return [2 /*return*/, command_1.ReturnCode.InvalidCommand];
-                        _g.label = 12;
+                        if (!this.jobSubCommands.includes(this.parsed.subCommand)) return [3 /*break*/, 12];
+                        return [4 /*yield*/, this.executeJobSasjs(target)];
+                    case 11:
+                        _e = _f.sent();
+                        return [3 /*break*/, 13];
                     case 12:
-                        _g.trys.push([12, 14, , 15]);
-                        return [4 /*yield*/, (0, utils_2.getAuthConfig)(target)];
-                    case 13:
-                        authConfig = _g.sent();
-                        return [3 /*break*/, 15];
+                        _e = command_1.ReturnCode.InvalidCommand;
+                        _f.label = 13;
+                    case 13: return [2 /*return*/, _e];
                     case 14:
-                        e_1 = _g.sent();
-                        return [3 /*break*/, 15];
-                    case 15:
-                        if (!this.jobSubCommands.includes(this.parsed.subCommand)) return [3 /*break*/, 17];
-                        return [4 /*yield*/, this.executeJobSasjs(sasjs, target, authConfig)];
-                    case 16:
-                        _f = _g.sent();
-                        return [3 /*break*/, 18];
-                    case 17:
-                        _f = command_1.ReturnCode.InvalidCommand;
-                        _g.label = 18;
-                    case 18: return [2 /*return*/, _f];
-                    case 19:
-                        (_b = process.logger) === null || _b === void 0 ? void 0 : _b.error("This command is not supported for specified server type.\nPlease try again with a different server type.");
+                        (_a = process.logger) === null || _a === void 0 ? void 0 : _a.error("This command is not supported for specified server type.\nPlease try again with a different server type.");
                         return [2 /*return*/, command_1.ReturnCode.InternalError];
                 }
             });
         });
     };
-    JobCommand.prototype.executeJobSasjs = function (sasjs, target, authConfig) {
+    JobCommand.prototype.executeJobSasjs = function (target) {
         var _a;
         return __awaiter(this, void 0, void 0, function () {
             var jobPath, log, output, returnCode;
@@ -252,7 +206,7 @@ var JobCommand = /** @class */ (function (_super) {
                         output = ((_a = this.parsed.output) === null || _a === void 0 ? void 0 : _a.length)
                             ? this.parsed.output
                             : undefined;
-                        return [4 /*yield*/, (0, execute_1.executeJobSasjs)(sasjs, jobPath, log, output, authConfig)
+                        return [4 /*yield*/, (0, execute_1.executeJobSasjs)(target, jobPath, log, output)
                                 .then(function () { return command_1.ReturnCode.Success; })
                                 .catch(function (err) {
                                 var _a;
@@ -266,12 +220,12 @@ var JobCommand = /** @class */ (function (_super) {
             });
         });
     };
-    JobCommand.prototype.executeJobSas9 = function (sasjs, target, config) {
+    JobCommand.prototype.executeJobSas9 = function (target) {
         var _a;
         return __awaiter(this, void 0, void 0, function () {
-            var jobPath, log, output, source, returnCode;
-            return __generator(this, function (_b) {
-                switch (_b.label) {
+            var jobPath, log, output, source, _b, sasjs, authConfigSas9, userName, password, returnCode;
+            return __generator(this, function (_c) {
+                switch (_c.label) {
                     case 0:
                         jobPath = (0, prefixAppLoc_1.prefixAppLoc)(target.appLoc, this.parsed.jobPath);
                         log = (0, getLogFilePath_1.getLogFilePath)(this.parsed.log, jobPath);
@@ -279,7 +233,18 @@ var JobCommand = /** @class */ (function (_super) {
                             ? this.parsed.output
                             : undefined;
                         source = this.parsed.source;
-                        return [4 /*yield*/, (0, execute_1.executeJobSas9)(sasjs, config, jobPath, log, output, source)
+                        return [4 /*yield*/, (0, utils_2.getSASjsAndAuthConfig)(target).catch(function (err) {
+                                var _a;
+                                (_a = process.logger) === null || _a === void 0 ? void 0 : _a.error('Unable to execute job. Error fetching auth config: ', err);
+                                return { sasjs: (0, utils_2.getSASjs)(target), authConfigSas9: undefined };
+                            })];
+                    case 1:
+                        _b = _c.sent(), sasjs = _b.sasjs, authConfigSas9 = _b.authConfigSas9;
+                        if (!authConfigSas9)
+                            return [2 /*return*/, command_1.ReturnCode.InternalError];
+                        userName = authConfigSas9.userName;
+                        password = (0, utils_1.decodeFromBase64)(authConfigSas9.password);
+                        return [4 /*yield*/, (0, execute_1.executeJobSas9)(sasjs, { userName: userName, password: password }, jobPath, log, output, source)
                                 .then(function () {
                                 return command_1.ReturnCode.Success;
                             })
@@ -288,19 +253,19 @@ var JobCommand = /** @class */ (function (_super) {
                                 (_a = process.logger) === null || _a === void 0 ? void 0 : _a.error('Error executing job: ', err);
                                 return command_1.ReturnCode.InternalError;
                             })];
-                    case 1:
-                        returnCode = _b.sent();
+                    case 2:
+                        returnCode = _c.sent();
                         return [2 /*return*/, returnCode];
                 }
             });
         });
     };
-    JobCommand.prototype.executeJobViya = function (target, sasjs, authConfig) {
+    JobCommand.prototype.executeJobViya = function (target) {
         var _a, _b, _c;
         return __awaiter(this, void 0, void 0, function () {
-            var jobPath, log, wait, output, statusFile, returnStatusOnly, ignoreWarnings, source, streamLog, returnCode;
-            return __generator(this, function (_d) {
-                switch (_d.label) {
+            var jobPath, log, wait, output, statusFile, returnStatusOnly, ignoreWarnings, source, streamLog, _d, sasjs, authConfig, returnCode;
+            return __generator(this, function (_e) {
+                switch (_e.label) {
                     case 0:
                         jobPath = (0, prefixAppLoc_1.prefixAppLoc)(target.appLoc, this.parsed.jobPath);
                         log = (0, getLogFilePath_1.getLogFilePath)(this.parsed.log, jobPath);
@@ -320,6 +285,15 @@ 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*/, (0, utils_2.getSASjsAndAuthConfig)(target).catch(function (err) {
+                                var _a;
+                                (_a = process.logger) === null || _a === void 0 ? void 0 : _a.error('Unable to execute job. Error fetching auth config: ', err);
+                                return { sasjs: (0, utils_2.getSASjs)(target), authConfig: undefined };
+                            })];
+                    case 1:
+                        _d = _e.sent(), sasjs = _d.sasjs, authConfig = _d.authConfig;
+                        if (!authConfig)
+                            return [2 /*return*/, command_1.ReturnCode.InternalError];
                         return [4 /*yield*/, (0, execute_1.executeJobViya)(sasjs, authConfig, jobPath, target, wait, output, log, statusFile, returnStatusOnly, ignoreWarnings, source, streamLog)
                                 .then(function () {
                                 return command_1.ReturnCode.Success;
@@ -329,8 +303,8 @@ var JobCommand = /** @class */ (function (_super) {
                                 (_a = process.logger) === null || _a === void 0 ? void 0 : _a.error('Error executing job: ', err);
                                 return command_1.ReturnCode.InternalError;
                             })];
-                    case 1:
-                        returnCode = _d.sent();
+                    case 2:
+                        returnCode = _e.sent();
                         return [2 /*return*/, returnCode];
                 }
             });

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

@@ -1,4 +1,23 @@
 "use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
 var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
     function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
     return new (P || (P = Promise))(function (resolve, reject) {
@@ -39,14 +58,16 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-var node_1 = __importDefault(require("@sasjs/adapter/node"));
+var node_1 = __importStar(require("@sasjs/adapter/node"));
 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 utilsModule = __importStar(require("../../../utils/utils"));
 var execute_1 = require("../internal/execute");
 var mocks_1 = require("./mocks");
 var sasjs = new node_1.default();
+var executeJobMock;
 var target = new types_1.Target({
     name: 'test',
     serverType: types_1.ServerType.Sasjs,
@@ -58,7 +79,7 @@ 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(types_1.ServerType.SasViya)];
+                case 0: return [4 /*yield*/, setupMocksForViya()];
                 case 1:
                     _a.sent();
                     return [2 /*return*/];
@@ -114,7 +135,7 @@ 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 0: return [4 /*yield*/, setupMocksForSasjs()];
                 case 1:
                     _a.sent();
                     return [2 /*return*/];
@@ -124,16 +145,16 @@ describe('executeJobSasjs', function () {
     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*/, (0, execute_1.executeJobSasjs)(sasjs, 'test/job', path_1.default.join(process.projectDir, 'logs'))];
+                case 0: return [4 /*yield*/, (0, execute_1.executeJobSasjs)(target, 'test/job', path_1.default.join(process.projectDir, 'logs'))];
                 case 1:
                     _a.sent();
-                    expect(sasjs.executeJobSASjs).toHaveBeenCalledWith({ _program: 'test/job' }, undefined);
+                    expect(executeJobMock).toHaveBeenCalledWith({ _program: 'test/job' }, target.appLoc, undefined);
                     return [2 /*return*/];
             }
         });
     }); });
 });
-var setupMocks = function (serverType) { return __awaiter(void 0, void 0, void 0, function () {
+var setupMocksForViya = function () { return __awaiter(void 0, void 0, void 0, function () {
     return __generator(this, function (_a) {
         switch (_a.label) {
             case 0:
@@ -144,9 +165,33 @@ var setupMocks = function (serverType) { return __awaiter(void 0, void 0, void 0
                 jest.restoreAllMocks();
                 jest.mock('@sasjs/adapter');
                 jest
-                    .spyOn(sasjs, serverType === types_1.ServerType.SasViya ? 'startComputeJob' : 'executeJobSASjs')
+                    .spyOn(sasjs, 'startComputeJob')
                     .mockImplementation(function () { return Promise.resolve(); });
                 return [2 /*return*/];
         }
     });
 }); };
+var setupMocksForSasjs = function () { return __awaiter(void 0, void 0, void 0, function () {
+    return __generator(this, function (_a) {
+        switch (_a.label) {
+            case 0:
+                process.projectDir = process.cwd();
+                return [4 /*yield*/, (0, utils_2.setConstants)()];
+            case 1:
+                _a.sent();
+                jest.restoreAllMocks();
+                executeJobMock = jest
+                    .spyOn(node_1.SASjsApiClient.prototype, 'executeJob')
+                    .mockImplementation(function () {
+                    return Promise.resolve({
+                        result: '',
+                        log: ''
+                    });
+                });
+                jest
+                    .spyOn(utilsModule, 'isSasJsServerInServerMode')
+                    .mockImplementation(function () { return Promise.resolve(false); });
+                return [2 /*return*/];
+        }
+    });
+}); };

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

@@ -289,7 +289,7 @@ describe('JobCommand', function () {
                 switch (_a.label) {
                     case 0:
                         jest
-                            .spyOn(configUtils, 'getAuthConfig')
+                            .spyOn(configUtils, 'getSASjsAndAuthConfig')
                             .mockImplementation(function () { return Promise.reject(new Error('Test Error')); });
                         return [4 /*yield*/, executeCommandWrapper([jobPath])];
                     case 1:
@@ -488,8 +488,13 @@ var setupMocksForViya = function () {
         return Promise.resolve({ target: targetViya, isLocal: true });
     });
     jest
-        .spyOn(configUtils, 'getAuthConfig')
-        .mockImplementation(function () { return Promise.resolve(authConfig); });
+        .spyOn(configUtils, 'getSASjsAndAuthConfig')
+        .mockImplementation(function (target) {
+        return Promise.resolve({
+            sasjs: configUtils.getSASjs(target),
+            authConfig: authConfig
+        });
+    });
     process.logger = new utils_1.Logger(utils_1.LogLevel.Off);
     jest.spyOn(process.logger, 'error');
 };

package/build/commands/request/spec/request.spec.server.sas9.js

@@ -70,6 +70,8 @@ var utils_3 = require("../../../utils");
 var getLogFilePath_1 = require("../../../utils/getLogFilePath");
 var fs_1 = require("fs");
 var utils_4 = require("./utils");
+var dotenv_1 = __importDefault(require("dotenv"));
+dotenv_1.default.config();
 describe('sasjs request with SAS9', function () {
     var appName = 'cli-tests-request-sas9-' + (0, utils_2.generateTimestamp)();
     var locationPrefix = "/User Folders/cli-tests/".concat(process.env.SAS_USERNAME, "/");