From b24e93bd224a89fd774bc1017b995a422f29d62a Mon Sep 17 00:00:00 2001 From: Amber Torrise Date: Fri, 24 May 2024 14:43:53 -0400 Subject: [PATCH 01/29] porting good first issue changes to v2 as well Signed-off-by: Amber Torrise --- .../cli.zos-console.collect.response.integration.test.ts.snap | 2 +- .../cli.zos-console.issue.command.integration.test.ts.snap | 2 +- packages/imperative/CHANGELOG.md | 4 ++++ packages/imperative/src/cmd/src/syntax/SyntaxValidator.ts | 2 +- 4 files changed, 7 insertions(+), 3 deletions(-) diff --git a/packages/cli/__tests__/zosconsole/__integration__/collect/__snapshots__/cli.zos-console.collect.response.integration.test.ts.snap b/packages/cli/__tests__/zosconsole/__integration__/collect/__snapshots__/cli.zos-console.collect.response.integration.test.ts.snap index 5378cc8051..48147e6429 100644 --- a/packages/cli/__tests__/zosconsole/__integration__/collect/__snapshots__/cli.zos-console.collect.response.integration.test.ts.snap +++ b/packages/cli/__tests__/zosconsole/__integration__/collect/__snapshots__/cli.zos-console.collect.response.integration.test.ts.snap @@ -190,7 +190,7 @@ Invalid value specified for option: You specified: 123@CA.COM -The value must match one of the following regular expressions: +The value must match one of the following options: [ '^[a-zA-Z0-9]+$' ]. Example: diff --git a/packages/cli/__tests__/zosconsole/__integration__/issue/__snapshots__/cli.zos-console.issue.command.integration.test.ts.snap b/packages/cli/__tests__/zosconsole/__integration__/issue/__snapshots__/cli.zos-console.issue.command.integration.test.ts.snap index 6d3defffaa..7a06c5fa40 100644 --- a/packages/cli/__tests__/zosconsole/__integration__/issue/__snapshots__/cli.zos-console.issue.command.integration.test.ts.snap +++ b/packages/cli/__tests__/zosconsole/__integration__/issue/__snapshots__/cli.zos-console.issue.command.integration.test.ts.snap @@ -309,7 +309,7 @@ Invalid value specified for option: You specified: 123@CA.COM -The value must match one of the following regular expressions: +The value must match one of the following regular options: [ '^[a-zA-Z0-9]+$' ]. Example: diff --git a/packages/imperative/CHANGELOG.md b/packages/imperative/CHANGELOG.md index f6e156cd5e..688adf40eb 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. +## Recent Changes + +- Patch: Modify error text in SyntaxValidator.invalidOptionError. [#2138](https://github.com/zowe/zowe-cli/issues/2138) + ## `5.23.2` - BugFix: Updated error text for invalid command options so that allowable values are displayed as strings instead of regular expressions when possible. [#1863](https://github.com/zowe/zowe-cli/issues/1863) diff --git a/packages/imperative/src/cmd/src/syntax/SyntaxValidator.ts b/packages/imperative/src/cmd/src/syntax/SyntaxValidator.ts index 759f23482a..448f7b295f 100644 --- a/packages/imperative/src/cmd/src/syntax/SyntaxValidator.ts +++ b/packages/imperative/src/cmd/src/syntax/SyntaxValidator.ts @@ -844,7 +844,7 @@ export class SyntaxValidator { const msg: string = responseObject.console.error( "Invalid value specified for option:\n{{long}} {{aliases}}\n\n" + "You specified:\n{{optionVal}}\n\n" + - "The value must match one of the following regular expressions:\n{{allowed}}.", + "The value must match one of the following options:\n{{allowed}}.", mustacheSummary); this.appendValidatorError(responseObject, {message: msg, optionInError: failingOption.name, definition: failingOption}); From e512298e12de69e0d721d7fd429efe58d3cade4d Mon Sep 17 00:00:00 2001 From: Amber Torrise Date: Tue, 28 May 2024 11:17:17 -0400 Subject: [PATCH 02/29] snaps Signed-off-by: Amber Torrise --- .../cli.zos-console.issue.command.integration.test.ts.snap | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/cli/__tests__/zosconsole/__integration__/issue/__snapshots__/cli.zos-console.issue.command.integration.test.ts.snap b/packages/cli/__tests__/zosconsole/__integration__/issue/__snapshots__/cli.zos-console.issue.command.integration.test.ts.snap index 7a06c5fa40..e98a637ad9 100644 --- a/packages/cli/__tests__/zosconsole/__integration__/issue/__snapshots__/cli.zos-console.issue.command.integration.test.ts.snap +++ b/packages/cli/__tests__/zosconsole/__integration__/issue/__snapshots__/cli.zos-console.issue.command.integration.test.ts.snap @@ -309,7 +309,7 @@ Invalid value specified for option: You specified: 123@CA.COM -The value must match one of the following regular options: +The value must match one of the following options: [ '^[a-zA-Z0-9]+$' ]. Example: From a6c8a8b89f09a98e765ae6247c1773c038b39c89 Mon Sep 17 00:00:00 2001 From: Timothy Johnson Date: Tue, 28 May 2024 12:00:44 -0400 Subject: [PATCH 03/29] Updates braces dependency for technical currency Signed-off-by: Timothy Johnson --- npm-shrinkwrap.json | 28 ++++++++++++++-------------- packages/cli/CHANGELOG.md | 4 ++++ packages/imperative/CHANGELOG.md | 4 ++++ 3 files changed, 22 insertions(+), 14 deletions(-) diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json index 2d42ccd3db..3837732420 100644 --- a/npm-shrinkwrap.json +++ b/npm-shrinkwrap.json @@ -7726,11 +7726,11 @@ } }, "node_modules/braces": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz", - "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==", + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.3.tgz", + "integrity": "sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==", "dependencies": { - "fill-range": "^7.0.1" + "fill-range": "^7.1.1" }, "engines": { "node": ">=8" @@ -10652,9 +10652,9 @@ } }, "node_modules/fill-range": { - "version": "7.0.1", - "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz", - "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==", + "version": "7.1.1", + "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.1.1.tgz", + "integrity": "sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==", "dependencies": { "to-regex-range": "^5.0.1" }, @@ -27099,11 +27099,11 @@ } }, "braces": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz", - "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==", + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.3.tgz", + "integrity": "sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==", "requires": { - "fill-range": "^7.0.1" + "fill-range": "^7.1.1" } }, "browserslist": { @@ -29268,9 +29268,9 @@ } }, "fill-range": { - "version": "7.0.1", - "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz", - "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==", + "version": "7.1.1", + "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.1.1.tgz", + "integrity": "sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==", "requires": { "to-regex-range": "^5.0.1" } diff --git a/packages/cli/CHANGELOG.md b/packages/cli/CHANGELOG.md index ea64dbca24..b5410efb23 100644 --- a/packages/cli/CHANGELOG.md +++ b/packages/cli/CHANGELOG.md @@ -2,6 +2,10 @@ All notable changes to the Zowe CLI package will be documented in this file. +## Recent Changes + +- BugFix: Updated `braces` dependency for technical currency. [#2157](https://github.com/zowe/zowe-cli/pull/2157) + ## `7.25.0` - Enhancement: Added the ability to set JCL reader properties for `--jobRecordLength`, `--jobRecordFormat` and `--jobEncoding` on the `zowe jobs submit local-file` and `zowe jobs submit stdin` commands. [#2139](https://github.com/zowe/zowe-cli/pull/2139) diff --git a/packages/imperative/CHANGELOG.md b/packages/imperative/CHANGELOG.md index f6e156cd5e..18e137df4e 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. +## Recent Changes + +- BugFix: Updated `braces` dependency for technical currency. [#2157](https://github.com/zowe/zowe-cli/pull/2157) + ## `5.23.2` - BugFix: Updated error text for invalid command options so that allowable values are displayed as strings instead of regular expressions when possible. [#1863](https://github.com/zowe/zowe-cli/issues/1863) From 8dd3aad2a3c78f788d38fd13ac785ca77dde1be2 Mon Sep 17 00:00:00 2001 From: zowe-robot Date: Wed, 29 May 2024 15:52:19 +0000 Subject: [PATCH 04/29] Bump version to 7.25.1 [ci skip] Signed-off-by: zowe-robot --- .../__packages__/cli-test-utils/package.json | 2 +- lerna.json | 2 +- npm-shrinkwrap.json | 52 +++++++++---------- packages/cli/package.json | 4 +- packages/core/package.json | 2 +- packages/imperative/CHANGELOG.md | 2 +- packages/imperative/package.json | 2 +- packages/provisioning/package.json | 2 +- packages/workflows/package.json | 2 +- packages/zosconsole/package.json | 2 +- packages/zosfiles/package.json | 2 +- packages/zosjobs/package.json | 2 +- packages/zoslogs/package.json | 2 +- packages/zosmf/package.json | 2 +- packages/zostso/package.json | 2 +- packages/zosuss/package.json | 2 +- 16 files changed, 42 insertions(+), 42 deletions(-) diff --git a/__tests__/__packages__/cli-test-utils/package.json b/__tests__/__packages__/cli-test-utils/package.json index e5d9fb5685..a511d10b0a 100644 --- a/__tests__/__packages__/cli-test-utils/package.json +++ b/__tests__/__packages__/cli-test-utils/package.json @@ -43,7 +43,7 @@ "devDependencies": { "@types/js-yaml": "^4.0.0", "@types/uuid": "^8.3.0", - "@zowe/imperative": "5.23.2" + "@zowe/imperative": "5.23.3" }, "peerDependencies": { "@zowe/imperative": "^5.0.0" diff --git a/lerna.json b/lerna.json index 72307e8b7f..2457279ed0 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "7.25.0", + "version": "7.25.1", "command": { "publish": { "ignoreChanges": [ diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json index 2d42ccd3db..0f3d9ff5ac 100644 --- a/npm-shrinkwrap.json +++ b/npm-shrinkwrap.json @@ -64,7 +64,7 @@ "devDependencies": { "@types/js-yaml": "^4.0.0", "@types/uuid": "^8.3.0", - "@zowe/imperative": "5.23.2" + "@zowe/imperative": "5.23.3" }, "peerDependencies": { "@zowe/imperative": "^5.0.0" @@ -20503,12 +20503,12 @@ }, "packages/cli": { "name": "@zowe/cli", - "version": "7.25.0", + "version": "7.25.1", "hasInstallScript": true, "license": "EPL-2.0", "dependencies": { "@zowe/core-for-zowe-sdk": "7.25.0", - "@zowe/imperative": "5.23.2", + "@zowe/imperative": "5.23.3", "@zowe/provisioning-for-zowe-sdk": "7.25.0", "@zowe/zos-console-for-zowe-sdk": "7.25.0", "@zowe/zos-files-for-zowe-sdk": "7.25.0", @@ -20573,7 +20573,7 @@ }, "devDependencies": { "@zowe/cli-test-utils": "7.24.3", - "@zowe/imperative": "5.23.2" + "@zowe/imperative": "5.23.3" }, "peerDependencies": { "@zowe/imperative": "^5.0.0" @@ -20581,7 +20581,7 @@ }, "packages/imperative": { "name": "@zowe/imperative", - "version": "5.23.2", + "version": "5.23.3", "license": "EPL-2.0", "dependencies": { "@types/yargs": "13.0.4", @@ -20935,7 +20935,7 @@ "@types/js-yaml": "^4.0.5", "@zowe/cli-test-utils": "7.24.3", "@zowe/core-for-zowe-sdk": "7.25.0", - "@zowe/imperative": "5.23.2" + "@zowe/imperative": "5.23.3" }, "peerDependencies": { "@zowe/core-for-zowe-sdk": "^7.0.0", @@ -20965,7 +20965,7 @@ "devDependencies": { "@zowe/cli-test-utils": "7.24.3", "@zowe/core-for-zowe-sdk": "7.25.0", - "@zowe/imperative": "5.23.2" + "@zowe/imperative": "5.23.3" }, "peerDependencies": { "@zowe/core-for-zowe-sdk": "^7.0.0", @@ -20979,7 +20979,7 @@ "devDependencies": { "@zowe/cli-test-utils": "7.24.3", "@zowe/core-for-zowe-sdk": "7.25.0", - "@zowe/imperative": "5.23.2" + "@zowe/imperative": "5.23.3" }, "peerDependencies": { "@zowe/core-for-zowe-sdk": "^7.0.0", @@ -20997,7 +20997,7 @@ "devDependencies": { "@zowe/cli-test-utils": "7.24.3", "@zowe/core-for-zowe-sdk": "7.25.0", - "@zowe/imperative": "5.23.2", + "@zowe/imperative": "5.23.3", "@zowe/zos-uss-for-zowe-sdk": "7.24.3" }, "peerDependencies": { @@ -21034,7 +21034,7 @@ "devDependencies": { "@zowe/cli-test-utils": "7.24.3", "@zowe/core-for-zowe-sdk": "7.25.0", - "@zowe/imperative": "5.23.2" + "@zowe/imperative": "5.23.3" }, "peerDependencies": { "@zowe/core-for-zowe-sdk": "^7.0.0", @@ -21048,7 +21048,7 @@ "devDependencies": { "@zowe/cli-test-utils": "7.24.3", "@zowe/core-for-zowe-sdk": "7.25.0", - "@zowe/imperative": "5.23.2" + "@zowe/imperative": "5.23.3" }, "peerDependencies": { "@zowe/core-for-zowe-sdk": "^7.0.0", @@ -21062,7 +21062,7 @@ "devDependencies": { "@zowe/cli-test-utils": "7.24.3", "@zowe/core-for-zowe-sdk": "7.25.0", - "@zowe/imperative": "5.23.2" + "@zowe/imperative": "5.23.3" }, "peerDependencies": { "@zowe/core-for-zowe-sdk": "^7.0.0", @@ -21079,7 +21079,7 @@ "devDependencies": { "@zowe/cli-test-utils": "7.24.3", "@zowe/core-for-zowe-sdk": "7.25.0", - "@zowe/imperative": "5.23.2" + "@zowe/imperative": "5.23.3" }, "peerDependencies": { "@zowe/core-for-zowe-sdk": "^7.0.0", @@ -21096,7 +21096,7 @@ "devDependencies": { "@types/ssh2": "^1.11.0", "@zowe/cli-test-utils": "7.24.3", - "@zowe/imperative": "5.23.2" + "@zowe/imperative": "5.23.3" }, "peerDependencies": { "@zowe/imperative": "^5.2.0" @@ -25788,7 +25788,7 @@ "@types/tar": "^6.1.2", "@zowe/cli-test-utils": "7.24.3", "@zowe/core-for-zowe-sdk": "7.25.0", - "@zowe/imperative": "5.23.2", + "@zowe/imperative": "5.23.3", "@zowe/provisioning-for-zowe-sdk": "7.25.0", "@zowe/secrets-for-zowe-sdk": "7.18.6", "@zowe/zos-console-for-zowe-sdk": "7.25.0", @@ -25832,7 +25832,7 @@ "requires": { "@types/js-yaml": "^4.0.0", "@types/uuid": "^8.3.0", - "@zowe/imperative": "5.23.2", + "@zowe/imperative": "5.23.3", "find-up": "^5.0.0", "js-yaml": "^4.0.0", "rimraf": "^3.0.2", @@ -25853,7 +25853,7 @@ "version": "file:packages/core", "requires": { "@zowe/cli-test-utils": "7.24.3", - "@zowe/imperative": "5.23.2", + "@zowe/imperative": "5.23.3", "comment-json": "4.1.1", "string-width": "4.2.3" } @@ -26114,7 +26114,7 @@ "@types/js-yaml": "^4.0.5", "@zowe/cli-test-utils": "7.24.3", "@zowe/core-for-zowe-sdk": "7.25.0", - "@zowe/imperative": "5.23.2", + "@zowe/imperative": "5.23.3", "js-yaml": "4.1.0" } }, @@ -26130,7 +26130,7 @@ "requires": { "@zowe/cli-test-utils": "7.24.3", "@zowe/core-for-zowe-sdk": "7.25.0", - "@zowe/imperative": "5.23.2" + "@zowe/imperative": "5.23.3" } }, "@zowe/zos-files-for-zowe-sdk": { @@ -26138,7 +26138,7 @@ "requires": { "@zowe/cli-test-utils": "7.24.3", "@zowe/core-for-zowe-sdk": "7.25.0", - "@zowe/imperative": "5.23.2", + "@zowe/imperative": "5.23.3", "@zowe/zos-uss-for-zowe-sdk": "7.24.3", "get-stream": "6.0.1", "minimatch": "5.0.1" @@ -26167,7 +26167,7 @@ "requires": { "@zowe/cli-test-utils": "7.24.3", "@zowe/core-for-zowe-sdk": "7.25.0", - "@zowe/imperative": "5.23.2", + "@zowe/imperative": "5.23.3", "@zowe/zos-files-for-zowe-sdk": "7.25.0" } }, @@ -26176,7 +26176,7 @@ "requires": { "@zowe/cli-test-utils": "7.24.3", "@zowe/core-for-zowe-sdk": "7.25.0", - "@zowe/imperative": "5.23.2" + "@zowe/imperative": "5.23.3" } }, "@zowe/zos-tso-for-zowe-sdk": { @@ -26184,7 +26184,7 @@ "requires": { "@zowe/cli-test-utils": "7.24.3", "@zowe/core-for-zowe-sdk": "7.25.0", - "@zowe/imperative": "5.23.2", + "@zowe/imperative": "5.23.3", "@zowe/zosmf-for-zowe-sdk": "7.25.0" } }, @@ -26193,7 +26193,7 @@ "requires": { "@types/ssh2": "^1.11.0", "@zowe/cli-test-utils": "7.24.3", - "@zowe/imperative": "5.23.2", + "@zowe/imperative": "5.23.3", "ssh2": "1.15.0" } }, @@ -26202,7 +26202,7 @@ "requires": { "@zowe/cli-test-utils": "7.24.3", "@zowe/core-for-zowe-sdk": "7.25.0", - "@zowe/imperative": "5.23.2", + "@zowe/imperative": "5.23.3", "@zowe/zos-files-for-zowe-sdk": "7.25.0" } }, @@ -26211,7 +26211,7 @@ "requires": { "@zowe/cli-test-utils": "7.24.3", "@zowe/core-for-zowe-sdk": "7.25.0", - "@zowe/imperative": "5.23.2" + "@zowe/imperative": "5.23.3" } }, "abbrev": { diff --git a/packages/cli/package.json b/packages/cli/package.json index 570e5621e9..2d915fd597 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -1,6 +1,6 @@ { "name": "@zowe/cli", - "version": "7.25.0", + "version": "7.25.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", @@ -59,7 +59,7 @@ }, "dependencies": { "@zowe/core-for-zowe-sdk": "7.25.0", - "@zowe/imperative": "5.23.2", + "@zowe/imperative": "5.23.3", "@zowe/provisioning-for-zowe-sdk": "7.25.0", "@zowe/zos-console-for-zowe-sdk": "7.25.0", "@zowe/zos-files-for-zowe-sdk": "7.25.0", diff --git a/packages/core/package.json b/packages/core/package.json index 7c556c26aa..61456cef36 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -50,7 +50,7 @@ }, "devDependencies": { "@zowe/cli-test-utils": "7.24.3", - "@zowe/imperative": "5.23.2" + "@zowe/imperative": "5.23.3" }, "peerDependencies": { "@zowe/imperative": "^5.0.0" diff --git a/packages/imperative/CHANGELOG.md b/packages/imperative/CHANGELOG.md index 688adf40eb..494bc81a43 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.23.3` - Patch: Modify error text in SyntaxValidator.invalidOptionError. [#2138](https://github.com/zowe/zowe-cli/issues/2138) diff --git a/packages/imperative/package.json b/packages/imperative/package.json index ff5551104b..d340816869 100644 --- a/packages/imperative/package.json +++ b/packages/imperative/package.json @@ -1,6 +1,6 @@ { "name": "@zowe/imperative", - "version": "5.23.2", + "version": "5.23.3", "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 9b580d1cdb..e70f4a48d1 100644 --- a/packages/provisioning/package.json +++ b/packages/provisioning/package.json @@ -51,7 +51,7 @@ "@types/js-yaml": "^4.0.5", "@zowe/cli-test-utils": "7.24.3", "@zowe/core-for-zowe-sdk": "7.25.0", - "@zowe/imperative": "5.23.2" + "@zowe/imperative": "5.23.3" }, "peerDependencies": { "@zowe/core-for-zowe-sdk": "^7.0.0", diff --git a/packages/workflows/package.json b/packages/workflows/package.json index e76d5658d2..f29c48e4d6 100644 --- a/packages/workflows/package.json +++ b/packages/workflows/package.json @@ -50,7 +50,7 @@ "devDependencies": { "@zowe/cli-test-utils": "7.24.3", "@zowe/core-for-zowe-sdk": "7.25.0", - "@zowe/imperative": "5.23.2" + "@zowe/imperative": "5.23.3" }, "peerDependencies": { "@zowe/core-for-zowe-sdk": "^7.0.0", diff --git a/packages/zosconsole/package.json b/packages/zosconsole/package.json index 1edb2d8a7c..81ff089643 100644 --- a/packages/zosconsole/package.json +++ b/packages/zosconsole/package.json @@ -47,7 +47,7 @@ "devDependencies": { "@zowe/cli-test-utils": "7.24.3", "@zowe/core-for-zowe-sdk": "7.25.0", - "@zowe/imperative": "5.23.2" + "@zowe/imperative": "5.23.3" }, "peerDependencies": { "@zowe/core-for-zowe-sdk": "^7.0.0", diff --git a/packages/zosfiles/package.json b/packages/zosfiles/package.json index 5ff7b3a540..5da4a8ee02 100644 --- a/packages/zosfiles/package.json +++ b/packages/zosfiles/package.json @@ -52,7 +52,7 @@ "devDependencies": { "@zowe/cli-test-utils": "7.24.3", "@zowe/core-for-zowe-sdk": "7.25.0", - "@zowe/imperative": "5.23.2", + "@zowe/imperative": "5.23.3", "@zowe/zos-uss-for-zowe-sdk": "7.24.3" }, "peerDependencies": { diff --git a/packages/zosjobs/package.json b/packages/zosjobs/package.json index 7fc3f76a29..35d3add429 100644 --- a/packages/zosjobs/package.json +++ b/packages/zosjobs/package.json @@ -51,7 +51,7 @@ "devDependencies": { "@zowe/cli-test-utils": "7.24.3", "@zowe/core-for-zowe-sdk": "7.25.0", - "@zowe/imperative": "5.23.2" + "@zowe/imperative": "5.23.3" }, "peerDependencies": { "@zowe/core-for-zowe-sdk": "^7.0.0", diff --git a/packages/zoslogs/package.json b/packages/zoslogs/package.json index 7add61b13a..21fdc27b70 100644 --- a/packages/zoslogs/package.json +++ b/packages/zoslogs/package.json @@ -47,7 +47,7 @@ "devDependencies": { "@zowe/cli-test-utils": "7.24.3", "@zowe/core-for-zowe-sdk": "7.25.0", - "@zowe/imperative": "5.23.2" + "@zowe/imperative": "5.23.3" }, "peerDependencies": { "@zowe/core-for-zowe-sdk": "^7.0.0", diff --git a/packages/zosmf/package.json b/packages/zosmf/package.json index 38e1c4f345..c653e7e8be 100644 --- a/packages/zosmf/package.json +++ b/packages/zosmf/package.json @@ -46,7 +46,7 @@ "devDependencies": { "@zowe/cli-test-utils": "7.24.3", "@zowe/core-for-zowe-sdk": "7.25.0", - "@zowe/imperative": "5.23.2" + "@zowe/imperative": "5.23.3" }, "peerDependencies": { "@zowe/core-for-zowe-sdk": "^7.0.0", diff --git a/packages/zostso/package.json b/packages/zostso/package.json index 4127efb8fa..3673f6fbca 100644 --- a/packages/zostso/package.json +++ b/packages/zostso/package.json @@ -50,7 +50,7 @@ "devDependencies": { "@zowe/cli-test-utils": "7.24.3", "@zowe/core-for-zowe-sdk": "7.25.0", - "@zowe/imperative": "5.23.2" + "@zowe/imperative": "5.23.3" }, "peerDependencies": { "@zowe/core-for-zowe-sdk": "^7.0.0", diff --git a/packages/zosuss/package.json b/packages/zosuss/package.json index 40b453bb01..e9ce4e7386 100644 --- a/packages/zosuss/package.json +++ b/packages/zosuss/package.json @@ -50,7 +50,7 @@ "devDependencies": { "@types/ssh2": "^1.11.0", "@zowe/cli-test-utils": "7.24.3", - "@zowe/imperative": "5.23.2" + "@zowe/imperative": "5.23.3" }, "peerDependencies": { "@zowe/imperative": "^5.2.0" From fd32fdffed58c6bad06f9937b5a217b5653994f9 Mon Sep 17 00:00:00 2001 From: jace-roell Date: Thu, 30 May 2024 10:10:21 -0400 Subject: [PATCH 05/29] completing logic Signed-off-by: jace-roell --- .../apiml/__unit__/Services.unit.test.ts | 4 ++-- packages/core/src/apiml/Services.ts | 23 ++++++++++++++++++- 2 files changed, 24 insertions(+), 3 deletions(-) diff --git a/packages/core/__tests__/apiml/__unit__/Services.unit.test.ts b/packages/core/__tests__/apiml/__unit__/Services.unit.test.ts index e6f4be7b6a..caaa10aa6d 100644 --- a/packages/core/__tests__/apiml/__unit__/Services.unit.test.ts +++ b/packages/core/__tests__/apiml/__unit__/Services.unit.test.ts @@ -551,7 +551,7 @@ describe("APIML Services unit tests", () => { "defaults": { // Multiple services were detected. // Uncomment one of the lines below to set a different default. - //"type2": "test2.2" + //"type2": "test2.2", "type2": "test2.1" }, "autoStore": true @@ -648,7 +648,7 @@ describe("APIML Services unit tests", () => { "type3": "test3", // Multiple services were detected. // Uncomment one of the lines below to set a different default. - //"type4": "test4.2" + //"type4": "test4.2", "type4": "test4.1" }, "autoStore": true diff --git a/packages/core/src/apiml/Services.ts b/packages/core/src/apiml/Services.ts index 9ab64caa42..b8023428fc 100644 --- a/packages/core/src/apiml/Services.ts +++ b/packages/core/src/apiml/Services.ts @@ -207,7 +207,27 @@ export class Services { const _genCommentsHelper = (key: string, elements: string[]): string => { if (elements == null || elements.length === 0) return ""; - return `//"${key}": "${elements.length === 1 ? elements[0] : elements.join('"\n//"' + key + '": "')}"`; + let kvPair: string = ""; + let endComma = ""; + + // add comma to end of kvp depending on if base profile + if(!key.includes("base")){ + endComma = ","; + } + if (elements.length === 1){ + return `//"${key}": "${elements[0]}"${endComma}`; + } + // format pair of kvp (add commas in expected places) + elements.forEach((element, index) => { + if (index === elements.length - 1) { + kvPair += `\n//"${key}": "${element}"`; + } else { + kvPair += `\n//"${key}": "${element}"${endComma}`; + } + }); + + return `${kvPair}${endComma}`; + // return `//"${key}": "${elements.length === 1 ? elements[0] : elements.join('"\n//"' + key + '": "')},"`; }; profileInfoList?.forEach((profileInfo: IApimlProfileInfo) => { @@ -271,6 +291,7 @@ export class Services { ${JSONC.stringify(configDefaults, null, ConfigConstants.INDENT).slice(0, -1)}${Object.keys(configDefaults).length > 0 ? "," : ""} // Multiple services were detected. // Uncomment one of the lines below to set a different default. + ${_genCommentsHelper(defaultKey, conflictingDefaults[defaultKey])} "${defaultKey}": "${trueDefault}" }`); From 1ce778eb462f679f7d13e08267431c8fee20762c Mon Sep 17 00:00:00 2001 From: jace-roell Date: Thu, 30 May 2024 11:34:20 -0400 Subject: [PATCH 06/29] created test Signed-off-by: jace-roell --- .../apiml/__unit__/Services.unit.test.ts | 50 +++++++++++++++++++ 1 file changed, 50 insertions(+) diff --git a/packages/core/__tests__/apiml/__unit__/Services.unit.test.ts b/packages/core/__tests__/apiml/__unit__/Services.unit.test.ts index caaa10aa6d..56f9de08ec 100644 --- a/packages/core/__tests__/apiml/__unit__/Services.unit.test.ts +++ b/packages/core/__tests__/apiml/__unit__/Services.unit.test.ts @@ -392,6 +392,56 @@ describe("APIML Services unit tests", () => { expect(actualJson).toEqual(expectedJson); }); + it("should properly apply comments and commas to profileInfoList", () => { + // should apply a comma to the end of all values in profile kvp except the last value + // should apply a comma to all commented profile types except base + const expectedJsonSnippet_base = ` + //"basePath": "test1/v2" + //"basePath": "test1/v3" + "basePath": "test1/v1" + ` + const expectedJsonSnippet_notBase= ` + //"type2": "test2.2", + "type2": "test2.1" + ` + const testCase: IApimlProfileInfo[] = [ + { + profName: "test1", + profType: "type1", + basePaths: [ + "test1/v1", + "test1/v2", + "test1/v3" + ], + pluginConfigs: new Set(), + gatewayUrlConflicts: {} + }, + { + profName: "test2.1", + profType: "type2", + basePaths: [ + "test2.1/v1" + ], + pluginConfigs: new Set(), + gatewayUrlConflicts: {} + }, + { + profName: "test2.2", + profType: "type2", + basePaths: [ + "test2.2/v1" + ], + pluginConfigs: new Set(), + gatewayUrlConflicts: {} + } + ]; + let actualJson = JSONC.stringify(Services.convertApimlProfileInfoToProfileConfig(testCase), null, ConfigConstants.INDENT); + + expect(actualJson.replace(/\s+/g, '')).toContain(expectedJsonSnippet_base.replace(/\s+/g, '')); + expect(actualJson.replace(/\s+/g, '')).toContain(expectedJsonSnippet_notBase.replace(/\s+/g, '')); + + }) + it("should create a config object without comments about conflicts", () => { const testCase: IApimlProfileInfo[] = [{ profName: "test0", From d803c458a9bd34e8a373a9c7ff6220427d3faa64 Mon Sep 17 00:00:00 2001 From: jace-roell Date: Thu, 30 May 2024 11:41:24 -0400 Subject: [PATCH 07/29] modified changelog Signed-off-by: jace-roell --- packages/core/CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/packages/core/CHANGELOG.md b/packages/core/CHANGELOG.md index 56c97b25f6..f664461a0e 100644 --- a/packages/core/CHANGELOG.md +++ b/packages/core/CHANGELOG.md @@ -2,6 +2,10 @@ All notable changes to the Zowe core SDK package will be documented in this file. +## Recent Changes + +- BugFix: Modified Services.ts to have commented properties end with commas [#1049](https://github.com/zowe/zowe-cli/issues/1049) + ## `7.25.0` - Enhancement: Added `X_IBM_INTRDR_FILE_ENCODING` header to `ZosmfHeaders` [#2139](https://github.com/zowe/zowe-cli/pull/2139) From cb4d45d7f8e36130c20b098b362c57f976189ab3 Mon Sep 17 00:00:00 2001 From: jace-roell <111985297+jace-roell@users.noreply.github.com> Date: Thu, 30 May 2024 11:45:13 -0400 Subject: [PATCH 08/29] Update CHANGELOG.md Signed-off-by: jace-roell <111985297+jace-roell@users.noreply.github.com> --- packages/core/CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/core/CHANGELOG.md b/packages/core/CHANGELOG.md index f664461a0e..b3d979eeec 100644 --- a/packages/core/CHANGELOG.md +++ b/packages/core/CHANGELOG.md @@ -4,7 +4,7 @@ All notable changes to the Zowe core SDK package will be documented in this file ## Recent Changes -- BugFix: Modified Services.ts to have commented properties end with commas [#1049](https://github.com/zowe/zowe-cli/issues/1049) +- Enhancement: Modified Services.ts to have commented properties end with commas [#1049](https://github.com/zowe/zowe-cli/issues/1049) ## `7.25.0` From 4e149d0dff7f572e34f1ea611f55cb5bdbd59119 Mon Sep 17 00:00:00 2001 From: jace-roell Date: Thu, 30 May 2024 12:56:18 -0400 Subject: [PATCH 09/29] added semicolons and removed trailing spaces Signed-off-by: jace-roell --- .../__tests__/apiml/__unit__/Services.unit.test.ts | 12 ++++++------ packages/core/src/apiml/Services.ts | 3 +-- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/packages/core/__tests__/apiml/__unit__/Services.unit.test.ts b/packages/core/__tests__/apiml/__unit__/Services.unit.test.ts index 56f9de08ec..fe3ba1632c 100644 --- a/packages/core/__tests__/apiml/__unit__/Services.unit.test.ts +++ b/packages/core/__tests__/apiml/__unit__/Services.unit.test.ts @@ -399,11 +399,11 @@ describe("APIML Services unit tests", () => { //"basePath": "test1/v2" //"basePath": "test1/v3" "basePath": "test1/v1" - ` + `; const expectedJsonSnippet_notBase= ` //"type2": "test2.2", "type2": "test2.1" - ` + `; const testCase: IApimlProfileInfo[] = [ { profName: "test1", @@ -433,14 +433,14 @@ describe("APIML Services unit tests", () => { ], pluginConfigs: new Set(), gatewayUrlConflicts: {} - } + } ]; - let actualJson = JSONC.stringify(Services.convertApimlProfileInfoToProfileConfig(testCase), null, ConfigConstants.INDENT); - + const actualJson = JSONC.stringify(Services.convertApimlProfileInfoToProfileConfig(testCase), null, ConfigConstants.INDENT); + expect(actualJson.replace(/\s+/g, '')).toContain(expectedJsonSnippet_base.replace(/\s+/g, '')); expect(actualJson.replace(/\s+/g, '')).toContain(expectedJsonSnippet_notBase.replace(/\s+/g, '')); - }) + }); it("should create a config object without comments about conflicts", () => { const testCase: IApimlProfileInfo[] = [{ diff --git a/packages/core/src/apiml/Services.ts b/packages/core/src/apiml/Services.ts index b8023428fc..9f08fb55fc 100644 --- a/packages/core/src/apiml/Services.ts +++ b/packages/core/src/apiml/Services.ts @@ -209,14 +209,13 @@ export class Services { if (elements == null || elements.length === 0) return ""; let kvPair: string = ""; let endComma = ""; - // add comma to end of kvp depending on if base profile if(!key.includes("base")){ endComma = ","; } if (elements.length === 1){ return `//"${key}": "${elements[0]}"${endComma}`; - } + } // format pair of kvp (add commas in expected places) elements.forEach((element, index) => { if (index === elements.length - 1) { From 9d9d06a42218edf2a9456213730ee9b46b9b2a99 Mon Sep 17 00:00:00 2001 From: jace-roell <111985297+jace-roell@users.noreply.github.com> Date: Thu, 30 May 2024 14:54:18 -0400 Subject: [PATCH 10/29] Update packages/core/src/apiml/Services.ts reformatted endComma initialization Co-authored-by: Trae Yelovich Signed-off-by: jace-roell <111985297+jace-roell@users.noreply.github.com> --- packages/core/src/apiml/Services.ts | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/packages/core/src/apiml/Services.ts b/packages/core/src/apiml/Services.ts index 9f08fb55fc..ed193fcffd 100644 --- a/packages/core/src/apiml/Services.ts +++ b/packages/core/src/apiml/Services.ts @@ -208,11 +208,8 @@ export class Services { const _genCommentsHelper = (key: string, elements: string[]): string => { if (elements == null || elements.length === 0) return ""; let kvPair: string = ""; - let endComma = ""; // add comma to end of kvp depending on if base profile - if(!key.includes("base")){ - endComma = ","; - } + const endComma = key.includes("base") ? "" : ","; if (elements.length === 1){ return `//"${key}": "${elements[0]}"${endComma}`; } From ea12953c81c34f75827ef3d91c30912e48c707d7 Mon Sep 17 00:00:00 2001 From: jace-roell <111985297+jace-roell@users.noreply.github.com> Date: Thu, 30 May 2024 14:54:32 -0400 Subject: [PATCH 11/29] Update packages/core/src/apiml/Services.ts Co-authored-by: Trae Yelovich Signed-off-by: jace-roell <111985297+jace-roell@users.noreply.github.com> --- packages/core/src/apiml/Services.ts | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/packages/core/src/apiml/Services.ts b/packages/core/src/apiml/Services.ts index ed193fcffd..194b4a21b0 100644 --- a/packages/core/src/apiml/Services.ts +++ b/packages/core/src/apiml/Services.ts @@ -214,13 +214,9 @@ export class Services { return `//"${key}": "${elements[0]}"${endComma}`; } // format pair of kvp (add commas in expected places) - elements.forEach((element, index) => { - if (index === elements.length - 1) { - kvPair += `\n//"${key}": "${element}"`; - } else { - kvPair += `\n//"${key}": "${element}"${endComma}`; - } - }); + const kvPair = elements.reduce((all, current: string, index) => { + return all.concat(index === elements.length - 1 ? `\n//"${key}": "${element}"` : `\n//"${key}": "${element}"${endComma}`); + }, ""); return `${kvPair}${endComma}`; // return `//"${key}": "${elements.length === 1 ? elements[0] : elements.join('"\n//"' + key + '": "')},"`; From b0f4b4bd2361ef57ad0c922a5ad02f3a53c084b9 Mon Sep 17 00:00:00 2001 From: jace-roell Date: Thu, 30 May 2024 14:59:55 -0400 Subject: [PATCH 12/29] cleaned up code Signed-off-by: jace-roell --- packages/core/src/apiml/Services.ts | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/packages/core/src/apiml/Services.ts b/packages/core/src/apiml/Services.ts index 194b4a21b0..1bfba4a01e 100644 --- a/packages/core/src/apiml/Services.ts +++ b/packages/core/src/apiml/Services.ts @@ -207,7 +207,6 @@ export class Services { const _genCommentsHelper = (key: string, elements: string[]): string => { if (elements == null || elements.length === 0) return ""; - let kvPair: string = ""; // add comma to end of kvp depending on if base profile const endComma = key.includes("base") ? "" : ","; if (elements.length === 1){ @@ -215,11 +214,10 @@ export class Services { } // format pair of kvp (add commas in expected places) const kvPair = elements.reduce((all, current: string, index) => { - return all.concat(index === elements.length - 1 ? `\n//"${key}": "${element}"` : `\n//"${key}": "${element}"${endComma}`); + return all.concat(index === elements.length - 1 ? `\n//"${key}": "${current}"` : `\n//"${key}": "${current}"${endComma}`); }, ""); return `${kvPair}${endComma}`; - // return `//"${key}": "${elements.length === 1 ? elements[0] : elements.join('"\n//"' + key + '": "')},"`; }; profileInfoList?.forEach((profileInfo: IApimlProfileInfo) => { From a1bf9b2057dca998674a18bb9f316683ca172270 Mon Sep 17 00:00:00 2001 From: zowe-robot Date: Thu, 30 May 2024 19:50:09 +0000 Subject: [PATCH 13/29] Bump version to 7.25.1 [ci skip] Signed-off-by: zowe-robot --- packages/cli/CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/cli/CHANGELOG.md b/packages/cli/CHANGELOG.md index b5410efb23..5b9f81d21c 100644 --- a/packages/cli/CHANGELOG.md +++ b/packages/cli/CHANGELOG.md @@ -2,7 +2,7 @@ All notable changes to the Zowe CLI package will be documented in this file. -## Recent Changes +## `7.25.1` - BugFix: Updated `braces` dependency for technical currency. [#2157](https://github.com/zowe/zowe-cli/pull/2157) From cb21a7ee5ba4d50dc9ad3872cc691fd930e3b226 Mon Sep 17 00:00:00 2001 From: jace-roell Date: Fri, 31 May 2024 12:56:06 -0400 Subject: [PATCH 14/29] simplified logic for default profile types and test cases Signed-off-by: jace-roell --- .../apiml/__unit__/Services.unit.test.ts | 144 ++++++++++++++++++ packages/core/src/apiml/Services.ts | 37 ++--- 2 files changed, 164 insertions(+), 17 deletions(-) diff --git a/packages/core/__tests__/apiml/__unit__/Services.unit.test.ts b/packages/core/__tests__/apiml/__unit__/Services.unit.test.ts index fe3ba1632c..a113e80959 100644 --- a/packages/core/__tests__/apiml/__unit__/Services.unit.test.ts +++ b/packages/core/__tests__/apiml/__unit__/Services.unit.test.ts @@ -702,6 +702,150 @@ describe("APIML Services unit tests", () => { "type4": "test4.1" }, "autoStore": true +}`; + expect(actualJson).toEqual(expectedJson); + }); + it("should produce proper default file when multiple comments for a type are passed", () => { + const testCase: IApimlProfileInfo[] = [ + { + profName: "test3", + profType: "type3", + basePaths: [ + "test3/v1", + "test3/v2", + "test3/v3" + ], + pluginConfigs: new Set([{ + apiId: "test3-apiId", + connProfType: "type3", + pluginName: "type3-plugin-name" + }]), + gatewayUrlConflicts: {} + }, + { + profName: "test4.1", + profType: "type4", + basePaths: [ + "test4/v1", + "test4/v2" + ], + pluginConfigs: new Set([ + { + apiId: "test4.1-apiId", + connProfType: "type4", + pluginName: "type4.1-plugin-name" + }, + { + apiId: "test4.1-apiId", + connProfType: "type4", + pluginName: "type4.1-plugin-name-copy" + } + ]), + gatewayUrlConflicts: { + "type4.1-plugin-name": ["test4/v1"], + "type4.1-plugin-name-copy": ["test4/v2", "test4/v3"] + } + }, + { + profName: "test4.2", + profType: "type4", + basePaths: [ + "test4/v1" + ], + pluginConfigs: new Set(), + gatewayUrlConflicts: {} + }, + { + profName: "test4.3", + profType: "type4", + basePaths: [ + "test4/v1" + ], + pluginConfigs: new Set(), + gatewayUrlConflicts: {} + }, + { + profName: "base1", + profType: "base", + basePaths: [ + "base1/v1" + ], + pluginConfigs: new Set(), + gatewayUrlConflicts: {} + }, + { + profName: "base2", + profType: "base", + basePaths: [ + "base2/v1" + ], + pluginConfigs: new Set(), + gatewayUrlConflicts: {} + } + ]; + const actualJson = JSONC.stringify(Services.convertApimlProfileInfoToProfileConfig(testCase), null, ConfigConstants.INDENT); + const expectedJson = `{ + "profiles": { + "test3": { + "type": "type3", + "properties": { + // Multiple base paths were detected for this service. + // Uncomment one of the lines below to use a different one. + //"basePath": "test3/v2" + //"basePath": "test3/v3" + "basePath": "test3/v1" + } + }, + "test4.1": { + "type": "type4", + "properties": { + // --- + // Warning: basePath conflict detected! + // Different plugins require different versions of the same API. + // List: + // "type4.1-plugin-name": "test4/v1" + // "type4.1-plugin-name-copy": "test4/v2", "test4/v3" + // --- + //"basePath": "test4/v2" + "basePath": "test4/v1" + } + }, + "test4.2": { + "type": "type4", + "properties": { + "basePath": "test4/v1" + } + }, + "test4.3": { + "type": "type4", + "properties": { + "basePath": "test4/v1" + } + }, + "base1": { + "type": "base", + "properties": { + "basePath": "base1/v1" + } + }, + "base2": { + "type": "base", + "properties": { + "basePath": "base2/v1" + } + } + }, + "defaults": { + "type3": "test3", + // Multiple services were detected. + // Uncomment one of the lines below to set a different default. + //"type4": "test4.2", + //"type4": "test4.3", + "type4": "test4.1", + //"base": "base2" + "base": "base1" + }, + "autoStore": true }`; expect(actualJson).toEqual(expectedJson); }); diff --git a/packages/core/src/apiml/Services.ts b/packages/core/src/apiml/Services.ts index 1bfba4a01e..1d50478fa2 100644 --- a/packages/core/src/apiml/Services.ts +++ b/packages/core/src/apiml/Services.ts @@ -207,17 +207,10 @@ export class Services { const _genCommentsHelper = (key: string, elements: string[]): string => { if (elements == null || elements.length === 0) return ""; - // add comma to end of kvp depending on if base profile - const endComma = key.includes("base") ? "" : ","; - if (elements.length === 1){ - return `//"${key}": "${elements[0]}"${endComma}`; - } - // format pair of kvp (add commas in expected places) - const kvPair = elements.reduce((all, current: string, index) => { - return all.concat(index === elements.length - 1 ? `\n//"${key}": "${current}"` : `\n//"${key}": "${current}"${endComma}`); - }, ""); - return `${kvPair}${endComma}`; + return elements.reduce((all, current: string, index) => { + return all.concat(key.includes("base") ? `\n//"${key}": "${current}"` : `\n//"${key}": "${current}",`); + }, ""); }; profileInfoList?.forEach((profileInfo: IApimlProfileInfo) => { @@ -272,19 +265,29 @@ export class Services { } }); + // Establish keys for object map for index check within loop + const defaultKeys = Object.keys(conflictingDefaults); + for (const defaultKey in conflictingDefaults) { if (configDefaults[defaultKey] != null) { const trueDefault = configDefaults[defaultKey]; delete configDefaults[defaultKey]; + let jsonString = ` + ${JSONC.stringify(configDefaults, null, ConfigConstants.INDENT).slice(0, -1)}${Object.keys(configDefaults).length > 0 ? "," : ""}`; + const defaultKeyIndex = defaultKeys.indexOf(defaultKey); - configDefaults = JSONC.parse(` - ${JSONC.stringify(configDefaults, null, ConfigConstants.INDENT).slice(0, -1)}${Object.keys(configDefaults).length > 0 ? "," : ""} - // Multiple services were detected. - // Uncomment one of the lines below to set a different default. - + // Logic to ensure that comment block is not duplicated + if (defaultKeyIndex === 0) { + jsonString += ` + // Multiple services were detected. + // Uncomment one of the lines below to set a different default.`; + } + jsonString += ` ${_genCommentsHelper(defaultKey, conflictingDefaults[defaultKey])} - "${defaultKey}": "${trueDefault}" - }`); + "${defaultKey}": "${trueDefault}"`; + // Terminate the JSON string + jsonString += '\n}'; + configDefaults = JSONC.parse(jsonString); } } From e8afc6f09e228b6d850784ed671cf3634dd67696 Mon Sep 17 00:00:00 2001 From: jace-roell Date: Fri, 31 May 2024 14:27:59 -0400 Subject: [PATCH 15/29] fixed lint warning Signed-off-by: jace-roell --- packages/core/src/apiml/Services.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/core/src/apiml/Services.ts b/packages/core/src/apiml/Services.ts index 1d50478fa2..64baef94b3 100644 --- a/packages/core/src/apiml/Services.ts +++ b/packages/core/src/apiml/Services.ts @@ -273,7 +273,7 @@ export class Services { const trueDefault = configDefaults[defaultKey]; delete configDefaults[defaultKey]; let jsonString = ` - ${JSONC.stringify(configDefaults, null, ConfigConstants.INDENT).slice(0, -1)}${Object.keys(configDefaults).length > 0 ? "," : ""}`; + ${JSONC.stringify(configDefaults, null, ConfigConstants.INDENT).slice(0, -1)}${Object.keys(configDefaults).length > 0 ? "," : ""}`; const defaultKeyIndex = defaultKeys.indexOf(defaultKey); // Logic to ensure that comment block is not duplicated From dc5dc47da0dd687702e4fecd549b186e5fa33dfd Mon Sep 17 00:00:00 2001 From: Amber Torrise <112635587+ATorrise@users.noreply.github.com> Date: Tue, 4 Jun 2024 11:15:21 -0400 Subject: [PATCH 16/29] period Signed-off-by: Amber Torrise <112635587+ATorrise@users.noreply.github.com> --- packages/core/CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/core/CHANGELOG.md b/packages/core/CHANGELOG.md index b3d979eeec..15168af11a 100644 --- a/packages/core/CHANGELOG.md +++ b/packages/core/CHANGELOG.md @@ -4,7 +4,7 @@ All notable changes to the Zowe core SDK package will be documented in this file ## Recent Changes -- Enhancement: Modified Services.ts to have commented properties end with commas [#1049](https://github.com/zowe/zowe-cli/issues/1049) +- Enhancement: Modified Services.ts to have commented properties end with commas. [#1049](https://github.com/zowe/zowe-cli/issues/1049) ## `7.25.0` From f66d5e0d9579f1856bfc838b9db51c1b9482e389 Mon Sep 17 00:00:00 2001 From: zowe-robot Date: Tue, 4 Jun 2024 18:55:44 +0000 Subject: [PATCH 17/29] Bump version to 7.25.2 [ci skip] Signed-off-by: zowe-robot --- .../__packages__/cli-test-utils/package.json | 2 +- lerna.json | 2 +- npm-shrinkwrap.json | 150 +++++++++--------- packages/cli/package.json | 22 +-- packages/core/CHANGELOG.md | 2 +- packages/core/package.json | 4 +- packages/imperative/CHANGELOG.md | 2 +- packages/imperative/package.json | 2 +- packages/provisioning/package.json | 6 +- packages/workflows/package.json | 8 +- packages/zosconsole/package.json | 6 +- packages/zosfiles/package.json | 6 +- packages/zosjobs/package.json | 8 +- packages/zoslogs/package.json | 6 +- packages/zosmf/package.json | 6 +- packages/zostso/package.json | 8 +- packages/zosuss/package.json | 2 +- 17 files changed, 121 insertions(+), 121 deletions(-) diff --git a/__tests__/__packages__/cli-test-utils/package.json b/__tests__/__packages__/cli-test-utils/package.json index a511d10b0a..52120e2978 100644 --- a/__tests__/__packages__/cli-test-utils/package.json +++ b/__tests__/__packages__/cli-test-utils/package.json @@ -43,7 +43,7 @@ "devDependencies": { "@types/js-yaml": "^4.0.0", "@types/uuid": "^8.3.0", - "@zowe/imperative": "5.23.3" + "@zowe/imperative": "5.23.4" }, "peerDependencies": { "@zowe/imperative": "^5.0.0" diff --git a/lerna.json b/lerna.json index 2457279ed0..7e954d5fae 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "7.25.1", + "version": "7.25.2", "command": { "publish": { "ignoreChanges": [ diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json index be30d6f639..94c66cdf7a 100644 --- a/npm-shrinkwrap.json +++ b/npm-shrinkwrap.json @@ -64,7 +64,7 @@ "devDependencies": { "@types/js-yaml": "^4.0.0", "@types/uuid": "^8.3.0", - "@zowe/imperative": "5.23.3" + "@zowe/imperative": "5.23.4" }, "peerDependencies": { "@zowe/imperative": "^5.0.0" @@ -20503,21 +20503,21 @@ }, "packages/cli": { "name": "@zowe/cli", - "version": "7.25.1", + "version": "7.25.2", "hasInstallScript": true, "license": "EPL-2.0", "dependencies": { - "@zowe/core-for-zowe-sdk": "7.25.0", - "@zowe/imperative": "5.23.3", - "@zowe/provisioning-for-zowe-sdk": "7.25.0", - "@zowe/zos-console-for-zowe-sdk": "7.25.0", - "@zowe/zos-files-for-zowe-sdk": "7.25.0", - "@zowe/zos-jobs-for-zowe-sdk": "7.25.0", - "@zowe/zos-logs-for-zowe-sdk": "7.25.0", - "@zowe/zos-tso-for-zowe-sdk": "7.25.0", + "@zowe/core-for-zowe-sdk": "7.25.2", + "@zowe/imperative": "5.23.4", + "@zowe/provisioning-for-zowe-sdk": "7.25.2", + "@zowe/zos-console-for-zowe-sdk": "7.25.2", + "@zowe/zos-files-for-zowe-sdk": "7.25.2", + "@zowe/zos-jobs-for-zowe-sdk": "7.25.2", + "@zowe/zos-logs-for-zowe-sdk": "7.25.2", + "@zowe/zos-tso-for-zowe-sdk": "7.25.2", "@zowe/zos-uss-for-zowe-sdk": "7.24.3", - "@zowe/zos-workflows-for-zowe-sdk": "7.25.0", - "@zowe/zosmf-for-zowe-sdk": "7.25.0", + "@zowe/zos-workflows-for-zowe-sdk": "7.25.2", + "@zowe/zosmf-for-zowe-sdk": "7.25.2", "find-process": "1.4.7", "get-stream": "6.0.1", "lodash": "4.17.21", @@ -20565,7 +20565,7 @@ }, "packages/core": { "name": "@zowe/core-for-zowe-sdk", - "version": "7.25.0", + "version": "7.25.2", "license": "EPL-2.0", "dependencies": { "comment-json": "4.1.1", @@ -20573,7 +20573,7 @@ }, "devDependencies": { "@zowe/cli-test-utils": "7.24.3", - "@zowe/imperative": "5.23.3" + "@zowe/imperative": "5.23.4" }, "peerDependencies": { "@zowe/imperative": "^5.0.0" @@ -20581,7 +20581,7 @@ }, "packages/imperative": { "name": "@zowe/imperative", - "version": "5.23.3", + "version": "5.23.4", "license": "EPL-2.0", "dependencies": { "@types/yargs": "13.0.4", @@ -20926,7 +20926,7 @@ }, "packages/provisioning": { "name": "@zowe/provisioning-for-zowe-sdk", - "version": "7.25.0", + "version": "7.25.2", "license": "EPL-2.0", "dependencies": { "js-yaml": "4.1.0" @@ -20934,8 +20934,8 @@ "devDependencies": { "@types/js-yaml": "^4.0.5", "@zowe/cli-test-utils": "7.24.3", - "@zowe/core-for-zowe-sdk": "7.25.0", - "@zowe/imperative": "5.23.3" + "@zowe/core-for-zowe-sdk": "7.25.2", + "@zowe/imperative": "5.23.4" }, "peerDependencies": { "@zowe/core-for-zowe-sdk": "^7.0.0", @@ -20957,15 +20957,15 @@ }, "packages/workflows": { "name": "@zowe/zos-workflows-for-zowe-sdk", - "version": "7.25.0", + "version": "7.25.2", "license": "EPL-2.0", "dependencies": { - "@zowe/zos-files-for-zowe-sdk": "7.25.0" + "@zowe/zos-files-for-zowe-sdk": "7.25.2" }, "devDependencies": { "@zowe/cli-test-utils": "7.24.3", - "@zowe/core-for-zowe-sdk": "7.25.0", - "@zowe/imperative": "5.23.3" + "@zowe/core-for-zowe-sdk": "7.25.2", + "@zowe/imperative": "5.23.4" }, "peerDependencies": { "@zowe/core-for-zowe-sdk": "^7.0.0", @@ -20974,12 +20974,12 @@ }, "packages/zosconsole": { "name": "@zowe/zos-console-for-zowe-sdk", - "version": "7.25.0", + "version": "7.25.2", "license": "EPL-2.0", "devDependencies": { "@zowe/cli-test-utils": "7.24.3", - "@zowe/core-for-zowe-sdk": "7.25.0", - "@zowe/imperative": "5.23.3" + "@zowe/core-for-zowe-sdk": "7.25.2", + "@zowe/imperative": "5.23.4" }, "peerDependencies": { "@zowe/core-for-zowe-sdk": "^7.0.0", @@ -20988,7 +20988,7 @@ }, "packages/zosfiles": { "name": "@zowe/zos-files-for-zowe-sdk", - "version": "7.25.0", + "version": "7.25.2", "license": "EPL-2.0", "dependencies": { "get-stream": "6.0.1", @@ -20996,8 +20996,8 @@ }, "devDependencies": { "@zowe/cli-test-utils": "7.24.3", - "@zowe/core-for-zowe-sdk": "7.25.0", - "@zowe/imperative": "5.23.3", + "@zowe/core-for-zowe-sdk": "7.25.2", + "@zowe/imperative": "5.23.4", "@zowe/zos-uss-for-zowe-sdk": "7.24.3" }, "peerDependencies": { @@ -21026,15 +21026,15 @@ }, "packages/zosjobs": { "name": "@zowe/zos-jobs-for-zowe-sdk", - "version": "7.25.0", + "version": "7.25.2", "license": "EPL-2.0", "dependencies": { - "@zowe/zos-files-for-zowe-sdk": "7.25.0" + "@zowe/zos-files-for-zowe-sdk": "7.25.2" }, "devDependencies": { "@zowe/cli-test-utils": "7.24.3", - "@zowe/core-for-zowe-sdk": "7.25.0", - "@zowe/imperative": "5.23.3" + "@zowe/core-for-zowe-sdk": "7.25.2", + "@zowe/imperative": "5.23.4" }, "peerDependencies": { "@zowe/core-for-zowe-sdk": "^7.0.0", @@ -21043,12 +21043,12 @@ }, "packages/zoslogs": { "name": "@zowe/zos-logs-for-zowe-sdk", - "version": "7.25.0", + "version": "7.25.2", "license": "EPL-2.0", "devDependencies": { "@zowe/cli-test-utils": "7.24.3", - "@zowe/core-for-zowe-sdk": "7.25.0", - "@zowe/imperative": "5.23.3" + "@zowe/core-for-zowe-sdk": "7.25.2", + "@zowe/imperative": "5.23.4" }, "peerDependencies": { "@zowe/core-for-zowe-sdk": "^7.0.0", @@ -21057,12 +21057,12 @@ }, "packages/zosmf": { "name": "@zowe/zosmf-for-zowe-sdk", - "version": "7.25.0", + "version": "7.25.2", "license": "EPL-2.0", "devDependencies": { "@zowe/cli-test-utils": "7.24.3", - "@zowe/core-for-zowe-sdk": "7.25.0", - "@zowe/imperative": "5.23.3" + "@zowe/core-for-zowe-sdk": "7.25.2", + "@zowe/imperative": "5.23.4" }, "peerDependencies": { "@zowe/core-for-zowe-sdk": "^7.0.0", @@ -21071,15 +21071,15 @@ }, "packages/zostso": { "name": "@zowe/zos-tso-for-zowe-sdk", - "version": "7.25.0", + "version": "7.25.2", "license": "EPL-2.0", "dependencies": { - "@zowe/zosmf-for-zowe-sdk": "7.25.0" + "@zowe/zosmf-for-zowe-sdk": "7.25.2" }, "devDependencies": { "@zowe/cli-test-utils": "7.24.3", - "@zowe/core-for-zowe-sdk": "7.25.0", - "@zowe/imperative": "5.23.3" + "@zowe/core-for-zowe-sdk": "7.25.2", + "@zowe/imperative": "5.23.4" }, "peerDependencies": { "@zowe/core-for-zowe-sdk": "^7.0.0", @@ -21096,7 +21096,7 @@ "devDependencies": { "@types/ssh2": "^1.11.0", "@zowe/cli-test-utils": "7.24.3", - "@zowe/imperative": "5.23.3" + "@zowe/imperative": "5.23.4" }, "peerDependencies": { "@zowe/imperative": "^5.2.0" @@ -25787,18 +25787,18 @@ "@types/lodash": "^4.14.175", "@types/tar": "^6.1.2", "@zowe/cli-test-utils": "7.24.3", - "@zowe/core-for-zowe-sdk": "7.25.0", - "@zowe/imperative": "5.23.3", - "@zowe/provisioning-for-zowe-sdk": "7.25.0", + "@zowe/core-for-zowe-sdk": "7.25.2", + "@zowe/imperative": "5.23.4", + "@zowe/provisioning-for-zowe-sdk": "7.25.2", "@zowe/secrets-for-zowe-sdk": "7.18.6", - "@zowe/zos-console-for-zowe-sdk": "7.25.0", - "@zowe/zos-files-for-zowe-sdk": "7.25.0", - "@zowe/zos-jobs-for-zowe-sdk": "7.25.0", - "@zowe/zos-logs-for-zowe-sdk": "7.25.0", - "@zowe/zos-tso-for-zowe-sdk": "7.25.0", + "@zowe/zos-console-for-zowe-sdk": "7.25.2", + "@zowe/zos-files-for-zowe-sdk": "7.25.2", + "@zowe/zos-jobs-for-zowe-sdk": "7.25.2", + "@zowe/zos-logs-for-zowe-sdk": "7.25.2", + "@zowe/zos-tso-for-zowe-sdk": "7.25.2", "@zowe/zos-uss-for-zowe-sdk": "7.24.3", - "@zowe/zos-workflows-for-zowe-sdk": "7.25.0", - "@zowe/zosmf-for-zowe-sdk": "7.25.0", + "@zowe/zos-workflows-for-zowe-sdk": "7.25.2", + "@zowe/zosmf-for-zowe-sdk": "7.25.2", "comment-json": "^4.1.1", "find-process": "1.4.7", "get-stream": "6.0.1", @@ -25832,7 +25832,7 @@ "requires": { "@types/js-yaml": "^4.0.0", "@types/uuid": "^8.3.0", - "@zowe/imperative": "5.23.3", + "@zowe/imperative": "5.23.4", "find-up": "^5.0.0", "js-yaml": "^4.0.0", "rimraf": "^3.0.2", @@ -25853,7 +25853,7 @@ "version": "file:packages/core", "requires": { "@zowe/cli-test-utils": "7.24.3", - "@zowe/imperative": "5.23.3", + "@zowe/imperative": "5.23.4", "comment-json": "4.1.1", "string-width": "4.2.3" } @@ -26113,8 +26113,8 @@ "requires": { "@types/js-yaml": "^4.0.5", "@zowe/cli-test-utils": "7.24.3", - "@zowe/core-for-zowe-sdk": "7.25.0", - "@zowe/imperative": "5.23.3", + "@zowe/core-for-zowe-sdk": "7.25.2", + "@zowe/imperative": "5.23.4", "js-yaml": "4.1.0" } }, @@ -26129,16 +26129,16 @@ "version": "file:packages/zosconsole", "requires": { "@zowe/cli-test-utils": "7.24.3", - "@zowe/core-for-zowe-sdk": "7.25.0", - "@zowe/imperative": "5.23.3" + "@zowe/core-for-zowe-sdk": "7.25.2", + "@zowe/imperative": "5.23.4" } }, "@zowe/zos-files-for-zowe-sdk": { "version": "file:packages/zosfiles", "requires": { "@zowe/cli-test-utils": "7.24.3", - "@zowe/core-for-zowe-sdk": "7.25.0", - "@zowe/imperative": "5.23.3", + "@zowe/core-for-zowe-sdk": "7.25.2", + "@zowe/imperative": "5.23.4", "@zowe/zos-uss-for-zowe-sdk": "7.24.3", "get-stream": "6.0.1", "minimatch": "5.0.1" @@ -26166,26 +26166,26 @@ "version": "file:packages/zosjobs", "requires": { "@zowe/cli-test-utils": "7.24.3", - "@zowe/core-for-zowe-sdk": "7.25.0", - "@zowe/imperative": "5.23.3", - "@zowe/zos-files-for-zowe-sdk": "7.25.0" + "@zowe/core-for-zowe-sdk": "7.25.2", + "@zowe/imperative": "5.23.4", + "@zowe/zos-files-for-zowe-sdk": "7.25.2" } }, "@zowe/zos-logs-for-zowe-sdk": { "version": "file:packages/zoslogs", "requires": { "@zowe/cli-test-utils": "7.24.3", - "@zowe/core-for-zowe-sdk": "7.25.0", - "@zowe/imperative": "5.23.3" + "@zowe/core-for-zowe-sdk": "7.25.2", + "@zowe/imperative": "5.23.4" } }, "@zowe/zos-tso-for-zowe-sdk": { "version": "file:packages/zostso", "requires": { "@zowe/cli-test-utils": "7.24.3", - "@zowe/core-for-zowe-sdk": "7.25.0", - "@zowe/imperative": "5.23.3", - "@zowe/zosmf-for-zowe-sdk": "7.25.0" + "@zowe/core-for-zowe-sdk": "7.25.2", + "@zowe/imperative": "5.23.4", + "@zowe/zosmf-for-zowe-sdk": "7.25.2" } }, "@zowe/zos-uss-for-zowe-sdk": { @@ -26193,7 +26193,7 @@ "requires": { "@types/ssh2": "^1.11.0", "@zowe/cli-test-utils": "7.24.3", - "@zowe/imperative": "5.23.3", + "@zowe/imperative": "5.23.4", "ssh2": "1.15.0" } }, @@ -26201,17 +26201,17 @@ "version": "file:packages/workflows", "requires": { "@zowe/cli-test-utils": "7.24.3", - "@zowe/core-for-zowe-sdk": "7.25.0", - "@zowe/imperative": "5.23.3", - "@zowe/zos-files-for-zowe-sdk": "7.25.0" + "@zowe/core-for-zowe-sdk": "7.25.2", + "@zowe/imperative": "5.23.4", + "@zowe/zos-files-for-zowe-sdk": "7.25.2" } }, "@zowe/zosmf-for-zowe-sdk": { "version": "file:packages/zosmf", "requires": { "@zowe/cli-test-utils": "7.24.3", - "@zowe/core-for-zowe-sdk": "7.25.0", - "@zowe/imperative": "5.23.3" + "@zowe/core-for-zowe-sdk": "7.25.2", + "@zowe/imperative": "5.23.4" } }, "abbrev": { diff --git a/packages/cli/package.json b/packages/cli/package.json index 2d915fd597..11e28e0f39 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -1,6 +1,6 @@ { "name": "@zowe/cli", - "version": "7.25.1", + "version": "7.25.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.25.0", - "@zowe/imperative": "5.23.3", - "@zowe/provisioning-for-zowe-sdk": "7.25.0", - "@zowe/zos-console-for-zowe-sdk": "7.25.0", - "@zowe/zos-files-for-zowe-sdk": "7.25.0", - "@zowe/zos-jobs-for-zowe-sdk": "7.25.0", - "@zowe/zos-logs-for-zowe-sdk": "7.25.0", - "@zowe/zos-tso-for-zowe-sdk": "7.25.0", + "@zowe/core-for-zowe-sdk": "7.25.2", + "@zowe/imperative": "5.23.4", + "@zowe/provisioning-for-zowe-sdk": "7.25.2", + "@zowe/zos-console-for-zowe-sdk": "7.25.2", + "@zowe/zos-files-for-zowe-sdk": "7.25.2", + "@zowe/zos-jobs-for-zowe-sdk": "7.25.2", + "@zowe/zos-logs-for-zowe-sdk": "7.25.2", + "@zowe/zos-tso-for-zowe-sdk": "7.25.2", "@zowe/zos-uss-for-zowe-sdk": "7.24.3", - "@zowe/zos-workflows-for-zowe-sdk": "7.25.0", - "@zowe/zosmf-for-zowe-sdk": "7.25.0", + "@zowe/zos-workflows-for-zowe-sdk": "7.25.2", + "@zowe/zosmf-for-zowe-sdk": "7.25.2", "find-process": "1.4.7", "get-stream": "6.0.1", "lodash": "4.17.21", diff --git a/packages/core/CHANGELOG.md b/packages/core/CHANGELOG.md index 15168af11a..a74d73be17 100644 --- a/packages/core/CHANGELOG.md +++ b/packages/core/CHANGELOG.md @@ -2,7 +2,7 @@ All notable changes to the Zowe core SDK package will be documented in this file. -## Recent Changes +## `7.25.2` - Enhancement: Modified Services.ts to have commented properties end with commas. [#1049](https://github.com/zowe/zowe-cli/issues/1049) diff --git a/packages/core/package.json b/packages/core/package.json index 61456cef36..bd131e45ed 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -1,6 +1,6 @@ { "name": "@zowe/core-for-zowe-sdk", - "version": "7.25.0", + "version": "7.25.2", "description": "Core libraries shared by Zowe SDK packages", "author": "Zowe", "license": "EPL-2.0", @@ -50,7 +50,7 @@ }, "devDependencies": { "@zowe/cli-test-utils": "7.24.3", - "@zowe/imperative": "5.23.3" + "@zowe/imperative": "5.23.4" }, "peerDependencies": { "@zowe/imperative": "^5.0.0" diff --git a/packages/imperative/CHANGELOG.md b/packages/imperative/CHANGELOG.md index c3b610231f..0cebb1bfa8 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.23.4` - BugFix: Updated `braces` dependency for technical currency. [#2157](https://github.com/zowe/zowe-cli/pull/2157) diff --git a/packages/imperative/package.json b/packages/imperative/package.json index d340816869..42741bf551 100644 --- a/packages/imperative/package.json +++ b/packages/imperative/package.json @@ -1,6 +1,6 @@ { "name": "@zowe/imperative", - "version": "5.23.3", + "version": "5.23.4", "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 e70f4a48d1..5fd033e37c 100644 --- a/packages/provisioning/package.json +++ b/packages/provisioning/package.json @@ -1,6 +1,6 @@ { "name": "@zowe/provisioning-for-zowe-sdk", - "version": "7.25.0", + "version": "7.25.2", "description": "Zowe SDK to interact with the z/OS provisioning APIs", "author": "Zowe", "license": "EPL-2.0", @@ -50,8 +50,8 @@ "devDependencies": { "@types/js-yaml": "^4.0.5", "@zowe/cli-test-utils": "7.24.3", - "@zowe/core-for-zowe-sdk": "7.25.0", - "@zowe/imperative": "5.23.3" + "@zowe/core-for-zowe-sdk": "7.25.2", + "@zowe/imperative": "5.23.4" }, "peerDependencies": { "@zowe/core-for-zowe-sdk": "^7.0.0", diff --git a/packages/workflows/package.json b/packages/workflows/package.json index f29c48e4d6..73a64e7119 100644 --- a/packages/workflows/package.json +++ b/packages/workflows/package.json @@ -1,6 +1,6 @@ { "name": "@zowe/zos-workflows-for-zowe-sdk", - "version": "7.25.0", + "version": "7.25.2", "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.25.0" + "@zowe/zos-files-for-zowe-sdk": "7.25.2" }, "devDependencies": { "@zowe/cli-test-utils": "7.24.3", - "@zowe/core-for-zowe-sdk": "7.25.0", - "@zowe/imperative": "5.23.3" + "@zowe/core-for-zowe-sdk": "7.25.2", + "@zowe/imperative": "5.23.4" }, "peerDependencies": { "@zowe/core-for-zowe-sdk": "^7.0.0", diff --git a/packages/zosconsole/package.json b/packages/zosconsole/package.json index 81ff089643..55c3b94604 100644 --- a/packages/zosconsole/package.json +++ b/packages/zosconsole/package.json @@ -1,6 +1,6 @@ { "name": "@zowe/zos-console-for-zowe-sdk", - "version": "7.25.0", + "version": "7.25.2", "description": "Zowe SDK to interact with the z/OS console", "author": "Zowe", "license": "EPL-2.0", @@ -46,8 +46,8 @@ }, "devDependencies": { "@zowe/cli-test-utils": "7.24.3", - "@zowe/core-for-zowe-sdk": "7.25.0", - "@zowe/imperative": "5.23.3" + "@zowe/core-for-zowe-sdk": "7.25.2", + "@zowe/imperative": "5.23.4" }, "peerDependencies": { "@zowe/core-for-zowe-sdk": "^7.0.0", diff --git a/packages/zosfiles/package.json b/packages/zosfiles/package.json index 5da4a8ee02..c989c5af23 100644 --- a/packages/zosfiles/package.json +++ b/packages/zosfiles/package.json @@ -1,6 +1,6 @@ { "name": "@zowe/zos-files-for-zowe-sdk", - "version": "7.25.0", + "version": "7.25.2", "description": "Zowe SDK to interact with files and data sets on z/OS", "author": "Zowe", "license": "EPL-2.0", @@ -51,8 +51,8 @@ }, "devDependencies": { "@zowe/cli-test-utils": "7.24.3", - "@zowe/core-for-zowe-sdk": "7.25.0", - "@zowe/imperative": "5.23.3", + "@zowe/core-for-zowe-sdk": "7.25.2", + "@zowe/imperative": "5.23.4", "@zowe/zos-uss-for-zowe-sdk": "7.24.3" }, "peerDependencies": { diff --git a/packages/zosjobs/package.json b/packages/zosjobs/package.json index 35d3add429..9b12877660 100644 --- a/packages/zosjobs/package.json +++ b/packages/zosjobs/package.json @@ -1,6 +1,6 @@ { "name": "@zowe/zos-jobs-for-zowe-sdk", - "version": "7.25.0", + "version": "7.25.2", "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.25.0" + "@zowe/zos-files-for-zowe-sdk": "7.25.2" }, "devDependencies": { "@zowe/cli-test-utils": "7.24.3", - "@zowe/core-for-zowe-sdk": "7.25.0", - "@zowe/imperative": "5.23.3" + "@zowe/core-for-zowe-sdk": "7.25.2", + "@zowe/imperative": "5.23.4" }, "peerDependencies": { "@zowe/core-for-zowe-sdk": "^7.0.0", diff --git a/packages/zoslogs/package.json b/packages/zoslogs/package.json index 21fdc27b70..188ead80cd 100644 --- a/packages/zoslogs/package.json +++ b/packages/zoslogs/package.json @@ -1,6 +1,6 @@ { "name": "@zowe/zos-logs-for-zowe-sdk", - "version": "7.25.0", + "version": "7.25.2", "description": "Zowe SDK to interact with the z/OS logs", "author": "Zowe", "license": "EPL-2.0", @@ -46,8 +46,8 @@ }, "devDependencies": { "@zowe/cli-test-utils": "7.24.3", - "@zowe/core-for-zowe-sdk": "7.25.0", - "@zowe/imperative": "5.23.3" + "@zowe/core-for-zowe-sdk": "7.25.2", + "@zowe/imperative": "5.23.4" }, "peerDependencies": { "@zowe/core-for-zowe-sdk": "^7.0.0", diff --git a/packages/zosmf/package.json b/packages/zosmf/package.json index c653e7e8be..46ef6b4105 100644 --- a/packages/zosmf/package.json +++ b/packages/zosmf/package.json @@ -1,6 +1,6 @@ { "name": "@zowe/zosmf-for-zowe-sdk", - "version": "7.25.0", + "version": "7.25.2", "description": "Zowe SDK to interact with the z/OS Management Facility", "author": "Zowe", "license": "EPL-2.0", @@ -45,8 +45,8 @@ }, "devDependencies": { "@zowe/cli-test-utils": "7.24.3", - "@zowe/core-for-zowe-sdk": "7.25.0", - "@zowe/imperative": "5.23.3" + "@zowe/core-for-zowe-sdk": "7.25.2", + "@zowe/imperative": "5.23.4" }, "peerDependencies": { "@zowe/core-for-zowe-sdk": "^7.0.0", diff --git a/packages/zostso/package.json b/packages/zostso/package.json index 3673f6fbca..2a718dd21e 100644 --- a/packages/zostso/package.json +++ b/packages/zostso/package.json @@ -1,6 +1,6 @@ { "name": "@zowe/zos-tso-for-zowe-sdk", - "version": "7.25.0", + "version": "7.25.2", "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.25.0" + "@zowe/zosmf-for-zowe-sdk": "7.25.2" }, "devDependencies": { "@zowe/cli-test-utils": "7.24.3", - "@zowe/core-for-zowe-sdk": "7.25.0", - "@zowe/imperative": "5.23.3" + "@zowe/core-for-zowe-sdk": "7.25.2", + "@zowe/imperative": "5.23.4" }, "peerDependencies": { "@zowe/core-for-zowe-sdk": "^7.0.0", diff --git a/packages/zosuss/package.json b/packages/zosuss/package.json index e9ce4e7386..8619cd8093 100644 --- a/packages/zosuss/package.json +++ b/packages/zosuss/package.json @@ -50,7 +50,7 @@ "devDependencies": { "@types/ssh2": "^1.11.0", "@zowe/cli-test-utils": "7.24.3", - "@zowe/imperative": "5.23.3" + "@zowe/imperative": "5.23.4" }, "peerDependencies": { "@zowe/imperative": "^5.2.0" From be5071be9114494aba423604f3e0cf96c5bc425a Mon Sep 17 00:00:00 2001 From: Timothy Johnson Date: Wed, 5 Jun 2024 13:53:38 -0400 Subject: [PATCH 18/29] WIP Fix incomplete files when downloading data sets Signed-off-by: Timothy Johnson --- .../src/rest/src/client/AbstractRestClient.ts | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/packages/imperative/src/rest/src/client/AbstractRestClient.ts b/packages/imperative/src/rest/src/client/AbstractRestClient.ts index 146796e5cb..d2629a3209 100644 --- a/packages/imperative/src/rest/src/client/AbstractRestClient.ts +++ b/packages/imperative/src/rest/src/client/AbstractRestClient.ts @@ -26,7 +26,7 @@ import { Session } from "../session/Session"; import * as path from "path"; import { IRestClientError } from "./doc/IRestClientError"; import { RestClientError } from "./RestClientError"; -import { Readable, Writable } from "stream"; +import { Readable, Writable, finished } from "stream"; import { IO } from "../../../io"; import { ITaskWithStatus, TaskProgress, TaskStage } from "../../../operations"; import { NextVerFeatures, TextUtils } from "../../../utilities"; @@ -817,12 +817,8 @@ export abstract class AbstractRestClient { causeErrors: this.dataString, source: "http" })); - } else if (this.mResponseStream != null && this.mResponseStream.writableEnded) { - // This will correct any instances where the finished event does not get emitted - // even though the stream processing has ended. - this.mResolve(this.dataString); - } else if (this.mResponseStream != null && !this.mResponseStream.writableFinished) { - this.mResponseStream.on("finish", () => this.mResolve(this.dataString)); + } else if (this.mResponseStream != null) { + finished(this.mResponseStream, () => this.mResolve(this.dataString)); } else { this.mResolve(this.dataString); } From 66bb6e426e01706a262cfa5f68a543bc07b5c65c Mon Sep 17 00:00:00 2001 From: Timothy Johnson Date: Wed, 5 Jun 2024 16:39:35 -0400 Subject: [PATCH 19/29] Use BufferBuilder to fix download promises not resolving Co-authored-by: Trae Yelovich Signed-off-by: Timothy Johnson --- .../src/rest/src/client/AbstractRestClient.ts | 9 ++---- packages/imperative/src/utilities/index.ts | 1 + .../src/utilities/src/BufferBuilder.ts | 32 +++++++++++++++++++ packages/zosfiles/src/methods/get/Get.ts | 12 +++---- 4 files changed, 41 insertions(+), 13 deletions(-) create mode 100644 packages/imperative/src/utilities/src/BufferBuilder.ts diff --git a/packages/imperative/src/rest/src/client/AbstractRestClient.ts b/packages/imperative/src/rest/src/client/AbstractRestClient.ts index d2629a3209..4af150a051 100644 --- a/packages/imperative/src/rest/src/client/AbstractRestClient.ts +++ b/packages/imperative/src/rest/src/client/AbstractRestClient.ts @@ -26,7 +26,7 @@ import { Session } from "../session/Session"; import * as path from "path"; import { IRestClientError } from "./doc/IRestClientError"; import { RestClientError } from "./RestClientError"; -import { Readable, Writable, finished } from "stream"; +import { Readable, Writable } from "stream"; import { IO } from "../../../io"; import { ITaskWithStatus, TaskProgress, TaskStage } from "../../../operations"; import { NextVerFeatures, TextUtils } from "../../../utilities"; @@ -797,10 +797,6 @@ export abstract class AbstractRestClient { this.mTask.percentComplete = TaskProgress.ONE_HUNDRED_PERCENT; this.mTask.stageName = TaskStage.COMPLETE; } - if (this.mResponseStream != null) { - this.log.debug("Ending response stream"); - this.mResponseStream.end(); - } if (this.mContentEncoding != null && this.mData.length > 0) { this.log.debug("Decompressing encoded response"); try { @@ -818,7 +814,8 @@ export abstract class AbstractRestClient { source: "http" })); } else if (this.mResponseStream != null) { - finished(this.mResponseStream, () => this.mResolve(this.dataString)); + this.log.debug("Ending response stream"); + this.mResponseStream.end(() => this.mResolve(this.dataString)); } else { this.mResolve(this.dataString); } diff --git a/packages/imperative/src/utilities/index.ts b/packages/imperative/src/utilities/index.ts index 50422471b8..b3464e1879 100644 --- a/packages/imperative/src/utilities/index.ts +++ b/packages/imperative/src/utilities/index.ts @@ -11,6 +11,7 @@ export * from "./src/doc/IDaemonRequest"; export * from "./src/doc/IDaemonResponse"; +export * from "./src/BufferBuilder"; export * from "./src/DaemonRequest"; export * from "./src/ExecUtils"; export * from "./src/ImperativeConfig"; diff --git a/packages/imperative/src/utilities/src/BufferBuilder.ts b/packages/imperative/src/utilities/src/BufferBuilder.ts new file mode 100644 index 0000000000..6dbfc00286 --- /dev/null +++ b/packages/imperative/src/utilities/src/BufferBuilder.ts @@ -0,0 +1,32 @@ +/* +* This program and the accompanying materials are made available under the terms of the +* Eclipse Public License v2.0 which accompanies this distribution, and is available at +* https://www.eclipse.org/legal/epl-v20.html +* +* SPDX-License-Identifier: EPL-2.0 +* +* Copyright Contributors to the Zowe Project. +* +*/ + +import { Duplex } from "stream"; + +export class BufferBuilder extends Duplex { + private chunks: Uint8Array[]; + + public constructor() { + super(); + this.chunks = []; + } + + public _write(chunk: any, _encoding: BufferEncoding, callback: (error?: Error) => void): void { + this.chunks.push(chunk); + callback(); + } + + public _read(_size: number): void { + const concatBuf = Buffer.concat(this.chunks); + this.push(concatBuf); + this.push(null); + } +} diff --git a/packages/zosfiles/src/methods/get/Get.ts b/packages/zosfiles/src/methods/get/Get.ts index 073fccbdfc..cb09e989c0 100644 --- a/packages/zosfiles/src/methods/get/Get.ts +++ b/packages/zosfiles/src/methods/get/Get.ts @@ -9,9 +9,7 @@ * */ -import { PassThrough } from "stream"; -import getStream = require("get-stream"); -import { AbstractSession, ImperativeExpect } from "@zowe/imperative"; +import { AbstractSession, BufferBuilder, ImperativeExpect } from "@zowe/imperative"; import { ZosFilesMessages } from "../../constants/ZosFiles.messages"; import { Download } from "../download/Download"; import { IGetOptions } from "./doc/IGetOptions"; @@ -37,12 +35,12 @@ export class Get { ImperativeExpect.toNotBeNullOrUndefined(dataSetName, ZosFilesMessages.missingDatasetName.message); ImperativeExpect.toNotBeEqual(dataSetName, "", ZosFilesMessages.missingDatasetName.message); - const responseStream = new PassThrough(); + const responseStream = new BufferBuilder(); await Download.dataSet(session, dataSetName, { ...options, stream: responseStream }); - return getStream.buffer(responseStream); + return responseStream.read(); } /** @@ -61,11 +59,11 @@ export class Get { ImperativeExpect.toNotBeEqual(USSFileName, "", ZosFilesMessages.missingUSSFileName.message); ImperativeExpect.toNotBeEqual(options.record, true, ZosFilesMessages.unsupportedDataType.message); // This should never exist for USS files - const responseStream = new PassThrough(); + const responseStream = new BufferBuilder(); await Download.ussFile(session, USSFileName, { ...options, stream: responseStream }); - return getStream.buffer(responseStream); + return responseStream.read(); } } From 85927ae5645dcbe577d85c351199116e12edd163 Mon Sep 17 00:00:00 2001 From: Timothy Johnson Date: Wed, 5 Jun 2024 16:39:56 -0400 Subject: [PATCH 20/29] Remove get-stream dep and update micromatch Signed-off-by: Timothy Johnson --- npm-shrinkwrap.json | 22 ++++++++++------------ packages/zosfiles/package.json | 1 - 2 files changed, 10 insertions(+), 13 deletions(-) diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json index 94c66cdf7a..f52c864f37 100644 --- a/npm-shrinkwrap.json +++ b/npm-shrinkwrap.json @@ -14862,12 +14862,12 @@ } }, "node_modules/micromatch": { - "version": "4.0.4", - "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.4.tgz", - "integrity": "sha512-pRmzw/XUcwXGpD9aI9q/0XOwLNygjETJ8y0ao0wdqprrzDa4YnxLcz7fQRZr8voh8V10kGhABbNcHVk5wHgWwg==", + "version": "4.0.7", + "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.7.tgz", + "integrity": "sha512-LPP/3KorzCwBxfeUuZmaR6bG2kdeHSbe0P2tY3FLRU4vYrjYz5hI4QZwV0njUx3jeuKe67YukQ1LSPZBKDqO/Q==", "dependencies": { - "braces": "^3.0.1", - "picomatch": "^2.2.3" + "braces": "^3.0.3", + "picomatch": "^2.3.1" }, "engines": { "node": ">=8.6" @@ -20991,7 +20991,6 @@ "version": "7.25.2", "license": "EPL-2.0", "dependencies": { - "get-stream": "6.0.1", "minimatch": "5.0.1" }, "devDependencies": { @@ -26140,7 +26139,6 @@ "@zowe/core-for-zowe-sdk": "7.25.2", "@zowe/imperative": "5.23.4", "@zowe/zos-uss-for-zowe-sdk": "7.24.3", - "get-stream": "6.0.1", "minimatch": "5.0.1" }, "dependencies": { @@ -32481,12 +32479,12 @@ "integrity": "sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==" }, "micromatch": { - "version": "4.0.4", - "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.4.tgz", - "integrity": "sha512-pRmzw/XUcwXGpD9aI9q/0XOwLNygjETJ8y0ao0wdqprrzDa4YnxLcz7fQRZr8voh8V10kGhABbNcHVk5wHgWwg==", + "version": "4.0.7", + "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.7.tgz", + "integrity": "sha512-LPP/3KorzCwBxfeUuZmaR6bG2kdeHSbe0P2tY3FLRU4vYrjYz5hI4QZwV0njUx3jeuKe67YukQ1LSPZBKDqO/Q==", "requires": { - "braces": "^3.0.1", - "picomatch": "^2.2.3" + "braces": "^3.0.3", + "picomatch": "^2.3.1" } }, "mime": { diff --git a/packages/zosfiles/package.json b/packages/zosfiles/package.json index c989c5af23..f7806ffbc3 100644 --- a/packages/zosfiles/package.json +++ b/packages/zosfiles/package.json @@ -46,7 +46,6 @@ "prepack": "node ../../scripts/prepareLicenses.js" }, "dependencies": { - "get-stream": "6.0.1", "minimatch": "5.0.1" }, "devDependencies": { From 9c6d505cbe28f8f6063bed267d5a747f1d11dac9 Mon Sep 17 00:00:00 2001 From: Timothy Johnson Date: Wed, 5 Jun 2024 17:05:59 -0400 Subject: [PATCH 21/29] Update unit tests for REST client and BufferBuilder Co-authored-by: Trae Yelovich Signed-off-by: Timothy Johnson --- .../client/AbstractRestClient.unit.test.ts | 2 +- .../src/rest/src/client/AbstractRestClient.ts | 28 ++++++++++------- .../__tests__/BufferBuilder.unit.test.ts | 30 +++++++++++++++++++ 3 files changed, 48 insertions(+), 12 deletions(-) create mode 100644 packages/imperative/src/utilities/__tests__/BufferBuilder.unit.test.ts diff --git a/packages/imperative/src/rest/__tests__/client/AbstractRestClient.unit.test.ts b/packages/imperative/src/rest/__tests__/client/AbstractRestClient.unit.test.ts index 48fef81aba..b20e1ba577 100644 --- a/packages/imperative/src/rest/__tests__/client/AbstractRestClient.unit.test.ts +++ b/packages/imperative/src/rest/__tests__/client/AbstractRestClient.unit.test.ts @@ -524,7 +524,7 @@ describe("AbstractRestClient tests", () => { const fakeResponseStream: any = { write: jest.fn(), on: jest.fn(), - end: jest.fn(), + end: jest.fn((cb: any) => cb()), writableFinished: true }; const fakeRequestStream: any = { diff --git a/packages/imperative/src/rest/src/client/AbstractRestClient.ts b/packages/imperative/src/rest/src/client/AbstractRestClient.ts index 4af150a051..0693bc1629 100644 --- a/packages/imperative/src/rest/src/client/AbstractRestClient.ts +++ b/packages/imperative/src/rest/src/client/AbstractRestClient.ts @@ -805,19 +805,25 @@ export abstract class AbstractRestClient { this.mReject(err); } } - if (this.requestFailure) { - // Reject the promise with an error - const httpStatus = this.response == null ? undefined : this.response.statusCode; - this.mReject(this.populateError({ - msg: "Rest API failure with HTTP(S) status " + httpStatus, - causeErrors: this.dataString, - source: "http" - })); - } else if (this.mResponseStream != null) { + + const requestEnd = () => { + if (this.requestFailure) { + // Reject the promise with an error + const httpStatus = this.response == null ? undefined : this.response.statusCode; + this.mReject(this.populateError({ + msg: "Rest API failure with HTTP(S) status " + httpStatus, + causeErrors: this.dataString, + source: "http" + })); + } else { + this.mResolve(this.dataString); + } + }; + if (this.mResponseStream != null) { this.log.debug("Ending response stream"); - this.mResponseStream.end(() => this.mResolve(this.dataString)); + this.mResponseStream.end(requestEnd); } else { - this.mResolve(this.dataString); + requestEnd(); } } diff --git a/packages/imperative/src/utilities/__tests__/BufferBuilder.unit.test.ts b/packages/imperative/src/utilities/__tests__/BufferBuilder.unit.test.ts new file mode 100644 index 0000000000..554c79bfa9 --- /dev/null +++ b/packages/imperative/src/utilities/__tests__/BufferBuilder.unit.test.ts @@ -0,0 +1,30 @@ +/* +* This program and the accompanying materials are made available under the terms of the +* Eclipse Public License v2.0 which accompanies this distribution, and is available at +* https://www.eclipse.org/legal/epl-v20.html +* +* SPDX-License-Identifier: EPL-2.0 +* +* Copyright Contributors to the Zowe Project. +* +*/ + +import { BufferBuilder } from "../src/BufferBuilder"; + +describe("BufferBuilder", () => { + it("calls the given callback on write", () => { + const bufBuilder = new BufferBuilder(); + const callbackMock = jest.fn(); + bufBuilder._write(new Uint8Array([1, 2, 3]), "binary", callbackMock); + expect(callbackMock).toHaveBeenCalled(); + }); + + it("calls 'push' on read", () => { + const bufBuilder = new BufferBuilder(); + const callbackMock = jest.fn(); + const pushMock = jest.spyOn(bufBuilder, "push"); + bufBuilder._write(new Uint8Array([1, 2, 3]), "binary", callbackMock); + bufBuilder._read(3); + expect(pushMock).toHaveBeenCalledTimes(2); + }); +}); From 76afd3762a4d99df703b0763d72eb678583a5ef6 Mon Sep 17 00:00:00 2001 From: Timothy Johnson Date: Wed, 5 Jun 2024 20:30:35 -0400 Subject: [PATCH 22/29] Update changelogs Signed-off-by: Timothy Johnson --- packages/imperative/CHANGELOG.md | 6 ++++++ packages/zosfiles/CHANGELOG.md | 4 ++++ 2 files changed, 10 insertions(+) diff --git a/packages/imperative/CHANGELOG.md b/packages/imperative/CHANGELOG.md index 0cebb1bfa8..19ea10d102 100644 --- a/packages/imperative/CHANGELOG.md +++ b/packages/imperative/CHANGELOG.md @@ -2,6 +2,12 @@ All notable changes to the Imperative package will be documented in this file. +## Recent Changes + +- Enhancement: Added `BufferBuilder` utility class to provide convenient way of downloading to a stream that can be read as a buffer. [#2167](https://github.com/zowe/zowe-cli/pull/2167) +- BugFix: Fixed error in REST client that when using stream could cause small data sets to download with incomplete contents. [#744](https://github.com/zowe/zowe-cli/issues/744) +- BugFix: Updated `micromatch` dependency for technical currency. [#2167](https://github.com/zowe/zowe-cli/pull/2167) + ## `5.23.4` - BugFix: Updated `braces` dependency for technical currency. [#2157](https://github.com/zowe/zowe-cli/pull/2157) diff --git a/packages/zosfiles/CHANGELOG.md b/packages/zosfiles/CHANGELOG.md index c2c9af4fb4..bf3a8ed52c 100644 --- a/packages/zosfiles/CHANGELOG.md +++ b/packages/zosfiles/CHANGELOG.md @@ -2,6 +2,10 @@ All notable changes to the Zowe z/OS files SDK package will be documented in this file. +## Recent Changes + +- BugFix: Fixed error where `Get.dataSet` and `Get.USSFile` could silently fail when downloading large data sets or files. [#2167](https://github.com/zowe/zowe-cli/pull/2167) + ## `7.24.0` - BugFix: Fixed error that could occur when listing data set members that contain control characters in the name. [#2104](https://github.com/zowe/zowe-cli/pull/2104) From 6f4f5e68abd0a885be9d7841af7303595e6e2c5c Mon Sep 17 00:00:00 2001 From: Timothy Johnson Date: Fri, 7 Jun 2024 10:46:23 -0400 Subject: [PATCH 23/29] Clarify what Get.dataSet and Get.USSFile are Signed-off-by: Timothy Johnson --- packages/zosfiles/CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/zosfiles/CHANGELOG.md b/packages/zosfiles/CHANGELOG.md index bf3a8ed52c..63498dd7c3 100644 --- a/packages/zosfiles/CHANGELOG.md +++ b/packages/zosfiles/CHANGELOG.md @@ -4,7 +4,7 @@ All notable changes to the Zowe z/OS files SDK package will be documented in thi ## Recent Changes -- BugFix: Fixed error where `Get.dataSet` and `Get.USSFile` could silently fail when downloading large data sets or files. [#2167](https://github.com/zowe/zowe-cli/pull/2167) +- BugFix: Fixed error where `Get.dataSet` and `Get.USSFile` methods could silently fail when downloading large data sets or files. [#2167](https://github.com/zowe/zowe-cli/pull/2167) ## `7.24.0` From a46a2fd1f1cc377e2d12033d6dffbf9c283ddfae Mon Sep 17 00:00:00 2001 From: zowe-robot Date: Fri, 7 Jun 2024 16:56:05 +0000 Subject: [PATCH 24/29] Bump version to 7.26.0 [ci skip] Signed-off-by: zowe-robot --- .../__packages__/cli-test-utils/package.json | 2 +- lerna.json | 2 +- npm-shrinkwrap.json | 78 +++++++++---------- packages/cli/package.json | 10 +-- packages/core/package.json | 2 +- packages/imperative/CHANGELOG.md | 2 +- packages/imperative/package.json | 2 +- packages/provisioning/package.json | 2 +- packages/workflows/package.json | 6 +- packages/zosconsole/package.json | 2 +- packages/zosfiles/CHANGELOG.md | 2 +- packages/zosfiles/package.json | 4 +- packages/zosjobs/package.json | 6 +- packages/zoslogs/package.json | 2 +- packages/zosmf/package.json | 2 +- packages/zostso/package.json | 2 +- packages/zosuss/package.json | 2 +- 17 files changed, 64 insertions(+), 64 deletions(-) diff --git a/__tests__/__packages__/cli-test-utils/package.json b/__tests__/__packages__/cli-test-utils/package.json index 52120e2978..368d6f6187 100644 --- a/__tests__/__packages__/cli-test-utils/package.json +++ b/__tests__/__packages__/cli-test-utils/package.json @@ -43,7 +43,7 @@ "devDependencies": { "@types/js-yaml": "^4.0.0", "@types/uuid": "^8.3.0", - "@zowe/imperative": "5.23.4" + "@zowe/imperative": "5.24.0" }, "peerDependencies": { "@zowe/imperative": "^5.0.0" diff --git a/lerna.json b/lerna.json index 7e954d5fae..b72a6dd1c7 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "7.25.2", + "version": "7.26.0", "command": { "publish": { "ignoreChanges": [ diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json index f52c864f37..3d1ce216e6 100644 --- a/npm-shrinkwrap.json +++ b/npm-shrinkwrap.json @@ -64,7 +64,7 @@ "devDependencies": { "@types/js-yaml": "^4.0.0", "@types/uuid": "^8.3.0", - "@zowe/imperative": "5.23.4" + "@zowe/imperative": "5.24.0" }, "peerDependencies": { "@zowe/imperative": "^5.0.0" @@ -20503,20 +20503,20 @@ }, "packages/cli": { "name": "@zowe/cli", - "version": "7.25.2", + "version": "7.26.0", "hasInstallScript": true, "license": "EPL-2.0", "dependencies": { "@zowe/core-for-zowe-sdk": "7.25.2", - "@zowe/imperative": "5.23.4", + "@zowe/imperative": "5.24.0", "@zowe/provisioning-for-zowe-sdk": "7.25.2", "@zowe/zos-console-for-zowe-sdk": "7.25.2", - "@zowe/zos-files-for-zowe-sdk": "7.25.2", - "@zowe/zos-jobs-for-zowe-sdk": "7.25.2", + "@zowe/zos-files-for-zowe-sdk": "7.26.0", + "@zowe/zos-jobs-for-zowe-sdk": "7.26.0", "@zowe/zos-logs-for-zowe-sdk": "7.25.2", "@zowe/zos-tso-for-zowe-sdk": "7.25.2", "@zowe/zos-uss-for-zowe-sdk": "7.24.3", - "@zowe/zos-workflows-for-zowe-sdk": "7.25.2", + "@zowe/zos-workflows-for-zowe-sdk": "7.26.0", "@zowe/zosmf-for-zowe-sdk": "7.25.2", "find-process": "1.4.7", "get-stream": "6.0.1", @@ -20573,7 +20573,7 @@ }, "devDependencies": { "@zowe/cli-test-utils": "7.24.3", - "@zowe/imperative": "5.23.4" + "@zowe/imperative": "5.24.0" }, "peerDependencies": { "@zowe/imperative": "^5.0.0" @@ -20581,7 +20581,7 @@ }, "packages/imperative": { "name": "@zowe/imperative", - "version": "5.23.4", + "version": "5.24.0", "license": "EPL-2.0", "dependencies": { "@types/yargs": "13.0.4", @@ -20935,7 +20935,7 @@ "@types/js-yaml": "^4.0.5", "@zowe/cli-test-utils": "7.24.3", "@zowe/core-for-zowe-sdk": "7.25.2", - "@zowe/imperative": "5.23.4" + "@zowe/imperative": "5.24.0" }, "peerDependencies": { "@zowe/core-for-zowe-sdk": "^7.0.0", @@ -20957,15 +20957,15 @@ }, "packages/workflows": { "name": "@zowe/zos-workflows-for-zowe-sdk", - "version": "7.25.2", + "version": "7.26.0", "license": "EPL-2.0", "dependencies": { - "@zowe/zos-files-for-zowe-sdk": "7.25.2" + "@zowe/zos-files-for-zowe-sdk": "7.26.0" }, "devDependencies": { "@zowe/cli-test-utils": "7.24.3", "@zowe/core-for-zowe-sdk": "7.25.2", - "@zowe/imperative": "5.23.4" + "@zowe/imperative": "5.24.0" }, "peerDependencies": { "@zowe/core-for-zowe-sdk": "^7.0.0", @@ -20979,7 +20979,7 @@ "devDependencies": { "@zowe/cli-test-utils": "7.24.3", "@zowe/core-for-zowe-sdk": "7.25.2", - "@zowe/imperative": "5.23.4" + "@zowe/imperative": "5.24.0" }, "peerDependencies": { "@zowe/core-for-zowe-sdk": "^7.0.0", @@ -20988,7 +20988,7 @@ }, "packages/zosfiles": { "name": "@zowe/zos-files-for-zowe-sdk", - "version": "7.25.2", + "version": "7.26.0", "license": "EPL-2.0", "dependencies": { "minimatch": "5.0.1" @@ -20996,7 +20996,7 @@ "devDependencies": { "@zowe/cli-test-utils": "7.24.3", "@zowe/core-for-zowe-sdk": "7.25.2", - "@zowe/imperative": "5.23.4", + "@zowe/imperative": "5.24.0", "@zowe/zos-uss-for-zowe-sdk": "7.24.3" }, "peerDependencies": { @@ -21025,15 +21025,15 @@ }, "packages/zosjobs": { "name": "@zowe/zos-jobs-for-zowe-sdk", - "version": "7.25.2", + "version": "7.26.0", "license": "EPL-2.0", "dependencies": { - "@zowe/zos-files-for-zowe-sdk": "7.25.2" + "@zowe/zos-files-for-zowe-sdk": "7.26.0" }, "devDependencies": { "@zowe/cli-test-utils": "7.24.3", "@zowe/core-for-zowe-sdk": "7.25.2", - "@zowe/imperative": "5.23.4" + "@zowe/imperative": "5.24.0" }, "peerDependencies": { "@zowe/core-for-zowe-sdk": "^7.0.0", @@ -21047,7 +21047,7 @@ "devDependencies": { "@zowe/cli-test-utils": "7.24.3", "@zowe/core-for-zowe-sdk": "7.25.2", - "@zowe/imperative": "5.23.4" + "@zowe/imperative": "5.24.0" }, "peerDependencies": { "@zowe/core-for-zowe-sdk": "^7.0.0", @@ -21061,7 +21061,7 @@ "devDependencies": { "@zowe/cli-test-utils": "7.24.3", "@zowe/core-for-zowe-sdk": "7.25.2", - "@zowe/imperative": "5.23.4" + "@zowe/imperative": "5.24.0" }, "peerDependencies": { "@zowe/core-for-zowe-sdk": "^7.0.0", @@ -21078,7 +21078,7 @@ "devDependencies": { "@zowe/cli-test-utils": "7.24.3", "@zowe/core-for-zowe-sdk": "7.25.2", - "@zowe/imperative": "5.23.4" + "@zowe/imperative": "5.24.0" }, "peerDependencies": { "@zowe/core-for-zowe-sdk": "^7.0.0", @@ -21095,7 +21095,7 @@ "devDependencies": { "@types/ssh2": "^1.11.0", "@zowe/cli-test-utils": "7.24.3", - "@zowe/imperative": "5.23.4" + "@zowe/imperative": "5.24.0" }, "peerDependencies": { "@zowe/imperative": "^5.2.0" @@ -25787,16 +25787,16 @@ "@types/tar": "^6.1.2", "@zowe/cli-test-utils": "7.24.3", "@zowe/core-for-zowe-sdk": "7.25.2", - "@zowe/imperative": "5.23.4", + "@zowe/imperative": "5.24.0", "@zowe/provisioning-for-zowe-sdk": "7.25.2", "@zowe/secrets-for-zowe-sdk": "7.18.6", "@zowe/zos-console-for-zowe-sdk": "7.25.2", - "@zowe/zos-files-for-zowe-sdk": "7.25.2", - "@zowe/zos-jobs-for-zowe-sdk": "7.25.2", + "@zowe/zos-files-for-zowe-sdk": "7.26.0", + "@zowe/zos-jobs-for-zowe-sdk": "7.26.0", "@zowe/zos-logs-for-zowe-sdk": "7.25.2", "@zowe/zos-tso-for-zowe-sdk": "7.25.2", "@zowe/zos-uss-for-zowe-sdk": "7.24.3", - "@zowe/zos-workflows-for-zowe-sdk": "7.25.2", + "@zowe/zos-workflows-for-zowe-sdk": "7.26.0", "@zowe/zosmf-for-zowe-sdk": "7.25.2", "comment-json": "^4.1.1", "find-process": "1.4.7", @@ -25831,7 +25831,7 @@ "requires": { "@types/js-yaml": "^4.0.0", "@types/uuid": "^8.3.0", - "@zowe/imperative": "5.23.4", + "@zowe/imperative": "5.24.0", "find-up": "^5.0.0", "js-yaml": "^4.0.0", "rimraf": "^3.0.2", @@ -25852,7 +25852,7 @@ "version": "file:packages/core", "requires": { "@zowe/cli-test-utils": "7.24.3", - "@zowe/imperative": "5.23.4", + "@zowe/imperative": "5.24.0", "comment-json": "4.1.1", "string-width": "4.2.3" } @@ -26113,7 +26113,7 @@ "@types/js-yaml": "^4.0.5", "@zowe/cli-test-utils": "7.24.3", "@zowe/core-for-zowe-sdk": "7.25.2", - "@zowe/imperative": "5.23.4", + "@zowe/imperative": "5.24.0", "js-yaml": "4.1.0" } }, @@ -26129,7 +26129,7 @@ "requires": { "@zowe/cli-test-utils": "7.24.3", "@zowe/core-for-zowe-sdk": "7.25.2", - "@zowe/imperative": "5.23.4" + "@zowe/imperative": "5.24.0" } }, "@zowe/zos-files-for-zowe-sdk": { @@ -26137,7 +26137,7 @@ "requires": { "@zowe/cli-test-utils": "7.24.3", "@zowe/core-for-zowe-sdk": "7.25.2", - "@zowe/imperative": "5.23.4", + "@zowe/imperative": "5.24.0", "@zowe/zos-uss-for-zowe-sdk": "7.24.3", "minimatch": "5.0.1" }, @@ -26165,8 +26165,8 @@ "requires": { "@zowe/cli-test-utils": "7.24.3", "@zowe/core-for-zowe-sdk": "7.25.2", - "@zowe/imperative": "5.23.4", - "@zowe/zos-files-for-zowe-sdk": "7.25.2" + "@zowe/imperative": "5.24.0", + "@zowe/zos-files-for-zowe-sdk": "7.26.0" } }, "@zowe/zos-logs-for-zowe-sdk": { @@ -26174,7 +26174,7 @@ "requires": { "@zowe/cli-test-utils": "7.24.3", "@zowe/core-for-zowe-sdk": "7.25.2", - "@zowe/imperative": "5.23.4" + "@zowe/imperative": "5.24.0" } }, "@zowe/zos-tso-for-zowe-sdk": { @@ -26182,7 +26182,7 @@ "requires": { "@zowe/cli-test-utils": "7.24.3", "@zowe/core-for-zowe-sdk": "7.25.2", - "@zowe/imperative": "5.23.4", + "@zowe/imperative": "5.24.0", "@zowe/zosmf-for-zowe-sdk": "7.25.2" } }, @@ -26191,7 +26191,7 @@ "requires": { "@types/ssh2": "^1.11.0", "@zowe/cli-test-utils": "7.24.3", - "@zowe/imperative": "5.23.4", + "@zowe/imperative": "5.24.0", "ssh2": "1.15.0" } }, @@ -26200,8 +26200,8 @@ "requires": { "@zowe/cli-test-utils": "7.24.3", "@zowe/core-for-zowe-sdk": "7.25.2", - "@zowe/imperative": "5.23.4", - "@zowe/zos-files-for-zowe-sdk": "7.25.2" + "@zowe/imperative": "5.24.0", + "@zowe/zos-files-for-zowe-sdk": "7.26.0" } }, "@zowe/zosmf-for-zowe-sdk": { @@ -26209,7 +26209,7 @@ "requires": { "@zowe/cli-test-utils": "7.24.3", "@zowe/core-for-zowe-sdk": "7.25.2", - "@zowe/imperative": "5.23.4" + "@zowe/imperative": "5.24.0" } }, "abbrev": { diff --git a/packages/cli/package.json b/packages/cli/package.json index 11e28e0f39..9680dfdd87 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -1,6 +1,6 @@ { "name": "@zowe/cli", - "version": "7.25.2", + "version": "7.26.0", "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", @@ -59,15 +59,15 @@ }, "dependencies": { "@zowe/core-for-zowe-sdk": "7.25.2", - "@zowe/imperative": "5.23.4", + "@zowe/imperative": "5.24.0", "@zowe/provisioning-for-zowe-sdk": "7.25.2", "@zowe/zos-console-for-zowe-sdk": "7.25.2", - "@zowe/zos-files-for-zowe-sdk": "7.25.2", - "@zowe/zos-jobs-for-zowe-sdk": "7.25.2", + "@zowe/zos-files-for-zowe-sdk": "7.26.0", + "@zowe/zos-jobs-for-zowe-sdk": "7.26.0", "@zowe/zos-logs-for-zowe-sdk": "7.25.2", "@zowe/zos-tso-for-zowe-sdk": "7.25.2", "@zowe/zos-uss-for-zowe-sdk": "7.24.3", - "@zowe/zos-workflows-for-zowe-sdk": "7.25.2", + "@zowe/zos-workflows-for-zowe-sdk": "7.26.0", "@zowe/zosmf-for-zowe-sdk": "7.25.2", "find-process": "1.4.7", "get-stream": "6.0.1", diff --git a/packages/core/package.json b/packages/core/package.json index bd131e45ed..6b8ad93717 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -50,7 +50,7 @@ }, "devDependencies": { "@zowe/cli-test-utils": "7.24.3", - "@zowe/imperative": "5.23.4" + "@zowe/imperative": "5.24.0" }, "peerDependencies": { "@zowe/imperative": "^5.0.0" diff --git a/packages/imperative/CHANGELOG.md b/packages/imperative/CHANGELOG.md index 19ea10d102..10a0506b36 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.24.0` - Enhancement: Added `BufferBuilder` utility class to provide convenient way of downloading to a stream that can be read as a buffer. [#2167](https://github.com/zowe/zowe-cli/pull/2167) - BugFix: Fixed error in REST client that when using stream could cause small data sets to download with incomplete contents. [#744](https://github.com/zowe/zowe-cli/issues/744) diff --git a/packages/imperative/package.json b/packages/imperative/package.json index 42741bf551..903d73e798 100644 --- a/packages/imperative/package.json +++ b/packages/imperative/package.json @@ -1,6 +1,6 @@ { "name": "@zowe/imperative", - "version": "5.23.4", + "version": "5.24.0", "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 5fd033e37c..9dbff0a101 100644 --- a/packages/provisioning/package.json +++ b/packages/provisioning/package.json @@ -51,7 +51,7 @@ "@types/js-yaml": "^4.0.5", "@zowe/cli-test-utils": "7.24.3", "@zowe/core-for-zowe-sdk": "7.25.2", - "@zowe/imperative": "5.23.4" + "@zowe/imperative": "5.24.0" }, "peerDependencies": { "@zowe/core-for-zowe-sdk": "^7.0.0", diff --git a/packages/workflows/package.json b/packages/workflows/package.json index 73a64e7119..ce8b5e3412 100644 --- a/packages/workflows/package.json +++ b/packages/workflows/package.json @@ -1,6 +1,6 @@ { "name": "@zowe/zos-workflows-for-zowe-sdk", - "version": "7.25.2", + "version": "7.26.0", "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.25.2" + "@zowe/zos-files-for-zowe-sdk": "7.26.0" }, "devDependencies": { "@zowe/cli-test-utils": "7.24.3", "@zowe/core-for-zowe-sdk": "7.25.2", - "@zowe/imperative": "5.23.4" + "@zowe/imperative": "5.24.0" }, "peerDependencies": { "@zowe/core-for-zowe-sdk": "^7.0.0", diff --git a/packages/zosconsole/package.json b/packages/zosconsole/package.json index 55c3b94604..ca564a15b7 100644 --- a/packages/zosconsole/package.json +++ b/packages/zosconsole/package.json @@ -47,7 +47,7 @@ "devDependencies": { "@zowe/cli-test-utils": "7.24.3", "@zowe/core-for-zowe-sdk": "7.25.2", - "@zowe/imperative": "5.23.4" + "@zowe/imperative": "5.24.0" }, "peerDependencies": { "@zowe/core-for-zowe-sdk": "^7.0.0", diff --git a/packages/zosfiles/CHANGELOG.md b/packages/zosfiles/CHANGELOG.md index 63498dd7c3..5579224aa1 100644 --- a/packages/zosfiles/CHANGELOG.md +++ b/packages/zosfiles/CHANGELOG.md @@ -2,7 +2,7 @@ All notable changes to the Zowe z/OS files SDK package will be documented in this file. -## Recent Changes +## `7.26.0` - BugFix: Fixed error where `Get.dataSet` and `Get.USSFile` methods could silently fail when downloading large data sets or files. [#2167](https://github.com/zowe/zowe-cli/pull/2167) diff --git a/packages/zosfiles/package.json b/packages/zosfiles/package.json index f7806ffbc3..74db32acc6 100644 --- a/packages/zosfiles/package.json +++ b/packages/zosfiles/package.json @@ -1,6 +1,6 @@ { "name": "@zowe/zos-files-for-zowe-sdk", - "version": "7.25.2", + "version": "7.26.0", "description": "Zowe SDK to interact with files and data sets on z/OS", "author": "Zowe", "license": "EPL-2.0", @@ -51,7 +51,7 @@ "devDependencies": { "@zowe/cli-test-utils": "7.24.3", "@zowe/core-for-zowe-sdk": "7.25.2", - "@zowe/imperative": "5.23.4", + "@zowe/imperative": "5.24.0", "@zowe/zos-uss-for-zowe-sdk": "7.24.3" }, "peerDependencies": { diff --git a/packages/zosjobs/package.json b/packages/zosjobs/package.json index 9b12877660..7ef9576ad7 100644 --- a/packages/zosjobs/package.json +++ b/packages/zosjobs/package.json @@ -1,6 +1,6 @@ { "name": "@zowe/zos-jobs-for-zowe-sdk", - "version": "7.25.2", + "version": "7.26.0", "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.25.2" + "@zowe/zos-files-for-zowe-sdk": "7.26.0" }, "devDependencies": { "@zowe/cli-test-utils": "7.24.3", "@zowe/core-for-zowe-sdk": "7.25.2", - "@zowe/imperative": "5.23.4" + "@zowe/imperative": "5.24.0" }, "peerDependencies": { "@zowe/core-for-zowe-sdk": "^7.0.0", diff --git a/packages/zoslogs/package.json b/packages/zoslogs/package.json index 188ead80cd..343f93cd20 100644 --- a/packages/zoslogs/package.json +++ b/packages/zoslogs/package.json @@ -47,7 +47,7 @@ "devDependencies": { "@zowe/cli-test-utils": "7.24.3", "@zowe/core-for-zowe-sdk": "7.25.2", - "@zowe/imperative": "5.23.4" + "@zowe/imperative": "5.24.0" }, "peerDependencies": { "@zowe/core-for-zowe-sdk": "^7.0.0", diff --git a/packages/zosmf/package.json b/packages/zosmf/package.json index 46ef6b4105..e3b3f7ff3e 100644 --- a/packages/zosmf/package.json +++ b/packages/zosmf/package.json @@ -46,7 +46,7 @@ "devDependencies": { "@zowe/cli-test-utils": "7.24.3", "@zowe/core-for-zowe-sdk": "7.25.2", - "@zowe/imperative": "5.23.4" + "@zowe/imperative": "5.24.0" }, "peerDependencies": { "@zowe/core-for-zowe-sdk": "^7.0.0", diff --git a/packages/zostso/package.json b/packages/zostso/package.json index 2a718dd21e..92ff37ffaf 100644 --- a/packages/zostso/package.json +++ b/packages/zostso/package.json @@ -50,7 +50,7 @@ "devDependencies": { "@zowe/cli-test-utils": "7.24.3", "@zowe/core-for-zowe-sdk": "7.25.2", - "@zowe/imperative": "5.23.4" + "@zowe/imperative": "5.24.0" }, "peerDependencies": { "@zowe/core-for-zowe-sdk": "^7.0.0", diff --git a/packages/zosuss/package.json b/packages/zosuss/package.json index 8619cd8093..3ddfba3399 100644 --- a/packages/zosuss/package.json +++ b/packages/zosuss/package.json @@ -50,7 +50,7 @@ "devDependencies": { "@types/ssh2": "^1.11.0", "@zowe/cli-test-utils": "7.24.3", - "@zowe/imperative": "5.23.4" + "@zowe/imperative": "5.24.0" }, "peerDependencies": { "@zowe/imperative": "^5.2.0" From 6e82750634358cb9fb84d8dc47aa30a706b16773 Mon Sep 17 00:00:00 2001 From: Timothy Johnson Date: Fri, 7 Jun 2024 13:42:07 -0400 Subject: [PATCH 25/29] Update changelogs for Imperative and zosfiles SDK Signed-off-by: Timothy Johnson --- packages/imperative/CHANGELOG.md | 6 ++++++ packages/zosfiles/CHANGELOG.md | 4 ++++ 2 files changed, 10 insertions(+) diff --git a/packages/imperative/CHANGELOG.md b/packages/imperative/CHANGELOG.md index c2ff2f2b90..4aa50a710b 100644 --- a/packages/imperative/CHANGELOG.md +++ b/packages/imperative/CHANGELOG.md @@ -2,6 +2,12 @@ All notable changes to the Imperative package will be documented in this file. +## Recent Changes + +- Enhancement: Added `BufferBuilder` utility class to provide convenient way of downloading to a stream that can be read as a buffer. [#2167](https://github.com/zowe/zowe-cli/pull/2167) +- BugFix: Fixed error in REST client that when using stream could cause small data sets to download with incomplete contents. [#744](https://github.com/zowe/zowe-cli/issues/744) +- BugFix: Updated `micromatch` dependency for technical currency. [#2167](https://github.com/zowe/zowe-cli/pull/2167) + ## `8.0.0-next.202406061600` - BugFix: Updated `braces` dependency for technical currency. [#2158](https://github.com/zowe/zowe-cli/pull/2158) diff --git a/packages/zosfiles/CHANGELOG.md b/packages/zosfiles/CHANGELOG.md index c96739e08f..13c4e492b1 100644 --- a/packages/zosfiles/CHANGELOG.md +++ b/packages/zosfiles/CHANGELOG.md @@ -2,6 +2,10 @@ All notable changes to the Zowe z/OS files SDK package will be documented in this file. +## Recent Changes + +- BugFix: Fixed error where `Get.dataSet` and `Get.USSFile` methods could silently fail when downloading large data sets or files. [#2167](https://github.com/zowe/zowe-cli/pull/2167) + ## `8.0.0-next.202405202020` - BugFix: Fixed a bug where a data set search would not return a search term if it was at the beginning of a line. [#2147](https://github.com/zowe/zowe-cli/pull/2147) From 1592f16a743aaa9ea873f3cb8f03a78f77f53b05 Mon Sep 17 00:00:00 2001 From: Timothy Johnson Date: Fri, 7 Jun 2024 17:35:12 -0400 Subject: [PATCH 26/29] Fix error when downloading spool files with default encoding Signed-off-by: Timothy Johnson --- packages/zosjobs/src/DownloadJobs.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/zosjobs/src/DownloadJobs.ts b/packages/zosjobs/src/DownloadJobs.ts index 869cf309eb..679ad2ad5a 100644 --- a/packages/zosjobs/src/DownloadJobs.ts +++ b/packages/zosjobs/src/DownloadJobs.ts @@ -122,7 +122,7 @@ export class DownloadJobs { parameters += "?mode=record"; } - if (!parms.binary && !parms.record && parms.encoding?.trim() != "") { + if (!parms.binary && !parms.record && parms.encoding?.trim()) { parameters += "?fileEncoding=" + parms.encoding; } From b71c764c205cfb185e78e8301258951bf4510114 Mon Sep 17 00:00:00 2001 From: Timothy Johnson Date: Mon, 10 Jun 2024 07:17:52 -0400 Subject: [PATCH 27/29] Update unit test and changelog Signed-off-by: Timothy Johnson --- packages/zosjobs/CHANGELOG.md | 4 ++++ .../zosjobs/__tests__/__unit__/DownloadJobs.unit.test.ts | 5 +++++ 2 files changed, 9 insertions(+) diff --git a/packages/zosjobs/CHANGELOG.md b/packages/zosjobs/CHANGELOG.md index 1f8c1c48ef..76a381b282 100644 --- a/packages/zosjobs/CHANGELOG.md +++ b/packages/zosjobs/CHANGELOG.md @@ -2,6 +2,10 @@ All notable changes to the Zowe z/OS jobs SDK package will be documented in this file. +## Recent Changes + +- BugFix: Fixed error in `DownloadJobs.downloadSpoolContentCommon` method when encoding parameter is not specified. [#2173](https://github.com/zowe/zowe-cli/pull/2173) + ## `7.25.0` - Enhancement: Added the ability to set `internalReaderFileEncoding` on the `submitJcl`, `submitJclString`, `submitJclCommon`, `submitJclNotify`, and `submitJclNotifyCommon` Jobs APIs [#2139](https://github.com/zowe/zowe-cli/pull/2139) diff --git a/packages/zosjobs/__tests__/__unit__/DownloadJobs.unit.test.ts b/packages/zosjobs/__tests__/__unit__/DownloadJobs.unit.test.ts index e226f35cad..9f8497ca1a 100644 --- a/packages/zosjobs/__tests__/__unit__/DownloadJobs.unit.test.ts +++ b/packages/zosjobs/__tests__/__unit__/DownloadJobs.unit.test.ts @@ -103,6 +103,10 @@ describe("DownloadJobs", () => { describe("downloadAllSpoolContentCommon", () => { it("should allow users to call downloadAllSpoolContentCommon with correct parameters", async () => { + let uri: string = ""; + ZosmfRestClient.getStreamed = jest.fn(async (session: AbstractSession, resource: string, reqHeaders?: any[]): Promise => { + uri = resource; + }); const allSpoolParms: IDownloadAllSpoolContentParms = { jobid: fakeJobID, jobname: fakeJobName, @@ -116,6 +120,7 @@ describe("DownloadJobs", () => { expect(GetJobs.getSpoolFiles).toHaveBeenCalled(); expect(IO.createDirsSyncFromFilePath).toHaveBeenCalledWith(expectedFile); + expect(uri).not.toContain("fileEncoding"); }); it("should allow users to call downloadAllSpoolContentCommon with correct parameters and binary mode", async () => { From 96c1d2be7e046e2427aaf428f2ee119eed0900f6 Mon Sep 17 00:00:00 2001 From: Timothy Johnson Date: Mon, 10 Jun 2024 08:09:50 -0400 Subject: [PATCH 28/29] Fix behavior of Get APIs for empty files Signed-off-by: Timothy Johnson --- packages/zosfiles/CHANGELOG.md | 4 ++ .../__unit__/methods/get/Get.unit.test.ts | 52 +++++++++++++++++++ packages/zosfiles/src/methods/get/Get.ts | 4 +- 3 files changed, 58 insertions(+), 2 deletions(-) diff --git a/packages/zosfiles/CHANGELOG.md b/packages/zosfiles/CHANGELOG.md index 5579224aa1..d9ec1d8840 100644 --- a/packages/zosfiles/CHANGELOG.md +++ b/packages/zosfiles/CHANGELOG.md @@ -2,6 +2,10 @@ All notable changes to the Zowe z/OS files SDK package will be documented in this file. +## Recent Changes + +- BugFix: Fixed `Get.dataSet` and `Get.USSFile` methods so that they return an empty buffer instead of null for empty files. [#2173](https://github.com/zowe/zowe-cli/pull/2173) + ## `7.26.0` - BugFix: Fixed error where `Get.dataSet` and `Get.USSFile` methods could silently fail when downloading large data sets or files. [#2167](https://github.com/zowe/zowe-cli/pull/2167) diff --git a/packages/zosfiles/__tests__/__unit__/methods/get/Get.unit.test.ts b/packages/zosfiles/__tests__/__unit__/methods/get/Get.unit.test.ts index 077ef6389c..be310e301a 100644 --- a/packages/zosfiles/__tests__/__unit__/methods/get/Get.unit.test.ts +++ b/packages/zosfiles/__tests__/__unit__/methods/get/Get.unit.test.ts @@ -109,6 +109,32 @@ describe("z/OS Files - View", () => { })); }); + it("should get data set content when empty", async () => { + let response; + let caughtError; + zosmfExpectSpy.mockImplementationOnce(async (_session, options) => { + options.responseStream?.end(); + return {}; + }); + + try { + response = await Get.dataSet(dummySession, dsname); + } catch (e) { + caughtError = e; + } + + const endpoint = posix.join(ZosFilesConstants.RESOURCE, ZosFilesConstants.RES_DS_FILES, dsname); + + expect(caughtError).toBeUndefined(); + expect(response).toEqual(Buffer.alloc(0)); + + expect(zosmfExpectSpy).toHaveBeenCalledTimes(1); + expect(zosmfExpectSpy).toHaveBeenCalledWith(dummySession, expect.objectContaining({ + reqHeaders: [ZosmfHeaders.ACCEPT_ENCODING, ZosmfHeaders.TEXT_PLAIN], + resource: endpoint + })); + }); + it("should get data set content in binary mode", async () => { let response; let caughtError; @@ -369,6 +395,32 @@ describe("z/OS Files - View", () => { })); }); + it("should get uss file content when empty", async () => { + let response; + let caughtError; + zosmfExpectSpy.mockImplementationOnce(async (_session, options) => { + options.responseStream?.end(); + return {}; + }); + + try { + response = await Get.USSFile(dummySession, ussfile); + } catch (e) { + caughtError = e; + } + + const endpoint = posix.join(ZosFilesConstants.RESOURCE, ZosFilesConstants.RES_USS_FILES, ussfile); + + expect(caughtError).toBeUndefined(); + expect(response).toEqual(Buffer.alloc(0)); + + expect(zosmfExpectSpy).toHaveBeenCalledTimes(1); + expect(zosmfExpectSpy).toHaveBeenCalledWith(dummySession, expect.objectContaining({ + reqHeaders: [ZosmfHeaders.ACCEPT_ENCODING, ZosmfHeaders.TEXT_PLAIN], + resource: endpoint + })); + }); + it("should get uss file content in binary mode", async () => { let response; let caughtError; diff --git a/packages/zosfiles/src/methods/get/Get.ts b/packages/zosfiles/src/methods/get/Get.ts index cb09e989c0..8996fefeca 100644 --- a/packages/zosfiles/src/methods/get/Get.ts +++ b/packages/zosfiles/src/methods/get/Get.ts @@ -40,7 +40,7 @@ export class Get { ...options, stream: responseStream }); - return responseStream.read(); + return responseStream.read() ?? Buffer.alloc(0); } /** @@ -64,6 +64,6 @@ export class Get { ...options, stream: responseStream }); - return responseStream.read(); + return responseStream.read() ?? Buffer.alloc(0); } } From ad18d098fc2b2586d18aeb8a55ef82c69dffdcba Mon Sep 17 00:00:00 2001 From: zowe-robot Date: Tue, 11 Jun 2024 13:33:14 +0000 Subject: [PATCH 29/29] Bump version to 7.26.1 [ci skip] Signed-off-by: zowe-robot --- lerna.json | 2 +- npm-shrinkwrap.json | 28 ++++++++++++++-------------- packages/cli/package.json | 8 ++++---- packages/workflows/package.json | 4 ++-- packages/zosfiles/CHANGELOG.md | 2 +- packages/zosfiles/package.json | 2 +- packages/zosjobs/CHANGELOG.md | 2 +- packages/zosjobs/package.json | 4 ++-- 8 files changed, 26 insertions(+), 26 deletions(-) diff --git a/lerna.json b/lerna.json index b72a6dd1c7..ec4f9b6720 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "7.26.0", + "version": "7.26.1", "command": { "publish": { "ignoreChanges": [ diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json index 3d1ce216e6..d67e973014 100644 --- a/npm-shrinkwrap.json +++ b/npm-shrinkwrap.json @@ -20503,7 +20503,7 @@ }, "packages/cli": { "name": "@zowe/cli", - "version": "7.26.0", + "version": "7.26.1", "hasInstallScript": true, "license": "EPL-2.0", "dependencies": { @@ -20511,12 +20511,12 @@ "@zowe/imperative": "5.24.0", "@zowe/provisioning-for-zowe-sdk": "7.25.2", "@zowe/zos-console-for-zowe-sdk": "7.25.2", - "@zowe/zos-files-for-zowe-sdk": "7.26.0", - "@zowe/zos-jobs-for-zowe-sdk": "7.26.0", + "@zowe/zos-files-for-zowe-sdk": "7.26.1", + "@zowe/zos-jobs-for-zowe-sdk": "7.26.1", "@zowe/zos-logs-for-zowe-sdk": "7.25.2", "@zowe/zos-tso-for-zowe-sdk": "7.25.2", "@zowe/zos-uss-for-zowe-sdk": "7.24.3", - "@zowe/zos-workflows-for-zowe-sdk": "7.26.0", + "@zowe/zos-workflows-for-zowe-sdk": "7.26.1", "@zowe/zosmf-for-zowe-sdk": "7.25.2", "find-process": "1.4.7", "get-stream": "6.0.1", @@ -20957,10 +20957,10 @@ }, "packages/workflows": { "name": "@zowe/zos-workflows-for-zowe-sdk", - "version": "7.26.0", + "version": "7.26.1", "license": "EPL-2.0", "dependencies": { - "@zowe/zos-files-for-zowe-sdk": "7.26.0" + "@zowe/zos-files-for-zowe-sdk": "7.26.1" }, "devDependencies": { "@zowe/cli-test-utils": "7.24.3", @@ -20988,7 +20988,7 @@ }, "packages/zosfiles": { "name": "@zowe/zos-files-for-zowe-sdk", - "version": "7.26.0", + "version": "7.26.1", "license": "EPL-2.0", "dependencies": { "minimatch": "5.0.1" @@ -21025,10 +21025,10 @@ }, "packages/zosjobs": { "name": "@zowe/zos-jobs-for-zowe-sdk", - "version": "7.26.0", + "version": "7.26.1", "license": "EPL-2.0", "dependencies": { - "@zowe/zos-files-for-zowe-sdk": "7.26.0" + "@zowe/zos-files-for-zowe-sdk": "7.26.1" }, "devDependencies": { "@zowe/cli-test-utils": "7.24.3", @@ -25791,12 +25791,12 @@ "@zowe/provisioning-for-zowe-sdk": "7.25.2", "@zowe/secrets-for-zowe-sdk": "7.18.6", "@zowe/zos-console-for-zowe-sdk": "7.25.2", - "@zowe/zos-files-for-zowe-sdk": "7.26.0", - "@zowe/zos-jobs-for-zowe-sdk": "7.26.0", + "@zowe/zos-files-for-zowe-sdk": "7.26.1", + "@zowe/zos-jobs-for-zowe-sdk": "7.26.1", "@zowe/zos-logs-for-zowe-sdk": "7.25.2", "@zowe/zos-tso-for-zowe-sdk": "7.25.2", "@zowe/zos-uss-for-zowe-sdk": "7.24.3", - "@zowe/zos-workflows-for-zowe-sdk": "7.26.0", + "@zowe/zos-workflows-for-zowe-sdk": "7.26.1", "@zowe/zosmf-for-zowe-sdk": "7.25.2", "comment-json": "^4.1.1", "find-process": "1.4.7", @@ -26166,7 +26166,7 @@ "@zowe/cli-test-utils": "7.24.3", "@zowe/core-for-zowe-sdk": "7.25.2", "@zowe/imperative": "5.24.0", - "@zowe/zos-files-for-zowe-sdk": "7.26.0" + "@zowe/zos-files-for-zowe-sdk": "7.26.1" } }, "@zowe/zos-logs-for-zowe-sdk": { @@ -26201,7 +26201,7 @@ "@zowe/cli-test-utils": "7.24.3", "@zowe/core-for-zowe-sdk": "7.25.2", "@zowe/imperative": "5.24.0", - "@zowe/zos-files-for-zowe-sdk": "7.26.0" + "@zowe/zos-files-for-zowe-sdk": "7.26.1" } }, "@zowe/zosmf-for-zowe-sdk": { diff --git a/packages/cli/package.json b/packages/cli/package.json index 9680dfdd87..1068e1cde7 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -1,6 +1,6 @@ { "name": "@zowe/cli", - "version": "7.26.0", + "version": "7.26.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", @@ -62,12 +62,12 @@ "@zowe/imperative": "5.24.0", "@zowe/provisioning-for-zowe-sdk": "7.25.2", "@zowe/zos-console-for-zowe-sdk": "7.25.2", - "@zowe/zos-files-for-zowe-sdk": "7.26.0", - "@zowe/zos-jobs-for-zowe-sdk": "7.26.0", + "@zowe/zos-files-for-zowe-sdk": "7.26.1", + "@zowe/zos-jobs-for-zowe-sdk": "7.26.1", "@zowe/zos-logs-for-zowe-sdk": "7.25.2", "@zowe/zos-tso-for-zowe-sdk": "7.25.2", "@zowe/zos-uss-for-zowe-sdk": "7.24.3", - "@zowe/zos-workflows-for-zowe-sdk": "7.26.0", + "@zowe/zos-workflows-for-zowe-sdk": "7.26.1", "@zowe/zosmf-for-zowe-sdk": "7.25.2", "find-process": "1.4.7", "get-stream": "6.0.1", diff --git a/packages/workflows/package.json b/packages/workflows/package.json index ce8b5e3412..a296127778 100644 --- a/packages/workflows/package.json +++ b/packages/workflows/package.json @@ -1,6 +1,6 @@ { "name": "@zowe/zos-workflows-for-zowe-sdk", - "version": "7.26.0", + "version": "7.26.1", "description": "Zowe SDK to interact with the z/OS workflows APIs", "author": "Zowe", "license": "EPL-2.0", @@ -45,7 +45,7 @@ "prepack": "node ../../scripts/prepareLicenses.js" }, "dependencies": { - "@zowe/zos-files-for-zowe-sdk": "7.26.0" + "@zowe/zos-files-for-zowe-sdk": "7.26.1" }, "devDependencies": { "@zowe/cli-test-utils": "7.24.3", diff --git a/packages/zosfiles/CHANGELOG.md b/packages/zosfiles/CHANGELOG.md index d9ec1d8840..5579345ebc 100644 --- a/packages/zosfiles/CHANGELOG.md +++ b/packages/zosfiles/CHANGELOG.md @@ -2,7 +2,7 @@ All notable changes to the Zowe z/OS files SDK package will be documented in this file. -## Recent Changes +## `7.26.1` - BugFix: Fixed `Get.dataSet` and `Get.USSFile` methods so that they return an empty buffer instead of null for empty files. [#2173](https://github.com/zowe/zowe-cli/pull/2173) diff --git a/packages/zosfiles/package.json b/packages/zosfiles/package.json index 74db32acc6..07cddb6e50 100644 --- a/packages/zosfiles/package.json +++ b/packages/zosfiles/package.json @@ -1,6 +1,6 @@ { "name": "@zowe/zos-files-for-zowe-sdk", - "version": "7.26.0", + "version": "7.26.1", "description": "Zowe SDK to interact with files and data sets on z/OS", "author": "Zowe", "license": "EPL-2.0", diff --git a/packages/zosjobs/CHANGELOG.md b/packages/zosjobs/CHANGELOG.md index 76a381b282..18cb80b765 100644 --- a/packages/zosjobs/CHANGELOG.md +++ b/packages/zosjobs/CHANGELOG.md @@ -2,7 +2,7 @@ All notable changes to the Zowe z/OS jobs SDK package will be documented in this file. -## Recent Changes +## `7.26.1` - BugFix: Fixed error in `DownloadJobs.downloadSpoolContentCommon` method when encoding parameter is not specified. [#2173](https://github.com/zowe/zowe-cli/pull/2173) diff --git a/packages/zosjobs/package.json b/packages/zosjobs/package.json index 7ef9576ad7..d186c6ab7c 100644 --- a/packages/zosjobs/package.json +++ b/packages/zosjobs/package.json @@ -1,6 +1,6 @@ { "name": "@zowe/zos-jobs-for-zowe-sdk", - "version": "7.26.0", + "version": "7.26.1", "description": "Zowe SDK to interact with jobs on z/OS", "author": "Zowe", "license": "EPL-2.0", @@ -46,7 +46,7 @@ "prepack": "node ../../scripts/prepareLicenses.js" }, "dependencies": { - "@zowe/zos-files-for-zowe-sdk": "7.26.0" + "@zowe/zos-files-for-zowe-sdk": "7.26.1" }, "devDependencies": { "@zowe/cli-test-utils": "7.24.3",