@sasjs/cli 3.6.0 → 3.6.4
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +0 -3
- package/build/cli.js +4 -4
- package/build/cli.spec.js +6 -6
- package/build/commands/add/addCommand.js +2 -2
- package/build/commands/add/addCredential.js +27 -27
- package/build/commands/add/addTarget.js +10 -10
- package/build/commands/add/internal/input.js +30 -30
- package/build/commands/add/internal/saveConfig.js +2 -2
- package/build/commands/add/spec/addCommand.spec.js +24 -20
- package/build/commands/add/spec/addCredential.spec.js +14 -14
- package/build/commands/add/spec/addTarget.spec.js +22 -22
- package/build/commands/build/build.js +81 -77
- package/build/commands/build/buildCommand.js +3 -3
- package/build/commands/build/compileBuildCommand.js +4 -4
- package/build/commands/build/internal/config.js +8 -8
- package/build/commands/build/internal/getLaunchPageCode.js +2 -2
- package/build/commands/build/spec/build.spec.js +10 -10
- package/build/commands/build/spec/buildCommand.spec.js +16 -12
- package/build/commands/build/spec/cb.spec.server.js +18 -18
- package/build/commands/build/spec/compileBuildCommand.spec.js +17 -13
- package/build/commands/compile/compile.js +61 -61
- package/build/commands/compile/compileCommand.js +10 -10
- package/build/commands/compile/compileSingleFile.js +17 -17
- package/build/commands/compile/internal/checkCompileStatus.js +11 -11
- package/build/commands/compile/internal/compareFolders.js +11 -11
- package/build/commands/compile/internal/compileJobFile.js +3 -3
- package/build/commands/compile/internal/compileServiceFile.js +14 -14
- package/build/commands/compile/internal/compileTestFile.js +41 -37
- package/build/commands/compile/internal/getAllJobFolders.js +13 -9
- package/build/commands/compile/internal/getAllServiceFolders.js +13 -9
- package/build/commands/compile/internal/getServerType.js +1 -1
- package/build/commands/compile/internal/identifySasFile.js +2 -2
- package/build/commands/compile/internal/loadDependencies.js +5 -5
- package/build/commands/compile/internal/spec/compileTestFile.spec.js +40 -40
- package/build/commands/compile/spec/compareFolders.spec.js +27 -27
- package/build/commands/compile/spec/compile.spec.js +93 -93
- package/build/commands/compile/spec/compileCommand.spec.js +37 -33
- package/build/commands/compile/spec/compileJobFile.spec.js +12 -22
- package/build/commands/compile/spec/compileServiceFile.spec.js +12 -22
- package/build/commands/compile/spec/copyFilesToBuildFolder.spec.js +7 -7
- package/build/commands/compile/spec/loadDependencies.spec.js +31 -162
- package/build/commands/context/contextCommand.js +16 -16
- package/build/commands/context/create.js +1 -1
- package/build/commands/context/delete.js +2 -2
- package/build/commands/context/edit.js +1 -1
- package/build/commands/context/export.js +5 -5
- package/build/commands/context/internal/validateConfigPath.js +1 -1
- package/build/commands/context/list.js +4 -4
- package/build/commands/context/spec/contextCommand.spec.js +80 -76
- package/build/commands/context/spec/create.spec.js +3 -3
- package/build/commands/context/spec/delete.spec.js +3 -3
- package/build/commands/context/spec/edit.spec.js +3 -3
- package/build/commands/context/spec/export.spec.js +8 -8
- package/build/commands/context/spec/list.spec.js +5 -5
- package/build/commands/create/create.js +12 -12
- package/build/commands/create/createCommand.js +2 -2
- package/build/commands/create/internal/createReadme.js +2 -2
- package/build/commands/create/spec/create.spec.js +39 -39
- package/build/commands/create/spec/createCommand.spec.js +14 -10
- package/build/commands/db/db.js +22 -22
- package/build/commands/db/dbCommand.js +1 -1
- package/build/commands/db/spec/db.spec.js +8 -8
- package/build/commands/db/spec/dbCommand.spec.js +11 -7
- package/build/commands/deploy/compileBuildDeployCommand.js +6 -6
- package/build/commands/deploy/deploy.js +39 -39
- package/build/commands/deploy/deployCommand.js +2 -2
- package/build/commands/deploy/internal/getDeployScripts.js +14 -10
- package/build/commands/deploy/spec/cbd.spec.js +14 -14
- package/build/commands/deploy/spec/cbd.spec.server.js +40 -40
- package/build/commands/deploy/spec/compileBuildDeployCommand.spec.js +18 -14
- package/build/commands/deploy/spec/deployCommand.spec.js +15 -11
- package/build/commands/deploy/spec/getDeployScripts.spec.js +8 -8
- package/build/commands/deploy/spec/utils.js +17 -17
- package/build/commands/docs/docsCommand.js +7 -7
- package/build/commands/docs/generateDocs.js +33 -29
- package/build/commands/docs/generateDot.js +12 -8
- package/build/commands/docs/initDocs.js +1 -1
- package/build/commands/docs/internal/createDotFiles.js +6 -6
- package/build/commands/docs/internal/getDotFileContent.js +17 -17
- package/build/commands/docs/internal/getFileInputs.js +1 -1
- package/build/commands/docs/internal/getFileOutputs.js +1 -1
- package/build/commands/docs/internal/getFoldersForDocs.js +4 -4
- package/build/commands/docs/internal/populateNodeDictionary.js +1 -1
- package/build/commands/docs/spec/docsCommand.spec.js +25 -21
- package/build/commands/docs/spec/generateDocs.spec.js +60 -60
- package/build/commands/docs/spec/generateDot.spec.js +23 -23
- package/build/commands/docs/spec/getDocConfig.spec.js +2 -2
- package/build/commands/docs/spec/initDocs.spec.js +7 -7
- package/build/commands/flow/execute.js +8 -8
- package/build/commands/flow/flowCommand.js +5 -5
- package/build/commands/flow/internal/checkPredecessorDeadlock.js +11 -7
- package/build/commands/flow/internal/executeFlow.js +23 -23
- package/build/commands/flow/internal/failAllSuccessors.js +1 -1
- package/build/commands/flow/internal/generateFileName.js +2 -2
- package/build/commands/flow/internal/normalizeFilePath.js +1 -1
- package/build/commands/flow/internal/parseJobDetails.js +3 -3
- package/build/commands/flow/internal/printError.js +1 -1
- package/build/commands/flow/internal/saveLog.js +8 -8
- package/build/commands/flow/internal/saveToCsv.js +2 -2
- package/build/commands/flow/internal/spec/allFlowsCompleted.spec.js +4 -4
- package/build/commands/flow/internal/spec/checkPredecessorDeadlock.spec.js +4 -4
- package/build/commands/flow/internal/spec/executeFlow.spec.js +10 -10
- package/build/commands/flow/internal/spec/failAllSuccessors.spec.js +1 -1
- package/build/commands/flow/internal/spec/saveToCsv.spec.js +16 -16
- package/build/commands/flow/internal/spec/validateParams.spec.js +33 -33
- package/build/commands/flow/internal/validateParams.js +17 -17
- package/build/commands/flow/spec/flow.spec.js +1 -1
- package/build/commands/flow/spec/flow.spec.server.js +60 -60
- package/build/commands/flow/spec/flowCommand.spec.js +16 -12
- package/build/commands/folder/create.js +2 -2
- package/build/commands/folder/delete.js +2 -2
- package/build/commands/folder/folderCommand.js +11 -11
- package/build/commands/folder/move.js +2 -2
- package/build/commands/folder/spec/folder.spec.server.js +35 -35
- package/build/commands/folder/spec/folderCommand.spec.js +23 -19
- package/build/commands/help/help.js +46 -46
- package/build/commands/help/helpCommand.js +1 -1
- package/build/commands/help/spec/help.spec.js +8 -8
- package/build/commands/help/spec/helpCommand.spec.js +11 -7
- package/build/commands/init/init.js +7 -7
- package/build/commands/init/initCommand.js +1 -1
- package/build/commands/init/spec/init.spec.server.js +17 -17
- package/build/commands/init/spec/initCommand.spec.js +11 -7
- package/build/commands/job/internal/execute/sasjs.js +1 -1
- package/build/commands/job/internal/execute/viya.js +35 -35
- package/build/commands/job/internal/utils.js +6 -6
- package/build/commands/job/jobCommand.js +6 -6
- package/build/commands/job/spec/execute.spec.js +6 -6
- package/build/commands/job/spec/getContextName.spec.js +2 -2
- package/build/commands/job/spec/job.spec.server.js +53 -53
- package/build/commands/job/spec/jobCommand.spec.js +17 -13
- package/build/commands/lint/initLint.js +2 -2
- package/build/commands/lint/lintCommand.js +10 -10
- package/build/commands/lint/processLint.js +5 -5
- package/build/commands/lint/spec/lintCommand.spec.js +19 -15
- package/build/commands/request/request.js +16 -16
- package/build/commands/request/requestCommand.js +5 -5
- package/build/commands/request/spec/request.spec.server.js +210 -178
- package/build/commands/request/spec/requestCommand.spec.js +17 -13
- package/build/commands/run/run.js +23 -23
- package/build/commands/run/runCommand.js +2 -2
- package/build/commands/run/spec/run.spec.server.js +51 -51
- package/build/commands/run/spec/runCommand.spec.js +10 -6
- package/build/commands/servicepack/deploy.js +6 -6
- package/build/commands/servicepack/servicePackCommand.js +3 -3
- package/build/commands/servicepack/spec/servicepack.spec.server.js +6 -6
- package/build/commands/servicepack/spec/servicepackCommand.spec.js +10 -6
- package/build/commands/shared/createConfigFile.js +2 -2
- package/build/commands/shared/createFileStructure.js +6 -6
- package/build/commands/shared/createLintConfigFile.js +1 -1
- package/build/commands/shared/deployToSasViyaWithServicePack.js +4 -4
- package/build/commands/shared/fetchLogFileContent.js +10 -6
- package/build/commands/testing/internal/saveOutput.js +39 -35
- package/build/commands/testing/spec/testCommand.spec.js +17 -13
- package/build/commands/testing/spec/testing.spec.server.js +38 -38
- package/build/commands/testing/test.js +45 -41
- package/build/commands/testing/testCommand.js +2 -2
- package/build/commands/version/spec/version.spec.js +1 -1
- package/build/commands/version/spec/versionCommand.spec.js +11 -7
- package/build/commands/version/version.js +3 -3
- package/build/commands/version/versionCommand.js +2 -2
- package/build/commands/web/internal/createAssetServices.js +28 -24
- package/build/commands/web/internal/getWebServiceContent.js +6 -6
- package/build/commands/web/internal/sasjsout.d.ts +1 -1
- package/build/commands/web/internal/sasjsout.js +1 -1
- package/build/commands/web/internal/spec/updateLinkTag.spec.js +2 -2
- package/build/commands/web/internal/spec/updateScriptTag.spec.js +10 -10
- package/build/commands/web/internal/updateAllTags.js +19 -15
- package/build/commands/web/internal/updateLinkTag.js +2 -2
- package/build/commands/web/internal/updateScriptTag.js +6 -6
- package/build/commands/web/spec/web.spec.js +23 -23
- package/build/commands/web/spec/webCommand.spec.js +16 -12
- package/build/commands/web/web.js +25 -25
- package/build/commands/web/webCommand.js +3 -3
- package/build/types/command/commandBase.js +19 -15
- package/build/types/command/parse.js +1 -1
- package/build/types/command/spec/commandBase.spec.js +16 -12
- package/build/types/command/targetCommand.js +4 -4
- package/build/types/command/unalias.js +9 -5
- package/build/utils/auth.js +7 -7
- package/build/utils/config.js +53 -49
- package/build/utils/displayResult.js +4 -4
- package/build/utils/file.js +11 -11
- package/build/utils/fileStructures/builtFiles.js +2 -2
- package/build/utils/fileStructures/builtFilesCustom1.js +2 -2
- package/build/utils/getLogFilePath.js +2 -3
- package/build/utils/loadEnvVariables.js +3 -3
- package/build/utils/prefixAppLoc.js +1 -1
- package/build/utils/saveLog.js +7 -7
- package/build/utils/setConstants.js +4 -4
- package/build/utils/setProjectDir.js +2 -2
- package/build/utils/spec/config.spec.js +80 -80
- package/build/utils/spec/displayResult.spec.js +7 -7
- package/build/utils/spec/file.spec.js +15 -15
- package/build/utils/spec/removeComments.spec.js +11 -11
- package/build/utils/spec/setConstants.spec.js +3 -3
- package/build/utils/spec/utils.spec.js +55 -55
- package/build/utils/test.js +59 -59
- package/build/utils/utils.js +47 -43
- package/package.json +11 -11
|
@@ -70,10 +70,14 @@ var __read = (this && this.__read) || function (o, n) {
|
|
|
70
70
|
}
|
|
71
71
|
return ar;
|
|
72
72
|
};
|
|
73
|
-
var __spreadArray = (this && this.__spreadArray) || function (to, from) {
|
|
74
|
-
for (var i = 0,
|
|
75
|
-
|
|
76
|
-
|
|
73
|
+
var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
|
|
74
|
+
if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) {
|
|
75
|
+
if (ar || !(i in from)) {
|
|
76
|
+
if (!ar) ar = Array.prototype.slice.call(from, 0, i);
|
|
77
|
+
ar[i] = from[i];
|
|
78
|
+
}
|
|
79
|
+
}
|
|
80
|
+
return to.concat(ar || Array.prototype.slice.call(from));
|
|
77
81
|
};
|
|
78
82
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
79
83
|
var addCommand_1 = require("../addCommand");
|
|
@@ -93,19 +97,19 @@ describe('AddCommand', function () {
|
|
|
93
97
|
.mockImplementation(function () { return Promise.resolve(true); });
|
|
94
98
|
});
|
|
95
99
|
it('should parse a simple sasjs add command', function () {
|
|
96
|
-
var args = __spreadArray(__spreadArray([], __read(defaultArgs)), ['add']);
|
|
100
|
+
var args = __spreadArray(__spreadArray([], __read(defaultArgs), false), ['add'], false);
|
|
97
101
|
var command = new addCommand_1.AddCommand(args);
|
|
98
102
|
expect(command.name).toEqual('add');
|
|
99
103
|
expect(command.insecure).toEqual(false);
|
|
100
104
|
});
|
|
101
105
|
it('should parse a sasjs add command with the insecure flag', function () {
|
|
102
|
-
var args = __spreadArray(__spreadArray([], __read(defaultArgs)), ['add', '--insecure']);
|
|
106
|
+
var args = __spreadArray(__spreadArray([], __read(defaultArgs), false), ['add', '--insecure'], false);
|
|
103
107
|
var command = new addCommand_1.AddCommand(args);
|
|
104
108
|
expect(command.name).toEqual('add');
|
|
105
109
|
expect(command.insecure).toEqual(true);
|
|
106
110
|
});
|
|
107
111
|
it('should parse a sasjs add command with the shorthand insecure flag', function () {
|
|
108
|
-
var args = __spreadArray(__spreadArray([], __read(defaultArgs)), ['add', '-i']);
|
|
112
|
+
var args = __spreadArray(__spreadArray([], __read(defaultArgs), false), ['add', '-i'], false);
|
|
109
113
|
var command = new addCommand_1.AddCommand(args);
|
|
110
114
|
expect(command.name).toEqual('add');
|
|
111
115
|
expect(command.insecure).toEqual(true);
|
|
@@ -115,7 +119,7 @@ describe('AddCommand', function () {
|
|
|
115
119
|
return __generator(this, function (_a) {
|
|
116
120
|
switch (_a.label) {
|
|
117
121
|
case 0:
|
|
118
|
-
args = __spreadArray(__spreadArray([], __read(defaultArgs)), ['add', '-i']);
|
|
122
|
+
args = __spreadArray(__spreadArray([], __read(defaultArgs), false), ['add', '-i'], false);
|
|
119
123
|
command = new addCommand_1.AddCommand(args);
|
|
120
124
|
return [4 /*yield*/, command.execute()];
|
|
121
125
|
case 1:
|
|
@@ -130,7 +134,7 @@ describe('AddCommand', function () {
|
|
|
130
134
|
return __generator(this, function (_a) {
|
|
131
135
|
switch (_a.label) {
|
|
132
136
|
case 0:
|
|
133
|
-
args = __spreadArray(__spreadArray([], __read(defaultArgs)), ['add']);
|
|
137
|
+
args = __spreadArray(__spreadArray([], __read(defaultArgs), false), ['add'], false);
|
|
134
138
|
command = new addCommand_1.AddCommand(args);
|
|
135
139
|
return [4 /*yield*/, command.execute()];
|
|
136
140
|
case 1:
|
|
@@ -164,28 +168,28 @@ describe('AddCommand - cred', function () {
|
|
|
164
168
|
jest.spyOn(process.logger, 'error');
|
|
165
169
|
});
|
|
166
170
|
it('should parse a simple sasjs add cred command', function () {
|
|
167
|
-
var args = __spreadArray(__spreadArray([], __read(defaultArgs)), ['add', 'cred']);
|
|
171
|
+
var args = __spreadArray(__spreadArray([], __read(defaultArgs), false), ['add', 'cred'], false);
|
|
168
172
|
var command = new addCommand_1.AddCommand(args);
|
|
169
173
|
expect(command.name).toEqual('add');
|
|
170
174
|
expect(command.subCommand).toEqual('cred');
|
|
171
175
|
expect(command.insecure).toEqual(false);
|
|
172
176
|
});
|
|
173
177
|
it('should parse a sasjs add cred command with the insecure flag', function () {
|
|
174
|
-
var args = __spreadArray(__spreadArray([], __read(defaultArgs)), ['add', 'cred', '--insecure']);
|
|
178
|
+
var args = __spreadArray(__spreadArray([], __read(defaultArgs), false), ['add', 'cred', '--insecure'], false);
|
|
175
179
|
var command = new addCommand_1.AddCommand(args);
|
|
176
180
|
expect(command.name).toEqual('add');
|
|
177
181
|
expect(command.subCommand).toEqual('cred');
|
|
178
182
|
expect(command.insecure).toEqual(true);
|
|
179
183
|
});
|
|
180
184
|
it('should parse a sasjs add cred command with the shorthand insecure flag', function () {
|
|
181
|
-
var args = __spreadArray(__spreadArray([], __read(defaultArgs)), ['add', 'cred', '-i']);
|
|
185
|
+
var args = __spreadArray(__spreadArray([], __read(defaultArgs), false), ['add', 'cred', '-i'], false);
|
|
182
186
|
var command = new addCommand_1.AddCommand(args);
|
|
183
187
|
expect(command.name).toEqual('add');
|
|
184
188
|
expect(command.subCommand).toEqual('cred');
|
|
185
189
|
expect(command.insecure).toEqual(true);
|
|
186
190
|
});
|
|
187
191
|
it('should parse a sasjs add cred command invoked with the alias sasjs auth', function () {
|
|
188
|
-
var args = __spreadArray(__spreadArray([], __read(defaultArgs)), ['auth', '-i']);
|
|
192
|
+
var args = __spreadArray(__spreadArray([], __read(defaultArgs), false), ['auth', '-i'], false);
|
|
189
193
|
var command = new addCommand_1.AddCommand(args);
|
|
190
194
|
expect(command.name).toEqual('add');
|
|
191
195
|
expect(command.insecure).toEqual(true);
|
|
@@ -195,7 +199,7 @@ describe('AddCommand - cred', function () {
|
|
|
195
199
|
return __generator(this, function (_a) {
|
|
196
200
|
switch (_a.label) {
|
|
197
201
|
case 0:
|
|
198
|
-
args = __spreadArray(__spreadArray([], __read(defaultArgs)), ['auth', '-t', 'test']);
|
|
202
|
+
args = __spreadArray(__spreadArray([], __read(defaultArgs), false), ['auth', '-t', 'test'], false);
|
|
199
203
|
command = new addCommand_1.AddCommand(args);
|
|
200
204
|
return [4 /*yield*/, command.execute()];
|
|
201
205
|
case 1:
|
|
@@ -210,7 +214,7 @@ describe('AddCommand - cred', function () {
|
|
|
210
214
|
return __generator(this, function (_a) {
|
|
211
215
|
switch (_a.label) {
|
|
212
216
|
case 0:
|
|
213
|
-
args = __spreadArray(__spreadArray([], __read(defaultArgs)), ['add', 'cred', '-t', 'test']);
|
|
217
|
+
args = __spreadArray(__spreadArray([], __read(defaultArgs), false), ['add', 'cred', '-t', 'test'], false);
|
|
214
218
|
command = new addCommand_1.AddCommand(args);
|
|
215
219
|
return [4 /*yield*/, command.execute()];
|
|
216
220
|
case 1:
|
|
@@ -225,7 +229,7 @@ describe('AddCommand - cred', function () {
|
|
|
225
229
|
return __generator(this, function (_a) {
|
|
226
230
|
switch (_a.label) {
|
|
227
231
|
case 0:
|
|
228
|
-
args = __spreadArray(__spreadArray([], __read(defaultArgs)), ['add', 'cred', '-t', 'test']);
|
|
232
|
+
args = __spreadArray(__spreadArray([], __read(defaultArgs), false), ['add', 'cred', '-t', 'test'], false);
|
|
229
233
|
command = new addCommand_1.AddCommand(args);
|
|
230
234
|
return [4 /*yield*/, command.execute()];
|
|
231
235
|
case 1:
|
|
@@ -241,7 +245,7 @@ describe('AddCommand - cred', function () {
|
|
|
241
245
|
return __generator(this, function (_a) {
|
|
242
246
|
switch (_a.label) {
|
|
243
247
|
case 0:
|
|
244
|
-
args = __spreadArray(__spreadArray([], __read(defaultArgs)), ['add', 'cred', '-t', 'test']);
|
|
248
|
+
args = __spreadArray(__spreadArray([], __read(defaultArgs), false), ['add', 'cred', '-t', 'test'], false);
|
|
245
249
|
jest
|
|
246
250
|
.spyOn(addCredentialModule, 'addCredential')
|
|
247
251
|
.mockImplementation(function () { return Promise.reject(new Error('Test Error')); });
|
|
@@ -260,7 +264,7 @@ describe('AddCommand - cred', function () {
|
|
|
260
264
|
return __generator(this, function (_a) {
|
|
261
265
|
switch (_a.label) {
|
|
262
266
|
case 0:
|
|
263
|
-
args = __spreadArray(__spreadArray([], __read(defaultArgs)), ['add', 'cred', '-t', 'test', '--insecure']);
|
|
267
|
+
args = __spreadArray(__spreadArray([], __read(defaultArgs), false), ['add', 'cred', '-t', 'test', '--insecure'], false);
|
|
264
268
|
command = new addCommand_1.AddCommand(args);
|
|
265
269
|
return [4 /*yield*/, command.execute()];
|
|
266
270
|
case 1:
|
|
@@ -275,7 +279,7 @@ describe('AddCommand - cred', function () {
|
|
|
275
279
|
return __generator(this, function (_a) {
|
|
276
280
|
switch (_a.label) {
|
|
277
281
|
case 0:
|
|
278
|
-
args = __spreadArray(__spreadArray([], __read(defaultArgs)), ['add', 'cred', '-t', 'test', '--insecure']);
|
|
282
|
+
args = __spreadArray(__spreadArray([], __read(defaultArgs), false), ['add', 'cred', '-t', 'test', '--insecure'], false);
|
|
279
283
|
jest
|
|
280
284
|
.spyOn(configUtils, 'findTargetInConfiguration')
|
|
281
285
|
.mockImplementation(function () { return Promise.resolve({ target: target, isLocal: false }); });
|
|
@@ -293,7 +297,7 @@ describe('AddCommand - cred', function () {
|
|
|
293
297
|
return __generator(this, function (_a) {
|
|
294
298
|
switch (_a.label) {
|
|
295
299
|
case 0:
|
|
296
|
-
args = __spreadArray(__spreadArray([], __read(defaultArgs)), ['add', 'cred', '-t', 'test']);
|
|
300
|
+
args = __spreadArray(__spreadArray([], __read(defaultArgs), false), ['add', 'cred', '-t', 'test'], false);
|
|
297
301
|
command = new addCommand_1.AddCommand(args);
|
|
298
302
|
return [4 /*yield*/, command.getTargetInfo()];
|
|
299
303
|
case 1:
|
|
@@ -84,7 +84,7 @@ describe('addCredential', function () {
|
|
|
84
84
|
appLoc: '/test',
|
|
85
85
|
contextName: utils_2.contextName
|
|
86
86
|
});
|
|
87
|
-
return [4 /*yield*/, addCredential_1.addCredential(target, false, types_1.TargetScope.Local)];
|
|
87
|
+
return [4 /*yield*/, (0, addCredential_1.addCredential)(target, false, types_1.TargetScope.Local)];
|
|
88
88
|
case 1:
|
|
89
89
|
_a.sent();
|
|
90
90
|
expect(inputModule.getAndValidateServerUrl).toHaveBeenCalled();
|
|
@@ -105,27 +105,27 @@ describe('addCredential', function () {
|
|
|
105
105
|
describe('validateTargetName', function () {
|
|
106
106
|
it('should return the target name if valid', function () {
|
|
107
107
|
var targetName = 'validTarget';
|
|
108
|
-
expect(addCredential_1.validateTargetName(targetName)).toEqual(targetName);
|
|
108
|
+
expect((0, addCredential_1.validateTargetName)(targetName)).toEqual(targetName);
|
|
109
109
|
});
|
|
110
110
|
it('should return the target name if valid', function () {
|
|
111
111
|
var targetName = '123validTarget';
|
|
112
|
-
expect(addCredential_1.validateTargetName(targetName)).toEqual(targetName);
|
|
112
|
+
expect((0, addCredential_1.validateTargetName)(targetName)).toEqual(targetName);
|
|
113
113
|
});
|
|
114
114
|
it('should return the target name if valid', function () {
|
|
115
115
|
var targetName = 'valid123Target';
|
|
116
|
-
expect(addCredential_1.validateTargetName(targetName)).toEqual(targetName);
|
|
116
|
+
expect((0, addCredential_1.validateTargetName)(targetName)).toEqual(targetName);
|
|
117
117
|
});
|
|
118
118
|
it('should return the target name if valid', function () {
|
|
119
119
|
var targetName = 'valid-target-123';
|
|
120
|
-
expect(addCredential_1.validateTargetName(targetName)).toEqual(targetName);
|
|
120
|
+
expect((0, addCredential_1.validateTargetName)(targetName)).toEqual(targetName);
|
|
121
121
|
});
|
|
122
122
|
it('should throw an error if the target name includes spaces', function () {
|
|
123
123
|
var targetName = 'test target name';
|
|
124
|
-
expect(function () { return addCredential_1.validateTargetName(targetName); }).toThrow('Target names cannot include spaces. Please try again with a valid target name.');
|
|
124
|
+
expect(function () { return (0, addCredential_1.validateTargetName)(targetName); }).toThrow('Target names cannot include spaces. Please try again with a valid target name.');
|
|
125
125
|
});
|
|
126
126
|
it('should throw an error if the target name contains invalid characters', function () {
|
|
127
127
|
var targetName = 'target#name!';
|
|
128
|
-
expect(function () { return addCredential_1.validateTargetName(targetName); }).toThrow('Target names can only contain alphanumeric characters. Please try again with a valid target name.');
|
|
128
|
+
expect(function () { return (0, addCredential_1.validateTargetName)(targetName); }).toThrow('Target names can only contain alphanumeric characters. Please try again with a valid target name.');
|
|
129
129
|
});
|
|
130
130
|
});
|
|
131
131
|
describe('getTokens', function () {
|
|
@@ -147,7 +147,7 @@ describe('getTokens', function () {
|
|
|
147
147
|
jest.spyOn(authUtils, 'getNewAccessToken').mockImplementation(function () {
|
|
148
148
|
throw new Error('Invalid credentials');
|
|
149
149
|
});
|
|
150
|
-
return [4 /*yield*/, expect(addCredential_1.getTokens(testTarget, client, secret)).rejects.toThrow()];
|
|
150
|
+
return [4 /*yield*/, expect((0, addCredential_1.getTokens)(testTarget, client, secret)).rejects.toThrow()];
|
|
151
151
|
case 1:
|
|
152
152
|
_a.sent();
|
|
153
153
|
return [2 /*return*/];
|
|
@@ -167,7 +167,7 @@ describe('getTokens', function () {
|
|
|
167
167
|
refresh_token: 'r3fr3sh'
|
|
168
168
|
});
|
|
169
169
|
});
|
|
170
|
-
return [4 /*yield*/, addCredential_1.getTokens(testTarget, clientId, secret)];
|
|
170
|
+
return [4 /*yield*/, (0, addCredential_1.getTokens)(testTarget, clientId, secret)];
|
|
171
171
|
case 1:
|
|
172
172
|
authResponse = _a.sent();
|
|
173
173
|
expect(authResponse.access_token).toBeTruthy();
|
|
@@ -188,13 +188,13 @@ describe('createEnvFile', function () {
|
|
|
188
188
|
secret = 's3cr3t';
|
|
189
189
|
accessToken = 't0k3n';
|
|
190
190
|
refreshToken = 'r3fr35h';
|
|
191
|
-
expectedEnvFileContent = "CLIENT="
|
|
191
|
+
expectedEnvFileContent = "CLIENT=".concat(clientId, "\nSECRET=").concat(secret, "\nACCESS_TOKEN=").concat(accessToken, "\nREFRESH_TOKEN=").concat(refreshToken, "\n");
|
|
192
192
|
process.projectDir = '.';
|
|
193
|
-
expectedEnvFilePath = path_1.default.join('.', ".env."
|
|
193
|
+
expectedEnvFilePath = path_1.default.join('.', ".env.".concat(targetName));
|
|
194
194
|
createSpy = jest
|
|
195
195
|
.spyOn(fileUtils, 'createFile')
|
|
196
196
|
.mockImplementation(function () { return Promise.resolve(); });
|
|
197
|
-
return [4 /*yield*/, addCredential_1.createEnvFileForViya(targetName, clientId, secret, accessToken, refreshToken)];
|
|
197
|
+
return [4 /*yield*/, (0, addCredential_1.createEnvFileForViya)(targetName, clientId, secret, accessToken, refreshToken)];
|
|
198
198
|
case 1:
|
|
199
199
|
_a.sent();
|
|
200
200
|
expect(createSpy).toHaveBeenCalledWith(expectedEnvFilePath, expectedEnvFileContent);
|
|
@@ -210,14 +210,14 @@ describe('getDefaultValues', function () {
|
|
|
210
210
|
it('should return values for client and secret if available', function () {
|
|
211
211
|
process.env.CLIENT = 'cl13nt';
|
|
212
212
|
process.env.SECRET = 's3cr3t';
|
|
213
|
-
var defaultValues = input_1.getDefaultValues('test');
|
|
213
|
+
var defaultValues = (0, input_1.getDefaultValues)('test');
|
|
214
214
|
expect(defaultValues.client).toEqual('cl13nt');
|
|
215
215
|
expect(defaultValues.secret).toEqual('s3cr3t');
|
|
216
216
|
});
|
|
217
217
|
it('should return empty strings for client and secret if unavailable', function () {
|
|
218
218
|
process.env.CLIENT = undefined;
|
|
219
219
|
process.env.SECRET = undefined;
|
|
220
|
-
var defaultValues = input_1.getDefaultValues('test');
|
|
220
|
+
var defaultValues = (0, input_1.getDefaultValues)('test');
|
|
221
221
|
expect(defaultValues.client).toEqual('');
|
|
222
222
|
expect(defaultValues.secret).toEqual('');
|
|
223
223
|
});
|
|
@@ -78,17 +78,17 @@ var config_1 = require("../../../utils/config");
|
|
|
78
78
|
var targetScope_1 = require("../../../types/targetScope");
|
|
79
79
|
var test_1 = require("../../../utils/test");
|
|
80
80
|
describe('addTarget', function () {
|
|
81
|
-
var appName = "cli-tests-add-"
|
|
82
|
-
var viyaTargetName = "test-viya-"
|
|
83
|
-
var sas9TargetName = "test-sas9-"
|
|
84
|
-
var sasjsTargetName = "test-server-"
|
|
81
|
+
var appName = "cli-tests-add-".concat((0, utils_1.generateTimestamp)());
|
|
82
|
+
var viyaTargetName = "test-viya-".concat((0, utils_1.generateTimestamp)());
|
|
83
|
+
var sas9TargetName = "test-sas9-".concat((0, utils_1.generateTimestamp)());
|
|
84
|
+
var sasjsTargetName = "test-server-".concat((0, utils_1.generateTimestamp)());
|
|
85
85
|
var globalTestTarget;
|
|
86
86
|
beforeAll(function () { return __awaiter(void 0, void 0, void 0, function () {
|
|
87
87
|
return __generator(this, function (_a) {
|
|
88
88
|
switch (_a.label) {
|
|
89
89
|
case 0:
|
|
90
90
|
dotenv_1.default.config();
|
|
91
|
-
return [4 /*yield*/, test_1.createTestMinimalApp(__dirname, appName)];
|
|
91
|
+
return [4 /*yield*/, (0, test_1.createTestMinimalApp)(__dirname, appName)];
|
|
92
92
|
case 1:
|
|
93
93
|
_a.sent();
|
|
94
94
|
return [2 /*return*/];
|
|
@@ -98,10 +98,10 @@ describe('addTarget', function () {
|
|
|
98
98
|
afterAll(function () { return __awaiter(void 0, void 0, void 0, function () {
|
|
99
99
|
return __generator(this, function (_a) {
|
|
100
100
|
switch (_a.label) {
|
|
101
|
-
case 0: return [4 /*yield*/, test_1.removeTestApp(__dirname, appName)];
|
|
101
|
+
case 0: return [4 /*yield*/, (0, test_1.removeTestApp)(__dirname, appName)];
|
|
102
102
|
case 1:
|
|
103
103
|
_a.sent();
|
|
104
|
-
return [4 /*yield*/, config_1.removeFromGlobalConfig(viyaTargetName)];
|
|
104
|
+
return [4 /*yield*/, (0, config_1.removeFromGlobalConfig)(viyaTargetName)];
|
|
105
105
|
case 2:
|
|
106
106
|
_a.sent();
|
|
107
107
|
return [2 /*return*/];
|
|
@@ -111,7 +111,7 @@ describe('addTarget', function () {
|
|
|
111
111
|
beforeEach(function () { return __awaiter(void 0, void 0, void 0, function () {
|
|
112
112
|
return __generator(this, function (_a) {
|
|
113
113
|
switch (_a.label) {
|
|
114
|
-
case 0: return [4 /*yield*/, test_1.createTestGlobalTarget("test-target-global-"
|
|
114
|
+
case 0: return [4 /*yield*/, (0, test_1.createTestGlobalTarget)("test-target-global-".concat((0, utils_1.generateTimestamp)()), "/Public/app/cli-tests/".concat(appName))];
|
|
115
115
|
case 1:
|
|
116
116
|
globalTestTarget = _a.sent();
|
|
117
117
|
return [2 /*return*/];
|
|
@@ -121,7 +121,7 @@ describe('addTarget', function () {
|
|
|
121
121
|
afterEach(function () { return __awaiter(void 0, void 0, void 0, function () {
|
|
122
122
|
return __generator(this, function (_a) {
|
|
123
123
|
switch (_a.label) {
|
|
124
|
-
case 0: return [4 /*yield*/, config_1.removeFromGlobalConfig(globalTestTarget.name)];
|
|
124
|
+
case 0: return [4 /*yield*/, (0, config_1.removeFromGlobalConfig)(globalTestTarget.name)];
|
|
125
125
|
case 1:
|
|
126
126
|
_a.sent();
|
|
127
127
|
return [2 /*return*/];
|
|
@@ -155,7 +155,7 @@ describe('addTarget', function () {
|
|
|
155
155
|
target: new utils_1.Target(commonFields)
|
|
156
156
|
});
|
|
157
157
|
});
|
|
158
|
-
return [4 /*yield*/, expect(addTarget_1.addTarget(false)).resolves.toEqual(true)];
|
|
158
|
+
return [4 /*yield*/, expect((0, addTarget_1.addTarget)(false)).resolves.toEqual(true)];
|
|
159
159
|
case 1:
|
|
160
160
|
_a.sent();
|
|
161
161
|
return [4 /*yield*/, verifyTarget(commonFields, true)];
|
|
@@ -191,7 +191,7 @@ describe('addTarget', function () {
|
|
|
191
191
|
target: new utils_1.Target(commonFields)
|
|
192
192
|
});
|
|
193
193
|
});
|
|
194
|
-
return [4 /*yield*/, expect(addTarget_1.addTarget(false)).resolves.toEqual(true)];
|
|
194
|
+
return [4 /*yield*/, expect((0, addTarget_1.addTarget)(false)).resolves.toEqual(true)];
|
|
195
195
|
case 1:
|
|
196
196
|
_a.sent();
|
|
197
197
|
return [4 /*yield*/, verifyTarget(commonFields, true)];
|
|
@@ -228,7 +228,7 @@ describe('addTarget', function () {
|
|
|
228
228
|
password: 'Some_Random_Password'
|
|
229
229
|
});
|
|
230
230
|
});
|
|
231
|
-
return [4 /*yield*/, expect(addTarget_1.addTarget(false)).resolves.toEqual(true)];
|
|
231
|
+
return [4 /*yield*/, expect((0, addTarget_1.addTarget)(false)).resolves.toEqual(true)];
|
|
232
232
|
case 1:
|
|
233
233
|
_a.sent();
|
|
234
234
|
return [4 /*yield*/, verifyTarget(commonFields, true)];
|
|
@@ -265,7 +265,7 @@ describe('addTarget', function () {
|
|
|
265
265
|
target: new utils_1.Target(commonFields)
|
|
266
266
|
});
|
|
267
267
|
});
|
|
268
|
-
return [4 /*yield*/, expect(addTarget_1.addTarget(false)).resolves.toEqual(true)];
|
|
268
|
+
return [4 /*yield*/, expect((0, addTarget_1.addTarget)(false)).resolves.toEqual(true)];
|
|
269
269
|
case 1:
|
|
270
270
|
_a.sent();
|
|
271
271
|
return [4 /*yield*/, verifyTarget(commonFields, false)];
|
|
@@ -281,7 +281,7 @@ describe('addTarget', function () {
|
|
|
281
281
|
switch (_a.label) {
|
|
282
282
|
case 0:
|
|
283
283
|
buildSourceFolder = process.sasjsConstants.buildSourceFolder;
|
|
284
|
-
return [4 /*yield*/, config_1.getConfiguration(path_1.default.join(buildSourceFolder, 'sasjs', 'sasjsconfig.json'))];
|
|
284
|
+
return [4 /*yield*/, (0, config_1.getConfiguration)(path_1.default.join(buildSourceFolder, 'sasjs', 'sasjsconfig.json'))];
|
|
285
285
|
case 1:
|
|
286
286
|
config = _a.sent();
|
|
287
287
|
targetJson = (config.targets || []).find(function (t) { return t.name === 'viya'; });
|
|
@@ -307,7 +307,7 @@ describe('addTarget', function () {
|
|
|
307
307
|
target: new utils_1.Target(__assign(__assign({}, targetJson), commonFields))
|
|
308
308
|
});
|
|
309
309
|
});
|
|
310
|
-
return [4 /*yield*/, expect(addTarget_1.addTarget(false)).resolves.toEqual(true)];
|
|
310
|
+
return [4 /*yield*/, expect((0, addTarget_1.addTarget)(false)).resolves.toEqual(true)];
|
|
311
311
|
case 2:
|
|
312
312
|
_a.sent();
|
|
313
313
|
return [4 /*yield*/, verifyTarget(commonFields, true)];
|
|
@@ -323,7 +323,7 @@ describe('addTarget', function () {
|
|
|
323
323
|
switch (_a.label) {
|
|
324
324
|
case 0:
|
|
325
325
|
buildSourceFolder = process.sasjsConstants.buildSourceFolder;
|
|
326
|
-
return [4 /*yield*/, config_1.getConfiguration(path_1.default.join(buildSourceFolder, 'sasjs', 'sasjsconfig.json'))];
|
|
326
|
+
return [4 /*yield*/, (0, config_1.getConfiguration)(path_1.default.join(buildSourceFolder, 'sasjs', 'sasjsconfig.json'))];
|
|
327
327
|
case 1:
|
|
328
328
|
config = _a.sent();
|
|
329
329
|
target = (config.targets || []).find(function (t) { return t.name === 'sas9'; });
|
|
@@ -349,7 +349,7 @@ describe('addTarget', function () {
|
|
|
349
349
|
password: 'Some_Random_Password'
|
|
350
350
|
});
|
|
351
351
|
});
|
|
352
|
-
return [4 /*yield*/, expect(addTarget_1.addTarget(false)).resolves.toEqual(true)];
|
|
352
|
+
return [4 /*yield*/, expect((0, addTarget_1.addTarget)(false)).resolves.toEqual(true)];
|
|
353
353
|
case 2:
|
|
354
354
|
_a.sent();
|
|
355
355
|
return [4 /*yield*/, verifyTarget(commonFields, true)];
|
|
@@ -365,7 +365,7 @@ describe('addTarget', function () {
|
|
|
365
365
|
switch (_a.label) {
|
|
366
366
|
case 0:
|
|
367
367
|
buildSourceFolder = process.sasjsConstants.buildSourceFolder;
|
|
368
|
-
return [4 /*yield*/, config_1.getConfiguration(path_1.default.join(buildSourceFolder, 'sasjs', 'sasjsconfig.json'))];
|
|
368
|
+
return [4 /*yield*/, (0, config_1.getConfiguration)(path_1.default.join(buildSourceFolder, 'sasjs', 'sasjsconfig.json'))];
|
|
369
369
|
case 1:
|
|
370
370
|
config = _a.sent();
|
|
371
371
|
targetJson = (config.targets || []).find(function (t) { return t.name === 'server'; });
|
|
@@ -390,7 +390,7 @@ describe('addTarget', function () {
|
|
|
390
390
|
target: new utils_1.Target(__assign(__assign({}, targetJson), commonFields))
|
|
391
391
|
});
|
|
392
392
|
});
|
|
393
|
-
return [4 /*yield*/, expect(addTarget_1.addTarget(false)).resolves.toEqual(true)];
|
|
393
|
+
return [4 /*yield*/, expect((0, addTarget_1.addTarget)(false)).resolves.toEqual(true)];
|
|
394
394
|
case 2:
|
|
395
395
|
_a.sent();
|
|
396
396
|
return [4 /*yield*/, verifyTarget(commonFields, true)];
|
|
@@ -427,7 +427,7 @@ describe('addTarget', function () {
|
|
|
427
427
|
target: new utils_1.Target(__assign(__assign({}, globalTestTarget), commonFields))
|
|
428
428
|
});
|
|
429
429
|
});
|
|
430
|
-
return [4 /*yield*/, expect(addTarget_1.addTarget(false)).resolves.toEqual(true)];
|
|
430
|
+
return [4 /*yield*/, expect((0, addTarget_1.addTarget)(false)).resolves.toEqual(true)];
|
|
431
431
|
case 1:
|
|
432
432
|
_a.sent();
|
|
433
433
|
return [4 /*yield*/, verifyTarget(commonFields, false)];
|
|
@@ -446,11 +446,11 @@ function verifyTarget(commonFields, isLocal) {
|
|
|
446
446
|
case 0:
|
|
447
447
|
if (!isLocal) return [3 /*break*/, 2];
|
|
448
448
|
buildSourceFolder = process.sasjsConstants.buildSourceFolder;
|
|
449
|
-
return [4 /*yield*/, config_1.getConfiguration(path_1.default.join(buildSourceFolder, 'sasjs', 'sasjsconfig.json'))];
|
|
449
|
+
return [4 /*yield*/, (0, config_1.getConfiguration)(path_1.default.join(buildSourceFolder, 'sasjs', 'sasjsconfig.json'))];
|
|
450
450
|
case 1:
|
|
451
451
|
config = _a.sent();
|
|
452
452
|
return [3 /*break*/, 4];
|
|
453
|
-
case 2: return [4 /*yield*/, config_1.getGlobalRcFile()];
|
|
453
|
+
case 2: return [4 /*yield*/, (0, config_1.getGlobalRcFile)()];
|
|
454
454
|
case 3:
|
|
455
455
|
config = _a.sent();
|
|
456
456
|
_a.label = 4;
|