From 040e9d3be2850af4c74dc10039497e610b1b9242 Mon Sep 17 00:00:00 2001 From: Billie Simmons <49491949+JillieBeanSim@users.noreply.github.com> Date: Wed, 24 Jul 2024 08:36:34 -0400 Subject: [PATCH 01/13] export new Proxy class from imperative Signed-off-by: Billie Simmons <49491949+JillieBeanSim@users.noreply.github.com> --- packages/imperative/src/rest/index.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/imperative/src/rest/index.ts b/packages/imperative/src/rest/index.ts index b5f48dbe18..b8b059e42c 100644 --- a/packages/imperative/src/rest/index.ts +++ b/packages/imperative/src/rest/index.ts @@ -17,6 +17,7 @@ export * from "./src/client/doc/IRestClientError"; export * from "./src/client/doc/IRestClientResponse"; export * from "./src/client/doc/IRestOptions"; export * from "./src/client/Headers"; +export * from "./src/client/Proxy"; export * from "./src/client/AbstractRestClient"; export * from "./src/client/CompressionUtils"; export * from "./src/client/RestClient"; From f33f44430ad0cfd9147d76e44b5505efb5de9155 Mon Sep 17 00:00:00 2001 From: Billie Simmons <49491949+JillieBeanSim@users.noreply.github.com> Date: Wed, 24 Jul 2024 08:42:48 -0400 Subject: [PATCH 02/13] add CHANGELOG Signed-off-by: Billie Simmons <49491949+JillieBeanSim@users.noreply.github.com> --- packages/imperative/CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/packages/imperative/CHANGELOG.md b/packages/imperative/CHANGELOG.md index a537afd911..c9ad217f4d 100644 --- a/packages/imperative/CHANGELOG.md +++ b/packages/imperative/CHANGELOG.md @@ -2,6 +2,10 @@ All notable changes to the Imperative package will be documented in this file. +## `7.28.1` + +- Bugfix: Export new Proxy class from Zowe imperative package. + ## `5.26.0` - Enhancement: Updated `ProfileInfo.updateProperty` function to support updating properties in typeless profiles. [#2196](https://github.com/zowe/zowe-cli/issues/2196) From 5c79ad2aa6e3e78317187d00448a5a1ee23f0da4 Mon Sep 17 00:00:00 2001 From: Billie Simmons <49491949+JillieBeanSim@users.noreply.github.com> Date: Wed, 24 Jul 2024 08:46:51 -0400 Subject: [PATCH 03/13] fix header Signed-off-by: Billie Simmons <49491949+JillieBeanSim@users.noreply.github.com> --- packages/imperative/CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/imperative/CHANGELOG.md b/packages/imperative/CHANGELOG.md index c9ad217f4d..d4c48f1fbe 100644 --- a/packages/imperative/CHANGELOG.md +++ b/packages/imperative/CHANGELOG.md @@ -2,7 +2,7 @@ All notable changes to the Imperative package will be documented in this file. -## `7.28.1` +## TBD Release - Bugfix: Export new Proxy class from Zowe imperative package. From 9db1ed099830f021dae3885fbc15f2a8115b6a9e Mon Sep 17 00:00:00 2001 From: Billie Simmons <49491949+JillieBeanSim@users.noreply.github.com> Date: Wed, 24 Jul 2024 08:54:35 -0400 Subject: [PATCH 04/13] found to add ## Recent Changes Signed-off-by: Billie Simmons <49491949+JillieBeanSim@users.noreply.github.com> --- packages/imperative/CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/imperative/CHANGELOG.md b/packages/imperative/CHANGELOG.md index d4c48f1fbe..8544cde4a5 100644 --- a/packages/imperative/CHANGELOG.md +++ b/packages/imperative/CHANGELOG.md @@ -2,7 +2,7 @@ All notable changes to the Imperative package will be documented in this file. -## TBD Release +## Recent Changes - Bugfix: Export new Proxy class from Zowe imperative package. From ab961e0def1402e7dbe31b11accc81c2a387e76a Mon Sep 17 00:00:00 2001 From: Billie Simmons <49491949+JillieBeanSim@users.noreply.github.com> Date: Wed, 24 Jul 2024 08:56:36 -0400 Subject: [PATCH 05/13] add issue number Signed-off-by: Billie Simmons <49491949+JillieBeanSim@users.noreply.github.com> --- packages/imperative/CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/imperative/CHANGELOG.md b/packages/imperative/CHANGELOG.md index 8544cde4a5..46d4ed06f0 100644 --- a/packages/imperative/CHANGELOG.md +++ b/packages/imperative/CHANGELOG.md @@ -4,7 +4,7 @@ All notable changes to the Imperative package will be documented in this file. ## Recent Changes -- Bugfix: Export new Proxy class from Zowe imperative package. +- Bugfix: Export new Proxy class from Zowe imperative package. [#2205](https://github.com/zowe/zowe-cli/pull/2205) ## `5.26.0` From bb05aa7e6a33e6387d9efc786560ba7fb2ebd487 Mon Sep 17 00:00:00 2001 From: Timothy Johnson Date: Wed, 24 Jul 2024 09:44:40 -0400 Subject: [PATCH 06/13] Add unit tests for ApimlAutoInitHandler Signed-off-by: Timothy Johnson --- .../ApimlAutoInitHandler.unit.test.ts | 89 +++++++++++++++++-- 1 file changed, 84 insertions(+), 5 deletions(-) diff --git a/packages/cli/__tests__/config/auto-init/__unit__/ApimlAutoInitHandler.unit.test.ts b/packages/cli/__tests__/config/auto-init/__unit__/ApimlAutoInitHandler.unit.test.ts index eaf064effa..8ffc0e1a32 100644 --- a/packages/cli/__tests__/config/auto-init/__unit__/ApimlAutoInitHandler.unit.test.ts +++ b/packages/cli/__tests__/config/auto-init/__unit__/ApimlAutoInitHandler.unit.test.ts @@ -29,10 +29,10 @@ function mockConfigApi(properties: IConfig | undefined): any { }, profiles: { getProfilePathFromName: (name: string) => `profiles.${name}`, - get: jest.fn().mockReturnValue({}) + get: jest.fn().mockReturnValue(properties.profiles.base?.properties) }, secure: { - securePropsForProfile: jest.fn().mockReturnValue([]) + securePropsForProfile: jest.fn().mockReturnValue(properties.profiles.base?.secure) } }, exists: true, @@ -195,6 +195,77 @@ describe("ApimlAutoInitHandler", () => { expect(response.profiles.base.properties.tokenValue).toEqual("fakeToken"); }); + it("should not have changed - secure fields with existing non-default base profile", async () => { + // NOTE: Token type and token value will be stored, but user and password will still be present in the base profile + const mockCreateZosmfSession = jest.fn(); + const mockGetPluginApimlConfigs = jest.fn().mockReturnValue([]); + const mockGetServicesByConfig = jest.fn().mockResolvedValue([]); + jest.spyOn(ConfigUtils, "getActiveProfileName").mockReturnValueOnce("base"); + const mockConfigValue: any = { + defaults: {}, + profiles: { + "base": { + properties: { + host: "fake", + port: 12345, + user: "fake", + password: "fake" + }, + secure: [ + "host", + "user", + "password" + ], + profiles: {} + } + }, + plugins: [] + }; + const mockConvertApimlProfileInfoToProfileConfig = jest.fn().mockReturnValue(mockConfigValue); + const mockLogin = jest.fn().mockResolvedValue("fakeToken"); + jest.spyOn(ImperativeConfig.instance, "config", "get").mockReturnValue(mockConfigApi(mockConfigValue)); + + ZosmfSession.createSessCfgFromArgs = mockCreateZosmfSession; + Services.getPluginApimlConfigs = mockGetPluginApimlConfigs; + Services.getServicesByConfig = mockGetServicesByConfig; + Services.convertApimlProfileInfoToProfileConfig = mockConvertApimlProfileInfoToProfileConfig; + Login.apimlLogin = mockLogin; + + const handler: any = new ApimlAutoInitHandler(); + expect(handler.mProfileType).toBe("base"); + + handler.createSessCfgFromArgs(); + expect(mockCreateZosmfSession).toHaveBeenCalledTimes(1); + + const response = await handler.doAutoInit( + { + ISession: { + hostname: "fake", + port: 1234, + user: "fake", + password: "fake", + type: SessConstants.AUTH_TYPE_BASIC, + tokenType: undefined + } + }, { + arguments: { + $0: "fake", + _: ["fake"], + "base-profile": "base" + } + }); + expect(mockGetPluginApimlConfigs).toHaveBeenCalledTimes(1); + expect(mockGetServicesByConfig).toHaveBeenCalledTimes(1); + expect(mockConvertApimlProfileInfoToProfileConfig).toHaveBeenCalledTimes(1); + expect(mockLogin).toHaveBeenCalledTimes(1); + expect(response.profiles.base.secure).toEqual(["host", "tokenValue"]); + expect(response.profiles.base.properties.tokenType).toBeDefined(); + expect(response.profiles.base.properties.tokenValue).toBeDefined(); + expect(response.profiles.base.properties.user).toBeUndefined(); + expect(response.profiles.base.properties.password).toBeUndefined(); + expect(response.defaults.base).toBe("base"); + }); + it("should not have changed - user & password with existing base profile", async () => { // NOTE: Token type and token value will be stored, but user and password will still be present in the base profile const mockCreateZosmfSession = jest.fn(); @@ -202,14 +273,19 @@ describe("ApimlAutoInitHandler", () => { const mockGetServicesByConfig = jest.fn().mockResolvedValue([]); jest.spyOn(ConfigUtils, "getActiveProfileName").mockReturnValueOnce("base"); const mockConfigValue: any = { - defaults: { base: "base"}, + defaults: { base: "base" }, profiles: { "base": { properties: { host: "fake", - port: 12345 + port: 12345, + user: "fake", + password: "fake" }, - secure: [], + secure: [ + "user", + "password" + ], profiles: {} } }, @@ -254,6 +330,9 @@ describe("ApimlAutoInitHandler", () => { expect(response.profiles.base.secure).toContain("tokenValue"); expect(response.profiles.base.properties.tokenType).toBeDefined(); expect(response.profiles.base.properties.tokenValue).toBeDefined(); + expect(response.profiles.base.properties.user).toBeUndefined(); + expect(response.profiles.base.properties.password).toBeUndefined(); + expect(response.defaults.base).toBe("base"); }); it("should not have changed - rejectUnauthorized flag true", async () => { From 80c17fe13c08d21a981e3536efb376e61fcb9a1d Mon Sep 17 00:00:00 2001 From: Timothy Johnson Date: Wed, 24 Jul 2024 09:51:18 -0400 Subject: [PATCH 07/13] Add unit tests for CommandProcessor Signed-off-by: Timothy Johnson --- .../__tests__/CommandProcessor.unit.test.ts | 64 ++++++++++++++++++- 1 file changed, 63 insertions(+), 1 deletion(-) diff --git a/packages/imperative/src/cmd/__tests__/CommandProcessor.unit.test.ts b/packages/imperative/src/cmd/__tests__/CommandProcessor.unit.test.ts index 4266a72a78..b1c882fa77 100644 --- a/packages/imperative/src/cmd/__tests__/CommandProcessor.unit.test.ts +++ b/packages/imperative/src/cmd/__tests__/CommandProcessor.unit.test.ts @@ -26,6 +26,7 @@ import { ImperativeConfig } from "../../utilities/src/ImperativeConfig"; import { setupConfigToLoad } from "../../../__tests__/src/TestUtil"; import { EnvFileUtils, NextVerFeatures } from "../../utilities"; import { join } from "path"; +import { Config } from "../../config"; jest.mock("../src/syntax/SyntaxValidator"); jest.mock("../src/utils/SharedOptions"); @@ -1785,7 +1786,7 @@ describe("Command Processor", () => { }); - it("should mask input value for a secure parm when --show-inputs-only flag is set", async () => { + it("should mask input value for a default secure parm when --show-inputs-only flag is set", async () => { // values to test const parm1Key = `user`; @@ -1831,6 +1832,67 @@ describe("Command Processor", () => { expect(commandResponse.stderr.toString()).toContain(`Some inputs are not displayed`); }); + it("should mask input value for a user-defined secure parm when --show-inputs-only flag is set", async () => { + + // values to test + const parm1Key = `token-value`; + const parm1Value = `secret`; + const secure = `(secure value)`; + jest.spyOn(ImperativeConfig, "instance", "get").mockReturnValue({ + config: { + api: { + secure: { + securePropsForProfile: jest.fn(() => ["tokenValue"]) + } + }, + layers: [{ exists: true, path: "zowe.config.json" }], + properties: Config.empty() + } + } as any); + + // Allocate the command processor + const processor: CommandProcessor = new CommandProcessor({ + envVariablePrefix: ENV_VAR_PREFIX, + fullDefinition: SAMPLE_COMPLEX_COMMAND, // `group action` + definition: { // `object` + name: "banana", + description: "The banana command", + type: "command", + handler: __dirname + "/__model__/TestCmdHandler", + options: [ + { + name: parm1Key, + type: "string", + description: "The first parameter", + } + ], + profile: { + optional: ["fruit"] + } + }, + helpGenerator: FAKE_HELP_GENERATOR, + profileManagerFactory: FAKE_PROFILE_MANAGER_FACTORY, + rootCommandName: SAMPLE_ROOT_COMMAND, + commandLine: "", + promptPhrase: "dummydummy", + config: ImperativeConfig.instance.config + }); + + const parms: any = { + arguments: { + _: ["check", "for", "banana"], + $0: "", + [parm1Key]: parm1Value, + valid: true, + showInputsOnly: true, + }, + silent: true + }; + const commandResponse: ICommandResponse = await processor.invoke(parms); + expect(commandResponse.data.commandValues[parm1Key]).toBe(secure); + expect(commandResponse.stderr.toString()).toContain(`Some inputs are not displayed`); + }); + it("should not mask input value for a secure parm when --show-inputs-only flag is set with env setting", async () => { // values to test From e5eb4228ef04d855f40487c78b7ba7e86b4e1a84 Mon Sep 17 00:00:00 2001 From: zowe-robot Date: Wed, 24 Jul 2024 14:12:32 +0000 Subject: [PATCH 08/13] Bump version to 7.28.1 [ci skip] Signed-off-by: zowe-robot --- .../__packages__/cli-test-utils/package.json | 4 +- lerna.json | 2 +- npm-shrinkwrap.json | 206 +++++++++--------- packages/cli/package.json | 26 +-- packages/core/package.json | 6 +- packages/imperative/CHANGELOG.md | 2 +- packages/imperative/package.json | 2 +- packages/provisioning/package.json | 8 +- packages/workflows/package.json | 10 +- packages/zosconsole/package.json | 8 +- packages/zosfiles/package.json | 10 +- packages/zosjobs/package.json | 10 +- packages/zoslogs/package.json | 8 +- packages/zosmf/package.json | 8 +- packages/zostso/package.json | 10 +- packages/zosuss/package.json | 6 +- 16 files changed, 163 insertions(+), 163 deletions(-) diff --git a/__tests__/__packages__/cli-test-utils/package.json b/__tests__/__packages__/cli-test-utils/package.json index 02e4ee9739..6636932dd0 100644 --- a/__tests__/__packages__/cli-test-utils/package.json +++ b/__tests__/__packages__/cli-test-utils/package.json @@ -1,6 +1,6 @@ { "name": "@zowe/cli-test-utils", - "version": "7.28.0", + "version": "7.28.1", "description": "Test utilities package for Zowe CLI plug-ins", "author": "Zowe", "license": "EPL-2.0", @@ -43,7 +43,7 @@ "devDependencies": { "@types/js-yaml": "^4.0.0", "@types/uuid": "^8.3.0", - "@zowe/imperative": "5.26.0" + "@zowe/imperative": "5.26.1" }, "peerDependencies": { "@zowe/imperative": "^5.0.0" diff --git a/lerna.json b/lerna.json index c439a32d6e..764758a7b9 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "7.28.0", + "version": "7.28.1", "command": { "publish": { "ignoreChanges": [ diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json index e103c3aaac..ea0ca07ea4 100644 --- a/npm-shrinkwrap.json +++ b/npm-shrinkwrap.json @@ -53,7 +53,7 @@ }, "__tests__/__packages__/cli-test-utils": { "name": "@zowe/cli-test-utils", - "version": "7.28.0", + "version": "7.28.1", "license": "EPL-2.0", "dependencies": { "find-up": "^5.0.0", @@ -64,7 +64,7 @@ "devDependencies": { "@types/js-yaml": "^4.0.0", "@types/uuid": "^8.3.0", - "@zowe/imperative": "5.26.0" + "@zowe/imperative": "5.26.1" }, "peerDependencies": { "@zowe/imperative": "^5.0.0" @@ -20451,21 +20451,21 @@ }, "packages/cli": { "name": "@zowe/cli", - "version": "7.28.0", + "version": "7.28.1", "hasInstallScript": true, "license": "EPL-2.0", "dependencies": { - "@zowe/core-for-zowe-sdk": "7.28.0", - "@zowe/imperative": "5.26.0", - "@zowe/provisioning-for-zowe-sdk": "7.28.0", - "@zowe/zos-console-for-zowe-sdk": "7.28.0", - "@zowe/zos-files-for-zowe-sdk": "7.28.0", - "@zowe/zos-jobs-for-zowe-sdk": "7.28.0", - "@zowe/zos-logs-for-zowe-sdk": "7.28.0", - "@zowe/zos-tso-for-zowe-sdk": "7.28.0", - "@zowe/zos-uss-for-zowe-sdk": "7.28.0", - "@zowe/zos-workflows-for-zowe-sdk": "7.28.0", - "@zowe/zosmf-for-zowe-sdk": "7.28.0", + "@zowe/core-for-zowe-sdk": "7.28.1", + "@zowe/imperative": "5.26.1", + "@zowe/provisioning-for-zowe-sdk": "7.28.1", + "@zowe/zos-console-for-zowe-sdk": "7.28.1", + "@zowe/zos-files-for-zowe-sdk": "7.28.1", + "@zowe/zos-jobs-for-zowe-sdk": "7.28.1", + "@zowe/zos-logs-for-zowe-sdk": "7.28.1", + "@zowe/zos-tso-for-zowe-sdk": "7.28.1", + "@zowe/zos-uss-for-zowe-sdk": "7.28.1", + "@zowe/zos-workflows-for-zowe-sdk": "7.28.1", + "@zowe/zosmf-for-zowe-sdk": "7.28.1", "find-process": "1.4.7", "get-stream": "6.0.1", "lodash": "4.17.21", @@ -20480,7 +20480,7 @@ "@types/diff": "^5.0.2", "@types/lodash": "^4.14.175", "@types/tar": "^6.1.2", - "@zowe/cli-test-utils": "7.28.0", + "@zowe/cli-test-utils": "7.28.1", "comment-json": "^4.1.1", "strip-ansi": "^6.0.1", "which": "^2.0.2" @@ -20513,15 +20513,15 @@ }, "packages/core": { "name": "@zowe/core-for-zowe-sdk", - "version": "7.28.0", + "version": "7.28.1", "license": "EPL-2.0", "dependencies": { "comment-json": "4.1.1", "string-width": "4.2.3" }, "devDependencies": { - "@zowe/cli-test-utils": "7.28.0", - "@zowe/imperative": "5.26.0" + "@zowe/cli-test-utils": "7.28.1", + "@zowe/imperative": "5.26.1" }, "peerDependencies": { "@zowe/imperative": "^5.0.0" @@ -20529,7 +20529,7 @@ }, "packages/imperative": { "name": "@zowe/imperative", - "version": "5.26.0", + "version": "5.26.1", "license": "EPL-2.0", "dependencies": { "@types/yargs": "13.0.4", @@ -20911,16 +20911,16 @@ }, "packages/provisioning": { "name": "@zowe/provisioning-for-zowe-sdk", - "version": "7.28.0", + "version": "7.28.1", "license": "EPL-2.0", "dependencies": { "js-yaml": "4.1.0" }, "devDependencies": { "@types/js-yaml": "^4.0.5", - "@zowe/cli-test-utils": "7.28.0", - "@zowe/core-for-zowe-sdk": "7.28.0", - "@zowe/imperative": "5.26.0" + "@zowe/cli-test-utils": "7.28.1", + "@zowe/core-for-zowe-sdk": "7.28.1", + "@zowe/imperative": "5.26.1" }, "peerDependencies": { "@zowe/core-for-zowe-sdk": "^7.0.0", @@ -20942,15 +20942,15 @@ }, "packages/workflows": { "name": "@zowe/zos-workflows-for-zowe-sdk", - "version": "7.28.0", + "version": "7.28.1", "license": "EPL-2.0", "dependencies": { - "@zowe/zos-files-for-zowe-sdk": "7.28.0" + "@zowe/zos-files-for-zowe-sdk": "7.28.1" }, "devDependencies": { - "@zowe/cli-test-utils": "7.28.0", - "@zowe/core-for-zowe-sdk": "7.28.0", - "@zowe/imperative": "5.26.0" + "@zowe/cli-test-utils": "7.28.1", + "@zowe/core-for-zowe-sdk": "7.28.1", + "@zowe/imperative": "5.26.1" }, "peerDependencies": { "@zowe/core-for-zowe-sdk": "^7.0.0", @@ -20959,12 +20959,12 @@ }, "packages/zosconsole": { "name": "@zowe/zos-console-for-zowe-sdk", - "version": "7.28.0", + "version": "7.28.1", "license": "EPL-2.0", "devDependencies": { - "@zowe/cli-test-utils": "7.28.0", - "@zowe/core-for-zowe-sdk": "7.28.0", - "@zowe/imperative": "5.26.0" + "@zowe/cli-test-utils": "7.28.1", + "@zowe/core-for-zowe-sdk": "7.28.1", + "@zowe/imperative": "5.26.1" }, "peerDependencies": { "@zowe/core-for-zowe-sdk": "^7.0.0", @@ -20973,16 +20973,16 @@ }, "packages/zosfiles": { "name": "@zowe/zos-files-for-zowe-sdk", - "version": "7.28.0", + "version": "7.28.1", "license": "EPL-2.0", "dependencies": { "minimatch": "5.0.1" }, "devDependencies": { - "@zowe/cli-test-utils": "7.28.0", - "@zowe/core-for-zowe-sdk": "7.28.0", - "@zowe/imperative": "5.26.0", - "@zowe/zos-uss-for-zowe-sdk": "7.28.0" + "@zowe/cli-test-utils": "7.28.1", + "@zowe/core-for-zowe-sdk": "7.28.1", + "@zowe/imperative": "5.26.1", + "@zowe/zos-uss-for-zowe-sdk": "7.28.1" }, "peerDependencies": { "@zowe/core-for-zowe-sdk": "^7.0.0", @@ -21010,15 +21010,15 @@ }, "packages/zosjobs": { "name": "@zowe/zos-jobs-for-zowe-sdk", - "version": "7.28.0", + "version": "7.28.1", "license": "EPL-2.0", "dependencies": { - "@zowe/zos-files-for-zowe-sdk": "7.28.0" + "@zowe/zos-files-for-zowe-sdk": "7.28.1" }, "devDependencies": { - "@zowe/cli-test-utils": "7.28.0", - "@zowe/core-for-zowe-sdk": "7.28.0", - "@zowe/imperative": "5.26.0" + "@zowe/cli-test-utils": "7.28.1", + "@zowe/core-for-zowe-sdk": "7.28.1", + "@zowe/imperative": "5.26.1" }, "peerDependencies": { "@zowe/core-for-zowe-sdk": "^7.0.0", @@ -21027,12 +21027,12 @@ }, "packages/zoslogs": { "name": "@zowe/zos-logs-for-zowe-sdk", - "version": "7.28.0", + "version": "7.28.1", "license": "EPL-2.0", "devDependencies": { - "@zowe/cli-test-utils": "7.28.0", - "@zowe/core-for-zowe-sdk": "7.28.0", - "@zowe/imperative": "5.26.0" + "@zowe/cli-test-utils": "7.28.1", + "@zowe/core-for-zowe-sdk": "7.28.1", + "@zowe/imperative": "5.26.1" }, "peerDependencies": { "@zowe/core-for-zowe-sdk": "^7.0.0", @@ -21041,12 +21041,12 @@ }, "packages/zosmf": { "name": "@zowe/zosmf-for-zowe-sdk", - "version": "7.28.0", + "version": "7.28.1", "license": "EPL-2.0", "devDependencies": { - "@zowe/cli-test-utils": "7.28.0", - "@zowe/core-for-zowe-sdk": "7.28.0", - "@zowe/imperative": "5.26.0" + "@zowe/cli-test-utils": "7.28.1", + "@zowe/core-for-zowe-sdk": "7.28.1", + "@zowe/imperative": "5.26.1" }, "peerDependencies": { "@zowe/core-for-zowe-sdk": "^7.0.0", @@ -21055,15 +21055,15 @@ }, "packages/zostso": { "name": "@zowe/zos-tso-for-zowe-sdk", - "version": "7.28.0", + "version": "7.28.1", "license": "EPL-2.0", "dependencies": { - "@zowe/zosmf-for-zowe-sdk": "7.28.0" + "@zowe/zosmf-for-zowe-sdk": "7.28.1" }, "devDependencies": { - "@zowe/cli-test-utils": "7.28.0", - "@zowe/core-for-zowe-sdk": "7.28.0", - "@zowe/imperative": "5.26.0" + "@zowe/cli-test-utils": "7.28.1", + "@zowe/core-for-zowe-sdk": "7.28.1", + "@zowe/imperative": "5.26.1" }, "peerDependencies": { "@zowe/core-for-zowe-sdk": "^7.0.0", @@ -21072,15 +21072,15 @@ }, "packages/zosuss": { "name": "@zowe/zos-uss-for-zowe-sdk", - "version": "7.28.0", + "version": "7.28.1", "license": "EPL-2.0", "dependencies": { "ssh2": "1.15.0" }, "devDependencies": { "@types/ssh2": "^1.11.0", - "@zowe/cli-test-utils": "7.28.0", - "@zowe/imperative": "5.26.0" + "@zowe/cli-test-utils": "7.28.1", + "@zowe/imperative": "5.26.1" }, "peerDependencies": { "@zowe/imperative": "^5.2.0" @@ -25770,19 +25770,19 @@ "@types/diff": "^5.0.2", "@types/lodash": "^4.14.175", "@types/tar": "^6.1.2", - "@zowe/cli-test-utils": "7.28.0", - "@zowe/core-for-zowe-sdk": "7.28.0", - "@zowe/imperative": "5.26.0", - "@zowe/provisioning-for-zowe-sdk": "7.28.0", + "@zowe/cli-test-utils": "7.28.1", + "@zowe/core-for-zowe-sdk": "7.28.1", + "@zowe/imperative": "5.26.1", + "@zowe/provisioning-for-zowe-sdk": "7.28.1", "@zowe/secrets-for-zowe-sdk": "7.18.6", - "@zowe/zos-console-for-zowe-sdk": "7.28.0", - "@zowe/zos-files-for-zowe-sdk": "7.28.0", - "@zowe/zos-jobs-for-zowe-sdk": "7.28.0", - "@zowe/zos-logs-for-zowe-sdk": "7.28.0", - "@zowe/zos-tso-for-zowe-sdk": "7.28.0", - "@zowe/zos-uss-for-zowe-sdk": "7.28.0", - "@zowe/zos-workflows-for-zowe-sdk": "7.28.0", - "@zowe/zosmf-for-zowe-sdk": "7.28.0", + "@zowe/zos-console-for-zowe-sdk": "7.28.1", + "@zowe/zos-files-for-zowe-sdk": "7.28.1", + "@zowe/zos-jobs-for-zowe-sdk": "7.28.1", + "@zowe/zos-logs-for-zowe-sdk": "7.28.1", + "@zowe/zos-tso-for-zowe-sdk": "7.28.1", + "@zowe/zos-uss-for-zowe-sdk": "7.28.1", + "@zowe/zos-workflows-for-zowe-sdk": "7.28.1", + "@zowe/zosmf-for-zowe-sdk": "7.28.1", "comment-json": "^4.1.1", "find-process": "1.4.7", "get-stream": "6.0.1", @@ -25816,7 +25816,7 @@ "requires": { "@types/js-yaml": "^4.0.0", "@types/uuid": "^8.3.0", - "@zowe/imperative": "5.26.0", + "@zowe/imperative": "5.26.1", "find-up": "^5.0.0", "js-yaml": "^4.0.0", "rimraf": "^3.0.2", @@ -25836,8 +25836,8 @@ "@zowe/core-for-zowe-sdk": { "version": "file:packages/core", "requires": { - "@zowe/cli-test-utils": "7.28.0", - "@zowe/imperative": "5.26.0", + "@zowe/cli-test-utils": "7.28.1", + "@zowe/imperative": "5.26.1", "comment-json": "4.1.1", "string-width": "4.2.3" } @@ -26124,9 +26124,9 @@ "version": "file:packages/provisioning", "requires": { "@types/js-yaml": "^4.0.5", - "@zowe/cli-test-utils": "7.28.0", - "@zowe/core-for-zowe-sdk": "7.28.0", - "@zowe/imperative": "5.26.0", + "@zowe/cli-test-utils": "7.28.1", + "@zowe/core-for-zowe-sdk": "7.28.1", + "@zowe/imperative": "5.26.1", "js-yaml": "4.1.0" } }, @@ -26140,18 +26140,18 @@ "@zowe/zos-console-for-zowe-sdk": { "version": "file:packages/zosconsole", "requires": { - "@zowe/cli-test-utils": "7.28.0", - "@zowe/core-for-zowe-sdk": "7.28.0", - "@zowe/imperative": "5.26.0" + "@zowe/cli-test-utils": "7.28.1", + "@zowe/core-for-zowe-sdk": "7.28.1", + "@zowe/imperative": "5.26.1" } }, "@zowe/zos-files-for-zowe-sdk": { "version": "file:packages/zosfiles", "requires": { - "@zowe/cli-test-utils": "7.28.0", - "@zowe/core-for-zowe-sdk": "7.28.0", - "@zowe/imperative": "5.26.0", - "@zowe/zos-uss-for-zowe-sdk": "7.28.0", + "@zowe/cli-test-utils": "7.28.1", + "@zowe/core-for-zowe-sdk": "7.28.1", + "@zowe/imperative": "5.26.1", + "@zowe/zos-uss-for-zowe-sdk": "7.28.1", "minimatch": "5.0.1" }, "dependencies": { @@ -26176,53 +26176,53 @@ "@zowe/zos-jobs-for-zowe-sdk": { "version": "file:packages/zosjobs", "requires": { - "@zowe/cli-test-utils": "7.28.0", - "@zowe/core-for-zowe-sdk": "7.28.0", - "@zowe/imperative": "5.26.0", - "@zowe/zos-files-for-zowe-sdk": "7.28.0" + "@zowe/cli-test-utils": "7.28.1", + "@zowe/core-for-zowe-sdk": "7.28.1", + "@zowe/imperative": "5.26.1", + "@zowe/zos-files-for-zowe-sdk": "7.28.1" } }, "@zowe/zos-logs-for-zowe-sdk": { "version": "file:packages/zoslogs", "requires": { - "@zowe/cli-test-utils": "7.28.0", - "@zowe/core-for-zowe-sdk": "7.28.0", - "@zowe/imperative": "5.26.0" + "@zowe/cli-test-utils": "7.28.1", + "@zowe/core-for-zowe-sdk": "7.28.1", + "@zowe/imperative": "5.26.1" } }, "@zowe/zos-tso-for-zowe-sdk": { "version": "file:packages/zostso", "requires": { - "@zowe/cli-test-utils": "7.28.0", - "@zowe/core-for-zowe-sdk": "7.28.0", - "@zowe/imperative": "5.26.0", - "@zowe/zosmf-for-zowe-sdk": "7.28.0" + "@zowe/cli-test-utils": "7.28.1", + "@zowe/core-for-zowe-sdk": "7.28.1", + "@zowe/imperative": "5.26.1", + "@zowe/zosmf-for-zowe-sdk": "7.28.1" } }, "@zowe/zos-uss-for-zowe-sdk": { "version": "file:packages/zosuss", "requires": { "@types/ssh2": "^1.11.0", - "@zowe/cli-test-utils": "7.28.0", - "@zowe/imperative": "5.26.0", + "@zowe/cli-test-utils": "7.28.1", + "@zowe/imperative": "5.26.1", "ssh2": "1.15.0" } }, "@zowe/zos-workflows-for-zowe-sdk": { "version": "file:packages/workflows", "requires": { - "@zowe/cli-test-utils": "7.28.0", - "@zowe/core-for-zowe-sdk": "7.28.0", - "@zowe/imperative": "5.26.0", - "@zowe/zos-files-for-zowe-sdk": "7.28.0" + "@zowe/cli-test-utils": "7.28.1", + "@zowe/core-for-zowe-sdk": "7.28.1", + "@zowe/imperative": "5.26.1", + "@zowe/zos-files-for-zowe-sdk": "7.28.1" } }, "@zowe/zosmf-for-zowe-sdk": { "version": "file:packages/zosmf", "requires": { - "@zowe/cli-test-utils": "7.28.0", - "@zowe/core-for-zowe-sdk": "7.28.0", - "@zowe/imperative": "5.26.0" + "@zowe/cli-test-utils": "7.28.1", + "@zowe/core-for-zowe-sdk": "7.28.1", + "@zowe/imperative": "5.26.1" } }, "abbrev": { diff --git a/packages/cli/package.json b/packages/cli/package.json index 6d0492ed98..dd1755a2c8 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -1,6 +1,6 @@ { "name": "@zowe/cli", - "version": "7.28.0", + "version": "7.28.1", "description": "Zowe CLI is a command line interface (CLI) that provides a simple and streamlined way to interact with IBM z/OS.", "author": "Zowe", "license": "EPL-2.0", @@ -58,17 +58,17 @@ "preshrinkwrap": "node ../../scripts/rewriteShrinkwrap.js" }, "dependencies": { - "@zowe/core-for-zowe-sdk": "7.28.0", - "@zowe/imperative": "5.26.0", - "@zowe/provisioning-for-zowe-sdk": "7.28.0", - "@zowe/zos-console-for-zowe-sdk": "7.28.0", - "@zowe/zos-files-for-zowe-sdk": "7.28.0", - "@zowe/zos-jobs-for-zowe-sdk": "7.28.0", - "@zowe/zos-logs-for-zowe-sdk": "7.28.0", - "@zowe/zos-tso-for-zowe-sdk": "7.28.0", - "@zowe/zos-uss-for-zowe-sdk": "7.28.0", - "@zowe/zos-workflows-for-zowe-sdk": "7.28.0", - "@zowe/zosmf-for-zowe-sdk": "7.28.0", + "@zowe/core-for-zowe-sdk": "7.28.1", + "@zowe/imperative": "5.26.1", + "@zowe/provisioning-for-zowe-sdk": "7.28.1", + "@zowe/zos-console-for-zowe-sdk": "7.28.1", + "@zowe/zos-files-for-zowe-sdk": "7.28.1", + "@zowe/zos-jobs-for-zowe-sdk": "7.28.1", + "@zowe/zos-logs-for-zowe-sdk": "7.28.1", + "@zowe/zos-tso-for-zowe-sdk": "7.28.1", + "@zowe/zos-uss-for-zowe-sdk": "7.28.1", + "@zowe/zos-workflows-for-zowe-sdk": "7.28.1", + "@zowe/zosmf-for-zowe-sdk": "7.28.1", "find-process": "1.4.7", "get-stream": "6.0.1", "lodash": "4.17.21", @@ -79,7 +79,7 @@ "@types/diff": "^5.0.2", "@types/lodash": "^4.14.175", "@types/tar": "^6.1.2", - "@zowe/cli-test-utils": "7.28.0", + "@zowe/cli-test-utils": "7.28.1", "comment-json": "^4.1.1", "strip-ansi": "^6.0.1", "which": "^2.0.2" diff --git a/packages/core/package.json b/packages/core/package.json index afd2af7baf..c3e714f600 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -1,6 +1,6 @@ { "name": "@zowe/core-for-zowe-sdk", - "version": "7.28.0", + "version": "7.28.1", "description": "Core libraries shared by Zowe SDK packages", "author": "Zowe", "license": "EPL-2.0", @@ -49,8 +49,8 @@ "string-width": "4.2.3" }, "devDependencies": { - "@zowe/cli-test-utils": "7.28.0", - "@zowe/imperative": "5.26.0" + "@zowe/cli-test-utils": "7.28.1", + "@zowe/imperative": "5.26.1" }, "peerDependencies": { "@zowe/imperative": "^5.0.0" diff --git a/packages/imperative/CHANGELOG.md b/packages/imperative/CHANGELOG.md index 46d4ed06f0..72e995d43c 100644 --- a/packages/imperative/CHANGELOG.md +++ b/packages/imperative/CHANGELOG.md @@ -2,7 +2,7 @@ All notable changes to the Imperative package will be documented in this file. -## Recent Changes +## `5.26.1` - Bugfix: Export new Proxy class from Zowe imperative package. [#2205](https://github.com/zowe/zowe-cli/pull/2205) diff --git a/packages/imperative/package.json b/packages/imperative/package.json index 3c94b6f6c7..20feed5dad 100644 --- a/packages/imperative/package.json +++ b/packages/imperative/package.json @@ -1,6 +1,6 @@ { "name": "@zowe/imperative", - "version": "5.26.0", + "version": "5.26.1", "description": "framework for building configurable CLIs", "author": "Zowe", "license": "EPL-2.0", diff --git a/packages/provisioning/package.json b/packages/provisioning/package.json index e5e9b9d965..1831569c3f 100644 --- a/packages/provisioning/package.json +++ b/packages/provisioning/package.json @@ -1,6 +1,6 @@ { "name": "@zowe/provisioning-for-zowe-sdk", - "version": "7.28.0", + "version": "7.28.1", "description": "Zowe SDK to interact with the z/OS provisioning APIs", "author": "Zowe", "license": "EPL-2.0", @@ -49,9 +49,9 @@ }, "devDependencies": { "@types/js-yaml": "^4.0.5", - "@zowe/cli-test-utils": "7.28.0", - "@zowe/core-for-zowe-sdk": "7.28.0", - "@zowe/imperative": "5.26.0" + "@zowe/cli-test-utils": "7.28.1", + "@zowe/core-for-zowe-sdk": "7.28.1", + "@zowe/imperative": "5.26.1" }, "peerDependencies": { "@zowe/core-for-zowe-sdk": "^7.0.0", diff --git a/packages/workflows/package.json b/packages/workflows/package.json index f08f3c7c35..8a53fbfce7 100644 --- a/packages/workflows/package.json +++ b/packages/workflows/package.json @@ -1,6 +1,6 @@ { "name": "@zowe/zos-workflows-for-zowe-sdk", - "version": "7.28.0", + "version": "7.28.1", "description": "Zowe SDK to interact with the z/OS workflows APIs", "author": "Zowe", "license": "EPL-2.0", @@ -45,12 +45,12 @@ "prepack": "node ../../scripts/prepareLicenses.js" }, "dependencies": { - "@zowe/zos-files-for-zowe-sdk": "7.28.0" + "@zowe/zos-files-for-zowe-sdk": "7.28.1" }, "devDependencies": { - "@zowe/cli-test-utils": "7.28.0", - "@zowe/core-for-zowe-sdk": "7.28.0", - "@zowe/imperative": "5.26.0" + "@zowe/cli-test-utils": "7.28.1", + "@zowe/core-for-zowe-sdk": "7.28.1", + "@zowe/imperative": "5.26.1" }, "peerDependencies": { "@zowe/core-for-zowe-sdk": "^7.0.0", diff --git a/packages/zosconsole/package.json b/packages/zosconsole/package.json index 43ecd292c8..0c0a06b8a9 100644 --- a/packages/zosconsole/package.json +++ b/packages/zosconsole/package.json @@ -1,6 +1,6 @@ { "name": "@zowe/zos-console-for-zowe-sdk", - "version": "7.28.0", + "version": "7.28.1", "description": "Zowe SDK to interact with the z/OS console", "author": "Zowe", "license": "EPL-2.0", @@ -45,9 +45,9 @@ "prepack": "node ../../scripts/prepareLicenses.js" }, "devDependencies": { - "@zowe/cli-test-utils": "7.28.0", - "@zowe/core-for-zowe-sdk": "7.28.0", - "@zowe/imperative": "5.26.0" + "@zowe/cli-test-utils": "7.28.1", + "@zowe/core-for-zowe-sdk": "7.28.1", + "@zowe/imperative": "5.26.1" }, "peerDependencies": { "@zowe/core-for-zowe-sdk": "^7.0.0", diff --git a/packages/zosfiles/package.json b/packages/zosfiles/package.json index b74d62d75e..a938e71801 100644 --- a/packages/zosfiles/package.json +++ b/packages/zosfiles/package.json @@ -1,6 +1,6 @@ { "name": "@zowe/zos-files-for-zowe-sdk", - "version": "7.28.0", + "version": "7.28.1", "description": "Zowe SDK to interact with files and data sets on z/OS", "author": "Zowe", "license": "EPL-2.0", @@ -49,10 +49,10 @@ "minimatch": "5.0.1" }, "devDependencies": { - "@zowe/cli-test-utils": "7.28.0", - "@zowe/core-for-zowe-sdk": "7.28.0", - "@zowe/imperative": "5.26.0", - "@zowe/zos-uss-for-zowe-sdk": "7.28.0" + "@zowe/cli-test-utils": "7.28.1", + "@zowe/core-for-zowe-sdk": "7.28.1", + "@zowe/imperative": "5.26.1", + "@zowe/zos-uss-for-zowe-sdk": "7.28.1" }, "peerDependencies": { "@zowe/core-for-zowe-sdk": "^7.0.0", diff --git a/packages/zosjobs/package.json b/packages/zosjobs/package.json index b07c0d38a6..8bb2fb3ca2 100644 --- a/packages/zosjobs/package.json +++ b/packages/zosjobs/package.json @@ -1,6 +1,6 @@ { "name": "@zowe/zos-jobs-for-zowe-sdk", - "version": "7.28.0", + "version": "7.28.1", "description": "Zowe SDK to interact with jobs on z/OS", "author": "Zowe", "license": "EPL-2.0", @@ -46,12 +46,12 @@ "prepack": "node ../../scripts/prepareLicenses.js" }, "dependencies": { - "@zowe/zos-files-for-zowe-sdk": "7.28.0" + "@zowe/zos-files-for-zowe-sdk": "7.28.1" }, "devDependencies": { - "@zowe/cli-test-utils": "7.28.0", - "@zowe/core-for-zowe-sdk": "7.28.0", - "@zowe/imperative": "5.26.0" + "@zowe/cli-test-utils": "7.28.1", + "@zowe/core-for-zowe-sdk": "7.28.1", + "@zowe/imperative": "5.26.1" }, "peerDependencies": { "@zowe/core-for-zowe-sdk": "^7.0.0", diff --git a/packages/zoslogs/package.json b/packages/zoslogs/package.json index c5d8cfd45e..1fa072ed1d 100644 --- a/packages/zoslogs/package.json +++ b/packages/zoslogs/package.json @@ -1,6 +1,6 @@ { "name": "@zowe/zos-logs-for-zowe-sdk", - "version": "7.28.0", + "version": "7.28.1", "description": "Zowe SDK to interact with the z/OS logs", "author": "Zowe", "license": "EPL-2.0", @@ -45,9 +45,9 @@ "prepack": "node ../../scripts/prepareLicenses.js" }, "devDependencies": { - "@zowe/cli-test-utils": "7.28.0", - "@zowe/core-for-zowe-sdk": "7.28.0", - "@zowe/imperative": "5.26.0" + "@zowe/cli-test-utils": "7.28.1", + "@zowe/core-for-zowe-sdk": "7.28.1", + "@zowe/imperative": "5.26.1" }, "peerDependencies": { "@zowe/core-for-zowe-sdk": "^7.0.0", diff --git a/packages/zosmf/package.json b/packages/zosmf/package.json index 4122a86a2f..3bf892749f 100644 --- a/packages/zosmf/package.json +++ b/packages/zosmf/package.json @@ -1,6 +1,6 @@ { "name": "@zowe/zosmf-for-zowe-sdk", - "version": "7.28.0", + "version": "7.28.1", "description": "Zowe SDK to interact with the z/OS Management Facility", "author": "Zowe", "license": "EPL-2.0", @@ -44,9 +44,9 @@ "prepack": "node ../../scripts/prepareLicenses.js" }, "devDependencies": { - "@zowe/cli-test-utils": "7.28.0", - "@zowe/core-for-zowe-sdk": "7.28.0", - "@zowe/imperative": "5.26.0" + "@zowe/cli-test-utils": "7.28.1", + "@zowe/core-for-zowe-sdk": "7.28.1", + "@zowe/imperative": "5.26.1" }, "peerDependencies": { "@zowe/core-for-zowe-sdk": "^7.0.0", diff --git a/packages/zostso/package.json b/packages/zostso/package.json index f9d0c5c421..a311c0f941 100644 --- a/packages/zostso/package.json +++ b/packages/zostso/package.json @@ -1,6 +1,6 @@ { "name": "@zowe/zos-tso-for-zowe-sdk", - "version": "7.28.0", + "version": "7.28.1", "description": "Zowe SDK to interact with TSO on z/OS", "author": "Zowe", "license": "EPL-2.0", @@ -45,12 +45,12 @@ "prepack": "node ../../scripts/prepareLicenses.js" }, "dependencies": { - "@zowe/zosmf-for-zowe-sdk": "7.28.0" + "@zowe/zosmf-for-zowe-sdk": "7.28.1" }, "devDependencies": { - "@zowe/cli-test-utils": "7.28.0", - "@zowe/core-for-zowe-sdk": "7.28.0", - "@zowe/imperative": "5.26.0" + "@zowe/cli-test-utils": "7.28.1", + "@zowe/core-for-zowe-sdk": "7.28.1", + "@zowe/imperative": "5.26.1" }, "peerDependencies": { "@zowe/core-for-zowe-sdk": "^7.0.0", diff --git a/packages/zosuss/package.json b/packages/zosuss/package.json index ad42ceb4d1..5683088568 100644 --- a/packages/zosuss/package.json +++ b/packages/zosuss/package.json @@ -1,6 +1,6 @@ { "name": "@zowe/zos-uss-for-zowe-sdk", - "version": "7.28.0", + "version": "7.28.1", "description": "Zowe SDK to interact with USS on z/OS", "author": "Zowe", "license": "EPL-2.0", @@ -49,8 +49,8 @@ }, "devDependencies": { "@types/ssh2": "^1.11.0", - "@zowe/cli-test-utils": "7.28.0", - "@zowe/imperative": "5.26.0" + "@zowe/cli-test-utils": "7.28.1", + "@zowe/imperative": "5.26.1" }, "peerDependencies": { "@zowe/imperative": "^5.2.0" From 7fa9de8ae2a3106225092fb0e4868c40f439b073 Mon Sep 17 00:00:00 2001 From: Timothy Johnson Date: Wed, 24 Jul 2024 10:24:13 -0400 Subject: [PATCH 09/13] Make unit test for secure parms dynamic Signed-off-by: Timothy Johnson --- .../src/cmd/__tests__/CommandProcessor.unit.test.ts | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/packages/imperative/src/cmd/__tests__/CommandProcessor.unit.test.ts b/packages/imperative/src/cmd/__tests__/CommandProcessor.unit.test.ts index b1c882fa77..2ea8e55955 100644 --- a/packages/imperative/src/cmd/__tests__/CommandProcessor.unit.test.ts +++ b/packages/imperative/src/cmd/__tests__/CommandProcessor.unit.test.ts @@ -27,6 +27,7 @@ import { setupConfigToLoad } from "../../../__tests__/src/TestUtil"; import { EnvFileUtils, NextVerFeatures } from "../../utilities"; import { join } from "path"; import { Config } from "../../config"; +import { LoggerUtils } from "../.."; jest.mock("../src/syntax/SyntaxValidator"); jest.mock("../src/utils/SharedOptions"); @@ -1832,17 +1833,17 @@ describe("Command Processor", () => { expect(commandResponse.stderr.toString()).toContain(`Some inputs are not displayed`); }); - it("should mask input value for a user-defined secure parm when --show-inputs-only flag is set", async () => { + it.each(LoggerUtils.SECURE_PROMPT_OPTIONS)("should mask input value for secure parm %s when --show-inputs-only flag is set", async (propName) => { // values to test - const parm1Key = `token-value`; + const parm1Key = CliUtils.getOptionFormat(propName).kebabCase; const parm1Value = `secret`; const secure = `(secure value)`; jest.spyOn(ImperativeConfig, "instance", "get").mockReturnValue({ config: { api: { secure: { - securePropsForProfile: jest.fn(() => ["tokenValue"]) + securePropsForProfile: jest.fn(() => [propName]) } }, layers: [{ exists: true, path: "zowe.config.json" }], From 6d178c2fa95d002fb8e3ad7e9ff95679243eafc1 Mon Sep 17 00:00:00 2001 From: Timothy Johnson Date: Thu, 25 Jul 2024 14:19:35 -0400 Subject: [PATCH 10/13] Enhance cli-test-utils error when "sh" missing from PATH Signed-off-by: Timothy Johnson --- __tests__/__packages__/cli-test-utils/CHANGELOG.md | 4 ++++ .../__packages__/cli-test-utils/src/TestUtils.ts | 13 +++++++++---- 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/__tests__/__packages__/cli-test-utils/CHANGELOG.md b/__tests__/__packages__/cli-test-utils/CHANGELOG.md index 115678f10d..0f97ea6226 100644 --- a/__tests__/__packages__/cli-test-utils/CHANGELOG.md +++ b/__tests__/__packages__/cli-test-utils/CHANGELOG.md @@ -2,6 +2,10 @@ All notable changes to the Zowe CLI test utils package will be documented in this file. +## Recent Changes + +- BugFix: Improved the error message shown on Windows when `runCliScript` method cannot find `sh` executable on PATH. [#2208](https://github.com/zowe/zowe-cli/issues/2208) + ## `7.18.11` - BugFix: Fix types error from an incorrect jstree type during compilation diff --git a/__tests__/__packages__/cli-test-utils/src/TestUtils.ts b/__tests__/__packages__/cli-test-utils/src/TestUtils.ts index 99cfdae81f..91b6b54034 100644 --- a/__tests__/__packages__/cli-test-utils/src/TestUtils.ts +++ b/__tests__/__packages__/cli-test-utils/src/TestUtils.ts @@ -10,7 +10,7 @@ */ import * as fs from "fs"; -import { spawnSync, SpawnSyncReturns } from "child_process"; +import { spawnSync, SpawnSyncReturns, ExecFileException } from "child_process"; import { ITestEnvironment } from "./environment/doc/response/ITestEnvironment"; import { CommandProfiles, ICommandDefinition, IHandlerParameters } from "@zowe/imperative"; @@ -37,11 +37,16 @@ export function runCliScript(scriptPath: string, testEnvironment: ITestEnvironme if (process.platform === "win32") { // Execute the command synchronously - return spawnSync("sh", [`${scriptPath}`].concat(args), { + const response = spawnSync("sh", [scriptPath].concat(args), { cwd: testEnvironment.workingDir, - env: childEnv, - encoding: "buffer" + encoding: "buffer", + env: childEnv }); + if ((response.error as ExecFileException)?.code === "ENOENT") { + throw new Error(`"sh" is missing from your PATH. Check that Git Bash is installed with the option to ` + + `"Use Git and Unix Tools from Windows Command Prompt".`); + } + return response; } // Check to see if the file is executable From 66b59ecfedd19500a894a1bf3d5839aa55b077f9 Mon Sep 17 00:00:00 2001 From: zowe-robot Date: Thu, 25 Jul 2024 20:35:49 +0000 Subject: [PATCH 11/13] Bump version to 7.28.2 [ci skip] Signed-off-by: zowe-robot --- .../__packages__/cli-test-utils/CHANGELOG.md | 2 +- .../__packages__/cli-test-utils/package.json | 2 +- lerna.json | 2 +- npm-shrinkwrap.json | 156 +++++++++--------- packages/cli/package.json | 24 +-- packages/core/package.json | 4 +- packages/provisioning/package.json | 6 +- packages/workflows/package.json | 8 +- packages/zosconsole/package.json | 6 +- packages/zosfiles/package.json | 8 +- packages/zosjobs/package.json | 8 +- packages/zoslogs/package.json | 6 +- packages/zosmf/package.json | 6 +- packages/zostso/package.json | 8 +- packages/zosuss/package.json | 4 +- 15 files changed, 125 insertions(+), 125 deletions(-) diff --git a/__tests__/__packages__/cli-test-utils/CHANGELOG.md b/__tests__/__packages__/cli-test-utils/CHANGELOG.md index 0f97ea6226..531be6aef0 100644 --- a/__tests__/__packages__/cli-test-utils/CHANGELOG.md +++ b/__tests__/__packages__/cli-test-utils/CHANGELOG.md @@ -2,7 +2,7 @@ All notable changes to the Zowe CLI test utils package will be documented in this file. -## Recent Changes +## `7.28.2` - BugFix: Improved the error message shown on Windows when `runCliScript` method cannot find `sh` executable on PATH. [#2208](https://github.com/zowe/zowe-cli/issues/2208) diff --git a/__tests__/__packages__/cli-test-utils/package.json b/__tests__/__packages__/cli-test-utils/package.json index 6636932dd0..83e901cdb7 100644 --- a/__tests__/__packages__/cli-test-utils/package.json +++ b/__tests__/__packages__/cli-test-utils/package.json @@ -1,6 +1,6 @@ { "name": "@zowe/cli-test-utils", - "version": "7.28.1", + "version": "7.28.2", "description": "Test utilities package for Zowe CLI plug-ins", "author": "Zowe", "license": "EPL-2.0", diff --git a/lerna.json b/lerna.json index 764758a7b9..28bf670e2c 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "7.28.1", + "version": "7.28.2", "command": { "publish": { "ignoreChanges": [ diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json index ea0ca07ea4..bbdac367c1 100644 --- a/npm-shrinkwrap.json +++ b/npm-shrinkwrap.json @@ -53,7 +53,7 @@ }, "__tests__/__packages__/cli-test-utils": { "name": "@zowe/cli-test-utils", - "version": "7.28.1", + "version": "7.28.2", "license": "EPL-2.0", "dependencies": { "find-up": "^5.0.0", @@ -20451,21 +20451,21 @@ }, "packages/cli": { "name": "@zowe/cli", - "version": "7.28.1", + "version": "7.28.2", "hasInstallScript": true, "license": "EPL-2.0", "dependencies": { - "@zowe/core-for-zowe-sdk": "7.28.1", + "@zowe/core-for-zowe-sdk": "7.28.2", "@zowe/imperative": "5.26.1", - "@zowe/provisioning-for-zowe-sdk": "7.28.1", - "@zowe/zos-console-for-zowe-sdk": "7.28.1", - "@zowe/zos-files-for-zowe-sdk": "7.28.1", - "@zowe/zos-jobs-for-zowe-sdk": "7.28.1", - "@zowe/zos-logs-for-zowe-sdk": "7.28.1", - "@zowe/zos-tso-for-zowe-sdk": "7.28.1", - "@zowe/zos-uss-for-zowe-sdk": "7.28.1", - "@zowe/zos-workflows-for-zowe-sdk": "7.28.1", - "@zowe/zosmf-for-zowe-sdk": "7.28.1", + "@zowe/provisioning-for-zowe-sdk": "7.28.2", + "@zowe/zos-console-for-zowe-sdk": "7.28.2", + "@zowe/zos-files-for-zowe-sdk": "7.28.2", + "@zowe/zos-jobs-for-zowe-sdk": "7.28.2", + "@zowe/zos-logs-for-zowe-sdk": "7.28.2", + "@zowe/zos-tso-for-zowe-sdk": "7.28.2", + "@zowe/zos-uss-for-zowe-sdk": "7.28.2", + "@zowe/zos-workflows-for-zowe-sdk": "7.28.2", + "@zowe/zosmf-for-zowe-sdk": "7.28.2", "find-process": "1.4.7", "get-stream": "6.0.1", "lodash": "4.17.21", @@ -20480,7 +20480,7 @@ "@types/diff": "^5.0.2", "@types/lodash": "^4.14.175", "@types/tar": "^6.1.2", - "@zowe/cli-test-utils": "7.28.1", + "@zowe/cli-test-utils": "7.28.2", "comment-json": "^4.1.1", "strip-ansi": "^6.0.1", "which": "^2.0.2" @@ -20513,14 +20513,14 @@ }, "packages/core": { "name": "@zowe/core-for-zowe-sdk", - "version": "7.28.1", + "version": "7.28.2", "license": "EPL-2.0", "dependencies": { "comment-json": "4.1.1", "string-width": "4.2.3" }, "devDependencies": { - "@zowe/cli-test-utils": "7.28.1", + "@zowe/cli-test-utils": "7.28.2", "@zowe/imperative": "5.26.1" }, "peerDependencies": { @@ -20911,15 +20911,15 @@ }, "packages/provisioning": { "name": "@zowe/provisioning-for-zowe-sdk", - "version": "7.28.1", + "version": "7.28.2", "license": "EPL-2.0", "dependencies": { "js-yaml": "4.1.0" }, "devDependencies": { "@types/js-yaml": "^4.0.5", - "@zowe/cli-test-utils": "7.28.1", - "@zowe/core-for-zowe-sdk": "7.28.1", + "@zowe/cli-test-utils": "7.28.2", + "@zowe/core-for-zowe-sdk": "7.28.2", "@zowe/imperative": "5.26.1" }, "peerDependencies": { @@ -20942,14 +20942,14 @@ }, "packages/workflows": { "name": "@zowe/zos-workflows-for-zowe-sdk", - "version": "7.28.1", + "version": "7.28.2", "license": "EPL-2.0", "dependencies": { - "@zowe/zos-files-for-zowe-sdk": "7.28.1" + "@zowe/zos-files-for-zowe-sdk": "7.28.2" }, "devDependencies": { - "@zowe/cli-test-utils": "7.28.1", - "@zowe/core-for-zowe-sdk": "7.28.1", + "@zowe/cli-test-utils": "7.28.2", + "@zowe/core-for-zowe-sdk": "7.28.2", "@zowe/imperative": "5.26.1" }, "peerDependencies": { @@ -20959,11 +20959,11 @@ }, "packages/zosconsole": { "name": "@zowe/zos-console-for-zowe-sdk", - "version": "7.28.1", + "version": "7.28.2", "license": "EPL-2.0", "devDependencies": { - "@zowe/cli-test-utils": "7.28.1", - "@zowe/core-for-zowe-sdk": "7.28.1", + "@zowe/cli-test-utils": "7.28.2", + "@zowe/core-for-zowe-sdk": "7.28.2", "@zowe/imperative": "5.26.1" }, "peerDependencies": { @@ -20973,16 +20973,16 @@ }, "packages/zosfiles": { "name": "@zowe/zos-files-for-zowe-sdk", - "version": "7.28.1", + "version": "7.28.2", "license": "EPL-2.0", "dependencies": { "minimatch": "5.0.1" }, "devDependencies": { - "@zowe/cli-test-utils": "7.28.1", - "@zowe/core-for-zowe-sdk": "7.28.1", + "@zowe/cli-test-utils": "7.28.2", + "@zowe/core-for-zowe-sdk": "7.28.2", "@zowe/imperative": "5.26.1", - "@zowe/zos-uss-for-zowe-sdk": "7.28.1" + "@zowe/zos-uss-for-zowe-sdk": "7.28.2" }, "peerDependencies": { "@zowe/core-for-zowe-sdk": "^7.0.0", @@ -21010,14 +21010,14 @@ }, "packages/zosjobs": { "name": "@zowe/zos-jobs-for-zowe-sdk", - "version": "7.28.1", + "version": "7.28.2", "license": "EPL-2.0", "dependencies": { - "@zowe/zos-files-for-zowe-sdk": "7.28.1" + "@zowe/zos-files-for-zowe-sdk": "7.28.2" }, "devDependencies": { - "@zowe/cli-test-utils": "7.28.1", - "@zowe/core-for-zowe-sdk": "7.28.1", + "@zowe/cli-test-utils": "7.28.2", + "@zowe/core-for-zowe-sdk": "7.28.2", "@zowe/imperative": "5.26.1" }, "peerDependencies": { @@ -21027,11 +21027,11 @@ }, "packages/zoslogs": { "name": "@zowe/zos-logs-for-zowe-sdk", - "version": "7.28.1", + "version": "7.28.2", "license": "EPL-2.0", "devDependencies": { - "@zowe/cli-test-utils": "7.28.1", - "@zowe/core-for-zowe-sdk": "7.28.1", + "@zowe/cli-test-utils": "7.28.2", + "@zowe/core-for-zowe-sdk": "7.28.2", "@zowe/imperative": "5.26.1" }, "peerDependencies": { @@ -21041,11 +21041,11 @@ }, "packages/zosmf": { "name": "@zowe/zosmf-for-zowe-sdk", - "version": "7.28.1", + "version": "7.28.2", "license": "EPL-2.0", "devDependencies": { - "@zowe/cli-test-utils": "7.28.1", - "@zowe/core-for-zowe-sdk": "7.28.1", + "@zowe/cli-test-utils": "7.28.2", + "@zowe/core-for-zowe-sdk": "7.28.2", "@zowe/imperative": "5.26.1" }, "peerDependencies": { @@ -21055,14 +21055,14 @@ }, "packages/zostso": { "name": "@zowe/zos-tso-for-zowe-sdk", - "version": "7.28.1", + "version": "7.28.2", "license": "EPL-2.0", "dependencies": { - "@zowe/zosmf-for-zowe-sdk": "7.28.1" + "@zowe/zosmf-for-zowe-sdk": "7.28.2" }, "devDependencies": { - "@zowe/cli-test-utils": "7.28.1", - "@zowe/core-for-zowe-sdk": "7.28.1", + "@zowe/cli-test-utils": "7.28.2", + "@zowe/core-for-zowe-sdk": "7.28.2", "@zowe/imperative": "5.26.1" }, "peerDependencies": { @@ -21072,14 +21072,14 @@ }, "packages/zosuss": { "name": "@zowe/zos-uss-for-zowe-sdk", - "version": "7.28.1", + "version": "7.28.2", "license": "EPL-2.0", "dependencies": { "ssh2": "1.15.0" }, "devDependencies": { "@types/ssh2": "^1.11.0", - "@zowe/cli-test-utils": "7.28.1", + "@zowe/cli-test-utils": "7.28.2", "@zowe/imperative": "5.26.1" }, "peerDependencies": { @@ -25770,19 +25770,19 @@ "@types/diff": "^5.0.2", "@types/lodash": "^4.14.175", "@types/tar": "^6.1.2", - "@zowe/cli-test-utils": "7.28.1", - "@zowe/core-for-zowe-sdk": "7.28.1", + "@zowe/cli-test-utils": "7.28.2", + "@zowe/core-for-zowe-sdk": "7.28.2", "@zowe/imperative": "5.26.1", - "@zowe/provisioning-for-zowe-sdk": "7.28.1", + "@zowe/provisioning-for-zowe-sdk": "7.28.2", "@zowe/secrets-for-zowe-sdk": "7.18.6", - "@zowe/zos-console-for-zowe-sdk": "7.28.1", - "@zowe/zos-files-for-zowe-sdk": "7.28.1", - "@zowe/zos-jobs-for-zowe-sdk": "7.28.1", - "@zowe/zos-logs-for-zowe-sdk": "7.28.1", - "@zowe/zos-tso-for-zowe-sdk": "7.28.1", - "@zowe/zos-uss-for-zowe-sdk": "7.28.1", - "@zowe/zos-workflows-for-zowe-sdk": "7.28.1", - "@zowe/zosmf-for-zowe-sdk": "7.28.1", + "@zowe/zos-console-for-zowe-sdk": "7.28.2", + "@zowe/zos-files-for-zowe-sdk": "7.28.2", + "@zowe/zos-jobs-for-zowe-sdk": "7.28.2", + "@zowe/zos-logs-for-zowe-sdk": "7.28.2", + "@zowe/zos-tso-for-zowe-sdk": "7.28.2", + "@zowe/zos-uss-for-zowe-sdk": "7.28.2", + "@zowe/zos-workflows-for-zowe-sdk": "7.28.2", + "@zowe/zosmf-for-zowe-sdk": "7.28.2", "comment-json": "^4.1.1", "find-process": "1.4.7", "get-stream": "6.0.1", @@ -25836,7 +25836,7 @@ "@zowe/core-for-zowe-sdk": { "version": "file:packages/core", "requires": { - "@zowe/cli-test-utils": "7.28.1", + "@zowe/cli-test-utils": "7.28.2", "@zowe/imperative": "5.26.1", "comment-json": "4.1.1", "string-width": "4.2.3" @@ -26124,8 +26124,8 @@ "version": "file:packages/provisioning", "requires": { "@types/js-yaml": "^4.0.5", - "@zowe/cli-test-utils": "7.28.1", - "@zowe/core-for-zowe-sdk": "7.28.1", + "@zowe/cli-test-utils": "7.28.2", + "@zowe/core-for-zowe-sdk": "7.28.2", "@zowe/imperative": "5.26.1", "js-yaml": "4.1.0" } @@ -26140,18 +26140,18 @@ "@zowe/zos-console-for-zowe-sdk": { "version": "file:packages/zosconsole", "requires": { - "@zowe/cli-test-utils": "7.28.1", - "@zowe/core-for-zowe-sdk": "7.28.1", + "@zowe/cli-test-utils": "7.28.2", + "@zowe/core-for-zowe-sdk": "7.28.2", "@zowe/imperative": "5.26.1" } }, "@zowe/zos-files-for-zowe-sdk": { "version": "file:packages/zosfiles", "requires": { - "@zowe/cli-test-utils": "7.28.1", - "@zowe/core-for-zowe-sdk": "7.28.1", + "@zowe/cli-test-utils": "7.28.2", + "@zowe/core-for-zowe-sdk": "7.28.2", "@zowe/imperative": "5.26.1", - "@zowe/zos-uss-for-zowe-sdk": "7.28.1", + "@zowe/zos-uss-for-zowe-sdk": "7.28.2", "minimatch": "5.0.1" }, "dependencies": { @@ -26176,34 +26176,34 @@ "@zowe/zos-jobs-for-zowe-sdk": { "version": "file:packages/zosjobs", "requires": { - "@zowe/cli-test-utils": "7.28.1", - "@zowe/core-for-zowe-sdk": "7.28.1", + "@zowe/cli-test-utils": "7.28.2", + "@zowe/core-for-zowe-sdk": "7.28.2", "@zowe/imperative": "5.26.1", - "@zowe/zos-files-for-zowe-sdk": "7.28.1" + "@zowe/zos-files-for-zowe-sdk": "7.28.2" } }, "@zowe/zos-logs-for-zowe-sdk": { "version": "file:packages/zoslogs", "requires": { - "@zowe/cli-test-utils": "7.28.1", - "@zowe/core-for-zowe-sdk": "7.28.1", + "@zowe/cli-test-utils": "7.28.2", + "@zowe/core-for-zowe-sdk": "7.28.2", "@zowe/imperative": "5.26.1" } }, "@zowe/zos-tso-for-zowe-sdk": { "version": "file:packages/zostso", "requires": { - "@zowe/cli-test-utils": "7.28.1", - "@zowe/core-for-zowe-sdk": "7.28.1", + "@zowe/cli-test-utils": "7.28.2", + "@zowe/core-for-zowe-sdk": "7.28.2", "@zowe/imperative": "5.26.1", - "@zowe/zosmf-for-zowe-sdk": "7.28.1" + "@zowe/zosmf-for-zowe-sdk": "7.28.2" } }, "@zowe/zos-uss-for-zowe-sdk": { "version": "file:packages/zosuss", "requires": { "@types/ssh2": "^1.11.0", - "@zowe/cli-test-utils": "7.28.1", + "@zowe/cli-test-utils": "7.28.2", "@zowe/imperative": "5.26.1", "ssh2": "1.15.0" } @@ -26211,17 +26211,17 @@ "@zowe/zos-workflows-for-zowe-sdk": { "version": "file:packages/workflows", "requires": { - "@zowe/cli-test-utils": "7.28.1", - "@zowe/core-for-zowe-sdk": "7.28.1", + "@zowe/cli-test-utils": "7.28.2", + "@zowe/core-for-zowe-sdk": "7.28.2", "@zowe/imperative": "5.26.1", - "@zowe/zos-files-for-zowe-sdk": "7.28.1" + "@zowe/zos-files-for-zowe-sdk": "7.28.2" } }, "@zowe/zosmf-for-zowe-sdk": { "version": "file:packages/zosmf", "requires": { - "@zowe/cli-test-utils": "7.28.1", - "@zowe/core-for-zowe-sdk": "7.28.1", + "@zowe/cli-test-utils": "7.28.2", + "@zowe/core-for-zowe-sdk": "7.28.2", "@zowe/imperative": "5.26.1" } }, diff --git a/packages/cli/package.json b/packages/cli/package.json index dd1755a2c8..aeae52f39e 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -1,6 +1,6 @@ { "name": "@zowe/cli", - "version": "7.28.1", + "version": "7.28.2", "description": "Zowe CLI is a command line interface (CLI) that provides a simple and streamlined way to interact with IBM z/OS.", "author": "Zowe", "license": "EPL-2.0", @@ -58,17 +58,17 @@ "preshrinkwrap": "node ../../scripts/rewriteShrinkwrap.js" }, "dependencies": { - "@zowe/core-for-zowe-sdk": "7.28.1", + "@zowe/core-for-zowe-sdk": "7.28.2", "@zowe/imperative": "5.26.1", - "@zowe/provisioning-for-zowe-sdk": "7.28.1", - "@zowe/zos-console-for-zowe-sdk": "7.28.1", - "@zowe/zos-files-for-zowe-sdk": "7.28.1", - "@zowe/zos-jobs-for-zowe-sdk": "7.28.1", - "@zowe/zos-logs-for-zowe-sdk": "7.28.1", - "@zowe/zos-tso-for-zowe-sdk": "7.28.1", - "@zowe/zos-uss-for-zowe-sdk": "7.28.1", - "@zowe/zos-workflows-for-zowe-sdk": "7.28.1", - "@zowe/zosmf-for-zowe-sdk": "7.28.1", + "@zowe/provisioning-for-zowe-sdk": "7.28.2", + "@zowe/zos-console-for-zowe-sdk": "7.28.2", + "@zowe/zos-files-for-zowe-sdk": "7.28.2", + "@zowe/zos-jobs-for-zowe-sdk": "7.28.2", + "@zowe/zos-logs-for-zowe-sdk": "7.28.2", + "@zowe/zos-tso-for-zowe-sdk": "7.28.2", + "@zowe/zos-uss-for-zowe-sdk": "7.28.2", + "@zowe/zos-workflows-for-zowe-sdk": "7.28.2", + "@zowe/zosmf-for-zowe-sdk": "7.28.2", "find-process": "1.4.7", "get-stream": "6.0.1", "lodash": "4.17.21", @@ -79,7 +79,7 @@ "@types/diff": "^5.0.2", "@types/lodash": "^4.14.175", "@types/tar": "^6.1.2", - "@zowe/cli-test-utils": "7.28.1", + "@zowe/cli-test-utils": "7.28.2", "comment-json": "^4.1.1", "strip-ansi": "^6.0.1", "which": "^2.0.2" diff --git a/packages/core/package.json b/packages/core/package.json index c3e714f600..178f3f2ccb 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -1,6 +1,6 @@ { "name": "@zowe/core-for-zowe-sdk", - "version": "7.28.1", + "version": "7.28.2", "description": "Core libraries shared by Zowe SDK packages", "author": "Zowe", "license": "EPL-2.0", @@ -49,7 +49,7 @@ "string-width": "4.2.3" }, "devDependencies": { - "@zowe/cli-test-utils": "7.28.1", + "@zowe/cli-test-utils": "7.28.2", "@zowe/imperative": "5.26.1" }, "peerDependencies": { diff --git a/packages/provisioning/package.json b/packages/provisioning/package.json index 1831569c3f..8a4b2e43da 100644 --- a/packages/provisioning/package.json +++ b/packages/provisioning/package.json @@ -1,6 +1,6 @@ { "name": "@zowe/provisioning-for-zowe-sdk", - "version": "7.28.1", + "version": "7.28.2", "description": "Zowe SDK to interact with the z/OS provisioning APIs", "author": "Zowe", "license": "EPL-2.0", @@ -49,8 +49,8 @@ }, "devDependencies": { "@types/js-yaml": "^4.0.5", - "@zowe/cli-test-utils": "7.28.1", - "@zowe/core-for-zowe-sdk": "7.28.1", + "@zowe/cli-test-utils": "7.28.2", + "@zowe/core-for-zowe-sdk": "7.28.2", "@zowe/imperative": "5.26.1" }, "peerDependencies": { diff --git a/packages/workflows/package.json b/packages/workflows/package.json index 8a53fbfce7..81b9fce498 100644 --- a/packages/workflows/package.json +++ b/packages/workflows/package.json @@ -1,6 +1,6 @@ { "name": "@zowe/zos-workflows-for-zowe-sdk", - "version": "7.28.1", + "version": "7.28.2", "description": "Zowe SDK to interact with the z/OS workflows APIs", "author": "Zowe", "license": "EPL-2.0", @@ -45,11 +45,11 @@ "prepack": "node ../../scripts/prepareLicenses.js" }, "dependencies": { - "@zowe/zos-files-for-zowe-sdk": "7.28.1" + "@zowe/zos-files-for-zowe-sdk": "7.28.2" }, "devDependencies": { - "@zowe/cli-test-utils": "7.28.1", - "@zowe/core-for-zowe-sdk": "7.28.1", + "@zowe/cli-test-utils": "7.28.2", + "@zowe/core-for-zowe-sdk": "7.28.2", "@zowe/imperative": "5.26.1" }, "peerDependencies": { diff --git a/packages/zosconsole/package.json b/packages/zosconsole/package.json index 0c0a06b8a9..0c7cd6d689 100644 --- a/packages/zosconsole/package.json +++ b/packages/zosconsole/package.json @@ -1,6 +1,6 @@ { "name": "@zowe/zos-console-for-zowe-sdk", - "version": "7.28.1", + "version": "7.28.2", "description": "Zowe SDK to interact with the z/OS console", "author": "Zowe", "license": "EPL-2.0", @@ -45,8 +45,8 @@ "prepack": "node ../../scripts/prepareLicenses.js" }, "devDependencies": { - "@zowe/cli-test-utils": "7.28.1", - "@zowe/core-for-zowe-sdk": "7.28.1", + "@zowe/cli-test-utils": "7.28.2", + "@zowe/core-for-zowe-sdk": "7.28.2", "@zowe/imperative": "5.26.1" }, "peerDependencies": { diff --git a/packages/zosfiles/package.json b/packages/zosfiles/package.json index a938e71801..a57258e5ff 100644 --- a/packages/zosfiles/package.json +++ b/packages/zosfiles/package.json @@ -1,6 +1,6 @@ { "name": "@zowe/zos-files-for-zowe-sdk", - "version": "7.28.1", + "version": "7.28.2", "description": "Zowe SDK to interact with files and data sets on z/OS", "author": "Zowe", "license": "EPL-2.0", @@ -49,10 +49,10 @@ "minimatch": "5.0.1" }, "devDependencies": { - "@zowe/cli-test-utils": "7.28.1", - "@zowe/core-for-zowe-sdk": "7.28.1", + "@zowe/cli-test-utils": "7.28.2", + "@zowe/core-for-zowe-sdk": "7.28.2", "@zowe/imperative": "5.26.1", - "@zowe/zos-uss-for-zowe-sdk": "7.28.1" + "@zowe/zos-uss-for-zowe-sdk": "7.28.2" }, "peerDependencies": { "@zowe/core-for-zowe-sdk": "^7.0.0", diff --git a/packages/zosjobs/package.json b/packages/zosjobs/package.json index 8bb2fb3ca2..7d879b9cb7 100644 --- a/packages/zosjobs/package.json +++ b/packages/zosjobs/package.json @@ -1,6 +1,6 @@ { "name": "@zowe/zos-jobs-for-zowe-sdk", - "version": "7.28.1", + "version": "7.28.2", "description": "Zowe SDK to interact with jobs on z/OS", "author": "Zowe", "license": "EPL-2.0", @@ -46,11 +46,11 @@ "prepack": "node ../../scripts/prepareLicenses.js" }, "dependencies": { - "@zowe/zos-files-for-zowe-sdk": "7.28.1" + "@zowe/zos-files-for-zowe-sdk": "7.28.2" }, "devDependencies": { - "@zowe/cli-test-utils": "7.28.1", - "@zowe/core-for-zowe-sdk": "7.28.1", + "@zowe/cli-test-utils": "7.28.2", + "@zowe/core-for-zowe-sdk": "7.28.2", "@zowe/imperative": "5.26.1" }, "peerDependencies": { diff --git a/packages/zoslogs/package.json b/packages/zoslogs/package.json index 1fa072ed1d..b9ba5d5a67 100644 --- a/packages/zoslogs/package.json +++ b/packages/zoslogs/package.json @@ -1,6 +1,6 @@ { "name": "@zowe/zos-logs-for-zowe-sdk", - "version": "7.28.1", + "version": "7.28.2", "description": "Zowe SDK to interact with the z/OS logs", "author": "Zowe", "license": "EPL-2.0", @@ -45,8 +45,8 @@ "prepack": "node ../../scripts/prepareLicenses.js" }, "devDependencies": { - "@zowe/cli-test-utils": "7.28.1", - "@zowe/core-for-zowe-sdk": "7.28.1", + "@zowe/cli-test-utils": "7.28.2", + "@zowe/core-for-zowe-sdk": "7.28.2", "@zowe/imperative": "5.26.1" }, "peerDependencies": { diff --git a/packages/zosmf/package.json b/packages/zosmf/package.json index 3bf892749f..c460dece8f 100644 --- a/packages/zosmf/package.json +++ b/packages/zosmf/package.json @@ -1,6 +1,6 @@ { "name": "@zowe/zosmf-for-zowe-sdk", - "version": "7.28.1", + "version": "7.28.2", "description": "Zowe SDK to interact with the z/OS Management Facility", "author": "Zowe", "license": "EPL-2.0", @@ -44,8 +44,8 @@ "prepack": "node ../../scripts/prepareLicenses.js" }, "devDependencies": { - "@zowe/cli-test-utils": "7.28.1", - "@zowe/core-for-zowe-sdk": "7.28.1", + "@zowe/cli-test-utils": "7.28.2", + "@zowe/core-for-zowe-sdk": "7.28.2", "@zowe/imperative": "5.26.1" }, "peerDependencies": { diff --git a/packages/zostso/package.json b/packages/zostso/package.json index a311c0f941..df9c88d588 100644 --- a/packages/zostso/package.json +++ b/packages/zostso/package.json @@ -1,6 +1,6 @@ { "name": "@zowe/zos-tso-for-zowe-sdk", - "version": "7.28.1", + "version": "7.28.2", "description": "Zowe SDK to interact with TSO on z/OS", "author": "Zowe", "license": "EPL-2.0", @@ -45,11 +45,11 @@ "prepack": "node ../../scripts/prepareLicenses.js" }, "dependencies": { - "@zowe/zosmf-for-zowe-sdk": "7.28.1" + "@zowe/zosmf-for-zowe-sdk": "7.28.2" }, "devDependencies": { - "@zowe/cli-test-utils": "7.28.1", - "@zowe/core-for-zowe-sdk": "7.28.1", + "@zowe/cli-test-utils": "7.28.2", + "@zowe/core-for-zowe-sdk": "7.28.2", "@zowe/imperative": "5.26.1" }, "peerDependencies": { diff --git a/packages/zosuss/package.json b/packages/zosuss/package.json index 5683088568..1ab17781ab 100644 --- a/packages/zosuss/package.json +++ b/packages/zosuss/package.json @@ -1,6 +1,6 @@ { "name": "@zowe/zos-uss-for-zowe-sdk", - "version": "7.28.1", + "version": "7.28.2", "description": "Zowe SDK to interact with USS on z/OS", "author": "Zowe", "license": "EPL-2.0", @@ -49,7 +49,7 @@ }, "devDependencies": { "@types/ssh2": "^1.11.0", - "@zowe/cli-test-utils": "7.28.1", + "@zowe/cli-test-utils": "7.28.2", "@zowe/imperative": "5.26.1" }, "peerDependencies": { From e4918c759f0ba1618d4a0fb0f4c3545b61f5eb5c Mon Sep 17 00:00:00 2001 From: Timothy Johnson Date: Fri, 26 Jul 2024 10:25:16 -0400 Subject: [PATCH 12/13] Fix import and update changelog Signed-off-by: Timothy Johnson --- packages/imperative/CHANGELOG.md | 2 +- .../imperative/src/cmd/__tests__/CommandProcessor.unit.test.ts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/imperative/CHANGELOG.md b/packages/imperative/CHANGELOG.md index db8b24f736..eb591b889b 100644 --- a/packages/imperative/CHANGELOG.md +++ b/packages/imperative/CHANGELOG.md @@ -428,7 +428,7 @@ All notable changes to the Imperative package will be documented in this file. ## `5.26.1` -- Bugfix: Export new Proxy class from Zowe imperative package. [#2205](https://github.com/zowe/zowe-cli/pull/2205) +- BugFix: Fixed missing export for `Proxy` class in Imperative package. [#2205](https://github.com/zowe/zowe-cli/pull/2205) ## `5.26.0` diff --git a/packages/imperative/src/cmd/__tests__/CommandProcessor.unit.test.ts b/packages/imperative/src/cmd/__tests__/CommandProcessor.unit.test.ts index 21e3c7e911..e0734d19b1 100644 --- a/packages/imperative/src/cmd/__tests__/CommandProcessor.unit.test.ts +++ b/packages/imperative/src/cmd/__tests__/CommandProcessor.unit.test.ts @@ -26,7 +26,7 @@ import { setupConfigToLoad } from "../../../__tests__/src/TestUtil"; import { EnvFileUtils } from "../../utilities"; import { join } from "path"; import { Config } from "../../config"; -import { LoggerUtils } from "../.."; +import { LoggerUtils } from "../../logger/src/LoggerUtils"; jest.mock("../src/syntax/SyntaxValidator"); jest.mock("../src/utils/SharedOptions"); From 743182b070de9ffa90335962569a9f726652d582 Mon Sep 17 00:00:00 2001 From: Timothy Johnson Date: Fri, 26 Jul 2024 16:46:48 -0400 Subject: [PATCH 13/13] Fix CommandProcessor unit test Signed-off-by: Timothy Johnson --- .../__tests__/CommandProcessor.unit.test.ts | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/packages/imperative/src/cmd/__tests__/CommandProcessor.unit.test.ts b/packages/imperative/src/cmd/__tests__/CommandProcessor.unit.test.ts index e0734d19b1..be3f7bfe2a 100644 --- a/packages/imperative/src/cmd/__tests__/CommandProcessor.unit.test.ts +++ b/packages/imperative/src/cmd/__tests__/CommandProcessor.unit.test.ts @@ -1481,7 +1481,7 @@ describe("Command Processor", () => { rootCommandName: SAMPLE_ROOT_COMMAND, commandLine: "", promptPhrase: "dummydummy", - config: ImperativeConfig.instance.config + config: ImperativeConfig.instance.config }); // Mock the profile loader @@ -1592,7 +1592,7 @@ describe("Command Processor", () => { rootCommandName: SAMPLE_ROOT_COMMAND, commandLine: "", promptPhrase: "dummydummy", - config: ImperativeConfig.instance.config + config: ImperativeConfig.instance.config }); // Mock the profile loader @@ -1661,13 +1661,26 @@ describe("Command Processor", () => { } }, helpGenerator: FAKE_HELP_GENERATOR, - profileManagerFactory: FAKE_PROFILE_MANAGER_FACTORY, rootCommandName: SAMPLE_ROOT_COMMAND, commandLine: "", promptPhrase: "dummydummy", config: ImperativeConfig.instance.config }); + // Mock the profile loader + (CommandProfileLoader.loader as any) = jest.fn((args) => { + return { + loadProfiles: (profArgs: any) => { + return; + } + }; + }); + + // return the "fake" args object with values from profile + CliUtils.getOptValueFromProfiles = jest.fn((cmdProfiles, profileDef, allOpts) => { + return {}; + }); + const parms: any = { arguments: { _: ["check", "for", "banana"],