diff --git a/package.json b/package.json index b554f4da61..6ad007b153 100644 --- a/package.json +++ b/package.json @@ -16,7 +16,7 @@ "vscode": "^1.53.2" }, "dependencies": { - "@zowe/cli": "7.21.4", + "@zowe/cli": "7.22.0", "vscode-nls": "4.1.2" }, "devDependencies": { diff --git a/packages/zowe-explorer-api/package.json b/packages/zowe-explorer-api/package.json index 1ebecb28c5..3bdfdd2e02 100644 --- a/packages/zowe-explorer-api/package.json +++ b/packages/zowe-explorer-api/package.json @@ -18,7 +18,7 @@ }, "dependencies": { "@types/vscode": "^1.53.2", - "@zowe/cli": "7.21.4", + "@zowe/cli": "7.22.0", "@zowe/secrets-for-zowe-sdk": "7.18.6", "handlebars": "^4.7.7", "semver": "^7.5.3" diff --git a/packages/zowe-explorer-api/src/profiles/ProfilesCache.ts b/packages/zowe-explorer-api/src/profiles/ProfilesCache.ts index c11eeab53e..a4718a0b6c 100644 --- a/packages/zowe-explorer-api/src/profiles/ProfilesCache.ts +++ b/packages/zowe-explorer-api/src/profiles/ProfilesCache.ts @@ -544,7 +544,7 @@ export class ProfilesCache { profile?.profile?.host && profile?.profile?.port && (baseProfile?.profile.host !== profile?.profile.host || baseProfile?.profile.port !== profile?.profile.port) && - profile?.profile.tokenType.startsWith(zowe.imperative.SessConstants.TOKEN_TYPE_APIML)) as boolean; + profile?.profile.tokenType?.startsWith(zowe.imperative.SessConstants.TOKEN_TYPE_APIML)) as boolean; } public async updateBaseProfileFileLogin( diff --git a/packages/zowe-explorer-ftp-extension/__tests__/__unit__/Jes/ZoweExplorerFtpJesApi.unit.test.ts b/packages/zowe-explorer-ftp-extension/__tests__/__unit__/Jes/ZoweExplorerFtpJesApi.unit.test.ts index 0dad543708..9f8b34c5c0 100644 --- a/packages/zowe-explorer-ftp-extension/__tests__/__unit__/Jes/ZoweExplorerFtpJesApi.unit.test.ts +++ b/packages/zowe-explorer-ftp-extension/__tests__/__unit__/Jes/ZoweExplorerFtpJesApi.unit.test.ts @@ -107,7 +107,7 @@ describe("FtpJesApi", () => { }; await JesApi.getSpoolContentById(mockParams.jobname, mockParams.jobid, mockParams.spoolID); - expect(response._readableState.buffer.head.data.toString()).toContain("Hello world"); + expect((response._readableState.buffer.head?.data ?? response._readableState.buffer).toString()).toContain("Hello world"); expect(JobUtils.getSpoolFileContent).toBeCalledTimes(1); expect(JesApi.releaseConnection).toBeCalled(); }); diff --git a/packages/zowe-explorer-ftp-extension/__tests__/__unit__/Mvs/ZoweExplorerFtpMvsApi.unit.test.ts b/packages/zowe-explorer-ftp-extension/__tests__/__unit__/Mvs/ZoweExplorerFtpMvsApi.unit.test.ts index 2d4ca5f5ff..7a9c334def 100644 --- a/packages/zowe-explorer-ftp-extension/__tests__/__unit__/Mvs/ZoweExplorerFtpMvsApi.unit.test.ts +++ b/packages/zowe-explorer-ftp-extension/__tests__/__unit__/Mvs/ZoweExplorerFtpMvsApi.unit.test.ts @@ -95,7 +95,7 @@ describe("FtpMvsApi", () => { expect(DataSetUtils.downloadDataSet).toBeCalledTimes(1); expect(MvsApi.releaseConnection).toBeCalled(); - expect(response._readableState.buffer.head.data.toString()).toContain("Hello world"); + expect((response._readableState.buffer.head?.data ?? response._readableState.buffer).toString()).toContain("Hello world"); }); it("should upload content to dataset.", async () => { diff --git a/packages/zowe-explorer-ftp-extension/__tests__/__unit__/Uss/ZoweExplorerFtpUssApi.unit.test.ts b/packages/zowe-explorer-ftp-extension/__tests__/__unit__/Uss/ZoweExplorerFtpUssApi.unit.test.ts index 18ecf95c59..ed9c03f52e 100644 --- a/packages/zowe-explorer-ftp-extension/__tests__/__unit__/Uss/ZoweExplorerFtpUssApi.unit.test.ts +++ b/packages/zowe-explorer-ftp-extension/__tests__/__unit__/Uss/ZoweExplorerFtpUssApi.unit.test.ts @@ -79,7 +79,7 @@ describe("FtpUssApi", () => { expect(UssUtils.downloadFile).toBeCalledTimes(1); expect(UssApi.releaseConnection).toBeCalled(); - expect(response._readableState.buffer.head.data.toString()).toContain("Hello world"); + expect((response._readableState.buffer.head?.data ?? response._readableState.buffer).toString()).toContain("Hello world"); }); const mockUssFileParams = { diff --git a/packages/zowe-explorer/src/Profiles.ts b/packages/zowe-explorer/src/Profiles.ts index c8ae5cce70..186ec8431f 100644 --- a/packages/zowe-explorer/src/Profiles.ts +++ b/packages/zowe-explorer/src/Profiles.ts @@ -1309,7 +1309,7 @@ export class Profiles extends ProfilesCache { if ( serviceProfile.type !== "zosmf" && serviceProfile.profile != null && - !serviceProfile.profile.tokenType.startsWith(zowe.imperative.SessConstants.TOKEN_TYPE_APIML) + !serviceProfile.profile.tokenType?.startsWith(zowe.imperative.SessConstants.TOKEN_TYPE_APIML) ) { await ZoweExplorerApiRegister.getInstance() .getCommonApi(serviceProfile) @@ -1342,13 +1342,13 @@ export class Profiles extends ProfilesCache { if (!profileName) { return []; } - const usingSecureCreds = !SettingsConfig.getDirectValue(globals.SETTINGS_SECURE_CREDENTIALS_ENABLED); - if ((await this.getProfileInfo()).usingTeamConfig && !usingSecureCreds) { - const config = (await this.getProfileInfo()).getTeamConfig(); - return config.api.secure.securePropsForProfile(profileName); + const usingSecureCreds = SettingsConfig.getDirectValue(globals.SETTINGS_SECURE_CREDENTIALS_ENABLED); + const profInfo = await this.getProfileInfo(); + if (profInfo.usingTeamConfig && usingSecureCreds) { + return profInfo.getTeamConfig().api.secure.securePropsForProfile(profileName); } const profAttrs = await this.getProfileFromConfig(profileName); - const mergedArgs = (await this.getProfileInfo()).mergeArgsForProfile(profAttrs); + const mergedArgs = profInfo.mergeArgsForProfile(profAttrs); return mergedArgs.knownArgs .filter((arg) => arg.secure || arg.argName === "tokenType" || arg.argName === "tokenValue") .map((arg) => arg.argName); diff --git a/packages/zowe-explorer/src/utils/ProfileManagement.ts b/packages/zowe-explorer/src/utils/ProfileManagement.ts index ac325b468a..e2c2743831 100644 --- a/packages/zowe-explorer/src/utils/ProfileManagement.ts +++ b/packages/zowe-explorer/src/utils/ProfileManagement.ts @@ -57,7 +57,7 @@ export class ProfileManagement { } case await ProfilesUtils.isUsingTokenAuth(profile.name): { ZoweLogger.debug(`Profile ${profile.name} is using token authentication.`); - selected = await this.setupProfileManagementQp("token", node); + selected = await this.setupProfileManagementQp(imperative.SessConstants.AUTH_TYPE_TOKEN, node); break; } // will need a case for isUsingCertAuth @@ -177,7 +177,7 @@ export class ProfileManagement { qp.placeholder = placeholders.basicAuth; break; } - case "token": { + case imperative.SessConstants.AUTH_TYPE_TOKEN: { quickPickOptions = this.tokenAuthQp(node); qp.placeholder = placeholders.tokenAuth; break; diff --git a/samples/uss-profile-sample/package.json b/samples/uss-profile-sample/package.json index 70433776c7..8ef06f49e9 100644 --- a/samples/uss-profile-sample/package.json +++ b/samples/uss-profile-sample/package.json @@ -33,7 +33,7 @@ "watch": "tsc -watch -p ./" }, "dependencies": { - "@zowe/cli": "7.21.4", + "@zowe/cli": "7.22.0", "@zowe/zowe-explorer-api": "file:../../packages/zowe-explorer-api", "ssh2-sftp-client": "^9.1.0" }, diff --git a/samples/uss-profile-sample/yarn.lock b/samples/uss-profile-sample/yarn.lock index 706cfe1773..fcf9f56563 100644 --- a/samples/uss-profile-sample/yarn.lock +++ b/samples/uss-profile-sample/yarn.lock @@ -279,22 +279,22 @@ "@typescript-eslint/types" "5.62.0" eslint-visitor-keys "^3.3.0" -"@zowe/cli@7.21.0": - version "7.21.0" - resolved "https://registry.npmjs.org/@zowe/cli/-/cli-7.21.0.tgz#748feccf9d7832daac5e5ceb61a784ef7ea65fb3" - integrity sha512-XSwgjfOpzMeXAVpzDHiZjFdYhcWqyZjlKyCUWWqN/Kw87OqvWYkUlvDrCk2RkynTiGP48E+4Zto1ZbvjH00cCw== - dependencies: - "@zowe/core-for-zowe-sdk" "7.21.0" - "@zowe/imperative" "5.20.0" - "@zowe/provisioning-for-zowe-sdk" "7.21.0" - "@zowe/zos-console-for-zowe-sdk" "7.21.0" - "@zowe/zos-files-for-zowe-sdk" "7.21.0" - "@zowe/zos-jobs-for-zowe-sdk" "7.21.0" - "@zowe/zos-logs-for-zowe-sdk" "7.21.0" - "@zowe/zos-tso-for-zowe-sdk" "7.21.0" - "@zowe/zos-uss-for-zowe-sdk" "7.21.0" - "@zowe/zos-workflows-for-zowe-sdk" "7.21.0" - "@zowe/zosmf-for-zowe-sdk" "7.21.0" +"@zowe/cli@7.22.0": + version "7.22.0" + resolved "https://registry.npmjs.org/@zowe/cli/-/cli-7.22.0.tgz#63e648337a1d61aad017748acca7468dc3940a24" + integrity sha512-Z+9403u7pPpge+WHAuuMqwSBaWNC+3qw0eL5aIVPgnvGPpQWWN0sL5mOaDo117GN9I1p8ee7tWqwrcll55tP0w== + dependencies: + "@zowe/core-for-zowe-sdk" "7.22.0" + "@zowe/imperative" "5.21.0" + "@zowe/provisioning-for-zowe-sdk" "7.22.0" + "@zowe/zos-console-for-zowe-sdk" "7.22.0" + "@zowe/zos-files-for-zowe-sdk" "7.22.0" + "@zowe/zos-jobs-for-zowe-sdk" "7.22.0" + "@zowe/zos-logs-for-zowe-sdk" "7.22.0" + "@zowe/zos-tso-for-zowe-sdk" "7.22.0" + "@zowe/zos-uss-for-zowe-sdk" "7.22.0" + "@zowe/zos-workflows-for-zowe-sdk" "7.22.0" + "@zowe/zosmf-for-zowe-sdk" "7.22.0" find-process "1.4.7" get-stream "6.0.1" lodash "4.17.21" @@ -303,18 +303,18 @@ optionalDependencies: "@zowe/secrets-for-zowe-sdk" "7.18.6" -"@zowe/core-for-zowe-sdk@7.21.0": - version "7.21.0" - resolved "https://registry.npmjs.org/@zowe/core-for-zowe-sdk/-/core-for-zowe-sdk-7.21.0.tgz#d35d5757eae41e43e3f998342a31b2570bb1b143" - integrity sha512-QNabrsS0FkNDpb7Hm51e/oLDTR7kgchsg9BtqbeEhduUFzqlPeQUumN5j8J37DSz9HJZcaBZakNg9wEwj4xQkg== +"@zowe/core-for-zowe-sdk@7.22.0": + version "7.22.0" + resolved "https://registry.npmjs.org/@zowe/core-for-zowe-sdk/-/core-for-zowe-sdk-7.22.0.tgz#ae271ee84e52f48b5508b74affb5f9aa5d4adbdf" + integrity sha512-uLkbxn0KvI6MiSZ8Y0SZRFJhvDarwhlvvW/oiSjIyNHeNtuTb31s5eYLTCdvX585om98wyVEKwYWK3ITzQ6w6g== dependencies: comment-json "4.1.1" string-width "4.2.3" -"@zowe/imperative@5.20.0": - version "5.20.0" - resolved "https://registry.npmjs.org/@zowe/imperative/-/imperative-5.20.0.tgz#f3fa5edb52748cd2bf08d35a755a66703d355c0e" - integrity sha512-UtVMBO3T+zZSdVS3zHn0TPFhJ9N/9ieydbDeJml1vA0oEHZETbid0Q7LScgaGCPV4hJxwCyaBUpamv1IeFx3QQ== +"@zowe/imperative@5.21.0": + version "5.21.0" + resolved "https://registry.npmjs.org/@zowe/imperative/-/imperative-5.21.0.tgz#52cd216bf04a15fe60fcc9fa4603dba0f8c59da2" + integrity sha512-yjt3Mmn1ItfZZK42SecH+2U5rSvKl6k4ZqPvFaQIvzfVwhOeXi3Srx6/ulxDhSPN0txPUgeyIxz+PHSPtN5Elw== dependencies: "@types/yargs" "13.0.4" chalk "2.4.2" @@ -353,10 +353,10 @@ yamljs "0.3.0" yargs "15.3.1" -"@zowe/provisioning-for-zowe-sdk@7.21.0": - version "7.21.0" - resolved "https://registry.npmjs.org/@zowe/provisioning-for-zowe-sdk/-/provisioning-for-zowe-sdk-7.21.0.tgz#141622245d59ba134157a4c94f5842946ed1c86f" - integrity sha512-bKKRzl1Qa/XBzqLDsMJqhRmpgeC1+Rra+1cBqmk63qh1BMsrkgrUQaeGJimpD3wJJHxfX8LYW59FDL92bb3S1w== +"@zowe/provisioning-for-zowe-sdk@7.22.0": + version "7.22.0" + resolved "https://registry.npmjs.org/@zowe/provisioning-for-zowe-sdk/-/provisioning-for-zowe-sdk-7.22.0.tgz#01bcd2a182c219115779b3f3aeee65e2f846d349" + integrity sha512-5wX+qXxXL3WlmmS9rnDDZeUL4K4fuUAJ+8H+z8z0qv++ffZSJc36Jkmi/D5tX9FanmB0/kpCgeHqx1rWE/mYtA== dependencies: js-yaml "4.1.0" @@ -365,62 +365,62 @@ resolved "https://registry.npmjs.org/@zowe/secrets-for-zowe-sdk/-/secrets-for-zowe-sdk-7.18.6.tgz#6b854b344babb291c26d19d82633099a46e08452" integrity sha512-YyS1NoXddb147mBQpu5/dTfo1gdwGa/xdg85U8KCngA+RHCmNct3n2rbK3tHx9C9H6rlgjeS+Mrux5Q+PHJUgQ== -"@zowe/zos-console-for-zowe-sdk@7.21.0": - version "7.21.0" - resolved "https://registry.npmjs.org/@zowe/zos-console-for-zowe-sdk/-/zos-console-for-zowe-sdk-7.21.0.tgz#eb0d1f3813e6edde92d36fb3620245b98a5577df" - integrity sha512-fQjc4ouovPuOvi+4kf8PDL3GBf01j0sRboHj/zHvrAhO+q8ILB9ukTWyvGlRMe3Hgg89pYKLwprTDvtqxxJSUw== +"@zowe/zos-console-for-zowe-sdk@7.22.0": + version "7.22.0" + resolved "https://registry.npmjs.org/@zowe/zos-console-for-zowe-sdk/-/zos-console-for-zowe-sdk-7.22.0.tgz#2088bee1963a9fa602df055a7078f63667a80f44" + integrity sha512-EI9rK76eq5kGXJqGkhobLMdNJstVUSswJ2JlNvGzwOQD/jV/7OJRHSHPllygMGaos8Rh14mzPDooeb9CBr5faA== -"@zowe/zos-files-for-zowe-sdk@7.21.0": - version "7.21.0" - resolved "https://registry.npmjs.org/@zowe/zos-files-for-zowe-sdk/-/zos-files-for-zowe-sdk-7.21.0.tgz#1af17544294f14ab382bb4b2bcdf0ed212a86591" - integrity sha512-9NIpyI7EKSJJVN66RwMKZ+cbsSD2Pp5wxJIunUgdplfKgUn7R6FF4uYQJa3ChyVYp+vdKcRcuWU8Gh8Gl79lEw== +"@zowe/zos-files-for-zowe-sdk@7.22.0": + version "7.22.0" + resolved "https://registry.npmjs.org/@zowe/zos-files-for-zowe-sdk/-/zos-files-for-zowe-sdk-7.22.0.tgz#a692b09016c0350685cf085dc47cb9591fec11d3" + integrity sha512-jw1j9q77DTQgm5i0YuslN454zC4eS0qb5PnfZ1thCbUugLxI/LRR1CgV59rTfqMGHMjXyfmmqjtCot4NMLUV1A== dependencies: get-stream "6.0.1" minimatch "5.0.1" -"@zowe/zos-jobs-for-zowe-sdk@7.21.0": - version "7.21.0" - resolved "https://registry.npmjs.org/@zowe/zos-jobs-for-zowe-sdk/-/zos-jobs-for-zowe-sdk-7.21.0.tgz#bce05b961fdc2f04719ff075b13a26d2141bd9c6" - integrity sha512-ZFroZA/0+EsfLU34HyG/MemcraJVOpL7ASl9ox4yvOWkua6tlfTxB5NFwaEQRmQk4U+hGKGg5Ns1QKzAPAxVkA== +"@zowe/zos-jobs-for-zowe-sdk@7.22.0": + version "7.22.0" + resolved "https://registry.npmjs.org/@zowe/zos-jobs-for-zowe-sdk/-/zos-jobs-for-zowe-sdk-7.22.0.tgz#4447071d304bc8c6348c08bdd8f28e84213aa1ac" + integrity sha512-QdKjWgQV7uEvLhHED48TBmQ2EhKn8ZG9OVrZiAa82k0AIsps5U2Wv/W9M1PyWlCEWQP/Zok7PpRWi3Bbv010cQ== dependencies: - "@zowe/zos-files-for-zowe-sdk" "7.21.0" + "@zowe/zos-files-for-zowe-sdk" "7.22.0" -"@zowe/zos-logs-for-zowe-sdk@7.21.0": - version "7.21.0" - resolved "https://registry.npmjs.org/@zowe/zos-logs-for-zowe-sdk/-/zos-logs-for-zowe-sdk-7.21.0.tgz#863a4f30891f7679e346150a006d422988d4b295" - integrity sha512-egYBu+oDK8BoHmRY1ILi+DrtKJjC3aaEaez/j77N0SO0AmT66GVkB0NMgQehkeCS0ajd2URmujT+/4Eq5DsQ5g== +"@zowe/zos-logs-for-zowe-sdk@7.22.0": + version "7.22.0" + resolved "https://registry.npmjs.org/@zowe/zos-logs-for-zowe-sdk/-/zos-logs-for-zowe-sdk-7.22.0.tgz#61500c48b76c2458243508d83137f221393ffb44" + integrity sha512-XA/ZH1LsdqE9vTA6GOlI3t6RsgA7hf+efImVltE9brVlFrrIgXCD46A9CVDl6bmkp/tFQqCdMYHjHFbWiwN4WA== -"@zowe/zos-tso-for-zowe-sdk@7.21.0": - version "7.21.0" - resolved "https://registry.npmjs.org/@zowe/zos-tso-for-zowe-sdk/-/zos-tso-for-zowe-sdk-7.21.0.tgz#64ffa4b755368c1f117499941044fc3d93caed23" - integrity sha512-ElxZlGvLDWcXHYDbHu7wTU69LlzoQHF/r70Gn3ikr8TkLOuqy57EPxYpTTbBr0bAAF9O54ciYPQ4Knpmkk8ZbA== +"@zowe/zos-tso-for-zowe-sdk@7.22.0": + version "7.22.0" + resolved "https://registry.npmjs.org/@zowe/zos-tso-for-zowe-sdk/-/zos-tso-for-zowe-sdk-7.22.0.tgz#38c0ba26bbcc6af0564911883e21bd9ad5c217e4" + integrity sha512-vzhKJUk6E/EHjH8BadCfpL45C40qmJxYlSHAIHitAtFcOkI4F7i13mlgulaxPCiTTV3jBw4g+JoJe8DwG1eiyA== dependencies: - "@zowe/zosmf-for-zowe-sdk" "7.21.0" + "@zowe/zosmf-for-zowe-sdk" "7.22.0" -"@zowe/zos-uss-for-zowe-sdk@7.21.0": - version "7.21.0" - resolved "https://registry.npmjs.org/@zowe/zos-uss-for-zowe-sdk/-/zos-uss-for-zowe-sdk-7.21.0.tgz#ce6c90d314845ecd2337ca585d6ab6689413f251" - integrity sha512-UH+7o1cjZ+OuL3HuVjTd07Q8cLJQunYdjM4haWb5ayuUnc0/hSMH7AmjyVPP15YttCFLATsfbRh3ruW/7oYnrA== +"@zowe/zos-uss-for-zowe-sdk@7.22.0": + version "7.22.0" + resolved "https://registry.npmjs.org/@zowe/zos-uss-for-zowe-sdk/-/zos-uss-for-zowe-sdk-7.22.0.tgz#3b6bb8dedae1a6c4f367189cf6b3bdbab0aca822" + integrity sha512-c3yXBdBWW2I1WbkMvgmx/EMNEpxJmCRZ0gygjYd1xM//wWhPaigOVY5XSRTpnXS0UY6KOX9T7ZymlCe6XzAhEQ== dependencies: - ssh2 "1.11.0" + ssh2 "1.15.0" -"@zowe/zos-workflows-for-zowe-sdk@7.21.0": - version "7.21.0" - resolved "https://registry.npmjs.org/@zowe/zos-workflows-for-zowe-sdk/-/zos-workflows-for-zowe-sdk-7.21.0.tgz#66b09c655ef819b0f44a31fcd0bdcfd4d255c244" - integrity sha512-9BEVXlwzLoIZmDdaduW//WIReCnQz9QbJD645BkIngbeio0tEuI3/oe/I088gHDjqZucV1mJ51b7z5i1yNElHQ== +"@zowe/zos-workflows-for-zowe-sdk@7.22.0": + version "7.22.0" + resolved "https://registry.npmjs.org/@zowe/zos-workflows-for-zowe-sdk/-/zos-workflows-for-zowe-sdk-7.22.0.tgz#05537853832bcf2307a78907459fb43e59ca22ed" + integrity sha512-arM0gVpm0zM84JuIZSWTK+bCqu6gED0ubYJZAdI5ttsjSaiv+E4LM1OUkd05n0HCUGYeNrL30LEsswHUM7cqZA== dependencies: - "@zowe/zos-files-for-zowe-sdk" "7.21.0" + "@zowe/zos-files-for-zowe-sdk" "7.22.0" -"@zowe/zosmf-for-zowe-sdk@7.21.0": - version "7.21.0" - resolved "https://registry.npmjs.org/@zowe/zosmf-for-zowe-sdk/-/zosmf-for-zowe-sdk-7.21.0.tgz#e540b2eec3e36d73b491f3db3a366eeb48b55273" - integrity sha512-uvraOpYVMVmDSjCiQcvPukauQSabXGgY+FwMBFdDw0kCs0b/1jVAQA5jVgzNuvuTlD4l+pCJYILsh/lmb9SfqA== +"@zowe/zosmf-for-zowe-sdk@7.22.0": + version "7.22.0" + resolved "https://registry.npmjs.org/@zowe/zosmf-for-zowe-sdk/-/zosmf-for-zowe-sdk-7.22.0.tgz#cc87f28acf60b600eca5111d35ac8668aaec192a" + integrity sha512-D4nbTDr5uJxJev9+zNwbq/3Z3DuQR6qfmbofzDGYYaU1peFO7+ioFN+uAInFBS1jqj4iHko2KINJfPZFALg3/A== "@zowe/zowe-explorer-api@file:../../packages/zowe-explorer-api": version "2.14.0-SNAPSHOT" dependencies: "@types/vscode" "^1.53.2" - "@zowe/cli" "7.21.0" + "@zowe/cli" "7.22.0" "@zowe/secrets-for-zowe-sdk" "7.18.6" handlebars "^4.7.7" semver "^7.5.3" @@ -513,7 +513,7 @@ array-union@^2.1.0: resolved "https://registry.npmjs.org/array-union/-/array-union-2.1.0.tgz#b798420adbeb1de828d84acd8a2e23d3efe85e8d" integrity sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw== -asn1@^0.2.4, asn1@^0.2.6: +asn1@^0.2.6: version "0.2.6" resolved "https://registry.npmjs.org/asn1/-/asn1-0.2.6.tgz#0d3a7bb6e64e02a90c0303b31f292868ea09a08d" integrity sha512-ix/FxPn0MDjeyJ7i/yoHGFt/EX6LyNbxSEhPPXODPL+KB0VPk86UYfL0lMdy+KCnv+fmvIzySwaK5COwqVbWTQ== @@ -725,7 +725,7 @@ core-util-is@^1.0.2: resolved "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.3.tgz#a6042d3634c2b27e9328f837b965fac83808db85" integrity sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ== -cpu-features@~0.0.4, cpu-features@~0.0.8: +cpu-features@~0.0.8, cpu-features@~0.0.9: version "0.0.9" resolved "https://registry.npmjs.org/cpu-features/-/cpu-features-0.0.9.tgz#5226b92f0f1c63122b0a3eb84cb8335a4de499fc" integrity sha512-AKjgn2rP2yJyfbepsmLfiYcmtNn/2eUvocUyM/09yB0YDiz39HteK/5/T4Onf0pmdYDMgkBoGvRLvEguzyL7wQ== @@ -1602,11 +1602,16 @@ mute-stream@~0.0.4: resolved "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.8.tgz#1630c42b2251ff81e2a283de96a5497ea92e5e0d" integrity sha512-nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA== -nan@^2.16.0, nan@^2.17.0: +nan@^2.17.0: version "2.17.0" resolved "https://registry.npmjs.org/nan/-/nan-2.17.0.tgz#c0150a2368a182f033e9aa5195ec76ea41a199cb" integrity sha512-2ZTgtl0nJsO0KQCjEpxcIr5D+Yv90plTitZt9JBfQvVJDS5seMl3FOvsh3+9CoYWXf/1l5OaZzzF6nDm4cagaQ== +nan@^2.18.0: + version "2.18.0" + resolved "https://registry.npmjs.org/nan/-/nan-2.18.0.tgz#26a6faae7ffbeb293a39660e88a76b82e30b7554" + integrity sha512-W7tfG7vMOGtD30sHoZSSc/JVYiyDPEyQVso/Zz+/uQd0B0L46gtC+pHha5FFMRpil6fm/AoEcRWyOVi4+E/f8w== + natural-compare-lite@^1.4.0: version "1.4.0" resolved "https://registry.npmjs.org/natural-compare-lite/-/natural-compare-lite-1.4.0.tgz#17b09581988979fddafe0201e931ba933c96cbb4" @@ -2064,16 +2069,16 @@ ssh2-sftp-client@^9.1.0: promise-retry "^2.0.1" ssh2 "^1.12.0" -ssh2@1.11.0: - version "1.11.0" - resolved "https://registry.npmjs.org/ssh2/-/ssh2-1.11.0.tgz#ce60186216971e12f6deb553dcf82322498fe2e4" - integrity sha512-nfg0wZWGSsfUe/IBJkXVll3PEZ//YH2guww+mP88gTpuSU4FtZN7zu9JoeTGOyCNx2dTDtT9fOpWwlzyj4uOOw== +ssh2@1.15.0: + version "1.15.0" + resolved "https://registry.npmjs.org/ssh2/-/ssh2-1.15.0.tgz#2f998455036a7f89e0df5847efb5421748d9871b" + integrity sha512-C0PHgX4h6lBxYx7hcXwu3QWdh4tg6tZZsTfXcdvc5caW/EMxaB4H9dWsl7qk+F7LAW762hp8VbXOX7x4xUYvEw== dependencies: - asn1 "^0.2.4" + asn1 "^0.2.6" bcrypt-pbkdf "^1.0.2" optionalDependencies: - cpu-features "~0.0.4" - nan "^2.16.0" + cpu-features "~0.0.9" + nan "^2.18.0" ssh2@^1.12.0: version "1.14.0" diff --git a/yarn.lock b/yarn.lock index fdc9702ff2..048d2e2033 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2642,22 +2642,22 @@ resolved "https://registry.npmjs.org/@xtuc/long/-/long-4.2.2.tgz" integrity sha512-NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ== -"@zowe/cli@7.21.4": - version "7.21.4" - resolved "https://registry.npmjs.org/@zowe/cli/-/cli-7.21.4.tgz#83f54f3226369b31ea2a91c6299b94299d4e4151" - integrity sha512-Yo4XcPcXi3M/6vo1POQZuQSogWVCDm1XnOUxmduSJFRgWXogZY9OpH6svzpf2am63705jTXbnF3eSeWLPTwryw== - dependencies: - "@zowe/core-for-zowe-sdk" "7.21.4" - "@zowe/imperative" "5.20.2" - "@zowe/provisioning-for-zowe-sdk" "7.21.4" - "@zowe/zos-console-for-zowe-sdk" "7.21.4" - "@zowe/zos-files-for-zowe-sdk" "7.21.4" - "@zowe/zos-jobs-for-zowe-sdk" "7.21.4" - "@zowe/zos-logs-for-zowe-sdk" "7.21.4" - "@zowe/zos-tso-for-zowe-sdk" "7.21.4" - "@zowe/zos-uss-for-zowe-sdk" "7.21.4" - "@zowe/zos-workflows-for-zowe-sdk" "7.21.4" - "@zowe/zosmf-for-zowe-sdk" "7.21.4" +"@zowe/cli@7.22.0": + version "7.22.0" + resolved "https://registry.npmjs.org/@zowe/cli/-/cli-7.22.0.tgz#63e648337a1d61aad017748acca7468dc3940a24" + integrity sha512-Z+9403u7pPpge+WHAuuMqwSBaWNC+3qw0eL5aIVPgnvGPpQWWN0sL5mOaDo117GN9I1p8ee7tWqwrcll55tP0w== + dependencies: + "@zowe/core-for-zowe-sdk" "7.22.0" + "@zowe/imperative" "5.21.0" + "@zowe/provisioning-for-zowe-sdk" "7.22.0" + "@zowe/zos-console-for-zowe-sdk" "7.22.0" + "@zowe/zos-files-for-zowe-sdk" "7.22.0" + "@zowe/zos-jobs-for-zowe-sdk" "7.22.0" + "@zowe/zos-logs-for-zowe-sdk" "7.22.0" + "@zowe/zos-tso-for-zowe-sdk" "7.22.0" + "@zowe/zos-uss-for-zowe-sdk" "7.22.0" + "@zowe/zos-workflows-for-zowe-sdk" "7.22.0" + "@zowe/zosmf-for-zowe-sdk" "7.22.0" find-process "1.4.7" get-stream "6.0.1" lodash "4.17.21" @@ -2666,18 +2666,18 @@ optionalDependencies: "@zowe/secrets-for-zowe-sdk" "7.18.6" -"@zowe/core-for-zowe-sdk@7.21.4": - version "7.21.4" - resolved "https://registry.npmjs.org/@zowe/core-for-zowe-sdk/-/core-for-zowe-sdk-7.21.4.tgz#31b8a282caf4bf3e693570f60205318c70448648" - integrity sha512-8pJNrd6RPnQN/ljlSxJzoRRTHUmqSUG1TbnPoII8hgGe/rJpGx11HgmPVS8GfONhsWFLeGm5fRz8SY2aJdxFnw== +"@zowe/core-for-zowe-sdk@7.22.0": + version "7.22.0" + resolved "https://registry.npmjs.org/@zowe/core-for-zowe-sdk/-/core-for-zowe-sdk-7.22.0.tgz#ae271ee84e52f48b5508b74affb5f9aa5d4adbdf" + integrity sha512-uLkbxn0KvI6MiSZ8Y0SZRFJhvDarwhlvvW/oiSjIyNHeNtuTb31s5eYLTCdvX585om98wyVEKwYWK3ITzQ6w6g== dependencies: comment-json "4.1.1" string-width "4.2.3" -"@zowe/imperative@5.20.2": - version "5.20.2" - resolved "https://registry.npmjs.org/@zowe/imperative/-/imperative-5.20.2.tgz#45b7d25735e270c016a7cc54f2a71ff1e51b67c5" - integrity sha512-kb+lWbogwOEOYpCFiexZfbBNVXNsv9RC+B/93nY4qoQhGddHRwZu/l22yeHPYNvTG25k0ubr/RgYuwOnv32UmQ== +"@zowe/imperative@5.21.0": + version "5.21.0" + resolved "https://registry.npmjs.org/@zowe/imperative/-/imperative-5.21.0.tgz#52cd216bf04a15fe60fcc9fa4603dba0f8c59da2" + integrity sha512-yjt3Mmn1ItfZZK42SecH+2U5rSvKl6k4ZqPvFaQIvzfVwhOeXi3Srx6/ulxDhSPN0txPUgeyIxz+PHSPtN5Elw== dependencies: "@types/yargs" "13.0.4" chalk "2.4.2" @@ -2716,10 +2716,10 @@ yamljs "0.3.0" yargs "15.3.1" -"@zowe/provisioning-for-zowe-sdk@7.21.4": - version "7.21.4" - resolved "https://registry.npmjs.org/@zowe/provisioning-for-zowe-sdk/-/provisioning-for-zowe-sdk-7.21.4.tgz#5df1b7a876d74c482597438a4d655b31f997ae13" - integrity sha512-P+anHTBK4Y6VQ7XNrgxQO2poIrLayOuuecelVOgApkc/pTs3KQ+gxsTaWamIekKdKSVWvDREPQYqrFznDZDg6A== +"@zowe/provisioning-for-zowe-sdk@7.22.0": + version "7.22.0" + resolved "https://registry.npmjs.org/@zowe/provisioning-for-zowe-sdk/-/provisioning-for-zowe-sdk-7.22.0.tgz#01bcd2a182c219115779b3f3aeee65e2f846d349" + integrity sha512-5wX+qXxXL3WlmmS9rnDDZeUL4K4fuUAJ+8H+z8z0qv++ffZSJc36Jkmi/D5tX9FanmB0/kpCgeHqx1rWE/mYtA== dependencies: js-yaml "4.1.0" @@ -2728,15 +2728,15 @@ resolved "https://registry.npmjs.org/@zowe/secrets-for-zowe-sdk/-/secrets-for-zowe-sdk-7.18.6.tgz#6b854b344babb291c26d19d82633099a46e08452" integrity sha512-YyS1NoXddb147mBQpu5/dTfo1gdwGa/xdg85U8KCngA+RHCmNct3n2rbK3tHx9C9H6rlgjeS+Mrux5Q+PHJUgQ== -"@zowe/zos-console-for-zowe-sdk@7.21.4": - version "7.21.4" - resolved "https://registry.npmjs.org/@zowe/zos-console-for-zowe-sdk/-/zos-console-for-zowe-sdk-7.21.4.tgz#6d899ddc55fcff58d575baf4a0c5386fca06779e" - integrity sha512-NCZG8ofj4cQr905iJ/PdaKSCK0B3SLbF+zPwlvA2/enC+3EGkBL/bedt8TViGuZbZwOFP2w0Ll95WKfPovXH5g== +"@zowe/zos-console-for-zowe-sdk@7.22.0": + version "7.22.0" + resolved "https://registry.npmjs.org/@zowe/zos-console-for-zowe-sdk/-/zos-console-for-zowe-sdk-7.22.0.tgz#2088bee1963a9fa602df055a7078f63667a80f44" + integrity sha512-EI9rK76eq5kGXJqGkhobLMdNJstVUSswJ2JlNvGzwOQD/jV/7OJRHSHPllygMGaos8Rh14mzPDooeb9CBr5faA== -"@zowe/zos-files-for-zowe-sdk@7.21.4": - version "7.21.4" - resolved "https://registry.npmjs.org/@zowe/zos-files-for-zowe-sdk/-/zos-files-for-zowe-sdk-7.21.4.tgz#293857954f78c71787cfebd4c9afac1426f72fb9" - integrity sha512-P0Ulh7JGWN2c+O5ZikNPQBD1TX1hBwxfWC/GMIVjIB8ncmGx6cwIh7DECmZAulR//TiLxw3TZJuC0yN6a0VOGQ== +"@zowe/zos-files-for-zowe-sdk@7.22.0": + version "7.22.0" + resolved "https://registry.npmjs.org/@zowe/zos-files-for-zowe-sdk/-/zos-files-for-zowe-sdk-7.22.0.tgz#a692b09016c0350685cf085dc47cb9591fec11d3" + integrity sha512-jw1j9q77DTQgm5i0YuslN454zC4eS0qb5PnfZ1thCbUugLxI/LRR1CgV59rTfqMGHMjXyfmmqjtCot4NMLUV1A== dependencies: get-stream "6.0.1" minimatch "5.0.1" @@ -2748,43 +2748,43 @@ dependencies: zos-node-accessor "1.0.14" -"@zowe/zos-jobs-for-zowe-sdk@7.21.4": - version "7.21.4" - resolved "https://registry.npmjs.org/@zowe/zos-jobs-for-zowe-sdk/-/zos-jobs-for-zowe-sdk-7.21.4.tgz#80976967a1b34a64a6c405f0975a20a6603e4619" - integrity sha512-7xLOO3g5gZP0Q4wTHS5SCfW9KpBLBhv/fqkMo/e9KmdmlJ6mLl5MlgUUGBStw8/qmSGvH6W3S1FuUu5TlAZipA== +"@zowe/zos-jobs-for-zowe-sdk@7.22.0": + version "7.22.0" + resolved "https://registry.npmjs.org/@zowe/zos-jobs-for-zowe-sdk/-/zos-jobs-for-zowe-sdk-7.22.0.tgz#4447071d304bc8c6348c08bdd8f28e84213aa1ac" + integrity sha512-QdKjWgQV7uEvLhHED48TBmQ2EhKn8ZG9OVrZiAa82k0AIsps5U2Wv/W9M1PyWlCEWQP/Zok7PpRWi3Bbv010cQ== dependencies: - "@zowe/zos-files-for-zowe-sdk" "7.21.4" + "@zowe/zos-files-for-zowe-sdk" "7.22.0" -"@zowe/zos-logs-for-zowe-sdk@7.21.4": - version "7.21.4" - resolved "https://registry.npmjs.org/@zowe/zos-logs-for-zowe-sdk/-/zos-logs-for-zowe-sdk-7.21.4.tgz#8495818da8946ac850a684b4ffca1c93a8955937" - integrity sha512-qd/YfU6daprFOcPeajqm1vAM7yOn4LKdhGJTcsfKP5aFdg4ZIAGFFwcEn5nZJpZsw/YDz5drjNdpWMH1hgSNAw== +"@zowe/zos-logs-for-zowe-sdk@7.22.0": + version "7.22.0" + resolved "https://registry.npmjs.org/@zowe/zos-logs-for-zowe-sdk/-/zos-logs-for-zowe-sdk-7.22.0.tgz#61500c48b76c2458243508d83137f221393ffb44" + integrity sha512-XA/ZH1LsdqE9vTA6GOlI3t6RsgA7hf+efImVltE9brVlFrrIgXCD46A9CVDl6bmkp/tFQqCdMYHjHFbWiwN4WA== -"@zowe/zos-tso-for-zowe-sdk@7.21.4": - version "7.21.4" - resolved "https://registry.npmjs.org/@zowe/zos-tso-for-zowe-sdk/-/zos-tso-for-zowe-sdk-7.21.4.tgz#12d69c9f57178c0b17fa0c3013242a1333de1954" - integrity sha512-fPhMzygVWYItNlNnS5W4d9Gv41c9RqUdG0pydgPFNs4KHpANx9e1tU3L+x4WHDdQHE4hOsy7xG3Sm6zg/a1XEQ== +"@zowe/zos-tso-for-zowe-sdk@7.22.0": + version "7.22.0" + resolved "https://registry.npmjs.org/@zowe/zos-tso-for-zowe-sdk/-/zos-tso-for-zowe-sdk-7.22.0.tgz#38c0ba26bbcc6af0564911883e21bd9ad5c217e4" + integrity sha512-vzhKJUk6E/EHjH8BadCfpL45C40qmJxYlSHAIHitAtFcOkI4F7i13mlgulaxPCiTTV3jBw4g+JoJe8DwG1eiyA== dependencies: - "@zowe/zosmf-for-zowe-sdk" "7.21.4" + "@zowe/zosmf-for-zowe-sdk" "7.22.0" -"@zowe/zos-uss-for-zowe-sdk@7.21.4": - version "7.21.4" - resolved "https://registry.npmjs.org/@zowe/zos-uss-for-zowe-sdk/-/zos-uss-for-zowe-sdk-7.21.4.tgz#fc75f7a67ef9262405697212c4cbf987643736b4" - integrity sha512-5Kc1DLPOfkW+h6u+1fogW33CzN6zPE5CHNmpeed/2GWB8O0ChupdEnwXqGANK+siVzEdX1U9AMkZ0/hZs61TMg== +"@zowe/zos-uss-for-zowe-sdk@7.22.0": + version "7.22.0" + resolved "https://registry.npmjs.org/@zowe/zos-uss-for-zowe-sdk/-/zos-uss-for-zowe-sdk-7.22.0.tgz#3b6bb8dedae1a6c4f367189cf6b3bdbab0aca822" + integrity sha512-c3yXBdBWW2I1WbkMvgmx/EMNEpxJmCRZ0gygjYd1xM//wWhPaigOVY5XSRTpnXS0UY6KOX9T7ZymlCe6XzAhEQ== dependencies: ssh2 "1.15.0" -"@zowe/zos-workflows-for-zowe-sdk@7.21.4": - version "7.21.4" - resolved "https://registry.npmjs.org/@zowe/zos-workflows-for-zowe-sdk/-/zos-workflows-for-zowe-sdk-7.21.4.tgz#1458f5945c0ac13e3785d6a95cfe578617b67cf3" - integrity sha512-AB51+U6Ew/QB9ATO7VkxeFWOeYQE/UJixaxliP5QV7Utfj0LlOGcIGltyKpdUa4QS0ehSe7csKvMRMc7rQdXLw== +"@zowe/zos-workflows-for-zowe-sdk@7.22.0": + version "7.22.0" + resolved "https://registry.npmjs.org/@zowe/zos-workflows-for-zowe-sdk/-/zos-workflows-for-zowe-sdk-7.22.0.tgz#05537853832bcf2307a78907459fb43e59ca22ed" + integrity sha512-arM0gVpm0zM84JuIZSWTK+bCqu6gED0ubYJZAdI5ttsjSaiv+E4LM1OUkd05n0HCUGYeNrL30LEsswHUM7cqZA== dependencies: - "@zowe/zos-files-for-zowe-sdk" "7.21.4" + "@zowe/zos-files-for-zowe-sdk" "7.22.0" -"@zowe/zosmf-for-zowe-sdk@7.21.4": - version "7.21.4" - resolved "https://registry.npmjs.org/@zowe/zosmf-for-zowe-sdk/-/zosmf-for-zowe-sdk-7.21.4.tgz#b7bd90f7e4b9320c56f4ae706fd0cc90811b9448" - integrity sha512-Q4VZtnUNHB4OWLFtlNnK/0lxp3y42AIAm6PwgvNIdH1Oy8nWA/VkXU3O8ur6zsbComYxyxyx/YNxzNJ7ENwxww== +"@zowe/zosmf-for-zowe-sdk@7.22.0": + version "7.22.0" + resolved "https://registry.npmjs.org/@zowe/zosmf-for-zowe-sdk/-/zosmf-for-zowe-sdk-7.22.0.tgz#cc87f28acf60b600eca5111d35ac8668aaec192a" + integrity sha512-D4nbTDr5uJxJev9+zNwbq/3Z3DuQR6qfmbofzDGYYaU1peFO7+ioFN+uAInFBS1jqj4iHko2KINJfPZFALg3/A== abab@^2.0.3, abab@^2.0.5: version "2.0.6"