@zowe/cli 8.32.2 → 8.33.0
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/lib/daemon/DaemonDecider.d.ts.map +1 -1
- package/lib/daemon/DaemonDecider.js +18 -3
- package/lib/daemon/DaemonDecider.js.map +1 -1
- package/lib/daemon/DaemonUtil.d.ts.map +1 -1
- package/lib/daemon/DaemonUtil.js +14 -4
- package/lib/daemon/DaemonUtil.js.map +1 -1
- package/lib/daemon/enable/Enable.handler.d.ts +1 -1
- package/lib/daemon/enable/Enable.handler.d.ts.map +1 -1
- package/lib/daemon/enable/Enable.handler.js +24 -6
- package/lib/daemon/enable/Enable.handler.js.map +1 -1
- package/lib/zosfiles/edit/Edit.handler.d.ts.map +1 -1
- package/lib/zosfiles/edit/Edit.handler.js +9 -0
- package/lib/zosfiles/edit/Edit.handler.js.map +1 -1
- package/lib/zosfiles/edit/Edit.utils.d.ts +3 -2
- package/lib/zosfiles/edit/Edit.utils.d.ts.map +1 -1
- package/lib/zosfiles/edit/Edit.utils.js +7 -1
- package/lib/zosfiles/edit/Edit.utils.js.map +1 -1
- package/lib/zostso/issue/command/Command.definition.d.ts.map +1 -1
- package/lib/zostso/issue/command/Command.definition.js +21 -11
- package/lib/zostso/issue/command/Command.definition.js.map +1 -1
- package/lib/zostso/issue/command/Command.handler.d.ts.map +1 -1
- package/lib/zostso/issue/command/Command.handler.js +5 -2
- package/lib/zostso/issue/command/Command.handler.js.map +1 -1
- package/npm-shrinkwrap.json +88 -54
- package/package.json +14 -14
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"DaemonDecider.d.ts","sourceRoot":"","sources":["../../src/daemon/DaemonDecider.ts"],"names":[],"mappings":"AA2BA;;;;GAIG;AACH,qBAAa,aAAa;IA8CV,OAAO,CAAC,MAAM;IA7C1B;;;;;OAKG;IACH,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,UAAU,CAAc;IAEhD;;;;;OAKG;IACH,OAAO,CAAC,OAAO,CAAa;IAE5B;;;;;OAKG;IACH,OAAO,CAAC,OAAO,CAAS;IAExB;;;;;OAKG;IACH,OAAO,CAAC,KAAK,CAAS;IAEtB;;;;;OAKG;IACH,OAAO,CAAC,YAAY,CAAU;IAE9B;;;;OAIG;gBACiB,MAAM,EAAE,MAAM,EAAE;IAEpC;;;OAGG;IACI,IAAI;IAeX;;;;OAIG;IACI,cAAc;
|
|
1
|
+
{"version":3,"file":"DaemonDecider.d.ts","sourceRoot":"","sources":["../../src/daemon/DaemonDecider.ts"],"names":[],"mappings":"AA2BA;;;;GAIG;AACH,qBAAa,aAAa;IA8CV,OAAO,CAAC,MAAM;IA7C1B;;;;;OAKG;IACH,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,UAAU,CAAc;IAEhD;;;;;OAKG;IACH,OAAO,CAAC,OAAO,CAAa;IAE5B;;;;;OAKG;IACH,OAAO,CAAC,OAAO,CAAS;IAExB;;;;;OAKG;IACH,OAAO,CAAC,KAAK,CAAS;IAEtB;;;;;OAKG;IACH,OAAO,CAAC,YAAY,CAAU;IAE9B;;;;OAIG;gBACiB,MAAM,EAAE,MAAM,EAAE;IAEpC;;;OAGG;IACI,IAAI;IAeX;;;;OAIG;IACI,cAAc;IAgCrB;;;;;;OAMG;IACH,OAAO,CAAC,eAAe;IAyBvB;;;;OAIG;IACH,OAAO,CAAC,KAAK;IAOb;;;;;OAKG;IACH,OAAO,CAAC,KAAK;IAKb;;;;OAIG;IACH,OAAO,CAAC,YAAY;IAiCpB;;;;OAIG;IACH,OAAO,KAAK,WAAW,GAEtB;IAED;;;;OAIG;IACH,OAAO,KAAK,WAAW,QAEtB;CACJ"}
|
|
@@ -67,6 +67,18 @@ class DaemonDecider {
|
|
|
67
67
|
});
|
|
68
68
|
this.mServer.maxConnections = 1;
|
|
69
69
|
this.mServer.listen(this.mSocket, () => {
|
|
70
|
+
// On POSIX systems the socket is a file on disk that is created with
|
|
71
|
+
// umask-derived permissions. Restrict it to the owner so that other
|
|
72
|
+
// local users cannot connect to our daemon and run commands as us.
|
|
73
|
+
// On Windows the socket is a named pipe (not a file), so this is skipped.
|
|
74
|
+
if (process.platform !== "win32") {
|
|
75
|
+
try {
|
|
76
|
+
imperative_1.IO.giveAccessOnlyToOwner(this.mSocket);
|
|
77
|
+
}
|
|
78
|
+
catch (err) {
|
|
79
|
+
imperative_1.Imperative.api.appLogger.error(`Unable to restrict access to daemon socket ${this.mSocket}: ${err.message}`);
|
|
80
|
+
}
|
|
81
|
+
}
|
|
70
82
|
imperative_1.Imperative.api.appLogger.debug(`daemon server bound ${this.mSocket}`);
|
|
71
83
|
new imperative_1.Console(`info`).info(`server bound ${this.mSocket}`);
|
|
72
84
|
});
|
|
@@ -90,9 +102,12 @@ class DaemonDecider {
|
|
|
90
102
|
const pidFilePath = path.join(DaemonUtil_1.DaemonUtil.getDaemonDir(), "daemon_pid.json");
|
|
91
103
|
const pidForUserStr = JSON.stringify(pidForUser, null, 2);
|
|
92
104
|
try {
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
fs.
|
|
105
|
+
// Create the file with owner-only permissions up front to avoid a brief
|
|
106
|
+
// window where it exists with default (umask-derived) permissions.
|
|
107
|
+
fs.writeFileSync(pidFilePath, pidForUserStr, { mode: 0o600 });
|
|
108
|
+
// Enforce owner-only access cross-platform (icacls on Windows, chmod on POSIX),
|
|
109
|
+
// and in case the file already existed with looser permissions.
|
|
110
|
+
imperative_1.IO.giveAccessOnlyToOwner(pidFilePath);
|
|
96
111
|
}
|
|
97
112
|
catch (err) {
|
|
98
113
|
throw new Error("Failed to write file '" + pidFilePath + "'\nDetails = " + err.message);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"DaemonDecider.js","sourceRoot":"","sources":["../../src/daemon/DaemonDecider.ts"],"names":[],"mappings":";AAAA;;;;;;;;;EASE;;;AAEF,yBAAyB;AACzB,2BAA2B;AAC3B,yBAAyB;AACzB,6BAA6B;AAC7B,iDAA2D;AAC3D,iDAA8C;AAC9C,6CAA0C;AAI1C,2DAA2D;AAC3D,6DAA6D;AAC7D,2HAA2H;AAC3H,wBAAwB;AACxB,iCAAiC;AAEjC;;;;GAIG;AACH,MAAa,aAAa;IAyCtB;;;;OAIG;IACH,YAAoB,MAAgB;QAAhB,WAAM,GAAN,MAAM,CAAU;IAAI,CAAC;IAEzC;;;OAGG;IACI,IAAI;QAEP,IAAI,CAAC,YAAY,EAAE,CAAC;QACpB,IAAI,IAAI,CAAC,WAAW,EAAE,CAAC;YACnB,IAAI,CAAC,OAAO,GAAG,GAAG,CAAC,YAAY,CAAC,CAAC,CAAC,EAAE,EAAE;gBAClC,IAAI,2BAAY,CAAC,CAAC,EAAE,IAAI,CAAC,OAAO,EAAE,IAAI,CAAC,KAAK,CAAC,CAAC,GAAG,EAAE,CAAC;YACxD,CAAC,CAAC,CAAC;YAEH,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC,OAAO,EAAE,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;YAChD,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC,OAAO,EAAE,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;YAEhD,IAAI,CAAC,eAAe,EAAE,CAAC;QAC3B,CAAC;IACL,CAAC;IAED;;;;OAIG;IACI,cAAc;QACjB,IAAI,IAAI,CAAC,OAAO,EAAE,CAAC;YACf,IAAI,OAAO,CAAC,QAAQ,KAAK,OAAO,IAAI,eAAE,CAAC,UAAU,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC;gBAC9D,eAAE,CAAC,UAAU,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;YAChC,CAAC;YAED,CAAC,MAAM,EAAE,QAAQ,EAAE,SAAS,EAAE,SAAS,CAAC,CAAC,OAAO,CAAC,CAAC,SAAc,EAAE,EAAE;gBAChE,OAAO,CAAC,EAAE,CAAC,SAAS,EAAE,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC,CAAC;YACvD,CAAC,CAAC,CAAC;YAEH,IAAI,CAAC,OAAO,CAAC,cAAc,GAAG,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"DaemonDecider.js","sourceRoot":"","sources":["../../src/daemon/DaemonDecider.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"DaemonUtil.d.ts","sourceRoot":"","sources":["../../src/daemon/DaemonUtil.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"DaemonUtil.d.ts","sourceRoot":"","sources":["../../src/daemon/DaemonUtil.ts"],"names":[],"mappings":"AAeA;;;;GAIG;AACH,qBAAa,UAAU;IACnB;;;;;OAKG;WACW,YAAY,IAAI,MAAM;CA6BvC"}
|
package/lib/daemon/DaemonUtil.js
CHANGED
|
@@ -11,7 +11,6 @@
|
|
|
11
11
|
*/
|
|
12
12
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
13
13
|
exports.DaemonUtil = void 0;
|
|
14
|
-
const fs = require("fs");
|
|
15
14
|
const os = require("os");
|
|
16
15
|
const path = require("path");
|
|
17
16
|
const imperative_1 = require("@zowe/imperative");
|
|
@@ -38,11 +37,22 @@ class DaemonUtil {
|
|
|
38
37
|
// our default location.
|
|
39
38
|
daemonDir = path.join(os.homedir(), ".zowe", "daemon");
|
|
40
39
|
}
|
|
41
|
-
if (
|
|
40
|
+
if (imperative_1.IO.existsSync(daemonDir)) {
|
|
41
|
+
// The directory already exists. Re-restrict it to the current user in case
|
|
42
|
+
// it was previously created with permissions that allow group/other access.
|
|
43
|
+
try {
|
|
44
|
+
imperative_1.IO.giveAccessOnlyToOwner(daemonDir);
|
|
45
|
+
}
|
|
46
|
+
catch (err) {
|
|
47
|
+
throw new Error("Failed to restrict access to directory '" + daemonDir + "'\nDetails = " + err.message);
|
|
48
|
+
}
|
|
49
|
+
}
|
|
50
|
+
else {
|
|
42
51
|
try {
|
|
43
52
|
imperative_1.IO.createDirSync(daemonDir);
|
|
44
|
-
|
|
45
|
-
|
|
53
|
+
// Restrict access to the daemon directory to only the current user.
|
|
54
|
+
// On Windows this sets an owner-only ACL; on POSIX it sets mode 0o700.
|
|
55
|
+
imperative_1.IO.giveAccessOnlyToOwner(daemonDir);
|
|
46
56
|
}
|
|
47
57
|
catch (err) {
|
|
48
58
|
throw new Error("Failed to create directory '" + daemonDir + "'\nDetails = " + err.message);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"DaemonUtil.js","sourceRoot":"","sources":["../../src/daemon/DaemonUtil.ts"],"names":[],"mappings":";AAAA;;;;;;;;;EASE;;;AAEF,yBAAyB;AACzB,
|
|
1
|
+
{"version":3,"file":"DaemonUtil.js","sourceRoot":"","sources":["../../src/daemon/DaemonUtil.ts"],"names":[],"mappings":";AAAA;;;;;;;;;EASE;;;AAEF,yBAAyB;AACzB,6BAA6B;AAC7B,iDAAsC;AAEtC;;;;GAIG;AACH,MAAa,UAAU;IACnB;;;;;OAKG;IACI,MAAM,CAAC,YAAY;;QACtB,IAAI,SAAiB,CAAC;QACtB,IAAI,CAAA,MAAA,MAAA,OAAO,CAAC,GAAG,0CAAE,eAAe,0CAAE,MAAM,IAAG,CAAC,EAAE,CAAC;YAC3C,mEAAmE;YACnE,SAAS,GAAG,OAAO,CAAC,GAAG,CAAC,eAAe,CAAC;QAC5C,CAAC;aAAM,CAAC;YACJ,wBAAwB;YACxB,SAAS,GAAG,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,OAAO,EAAE,EAAE,OAAO,EAAE,QAAQ,CAAC,CAAC;QAC3D,CAAC;QACD,IAAI,eAAE,CAAC,UAAU,CAAC,SAAS,CAAC,EAAE,CAAC;YAC3B,2EAA2E;YAC3E,4EAA4E;YAC5E,IAAI,CAAC;gBACD,eAAE,CAAC,qBAAqB,CAAC,SAAS,CAAC,CAAC;YACxC,CAAC;YAAC,OAAM,GAAG,EAAE,CAAC;gBACV,MAAM,IAAI,KAAK,CAAC,0CAA0C,GAAG,SAAS,GAAG,eAAe,GAAG,GAAG,CAAC,OAAO,CAAC,CAAC;YAC5G,CAAC;QACL,CAAC;aAAM,CAAC;YACJ,IAAI,CAAC;gBACD,eAAE,CAAC,aAAa,CAAC,SAAS,CAAC,CAAC;gBAC5B,oEAAoE;gBACpE,uEAAuE;gBACvE,eAAE,CAAC,qBAAqB,CAAC,SAAS,CAAC,CAAC;YACxC,CAAC;YAAC,OAAM,GAAG,EAAE,CAAC;gBACV,MAAM,IAAI,KAAK,CAAC,8BAA8B,GAAG,SAAS,GAAG,eAAe,GAAG,GAAG,CAAC,OAAO,CAAC,CAAC;YAChG,CAAC;QACL,CAAC;QACD,OAAO,SAAS,CAAC;IACrB,CAAC;CACJ;AApCD,gCAoCC"}
|
|
@@ -46,7 +46,7 @@ export default class EnableDaemonHandler implements ICommandHandler {
|
|
|
46
46
|
/**
|
|
47
47
|
* Add our .zowe/bin directory to the user's PATH.
|
|
48
48
|
*
|
|
49
|
-
* @param pathToZoweBin The absolute path to our .zowe/bin
|
|
49
|
+
* @param pathToZoweBin The absolute path to our .zowe/bin directory.
|
|
50
50
|
*
|
|
51
51
|
* @param {IDaemonEnableQuestions} userQuestions Questions for user (if permitted)
|
|
52
52
|
*
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Enable.handler.d.ts","sourceRoot":"","sources":["../../../src/daemon/enable/Enable.handler.ts"],"names":[],"mappings":"AAgBA,OAAO,EACO,eAAe,EAAE,kBAAkB,EAEhD,MAAM,kBAAkB,CAAC;AAI1B;;;;;GAKG;AACH,MAAM,CAAC,OAAO,OAAO,mBAAoB,YAAW,eAAe;IAC/D,OAAO,CAAC,MAAM,CAAC,kBAAkB,CAAgF;IAEjH;;;;;;;OAOG;IACU,OAAO,CAAC,SAAS,EAAE,kBAAkB,GAAG,OAAO,CAAC,IAAI,CAAC;IAsBlE;;;;;;;;;;OAUG;YACW,YAAY;
|
|
1
|
+
{"version":3,"file":"Enable.handler.d.ts","sourceRoot":"","sources":["../../../src/daemon/enable/Enable.handler.ts"],"names":[],"mappings":"AAgBA,OAAO,EACO,eAAe,EAAE,kBAAkB,EAEhD,MAAM,kBAAkB,CAAC;AAI1B;;;;;GAKG;AACH,MAAM,CAAC,OAAO,OAAO,mBAAoB,YAAW,eAAe;IAC/D,OAAO,CAAC,MAAM,CAAC,kBAAkB,CAAgF;IAEjH;;;;;;;OAOG;IACU,OAAO,CAAC,SAAS,EAAE,kBAAkB,GAAG,OAAO,CAAC,IAAI,CAAC;IAsBlE;;;;;;;;;;OAUG;YACW,YAAY;IAgI1B;;;;;;;;;;;;;OAaG;YACW,QAAQ;IA2BtB;;;;;;;;;OASG;YACW,gBAAgB;IA6C9B;;;;;;;OAOG;YACW,mBAAmB;CAoCpC"}
|
|
@@ -116,11 +116,24 @@ class EnableDaemonHandler {
|
|
|
116
116
|
msg: `The existing file '${pathToZoweBin}' must be a directory.`
|
|
117
117
|
});
|
|
118
118
|
}
|
|
119
|
+
// The directory already exists. Re-restrict it to the current user in case
|
|
120
|
+
// it was previously created with permissions that allow group/other access.
|
|
121
|
+
try {
|
|
122
|
+
imperative_1.IO.giveAccessOnlyToOwner(pathToZoweBin);
|
|
123
|
+
}
|
|
124
|
+
catch (err) {
|
|
125
|
+
throw new imperative_1.ImperativeError({
|
|
126
|
+
msg: `Unable to restrict access to directory '${pathToZoweBin}'.\nReason: ${err}`
|
|
127
|
+
});
|
|
128
|
+
}
|
|
119
129
|
}
|
|
120
130
|
else {
|
|
121
131
|
// create the directory
|
|
122
132
|
try {
|
|
123
133
|
imperative_1.IO.createDirSync(pathToZoweBin);
|
|
134
|
+
// Restrict the bin directory to the current user only.
|
|
135
|
+
// On Windows this sets an owner-only ACL; on POSIX it sets mode 0o700.
|
|
136
|
+
imperative_1.IO.giveAccessOnlyToOwner(pathToZoweBin);
|
|
124
137
|
}
|
|
125
138
|
catch (err) {
|
|
126
139
|
throw new imperative_1.ImperativeError({
|
|
@@ -140,6 +153,11 @@ class EnableDaemonHandler {
|
|
|
140
153
|
// display the version of the executable
|
|
141
154
|
let userInfoMsg = "Zowe CLI native executable version = ";
|
|
142
155
|
const zoweExePath = nodeJsPath.resolve(pathToZoweBin, exeFileName);
|
|
156
|
+
// Restrict the extracted executable to the current user only. On Windows this sets
|
|
157
|
+
// an owner-only ACL; on POSIX it enforces 0o700 regardless of the process umask.
|
|
158
|
+
if (imperative_1.IO.existsSync(zoweExePath)) {
|
|
159
|
+
imperative_1.IO.giveAccessOnlyToOwner(zoweExePath);
|
|
160
|
+
}
|
|
143
161
|
const ioOpts = ["pipe", "pipe", "pipe"];
|
|
144
162
|
try {
|
|
145
163
|
const spawnResult = (0, child_process_1.spawnSync)(zoweExePath, ["--version-exe"], {
|
|
@@ -192,12 +210,12 @@ class EnableDaemonHandler {
|
|
|
192
210
|
*/
|
|
193
211
|
unzipTgz(tgzFile, toDir, fileToExtract) {
|
|
194
212
|
return __awaiter(this, void 0, void 0, function* () {
|
|
195
|
-
return new Promise((resolve) => {
|
|
213
|
+
return new Promise((resolve, reject) => {
|
|
196
214
|
fs.createReadStream(tgzFile)
|
|
197
215
|
.on('error', function (err) {
|
|
198
|
-
|
|
216
|
+
reject(new imperative_1.ImperativeError({
|
|
199
217
|
msg: err
|
|
200
|
-
});
|
|
218
|
+
}));
|
|
201
219
|
})
|
|
202
220
|
.pipe(new tar.Parser())
|
|
203
221
|
.on('entry', function (entry) {
|
|
@@ -205,8 +223,8 @@ class EnableDaemonHandler {
|
|
|
205
223
|
const sysInfo = imperative_1.ProcessUtils.getBasicSystemInfo();
|
|
206
224
|
let fileCreateOpts = {};
|
|
207
225
|
if (sysInfo.platform == "linux" || sysInfo.platform == "darwin") {
|
|
208
|
-
//
|
|
209
|
-
fileCreateOpts = { mode:
|
|
226
|
+
// restrict the executable to the owner only (rwx------), in octal
|
|
227
|
+
fileCreateOpts = { mode: 0o700 };
|
|
210
228
|
}
|
|
211
229
|
// do not include any path structure from the tgz, just the exe name
|
|
212
230
|
entry.pipe(fs.createWriteStream(nodeJsPath.resolve(toDir, nodeJsPath.basename(entry.path)), fileCreateOpts));
|
|
@@ -221,7 +239,7 @@ class EnableDaemonHandler {
|
|
|
221
239
|
/**
|
|
222
240
|
* Add our .zowe/bin directory to the user's PATH.
|
|
223
241
|
*
|
|
224
|
-
* @param pathToZoweBin The absolute path to our .zowe/bin
|
|
242
|
+
* @param pathToZoweBin The absolute path to our .zowe/bin directory.
|
|
225
243
|
*
|
|
226
244
|
* @param {IDaemonEnableQuestions} userQuestions Questions for user (if permitted)
|
|
227
245
|
*
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Enable.handler.js","sourceRoot":"","sources":["../../../src/daemon/enable/Enable.handler.ts"],"names":[],"mappings":";AAAA;;;;;;;;;EASE;;;;;;;;;;;AAEF,yBAAyB;AACzB,mCAAmC;AACnC,2BAA2B;AAC3B,iDAAwD;AAExD,iDAG0B;AAI1B;;;;;GAKG;AACH,MAAqB,mBAAmB;IAGpC;;;;;;;OAOG;IACU,OAAO,CAAC,SAA6B;;YAC9C,IAAI,OAAe,CAAC;YACpB,IAAI,CAAC;gBACD,MAAM,aAAa,GAA2B;oBAC1C;;;sBAGE;oBACF,UAAU,EAAE,KAAK;oBACjB,eAAe,EAAE,GAAG;iBACvB,CAAC;gBACF,OAAO,GAAG,MAAM,IAAI,CAAC,YAAY,CAAC,aAAa,CAAC,CAAC;YACrD,CAAC;YAAC,OAAM,MAAM,EAAE,CAAC;gBACb,SAAS,CAAC,QAAQ,CAAC,OAAO,CAAC,GAAG,CAAC,0CAA0C,GAAI,MAA0B,CAAC,OAAO,CAAC,CAAC;gBACjH,SAAS,CAAC,QAAQ,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC;gBACvC,OAAO;YACX,CAAC;YAED,SAAS,CAAC,QAAQ,CAAC,OAAO,CAAC,GAAG,CAAC,oCAAoC,GAAG,OAAO,CAAC,CAAC;YAC/E,SAAS,CAAC,QAAQ,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC;QAC3C,CAAC;KAAA;IAED;;;;;;;;;;OAUG;IACW,YAAY,CAAC,aAAqC;;;YAC5D,2BAA2B;YAC3B,MAAM,OAAO,GAAgB,yBAAY,CAAC,kBAAkB,EAAE,CAAC;YAE/D,0CAA0C;YAC1C,IAAI,SAAS,GAAG,SAAS,GAAG,6BAA6B,CAAC;YAC1D,IAAI,WAAW,GAAG,MAAM,CAAC;YACzB,QAAQ,OAAO,CAAC,QAAQ,EAAE,CAAC;gBACvB,KAAK,QAAQ,CAAC,CAAC,CAAC;oBACZ,SAAS,IAAI,WAAW,CAAC;oBACzB,MAAM;gBACV,CAAC;gBACD,KAAK,OAAO,CAAC,CAAC,CAAC;oBACX,SAAS,IAAI,WAAW,CAAC;oBACzB,MAAM;gBACV,CAAC;gBACD,KAAK,OAAO,CAAC,CAAC,CAAC;oBACX,SAAS,IAAI,aAAa,CAAC;oBAC3B,WAAW,IAAI,MAAM,CAAC;oBACtB,MAAM;gBACV,CAAC;gBACD,OAAO,CAAC,CAAC,CAAC;oBACN,MAAM,IAAI,4BAAe,CAAC;wBACtB,GAAG,EAAE,wCAAwC,OAAO,CAAC,QAAQ,qBAAqB;qBACrF,CAAC,CAAC;gBACP,CAAC;YACL,CAAC;YAED,SAAS,GAAG,UAAU,CAAC,SAAS,CAAC,SAAS,CAAC,CAAC;YAC5C,IAAI,CAAC,eAAE,CAAC,UAAU,CAAC,SAAS,CAAC,EAAE,CAAC;gBAC5B,MAAM,IAAI,4BAAe,CAAC;oBACtB,GAAG,EAAE,sDAAsD,SAAS,EAAE;iBACzE,CAAC,CAAC;YACP,CAAC;YAED,sDAAsD;YACtD,MAAM,aAAa,GAAG,UAAU,CAAC,SAAS,CAAC,6BAAgB,CAAC,QAAQ,CAAC,OAAO,GAAG,MAAM,CAAC,CAAC;YAEvF,8CAA8C;YAC9C,IAAI,eAAE,CAAC,UAAU,CAAC,aAAa,CAAC,EAAE,CAAC;gBAC/B,IAAI,CAAC,eAAE,CAAC,KAAK,CAAC,aAAa,CAAC,EAAE,CAAC;oBAC3B,MAAM,IAAI,4BAAe,CAAC;wBACtB,GAAG,EAAE,sBAAsB,aAAa,wBAAwB;qBACnE,CAAC,CAAC;gBACP,CAAC;YACL,CAAC;iBAAM,CAAC;gBACJ,uBAAuB;gBACvB,IAAI,CAAC;oBACD,eAAE,CAAC,aAAa,CAAC,aAAa,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"Enable.handler.js","sourceRoot":"","sources":["../../../src/daemon/enable/Enable.handler.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Edit.handler.d.ts","sourceRoot":"","sources":["../../../src/zosfiles/edit/Edit.handler.ts"],"names":[],"mappings":"AAWA,OAAO,EAAE,eAAe,EAAa,kBAAkB,EACkC,MAAM,kBAAkB,CAAC;AAClH,OAAO,EAAE,iBAAiB,EAAE,MAAM,8BAA8B,CAAC;AACjE,OAAO,EAAE,mBAAmB,EAAE,MAAM,yBAAyB,CAAC;AAG9D;;;GAGG;AACH,MAAM,CAAC,OAAO,OAAO,WAAY,SAAQ,mBAAmB;IAC3C,kBAAkB,CAAC,iBAAiB,EAAE,kBAAkB,EAAE,OAAO,EAAE,eAAe,GAAG,OAAO,CAAC,iBAAiB,CAAC;
|
|
1
|
+
{"version":3,"file":"Edit.handler.d.ts","sourceRoot":"","sources":["../../../src/zosfiles/edit/Edit.handler.ts"],"names":[],"mappings":"AAWA,OAAO,EAAE,eAAe,EAAa,kBAAkB,EACkC,MAAM,kBAAkB,CAAC;AAClH,OAAO,EAAE,iBAAiB,EAAE,MAAM,8BAA8B,CAAC;AACjE,OAAO,EAAE,mBAAmB,EAAE,MAAM,yBAAyB,CAAC;AAG9D;;;GAGG;AACH,MAAM,CAAC,OAAO,OAAO,WAAY,SAAQ,mBAAmB;IAC3C,kBAAkB,CAAC,iBAAiB,EAAE,kBAAkB,EAAE,OAAO,EAAE,eAAe,GAAG,OAAO,CAAC,iBAAiB,CAAC;CAqG/H"}
|
|
@@ -30,6 +30,15 @@ class EditHandler extends ZosFilesBase_handler_1.ZosFilesBaseHandler {
|
|
|
30
30
|
processWithSession(commandParameters, session) {
|
|
31
31
|
return __awaiter(this, void 0, void 0, function* () {
|
|
32
32
|
var _a;
|
|
33
|
+
if (commandParameters.arguments.editor) {
|
|
34
|
+
const trustEditor = yield Edit_utils_1.EditUtilities.promptUser(Edit_utils_1.Prompt.trustEditor, false, [commandParameters.arguments.editor]);
|
|
35
|
+
if (!trustEditor) {
|
|
36
|
+
throw new imperative_1.ImperativeError({
|
|
37
|
+
msg: imperative_1.TextUtils.chalk.red(`User did not trust the editor. Command terminated.`),
|
|
38
|
+
causeErrors: new Error(`User did not trust the editor.`)
|
|
39
|
+
});
|
|
40
|
+
}
|
|
41
|
+
}
|
|
33
42
|
// Setup - build temp and check for stash
|
|
34
43
|
let lfFile = {
|
|
35
44
|
tempPath: null,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Edit.handler.js","sourceRoot":"","sources":["../../../src/zosfiles/edit/Edit.handler.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"Edit.handler.js","sourceRoot":"","sources":["../../../src/zosfiles/edit/Edit.handler.ts"],"names":[],"mappings":"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"}
|
|
@@ -10,7 +10,8 @@ export declare enum Prompt {
|
|
|
10
10
|
viewDiff = 1,
|
|
11
11
|
overwriteRemote = 2,
|
|
12
12
|
viewUpdatedRemote = 3,
|
|
13
|
-
continueToUpload = 4
|
|
13
|
+
continueToUpload = 4,
|
|
14
|
+
trustEditor = 5
|
|
14
15
|
}
|
|
15
16
|
/**
|
|
16
17
|
* Type indicates which file system is being used for storage on mainframe {@link ILocalFile}
|
|
@@ -62,7 +63,7 @@ export declare class EditUtilities {
|
|
|
62
63
|
* @returns {Promise<boolean>} - promise whose resolution depends on user input
|
|
63
64
|
* @memberof EditUtilities
|
|
64
65
|
*/
|
|
65
|
-
static promptUser(prompt: Prompt, conflict?: boolean): Promise<boolean>;
|
|
66
|
+
static promptUser(prompt: Prompt, conflict?: boolean, promptTexts?: string[]): Promise<boolean>;
|
|
66
67
|
/**
|
|
67
68
|
* Download file and determine if downloading just to get etag (useStash) or to save file locally & get etag (!useStash)
|
|
68
69
|
* @param {AbstractSession} session - the session object generated from the connected profile
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Edit.utils.d.ts","sourceRoot":"","sources":["../../../src/zosfiles/edit/Edit.utils.ts"],"names":[],"mappings":"AAWA,OAAO,EAAoB,iBAAiB,EAAoC,MAAM,8BAA8B,CAAC;AACrH,OAAO,EAAE,eAAe,EAAE,kBAAkB,EACD,MAAM,kBAAkB,CAAC;AASpE;;;;GAIG;AACH,oBAAY,MAAM;IACd,QAAQ,IAAA;IACR,QAAQ,IAAA;IACR,eAAe,IAAA;IACf,iBAAiB,IAAA;IACjB,gBAAgB,IAAA;
|
|
1
|
+
{"version":3,"file":"Edit.utils.d.ts","sourceRoot":"","sources":["../../../src/zosfiles/edit/Edit.utils.ts"],"names":[],"mappings":"AAWA,OAAO,EAAoB,iBAAiB,EAAoC,MAAM,8BAA8B,CAAC;AACrH,OAAO,EAAE,eAAe,EAAE,kBAAkB,EACD,MAAM,kBAAkB,CAAC;AASpE;;;;GAIG;AACH,oBAAY,MAAM;IACd,QAAQ,IAAA;IACR,QAAQ,IAAA;IACR,eAAe,IAAA;IACf,iBAAiB,IAAA;IACjB,gBAAgB,IAAA;IAChB,WAAW,IAAA;CACd;AAED;;;;GAIG;AACH,MAAM,MAAM,YAAY,GAAG,KAAK,GAAG,IAAI,CAAC;AAExC;;;;GAIG;AACH,MAAM,WAAW,UAAU;IACvB,QAAQ,EAAE,MAAM,GAAG,IAAI,CAAC;IACxB,QAAQ,EAAE,MAAM,CAAC;IACjB,QAAQ,EAAE,YAAY,CAAC;IACvB,QAAQ,EAAE,OAAO,CAAC;IAClB,OAAO,EAAE,iBAAiB,GAAG,IAAI,CAAC;IAClC,QAAQ,EAAE,OAAO,CAAC;IAClB,QAAQ,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACzB,MAAM,CAAC,EAAE,OAAO,CAAC;CACpB;AAED;;;;GAIG;AACH,qBAAa,aAAa;IACtB;;;;;;;OAOG;WACiB,aAAa,CAAC,MAAM,EAAE,UAAU,EAAE,iBAAiB,EAAE,kBAAkB,GAAG,OAAO,CAAC,MAAM,CAAC;IAiB7G;;;;;OAKG;WACiB,aAAa,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;IAWrE;;;;;;OAMG;WACiB,UAAU,CAAC,MAAM,EAAE,MAAM,EAAE,QAAQ,CAAC,EAAE,OAAO,EAAE,WAAW,CAAC,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,OAAO,CAAC;IAsC5G;;;;;;OAMG;WACiB,aAAa,CAAC,OAAO,EAAE,eAAe,EAAE,MAAM,EAAE,UAAU,EAAE,QAAQ,EAAE,OAAO,GAAG,OAAO,CAAC,UAAU,CAAC;IA2BvH;;;;;;;;;OASG;WACiB,cAAc,CAAC,OAAO,EAAE,eAAe,EAAE,iBAAiB,EAAE,kBAAkB,EAAE,MAAM,EAAE,UAAU,EAClH,UAAU,CAAC,EAAE,OAAO,GAAG,OAAO,CAAC,iBAAiB,CAAC;IAoDrD;;;;;OAKG;WACiB,SAAS,CAAC,MAAM,EAAE,UAAU,EAAE,MAAM,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;IAOpF;;;;;;;;;;OAUG;WACiB,WAAW,CAAC,OAAO,EAAE,eAAe,EAAE,iBAAiB,EAAE,kBAAkB,EAC3F,MAAM,EAAE,UAAU,GAAG,OAAO,CAAC,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;IA2CpD;;;;;;;OAOG;WACiB,YAAY,CAAC,OAAO,EAAE,eAAe,EAAE,iBAAiB,EAAE,kBAAkB,EAC5F,MAAM,EAAE,UAAU,GAAG,OAAO,CAAC,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;IA+BpD;;;;OAIG;WACiB,eAAe,CAAC,QAAQ,EAAC,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;CAUtE"}
|
|
@@ -40,6 +40,7 @@ var Prompt;
|
|
|
40
40
|
Prompt[Prompt["overwriteRemote"] = 2] = "overwriteRemote";
|
|
41
41
|
Prompt[Prompt["viewUpdatedRemote"] = 3] = "viewUpdatedRemote";
|
|
42
42
|
Prompt[Prompt["continueToUpload"] = 4] = "continueToUpload";
|
|
43
|
+
Prompt[Prompt["trustEditor"] = 5] = "trustEditor";
|
|
43
44
|
})(Prompt || (exports.Prompt = Prompt = {}));
|
|
44
45
|
/**
|
|
45
46
|
* A shared utility class that uss and ds handlers use for local file editing
|
|
@@ -100,7 +101,7 @@ class EditUtilities {
|
|
|
100
101
|
* @returns {Promise<boolean>} - promise whose resolution depends on user input
|
|
101
102
|
* @memberof EditUtilities
|
|
102
103
|
*/
|
|
103
|
-
static promptUser(prompt, conflict) {
|
|
104
|
+
static promptUser(prompt, conflict, promptTexts) {
|
|
104
105
|
return __awaiter(this, void 0, void 0, function* () {
|
|
105
106
|
let input;
|
|
106
107
|
let promptText;
|
|
@@ -121,6 +122,11 @@ class EditUtilities {
|
|
|
121
122
|
case Prompt.continueToUpload:
|
|
122
123
|
promptText = promptPrefix + 'Ignore conflicts and overwrite remote? y/n';
|
|
123
124
|
break;
|
|
125
|
+
case Prompt.trustEditor: {
|
|
126
|
+
const editorName = (promptTexts === null || promptTexts === void 0 ? void 0 : promptTexts.length) > 0 ? promptTexts[0] : "the custom editor";
|
|
127
|
+
promptText = `You are about to edit using '${editorName}'. Would you like to trust this editor? y/n`;
|
|
128
|
+
break;
|
|
129
|
+
}
|
|
124
130
|
}
|
|
125
131
|
do {
|
|
126
132
|
input = yield imperative_1.CliUtils.readPrompt(imperative_1.TextUtils.chalk.green(promptText));
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Edit.utils.js","sourceRoot":"","sources":["../../../src/zosfiles/edit/Edit.utils.ts"],"names":[],"mappings":";AAAA;;;;;;;;;EASE;;;;;;;;;;;;AAEF,yEAAqH;AACrH,iDACoE;AACpE,oEAAiE;AACjE,2BAA4C;AAC5C,2BAA4B;AAC5B,6BAA6B;AAC7B,wFAAgF;AAChF,iFAAyE;AAGzE;;;;GAIG;AACH,IAAY,
|
|
1
|
+
{"version":3,"file":"Edit.utils.js","sourceRoot":"","sources":["../../../src/zosfiles/edit/Edit.utils.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Command.definition.d.ts","sourceRoot":"","sources":["../../../../src/zostso/issue/command/Command.definition.ts"],"names":[],"mappings":"AAWA,OAAO,EAAE,kBAAkB,EAA4B,MAAM,kBAAkB,CAAC;AAGhF,eAAO,MAAM,iBAAiB,EAAE,
|
|
1
|
+
{"version":3,"file":"Command.definition.d.ts","sourceRoot":"","sources":["../../../../src/zostso/issue/command/Command.definition.ts"],"names":[],"mappings":"AAWA,OAAO,EAAE,kBAAkB,EAA4B,MAAM,kBAAkB,CAAC;AAGhF,eAAO,MAAM,iBAAiB,EAAE,kBAiE/B,CAAC"}
|
|
@@ -18,23 +18,23 @@ exports.CommandDefinition = {
|
|
|
18
18
|
summary: "Issue a TSO command",
|
|
19
19
|
description: "Creates a TSO address space, issues a TSO command through the newly created address space, " +
|
|
20
20
|
"waits for the READY prompt to print the response, and terminates the TSO address space. All response data" +
|
|
21
|
-
"
|
|
21
|
+
" is returned to the user up to (but not including) the TSO 'READY' prompt.",
|
|
22
22
|
type: "command",
|
|
23
23
|
handler: __dirname + "/Command.handler",
|
|
24
24
|
profile: {
|
|
25
|
-
optional: ["zosmf", "tso"]
|
|
25
|
+
optional: ["zosmf", "tso"],
|
|
26
26
|
},
|
|
27
27
|
positionals: [
|
|
28
28
|
{
|
|
29
29
|
name: "commandText",
|
|
30
30
|
type: "string",
|
|
31
31
|
description: "The TSO command to issue.",
|
|
32
|
-
required: true
|
|
33
|
-
}
|
|
32
|
+
required: true,
|
|
33
|
+
},
|
|
34
34
|
],
|
|
35
35
|
options: [
|
|
36
36
|
{
|
|
37
|
-
// Old API behavior will be utilized upon specifying --ssm to be false,
|
|
37
|
+
// Old API behavior will be utilized upon specifying --legacy true, or --ssm to be false,
|
|
38
38
|
// otherwise try new API and if it fails, fallback to old API.
|
|
39
39
|
// Specifying --ssm to be false makes the value of --stateful have no impact on
|
|
40
40
|
// behavior since old API behavior does not utilize statefulness.
|
|
@@ -42,7 +42,7 @@ exports.CommandDefinition = {
|
|
|
42
42
|
aliases: ["ssm"],
|
|
43
43
|
type: "boolean",
|
|
44
44
|
description: "Suppress console messages from start of address space.",
|
|
45
|
-
defaultValue: true
|
|
45
|
+
defaultValue: true,
|
|
46
46
|
},
|
|
47
47
|
{
|
|
48
48
|
// --stateful has no impact if --suppress-startup-messages is set to false.
|
|
@@ -51,14 +51,24 @@ exports.CommandDefinition = {
|
|
|
51
51
|
type: "boolean",
|
|
52
52
|
description: "Statefulness of address space created for TSO command." +
|
|
53
53
|
" This option is not supported when --suppress-startup-messages is set to false.",
|
|
54
|
-
defaultValue: false
|
|
55
|
-
}
|
|
54
|
+
defaultValue: false,
|
|
55
|
+
},
|
|
56
|
+
{
|
|
57
|
+
name: "legacy",
|
|
58
|
+
aliases: [],
|
|
59
|
+
type: "boolean",
|
|
60
|
+
description: "Force the use of the previous TSO command functionality " +
|
|
61
|
+
"(where Zowe CLI creates and tears down the TSO address space via multiple API calls)." +
|
|
62
|
+
" This is useful for working around an issue that might occur when using the newer z/OSMF API where an error " +
|
|
63
|
+
"reading 'Did not receive output from the z/OSMF TSO API' is thrown.",
|
|
64
|
+
defaultValue: false,
|
|
65
|
+
},
|
|
56
66
|
].concat(zos_tso_for_zowe_sdk_1.TsoProfileConstants.TSO_PROFILE_OPTIONS),
|
|
57
67
|
examples: [
|
|
58
68
|
{
|
|
59
69
|
description: 'Issue the TSO command "status" to display information about jobs for your user ID.',
|
|
60
|
-
options: "
|
|
61
|
-
}
|
|
62
|
-
]
|
|
70
|
+
options: '"status"',
|
|
71
|
+
},
|
|
72
|
+
],
|
|
63
73
|
};
|
|
64
74
|
//# sourceMappingURL=Command.definition.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Command.definition.js","sourceRoot":"","sources":["../../../../src/zostso/issue/command/Command.definition.ts"],"names":[],"mappings":";AAAA;;;;;;;;;EASE;;;AAGF,qEAAiE;AAEpD,QAAA,iBAAiB,GAAuB;IACjD,IAAI,EAAE,SAAS;IACf,OAAO,EAAE,CAAC,KAAK,CAAC;IAChB,OAAO,EAAE,qBAAqB;IAC9B,WAAW,
|
|
1
|
+
{"version":3,"file":"Command.definition.js","sourceRoot":"","sources":["../../../../src/zostso/issue/command/Command.definition.ts"],"names":[],"mappings":";AAAA;;;;;;;;;EASE;;;AAGF,qEAAiE;AAEpD,QAAA,iBAAiB,GAAuB;IACjD,IAAI,EAAE,SAAS;IACf,OAAO,EAAE,CAAC,KAAK,CAAC;IAChB,OAAO,EAAE,qBAAqB;IAC9B,WAAW,EACP,6FAA6F;QAC7F,2GAA2G;QAC3G,4EAA4E;IAChF,IAAI,EAAE,SAAS;IACf,OAAO,EAAE,SAAS,GAAG,kBAAkB;IACvC,OAAO,EAAE;QACL,QAAQ,EAAE,CAAC,OAAO,EAAE,KAAK,CAAC;KAC7B;IACD,WAAW,EAAE;QACT;YACI,IAAI,EAAE,aAAa;YACnB,IAAI,EAAE,QAAQ;YACd,WAAW,EAAE,2BAA2B;YACxC,QAAQ,EAAE,IAAI;SACjB;KACJ;IACD,OAAO,EACH;QACI;YACI,yFAAyF;YACzF,8DAA8D;YAE9D,+EAA+E;YAC/E,iEAAiE;YACjE,IAAI,EAAE,2BAA2B;YACjC,OAAO,EAAE,CAAC,KAAK,CAAC;YAChB,IAAI,EAAE,SAAS;YACf,WAAW,EACP,wDAAwD;YAC5D,YAAY,EAAE,IAAI;SACrB;QACD;YACI,2EAA2E;YAC3E,IAAI,EAAE,UAAU;YAChB,OAAO,EAAE,CAAC,IAAI,CAAC;YACf,IAAI,EAAE,SAAS;YACf,WAAW,EACP,wDAAwD;gBACxD,iFAAiF;YACrF,YAAY,EAAE,KAAK;SACtB;QACD;YACI,IAAI,EAAE,QAAQ;YACd,OAAO,EAAE,EAAE;YACX,IAAI,EAAE,SAAS;YACf,WAAW,EAAE,0DAA0D;gBACnE,uFAAuF;gBACvF,8GAA8G;gBAC9G,qEAAqE;YACzE,YAAY,EAAE,KAAK;SACtB;KAER,CAAC,MAAM,CAAC,0CAAmB,CAAC,mBAAmB,CAAC;IACjD,QAAQ,EAAE;QACN;YACI,WAAW,EACP,oFAAoF;YACxF,OAAO,EAAE,UAAU;SACtB;KACJ;CACJ,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Command.handler.d.ts","sourceRoot":"","sources":["../../../../src/zostso/issue/command/Command.handler.ts"],"names":[],"mappings":"AAWA,OAAO,EAAE,kBAAkB,EAAE,MAAM,kBAAkB,CAAC;AACtD,OAAO,EAGH,iBAAiB,EACpB,MAAM,4BAA4B,CAAC;AAEpC;;;;;GAKG;AACH,MAAM,CAAC,OAAO,OAAO,OAAQ,SAAQ,iBAAiB;IAGrC,UAAU,CAAC,MAAM,EAAE,kBAAkB;
|
|
1
|
+
{"version":3,"file":"Command.handler.d.ts","sourceRoot":"","sources":["../../../../src/zostso/issue/command/Command.handler.ts"],"names":[],"mappings":"AAWA,OAAO,EAAE,kBAAkB,EAAE,MAAM,kBAAkB,CAAC;AACtD,OAAO,EAGH,iBAAiB,EACpB,MAAM,4BAA4B,CAAC;AAEpC;;;;;GAKG;AACH,MAAM,CAAC,OAAO,OAAO,OAAQ,SAAQ,iBAAiB;IAGrC,UAAU,CAAC,MAAM,EAAE,kBAAkB;CA4CrD"}
|
|
@@ -36,10 +36,13 @@ class Handler extends zos_tso_for_zowe_sdk_1.ZosTsoBaseHandler {
|
|
|
36
36
|
const response = yield zos_tso_for_zowe_sdk_1.IssueTso.issueTsoCmd(this.mSession, params.arguments.commandText, {
|
|
37
37
|
isStateful: params.arguments.stateful,
|
|
38
38
|
suppressStartupMessages: params.arguments.suppressStartupMessages,
|
|
39
|
-
addressSpaceOptions: this.mTsoStart
|
|
39
|
+
addressSpaceOptions: this.mTsoStart,
|
|
40
|
+
useLegacyApi: params.arguments.legacy,
|
|
40
41
|
});
|
|
41
42
|
const defProc = "IZUFPROC";
|
|
42
|
-
if (params.arguments.logonProcedure &&
|
|
43
|
+
if (params.arguments.logonProcedure &&
|
|
44
|
+
params.arguments.logonProcedure !== defProc &&
|
|
45
|
+
params.arguments.suppressStartupMessages) {
|
|
43
46
|
this.console.error(chalk.yellow("Warning: The logon procedure specified is not used when issuing a TSO command with the " +
|
|
44
47
|
"--suppress-startup-messages (--ssm) option set to true."));
|
|
45
48
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Command.handler.js","sourceRoot":"","sources":["../../../../src/zostso/issue/command/Command.handler.ts"],"names":[],"mappings":";AAAA;;;;;;;;;EASE;;;;;;;;;;;AAGF,qEAIoC;AACpC,+BAAgC;AAChC;;;;;GAKG;AACH,MAAqB,OAAQ,SAAQ,wCAAiB;IAClD,mDAAmD;IAEtC,UAAU,CAAC,MAA0B;;;YAC9C,wBAAwB;YACxB,MAAM,QAAQ,GAAmB,MAAM,+BAAQ,CAAC,WAAW,CACvD,IAAI,CAAC,QAAQ,EACb,MAAM,CAAC,SAAS,CAAC,WAAW,EAC5B;gBACI,UAAU,EAAE,MAAM,CAAC,SAAS,CAAC,QAAQ;gBACrC,uBAAuB,EACnB,MAAM,CAAC,SAAS,CAAC,uBAAuB;gBAC5C,mBAAmB,EAAE,IAAI,CAAC,SAAS;
|
|
1
|
+
{"version":3,"file":"Command.handler.js","sourceRoot":"","sources":["../../../../src/zostso/issue/command/Command.handler.ts"],"names":[],"mappings":";AAAA;;;;;;;;;EASE;;;;;;;;;;;AAGF,qEAIoC;AACpC,+BAAgC;AAChC;;;;;GAKG;AACH,MAAqB,OAAQ,SAAQ,wCAAiB;IAClD,mDAAmD;IAEtC,UAAU,CAAC,MAA0B;;;YAC9C,wBAAwB;YACxB,MAAM,QAAQ,GAAmB,MAAM,+BAAQ,CAAC,WAAW,CACvD,IAAI,CAAC,QAAQ,EACb,MAAM,CAAC,SAAS,CAAC,WAAW,EAC5B;gBACI,UAAU,EAAE,MAAM,CAAC,SAAS,CAAC,QAAQ;gBACrC,uBAAuB,EACnB,MAAM,CAAC,SAAS,CAAC,uBAAuB;gBAC5C,mBAAmB,EAAE,IAAI,CAAC,SAAS;gBACnC,YAAY,EAAE,MAAM,CAAC,SAAS,CAAC,MAAM;aACxC,CACJ,CAAC;YAEF,MAAM,OAAO,GAAG,UAAU,CAAC;YAC3B,IACI,MAAM,CAAC,SAAS,CAAC,cAAc;gBAC/B,MAAM,CAAC,SAAS,CAAC,cAAc,KAAK,OAAO;gBAC3C,MAAM,CAAC,SAAS,CAAC,uBAAuB,EAC1C,CAAC;gBACC,IAAI,CAAC,OAAO,CAAC,KAAK,CACd,KAAK,CAAC,MAAM,CACR,yFAAyF;oBACrF,yDAAyD,CAChE,CACJ,CAAC;YACN,CAAC;YAED,qCAAqC;YACrC,IACI,CAAC,MAAM,CAAC,SAAS,CAAC,uBAAuB;gBACzC,QAAQ,CAAC,aAAa,IAAI,IAAI,EAChC,CAAC;gBACC,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,aAAa,CAAC,QAAQ,CAAC,CAAC;YACtD,CAAC;YACD,IAAI,MAAA,MAAA,QAAQ,CAAC,aAAa,0CAAG,CAAC,CAAC,0CAAE,UAAU;gBACvC,IAAI,CAAC,OAAO,CAAC,GAAG,CACZ,GAAG,KAAK,CAAC,MAAM,CAAC,eAAe,CAAC,GAAG,QAAQ,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC,UAAU,EAAE,CAC5E,CAAC;YAEN,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,eAAe,CAAC,CAAC;YAC3C,wDAAwD;YACxD,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;QAC/B,CAAC;KAAA;CACJ;AA/CD,0BA+CC"}
|
package/npm-shrinkwrap.json
CHANGED
|
@@ -1,30 +1,30 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@zowe/cli",
|
|
3
|
-
"version": "8.
|
|
3
|
+
"version": "8.33.0",
|
|
4
4
|
"lockfileVersion": 3,
|
|
5
5
|
"requires": true,
|
|
6
6
|
"packages": {
|
|
7
7
|
"": {
|
|
8
8
|
"name": "@zowe/cli",
|
|
9
|
-
"version": "8.
|
|
9
|
+
"version": "8.33.0",
|
|
10
10
|
"hasInstallScript": true,
|
|
11
11
|
"license": "EPL-2.0",
|
|
12
12
|
"dependencies": {
|
|
13
|
-
"@zowe/core-for-zowe-sdk": "8.
|
|
14
|
-
"@zowe/imperative": "8.
|
|
15
|
-
"@zowe/provisioning-for-zowe-sdk": "8.
|
|
16
|
-
"@zowe/zos-console-for-zowe-sdk": "8.
|
|
17
|
-
"@zowe/zos-files-for-zowe-sdk": "8.
|
|
18
|
-
"@zowe/zos-jobs-for-zowe-sdk": "8.
|
|
19
|
-
"@zowe/zos-logs-for-zowe-sdk": "8.
|
|
20
|
-
"@zowe/zos-tso-for-zowe-sdk": "8.
|
|
21
|
-
"@zowe/zos-uss-for-zowe-sdk": "8.
|
|
22
|
-
"@zowe/zos-workflows-for-zowe-sdk": "8.
|
|
23
|
-
"@zowe/zosmf-for-zowe-sdk": "8.
|
|
13
|
+
"@zowe/core-for-zowe-sdk": "8.33.0",
|
|
14
|
+
"@zowe/imperative": "8.33.0",
|
|
15
|
+
"@zowe/provisioning-for-zowe-sdk": "8.33.0",
|
|
16
|
+
"@zowe/zos-console-for-zowe-sdk": "8.33.0",
|
|
17
|
+
"@zowe/zos-files-for-zowe-sdk": "8.33.0",
|
|
18
|
+
"@zowe/zos-jobs-for-zowe-sdk": "8.33.0",
|
|
19
|
+
"@zowe/zos-logs-for-zowe-sdk": "8.33.0",
|
|
20
|
+
"@zowe/zos-tso-for-zowe-sdk": "8.33.0",
|
|
21
|
+
"@zowe/zos-uss-for-zowe-sdk": "8.33.0",
|
|
22
|
+
"@zowe/zos-workflows-for-zowe-sdk": "8.33.0",
|
|
23
|
+
"@zowe/zosmf-for-zowe-sdk": "8.33.0",
|
|
24
24
|
"find-process": "^1.4.7",
|
|
25
25
|
"lodash": "^4.17.23",
|
|
26
26
|
"minimatch": "^10.2.3",
|
|
27
|
-
"tar": "^7.5.
|
|
27
|
+
"tar": "^7.5.16"
|
|
28
28
|
},
|
|
29
29
|
"bin": {
|
|
30
30
|
"zowe": "lib/main.js"
|
|
@@ -32,7 +32,7 @@
|
|
|
32
32
|
"devDependencies": {
|
|
33
33
|
"@types/diff": "^5.0.9",
|
|
34
34
|
"@types/lodash": "^4.17.6",
|
|
35
|
-
"@zowe/cli-test-utils": "8.
|
|
35
|
+
"@zowe/cli-test-utils": "8.33.0",
|
|
36
36
|
"comment-json": "^4.2.3",
|
|
37
37
|
"strip-ansi": "^6.0.1",
|
|
38
38
|
"which": "^4.0.0"
|
|
@@ -149,8 +149,8 @@
|
|
|
149
149
|
"license": "MIT"
|
|
150
150
|
},
|
|
151
151
|
"node_modules/@zowe/core-for-zowe-sdk": {
|
|
152
|
-
"version": "8.
|
|
153
|
-
"integrity": "sha512-
|
|
152
|
+
"version": "8.33.0",
|
|
153
|
+
"integrity": "sha512-Kf4xVCer8O1K4Gmz1DKvgBP7Fp0CdR6s3mcxswbjCeeMNmhqg7KZCHp9mB7SYZi81U1oVoMT+Q5mjwdCCT52kw==",
|
|
154
154
|
"license": "EPL-2.0",
|
|
155
155
|
"dependencies": {
|
|
156
156
|
"comment-json": "~4.2.3",
|
|
@@ -164,8 +164,8 @@
|
|
|
164
164
|
}
|
|
165
165
|
},
|
|
166
166
|
"node_modules/@zowe/imperative": {
|
|
167
|
-
"version": "8.
|
|
168
|
-
"integrity": "sha512-
|
|
167
|
+
"version": "8.33.0",
|
|
168
|
+
"integrity": "sha512-dHBx/9E1UC5anXLZSCmy49XGfTidBz9CvCmJLvTomBXeoWoZgtz84biKZSSEihQ46SroFzq5G/O8H0COeJWX0Q==",
|
|
169
169
|
"license": "EPL-2.0",
|
|
170
170
|
"dependencies": {
|
|
171
171
|
"@types/semver": "^7.5.0",
|
|
@@ -187,13 +187,13 @@
|
|
|
187
187
|
"http-proxy-agent": "^7.0.2",
|
|
188
188
|
"https-proxy-agent": "^7.0.4",
|
|
189
189
|
"jest-diff": "^29.0.0",
|
|
190
|
-
"js-yaml": "^4.
|
|
190
|
+
"js-yaml": "^4.2.0",
|
|
191
191
|
"jsonfile": "^6.0.0",
|
|
192
192
|
"jsonschema": "^1.4.1",
|
|
193
193
|
"lodash": "^4.17.23",
|
|
194
194
|
"lodash-deep": "^2.0.0",
|
|
195
195
|
"log4js": "^6.9.1",
|
|
196
|
-
"markdown-it": "^14.
|
|
196
|
+
"markdown-it": "^14.2.0",
|
|
197
197
|
"mustache": "^4.2.0",
|
|
198
198
|
"npm-package-arg": "^11.0.1",
|
|
199
199
|
"opener": "^1.5.2",
|
|
@@ -213,11 +213,11 @@
|
|
|
213
213
|
}
|
|
214
214
|
},
|
|
215
215
|
"node_modules/@zowe/provisioning-for-zowe-sdk": {
|
|
216
|
-
"version": "8.
|
|
217
|
-
"integrity": "sha512-
|
|
216
|
+
"version": "8.33.0",
|
|
217
|
+
"integrity": "sha512-AZAviWpvJDFvNV3Oea4ZFwRhghn8YFDOzUymqi4PlRJWffqoHa1tvdEIuKq5lfM04hGfPz/7v1iliu1wGKudyg==",
|
|
218
218
|
"license": "EPL-2.0",
|
|
219
219
|
"dependencies": {
|
|
220
|
-
"js-yaml": "^4.
|
|
220
|
+
"js-yaml": "^4.2.0"
|
|
221
221
|
},
|
|
222
222
|
"engines": {
|
|
223
223
|
"node": ">=20.9.0"
|
|
@@ -238,8 +238,8 @@
|
|
|
238
238
|
}
|
|
239
239
|
},
|
|
240
240
|
"node_modules/@zowe/zos-console-for-zowe-sdk": {
|
|
241
|
-
"version": "8.
|
|
242
|
-
"integrity": "sha512-
|
|
241
|
+
"version": "8.33.0",
|
|
242
|
+
"integrity": "sha512-TENsjQvD048IdH/CymjmpWX8wRVI+WgPXg3sZyOxKUDPH968sCAYYuVLTwe7bUlE/rnhSiA5hHjcb0sBN3UMjQ==",
|
|
243
243
|
"license": "EPL-2.0",
|
|
244
244
|
"engines": {
|
|
245
245
|
"node": ">=20.9.0"
|
|
@@ -250,8 +250,8 @@
|
|
|
250
250
|
}
|
|
251
251
|
},
|
|
252
252
|
"node_modules/@zowe/zos-files-for-zowe-sdk": {
|
|
253
|
-
"version": "8.
|
|
254
|
-
"integrity": "sha512-
|
|
253
|
+
"version": "8.33.0",
|
|
254
|
+
"integrity": "sha512-gcbcDNyYKiPICi2RLIE/U2bLqIsEuWzplExU2WqQrWSM942oJJqmADeLYFrAKmghmt5dxgtWIZxFVZfLzPxgfg==",
|
|
255
255
|
"license": "EPL-2.0",
|
|
256
256
|
"dependencies": {
|
|
257
257
|
"lodash": "^4.17.23",
|
|
@@ -266,11 +266,11 @@
|
|
|
266
266
|
}
|
|
267
267
|
},
|
|
268
268
|
"node_modules/@zowe/zos-jobs-for-zowe-sdk": {
|
|
269
|
-
"version": "8.
|
|
270
|
-
"integrity": "sha512-
|
|
269
|
+
"version": "8.33.0",
|
|
270
|
+
"integrity": "sha512-IGomubnBeIXBPe77XMYYpTWfTHxQuuIGFxyU7TB+eQpxRVcCFZrxLApJ1PWomZtfdI6w3e4h8/REj8pw6JUsXw==",
|
|
271
271
|
"license": "EPL-2.0",
|
|
272
272
|
"dependencies": {
|
|
273
|
-
"@zowe/zos-files-for-zowe-sdk": "8.
|
|
273
|
+
"@zowe/zos-files-for-zowe-sdk": "8.33.0"
|
|
274
274
|
},
|
|
275
275
|
"engines": {
|
|
276
276
|
"node": ">=20.9.0"
|
|
@@ -281,8 +281,8 @@
|
|
|
281
281
|
}
|
|
282
282
|
},
|
|
283
283
|
"node_modules/@zowe/zos-logs-for-zowe-sdk": {
|
|
284
|
-
"version": "8.
|
|
285
|
-
"integrity": "sha512-
|
|
284
|
+
"version": "8.33.0",
|
|
285
|
+
"integrity": "sha512-RUolKWCAW7/PY5P+/Y7wG87/1/y2n9h9ubV8IVTM+U9STlTKrp55Pzd3S4tbY0JtZpEwwM7aMFj7lm+3uMAG8Q==",
|
|
286
286
|
"license": "EPL-2.0",
|
|
287
287
|
"engines": {
|
|
288
288
|
"node": ">=20.9.0"
|
|
@@ -293,11 +293,11 @@
|
|
|
293
293
|
}
|
|
294
294
|
},
|
|
295
295
|
"node_modules/@zowe/zos-tso-for-zowe-sdk": {
|
|
296
|
-
"version": "8.
|
|
297
|
-
"integrity": "sha512-
|
|
296
|
+
"version": "8.33.0",
|
|
297
|
+
"integrity": "sha512-ib1lDEmvP/Pn76KHdGsExUDW+iVvgPo0BPZg9W35gFMygf8iFXwEFjLS+JEUfFkXdPwAPOVQIcRuRw2wHr2E8w==",
|
|
298
298
|
"license": "EPL-2.0",
|
|
299
299
|
"dependencies": {
|
|
300
|
-
"@zowe/zosmf-for-zowe-sdk": "8.
|
|
300
|
+
"@zowe/zosmf-for-zowe-sdk": "8.33.0"
|
|
301
301
|
},
|
|
302
302
|
"engines": {
|
|
303
303
|
"node": ">=20.9.0"
|
|
@@ -308,8 +308,8 @@
|
|
|
308
308
|
}
|
|
309
309
|
},
|
|
310
310
|
"node_modules/@zowe/zos-uss-for-zowe-sdk": {
|
|
311
|
-
"version": "8.
|
|
312
|
-
"integrity": "sha512-
|
|
311
|
+
"version": "8.33.0",
|
|
312
|
+
"integrity": "sha512-zQxqY0yqoeoNlHe+rMYEmMNktXrspceW1rpU/7w7sH+9Fgs1hP7Krg8/TgPY0KZC63K4v1cwut19SW9tYzkpRw==",
|
|
313
313
|
"license": "EPL-2.0",
|
|
314
314
|
"dependencies": {
|
|
315
315
|
"ssh2": "^1.15.0"
|
|
@@ -322,11 +322,11 @@
|
|
|
322
322
|
}
|
|
323
323
|
},
|
|
324
324
|
"node_modules/@zowe/zos-workflows-for-zowe-sdk": {
|
|
325
|
-
"version": "8.
|
|
326
|
-
"integrity": "sha512-
|
|
325
|
+
"version": "8.33.0",
|
|
326
|
+
"integrity": "sha512-kYqmIzccWsD6mkXX8wT/kO+Qh8N0DVRArm44bTQzj2ENxCkV9cq1y9+gu54Xb0q93fFCTqYtd0IJ7ZGnUioCFg==",
|
|
327
327
|
"license": "EPL-2.0",
|
|
328
328
|
"dependencies": {
|
|
329
|
-
"@zowe/zos-files-for-zowe-sdk": "8.
|
|
329
|
+
"@zowe/zos-files-for-zowe-sdk": "8.33.0"
|
|
330
330
|
},
|
|
331
331
|
"engines": {
|
|
332
332
|
"node": ">=20.9.0"
|
|
@@ -337,8 +337,8 @@
|
|
|
337
337
|
}
|
|
338
338
|
},
|
|
339
339
|
"node_modules/@zowe/zosmf-for-zowe-sdk": {
|
|
340
|
-
"version": "8.
|
|
341
|
-
"integrity": "sha512
|
|
340
|
+
"version": "8.33.0",
|
|
341
|
+
"integrity": "sha512-piw9TjaL2yEIXJYN2a74zmc6Zfw3qW0upga6JOf2iQMxWUs7uxZzAnX/WGtRWmIjdEIUwu7VWE2HB33nf9tBQA==",
|
|
342
342
|
"license": "EPL-2.0",
|
|
343
343
|
"engines": {
|
|
344
344
|
"node": ">=20.9.0"
|
|
@@ -670,7 +670,8 @@
|
|
|
670
670
|
}
|
|
671
671
|
},
|
|
672
672
|
"node_modules/escalade": {
|
|
673
|
-
"version": "3.
|
|
673
|
+
"version": "3.2.0",
|
|
674
|
+
"integrity": "sha512-WUj2qlxaQtO4g6Pq5c29GTcWGDyd8itL8zTlipgECz3JesAiiOKotd8JU6otB3PACgG6xkJUyVhboMS+bje/jA==",
|
|
674
675
|
"license": "MIT",
|
|
675
676
|
"engines": {
|
|
676
677
|
"node": ">=6"
|
|
@@ -932,8 +933,18 @@
|
|
|
932
933
|
}
|
|
933
934
|
},
|
|
934
935
|
"node_modules/js-yaml": {
|
|
935
|
-
"version": "4.
|
|
936
|
-
"integrity": "sha512-
|
|
936
|
+
"version": "4.2.0",
|
|
937
|
+
"integrity": "sha512-ePWsvanv0DWuDRsW8dnt+R4jQ31SCRCQ7hhNcPXZPsoBZiemuZNYGf7adZdqX2D86j6rvKp3RpCxVTSb8WQlOw==",
|
|
938
|
+
"funding": [
|
|
939
|
+
{
|
|
940
|
+
"type": "github",
|
|
941
|
+
"url": "https://github.com/sponsors/puzrin"
|
|
942
|
+
},
|
|
943
|
+
{
|
|
944
|
+
"type": "github",
|
|
945
|
+
"url": "https://github.com/sponsors/nodeca"
|
|
946
|
+
}
|
|
947
|
+
],
|
|
937
948
|
"license": "MIT",
|
|
938
949
|
"dependencies": {
|
|
939
950
|
"argparse": "^2.0.1"
|
|
@@ -965,7 +976,18 @@
|
|
|
965
976
|
"license": "MIT"
|
|
966
977
|
},
|
|
967
978
|
"node_modules/linkify-it": {
|
|
968
|
-
"version": "5.0.
|
|
979
|
+
"version": "5.0.1",
|
|
980
|
+
"integrity": "sha512-wVoTjP4Q6R0NW5hiZkVJaFZPWgtXfoGF+6LucL3/FtiNjmcHhYjEr5f1Kqjirc1nBW07J/ZuRFumqr2oqccEWg==",
|
|
981
|
+
"funding": [
|
|
982
|
+
{
|
|
983
|
+
"type": "github",
|
|
984
|
+
"url": "https://github.com/sponsors/puzrin"
|
|
985
|
+
},
|
|
986
|
+
{
|
|
987
|
+
"type": "github",
|
|
988
|
+
"url": "https://github.com/sponsors/markdown-it"
|
|
989
|
+
}
|
|
990
|
+
],
|
|
969
991
|
"license": "MIT",
|
|
970
992
|
"dependencies": {
|
|
971
993
|
"uc.micro": "^2.0.0"
|
|
@@ -1045,13 +1067,23 @@
|
|
|
1045
1067
|
"license": "ISC"
|
|
1046
1068
|
},
|
|
1047
1069
|
"node_modules/markdown-it": {
|
|
1048
|
-
"version": "14.
|
|
1049
|
-
"integrity": "sha512-
|
|
1070
|
+
"version": "14.2.0",
|
|
1071
|
+
"integrity": "sha512-1TGiQiJVRQ3NPmZH6sx5Cfnmg6GQm9jvC1ch4TK511NjSJvjzKLzn5pPfZRNZkRPZP0HqCioSndqH8v2nRaWVQ==",
|
|
1072
|
+
"funding": [
|
|
1073
|
+
{
|
|
1074
|
+
"type": "github",
|
|
1075
|
+
"url": "https://github.com/sponsors/puzrin"
|
|
1076
|
+
},
|
|
1077
|
+
{
|
|
1078
|
+
"type": "github",
|
|
1079
|
+
"url": "https://github.com/sponsors/markdown-it"
|
|
1080
|
+
}
|
|
1081
|
+
],
|
|
1050
1082
|
"license": "MIT",
|
|
1051
1083
|
"dependencies": {
|
|
1052
1084
|
"argparse": "^2.0.1",
|
|
1053
1085
|
"entities": "^4.4.0",
|
|
1054
|
-
"linkify-it": "^5.0.
|
|
1086
|
+
"linkify-it": "^5.0.1",
|
|
1055
1087
|
"mdurl": "^2.0.0",
|
|
1056
1088
|
"punycode.js": "^2.3.1",
|
|
1057
1089
|
"uc.micro": "^2.1.0"
|
|
@@ -1419,8 +1451,8 @@
|
|
|
1419
1451
|
"license": "MIT"
|
|
1420
1452
|
},
|
|
1421
1453
|
"node_modules/semver": {
|
|
1422
|
-
"version": "7.
|
|
1423
|
-
"integrity": "sha512-
|
|
1454
|
+
"version": "7.8.4",
|
|
1455
|
+
"integrity": "sha512-rUCObTnP32Q08R2uuIrt7r9PlEonuTmtuXYcW6s5kjdlj3xbnwe+21yXptAUYcMAABLkYYTtnmzb3w3EDZfueA==",
|
|
1424
1456
|
"license": "ISC",
|
|
1425
1457
|
"bin": {
|
|
1426
1458
|
"semver": "bin/semver.js"
|
|
@@ -1570,8 +1602,9 @@
|
|
|
1570
1602
|
}
|
|
1571
1603
|
},
|
|
1572
1604
|
"node_modules/tar": {
|
|
1573
|
-
"version": "7.5.
|
|
1574
|
-
"integrity": "sha512-
|
|
1605
|
+
"version": "7.5.16",
|
|
1606
|
+
"integrity": "sha512-56adEpPMouktRlBLXiaYFFzZ/3+JXa8P9n7WbR+ibIjtviN55mEaOkiysCnPnWm+7kkui1Dn8J9l+g6zV8731w==",
|
|
1607
|
+
"license": "BlueOak-1.0.0",
|
|
1575
1608
|
"dependencies": {
|
|
1576
1609
|
"@isaacs/fs-minipass": "^4.0.0",
|
|
1577
1610
|
"chownr": "^3.0.0",
|
|
@@ -1620,6 +1653,7 @@
|
|
|
1620
1653
|
},
|
|
1621
1654
|
"node_modules/uc.micro": {
|
|
1622
1655
|
"version": "2.1.0",
|
|
1656
|
+
"integrity": "sha512-ARDJmphmdvUk6Glw7y9DQ2bFkKBHwQHLi2lsaH6PPmz/Ka9sFOBsBluozhDltWmnv9u/cF6Rt87znRTPV+yp/A==",
|
|
1623
1657
|
"license": "MIT"
|
|
1624
1658
|
},
|
|
1625
1659
|
"node_modules/universalify": {
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@zowe/cli",
|
|
3
|
-
"version": "8.
|
|
3
|
+
"version": "8.33.0",
|
|
4
4
|
"zoweVersion": "v3.5.0",
|
|
5
5
|
"description": "Zowe CLI is a command line interface (CLI) that provides a simple and streamlined way to interact with IBM z/OS.",
|
|
6
6
|
"author": "Zowe",
|
|
@@ -57,26 +57,26 @@
|
|
|
57
57
|
"preshrinkwrap": "node ../../scripts/rewriteShrinkwrap.js"
|
|
58
58
|
},
|
|
59
59
|
"dependencies": {
|
|
60
|
-
"@zowe/core-for-zowe-sdk": "8.
|
|
61
|
-
"@zowe/imperative": "8.
|
|
62
|
-
"@zowe/provisioning-for-zowe-sdk": "8.
|
|
63
|
-
"@zowe/zos-console-for-zowe-sdk": "8.
|
|
64
|
-
"@zowe/zos-files-for-zowe-sdk": "8.
|
|
65
|
-
"@zowe/zos-jobs-for-zowe-sdk": "8.
|
|
66
|
-
"@zowe/zos-logs-for-zowe-sdk": "8.
|
|
67
|
-
"@zowe/zos-tso-for-zowe-sdk": "8.
|
|
68
|
-
"@zowe/zos-uss-for-zowe-sdk": "8.
|
|
69
|
-
"@zowe/zos-workflows-for-zowe-sdk": "8.
|
|
70
|
-
"@zowe/zosmf-for-zowe-sdk": "8.
|
|
60
|
+
"@zowe/core-for-zowe-sdk": "8.33.0",
|
|
61
|
+
"@zowe/imperative": "8.33.0",
|
|
62
|
+
"@zowe/provisioning-for-zowe-sdk": "8.33.0",
|
|
63
|
+
"@zowe/zos-console-for-zowe-sdk": "8.33.0",
|
|
64
|
+
"@zowe/zos-files-for-zowe-sdk": "8.33.0",
|
|
65
|
+
"@zowe/zos-jobs-for-zowe-sdk": "8.33.0",
|
|
66
|
+
"@zowe/zos-logs-for-zowe-sdk": "8.33.0",
|
|
67
|
+
"@zowe/zos-tso-for-zowe-sdk": "8.33.0",
|
|
68
|
+
"@zowe/zos-uss-for-zowe-sdk": "8.33.0",
|
|
69
|
+
"@zowe/zos-workflows-for-zowe-sdk": "8.33.0",
|
|
70
|
+
"@zowe/zosmf-for-zowe-sdk": "8.33.0",
|
|
71
71
|
"find-process": "^1.4.7",
|
|
72
72
|
"lodash": "^4.17.23",
|
|
73
73
|
"minimatch": "^10.2.3",
|
|
74
|
-
"tar": "^7.5.
|
|
74
|
+
"tar": "^7.5.16"
|
|
75
75
|
},
|
|
76
76
|
"devDependencies": {
|
|
77
77
|
"@types/diff": "^5.0.9",
|
|
78
78
|
"@types/lodash": "^4.17.6",
|
|
79
|
-
"@zowe/cli-test-utils": "8.
|
|
79
|
+
"@zowe/cli-test-utils": "8.33.0",
|
|
80
80
|
"comment-json": "^4.2.3",
|
|
81
81
|
"strip-ansi": "^6.0.1",
|
|
82
82
|
"which": "^4.0.0"
|