@sasjs/cli 2.38.8 → 3.0.2

package/build/commands/deploy/deploy.js

@@ -49,7 +49,7 @@ var utils_2 = require("@sasjs/utils");
 var file_1 = require("../../utils/file");
 var getDeployScripts_1 = require("./internal/getDeployScripts");
 var deployToSasViyaWithServicePack_1 = require("../shared/deployToSasViyaWithServicePack");
-function deploy(target, isLocal) {
+function deploy(target, isLocal, sasjs) {
     var _a, _b, _c, _d, _e, _f, _g, _h, _j;
     return __awaiter(this, void 0, void 0, function () {
         var appLoc, buildDestinationFolder_1, finalFilePathJSON, jsonObject, webIndexFileName, deployScripts, buildDestinationFolder, logFilePath;
@@ -82,50 +82,58 @@ function deploy(target, isLocal) {
                     }
                     buildDestinationFolder = process.sasjsConstants.buildDestinationFolder;
                     logFilePath = buildDestinationFolder;
-                    return [4 /*yield*/, utils_2.asyncForEach(deployScripts, function (deployScript) { return __awaiter(_this, void 0, void 0, function () {
-                            var deployScriptPath, deployScriptFile, linesToExecute, streamConfig, logPath;
-                            var _a, _b, _c;
-                            return __generator(this, function (_d) {
-                                switch (_d.label) {
-                                    case 0:
-                                        deployScriptPath = utils_1.getAbsolutePath(deployScript, process.projectDir);
-                                        if (!file_1.isSasFile(deployScript)) return [3 /*break*/, 7];
-                                        (_a = process.logger) === null || _a === void 0 ? void 0 : _a.info("Processing SAS file " + path_1.default.basename(deployScript) + " ...");
-                                        return [4 /*yield*/, utils_2.readFile(deployScriptPath)
-                                            // split into lines
-                                        ];
-                                    case 1:
-                                        deployScriptFile = _d.sent();
-                                        linesToExecute = deployScriptFile.replace(/\r\n/g, '\n').split('\n');
-                                        return [4 /*yield*/, config_1.getStreamConfig(target)];
-                                    case 2:
-                                        streamConfig = _d.sent();
-                                        if (!(target.serverType === utils_2.ServerType.SasViya)) return [3 /*break*/, 4];
-                                        return [4 /*yield*/, deployToSasViya(deployScript, target, isLocal, linesToExecute, logFilePath, streamConfig)];
-                                    case 3:
-                                        _d.sent();
-                                        return [3 /*break*/, 6];
-                                    case 4: return [4 /*yield*/, deployToSas9(deployScript, target, linesToExecute, logFilePath, streamConfig)];
-                                    case 5:
-                                        _d.sent();
-                                        _d.label = 6;
-                                    case 6: return [3 /*break*/, 9];
-                                    case 7:
-                                        if (!file_1.isShellScript(deployScript)) return [3 /*break*/, 9];
-                                        (_b = process.logger) === null || _b === void 0 ? void 0 : _b.info("Executing shell script " + deployScript + " ...");
-                                        logPath = path_1.default.join(process.projectDir, 'sasjsbuild', path_1.default.basename(deployScript).replace('.sh', '') + ".log");
-                                        return [4 /*yield*/, utils_1.executeShellScript(deployScriptPath, logPath)];
-                                    case 8:
-                                        _d.sent();
-                                        (_c = process.logger) === null || _c === void 0 ? void 0 : _c.success("Shell script execution completed! Log is here: " + logPath);
-                                        _d.label = 9;
-                                    case 9: return [2 /*return*/];
-                                }
-                            });
-                        }); })];
+                    if (!(target.serverType === utils_2.ServerType.Sasjs)) return [3 /*break*/, 5];
+                    return [4 /*yield*/, deployToSasjs(target, sasjs)];
                 case 4:
                     _k.sent();
-                    return [2 /*return*/];
+                    return [3 /*break*/, 7];
+                case 5: return [4 /*yield*/, utils_2.asyncForEach(deployScripts, function (deployScript) { return __awaiter(_this, void 0, void 0, function () {
+                        var deployScriptPath, deployScriptFile, linesToExecute, streamConfig, logPath;
+                        var _a, _b, _c;
+                        return __generator(this, function (_d) {
+                            switch (_d.label) {
+                                case 0:
+                                    deployScriptPath = utils_1.getAbsolutePath(deployScript, process.projectDir);
+                                    if (!file_1.isSasFile(deployScript)) return [3 /*break*/, 7];
+                                    (_a = process.logger) === null || _a === void 0 ? void 0 : _a.info("Processing SAS file " + path_1.default.basename(deployScript) + " ...");
+                                    return [4 /*yield*/, utils_2.readFile(deployScriptPath)
+                                        // split into lines
+                                    ];
+                                case 1:
+                                    deployScriptFile = _d.sent();
+                                    linesToExecute = deployScriptFile
+                                        .replace(/\r\n/g, '\n')
+                                        .split('\n');
+                                    return [4 /*yield*/, config_1.getStreamConfig(target)];
+                                case 2:
+                                    streamConfig = _d.sent();
+                                    if (!(target.serverType === utils_2.ServerType.SasViya)) return [3 /*break*/, 4];
+                                    return [4 /*yield*/, deployToSasViya(deployScript, target, isLocal, linesToExecute, logFilePath, streamConfig)];
+                                case 3:
+                                    _d.sent();
+                                    return [3 /*break*/, 6];
+                                case 4: return [4 /*yield*/, deployToSas9(deployScript, target, linesToExecute, logFilePath, streamConfig)];
+                                case 5:
+                                    _d.sent();
+                                    _d.label = 6;
+                                case 6: return [3 /*break*/, 9];
+                                case 7:
+                                    if (!file_1.isShellScript(deployScript)) return [3 /*break*/, 9];
+                                    (_b = process.logger) === null || _b === void 0 ? void 0 : _b.info("Executing shell script " + deployScript + " ...");
+                                    logPath = path_1.default.join(process.projectDir, 'sasjsbuild', path_1.default.basename(deployScript).replace('.sh', '') + ".log");
+                                    return [4 /*yield*/, utils_1.executeShellScript(deployScriptPath, logPath)];
+                                case 8:
+                                    _d.sent();
+                                    (_c = process.logger) === null || _c === void 0 ? void 0 : _c.success("Shell script execution completed! Log is here: " + logPath);
+                                    _d.label = 9;
+                                case 9: return [2 /*return*/];
+                            }
+                        });
+                    }); })];
+                case 6:
+                    _k.sent();
+                    _k.label = 7;
+                case 7: return [2 /*return*/];
             }
         });
     });
@@ -141,7 +149,7 @@ function getSASjsAndAuthConfig(target, isLocal) {
                         serverUrl: target.serverUrl,
                         appLoc: target.appLoc,
                         serverType: target.serverType,
-                        allowInsecureRequests: target.allowInsecureRequests,
+                        httpsAgentOptions: target.httpsAgentOptions,
                         debug: true,
                         useComputeApi: true
                     });
@@ -233,14 +241,15 @@ function deployToSas9(deployScript, target, linesToExecute, logFilePath, streamC
                     password = utils_2.decodeFromBase64(password);
                     sasjs = new node_1.default({
                         serverUrl: target.serverUrl,
-                        allowInsecureRequests: target.allowInsecureRequests,
+                        httpsAgentOptions: target.httpsAgentOptions,
                         appLoc: target.appLoc,
                         serverType: target.serverType
                     });
                     return [4 /*yield*/, sasjs
                             .executeScriptSAS9(linesToExecute, username, password)
                             .catch(function (err) {
-                            process.logger.log(formatErrorString(err));
+                            var _a;
+                            (_a = process.logger) === null || _a === void 0 ? void 0 : _a.log(formatErrorString(err));
                             if (err && err.errorCode === 404) {
                                 utils_1.displaySasjsRunnerError(username);
                             }
@@ -270,6 +279,43 @@ function deployToSas9(deployScript, target, linesToExecute, logFilePath, streamC
         });
     });
 }
+function deployToSasjs(target, sasjs) {
+    var _a, _b;
+    return __awaiter(this, void 0, void 0, function () {
+        var buildDestinationFolder, finalFilePathJSON, jsonContent, payload, result;
+        return __generator(this, function (_c) {
+            switch (_c.label) {
+                case 0:
+                    buildDestinationFolder = process.sasjsConstants.buildDestinationFolder;
+                    finalFilePathJSON = path_1.default.join(buildDestinationFolder, target.name + ".json");
+                    return [4 /*yield*/, utils_2.readFile(finalFilePathJSON)];
+                case 1:
+                    jsonContent = _c.sent();
+                    payload = JSON.parse(jsonContent);
+                    sasjs = sasjs
+                        ? sasjs
+                        : new node_1.default({
+                            serverType: target.serverType,
+                            serverUrl: target.serverUrl,
+                            appLoc: target.appLoc
+                        });
+                    return [4 /*yield*/, sasjs.deployToSASjs(payload).catch(function (err) {
+                            var _a;
+                            (_a = process.logger) === null || _a === void 0 ? void 0 : _a.error(err);
+                        })];
+                case 2:
+                    result = _c.sent();
+                    if ((result === null || result === void 0 ? void 0 : result.status) === 'failure') {
+                        (_a = process.logger) === null || _a === void 0 ? void 0 : _a.error(result.message);
+                        if (result.example) {
+                            (_b = process.logger) === null || _b === void 0 ? void 0 : _b.info("Payload example:\n" + JSON.stringify(result.example, null, 2));
+                        }
+                    }
+                    return [2 /*return*/];
+            }
+        });
+    });
+}
 /**
  * this function formats the error string to dump error log on console
  * @param error

package/build/commands/deploy/spec/cbd.spec.d.ts

@@ -0,0 +1 @@
+export {};

package/build/commands/deploy/spec/cbd.spec.js

@@ -0,0 +1,141 @@
+"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 });
+var node_1 = __importDefault(require("@sasjs/adapter/node"));
+var utils_1 = require("@sasjs/utils");
+var test_1 = require("../../../utils/test");
+var types_1 = require("../../../types");
+var build_1 = require("../../build/build");
+var deploy_1 = require("../deploy");
+var utils_2 = require("./utils");
+var config_1 = require("../../../utils/config");
+describe('sasjs cbd with server type SASJS', function () {
+    var target;
+    var appName;
+    beforeEach(function () { return __awaiter(void 0, void 0, void 0, function () {
+        return __generator(this, function (_a) {
+            switch (_a.label) {
+                case 0:
+                    appName = "cli-tests-cbd-sasjs-server-" + utils_1.generateTimestamp();
+                    return [4 /*yield*/, test_1.createTestMinimalApp(__dirname, appName)];
+                case 1:
+                    _a.sent();
+                    return [4 /*yield*/, utils_2.createLocalTarget(utils_1.ServerType.Sasjs)];
+                case 2:
+                    target = _a.sent();
+                    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*/, test_1.removeTestApp(__dirname, appName)];
+                case 1:
+                    _a.sent();
+                    jest.resetAllMocks();
+                    return [2 /*return*/];
+            }
+        });
+    }); });
+    it("should deploy compile and build to sasjs/server", function () { return __awaiter(void 0, void 0, void 0, function () {
+        var sasjs, customTarget;
+        return __generator(this, function (_a) {
+            switch (_a.label) {
+                case 0:
+                    sasjs = new node_1.default();
+                    jest.mock('@sasjs/adapter');
+                    jest.spyOn(sasjs, 'deployToSASjs').mockImplementation(function () {
+                        return Promise.resolve({
+                            status: 'success',
+                            message: 'message'
+                        });
+                    });
+                    return [4 /*yield*/, utils_2.updateLocalTarget(target.name, {
+                            jobConfig: undefined,
+                            serviceConfig: undefined,
+                            deployConfig: {
+                                deployServicePack: false,
+                                deployScripts: ["sasjsbuild/" + target.name + ".sas"]
+                            }
+                        })];
+                case 1:
+                    _a.sent();
+                    return [4 /*yield*/, config_1.findTargetInConfiguration(target.name, types_1.TargetScope.Local)];
+                case 2:
+                    customTarget = (_a.sent()).target;
+                    return [4 /*yield*/, expect(build_1.build(customTarget)).toResolve()];
+                case 3:
+                    _a.sent();
+                    return [4 /*yield*/, deploy_1.deploy(customTarget, true, sasjs)];
+                case 4:
+                    _a.sent();
+                    expect(sasjs.deployToSASjs).toHaveBeenCalledWith({
+                        members: [
+                            {
+                                name: 'services',
+                                type: 'folder',
+                                members: [
+                                    {
+                                        name: 'common',
+                                        type: 'folder',
+                                        members: [
+                                            {
+                                                name: 'appinit',
+                                                type: 'service',
+                                                code: '/* provide additional debug info */\n%global _program;\n%put &=syscc;\n%put user=%mf_getuser();\n%put pgm=&_program;\n%put timestamp=%sysfunc(datetime(),datetime19.);\n* Service Variables start;\n*Service Variables end;\n* Dependencies start;\n* Dependencies end;\n* Programs start;\n*Programs end;\n* Service start;\nproc sql;\ncreate table areas as select distinct area\n  from sashelp.springs;\n%webout(OPEN)\n%webout(OBJ,areas)\n%webout(CLOSE)\n* Service end;'
+                                            },
+                                            {
+                                                name: 'getdata',
+                                                type: 'service',
+                                                code: '/* provide additional debug info */\n%global _program;\n%put &=syscc;\n%put user=%mf_getuser();\n%put pgm=&_program;\n%put timestamp=%sysfunc(datetime(),datetime19.);\n* Service Variables start;\n*Service Variables end;\n* Dependencies start;\n* Dependencies end;\n* Programs start;\n*Programs end;\n* Service start;\n%webout(FETCH)\nproc sql;\ncreate table springs as select * from sashelp.springs\n  where area in (select area from work.areas);\n%webout(OPEN)\n%webout(OBJ,springs)\n%webout(CLOSE)\n* Service end;'
+                                            }
+                                        ]
+                                    }
+                                ]
+                            }
+                        ]
+                    });
+                    return [2 /*return*/];
+            }
+        });
+    }); });
+});

package/build/commands/deploy/spec/cbd.spec.server.js

@@ -70,7 +70,6 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 var utils_1 = require("@sasjs/utils");
-var dotenv_1 = __importDefault(require("dotenv"));
 var path_1 = __importDefault(require("path"));
 var utils_2 = require("@sasjs/utils");
 var configUtils = __importStar(require("../../../utils/config"));
@@ -78,18 +77,18 @@ var getDeployScriptsModule = __importStar(require("../internal/getDeployScripts"
 var test_1 = require("../../../utils/test");
 var build_1 = require("../../build/build");
 var deploy_1 = require("../deploy");
-var utils_3 = require("../../../utils");
+var utils_3 = require("./utils");
 describe('sasjs cbd with global config', function () {
     var target;
     beforeEach(function () { return __awaiter(void 0, void 0, void 0, function () {
         return __generator(this, function (_a) {
             switch (_a.label) {
                 case 0:
-                    target = generateTarget(false);
+                    target = utils_3.generateTarget(false);
                     return [4 /*yield*/, test_1.createTestMinimalApp(__dirname, target.name)];
                 case 1:
                     _a.sent();
-                    return [4 /*yield*/, copyJobsAndServices(target.name)];
+                    return [4 /*yield*/, utils_3.copyJobsAndServices(target.name)];
                 case 2:
                     _a.sent();
                     return [2 /*return*/];
@@ -168,8 +167,8 @@ describe('sasjs cbd with local config', function () {
                     return [4 /*yield*/, test_1.createTestApp(__dirname, appName)];
                 case 1:
                     _a.sent();
-                    target = generateTarget(true);
-                    return [4 /*yield*/, copyJobsAndServices(appName)];
+                    target = utils_3.generateTarget(true);
+                    return [4 /*yield*/, utils_3.copyJobsAndServices(appName)];
                 case 2:
                     _a.sent();
                     return [4 /*yield*/, utils_1.copy(path_1.default.join(__dirname, 'testScript', 'copyscript.sh'), path_1.default.join(process.projectDir, 'sasjs', 'build', 'copyscript.sh'))];
@@ -283,7 +282,7 @@ describe('sasjs cbd having stream app', function () {
                     return [4 /*yield*/, test_1.createTestMinimalApp(__dirname, appName)];
                 case 1:
                     _a.sent();
-                    target = generateTarget(true);
+                    target = utils_3.generateTarget(true);
                     return [2 /*return*/];
             }
         });
@@ -330,53 +329,3 @@ describe('sasjs cbd having stream app', function () {
         });
     }); });
 });
-var generateTarget = function (isLocal) {
-    dotenv_1.default.config();
-    var timestamp = utils_2.generateTimestamp();
-    var targetName = "cli-tests-cbd-" + timestamp;
-    var authConfig = isLocal
-        ? undefined
-        : {
-            client: process.env.CLIENT,
-            secret: process.env.SECRET,
-            access_token: process.env.ACCESS_TOKEN,
-            refresh_token: process.env.REFRESH_TOKEN
-        };
-    return new utils_2.Target({
-        name: targetName,
-        serverType: utils_2.ServerType.SasViya,
-        serverUrl: process.env.VIYA_SERVER_URL,
-        appLoc: "/Public/app/cli-tests/" + targetName,
-        contextName: utils_3.contextName,
-        serviceConfig: {
-            serviceFolders: ['sasjs/testServices', 'sasjs/testJob', 'sasjs/services'],
-            initProgram: 'sasjs/testServices/serviceinit.sas',
-            termProgram: 'sasjs/testServices/serviceterm.sas',
-            macroVars: {}
-        },
-        jobConfig: {
-            jobFolders: ['sasjs/testJob'],
-            initProgram: 'sasjs/testServices/serviceinit.sas',
-            termProgram: 'sasjs/testServices/serviceterm.sas',
-            macroVars: {}
-        },
-        authConfig: authConfig,
-        deployConfig: {
-            deployServicePack: true,
-            deployScripts: ['']
-        }
-    });
-};
-var copyJobsAndServices = function (appName) { return __awaiter(void 0, void 0, void 0, function () {
-    return __generator(this, function (_a) {
-        switch (_a.label) {
-            case 0: return [4 /*yield*/, utils_1.copy(path_1.default.join(__dirname, 'testJob'), path_1.default.join(__dirname, appName, 'sasjs', 'testJob'))];
-            case 1:
-                _a.sent();
-                return [4 /*yield*/, utils_1.copy(path_1.default.join(__dirname, 'testServices'), path_1.default.join(__dirname, appName, 'sasjs', 'testServices'))];
-            case 2:
-                _a.sent();
-                return [2 /*return*/];
-        }
-    });
-}); };

package/build/commands/deploy/spec/utils.d.ts

@@ -0,0 +1,6 @@
+import { ServerType, Target } from '@sasjs/utils';
+export declare const createGlobalTarget: (serverType?: ServerType) => Promise<Target>;
+export declare const createLocalTarget: (serverType?: ServerType) => Promise<Target>;
+export declare const updateLocalTarget: (targetName: string, data: any) => Promise<void>;
+export declare const copyJobsAndServices: (appName: string) => Promise<void>;
+export declare const generateTarget: (isLocal: boolean) => Target;