From f8fb9627c2fc60cf163103ab582e282aa6cc250c Mon Sep 17 00:00:00 2001 From: "Andrew W. Harn" Date: Tue, 28 Nov 2023 15:23:07 +0000 Subject: [PATCH 001/138] Migrate and add utility Signed-off-by: Andrew W. Harn --- .../cli/src/zosfiles/copy/ds/Ds.handler.ts | 7 +++--- .../src/zosfiles/copy/dsclp/Dsclp.handler.ts | 7 +++--- packages/zosfiles/CHANGELOG.md | 4 ++++ .../__unit__/utils/ZosFilesUtils.unit.test.ts | 23 +++++++++++++++++++ packages/zosfiles/src/utils/ZosFilesUtils.ts | 19 +++++++++++++++ 5 files changed, 52 insertions(+), 8 deletions(-) diff --git a/packages/cli/src/zosfiles/copy/ds/Ds.handler.ts b/packages/cli/src/zosfiles/copy/ds/Ds.handler.ts index a3b0efb0f2..47a21cfb62 100644 --- a/packages/cli/src/zosfiles/copy/ds/Ds.handler.ts +++ b/packages/cli/src/zosfiles/copy/ds/Ds.handler.ts @@ -10,17 +10,16 @@ */ import { AbstractSession, IHandlerParameters } from "@zowe/imperative"; -import { Copy, IZosFilesResponse, IDataSet, ICopyDatasetOptions } from "@zowe/zos-files-for-zowe-sdk"; +import { Copy, IZosFilesResponse, IDataSet, ICopyDatasetOptions, ZosFilesUtils } from "@zowe/zos-files-for-zowe-sdk"; import { ZosFilesBaseHandler } from "../../ZosFilesBase.handler"; -import { getDataSet } from "../../ZosFiles.utils"; /** * Handler to copy a data set. */ export default class DsHandler extends ZosFilesBaseHandler { public async processWithSession(commandParameters: IHandlerParameters, session: AbstractSession): Promise { - const fromDataSet: IDataSet = getDataSet(commandParameters.arguments.fromDataSetName); - const toDataSet: IDataSet = getDataSet(commandParameters.arguments.toDataSetName); + const fromDataSet: IDataSet = ZosFilesUtils.getDataSetFromName(commandParameters.arguments.fromDataSetName); + const toDataSet: IDataSet = ZosFilesUtils.getDataSetFromName(commandParameters.arguments.toDataSetName); const options: ICopyDatasetOptions = { "from-dataset": fromDataSet, enq: commandParameters.arguments.enq, diff --git a/packages/cli/src/zosfiles/copy/dsclp/Dsclp.handler.ts b/packages/cli/src/zosfiles/copy/dsclp/Dsclp.handler.ts index 5aa488f417..f8873e1234 100644 --- a/packages/cli/src/zosfiles/copy/dsclp/Dsclp.handler.ts +++ b/packages/cli/src/zosfiles/copy/dsclp/Dsclp.handler.ts @@ -10,9 +10,8 @@ */ import { AbstractSession, IHandlerParameters, IHandlerResponseConsoleApi, Session } from "@zowe/imperative"; -import { Copy, ICrossLparCopyDatasetOptions, IDataSet, IGetOptions, IZosFilesResponse } from "@zowe/zos-files-for-zowe-sdk"; +import { Copy, ICrossLparCopyDatasetOptions, IDataSet, IGetOptions, IZosFilesResponse, ZosFilesUtils } from "@zowe/zos-files-for-zowe-sdk"; import { ZosFilesBaseHandler } from "../../ZosFilesBase.handler"; -import { getDataSet } from "../../ZosFiles.utils"; /** * Handler to copy a data set. @@ -20,8 +19,8 @@ import { getDataSet } from "../../ZosFiles.utils"; export default class DsclpHandler extends ZosFilesBaseHandler { public async processWithSession(commandParameters: IHandlerParameters, session: AbstractSession): Promise { - const sourceDataset: IDataSet = getDataSet(commandParameters.arguments.fromDataSetName); - const targetDataset: IDataSet = getDataSet(commandParameters.arguments.toDataSetName); + const sourceDataset: IDataSet = ZosFilesUtils.getDataSetFromName(commandParameters.arguments.fromDataSetName); + const targetDataset: IDataSet = ZosFilesUtils.getDataSetFromName(commandParameters.arguments.toDataSetName); const options: ICrossLparCopyDatasetOptions = { "from-dataset": sourceDataset, diff --git a/packages/zosfiles/CHANGELOG.md b/packages/zosfiles/CHANGELOG.md index c16df26fc5..b5056f9d6f 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 + +- Deprecated: Deprecated `getDataSet` from the `zosfiles` command group. Use the `zosfiles` SDK's `ZosFilesUtils.getDataSetFromName` instead [#1696](https://github.com/zowe/zowe-cli/issues/1696) + ## `7.18.9` - BugFix: Fix behavior where a specified directory was being lowercased on non-PDS datasets when downloading all datasets [#1722](https://github.com/zowe/zowe-cli/issues/1722) diff --git a/packages/zosfiles/__tests__/__unit__/utils/ZosFilesUtils.unit.test.ts b/packages/zosfiles/__tests__/__unit__/utils/ZosFilesUtils.unit.test.ts index 6e200dec6d..4921b64e13 100644 --- a/packages/zosfiles/__tests__/__unit__/utils/ZosFilesUtils.unit.test.ts +++ b/packages/zosfiles/__tests__/__unit__/utils/ZosFilesUtils.unit.test.ts @@ -15,6 +15,7 @@ import { IO } from "@zowe/imperative"; import { ZosFilesUtils } from "../../../src/utils/ZosFilesUtils"; import { ZosFilesConstants } from "../../../src/constants/ZosFiles.constants"; import { ZosFilesMessages } from "../../../src/constants/ZosFiles.messages"; +import { IDataSet } from "../../../src/doc/IDataSet"; jest.mock("fs"); @@ -210,4 +211,26 @@ describe("ZosFilesUtils", () => { }); }); + describe("getDataSetFromName", () => { + it("should generate an IDataSet for a dataset", () => { + const dataSetName = "SYS1.PARMLIB"; + const expectedResult: IDataSet = { + dsn: "SYS1.PARMLIB", + member: undefined + }; + + expect(ZosFilesUtils.getDataSetFromName(dataSetName)).toEqual(expectedResult); + }); + + it("should generate an IDataSet for a partitioned dataset", () => { + const dataSetName = "SYS1.PARMLIB(SOMEMEM)"; + const expectedResult: IDataSet = { + dsn: "SYS1.PARMLIB", + member: "SOMEMEM" + }; + + expect(ZosFilesUtils.getDataSetFromName(dataSetName)).toEqual(expectedResult); + }); + }); + }); diff --git a/packages/zosfiles/src/utils/ZosFilesUtils.ts b/packages/zosfiles/src/utils/ZosFilesUtils.ts index 6ab0764926..eb73f879a4 100644 --- a/packages/zosfiles/src/utils/ZosFilesUtils.ts +++ b/packages/zosfiles/src/utils/ZosFilesUtils.ts @@ -18,6 +18,7 @@ import { IZosFilesResponse } from "../doc/IZosFilesResponse"; import { ZosmfRestClient, ZosmfHeaders } from "@zowe/core-for-zowe-sdk"; import { IDeleteOptions } from "../methods/hDelete"; import { IOptions } from "../doc/IOptions"; +import { IDataSet } from "../doc/IDataSet"; /** * Common IO utilities @@ -275,4 +276,22 @@ export class ZosFilesUtils { throw error; } } + + /** + * Converts the name of a data set to an IDataSet + * @param {string} name - the name in the form USER.DATA.SET | USER.DATA.SET(mem1) + */ + public static getDataSetFromName(name: string): IDataSet { + const parts = name.replace(')', '').split('('); + if (parts.length > 1) { + return { + dsn: parts[0], + member: parts[1] + }; + } else { + return { + dsn: name + }; + } + } } From 075fb71cd03e13243c687bd2841681b760d50510 Mon Sep 17 00:00:00 2001 From: "Andrew W. Harn" Date: Tue, 28 Nov 2023 15:31:53 +0000 Subject: [PATCH 002/138] Add deprecation message and update changelog Signed-off-by: Andrew W. Harn --- packages/cli/src/zosfiles/ZosFiles.utils.ts | 1 + packages/zosfiles/CHANGELOG.md | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/cli/src/zosfiles/ZosFiles.utils.ts b/packages/cli/src/zosfiles/ZosFiles.utils.ts index 2ab6e8dd37..9958461ca2 100644 --- a/packages/cli/src/zosfiles/ZosFiles.utils.ts +++ b/packages/cli/src/zosfiles/ZosFiles.utils.ts @@ -14,6 +14,7 @@ import { IDataSet } from "@zowe/zos-files-for-zowe-sdk"; /** + * @deprecated - use @zowe/zos-files-for-zowe-sdk's ZosFilesUtils.getDataSetFromName instead * Converts the name of a data set to an IDataSet * @param {string} name - the name in the form USER.DATA.SET | USER.DATA.SET(mem1) */ diff --git a/packages/zosfiles/CHANGELOG.md b/packages/zosfiles/CHANGELOG.md index b5056f9d6f..b14985b5a4 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 -- Deprecated: Deprecated `getDataSet` from the `zosfiles` command group. Use the `zosfiles` SDK's `ZosFilesUtils.getDataSetFromName` instead [#1696](https://github.com/zowe/zowe-cli/issues/1696) +- Enhancement: Adds `ZosFilesUtils.getDataSetFromName` to create an IDataSet from a dataset name [#1696](https://github.com/zowe/zowe-cli/issues/1696) ## `7.18.9` From 2c81b5239787b9f5f8c8b46a85dccc46570c81f1 Mon Sep 17 00:00:00 2001 From: "Andrew W. Harn" Date: Tue, 28 Nov 2023 15:43:51 +0000 Subject: [PATCH 003/138] Add missing changelog Signed-off-by: Andrew W. Harn --- packages/cli/CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/packages/cli/CHANGELOG.md b/packages/cli/CHANGELOG.md index c47e724f55..cdcc6c4de9 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 + +- Deprecated: `getDataSet` in the `zosfiles` command group utility functions, use `zosfiles` SDK's `ZosFilesUtils.getDataSetFromName` instead. [#1696](https://github.com/zowe/zowe-cli/issues/1696) + ## `7.18.10` - BugFix: Added missing z/OSMF connection options to the z/OS Logs command group. From 67d5bac9c00be38704bb2bc23b0cabc4613c2153 Mon Sep 17 00:00:00 2001 From: "Andrew W. Harn" Date: Tue, 28 Nov 2023 18:02:55 +0000 Subject: [PATCH 004/138] Make requested change Signed-off-by: Andrew W. Harn --- packages/cli/src/zosfiles/ZosFiles.utils.ts | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/packages/cli/src/zosfiles/ZosFiles.utils.ts b/packages/cli/src/zosfiles/ZosFiles.utils.ts index 9958461ca2..a61f9b8508 100644 --- a/packages/cli/src/zosfiles/ZosFiles.utils.ts +++ b/packages/cli/src/zosfiles/ZosFiles.utils.ts @@ -11,7 +11,7 @@ // We are using arguments as an expected input to the function. Thus there is no generated code // so we can ignore this linting error. -import { IDataSet } from "@zowe/zos-files-for-zowe-sdk"; +import { IDataSet, ZosFilesUtils } from "@zowe/zos-files-for-zowe-sdk"; /** * @deprecated - use @zowe/zos-files-for-zowe-sdk's ZosFilesUtils.getDataSetFromName instead @@ -19,15 +19,5 @@ import { IDataSet } from "@zowe/zos-files-for-zowe-sdk"; * @param {string} name - the name in the form USER.DATA.SET | USER.DATA.SET(mem1) */ export function getDataSet(name: string): IDataSet { - const parts = name.replace(')', '').split('('); - if (parts.length > 1) { - return { - dsn: parts[0], - member: parts[1] - }; - } else { - return { - dsn: name - }; - } + return ZosFilesUtils.getDataSetFromName(name); } From 84ead1b03f26c71034e613e292777ed2eeb7b680 Mon Sep 17 00:00:00 2001 From: "Andrew W. Harn" Date: Tue, 28 Nov 2023 18:06:14 +0000 Subject: [PATCH 005/138] Update typo in readme Signed-off-by: Andrew W. Harn --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 1c90fe8cf6..32abd3e9dc 100644 --- a/README.md +++ b/README.md @@ -208,4 +208,4 @@ Don't see what you're looking for? Browse questions from the community or ask yo Zowe CLI is a component of the Zowe Open Mainframe Project, part of the Linux Foundation. -To learn more about how Zowe is structured and governed, see the [Technical Steering Committee Strucutre and Governance documentation](https://github.com/zowe/community/blob/master/Technical-Steering-Committee/tsc-governance.md). +To learn more about how Zowe is structured and governed, see the [Technical Steering Committee Structure and Governance documentation](https://github.com/zowe/community/blob/master/Technical-Steering-Committee/tsc-governance.md). From 3fd366327769bf619637441c49d28f06f7d6f87d Mon Sep 17 00:00:00 2001 From: zowe-robot Date: Tue, 28 Nov 2023 19:44:49 +0000 Subject: [PATCH 006/138] Bump version to 7.20.0 [ci skip] Signed-off-by: zowe-robot --- lerna.json | 2 +- npm-shrinkwrap.json | 28 ++++++++++++++-------------- packages/cli/CHANGELOG.md | 2 +- packages/cli/package.json | 8 ++++---- packages/workflows/package.json | 4 ++-- packages/zosfiles/CHANGELOG.md | 2 +- packages/zosfiles/package.json | 2 +- packages/zosjobs/package.json | 4 ++-- 8 files changed, 26 insertions(+), 26 deletions(-) diff --git a/lerna.json b/lerna.json index 564a2db19c..379c0aea60 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "7.19.0", + "version": "7.20.0", "command": { "publish": { "ignoreChanges": [ diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json index 368842a656..6a069607fb 100644 --- a/npm-shrinkwrap.json +++ b/npm-shrinkwrap.json @@ -24704,7 +24704,7 @@ }, "packages/cli": { "name": "@zowe/cli", - "version": "7.19.0", + "version": "7.20.0", "hasInstallScript": true, "license": "EPL-2.0", "dependencies": { @@ -24712,12 +24712,12 @@ "@zowe/imperative": "5.19.0", "@zowe/provisioning-for-zowe-sdk": "7.19.0", "@zowe/zos-console-for-zowe-sdk": "7.19.0", - "@zowe/zos-files-for-zowe-sdk": "7.19.0", - "@zowe/zos-jobs-for-zowe-sdk": "7.19.0", + "@zowe/zos-files-for-zowe-sdk": "7.20.0", + "@zowe/zos-jobs-for-zowe-sdk": "7.20.0", "@zowe/zos-logs-for-zowe-sdk": "7.19.0", "@zowe/zos-tso-for-zowe-sdk": "7.19.0", "@zowe/zos-uss-for-zowe-sdk": "7.19.0", - "@zowe/zos-workflows-for-zowe-sdk": "7.19.0", + "@zowe/zos-workflows-for-zowe-sdk": "7.20.0", "@zowe/zosmf-for-zowe-sdk": "7.19.0", "find-process": "1.4.7", "get-stream": "6.0.1", @@ -25161,10 +25161,10 @@ }, "packages/workflows": { "name": "@zowe/zos-workflows-for-zowe-sdk", - "version": "7.19.0", + "version": "7.20.0", "license": "EPL-2.0", "dependencies": { - "@zowe/zos-files-for-zowe-sdk": "7.19.0" + "@zowe/zos-files-for-zowe-sdk": "7.20.0" }, "devDependencies": { "@zowe/cli-test-utils": "7.19.0", @@ -25192,7 +25192,7 @@ }, "packages/zosfiles": { "name": "@zowe/zos-files-for-zowe-sdk", - "version": "7.19.0", + "version": "7.20.0", "license": "EPL-2.0", "dependencies": { "get-stream": "6.0.1", @@ -25230,10 +25230,10 @@ }, "packages/zosjobs": { "name": "@zowe/zos-jobs-for-zowe-sdk", - "version": "7.19.0", + "version": "7.20.0", "license": "EPL-2.0", "dependencies": { - "@zowe/zos-files-for-zowe-sdk": "7.19.0" + "@zowe/zos-files-for-zowe-sdk": "7.20.0" }, "devDependencies": { "@zowe/cli-test-utils": "7.19.0", @@ -31980,12 +31980,12 @@ "@zowe/provisioning-for-zowe-sdk": "7.19.0", "@zowe/secrets-for-zowe-sdk": "7.18.6", "@zowe/zos-console-for-zowe-sdk": "7.19.0", - "@zowe/zos-files-for-zowe-sdk": "7.19.0", - "@zowe/zos-jobs-for-zowe-sdk": "7.19.0", + "@zowe/zos-files-for-zowe-sdk": "7.20.0", + "@zowe/zos-jobs-for-zowe-sdk": "7.20.0", "@zowe/zos-logs-for-zowe-sdk": "7.19.0", "@zowe/zos-tso-for-zowe-sdk": "7.19.0", "@zowe/zos-uss-for-zowe-sdk": "7.19.0", - "@zowe/zos-workflows-for-zowe-sdk": "7.19.0", + "@zowe/zos-workflows-for-zowe-sdk": "7.20.0", "@zowe/zosmf-for-zowe-sdk": "7.19.0", "comment-json": "^4.1.1", "find-process": "1.4.7", @@ -32356,7 +32356,7 @@ "@zowe/cli-test-utils": "7.19.0", "@zowe/core-for-zowe-sdk": "7.19.0", "@zowe/imperative": "5.19.0", - "@zowe/zos-files-for-zowe-sdk": "7.19.0" + "@zowe/zos-files-for-zowe-sdk": "7.20.0" } }, "@zowe/zos-logs-for-zowe-sdk": { @@ -32391,7 +32391,7 @@ "@zowe/cli-test-utils": "7.19.0", "@zowe/core-for-zowe-sdk": "7.19.0", "@zowe/imperative": "5.19.0", - "@zowe/zos-files-for-zowe-sdk": "7.19.0" + "@zowe/zos-files-for-zowe-sdk": "7.20.0" } }, "@zowe/zosmf-for-zowe-sdk": { diff --git a/packages/cli/CHANGELOG.md b/packages/cli/CHANGELOG.md index cdcc6c4de9..97da9e10cd 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.20.0` - Deprecated: `getDataSet` in the `zosfiles` command group utility functions, use `zosfiles` SDK's `ZosFilesUtils.getDataSetFromName` instead. [#1696](https://github.com/zowe/zowe-cli/issues/1696) diff --git a/packages/cli/package.json b/packages/cli/package.json index b3d70ae14c..487775c3b9 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -1,6 +1,6 @@ { "name": "@zowe/cli", - "version": "7.19.0", + "version": "7.20.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", @@ -61,12 +61,12 @@ "@zowe/imperative": "5.19.0", "@zowe/provisioning-for-zowe-sdk": "7.19.0", "@zowe/zos-console-for-zowe-sdk": "7.19.0", - "@zowe/zos-files-for-zowe-sdk": "7.19.0", - "@zowe/zos-jobs-for-zowe-sdk": "7.19.0", + "@zowe/zos-files-for-zowe-sdk": "7.20.0", + "@zowe/zos-jobs-for-zowe-sdk": "7.20.0", "@zowe/zos-logs-for-zowe-sdk": "7.19.0", "@zowe/zos-tso-for-zowe-sdk": "7.19.0", "@zowe/zos-uss-for-zowe-sdk": "7.19.0", - "@zowe/zos-workflows-for-zowe-sdk": "7.19.0", + "@zowe/zos-workflows-for-zowe-sdk": "7.20.0", "@zowe/zosmf-for-zowe-sdk": "7.19.0", "find-process": "1.4.7", "get-stream": "6.0.1", diff --git a/packages/workflows/package.json b/packages/workflows/package.json index 142d335dab..6d11ff510e 100644 --- a/packages/workflows/package.json +++ b/packages/workflows/package.json @@ -1,6 +1,6 @@ { "name": "@zowe/zos-workflows-for-zowe-sdk", - "version": "7.19.0", + "version": "7.20.0", "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.19.0" + "@zowe/zos-files-for-zowe-sdk": "7.20.0" }, "devDependencies": { "@zowe/cli-test-utils": "7.19.0", diff --git a/packages/zosfiles/CHANGELOG.md b/packages/zosfiles/CHANGELOG.md index b14985b5a4..820b85bec7 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.20.0` - Enhancement: Adds `ZosFilesUtils.getDataSetFromName` to create an IDataSet from a dataset name [#1696](https://github.com/zowe/zowe-cli/issues/1696) diff --git a/packages/zosfiles/package.json b/packages/zosfiles/package.json index f43d0b82ad..578f1bf276 100644 --- a/packages/zosfiles/package.json +++ b/packages/zosfiles/package.json @@ -1,6 +1,6 @@ { "name": "@zowe/zos-files-for-zowe-sdk", - "version": "7.19.0", + "version": "7.20.0", "description": "Zowe SDK to interact with files and data sets on z/OS", "author": "Zowe", "license": "EPL-2.0", diff --git a/packages/zosjobs/package.json b/packages/zosjobs/package.json index 45bad21ee4..1723ca473a 100644 --- a/packages/zosjobs/package.json +++ b/packages/zosjobs/package.json @@ -1,6 +1,6 @@ { "name": "@zowe/zos-jobs-for-zowe-sdk", - "version": "7.19.0", + "version": "7.20.0", "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.19.0" + "@zowe/zos-files-for-zowe-sdk": "7.20.0" }, "devDependencies": { "@zowe/cli-test-utils": "7.19.0", From 108b5dacfa41ad495ef039b05e158c564279d610 Mon Sep 17 00:00:00 2001 From: Timothy Johnson Date: Wed, 29 Nov 2023 16:00:04 -0500 Subject: [PATCH 007/138] Add missing shrinkwrap Signed-off-by: Timothy Johnson --- packages/cli/CHANGELOG.md | 4 ++++ packages/cli/package.json | 1 + 2 files changed, 5 insertions(+) diff --git a/packages/cli/CHANGELOG.md b/packages/cli/CHANGELOG.md index 97da9e10cd..5e9088b24e 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: Add missing npm-shrinkwrap + ## `7.20.0` - Deprecated: `getDataSet` in the `zosfiles` command group utility functions, use `zosfiles` SDK's `ZosFilesUtils.getDataSetFromName` instead. [#1696](https://github.com/zowe/zowe-cli/issues/1696) diff --git a/packages/cli/package.json b/packages/cli/package.json index 487775c3b9..d71b28eadb 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -31,6 +31,7 @@ "lib", "prebuilds", "scripts", + "npm-shrinkwrap.json", "web-help-logo.png" ], "publishConfig": { From c27fa66f83c411141c0c7f6032b13b99c4a65fe5 Mon Sep 17 00:00:00 2001 From: zowe-robot Date: Wed, 29 Nov 2023 23:56:16 +0000 Subject: [PATCH 008/138] Bump version to 7.20.1 [ci skip] Signed-off-by: zowe-robot --- lerna.json | 2 +- npm-shrinkwrap.json | 2 +- packages/cli/CHANGELOG.md | 2 +- packages/cli/package.json | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/lerna.json b/lerna.json index 379c0aea60..12ff470699 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "7.20.0", + "version": "7.20.1", "command": { "publish": { "ignoreChanges": [ diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json index 6a069607fb..cafb5c3f61 100644 --- a/npm-shrinkwrap.json +++ b/npm-shrinkwrap.json @@ -24704,7 +24704,7 @@ }, "packages/cli": { "name": "@zowe/cli", - "version": "7.20.0", + "version": "7.20.1", "hasInstallScript": true, "license": "EPL-2.0", "dependencies": { diff --git a/packages/cli/CHANGELOG.md b/packages/cli/CHANGELOG.md index 5e9088b24e..7ec80fb818 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.20.1` - BugFix: Add missing npm-shrinkwrap diff --git a/packages/cli/package.json b/packages/cli/package.json index d71b28eadb..31e940b82c 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -1,6 +1,6 @@ { "name": "@zowe/cli", - "version": "7.20.0", + "version": "7.20.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", From 76e98e2ce1b352f476e7fb20c64f2553193ca8fb Mon Sep 17 00:00:00 2001 From: zFernand0 <37381190+zFernand0@users.noreply.github.com> Date: Thu, 30 Nov 2023 19:13:17 +0000 Subject: [PATCH 009/138] feat(imperative): Enhance to allow for `ProfileInfo.updateProperty` to allow for `forceUpdate`s Signed-off-by: zFernand0 <37381190+zFernand0@users.noreply.github.com> --- packages/imperative/CHANGELOG.md | 4 +++ .../ProfileInfo.TeamConfig.unit.test.ts | 35 +++++++++++++++++-- .../imperative/src/config/src/ProfileInfo.ts | 7 ++++ .../config/src/doc/IProfInfoUpdatePropOpts.ts | 7 ++++ 4 files changed, 51 insertions(+), 2 deletions(-) diff --git a/packages/imperative/CHANGELOG.md b/packages/imperative/CHANGELOG.md index 7dbc271cb1..d11fdb7b11 100644 --- a/packages/imperative/CHANGELOG.md +++ b/packages/imperative/CHANGELOG.md @@ -335,6 +335,10 @@ that would be used if a command were executed. - BugFix: Fixed incorrect description for untyped profiles in team config files. [zowe/zowe-cli#1303](https://github.com/zowe/zowe-cli/issues/1303) - **Next Breaking**: Schema files created or updated with the above changes are not backward compatible with older versions of Imperative. +## Recent Changes + +- Enhancement: Added the ability to `forceUpdate` a property using the `ProfileInfo.updateProperty` method. [zowe-explorer#2493](https://github.com/zowe/vscode-extension-for-zowe/issues/2493) + ## `5.0.0-next.202203222132` - BugFix: Reverted unintentional breaking change that prevented `DefaultCredentialManager` from finding Keytar outside of calling CLI's node_modules folder. diff --git a/packages/imperative/src/config/__tests__/ProfileInfo.TeamConfig.unit.test.ts b/packages/imperative/src/config/__tests__/ProfileInfo.TeamConfig.unit.test.ts index 1042b5a537..c003154afb 100644 --- a/packages/imperative/src/config/__tests__/ProfileInfo.TeamConfig.unit.test.ts +++ b/packages/imperative/src/config/__tests__/ProfileInfo.TeamConfig.unit.test.ts @@ -25,6 +25,7 @@ import { AbstractSession, SessConstants } from "../../rest"; import { ConfigAutoStore } from "../src/ConfigAutoStore"; import { ImperativeConfig } from "../../utilities/src/ImperativeConfig"; import { ImperativeError } from "../../error"; +import { IProfInfoUpdatePropOpts } from "../src/doc/IProfInfoUpdatePropOpts"; const testAppNm = "ProfInfoApp"; const testEnvPrefix = testAppNm.toUpperCase(); @@ -1009,6 +1010,36 @@ describe("TeamConfig ProfileInfo tests", () => { expect(updateKnownPropertySpy).toHaveBeenCalledWith({ ...profileOptions, mergedArgs: {}, osLocInfo: undefined }); }); + it("should succeed forceUpdating a property even if the jsonLoc points somewhere else", async () => { + const profInfo = createNewProfInfo(teamProjDir); + await profInfo.readProfilesFromDisk(); + const mergedArgs = { + knownArgs: [{ + argName: "rejectUnauthorized", + argLoc: { jsonLoc: "profiles.base_glob.properties.rejectUnauthorized" } + }] + }; + jest.spyOn(profInfo as any, "mergeArgsForProfile").mockReturnValue(mergedArgs); + const updateKnownPropertySpy = jest.spyOn(profInfo as any, "updateKnownProperty").mockResolvedValue(true); + const profileOptions: IProfInfoUpdatePropOpts = { + profileName: "LPAR4", + profileType: "dummy", + property: "rejectUnauthorized", + value: true, + forceUpdate: true + }; + let caughtError; + try { + await profInfo.updateProperty(profileOptions); + } catch (error) { + caughtError = error; + } + expect(caughtError).toBeUndefined(); + expect(mergedArgs.knownArgs[0].argLoc.jsonLoc).toEqual("profiles.LPAR4.properties.rejectUnauthorized"); + const osLocInfo = { global: false, user: false, name: "LPAR4", path: path.join(teamProjDir, `${testAppNm}.config.json`) }; + expect(updateKnownPropertySpy).toHaveBeenCalledWith({ ...profileOptions, mergedArgs, osLocInfo }); + }); + it("should attempt to store session config properties without adding profile types to the loadedConfig", async () => { const profInfo = createNewProfInfo(teamProjDir); await profInfo.readProfilesFromDisk(); @@ -1153,11 +1184,11 @@ describe("TeamConfig ProfileInfo tests", () => { await profInfo.readProfilesFromDisk(); const prof = profInfo.mergeArgsForProfile(profInfo.getAllProfiles("dummy")[0]); - await profInfo.updateProperty({profileName: 'LPAR4', property: "someProperty", value: "example.com", profileType: "dummy"}); + await profInfo.updateProperty({ profileName: 'LPAR4', property: "someProperty", value: "example.com", profileType: "dummy" }); const afterUpdate = profInfo.mergeArgsForProfile(profInfo.getAllProfiles("dummy")[0]); expect(afterUpdate.knownArgs.find(v => v.argName === 'someProperty')?.argValue).toBe('example.com'); - await profInfo.removeKnownProperty({mergedArgs: afterUpdate, property: 'someProperty'}); + await profInfo.removeKnownProperty({ mergedArgs: afterUpdate, property: 'someProperty' }); const afterRemove = profInfo.mergeArgsForProfile(profInfo.getAllProfiles("dummy")[0]); expect(afterRemove.knownArgs.find(v => v.argName === 'someProperty')).toBeUndefined(); diff --git a/packages/imperative/src/config/src/ProfileInfo.ts b/packages/imperative/src/config/src/ProfileInfo.ts index 6d15c63a3e..99c6c155ee 100644 --- a/packages/imperative/src/config/src/ProfileInfo.ts +++ b/packages/imperative/src/config/src/ProfileInfo.ts @@ -201,6 +201,13 @@ export class ProfileInfo { } const mergedArgs = this.mergeArgsForProfile(desiredProfile, { getSecureVals: false }); + if (options.forceUpdate && this.usingTeamConfig) { + const knownProperty = mergedArgs.knownArgs.find((v => v.argName === options.property)); + const profPath = this.getTeamConfig().api.profiles.getProfilePathFromName(options.profileName); + if (!knownProperty.argLoc.jsonLoc.startsWith(profPath)) { + knownProperty.argLoc.jsonLoc = `${profPath}.properties.${options.property}`; + } + } if (!(await this.updateKnownProperty({ ...options, mergedArgs, osLocInfo: this.getOsLocInfo(desiredProfile)?.[0] }))) { if (this.usingTeamConfig) { // Check to see if loadedConfig already contains the schema for the specified profile type diff --git a/packages/imperative/src/config/src/doc/IProfInfoUpdatePropOpts.ts b/packages/imperative/src/config/src/doc/IProfInfoUpdatePropOpts.ts index 1c39c7b381..4ab1afce17 100644 --- a/packages/imperative/src/config/src/doc/IProfInfoUpdatePropOpts.ts +++ b/packages/imperative/src/config/src/doc/IProfInfoUpdatePropOpts.ts @@ -26,6 +26,13 @@ export interface IProfInfoUpdatePropOpts extends IProfInfoUpdatePropCommonOpts { * Name of the active profile */ profileName: string; + + /** + * Force the update to the profile specified even if the property comes from somehwere else + * Example: Token Value could be in the base profile and not in the service profile specified + * and the programmer has the intention of storing the token in the service profile + */ + forceUpdate?: boolean } /** From 7a1eaab5639122d7f9cd5aae11805ecda0ae3c90 Mon Sep 17 00:00:00 2001 From: Gene Johnston Date: Thu, 30 Nov 2023 17:56:40 -0500 Subject: [PATCH 010/138] No longer add profile group into cmd tree within Imperative.addAutoGeneratedCommands Remove call to CliProfileManager.initialize from Imperative.init. Remove BasicProfileManager.initialize. Remove AbstractProfileManager.createProfileTypeDirectory Signed-off-by: Gene Johnston --- .../src/imperative/src/Imperative.ts | 28 ------- packages/imperative/src/profiles/index.ts | 2 - .../src/profiles/src/BasicProfileManager.ts | 74 ------------------- .../src/abstract/AbstractProfileManager.ts | 15 ---- .../src/doc/parms/IProfileManagerInit.ts | 51 ------------- .../src/profiles/src/doc/parms/index.ts | 1 - .../src/doc/response/IProfileInitialized.ts | 25 ------- .../src/profiles/src/doc/response/index.ts | 1 - 8 files changed, 197 deletions(-) delete mode 100644 packages/imperative/src/profiles/src/doc/parms/IProfileManagerInit.ts delete mode 100644 packages/imperative/src/profiles/src/doc/response/IProfileInitialized.ts diff --git a/packages/imperative/src/imperative/src/Imperative.ts b/packages/imperative/src/imperative/src/Imperative.ts index 2e83949c47..435c18eb00 100644 --- a/packages/imperative/src/imperative/src/Imperative.ts +++ b/packages/imperative/src/imperative/src/Imperative.ts @@ -281,14 +281,6 @@ export class Imperative { // final preparation of the command tree const preparedHostCliCmdTree = this.getPreparedCmdTree(resolvedHostCliCmdTree, config.baseProfile); - /** - * Only initialize the old-school profile environment - * if we are not in team-config mode. - */ - if (ImperativeConfig.instance.config.exists === false) { - await this.initProfiles(config); - } - /** * Define all known commands */ @@ -521,25 +513,6 @@ export class Imperative { Logger.initLogger(loggingConfig); } - /** - * Initialize the profiles directory with types and meta files. This can be called every startup of the CLI - * without issue, but if the meta files or configuration changes, we'll have to re-initialize. - * TODO: Determine the re-initialize strategy. - * @private - * @static - * @param {IImperativeConfig} config - The configuration document passed to init. - * @memberof Imperative - */ - private static async initProfiles(config: IImperativeConfig) { - if (config.profiles != null && config.profiles.length > 0) { - await CliProfileManager.initialize({ - configuration: config.profiles, - profileRootDirectory: ProfileUtils.constructProfilesRootDirectory(ImperativeConfig.instance.cliHome), - reinitialize: false - }); - } - } - /** * Define to yargs for main CLI and plugins * @@ -714,7 +687,6 @@ export class Imperative { if (loadedConfig.baseProfile != null) { allProfiles.push(loadedConfig.baseProfile); } - rootCommand.children.push(CompleteProfilesGroupBuilder.getProfileGroup(allProfiles, this.log)); } const authConfigs: {[key: string]: ICommandProfileAuthConfig[]} = {}; if (loadedConfig.profiles != null) { diff --git a/packages/imperative/src/profiles/index.ts b/packages/imperative/src/profiles/index.ts index 1e761a6387..d6732dd0eb 100644 --- a/packages/imperative/src/profiles/index.ts +++ b/packages/imperative/src/profiles/index.ts @@ -23,7 +23,6 @@ export * from "./src/doc/api/IProfileManagerFactory"; export * from "./src/doc/parms/IDeleteProfile"; export * from "./src/doc/parms/ILoadProfile"; export * from "./src/doc/parms/IProfileManager"; -export * from "./src/doc/parms/IProfileManagerInit"; export * from "./src/doc/parms/ISaveProfile"; export * from "./src/doc/parms/ISaveProfileFromCliArgs"; export * from "./src/doc/parms/ISetDefaultProfile"; @@ -36,7 +35,6 @@ export * from "./src/doc/parms/IValidateProfileWithSchema"; export * from "./src/doc/api/IProfileManagerFactory"; export * from "./src/doc/response/IProfileDeleted"; -export * from "./src/doc/response/IProfileInitialized"; export * from "./src/doc/response/IProfileLoaded"; export * from "./src/doc/response/IProfileSaved"; export * from "./src/doc/response/IProfileUpdated"; diff --git a/packages/imperative/src/profiles/src/BasicProfileManager.ts b/packages/imperative/src/profiles/src/BasicProfileManager.ts index 75859ef234..37be65aed9 100644 --- a/packages/imperative/src/profiles/src/BasicProfileManager.ts +++ b/packages/imperative/src/profiles/src/BasicProfileManager.ts @@ -13,12 +13,9 @@ import { AbstractProfileManager } from "./abstract/AbstractProfileManager"; import { IDeleteProfile, ILoadProfile, - IMetaProfile, IProfile, IProfileDeleted, - IProfileInitialized, IProfileLoaded, - IProfileManagerInit, IProfileSaved, IProfileTypeConfiguration, IProfileUpdated, @@ -55,77 +52,6 @@ import { ProfileIO } from "./utils"; * @template T */ export class BasicProfileManager extends AbstractProfileManager { - /** - * Static method to initialize the profile environment. Accepts the profile root directory (normally supplied by - * your Imperative configuration documents) and all profile "type" configuration documents and constructs the directories - * needed to manage profiles of all types. You must execute this method before beginning to use profiles OR you must - * supply all the type configuration documents (normally obtained from your Imperative configuration document) to - * the constructor of - * @static - * @param {IProfileManagerInit} parms - * @returns {Promise} - * @memberof AbstractProfileManager - */ - public static async initialize(parms: IProfileManagerInit): Promise { - // Validate the input parameters - TODO: Validate all - ImperativeExpect.toNotBeNullOrUndefined( - parms, - `A request was made to initialize the profile environment, but no parameters were supplied.` - ); - ImperativeExpect.keysToBeDefined(parms, ["configuration"], - `A request was made to initialize the profile environment, but no configuration documents were supplied.` - ); - ImperativeExpect.keysToBeDefinedAndNonBlank(parms, ["profileRootDirectory"], - `A request was made to initialize the profile environment, but the profile root directory was not supplied.` - ); - ImperativeExpect.keysToBeAnArray(parms, true, ["configuration"], - `A request was mad to initialize the profile environment, but the configuration provided is invalid (not an array or of length 0).` - ); - - // Set any defaults - parms.reinitialize = (isNullOrUndefined(parms.reinitialize)) ? false : parms.reinitialize; - - // Create the profile root directory (if necessary) - ProfileIO.createProfileDirs(parms.profileRootDirectory); - - // Iterate through the types and create this types configuration document - create a new instance of the - // Manager to create the other types - const responses: IProfileInitialized[] = []; - for (const config of parms.configuration) { - - // Construct the profile type directory - const profileTypeRootDir = parms.profileRootDirectory + "/" + config.type + "/"; - ProfileIO.createProfileDirs(profileTypeRootDir); - - // Meta file path and name - const metaFilePath = profileTypeRootDir + config.type - + AbstractProfileManager.META_FILE_SUFFIX + AbstractProfileManager.PROFILE_EXTENSION; - - // Construct the default meta file - const defaultMetaFile: IMetaProfile = { - defaultProfile: undefined, - configuration: config - }; - - // If the directory doesn't exist, create it and the default meta file for this type - // If the directory exists and re-init was specified, write out the default meta file - // If it exists and re-init was not specified, leave it alone - if (!ProfileIO.exists(metaFilePath)) { - ProfileIO.writeMetaFile(defaultMetaFile, metaFilePath); - responses.push({ - message: `Profile environment initialized for type "${config.type}".` - }); - } else if (parms.reinitialize) { - ProfileIO.writeMetaFile(defaultMetaFile, metaFilePath); - responses.push({ - message: `Profile environment re-initialized for type "${config.type}".` - }); - } - } - - return responses; - } - /** * Loads all profiles from every type. Profile types are deteremined by reading all directories within the * profile root directory. diff --git a/packages/imperative/src/profiles/src/abstract/AbstractProfileManager.ts b/packages/imperative/src/profiles/src/abstract/AbstractProfileManager.ts index 50eaa93ff9..c4447997cd 100644 --- a/packages/imperative/src/profiles/src/abstract/AbstractProfileManager.ts +++ b/packages/imperative/src/profiles/src/abstract/AbstractProfileManager.ts @@ -233,7 +233,6 @@ export abstract class AbstractProfileManager Date: Fri, 1 Dec 2023 10:14:57 -0500 Subject: [PATCH 011/138] Update packages/imperative/src/config/src/ProfileInfo.ts Nice catch! Thank you, @traeok Co-authored-by: Trae Yelovich Signed-off-by: Fernando Rijo Cedeno <37381190+zFernand0@users.noreply.github.com> --- packages/imperative/src/config/src/ProfileInfo.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/imperative/src/config/src/ProfileInfo.ts b/packages/imperative/src/config/src/ProfileInfo.ts index 99c6c155ee..161a9aaf89 100644 --- a/packages/imperative/src/config/src/ProfileInfo.ts +++ b/packages/imperative/src/config/src/ProfileInfo.ts @@ -204,7 +204,7 @@ export class ProfileInfo { if (options.forceUpdate && this.usingTeamConfig) { const knownProperty = mergedArgs.knownArgs.find((v => v.argName === options.property)); const profPath = this.getTeamConfig().api.profiles.getProfilePathFromName(options.profileName); - if (!knownProperty.argLoc.jsonLoc.startsWith(profPath)) { + if (!knownProperty?.argLoc.jsonLoc.startsWith(profPath)) { knownProperty.argLoc.jsonLoc = `${profPath}.properties.${options.property}`; } } From 54bbc36fb1a419e9c974474ab8d167ff2254cd03 Mon Sep 17 00:00:00 2001 From: Gene Johnston Date: Mon, 4 Dec 2023 15:19:34 -0500 Subject: [PATCH 012/138] Set profiles directory even though we don't create it Signed-off-by: Gene Johnston --- .../src/profiles/src/abstract/AbstractProfileManager.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/imperative/src/profiles/src/abstract/AbstractProfileManager.ts b/packages/imperative/src/profiles/src/abstract/AbstractProfileManager.ts index c4447997cd..dca40121b9 100644 --- a/packages/imperative/src/profiles/src/abstract/AbstractProfileManager.ts +++ b/packages/imperative/src/profiles/src/abstract/AbstractProfileManager.ts @@ -233,6 +233,7 @@ export abstract class AbstractProfileManager Date: Mon, 4 Dec 2023 15:24:17 -0500 Subject: [PATCH 013/138] Alter tests for removal of BasicProfileManager.initialize() Signed-off-by: Gene Johnston --- ...ileManager.constructor.integration.test.ts | 42 +++++++ ...fileManager.initialize.integration.test.ts | 57 ---------- ...anager.initialize.integration.test.ts.snap | 72 ------------ .../BasicProfileManagerTestConstants.ts | 2 +- .../src/packages/profiles/test_app/TestApp.ts | 53 ++++++++- .../BasicProfileManager.unit.test.ts | 103 ------------------ .../BasicProfileManager.unit.test.ts.snap | 52 --------- .../src/profiles/src/BasicProfileManager.ts | 5 +- 8 files changed, 95 insertions(+), 291 deletions(-) create mode 100644 packages/imperative/__tests__/src/packages/profiles/__integration__/BasicProfileManager.constructor.integration.test.ts delete mode 100644 packages/imperative/__tests__/src/packages/profiles/__integration__/BasicProfileManager.initialize.integration.test.ts delete mode 100644 packages/imperative/__tests__/src/packages/profiles/__integration__/__snapshots__/BasicProfileManager.initialize.integration.test.ts.snap diff --git a/packages/imperative/__tests__/src/packages/profiles/__integration__/BasicProfileManager.constructor.integration.test.ts b/packages/imperative/__tests__/src/packages/profiles/__integration__/BasicProfileManager.constructor.integration.test.ts new file mode 100644 index 0000000000..2c26f2a4b0 --- /dev/null +++ b/packages/imperative/__tests__/src/packages/profiles/__integration__/BasicProfileManager.constructor.integration.test.ts @@ -0,0 +1,42 @@ +/* +* 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. +* +*/ + +jest.mock("../../../../../src/utilities/src/ImperativeConfig"); + +import * as TestUtil from "../../../TestUtil"; +import { BasicProfileManager } from "../../../../../src/index"; +import { TestLogger } from "../../../../src/TestLogger"; +import { bananaProfile, PROFILE_TYPE } from "../src/constants/BasicProfileManagerTestConstants"; + +const profileDirectory = TestUtil.createUniqueTestDataDir("profile-manager-initialize"); + +describe("Basic Profile Manager Constructor", () => { + it("Should create a profile manager", async () => { + let caughtError: Error = new Error(""); + let newProfMgr; + + try { + // Create a manager instance + newProfMgr = new BasicProfileManager({ + profileRootDirectory: profileDirectory, + logger: TestLogger.getTestLogger(), + type: PROFILE_TYPE.BANANA, + typeConfigurations: [bananaProfile] + }); + } catch (e) { + caughtError = e; + TestLogger.error(caughtError.message); + } + + expect(newProfMgr).not.toBeNull(); + expect(caughtError.message).toEqual(""); + }); +}); diff --git a/packages/imperative/__tests__/src/packages/profiles/__integration__/BasicProfileManager.initialize.integration.test.ts b/packages/imperative/__tests__/src/packages/profiles/__integration__/BasicProfileManager.initialize.integration.test.ts deleted file mode 100644 index 3d2ae4b317..0000000000 --- a/packages/imperative/__tests__/src/packages/profiles/__integration__/BasicProfileManager.initialize.integration.test.ts +++ /dev/null @@ -1,57 +0,0 @@ -/* -* 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. -* -*/ - -jest.mock("../../../../../src/utilities/src/ImperativeConfig"); - -import * as TestUtil from "../../../TestUtil"; -import { BasicProfileManager } from "../../../../../src/index"; -import { TestLogger } from "../../../../src/TestLogger"; -import { PROFILE_TYPE, getConfig } from "../src/constants/BasicProfileManagerTestConstants"; -import * as fs from "fs"; - -const profileDirectory = TestUtil.createUniqueTestDataDir("profile-manager-initialize"); - -describe("Basic Profile Manager Initialize", () => { - it("Should allow us to initialize the environment and create a profile manager", async () => { - const config = getConfig(profileDirectory); - - const responses = BasicProfileManager.initialize({ - configuration: config.profiles, - profileRootDirectory: profileDirectory - }); - try { - // Ensure the type directories created - const dirs = fs.readdirSync(profileDirectory); - const profTypes = Object.keys(PROFILE_TYPE).sort().map((keyType: string): string => keyType.toLocaleLowerCase()); - - expect(dirs).toEqual(profTypes); - - for (let i = 0; i < dirs.length; i++) { - // Ensure that the directories contain the meta files - const profDir = fs.readdirSync(profileDirectory + "/" + dirs[i]); - expect(profDir).toEqual([profTypes[i] + "_meta.yaml"]); - - const profMeta = fs.readFileSync(profileDirectory + "/" + dirs[i] + "/" + profDir[0]).toString(); - expect(profMeta).toMatchSnapshot(); - } - - // Create a manager instance - const manager = new BasicProfileManager({ - profileRootDirectory: profileDirectory, - logger: TestLogger.getTestLogger(), - type: PROFILE_TYPE.BANANA - }); - } catch (e) { - TestLogger.error(e); - throw e; - } - }); -}); diff --git a/packages/imperative/__tests__/src/packages/profiles/__integration__/__snapshots__/BasicProfileManager.initialize.integration.test.ts.snap b/packages/imperative/__tests__/src/packages/profiles/__integration__/__snapshots__/BasicProfileManager.initialize.integration.test.ts.snap deleted file mode 100644 index a1175cb2c3..0000000000 --- a/packages/imperative/__tests__/src/packages/profiles/__integration__/__snapshots__/BasicProfileManager.initialize.integration.test.ts.snap +++ /dev/null @@ -1,72 +0,0 @@ -// Jest Snapshot v1, https://goo.gl/fbAQLP - -exports[`Basic Profile Manager Initialize Should allow us to initialize the environment and create a profile manager 1`] = ` -"defaultProfile: null -configuration: - type: banana - schema: - type: object - title: 'The Banana command profile schema' - description: 'The Banana command profile schema' - properties: - age: - optionDefinition: - description: 'The age of the Banana' - type: number - name: age - aliases: - - a - required: true - type: number - required: - - age -" -`; - -exports[`Basic Profile Manager Initialize Should allow us to initialize the environment and create a profile manager 2`] = ` -"defaultProfile: null -configuration: - type: secure_orange - schema: - type: object - title: 'The secure_orange command profile schema' - description: 'The secure_orange command profile schema' - properties: - username: - optionDefinition: - description: 'The username of the secure_orange' - type: string - name: username - type: string - password: - optionDefinition: - description: 'The password of the secure_orange' - type: string - name: password - type: string - required: [] -" -`; - -exports[`Basic Profile Manager Initialize Should allow us to initialize the environment and create a profile manager 3`] = ` -"defaultProfile: null -configuration: - type: strawberry - schema: - type: object - title: 'The strawberry command profile schema' - description: 'The strawberry command profile schema' - properties: - age: - optionDefinition: - description: 'The age of the strawberry' - type: number - name: age - aliases: - - a - required: true - type: number - required: - - age -" -`; diff --git a/packages/imperative/__tests__/src/packages/profiles/src/constants/BasicProfileManagerTestConstants.ts b/packages/imperative/__tests__/src/packages/profiles/src/constants/BasicProfileManagerTestConstants.ts index ba71a6207c..d623bf9625 100644 --- a/packages/imperative/__tests__/src/packages/profiles/src/constants/BasicProfileManagerTestConstants.ts +++ b/packages/imperative/__tests__/src/packages/profiles/src/constants/BasicProfileManagerTestConstants.ts @@ -31,7 +31,7 @@ export const PROFILE_TYPE = { STRAWBERRY: "strawberry" }; -const bananaProfile: ICommandProfileTypeConfiguration = { +export const bananaProfile: ICommandProfileTypeConfiguration = { type: PROFILE_TYPE.BANANA, schema: { type: "object", diff --git a/packages/imperative/__tests__/src/packages/profiles/test_app/TestApp.ts b/packages/imperative/__tests__/src/packages/profiles/test_app/TestApp.ts index 549f9a06dd..0c5ec8b0bc 100644 --- a/packages/imperative/__tests__/src/packages/profiles/test_app/TestApp.ts +++ b/packages/imperative/__tests__/src/packages/profiles/test_app/TestApp.ts @@ -11,15 +11,62 @@ import { TestProfileLoader } from "./TestProfileLoader"; import { TestAppImperativeConfig } from "../src/constants/ProfileInfoConstants"; -import { CliProfileManager } from "../../../../../src/cmd/src/profiles/CliProfileManager"; import { Logger } from "../../../../../src/logger/src/Logger"; +import { ProfileIO } from "../../../../../src/profiles/src/utils"; +import { AbstractProfileManager } from "../../../../../src/profiles/src/abstract/AbstractProfileManager"; +import { IMetaProfile } from "../../../../../src/profiles/src/doc/definition"; +import { IProfileTypeConfiguration } from "../../../../../src/profiles/src/doc/config/IProfileTypeConfiguration"; import * as path from "path"; +/* Logic from the now-removed BasicProfileManager.initialize() function. We never create + * the old v1 profile structure in the product, but we might for tests. In V3, we maintain + * the ability to read V1 profiles for the purpose of converting them to a team config. + */ const setupOldProfiles = async (projectDir: string) => { - await CliProfileManager.initialize({ + const parms: any = { configuration: TestAppImperativeConfig.profiles, profileRootDirectory: path.join(projectDir, "profiles"), - }); + }; + + // Create the profile root directory (if necessary) + ProfileIO.createProfileDirs(parms.profileRootDirectory); + + // Iterate through the types and create this types configuration document - create a new instance of the + // Manager to create the other types + const responses: any[] = []; + for(const config of parms.configuration) { + + // Construct the profile type directory + const profileTypeRootDir = parms.profileRootDirectory + "/" + config.type + "/"; + ProfileIO.createProfileDirs(profileTypeRootDir); + + // Meta file path and name + const metaFilePath = profileTypeRootDir + config.type + + AbstractProfileManager.META_FILE_SUFFIX + AbstractProfileManager.PROFILE_EXTENSION; + + // Construct the default meta file + const defaultMetaFile: IMetaProfile = { + defaultProfile: undefined, + configuration: config + }; + + // If the directory doesn't exist, create it and the default meta file for this type + // If the directory exists and re-init was specified, write out the default meta file + // If it exists and re-init was not specified, leave it alone + if (!ProfileIO.exists(metaFilePath)) { + ProfileIO.writeMetaFile(defaultMetaFile, metaFilePath); + responses.push({ + message: `Profile environment initialized for type "${config.type}".` + }); + } else if (parms.reinitialize) { + ProfileIO.writeMetaFile(defaultMetaFile, metaFilePath); + responses.push({ + message: `Profile environment re-initialized for type "${config.type}".` + }); + } + } + + return responses; }; const log = (logger: Logger, msg: string, ...args: any) => { diff --git a/packages/imperative/src/profiles/__tests__/BasicProfileManager.unit.test.ts b/packages/imperative/src/profiles/__tests__/BasicProfileManager.unit.test.ts index 8c14a19447..2e4bfa13b7 100644 --- a/packages/imperative/src/profiles/__tests__/BasicProfileManager.unit.test.ts +++ b/packages/imperative/src/profiles/__tests__/BasicProfileManager.unit.test.ts @@ -16,7 +16,6 @@ import { IProfileLoaded } from "../../profiles/src/doc/response/IProfileLoaded"; import { APPLE_PROFILE_TYPE, APPLE_TWO_REQ_DEP_BANANA_AND_STRAWBERRIES, - APPLE_TWO_REQ_DEP_BANANA_ONE_REQ_DEP_GRAPE, BLUEBERRY_PROFILE_TYPE, FRUIT_BASKET_DIR, ONLY_APPLE, @@ -218,72 +217,6 @@ describe("Basic Profile Manager", () => { expect(error.message).toMatchSnapshot(); }); - it("should initialize the environment", async () => { - const responses = await BasicProfileManager.initialize({ - configuration: APPLE_TWO_REQ_DEP_BANANA_ONE_REQ_DEP_GRAPE, - profileRootDirectory: TEST_PROFILE_ROOT_DIR - }); - - expect(responses).toBeDefined(); - expect(responses).toMatchSnapshot(); - }); - - it("should detect missing parms on initialize", async () => { - let error; - try { - const responses = await BasicProfileManager.initialize(undefined); - } catch (e) { - error = e; - } - expect(error instanceof ImperativeError).toBe(true); - expect(error.message).toMatchSnapshot(); - }); - - it("should detect missing configuration on initialize", async () => { - let error; - try { - const parms = { - configuration: undefined as any, - profileRootDirectory: TEST_PROFILE_ROOT_DIR - }; - const responses = await BasicProfileManager.initialize(parms); - } catch (e) { - error = e; - } - expect(error instanceof ImperativeError).toBe(true); - expect(error.message).toMatchSnapshot(); - }); - - it("should detect missing profile directory on initialize", async () => { - let error; - try { - const parms = { - configuration: APPLE_TWO_REQ_DEP_BANANA_ONE_REQ_DEP_GRAPE, - profileRootDirectory: undefined as any - }; - const responses = await BasicProfileManager.initialize(parms); - } catch (e) { - error = e; - } - expect(error instanceof ImperativeError).toBe(true); - expect(error.message).toMatchSnapshot(); - }); - - it("should detect blank profile directory on initialize", async () => { - let error; - try { - const parms = { - configuration: APPLE_TWO_REQ_DEP_BANANA_ONE_REQ_DEP_GRAPE, - profileRootDirectory: " " - }; - const responses = await BasicProfileManager.initialize(parms); - } catch (e) { - error = e; - } - expect(error instanceof ImperativeError).toBe(true); - expect(error.message).toMatchSnapshot(); - }); - it("should create an instance and read all configurations from the meta files", async () => { const prof = new BasicProfileManager({ profileRootDirectory: TEST_PROFILE_ROOT_DIR + FRUIT_BASKET_DIR, @@ -308,42 +241,6 @@ describe("Basic Profile Manager", () => { expect(error.message).toMatchSnapshot(); }); - it("should detect that the configuration passed is not an array", async () => { - const init: any = { - configuration: [], - profileRootDirectory: TEST_PROFILE_ROOT_DIR + FRUIT_BASKET_DIR - }; - init.configuration = {}; - let error; - try { - const responses = await BasicProfileManager.initialize(init); - } catch (e) { - error = e; - } - expect(error).toBeDefined(); - expect(error instanceof ImperativeError).toBe(true); - expect(error.message).toMatchSnapshot(); - }); - - it("should only initialize types not already defined in the environment", async () => { - const responses = await BasicProfileManager.initialize({ - configuration: APPLE_TWO_REQ_DEP_BANANA_ONE_REQ_DEP_GRAPE, - profileRootDirectory: TEST_PROFILE_ROOT_DIR + FRUIT_BASKET_DIR - }); - expect(responses).toBeDefined(); - expect(responses).toMatchSnapshot(); - }); - - it("should allow a re-initialize of the environment", async () => { - const responses = await BasicProfileManager.initialize({ - configuration: APPLE_TWO_REQ_DEP_BANANA_ONE_REQ_DEP_GRAPE, - profileRootDirectory: TEST_PROFILE_ROOT_DIR + FRUIT_BASKET_DIR, - reinitialize: true - }); - expect(responses).toBeDefined(); - expect(responses).toMatchSnapshot(); - }); - it("should allow us to set the default in the meta profile", () => { let error; let response; diff --git a/packages/imperative/src/profiles/__tests__/__snapshots__/BasicProfileManager.unit.test.ts.snap b/packages/imperative/src/profiles/__tests__/__snapshots__/BasicProfileManager.unit.test.ts.snap index b574616f7a..81eeb957bb 100644 --- a/packages/imperative/src/profiles/__tests__/__snapshots__/BasicProfileManager.unit.test.ts.snap +++ b/packages/imperative/src/profiles/__tests__/__snapshots__/BasicProfileManager.unit.test.ts.snap @@ -1,22 +1,5 @@ // Jest Snapshot v1, https://goo.gl/fbAQLP -exports[`Basic Profile Manager should allow a re-initialize of the environment 1`] = ` -Array [ - Object { - "message": "Profile environment re-initialized for type \\"apple\\".", - }, - Object { - "message": "Profile environment re-initialized for type \\"strawberry\\".", - }, - Object { - "message": "Profile environment initialized for type \\"banana\\".", - }, - Object { - "message": "Profile environment re-initialized for type \\"grape\\".", - }, -] -`; - exports[`Basic Profile Manager should allow us to set the default in the meta profile 1`] = `"Default profile for type \\"blueberry\\" set to \\"tart_blueberry\\"."`; exports[`Basic Profile Manager should create an instance and read all configurations from the meta files 1`] = ` @@ -107,8 +90,6 @@ Array [ ] `; -exports[`Basic Profile Manager should detect blank profile directory on initialize 1`] = `"Expect Error: A request was made to initialize the profile environment, but the profile root directory was not supplied."`; - exports[`Basic Profile Manager should detect if the type is blank 1`] = `"Expect Error: No profile type supplied on the profile manager parameters."`; exports[`Basic Profile Manager should detect if the type is undefined 1`] = `"Expect Error: No profile type supplied on the profile manager parameters."`; @@ -121,16 +102,8 @@ Loading \\"strawberry_and_apple\\" of type \\"strawberry\\" Error Details: \\"Profile validation error during load of profile \\"good_apple\\" of type \\"apple\\". Error Details: Profile type \\"apple\\" specifies a required dependency of type \\"strawberry\\" on the \\"apple\\" profile type configuration document. A dependency of type \\"strawberry\\" was NOT listed on the input profile.\\"" `; -exports[`Basic Profile Manager should detect missing configuration on initialize 1`] = `"Expect Error: A request was made to initialize the profile environment, but no configuration documents were supplied."`; - -exports[`Basic Profile Manager should detect missing parms on initialize 1`] = `"Expect Error: A request was made to initialize the profile environment, but no parameters were supplied."`; - -exports[`Basic Profile Manager should detect missing profile directory on initialize 1`] = `"Expect Error: A request was made to initialize the profile environment, but the profile root directory was not supplied."`; - exports[`Basic Profile Manager should detect no parms when instantiating 1`] = `"Expect Error: Profile Manager input parms not supplied."`; -exports[`Basic Profile Manager should detect that the configuration passed is not an array 1`] = `"Expect Error: A request was mad to initialize the profile environment, but the configuration provided is invalid (not an array or of length 0)."`; - exports[`Basic Profile Manager should detect that the profile directory is blank 1`] = `"Expect Error: No profile root directory supplied on the profile manager parameters"`; exports[`Basic Profile Manager should detect that the profile directory is undefined 1`] = `"Expect Error: No profile root directory supplied on the profile manager parameters"`; @@ -139,23 +112,6 @@ exports[`Basic Profile Manager should fail a create if no configurations and pas exports[`Basic Profile Manager should fail a request to set the default if the profile is not found 1`] = `"Cannot update default profile for type \\"blueberry\\". The profile name specified (\\"bad_blueberry\\") does not exist. Please create before attempting to set the default."`; -exports[`Basic Profile Manager should initialize the environment 1`] = ` -Array [ - Object { - "message": "Profile environment initialized for type \\"apple\\".", - }, - Object { - "message": "Profile environment initialized for type \\"strawberry\\".", - }, - Object { - "message": "Profile environment initialized for type \\"banana\\".", - }, - Object { - "message": "Profile environment initialized for type \\"grape\\".", - }, -] -`; - exports[`Basic Profile Manager should load all profiles 1`] = ` Array [ Object { @@ -204,11 +160,3 @@ Array [ }, ] `; - -exports[`Basic Profile Manager should only initialize types not already defined in the environment 1`] = ` -Array [ - Object { - "message": "Profile environment initialized for type \\"banana\\".", - }, -] -`; diff --git a/packages/imperative/src/profiles/src/BasicProfileManager.ts b/packages/imperative/src/profiles/src/BasicProfileManager.ts index 37be65aed9..fd24fa00e4 100644 --- a/packages/imperative/src/profiles/src/BasicProfileManager.ts +++ b/packages/imperative/src/profiles/src/BasicProfileManager.ts @@ -25,7 +25,6 @@ import { IValidateProfileWithSchema } from "./doc"; -import { ImperativeExpect } from "../../expect"; import { isNullOrUndefined } from "util"; import { ImperativeError } from "../../error"; import { ProfileIO } from "./utils"; @@ -218,7 +217,7 @@ export class BasicProfileManager extends Ab } /** - * Validate profile - ensures that the profile is valid agaisnt the schema and configuration document + * Validate profile - ensures that the profile is valid against the schema and configuration document * @protected * @param {IValidateProfileWithSchema} parms - Validate control params - see the interface for full details * @returns {Promise} - Promise that is fulfilled when complete (or rejected with an Imperative Error) @@ -238,7 +237,7 @@ export class BasicProfileManager extends Ab // on the profile object passed. this.validateRequiredDependenciesAreSpecified(parms.profile); - // Validate the profile agaisnt the schema + // Validate the profile against the schema this.validateProfileAgainstSchema(parms.name, parms.profile, parms.strict); // Return the response From cec611c2e53175ee2a1655e85ee80b7dbd4eb7f5 Mon Sep 17 00:00:00 2001 From: Gene Johnston Date: Mon, 4 Dec 2023 15:37:16 -0500 Subject: [PATCH 014/138] Remove unused imports Signed-off-by: Gene Johnston --- packages/imperative/src/imperative/src/Imperative.ts | 3 --- 1 file changed, 3 deletions(-) diff --git a/packages/imperative/src/imperative/src/Imperative.ts b/packages/imperative/src/imperative/src/Imperative.ts index 435c18eb00..f0e4f17d09 100644 --- a/packages/imperative/src/imperative/src/Imperative.ts +++ b/packages/imperative/src/imperative/src/Imperative.ts @@ -31,7 +31,6 @@ import { PluginManagementFacility } from "./plugins/PluginManagementFacility"; // import { ConfigManagementFacility } from "./config/ConfigManagementFacility"; import { AbstractCommandYargs } from "../../cmd/src/yargs/AbstractCommandYargs"; -import { CliProfileManager } from "../../cmd/src/profiles/CliProfileManager"; import { CommandPreparer } from "../../cmd/src/CommandPreparer"; import { CommandYargs } from "../../cmd/src/yargs/CommandYargs"; import { ICommandDefinition } from "../../cmd/src/doc/ICommandDefinition"; @@ -45,9 +44,7 @@ import { WebHelpManager } from "../../cmd/src/help/WebHelpManager"; import { YargsConfigurer } from "../../cmd/src/yargs/YargsConfigurer"; import { YargsDefiner } from "../../cmd/src/yargs/YargsDefiner"; -import { ProfileUtils } from "../../profiles/src/utils/ProfileUtils"; import { IProfileTypeConfiguration } from "../../profiles/src/doc/config/IProfileTypeConfiguration"; -import { CompleteProfilesGroupBuilder } from "./profiles/builders/CompleteProfilesGroupBuilder"; import { ImperativeHelpGeneratorFactory } from "./help/ImperativeHelpGeneratorFactory"; import { OverridesLoader } from "./OverridesLoader"; import { ImperativeProfileManagerFactory } from "./profiles/ImperativeProfileManagerFactory"; From ea34b879447aa6d58851352eb8191ebcef3979dc Mon Sep 17 00:00:00 2001 From: Gene Johnston Date: Mon, 4 Dec 2023 16:04:43 -0500 Subject: [PATCH 015/138] Fix tests for removal of CompleteProfilesGroupBuilder Signed-off-by: Gene Johnston --- .../__tests__/Imperative.unit.test.ts | 42 +------------------ 1 file changed, 1 insertion(+), 41 deletions(-) diff --git a/packages/imperative/src/imperative/__tests__/Imperative.unit.test.ts b/packages/imperative/src/imperative/__tests__/Imperative.unit.test.ts index 9b5ff1cc51..15f02d37f7 100644 --- a/packages/imperative/src/imperative/__tests__/Imperative.unit.test.ts +++ b/packages/imperative/src/imperative/__tests__/Imperative.unit.test.ts @@ -41,7 +41,6 @@ describe("Imperative", () => { jest.doMock("../../logger/src/Logger"); jest.doMock("../src/env/EnvironmentalVariableSettings"); jest.doMock("../src/auth/builders/CompleteAuthGroupBuilder"); - jest.doMock("../src/profiles/builders/CompleteProfilesGroupBuilder"); jest.doMock("../src/config/cmd/auto-init/builders/CompleteAutoInitCommandBuilder"); jest.doMock("../../config/src/Config"); jest.doMock("../../security/src/CredentialManagerFactory"); @@ -58,7 +57,6 @@ describe("Imperative", () => { const { Logger } = require("../../logger"); const { EnvironmentalVariableSettings } = require("../src/env/EnvironmentalVariableSettings"); const { CompleteAuthGroupBuilder } = require("../src/auth/builders/CompleteAuthGroupBuilder"); - const { CompleteProfilesGroupBuilder } = require("../src/profiles/builders/CompleteProfilesGroupBuilder"); const { CompleteAutoInitCommandBuilder } = require("../src/config/cmd/auto-init/builders/CompleteAutoInitCommandBuilder"); const { Config } = require("../../config/src/Config"); const { CredentialManagerFactory } = require("../../security/src/CredentialManagerFactory"); @@ -85,9 +83,6 @@ describe("Imperative", () => { CompleteAuthGroupBuilder: { getAuthGroup: CompleteAuthGroupBuilder.getAuthGroup as Mock }, - CompleteProfilesGroupBuilder: { - getProfileGroup: CompleteProfilesGroupBuilder.getProfileGroup as Mock - }, CompleteAutoInitCommandBuilder: { getAutoInitCommand: CompleteAutoInitCommandBuilder.getAutoInitCommand as Mock< typeof CompleteAutoInitCommandBuilder.getAutoInitCommand @@ -623,41 +618,6 @@ describe("Imperative", () => { }] }; - it("should call getProfileGroup when we need to auto-generate commands", () => { - /* addAutoGeneratedCommands calls ImperativeConfig.instance.loadedConfig. - * getLoadedConfig is a getter of a property, so mock we the property. - * We need loadedConfig.autoGenerateProfileCommands to be null and - * loadedConfig.profiles to have something in it. - */ - Object.defineProperty(mocks.ImperativeConfig.instance, "loadedConfig", { - configurable: true, - get: jest.fn(() => fakeConfig) - }); - - const autoGenCmdTree = Imperative.addAutoGeneratedCommands(JSON.parse(JSON.stringify(mockRootCmdTree))); - expect(mocks.CompleteProfilesGroupBuilder.getProfileGroup).toHaveBeenCalledTimes(1); - expect(autoGenCmdTree.children.length).toBe(2); - }); - - it("should add base profile in getProfileGroup when it is defined in Imperative config", () => { - /* addAutoGeneratedCommands calls ImperativeConfig.instance.loadedConfig. - * getLoadedConfig is a getter of a property, so mock we the property. - * We need loadedConfig.autoGenerateProfileCommands to be null and - * loadedConfig.profiles to have something in it. - */ - Object.defineProperty(mocks.ImperativeConfig.instance, "loadedConfig", { - configurable: true, - get: jest.fn(() => { - return { ...fakeConfig, baseProfile: fakeConfig.profiles[0] }; - }) - }); - - const autoGenCmdTree = Imperative.addAutoGeneratedCommands(JSON.parse(JSON.stringify(mockRootCmdTree))); - expect(mocks.CompleteProfilesGroupBuilder.getProfileGroup).toHaveBeenCalledTimes(1); - expect(mocks.CompleteProfilesGroupBuilder.getProfileGroup.mock.calls[0][0].length).toBe(2); - expect(autoGenCmdTree.children.length).toBe(2); - }); - it("should add auth service in getAuthGroup when it is defined in Imperative config", () => { /* addAutoGeneratedCommands calls ImperativeConfig.instance.loadedConfig. * getLoadedConfig is a getter of a property, so mock we the property. @@ -698,7 +658,7 @@ describe("Imperative", () => { const autoGenCmdTree = Imperative.addAutoGeneratedCommands(JSON.parse(JSON.stringify(mockRootCmdTree))); expect(mocks.CompleteAuthGroupBuilder.getAuthGroup).toHaveBeenCalledTimes(1); - // Expect 3 command groups added (auth, config and profiles) + // Expect 2 command groups added (auth and config) expect(autoGenCmdTree.children.length).toBe(3); }); From cf6995ff8f16c9f6ec1e5474791f3aafc553debb Mon Sep 17 00:00:00 2001 From: Gene Johnston Date: Mon, 4 Dec 2023 17:10:51 -0500 Subject: [PATCH 016/138] Reduce command count from 3 to 2 due to removed profiles group Signed-off-by: Gene Johnston --- .../imperative/src/imperative/__tests__/Imperative.unit.test.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/imperative/src/imperative/__tests__/Imperative.unit.test.ts b/packages/imperative/src/imperative/__tests__/Imperative.unit.test.ts index 15f02d37f7..e6b897ccbb 100644 --- a/packages/imperative/src/imperative/__tests__/Imperative.unit.test.ts +++ b/packages/imperative/src/imperative/__tests__/Imperative.unit.test.ts @@ -659,7 +659,7 @@ describe("Imperative", () => { const autoGenCmdTree = Imperative.addAutoGeneratedCommands(JSON.parse(JSON.stringify(mockRootCmdTree))); expect(mocks.CompleteAuthGroupBuilder.getAuthGroup).toHaveBeenCalledTimes(1); // Expect 2 command groups added (auth and config) - expect(autoGenCmdTree.children.length).toBe(3); + expect(autoGenCmdTree.children.length).toBe(2); }); it("should add auto init in the config group when it is defined in Imperative config", () => { From 9831531e53196e98c530449a9955377f26431350 Mon Sep 17 00:00:00 2001 From: Gene Johnston Date: Wed, 6 Dec 2023 16:28:30 -0500 Subject: [PATCH 017/138] Use config not v1 profiles in tests - round 1 Signed-off-by: Gene Johnston --- ...profile.option.mapping.integration.test.ts | 79 ++++++++++--------- .../__scripts__/profiles/banana.config.json | 20 +++++ .../banana_profile_and_specify_cli.sh | 36 +++++---- .../banana_profile_and_specify_env.sh | 44 ++++++----- .../banana_profile_and_specify_env_and_cli.sh | 43 +++++----- .../profiles/base_and_kiwi.config.json | 22 ++++++ .../profiles/base_and_kiwi_profile.sh | 36 ++++----- .../__scripts__/profiles/exitOnFailure.sh | 13 +++ .../profiles/map_banana_to_options.sh | 36 +++++---- .../profiles/map_banana_to_positionals.sh | 35 ++++---- .../__scripts__/profiles/name_type_specify.sh | 38 ++++----- .../profiles/name_type_undefined.sh | 36 +++++---- .../profiles/specify_env_for_array.sh | 14 ++-- .../profiles/specify_env_for_boolean.sh | 14 ++-- .../profiles/specify_env_for_number.sh | 14 ++-- .../profiles/specify_env_for_positional.sh | 18 +++-- .../profiles/specify_env_sweetness.sh | 15 ++-- 17 files changed, 294 insertions(+), 219 deletions(-) create mode 100644 packages/imperative/__tests__/__integration__/cmd/__tests__/integration/cli/profiles/__scripts__/profiles/banana.config.json create mode 100644 packages/imperative/__tests__/__integration__/cmd/__tests__/integration/cli/profiles/__scripts__/profiles/base_and_kiwi.config.json create mode 100644 packages/imperative/__tests__/__integration__/cmd/__tests__/integration/cli/profiles/__scripts__/profiles/exitOnFailure.sh diff --git a/packages/imperative/__tests__/__integration__/cmd/__tests__/integration/cli/profiles/Cmd.cli.profile.option.mapping.integration.test.ts b/packages/imperative/__tests__/__integration__/cmd/__tests__/integration/cli/profiles/Cmd.cli.profile.option.mapping.integration.test.ts index 3d30bbd6db..2feb0fb158 100644 --- a/packages/imperative/__tests__/__integration__/cmd/__tests__/integration/cli/profiles/Cmd.cli.profile.option.mapping.integration.test.ts +++ b/packages/imperative/__tests__/__integration__/cmd/__tests__/integration/cli/profiles/Cmd.cli.profile.option.mapping.integration.test.ts @@ -35,14 +35,14 @@ describe("cmd-cli profile mapping", () => { const moldType = "none"; const response = runCliScript(__dirname + "/__scripts__/profiles/map_banana_to_options.sh", TEST_ENVIRONMENT.workingDir, [color, description, moldType]); - expect(response.stderr.toString()).toContain("The command 'profiles create' is deprecated."); - expect(response.status).toBe(0); // the output of the command should use the profile values + expect(response.stderr.toString()).toBe(""); expect(response.stdout.toString()).toContain("Color: " + color); expect(response.stdout.toString()).toContain("Description: " + description); expect(response.stdout.toString()).toContain("Mold type: " + moldType); expect(response.stdout.toString()).toContain("Sweetness: mild"); + expect(response.status).toBe(0); }); it("should have command line arguments take precedence over profile fields", () => { @@ -55,14 +55,14 @@ describe("cmd-cli profile mapping", () => { const cliMoldType = "no mold at all"; const response = runCliScript(__dirname + "/__scripts__/profiles/banana_profile_and_specify_cli.sh", TEST_ENVIRONMENT.workingDir, [color, description, moldType, cliColor, cliDescription, cliMoldType]); - expect(response.stderr.toString()).toContain("The command 'profiles create' is deprecated."); - expect(response.status).toBe(0); // the output of the command should use the CLI arguments + expect(response.stderr.toString()).toBe(""); expect(response.stdout.toString()).toContain("Color: " + cliColor); expect(response.stdout.toString()).toContain("Description: " + cliDescription); expect(response.stdout.toString()).toContain("Mold type: " + cliMoldType); expect(response.stdout.toString()).toContain("Sweetness: mild"); + expect(response.status).toBe(0); }); it("should have environmental variables take precedence over profile fields", () => { @@ -75,14 +75,14 @@ describe("cmd-cli profile mapping", () => { const envMoldType = "no mold at all"; const response = runCliScript(__dirname + "/__scripts__/profiles/banana_profile_and_specify_env.sh", TEST_ENVIRONMENT.workingDir, [color, description, moldType, envColor, envDescription, envMoldType]); - expect(response.stderr.toString()).toContain("The command 'profiles create' is deprecated."); - expect(response.status).toBe(0); // the output of the command should use the env variable values + expect(response.stderr.toString()).toBe(""); expect(response.stdout.toString()).toContain("Color: " + envColor); expect(response.stdout.toString()).toContain("Description: " + envDescription); expect(response.stdout.toString()).toContain("Mold type: " + envMoldType); expect(response.stdout.toString()).toContain("Sweetness: mild"); + expect(response.status).toBe(0); }); it("should have command line arguments take precedence over profile fields and environmental variables", () => { @@ -102,14 +102,14 @@ describe("cmd-cli profile mapping", () => { const response = runCliScript(__dirname + "/__scripts__/profiles/banana_profile_and_specify_env_and_cli.sh", TEST_ENVIRONMENT.workingDir, [color, description, moldType, envColor, envDescription, envMoldType, cliColor, cliDescription, cliMoldType]); - expect(response.stderr.toString()).toContain("The command 'profiles create' is deprecated."); - expect(response.status).toBe(0); // the output of the command should use the CLI arguments + expect(response.stderr.toString()).toBe(""); expect(response.stdout.toString()).toContain("Color: " + cliColor); expect(response.stdout.toString()).toContain("Description: " + cliDescription); expect(response.stdout.toString()).toContain("Mold type: " + cliMoldType); expect(response.stdout.toString()).toContain("Sweetness: mild"); + expect(response.status).toBe(0); }); it("should have environmental variables take precedence over default values", () => { @@ -123,15 +123,15 @@ describe("cmd-cli profile mapping", () => { const response = runCliScript(__dirname + "/__scripts__/profiles/specify_env_sweetness.sh", TEST_ENVIRONMENT.workingDir, [cliColor, cliDescription, cliMoldType, envSweetness]); - expect(response.stderr.toString()).toBe(""); - expect(response.status).toBe(0); // the output of the command should use the CLI arguments // except for sweetness which was specified by environmental variables + expect(response.stderr.toString()).toBe(""); expect(response.stdout.toString()).toContain("Color: " + cliColor); expect(response.stdout.toString()).toContain("Description: " + cliDescription); expect(response.stdout.toString()).toContain("Mold type: " + cliMoldType); expect(response.stdout.toString()).toContain("Sweetness: " + envSweetness); + expect(response.status).toBe(0); }); it("should have service profile fields take precedence over base profile fields", () => { @@ -140,13 +140,13 @@ describe("cmd-cli profile mapping", () => { const kiwiAmount = 1000; const response = runCliScript(__dirname + "/__scripts__/profiles/base_and_kiwi_profile.sh", TEST_ENVIRONMENT.workingDir, [baseAmount, basePrice, kiwiAmount]); - expect(response.stderr.toString()).toContain("The command 'profiles create' is deprecated."); - expect(response.status).toBe(0); // the output of the command should use the base profile values // except for amount which was specified in service profile + expect(response.stderr.toString()).toBe(""); expect(response.stdout.toString()).toContain(`Amount: ${kiwiAmount}`); expect(response.stdout.toString()).toContain(`Price: ${basePrice}`); + expect(response.status).toBe(0); }); it("should be able to specify positional options via environmental variables", () => { @@ -156,13 +156,13 @@ describe("cmd-cli profile mapping", () => { const envMoldType = "no mold at all"; const response = runCliScript(__dirname + "/__scripts__/profiles/specify_env_for_positional.sh", TEST_ENVIRONMENT.workingDir, [envColor, envDescription, envMoldType]); - expect(response.stderr.toString()).toBe(""); - expect(response.status).toBe(0); // the output of the command should use the env variable values + expect(response.stderr.toString()).toBe(""); expect(response.stdout.toString()).toContain("Color: " + envColor); expect(response.stdout.toString()).toContain("Description: " + envDescription); expect(response.stdout.toString()).toContain("Mold type: " + envMoldType); + expect(response.status).toBe(0); }); it("should map profile fields to positional options", () => { @@ -171,13 +171,13 @@ describe("cmd-cli profile mapping", () => { const moldType = "none"; const response = runCliScript(__dirname + "/__scripts__/profiles/map_banana_to_positionals.sh", TEST_ENVIRONMENT.workingDir, [color, description, moldType]); - expect(response.stderr.toString()).toContain("The command 'profiles create' is deprecated."); - expect(response.status).toBe(0); // the output of the command should use the profile values + expect(response.stderr.toString()).toBe(""); expect(response.stdout.toString()).toContain("Color: " + color); expect(response.stdout.toString()).toContain("Description: " + description); expect(response.stdout.toString()).toContain("Mold type: " + moldType); + expect(response.status).toBe(0); }); it("should be able to specify valid number type options via environmental variables", () => { @@ -188,14 +188,14 @@ describe("cmd-cli profile mapping", () => { const envSides = "443"; const response = runCliScript(__dirname + "/__scripts__/profiles/specify_env_for_number.sh", TEST_ENVIRONMENT.workingDir, [cliColor, cliDescription, cliMoldType, envSides]); - expect(response.stderr.toString()).toBe(""); - expect(response.status).toBe(0); // the output of the command should use the env variable values + expect(response.stderr.toString()).toBe(""); expect(response.stdout.toString()).toContain("Color: " + cliColor); expect(response.stdout.toString()).toContain("Description: " + cliDescription); expect(response.stdout.toString()).toContain("Mold type: " + cliMoldType); expect(response.stdout.toString()).toContain("Sides: " + envSides); + expect(response.status).toBe(0); }); it("should get a syntax error when specifying a non-numeric value via environmental variables", () => { @@ -207,14 +207,17 @@ describe("cmd-cli profile mapping", () => { const response = runCliScript(__dirname + "/__scripts__/profiles/specify_env_for_number.sh", TEST_ENVIRONMENT.workingDir, [cliColor, cliDescription, cliMoldType, envSides]); - expect(response.stderr.toString()).toContain("failed!"); - expect(response.stderr.toString()).toContain("Syntax"); - expect(response.stderr.toString()).toContain("number"); + expect(response.stderr.toString()).toContain("Syntax Error"); + expect(response.stderr.toString()).toContain("Invalid value specified for option"); + expect(response.stderr.toString()).toContain("--sides"); + expect(response.stderr.toString()).toContain("You specified"); + expect(response.stderr.toString()).toContain(envSides); + expect(response.stderr.toString()).toContain("The value must be a number"); expect(response.stderr.toString()).toContain(envSides); expect(response.status).toBe(1); }); - it("should be able to specify valid boolean type options (true) via environmental variables", () => { + it("should be able to specify true boolean type options via environmental variables", () => { // values used as env variables const cliColor = "yellow and black"; const cliDescription = "A beautiful bunch of ripe banana hides the deadly black tarantula"; @@ -222,17 +225,17 @@ describe("cmd-cli profile mapping", () => { const envRipe = "true"; const response = runCliScript(__dirname + "/__scripts__/profiles/specify_env_for_boolean.sh", TEST_ENVIRONMENT.workingDir, [cliColor, cliDescription, cliMoldType, envRipe]); - expect(response.stderr.toString()).toBe(""); - expect(response.status).toBe(0); // the output of the command should use the env variable values + expect(response.stderr.toString()).toBe(""); expect(response.stdout.toString()).toContain("Color: " + cliColor); expect(response.stdout.toString()).toContain("Description: " + cliDescription); expect(response.stdout.toString()).toContain("Mold type: " + cliMoldType); expect(response.stdout.toString()).toContain("Ripe: true"); + expect(response.status).toBe(0); }); - it("should be able to specify valid boolean type options (false) via environmental variables", () => { + it("should be able to specify false boolean type options via environmental variables", () => { // values used as env variables const cliColor = "yellow and black"; const cliDescription = "A beautiful bunch of ripe banana hides the deadly black tarantula"; @@ -240,14 +243,14 @@ describe("cmd-cli profile mapping", () => { const envRipe = "false"; const response = runCliScript(__dirname + "/__scripts__/profiles/specify_env_for_boolean.sh", TEST_ENVIRONMENT.workingDir, [cliColor, cliDescription, cliMoldType, envRipe]); - expect(response.stderr.toString()).toBe(""); - expect(response.status).toBe(0); // the output of the command should use the env variable values + expect(response.stderr.toString()).toBe(""); expect(response.stdout.toString()).toContain("Color: " + cliColor); expect(response.stdout.toString()).toContain("Description: " + cliDescription); expect(response.stdout.toString()).toContain("Mold type: " + cliMoldType); expect(response.stdout.toString()).toContain("Ripe: false"); + expect(response.status).toBe(0); }); it("should get a syntax error when specifying a non-boolean value via environmental variables", () => { @@ -259,10 +262,12 @@ describe("cmd-cli profile mapping", () => { const response = runCliScript(__dirname + "/__scripts__/profiles/specify_env_for_boolean.sh", TEST_ENVIRONMENT.workingDir, [cliColor, cliDescription, cliMoldType, envRipe]); - expect(response.stderr.toString()).toContain("failed!"); - expect(response.stderr.toString()).toContain("Syntax"); - expect(response.stderr.toString()).toContain("boolean"); + expect(response.stderr.toString()).toContain("Syntax Error"); + expect(response.stderr.toString()).toContain("Invalid value specified for option"); + expect(response.stderr.toString()).toContain("--ripe (-r)"); + expect(response.stderr.toString()).toContain("You specified"); expect(response.stderr.toString()).toContain(envRipe); + expect(response.stderr.toString()).toContain("The value must be a boolean (true or false)"); expect(response.status).toBe(1); }); @@ -277,16 +282,16 @@ describe("cmd-cli profile mapping", () => { }).join(" "); const response = runCliScript(__dirname + "/__scripts__/profiles/specify_env_for_array.sh", TEST_ENVIRONMENT.workingDir, [cliColor, cliDescription, cliMoldType, envNames]); - expect(response.stderr.toString()).toBe(""); - expect(response.status).toBe(0); // the output of the command should use the env variable values + expect(response.stderr.toString()).toBe(""); expect(response.stdout.toString()).toContain("Color: " + cliColor); expect(response.stdout.toString()).toContain("Description: " + cliDescription); expect(response.stdout.toString()).toContain("Mold type: " + cliMoldType); for (const name of rawNames) { expect(response.stdout.toString()).toContain(name.replace("\\'", "'")); } + expect(response.status).toBe(0); }); it("should not map profile fields to --name or --type", () => { @@ -296,11 +301,12 @@ describe("cmd-cli profile mapping", () => { const moldType = "none"; const response = runCliScript(__dirname + "/__scripts__/profiles/name_type_undefined.sh", TEST_ENVIRONMENT.workingDir, [color, description, moldType]); - expect(response.stderr.toString()).toContain("The command 'profiles create' is deprecated."); - expect(response.status).toBe(0); + // name and type should be undefined since we did not specify them via command line + expect(response.stderr.toString()).toBe(""); expect(response.stdout.toString()).toContain("Name: undefined"); expect(response.stdout.toString()).toContain("Type: undefined"); + expect(response.status).toBe(0); }); it("should still be able to specify --name and --type on command line", () => { // values used as env variables @@ -311,10 +317,11 @@ describe("cmd-cli profile mapping", () => { const cliType = "Big"; const response = runCliScript(__dirname + "/__scripts__/profiles/name_type_specify.sh", TEST_ENVIRONMENT.workingDir, [color, description, moldType, cliName, cliType]); - expect(response.stderr.toString()).toContain("The command 'profiles create' is deprecated."); - expect(response.status).toBe(0); + // name and type should be undefined since we did not specify them via command line + expect(response.stderr.toString()).toBe(""); expect(response.stdout.toString()).toContain("Name: " + cliName); expect(response.stdout.toString()).toContain("Type: " + cliType); + expect(response.status).toBe(0); }); }); diff --git a/packages/imperative/__tests__/__integration__/cmd/__tests__/integration/cli/profiles/__scripts__/profiles/banana.config.json b/packages/imperative/__tests__/__integration__/cmd/__tests__/integration/cli/profiles/__scripts__/profiles/banana.config.json new file mode 100644 index 0000000000..a731429402 --- /dev/null +++ b/packages/imperative/__tests__/__integration__/cmd/__tests__/integration/cli/profiles/__scripts__/profiles/banana.config.json @@ -0,0 +1,20 @@ +{ + "profiles": { + "bananaProfName": { + "type": "banana", + "properties": { + "color": "NoColorVal", + "bananaDescription": "NoDescriptionVal", + "moldType": "NoMoldTypeVal", + "sweetness": "mild", + "ripe": false, + "sides": 0, + "names": ["NoNamesVal"] + } + }, + }, + "defaults": { + "banana": "bananaProfName" + }, + "autoStore": true +} \ No newline at end of file diff --git a/packages/imperative/__tests__/__integration__/cmd/__tests__/integration/cli/profiles/__scripts__/profiles/banana_profile_and_specify_cli.sh b/packages/imperative/__tests__/__integration__/cmd/__tests__/integration/cli/profiles/__scripts__/profiles/banana_profile_and_specify_cli.sh index 874280e425..de3abf864b 100644 --- a/packages/imperative/__tests__/__integration__/cmd/__tests__/integration/cli/profiles/__scripts__/profiles/banana_profile_and_specify_cli.sh +++ b/packages/imperative/__tests__/__integration__/cmd/__tests__/integration/cli/profiles/__scripts__/profiles/banana_profile_and_specify_cli.sh @@ -1,25 +1,27 @@ #!/bin/bash -color=$1 -description=$2 -moldtype=$3 +profileColor=$1 +profileDescription=$2 +profileMoldType=$3 cliColor=$4 cliDescription=$5 cliMoldType=$6 -# First create a banana profile -cmd-cli profiles create banana-profile "test_banana" --color "$color" --banana-description "$description" --mold-type "$moldtype" -CMDRC=$? -if [ $CMDRC -gt 0 ] -then - echo "Creating a test_banana profile of type banana failed!" 1>&2 - exit $CMDRC -fi +# include exitOnFailure function +myScriptDir=`dirname $0` +source $myScriptDir/exitOnFailure.sh + +# set desired properties in our config file +cp $myScriptDir/banana.config.json . +exitOnFailure "Failed to copy config file." $? + +sed -e "s/NoColorVal/$profileColor/" \ + -e "s/NoDescriptionVal/$profileDescription/" \ + -e "s/NoMoldTypeVal/$profileMoldType/" \ + < banana.config.json > cmd-cli.config.json +exitOnFailure "Failed to update config file." $? + +# show the property values that will be used cmd-cli profile mapping --color "$cliColor" --banana-description "$cliDescription" --mold-type "$cliMoldType" -CMDRC=$? -if [ $CMDRC -gt 0 ] -then - echo "Profile mapping command failed!" 1>&2 - exit $CMDRC -fi +exitOnFailure "The 'profile mapping' command failed." $? diff --git a/packages/imperative/__tests__/__integration__/cmd/__tests__/integration/cli/profiles/__scripts__/profiles/banana_profile_and_specify_env.sh b/packages/imperative/__tests__/__integration__/cmd/__tests__/integration/cli/profiles/__scripts__/profiles/banana_profile_and_specify_env.sh index 66411bdf10..a8fd8fc1c6 100644 --- a/packages/imperative/__tests__/__integration__/cmd/__tests__/integration/cli/profiles/__scripts__/profiles/banana_profile_and_specify_env.sh +++ b/packages/imperative/__tests__/__integration__/cmd/__tests__/integration/cli/profiles/__scripts__/profiles/banana_profile_and_specify_env.sh @@ -1,25 +1,27 @@ #!/bin/bash -color=$1 -description=$2 -moldtype=$3 +profileColor=$1 +profileDescription=$2 +profileMoldType=$3 -cliColor=$4 -cliDescription=$5 -cliMoldType=$6 -# First create a banana profile -cmd-cli profiles create banana-profile "test_banana" --color "$color" --banana-description "$description" --mold-type "$moldtype" -CMDRC=$? -if [ $CMDRC -gt 0 ] -then - echo "Creating a test_banana profile of type banana failed!" 1>&2 - exit $CMDRC -fi +envColor=$4 +envDescription=$5 +envMoldType=$6 -CMD_CLI_OPT_COLOR="$4" CMD_CLI_OPT_BANANA_DESCRIPTION="$5" CMD_CLI_OPT_MOLD_TYPE="$6" cmd-cli profile mapping -CMDRC=$? -if [ $CMDRC -gt 0 ] -then - echo "Profile mapping command failed!" 1>&2 - exit $CMDRC -fi +# include exitOnFailure function +myScriptDir=`dirname $0` +source $myScriptDir/exitOnFailure.sh + +# set desired properties in our config file +cp $myScriptDir/banana.config.json . +exitOnFailure "Failed to copy config file." $? + +sed -e "s/NoColorVal/$profileColor/" \ + -e "s/NoDescriptionVal/$profileDescription/" \ + -e "s/NoMoldTypeVal/$profileMoldType/" \ + < banana.config.json > cmd-cli.config.json +exitOnFailure "Failed to update config file." $? + +# show the property values that will be used +CMD_CLI_OPT_COLOR="$envColor" CMD_CLI_OPT_BANANA_DESCRIPTION="$envDescription" CMD_CLI_OPT_MOLD_TYPE="$envMoldType" cmd-cli profile mapping +exitOnFailure "The 'profile mapping' command failed." $? diff --git a/packages/imperative/__tests__/__integration__/cmd/__tests__/integration/cli/profiles/__scripts__/profiles/banana_profile_and_specify_env_and_cli.sh b/packages/imperative/__tests__/__integration__/cmd/__tests__/integration/cli/profiles/__scripts__/profiles/banana_profile_and_specify_env_and_cli.sh index ae000d93a6..9bb22d9f17 100644 --- a/packages/imperative/__tests__/__integration__/cmd/__tests__/integration/cli/profiles/__scripts__/profiles/banana_profile_and_specify_env_and_cli.sh +++ b/packages/imperative/__tests__/__integration__/cmd/__tests__/integration/cli/profiles/__scripts__/profiles/banana_profile_and_specify_env_and_cli.sh @@ -1,25 +1,32 @@ #!/bin/bash -color=$1 -description=$2 -moldtype=$3 +profileColor=$1 +profileDescription=$2 +profileMoldType=$3 + +envColor=$4 +envDescription=$5 +envMoldType=$6 cliColor=$7 cliDescription=$8 cliMoldType=$9 -# First create a banana profile -cmd-cli profiles create banana-profile "test_banana" --color "$color" --banana-description "$description" --mold-type "$moldtype" -CMDRC=$? -if [ $CMDRC -gt 0 ] -then - echo "Creating a test_banana profile of type banana failed!" 1>&2 - exit $CMDRC -fi -CMD_CLI_OPT_COLOR="$4" CMD_CLI_OPT_BANANA_DESCRIPTION="$5" CMD_CLI_OPT_MOLD_TYPE="$6" cmd-cli profile mapping --color "$cliColor" --banana-description "$cliDescription" --mold-type "$cliMoldType" -CMDRC=$? -if [ $CMDRC -gt 0 ] -then - echo "Profile mapping command failed!" 1>&2 - exit $CMDRC -fi +# include exitOnFailure function +myScriptDir=`dirname $0` +source $myScriptDir/exitOnFailure.sh + +# set desired properties in our config file +cp $myScriptDir/banana.config.json . +exitOnFailure "Failed to copy config file." $? + +sed -e "s/NoColorVal/$profileColor/" \ + -e "s/NoDescriptionVal/$profileDescription/" \ + -e "s/NoMoldTypeVal/$profileMoldType/" \ + < banana.config.json > cmd-cli.config.json +exitOnFailure "Failed to update config file." $? + +# show the property values that will be used +CMD_CLI_OPT_COLOR="$envColor" CMD_CLI_OPT_BANANA_DESCRIPTION="$envDescription" CMD_CLI_OPT_MOLD_TYPE="$envMoldType" \ + cmd-cli profile mapping --color "$cliColor" --banana-description "$cliDescription" --mold-type "$cliMoldType" +exitOnFailure "The 'profile mapping' command failed." $? diff --git a/packages/imperative/__tests__/__integration__/cmd/__tests__/integration/cli/profiles/__scripts__/profiles/base_and_kiwi.config.json b/packages/imperative/__tests__/__integration__/cmd/__tests__/integration/cli/profiles/__scripts__/profiles/base_and_kiwi.config.json new file mode 100644 index 0000000000..cab203266e --- /dev/null +++ b/packages/imperative/__tests__/__integration__/cmd/__tests__/integration/cli/profiles/__scripts__/profiles/base_and_kiwi.config.json @@ -0,0 +1,22 @@ +{ + "profiles": { + "baseProfName": { + "type": "base", + "properties": { + "amount": NoBaseAmountVal, + "price": NoBasePriceVal + } + }, + "kiwiProfName": { + "type": "kiwi", + "properties": { + "amount": NoKiwiAmountVal + } + } + }, + "defaults": { + "base": "baseProfName", + "kiwi": "kiwiProfName" + }, + "autoStore": true +} \ No newline at end of file diff --git a/packages/imperative/__tests__/__integration__/cmd/__tests__/integration/cli/profiles/__scripts__/profiles/base_and_kiwi_profile.sh b/packages/imperative/__tests__/__integration__/cmd/__tests__/integration/cli/profiles/__scripts__/profiles/base_and_kiwi_profile.sh index 81a7bc8bab..c255f1f6f6 100644 --- a/packages/imperative/__tests__/__integration__/cmd/__tests__/integration/cli/profiles/__scripts__/profiles/base_and_kiwi_profile.sh +++ b/packages/imperative/__tests__/__integration__/cmd/__tests__/integration/cli/profiles/__scripts__/profiles/base_and_kiwi_profile.sh @@ -4,28 +4,20 @@ baseAmount=$1 basePrice=$2 kiwiAmount=$3 -# First create a base profile -cmd-cli profiles create base-profile "test_base" --amount $baseAmount --price $basePrice -CMDRC=$? -if [ $CMDRC -gt 0 ] -then - echo "Creating a test_base profile of type base failed!" 1>&2 - exit $CMDRC -fi +# include exitOnFailure function +myScriptDir=`dirname $0` +source $myScriptDir/exitOnFailure.sh -# Next create a kiwi profile -cmd-cli profiles create kiwi-profile "test_kiwi" --amount $kiwiAmount --dd -CMDRC=$? -if [ $CMDRC -gt 0 ] -then - echo "Creating a test_kiwi profile of type kiwi failed!" 1>&2 - exit $CMDRC -fi +# set desired properties in our config file +cp $myScriptDir/base_and_kiwi.config.json . +exitOnFailure "Failed to copy config file." $? +sed -e "s/NoBaseAmountVal/$baseAmount/" \ + -e "s/NoBasePriceVal/$basePrice/" \ + -e "s/NoKiwiAmountVal/$kiwiAmount/" \ + < base_and_kiwi.config.json > cmd-cli.config.json +exitOnFailure "Failed to update config file." $? + +# show the property values that will be used cmd-cli profile mapping-base -CMDRC=$? -if [ $CMDRC -gt 0 ] -then - echo "Profile mapping command failed!" 1>&2 - exit $CMDRC -fi +exitOnFailure "The 'profile mapping' command failed." $? diff --git a/packages/imperative/__tests__/__integration__/cmd/__tests__/integration/cli/profiles/__scripts__/profiles/exitOnFailure.sh b/packages/imperative/__tests__/__integration__/cmd/__tests__/integration/cli/profiles/__scripts__/profiles/exitOnFailure.sh new file mode 100644 index 0000000000..3dbf0d5f8f --- /dev/null +++ b/packages/imperative/__tests__/__integration__/cmd/__tests__/integration/cli/profiles/__scripts__/profiles/exitOnFailure.sh @@ -0,0 +1,13 @@ +#!/bin/bash + +# function to exit if we encounter a bad return code +function exitOnFailure +{ + failureMsg=${1:?"First parm (failureMsg) is required."} + actualExitCode=${2:?"Second parm (actualExitCode) is required."} + goodExitCode=${3:-0} + if [ $actualExitCode != $goodExitCode ]; then + echo `basename $0`": $failureMsg" 1>&2 + exit $actualExitCode + fi +} diff --git a/packages/imperative/__tests__/__integration__/cmd/__tests__/integration/cli/profiles/__scripts__/profiles/map_banana_to_options.sh b/packages/imperative/__tests__/__integration__/cmd/__tests__/integration/cli/profiles/__scripts__/profiles/map_banana_to_options.sh index 250c287730..32eead05a7 100644 --- a/packages/imperative/__tests__/__integration__/cmd/__tests__/integration/cli/profiles/__scripts__/profiles/map_banana_to_options.sh +++ b/packages/imperative/__tests__/__integration__/cmd/__tests__/integration/cli/profiles/__scripts__/profiles/map_banana_to_options.sh @@ -1,21 +1,23 @@ #!/bin/bash -color=$1 -description=$2 -moldtype=$3 -# First create a banana profile -cmd-cli profiles create banana-profile "test_banana" --color "$color" --banana-description "$description" --mold-type "$moldtype" -CMDRC=$? -if [ $CMDRC -gt 0 ] -then - echo "Creating a test_banana profile of type banana failed!" 1>&2 - exit $CMDRC -fi +profileColor=$1 +profileDescription=$2 +profileMoldType=$3 +# include exitOnFailure function +myScriptDir=`dirname $0` +source $myScriptDir/exitOnFailure.sh + +# set desired properties in our config file +cp $myScriptDir/banana.config.json . +exitOnFailure "Failed to copy config file." $? + +sed -e "s/NoColorVal/$profileColor/" \ + -e "s/NoDescriptionVal/$profileDescription/" \ + -e "s/NoMoldTypeVal/$profileMoldType/" \ + < banana.config.json > cmd-cli.config.json +exitOnFailure "Failed to update config file." $? + +# show the property values that will be used cmd-cli profile mapping -CMDRC=$? -if [ $CMDRC -gt 0 ] -then - echo "Profile mapping command failed!" 1>&2 - exit $CMDRC -fi +exitOnFailure "The 'profile mapping' command failed." $? diff --git a/packages/imperative/__tests__/__integration__/cmd/__tests__/integration/cli/profiles/__scripts__/profiles/map_banana_to_positionals.sh b/packages/imperative/__tests__/__integration__/cmd/__tests__/integration/cli/profiles/__scripts__/profiles/map_banana_to_positionals.sh index fd49ad0234..ac50b8ee4d 100644 --- a/packages/imperative/__tests__/__integration__/cmd/__tests__/integration/cli/profiles/__scripts__/profiles/map_banana_to_positionals.sh +++ b/packages/imperative/__tests__/__integration__/cmd/__tests__/integration/cli/profiles/__scripts__/profiles/map_banana_to_positionals.sh @@ -1,21 +1,22 @@ #!/bin/bash -color=$1 -description=$2 -moldtype=$3 -# First create a banana profile -cmd-cli profiles create banana-profile "test_banana" --color "$color" --banana-description "$description" --mold-type "$moldtype" -CMDRC=$? -if [ $CMDRC -gt 0 ] -then - echo "Creating a test_banana profile of type banana failed!" 1>&2 - exit $CMDRC -fi +profileColor=$1 +profileDescription=$2 +profileMoldType=$3 + +# include exitOnFailure function +myScriptDir=`dirname $0` +source $myScriptDir/exitOnFailure.sh + +# set desired properties in our config file +cp $myScriptDir/banana.config.json . +exitOnFailure "Failed to copy config file." $? + +sed -e "s/NoColorVal/$profileColor/" \ + -e "s/NoDescriptionVal/$profileDescription/" \ + -e "s/NoMoldTypeVal/$profileMoldType/" \ + < banana.config.json > cmd-cli.config.json +exitOnFailure "Failed to update config file." $? cmd-cli profile mapping-positional -CMDRC=$? -if [ $CMDRC -gt 0 ] -then - echo "Profile mapping command failed!" 1>&2 - exit $CMDRC -fi +exitOnFailure "The 'profile mapping-positional' command failed." $? diff --git a/packages/imperative/__tests__/__integration__/cmd/__tests__/integration/cli/profiles/__scripts__/profiles/name_type_specify.sh b/packages/imperative/__tests__/__integration__/cmd/__tests__/integration/cli/profiles/__scripts__/profiles/name_type_specify.sh index 22bae3af8f..7051a3e107 100644 --- a/packages/imperative/__tests__/__integration__/cmd/__tests__/integration/cli/profiles/__scripts__/profiles/name_type_specify.sh +++ b/packages/imperative/__tests__/__integration__/cmd/__tests__/integration/cli/profiles/__scripts__/profiles/name_type_specify.sh @@ -1,23 +1,25 @@ #!/bin/bash -color=$1 -description=$2 -moldtype=$3 -# First create a banana profile -cmd-cli profiles create banana-profile "test_banana" --color "$color" --banana-description "$description" --mold-type "$moldtype" -CMDRC=$? -if [ $CMDRC -gt 0 ] -then - echo "Creating a test_banana profile of type banana failed!" 1>&2 - exit $CMDRC -fi - cliName=$4 +profileColor=$1 +profileDescription=$2 +profileMoldType=$3 +cliName=$4 cliType=$5 + +# include exitOnFailure function +myScriptDir=`dirname $0` +source $myScriptDir/exitOnFailure.sh + +# set desired properties in our config file +cp $myScriptDir/banana.config.json . +exitOnFailure "Failed to copy config file." $? + +sed -e "s/NoColorVal/$profileColor/" \ + -e "s/NoDescriptionVal/$profileDescription/" \ + -e "s/NoMoldTypeVal/$profileMoldType/" \ + < banana.config.json > cmd-cli.config.json +exitOnFailure "Failed to update config file." $? + # should print the name and type that are specified, not the profile name or type cmd-cli profile mapping-name-type "$cliName" --type "$cliType" -CMDRC=$? -if [ $CMDRC -gt 0 ] -then - echo "Profile mapping command failed!" 1>&2 - exit $CMDRC -fi \ No newline at end of file +exitOnFailure "The 'profile mapping-name-type' command failed." $? diff --git a/packages/imperative/__tests__/__integration__/cmd/__tests__/integration/cli/profiles/__scripts__/profiles/name_type_undefined.sh b/packages/imperative/__tests__/__integration__/cmd/__tests__/integration/cli/profiles/__scripts__/profiles/name_type_undefined.sh index 82b1bd9c7b..a15cb9d517 100644 --- a/packages/imperative/__tests__/__integration__/cmd/__tests__/integration/cli/profiles/__scripts__/profiles/name_type_undefined.sh +++ b/packages/imperative/__tests__/__integration__/cmd/__tests__/integration/cli/profiles/__scripts__/profiles/name_type_undefined.sh @@ -1,21 +1,23 @@ #!/bin/bash -color=$1 -description=$2 -moldtype=$3 -# First create a banana profile -cmd-cli profiles create banana-profile "test_banana" --color "$color" --banana-description "$description" --mold-type "$moldtype" -CMDRC=$? -if [ $CMDRC -gt 0 ] -then - echo "Creating a test_banana profile of type banana failed!" 1>&2 - exit $CMDRC -fi +profileColor=$1 +profileDescription=$2 +profileMoldType=$3 + +# include exitOnFailure function +myScriptDir=`dirname $0` +source $myScriptDir/exitOnFailure.sh + +# set desired properties in our config file +cp $myScriptDir/banana.config.json . +exitOnFailure "Failed to copy config file." $? + +sed -e "s/NoColorVal/$profileColor/" \ + -e "s/NoDescriptionVal/$profileDescription/" \ + -e "s/NoMoldTypeVal/$profileMoldType/" \ + < banana.config.json > cmd-cli.config.json +exitOnFailure "Failed to update config file." $? + # should print name: undefined type: undefined, not the profile name or type cmd-cli profile mapping-name-type -CMDRC=$? -if [ $CMDRC -gt 0 ] -then - echo "Profile mapping command failed!" 1>&2 - exit $CMDRC -fi \ No newline at end of file +exitOnFailure "The 'profile mapping-name-type' command failed." $? diff --git a/packages/imperative/__tests__/__integration__/cmd/__tests__/integration/cli/profiles/__scripts__/profiles/specify_env_for_array.sh b/packages/imperative/__tests__/__integration__/cmd/__tests__/integration/cli/profiles/__scripts__/profiles/specify_env_for_array.sh index 96e1f69290..543124e06d 100644 --- a/packages/imperative/__tests__/__integration__/cmd/__tests__/integration/cli/profiles/__scripts__/profiles/specify_env_for_array.sh +++ b/packages/imperative/__tests__/__integration__/cmd/__tests__/integration/cli/profiles/__scripts__/profiles/specify_env_for_array.sh @@ -3,11 +3,11 @@ cliColor=$1 cliDescription=$2 cliMoldType=$3 +envNames=$4 -CMD_CLI_OPT_NAMES="$4" cmd-cli profile mapping --color "$cliColor" --banana-description "$cliDescription" --mold-type "$cliMoldType" -CMDRC=$? -if [ $CMDRC -gt 0 ] -then - echo "Profile mapping command failed!" 1>&2 - exit $CMDRC -fi +# include exitOnFailure function +myScriptDir=`dirname $0` +source $myScriptDir/exitOnFailure.sh + +CMD_CLI_OPT_NAMES="$envNames" cmd-cli profile mapping --color "$cliColor" --banana-description "$cliDescription" --mold-type "$cliMoldType" +exitOnFailure "The 'profile mapping' command failed." $? diff --git a/packages/imperative/__tests__/__integration__/cmd/__tests__/integration/cli/profiles/__scripts__/profiles/specify_env_for_boolean.sh b/packages/imperative/__tests__/__integration__/cmd/__tests__/integration/cli/profiles/__scripts__/profiles/specify_env_for_boolean.sh index 7f234835ba..5d5d614025 100644 --- a/packages/imperative/__tests__/__integration__/cmd/__tests__/integration/cli/profiles/__scripts__/profiles/specify_env_for_boolean.sh +++ b/packages/imperative/__tests__/__integration__/cmd/__tests__/integration/cli/profiles/__scripts__/profiles/specify_env_for_boolean.sh @@ -3,11 +3,11 @@ cliColor=$1 cliDescription=$2 cliMoldType=$3 +envRipe=$4 -CMD_CLI_OPT_RIPE=$4 cmd-cli profile mapping --color "$cliColor" --banana-description "$cliDescription" --mold-type "$cliMoldType" -CMDRC=$? -if [ $CMDRC -gt 0 ] -then - echo "Profile mapping command failed!" 1>&2 - exit $CMDRC -fi +# include exitOnFailure function +myScriptDir=`dirname $0` +source $myScriptDir/exitOnFailure.sh + +CMD_CLI_OPT_RIPE=$envRipe cmd-cli profile mapping --color "$cliColor" --banana-description "$cliDescription" --mold-type "$cliMoldType" +exitOnFailure "The 'profile mapping' command failed." $? diff --git a/packages/imperative/__tests__/__integration__/cmd/__tests__/integration/cli/profiles/__scripts__/profiles/specify_env_for_number.sh b/packages/imperative/__tests__/__integration__/cmd/__tests__/integration/cli/profiles/__scripts__/profiles/specify_env_for_number.sh index ab7258c438..6f72f5676d 100644 --- a/packages/imperative/__tests__/__integration__/cmd/__tests__/integration/cli/profiles/__scripts__/profiles/specify_env_for_number.sh +++ b/packages/imperative/__tests__/__integration__/cmd/__tests__/integration/cli/profiles/__scripts__/profiles/specify_env_for_number.sh @@ -3,11 +3,11 @@ cliColor=$1 cliDescription=$2 cliMoldType=$3 +envSides=$4 -CMD_CLI_OPT_SIDES=$4 cmd-cli profile mapping --color "$cliColor" --banana-description "$cliDescription" --mold-type "$cliMoldType" -CMDRC=$? -if [ $CMDRC -gt 0 ] -then - echo "Profile mapping command failed!" 1>&2 - exit $CMDRC -fi +# include exitOnFailure function +myScriptDir=`dirname $0` +source $myScriptDir/exitOnFailure.sh + +CMD_CLI_OPT_SIDES=$envSides cmd-cli profile mapping --color "$cliColor" --banana-description "$cliDescription" --mold-type "$cliMoldType" +exitOnFailure "The 'profile mapping' command failed." $? diff --git a/packages/imperative/__tests__/__integration__/cmd/__tests__/integration/cli/profiles/__scripts__/profiles/specify_env_for_positional.sh b/packages/imperative/__tests__/__integration__/cmd/__tests__/integration/cli/profiles/__scripts__/profiles/specify_env_for_positional.sh index ef2b4c71f5..f46ea8711a 100644 --- a/packages/imperative/__tests__/__integration__/cmd/__tests__/integration/cli/profiles/__scripts__/profiles/specify_env_for_positional.sh +++ b/packages/imperative/__tests__/__integration__/cmd/__tests__/integration/cli/profiles/__scripts__/profiles/specify_env_for_positional.sh @@ -1,9 +1,13 @@ #!/bin/bash -CMD_CLI_OPT_COLOR="$1" CMD_CLI_OPT_BANANA_DESCRIPTION="$2" CMD_CLI_OPT_MOLD_TYPE="$3" cmd-cli profile mapping-positional -CMDRC=$? -if [ $CMDRC -gt 0 ] -then - echo "Profile mapping command failed!" 1>&2 - exit $CMDRC -fi +envColor=$1 +envDescription=$2 +envMoldType=$3 + +# include exitOnFailure function +myScriptDir=`dirname $0` +source $myScriptDir/exitOnFailure.sh + +CMD_CLI_OPT_COLOR="$envColor" CMD_CLI_OPT_BANANA_DESCRIPTION="$envDescription" CMD_CLI_OPT_MOLD_TYPE="$envMoldType" \ + cmd-cli profile mapping-positional +exitOnFailure "The 'profile mapping-positional' command failed." $? diff --git a/packages/imperative/__tests__/__integration__/cmd/__tests__/integration/cli/profiles/__scripts__/profiles/specify_env_sweetness.sh b/packages/imperative/__tests__/__integration__/cmd/__tests__/integration/cli/profiles/__scripts__/profiles/specify_env_sweetness.sh index 9137cab837..c2a9d0ddcd 100644 --- a/packages/imperative/__tests__/__integration__/cmd/__tests__/integration/cli/profiles/__scripts__/profiles/specify_env_sweetness.sh +++ b/packages/imperative/__tests__/__integration__/cmd/__tests__/integration/cli/profiles/__scripts__/profiles/specify_env_sweetness.sh @@ -1,14 +1,13 @@ #!/bin/bash - cliColor=$1 cliDescription=$2 cliMoldType=$3 +envSweetness=$4 + +# include exitOnFailure function +myScriptDir=`dirname $0` +source $myScriptDir/exitOnFailure.sh -CMD_CLI_OPT_SWEETNESS="$4" cmd-cli profile mapping --color "$cliColor" --banana-description "$cliDescription" --mold-type "$cliMoldType" -CMDRC=$? -if [ $CMDRC -gt 0 ] -then - echo "Profile mapping command failed!" 1>&2 - exit $CMDRC -fi +CMD_CLI_OPT_SWEETNESS="$envSweetness" cmd-cli profile mapping --color "$cliColor" --banana-description "$cliDescription" --mold-type "$cliMoldType" +exitOnFailure "The 'profile mapping' command failed." $? From 01a42ce56beb451a42e0b638861a1cbfdd6352e2 Mon Sep 17 00:00:00 2001 From: Gene Johnston Date: Thu, 7 Dec 2023 16:29:16 -0500 Subject: [PATCH 018/138] Remove tests of v1 profiles - round 1 Signed-off-by: Gene Johnston --- ....create.banana-profile.integration.test.ts | 60 ------------------- ...ofiles.create.insecure.integration.test.ts | 34 ----------- .../profiles/create_insecure_profile.sh | 10 ---- .../profiles/create_some_profiles.sh | 37 ------------ .../profiles/list_profiles_of_type.sh | 3 - ...te.banana-profile.integration.test.ts.snap | 30 ---------- 6 files changed, 174 deletions(-) delete mode 100644 packages/imperative/__tests__/__integration__/cmd/__tests__/integration/cli/profiles/Cmd.cli.profiles.create.banana-profile.integration.test.ts delete mode 100644 packages/imperative/__tests__/__integration__/cmd/__tests__/integration/cli/profiles/Cmd.cli.profiles.create.insecure.integration.test.ts delete mode 100644 packages/imperative/__tests__/__integration__/cmd/__tests__/integration/cli/profiles/__scripts__/profiles/create_insecure_profile.sh delete mode 100644 packages/imperative/__tests__/__integration__/cmd/__tests__/integration/cli/profiles/__scripts__/profiles/create_some_profiles.sh delete mode 100644 packages/imperative/__tests__/__integration__/cmd/__tests__/integration/cli/profiles/__scripts__/profiles/list_profiles_of_type.sh delete mode 100644 packages/imperative/__tests__/__integration__/cmd/__tests__/integration/cli/profiles/__snapshots__/Cmd.cli.profiles.create.banana-profile.integration.test.ts.snap diff --git a/packages/imperative/__tests__/__integration__/cmd/__tests__/integration/cli/profiles/Cmd.cli.profiles.create.banana-profile.integration.test.ts b/packages/imperative/__tests__/__integration__/cmd/__tests__/integration/cli/profiles/Cmd.cli.profiles.create.banana-profile.integration.test.ts deleted file mode 100644 index 2eb8e00b9f..0000000000 --- a/packages/imperative/__tests__/__integration__/cmd/__tests__/integration/cli/profiles/Cmd.cli.profiles.create.banana-profile.integration.test.ts +++ /dev/null @@ -1,60 +0,0 @@ -/* -* 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 { runCliScript } from "../../../../../../src/TestUtil"; -import { ITestEnvironment } from "../../../../../../__src__/environment/doc/response/ITestEnvironment"; -import { SetupTestEnvironment } from "../../../../../../__src__/environment/SetupTestEnvironment"; -// Test Environment populated in the beforeAll(); -let TEST_ENVIRONMENT: ITestEnvironment; -describe("cmd-cli profiles create banana", () => { - // Create the unique test environment - beforeAll(async () => { - TEST_ENVIRONMENT = await SetupTestEnvironment.createTestEnv({ - cliHomeEnvVar: "CMD_CLI_CLI_HOME", - testName: "cmd_profiles_create_banana" - }); - }); - - it("should create profiles and only list the type requested", () => { - - // Create a few profiles of multiple types - const response = runCliScript(__dirname + "/__scripts__/profiles/create_some_profiles.sh", TEST_ENVIRONMENT.workingDir); - expect(response.status).toBe(0); - expect(response.stderr.toString()).toContain("command 'profiles create' is deprecated"); - expect(response.stdout.toString()).toContain("test_banana"); - expect(response.stdout.toString()).toContain("test_strawberry"); - expect(response.stdout.toString()).toContain("test_kiwi"); - expect(response.stdout.toString()).not.toContain("Overwrote existing profile"); - - // List the profiles for banana - const listBananaResponse = runCliScript(__dirname + "/__scripts__/profiles/list_profiles_of_type.sh", TEST_ENVIRONMENT.workingDir, - ["banana"]); - expect(listBananaResponse.status).toBe(0); - expect(listBananaResponse.stderr.toString()).toContain("command 'profiles list' is deprecated"); - expect(listBananaResponse.stdout.toString()).not.toContain("strawberry"); - expect(listBananaResponse.stdout.toString()).toMatchSnapshot(); - - // List the profiles for strawberry - const listStrawberryResponse = runCliScript(__dirname + "/__scripts__/profiles/list_profiles_of_type.sh", TEST_ENVIRONMENT.workingDir, - ["strawberry"]); - expect(listStrawberryResponse.status).toBe(0); - expect(listStrawberryResponse.stderr.toString()).toContain("command 'profiles list' is deprecated"); - expect(listStrawberryResponse.stdout.toString()).toMatchSnapshot(); - expect((listStrawberryResponse.stdout.toString().match(/default/g) || []).length).toBe(1); - - // List the profiles for kiwi - const listKiwiResponse = runCliScript(__dirname + "/__scripts__/profiles/list_profiles_of_type.sh", TEST_ENVIRONMENT.workingDir, ["kiwi"]); - expect(listKiwiResponse.status).toBe(0); - expect(listKiwiResponse.stderr.toString()).toContain("command 'profiles list' is deprecated"); - expect(listKiwiResponse.stdout.toString()).not.toContain("kiwiSecret"); - expect(listKiwiResponse.stdout.toString()).toMatchSnapshot(); - }); -}); diff --git a/packages/imperative/__tests__/__integration__/cmd/__tests__/integration/cli/profiles/Cmd.cli.profiles.create.insecure.integration.test.ts b/packages/imperative/__tests__/__integration__/cmd/__tests__/integration/cli/profiles/Cmd.cli.profiles.create.insecure.integration.test.ts deleted file mode 100644 index 31087fd290..0000000000 --- a/packages/imperative/__tests__/__integration__/cmd/__tests__/integration/cli/profiles/Cmd.cli.profiles.create.insecure.integration.test.ts +++ /dev/null @@ -1,34 +0,0 @@ -/* -* 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 { runCliScript } from "../../../../../../src/TestUtil"; -import { ITestEnvironment } from "../../../../../../__src__/environment/doc/response/ITestEnvironment"; -import { SetupTestEnvironment } from "../../../../../../__src__/environment/SetupTestEnvironment"; -// Test Environment populated in the beforeAll(); -let TEST_ENVIRONMENT: ITestEnvironment; -describe("cmd-cli profiles create insecure", () => { - // Create the unique test environment - beforeAll(async () => { - TEST_ENVIRONMENT = await SetupTestEnvironment.createTestEnv({ - cliHomeEnvVar: "CMD_CLI_CLI_HOME", - testName: "cmd_profiles_create_insecure" - }); - }); - - it("should create a profile with a field marked as secure in plain text if the cli does not mark keytar as a dependency", () => { - const response = runCliScript(__dirname + "/__scripts__/profiles/create_insecure_profile.sh", TEST_ENVIRONMENT.workingDir); - expect(response.stderr.toString()).toContain("command 'profiles create' is deprecated"); - expect(response.stderr.toString()).toContain("command 'profiles list' is deprecated"); - expect(response.stdout.toString()).toContain("not so secret info"); - expect(response.stdout.toString()).not.toContain("managed by"); - expect(response.status).toBe(0); - }); -}); diff --git a/packages/imperative/__tests__/__integration__/cmd/__tests__/integration/cli/profiles/__scripts__/profiles/create_insecure_profile.sh b/packages/imperative/__tests__/__integration__/cmd/__tests__/integration/cli/profiles/__scripts__/profiles/create_insecure_profile.sh deleted file mode 100644 index da85e0cad8..0000000000 --- a/packages/imperative/__tests__/__integration__/cmd/__tests__/integration/cli/profiles/__scripts__/profiles/create_insecure_profile.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash -cmd-cli profiles create insecure "test_insecure" --info "some info" --secret "not so secret info" -CMDRC=$? -if [ $CMDRC -gt 0 ] -then - echo "Creating a profile of type 'insecure' failed!" 1>&2 - exit $CMDRC -fi - -cmd-cli profiles list insecure --sc \ No newline at end of file diff --git a/packages/imperative/__tests__/__integration__/cmd/__tests__/integration/cli/profiles/__scripts__/profiles/create_some_profiles.sh b/packages/imperative/__tests__/__integration__/cmd/__tests__/integration/cli/profiles/__scripts__/profiles/create_some_profiles.sh deleted file mode 100644 index bb23d58ce9..0000000000 --- a/packages/imperative/__tests__/__integration__/cmd/__tests__/integration/cli/profiles/__scripts__/profiles/create_some_profiles.sh +++ /dev/null @@ -1,37 +0,0 @@ -#!/bin/bash -# First create a banana profile -cmd-cli profiles create banana-profile "test_banana" --color "green" -CMDRC=$? -if [ $CMDRC -gt 0 ] -then - echo "Creating a test_banana profile of type banana failed!" 1>&2 - exit $CMDRC -fi - -# Next create a strawberry profile with the same name as the banana profile -# This should cause the defaults of both types to be the same profile name -cmd-cli profiles create strawberry-profile "test_banana" --amount 1000 -CMDRC=$? -if [ $CMDRC -gt 0 ] -then - echo "Creating a test_banana profile of type strawberry failed!" 1>&2 - exit $CMDRC -fi - -# Next create a strawberry profile with the same name as the banana profile -cmd-cli profiles create strawberry-profile "test_strawberry" --amount 1000 -CMDRC=$? -if [ $CMDRC -gt 0 ] -then - echo "Creating a test_strawberry profile failed!" 1>&2 - exit $CMDRC -fi - -# Next create a kiwi profile with kiwiSecret not defined -cmd-cli profiles create kiwi-profile "test_kiwi" --amount 1000 -CMDRC=$? -if [ $CMDRC -gt 0 ] -then - echo "Creating a test_kiwi profile failed!" 1>&2 - exit $CMDRC -fi diff --git a/packages/imperative/__tests__/__integration__/cmd/__tests__/integration/cli/profiles/__scripts__/profiles/list_profiles_of_type.sh b/packages/imperative/__tests__/__integration__/cmd/__tests__/integration/cli/profiles/__scripts__/profiles/list_profiles_of_type.sh deleted file mode 100644 index ef2f15619a..0000000000 --- a/packages/imperative/__tests__/__integration__/cmd/__tests__/integration/cli/profiles/__scripts__/profiles/list_profiles_of_type.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/bash -cmd-cli profiles list $1-profiles --show-contents -exit $? \ No newline at end of file diff --git a/packages/imperative/__tests__/__integration__/cmd/__tests__/integration/cli/profiles/__snapshots__/Cmd.cli.profiles.create.banana-profile.integration.test.ts.snap b/packages/imperative/__tests__/__integration__/cmd/__tests__/integration/cli/profiles/__snapshots__/Cmd.cli.profiles.create.banana-profile.integration.test.ts.snap deleted file mode 100644 index d45fa14349..0000000000 --- a/packages/imperative/__tests__/__integration__/cmd/__tests__/integration/cli/profiles/__snapshots__/Cmd.cli.profiles.create.banana-profile.integration.test.ts.snap +++ /dev/null @@ -1,30 +0,0 @@ -// Jest Snapshot v1, https://goo.gl/fbAQLP - -exports[`cmd-cli profiles create banana should create profiles and only list the type requested 1`] = ` -"- - name: test_banana (default) - contents: - color: green -" -`; - -exports[`cmd-cli profiles create banana should create profiles and only list the type requested 2`] = ` -"- - name: test_banana (default) - contents: - amount: 1000 -- - name: test_strawberry - contents: - amount: 1000 -" -`; - -exports[`cmd-cli profiles create banana should create profiles and only list the type requested 3`] = ` -"- - name: test_kiwi (default) - contents: - amount: 1000 - price: 1 -" -`; From 7dd5a40561cefa316c00acabdf725e2eebd0cefe Mon Sep 17 00:00:00 2001 From: zFernand0 <37381190+zFernand0@users.noreply.github.com> Date: Fri, 8 Dec 2023 13:13:46 +0000 Subject: [PATCH 019/138] update typedoc Signed-off-by: zFernand0 <37381190+zFernand0@users.noreply.github.com> --- .../src/config/src/doc/IProfInfoUpdatePropOpts.ts | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/packages/imperative/src/config/src/doc/IProfInfoUpdatePropOpts.ts b/packages/imperative/src/config/src/doc/IProfInfoUpdatePropOpts.ts index 4ab1afce17..17f3f7f332 100644 --- a/packages/imperative/src/config/src/doc/IProfInfoUpdatePropOpts.ts +++ b/packages/imperative/src/config/src/doc/IProfInfoUpdatePropOpts.ts @@ -29,8 +29,11 @@ export interface IProfInfoUpdatePropOpts extends IProfInfoUpdatePropCommonOpts { /** * Force the update to the profile specified even if the property comes from somehwere else - * Example: Token Value could be in the base profile and not in the service profile specified - * and the programmer has the intention of storing the token in the service profile + * @example Token Value could be in the base profile (not in the service profile specified) + * and the programmer has the intention of storing the token in the service profile + * @default false When the property is not specified, the updateProperty method follows current + * procedure of updating the property in the known jsonLoc (e.g. base profile). Otherwise, + * the updateProperty method updates the specified profile name-type combination. */ forceUpdate?: boolean } From 6efc80d23fcd03e42eeb94f71ed26f5bbc35df82 Mon Sep 17 00:00:00 2001 From: zowe-robot Date: Fri, 8 Dec 2023 17:14:30 +0000 Subject: [PATCH 020/138] Bump version to 7.21.0 [ci skip] Signed-off-by: zowe-robot --- .../__packages__/cli-test-utils/package.json | 4 +- lerna.json | 2 +- npm-shrinkwrap.json | 206 +++++++++--------- packages/cli/package.json | 26 +-- packages/core/package.json | 6 +- packages/imperative/CHANGELOG.md | 2 +- packages/imperative/package.json | 2 +- packages/provisioning/package.json | 8 +- packages/workflows/package.json | 10 +- packages/zosconsole/package.json | 8 +- packages/zosfiles/package.json | 10 +- packages/zosjobs/package.json | 10 +- packages/zoslogs/package.json | 8 +- packages/zosmf/package.json | 8 +- packages/zostso/package.json | 10 +- packages/zosuss/package.json | 6 +- 16 files changed, 163 insertions(+), 163 deletions(-) diff --git a/__tests__/__packages__/cli-test-utils/package.json b/__tests__/__packages__/cli-test-utils/package.json index 63e6aa46e3..125eee9cf0 100644 --- a/__tests__/__packages__/cli-test-utils/package.json +++ b/__tests__/__packages__/cli-test-utils/package.json @@ -1,6 +1,6 @@ { "name": "@zowe/cli-test-utils", - "version": "7.19.0", + "version": "7.21.0", "description": "Test utilities package for Zowe CLI plug-ins", "author": "Zowe", "license": "EPL-2.0", @@ -43,7 +43,7 @@ "devDependencies": { "@types/js-yaml": "^4.0.0", "@types/uuid": "^8.3.0", - "@zowe/imperative": "5.19.0" + "@zowe/imperative": "5.20.0" }, "peerDependencies": { "@zowe/imperative": "^5.0.0" diff --git a/lerna.json b/lerna.json index 12ff470699..8069b0c093 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "7.20.1", + "version": "7.21.0", "command": { "publish": { "ignoreChanges": [ diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json index cafb5c3f61..fc11dc3409 100644 --- a/npm-shrinkwrap.json +++ b/npm-shrinkwrap.json @@ -51,7 +51,7 @@ }, "__tests__/__packages__/cli-test-utils": { "name": "@zowe/cli-test-utils", - "version": "7.19.0", + "version": "7.21.0", "license": "EPL-2.0", "dependencies": { "find-up": "^5.0.0", @@ -62,7 +62,7 @@ "devDependencies": { "@types/js-yaml": "^4.0.0", "@types/uuid": "^8.3.0", - "@zowe/imperative": "5.19.0" + "@zowe/imperative": "5.20.0" }, "peerDependencies": { "@zowe/imperative": "^5.0.0" @@ -24704,21 +24704,21 @@ }, "packages/cli": { "name": "@zowe/cli", - "version": "7.20.1", + "version": "7.21.0", "hasInstallScript": true, "license": "EPL-2.0", "dependencies": { - "@zowe/core-for-zowe-sdk": "7.19.0", - "@zowe/imperative": "5.19.0", - "@zowe/provisioning-for-zowe-sdk": "7.19.0", - "@zowe/zos-console-for-zowe-sdk": "7.19.0", - "@zowe/zos-files-for-zowe-sdk": "7.20.0", - "@zowe/zos-jobs-for-zowe-sdk": "7.20.0", - "@zowe/zos-logs-for-zowe-sdk": "7.19.0", - "@zowe/zos-tso-for-zowe-sdk": "7.19.0", - "@zowe/zos-uss-for-zowe-sdk": "7.19.0", - "@zowe/zos-workflows-for-zowe-sdk": "7.20.0", - "@zowe/zosmf-for-zowe-sdk": "7.19.0", + "@zowe/core-for-zowe-sdk": "7.21.0", + "@zowe/imperative": "5.20.0", + "@zowe/provisioning-for-zowe-sdk": "7.21.0", + "@zowe/zos-console-for-zowe-sdk": "7.21.0", + "@zowe/zos-files-for-zowe-sdk": "7.21.0", + "@zowe/zos-jobs-for-zowe-sdk": "7.21.0", + "@zowe/zos-logs-for-zowe-sdk": "7.21.0", + "@zowe/zos-tso-for-zowe-sdk": "7.21.0", + "@zowe/zos-uss-for-zowe-sdk": "7.21.0", + "@zowe/zos-workflows-for-zowe-sdk": "7.21.0", + "@zowe/zosmf-for-zowe-sdk": "7.21.0", "find-process": "1.4.7", "get-stream": "6.0.1", "lodash": "4.17.21", @@ -24733,7 +24733,7 @@ "@types/diff": "^5.0.2", "@types/lodash": "^4.14.175", "@types/tar": "^6.1.2", - "@zowe/cli-test-utils": "7.19.0", + "@zowe/cli-test-utils": "7.21.0", "comment-json": "^4.1.1", "strip-ansi": "^6.0.1", "which": "^2.0.2" @@ -24766,15 +24766,15 @@ }, "packages/core": { "name": "@zowe/core-for-zowe-sdk", - "version": "7.19.0", + "version": "7.21.0", "license": "EPL-2.0", "dependencies": { "comment-json": "4.1.1", "string-width": "4.2.3" }, "devDependencies": { - "@zowe/cli-test-utils": "7.19.0", - "@zowe/imperative": "5.19.0" + "@zowe/cli-test-utils": "7.21.0", + "@zowe/imperative": "5.20.0" }, "peerDependencies": { "@zowe/imperative": "^5.0.0" @@ -24782,7 +24782,7 @@ }, "packages/imperative": { "name": "@zowe/imperative", - "version": "5.19.0", + "version": "5.20.0", "license": "EPL-2.0", "dependencies": { "@types/yargs": "13.0.4", @@ -25130,16 +25130,16 @@ }, "packages/provisioning": { "name": "@zowe/provisioning-for-zowe-sdk", - "version": "7.19.0", + "version": "7.21.0", "license": "EPL-2.0", "dependencies": { "js-yaml": "4.1.0" }, "devDependencies": { "@types/js-yaml": "^4.0.5", - "@zowe/cli-test-utils": "7.19.0", - "@zowe/core-for-zowe-sdk": "7.19.0", - "@zowe/imperative": "5.19.0" + "@zowe/cli-test-utils": "7.21.0", + "@zowe/core-for-zowe-sdk": "7.21.0", + "@zowe/imperative": "5.20.0" }, "peerDependencies": { "@zowe/core-for-zowe-sdk": "^7.0.0", @@ -25161,15 +25161,15 @@ }, "packages/workflows": { "name": "@zowe/zos-workflows-for-zowe-sdk", - "version": "7.20.0", + "version": "7.21.0", "license": "EPL-2.0", "dependencies": { - "@zowe/zos-files-for-zowe-sdk": "7.20.0" + "@zowe/zos-files-for-zowe-sdk": "7.21.0" }, "devDependencies": { - "@zowe/cli-test-utils": "7.19.0", - "@zowe/core-for-zowe-sdk": "7.19.0", - "@zowe/imperative": "5.19.0" + "@zowe/cli-test-utils": "7.21.0", + "@zowe/core-for-zowe-sdk": "7.21.0", + "@zowe/imperative": "5.20.0" }, "peerDependencies": { "@zowe/core-for-zowe-sdk": "^7.0.0", @@ -25178,12 +25178,12 @@ }, "packages/zosconsole": { "name": "@zowe/zos-console-for-zowe-sdk", - "version": "7.19.0", + "version": "7.21.0", "license": "EPL-2.0", "devDependencies": { - "@zowe/cli-test-utils": "7.19.0", - "@zowe/core-for-zowe-sdk": "7.19.0", - "@zowe/imperative": "5.19.0" + "@zowe/cli-test-utils": "7.21.0", + "@zowe/core-for-zowe-sdk": "7.21.0", + "@zowe/imperative": "5.20.0" }, "peerDependencies": { "@zowe/core-for-zowe-sdk": "^7.0.0", @@ -25192,17 +25192,17 @@ }, "packages/zosfiles": { "name": "@zowe/zos-files-for-zowe-sdk", - "version": "7.20.0", + "version": "7.21.0", "license": "EPL-2.0", "dependencies": { "get-stream": "6.0.1", "minimatch": "5.0.1" }, "devDependencies": { - "@zowe/cli-test-utils": "7.19.0", - "@zowe/core-for-zowe-sdk": "7.19.0", - "@zowe/imperative": "5.19.0", - "@zowe/zos-uss-for-zowe-sdk": "7.19.0" + "@zowe/cli-test-utils": "7.21.0", + "@zowe/core-for-zowe-sdk": "7.21.0", + "@zowe/imperative": "5.20.0", + "@zowe/zos-uss-for-zowe-sdk": "7.21.0" }, "peerDependencies": { "@zowe/core-for-zowe-sdk": "^7.0.0", @@ -25230,15 +25230,15 @@ }, "packages/zosjobs": { "name": "@zowe/zos-jobs-for-zowe-sdk", - "version": "7.20.0", + "version": "7.21.0", "license": "EPL-2.0", "dependencies": { - "@zowe/zos-files-for-zowe-sdk": "7.20.0" + "@zowe/zos-files-for-zowe-sdk": "7.21.0" }, "devDependencies": { - "@zowe/cli-test-utils": "7.19.0", - "@zowe/core-for-zowe-sdk": "7.19.0", - "@zowe/imperative": "5.19.0" + "@zowe/cli-test-utils": "7.21.0", + "@zowe/core-for-zowe-sdk": "7.21.0", + "@zowe/imperative": "5.20.0" }, "peerDependencies": { "@zowe/core-for-zowe-sdk": "^7.0.0", @@ -25247,12 +25247,12 @@ }, "packages/zoslogs": { "name": "@zowe/zos-logs-for-zowe-sdk", - "version": "7.19.0", + "version": "7.21.0", "license": "EPL-2.0", "devDependencies": { - "@zowe/cli-test-utils": "7.19.0", - "@zowe/core-for-zowe-sdk": "7.19.0", - "@zowe/imperative": "5.19.0" + "@zowe/cli-test-utils": "7.21.0", + "@zowe/core-for-zowe-sdk": "7.21.0", + "@zowe/imperative": "5.20.0" }, "peerDependencies": { "@zowe/core-for-zowe-sdk": "^7.0.0", @@ -25261,12 +25261,12 @@ }, "packages/zosmf": { "name": "@zowe/zosmf-for-zowe-sdk", - "version": "7.19.0", + "version": "7.21.0", "license": "EPL-2.0", "devDependencies": { - "@zowe/cli-test-utils": "7.19.0", - "@zowe/core-for-zowe-sdk": "7.19.0", - "@zowe/imperative": "5.19.0" + "@zowe/cli-test-utils": "7.21.0", + "@zowe/core-for-zowe-sdk": "7.21.0", + "@zowe/imperative": "5.20.0" }, "peerDependencies": { "@zowe/core-for-zowe-sdk": "^7.0.0", @@ -25275,15 +25275,15 @@ }, "packages/zostso": { "name": "@zowe/zos-tso-for-zowe-sdk", - "version": "7.19.0", + "version": "7.21.0", "license": "EPL-2.0", "dependencies": { - "@zowe/zosmf-for-zowe-sdk": "7.19.0" + "@zowe/zosmf-for-zowe-sdk": "7.21.0" }, "devDependencies": { - "@zowe/cli-test-utils": "7.19.0", - "@zowe/core-for-zowe-sdk": "7.19.0", - "@zowe/imperative": "5.19.0" + "@zowe/cli-test-utils": "7.21.0", + "@zowe/core-for-zowe-sdk": "7.21.0", + "@zowe/imperative": "5.20.0" }, "peerDependencies": { "@zowe/core-for-zowe-sdk": "^7.0.0", @@ -25292,15 +25292,15 @@ }, "packages/zosuss": { "name": "@zowe/zos-uss-for-zowe-sdk", - "version": "7.19.0", + "version": "7.21.0", "license": "EPL-2.0", "dependencies": { "ssh2": "1.11.0" }, "devDependencies": { "@types/ssh2": "^1.11.0", - "@zowe/cli-test-utils": "7.19.0", - "@zowe/imperative": "5.19.0" + "@zowe/cli-test-utils": "7.21.0", + "@zowe/imperative": "5.20.0" }, "peerDependencies": { "@zowe/imperative": "^5.2.0" @@ -31974,19 +31974,19 @@ "@types/diff": "^5.0.2", "@types/lodash": "^4.14.175", "@types/tar": "^6.1.2", - "@zowe/cli-test-utils": "7.19.0", - "@zowe/core-for-zowe-sdk": "7.19.0", - "@zowe/imperative": "5.19.0", - "@zowe/provisioning-for-zowe-sdk": "7.19.0", + "@zowe/cli-test-utils": "7.21.0", + "@zowe/core-for-zowe-sdk": "7.21.0", + "@zowe/imperative": "5.20.0", + "@zowe/provisioning-for-zowe-sdk": "7.21.0", "@zowe/secrets-for-zowe-sdk": "7.18.6", - "@zowe/zos-console-for-zowe-sdk": "7.19.0", - "@zowe/zos-files-for-zowe-sdk": "7.20.0", - "@zowe/zos-jobs-for-zowe-sdk": "7.20.0", - "@zowe/zos-logs-for-zowe-sdk": "7.19.0", - "@zowe/zos-tso-for-zowe-sdk": "7.19.0", - "@zowe/zos-uss-for-zowe-sdk": "7.19.0", - "@zowe/zos-workflows-for-zowe-sdk": "7.20.0", - "@zowe/zosmf-for-zowe-sdk": "7.19.0", + "@zowe/zos-console-for-zowe-sdk": "7.21.0", + "@zowe/zos-files-for-zowe-sdk": "7.21.0", + "@zowe/zos-jobs-for-zowe-sdk": "7.21.0", + "@zowe/zos-logs-for-zowe-sdk": "7.21.0", + "@zowe/zos-tso-for-zowe-sdk": "7.21.0", + "@zowe/zos-uss-for-zowe-sdk": "7.21.0", + "@zowe/zos-workflows-for-zowe-sdk": "7.21.0", + "@zowe/zosmf-for-zowe-sdk": "7.21.0", "comment-json": "^4.1.1", "find-process": "1.4.7", "get-stream": "6.0.1", @@ -32020,7 +32020,7 @@ "requires": { "@types/js-yaml": "^4.0.0", "@types/uuid": "^8.3.0", - "@zowe/imperative": "5.19.0", + "@zowe/imperative": "5.20.0", "find-up": "^5.0.0", "js-yaml": "^4.0.0", "rimraf": "^3.0.2", @@ -32040,8 +32040,8 @@ "@zowe/core-for-zowe-sdk": { "version": "file:packages/core", "requires": { - "@zowe/cli-test-utils": "7.19.0", - "@zowe/imperative": "5.19.0", + "@zowe/cli-test-utils": "7.21.0", + "@zowe/imperative": "5.20.0", "comment-json": "4.1.1", "string-width": "4.2.3" } @@ -32300,9 +32300,9 @@ "version": "file:packages/provisioning", "requires": { "@types/js-yaml": "^4.0.5", - "@zowe/cli-test-utils": "7.19.0", - "@zowe/core-for-zowe-sdk": "7.19.0", - "@zowe/imperative": "5.19.0", + "@zowe/cli-test-utils": "7.21.0", + "@zowe/core-for-zowe-sdk": "7.21.0", + "@zowe/imperative": "5.20.0", "js-yaml": "4.1.0" } }, @@ -32316,18 +32316,18 @@ "@zowe/zos-console-for-zowe-sdk": { "version": "file:packages/zosconsole", "requires": { - "@zowe/cli-test-utils": "7.19.0", - "@zowe/core-for-zowe-sdk": "7.19.0", - "@zowe/imperative": "5.19.0" + "@zowe/cli-test-utils": "7.21.0", + "@zowe/core-for-zowe-sdk": "7.21.0", + "@zowe/imperative": "5.20.0" } }, "@zowe/zos-files-for-zowe-sdk": { "version": "file:packages/zosfiles", "requires": { - "@zowe/cli-test-utils": "7.19.0", - "@zowe/core-for-zowe-sdk": "7.19.0", - "@zowe/imperative": "5.19.0", - "@zowe/zos-uss-for-zowe-sdk": "7.19.0", + "@zowe/cli-test-utils": "7.21.0", + "@zowe/core-for-zowe-sdk": "7.21.0", + "@zowe/imperative": "5.20.0", + "@zowe/zos-uss-for-zowe-sdk": "7.21.0", "get-stream": "6.0.1", "minimatch": "5.0.1" }, @@ -32353,53 +32353,53 @@ "@zowe/zos-jobs-for-zowe-sdk": { "version": "file:packages/zosjobs", "requires": { - "@zowe/cli-test-utils": "7.19.0", - "@zowe/core-for-zowe-sdk": "7.19.0", - "@zowe/imperative": "5.19.0", - "@zowe/zos-files-for-zowe-sdk": "7.20.0" + "@zowe/cli-test-utils": "7.21.0", + "@zowe/core-for-zowe-sdk": "7.21.0", + "@zowe/imperative": "5.20.0", + "@zowe/zos-files-for-zowe-sdk": "7.21.0" } }, "@zowe/zos-logs-for-zowe-sdk": { "version": "file:packages/zoslogs", "requires": { - "@zowe/cli-test-utils": "7.19.0", - "@zowe/core-for-zowe-sdk": "7.19.0", - "@zowe/imperative": "5.19.0" + "@zowe/cli-test-utils": "7.21.0", + "@zowe/core-for-zowe-sdk": "7.21.0", + "@zowe/imperative": "5.20.0" } }, "@zowe/zos-tso-for-zowe-sdk": { "version": "file:packages/zostso", "requires": { - "@zowe/cli-test-utils": "7.19.0", - "@zowe/core-for-zowe-sdk": "7.19.0", - "@zowe/imperative": "5.19.0", - "@zowe/zosmf-for-zowe-sdk": "7.19.0" + "@zowe/cli-test-utils": "7.21.0", + "@zowe/core-for-zowe-sdk": "7.21.0", + "@zowe/imperative": "5.20.0", + "@zowe/zosmf-for-zowe-sdk": "7.21.0" } }, "@zowe/zos-uss-for-zowe-sdk": { "version": "file:packages/zosuss", "requires": { "@types/ssh2": "^1.11.0", - "@zowe/cli-test-utils": "7.19.0", - "@zowe/imperative": "5.19.0", + "@zowe/cli-test-utils": "7.21.0", + "@zowe/imperative": "5.20.0", "ssh2": "1.11.0" } }, "@zowe/zos-workflows-for-zowe-sdk": { "version": "file:packages/workflows", "requires": { - "@zowe/cli-test-utils": "7.19.0", - "@zowe/core-for-zowe-sdk": "7.19.0", - "@zowe/imperative": "5.19.0", - "@zowe/zos-files-for-zowe-sdk": "7.20.0" + "@zowe/cli-test-utils": "7.21.0", + "@zowe/core-for-zowe-sdk": "7.21.0", + "@zowe/imperative": "5.20.0", + "@zowe/zos-files-for-zowe-sdk": "7.21.0" } }, "@zowe/zosmf-for-zowe-sdk": { "version": "file:packages/zosmf", "requires": { - "@zowe/cli-test-utils": "7.19.0", - "@zowe/core-for-zowe-sdk": "7.19.0", - "@zowe/imperative": "5.19.0" + "@zowe/cli-test-utils": "7.21.0", + "@zowe/core-for-zowe-sdk": "7.21.0", + "@zowe/imperative": "5.20.0" } }, "abbrev": { diff --git a/packages/cli/package.json b/packages/cli/package.json index 31e940b82c..456eebf130 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -1,6 +1,6 @@ { "name": "@zowe/cli", - "version": "7.20.1", + "version": "7.21.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", @@ -58,17 +58,17 @@ "preshrinkwrap": "node ../../scripts/rewriteShrinkwrap.js" }, "dependencies": { - "@zowe/core-for-zowe-sdk": "7.19.0", - "@zowe/imperative": "5.19.0", - "@zowe/provisioning-for-zowe-sdk": "7.19.0", - "@zowe/zos-console-for-zowe-sdk": "7.19.0", - "@zowe/zos-files-for-zowe-sdk": "7.20.0", - "@zowe/zos-jobs-for-zowe-sdk": "7.20.0", - "@zowe/zos-logs-for-zowe-sdk": "7.19.0", - "@zowe/zos-tso-for-zowe-sdk": "7.19.0", - "@zowe/zos-uss-for-zowe-sdk": "7.19.0", - "@zowe/zos-workflows-for-zowe-sdk": "7.20.0", - "@zowe/zosmf-for-zowe-sdk": "7.19.0", + "@zowe/core-for-zowe-sdk": "7.21.0", + "@zowe/imperative": "5.20.0", + "@zowe/provisioning-for-zowe-sdk": "7.21.0", + "@zowe/zos-console-for-zowe-sdk": "7.21.0", + "@zowe/zos-files-for-zowe-sdk": "7.21.0", + "@zowe/zos-jobs-for-zowe-sdk": "7.21.0", + "@zowe/zos-logs-for-zowe-sdk": "7.21.0", + "@zowe/zos-tso-for-zowe-sdk": "7.21.0", + "@zowe/zos-uss-for-zowe-sdk": "7.21.0", + "@zowe/zos-workflows-for-zowe-sdk": "7.21.0", + "@zowe/zosmf-for-zowe-sdk": "7.21.0", "find-process": "1.4.7", "get-stream": "6.0.1", "lodash": "4.17.21", @@ -79,7 +79,7 @@ "@types/diff": "^5.0.2", "@types/lodash": "^4.14.175", "@types/tar": "^6.1.2", - "@zowe/cli-test-utils": "7.19.0", + "@zowe/cli-test-utils": "7.21.0", "comment-json": "^4.1.1", "strip-ansi": "^6.0.1", "which": "^2.0.2" diff --git a/packages/core/package.json b/packages/core/package.json index 6c8c9c5b58..3da81ed38b 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -1,6 +1,6 @@ { "name": "@zowe/core-for-zowe-sdk", - "version": "7.19.0", + "version": "7.21.0", "description": "Core libraries shared by Zowe SDK packages", "author": "Zowe", "license": "EPL-2.0", @@ -49,8 +49,8 @@ "string-width": "4.2.3" }, "devDependencies": { - "@zowe/cli-test-utils": "7.19.0", - "@zowe/imperative": "5.19.0" + "@zowe/cli-test-utils": "7.21.0", + "@zowe/imperative": "5.20.0" }, "peerDependencies": { "@zowe/imperative": "^5.0.0" diff --git a/packages/imperative/CHANGELOG.md b/packages/imperative/CHANGELOG.md index d11fdb7b11..f87cd19d32 100644 --- a/packages/imperative/CHANGELOG.md +++ b/packages/imperative/CHANGELOG.md @@ -335,7 +335,7 @@ that would be used if a command were executed. - BugFix: Fixed incorrect description for untyped profiles in team config files. [zowe/zowe-cli#1303](https://github.com/zowe/zowe-cli/issues/1303) - **Next Breaking**: Schema files created or updated with the above changes are not backward compatible with older versions of Imperative. -## Recent Changes +## `5.20.0` - Enhancement: Added the ability to `forceUpdate` a property using the `ProfileInfo.updateProperty` method. [zowe-explorer#2493](https://github.com/zowe/vscode-extension-for-zowe/issues/2493) diff --git a/packages/imperative/package.json b/packages/imperative/package.json index fa237bd701..b3578720c2 100644 --- a/packages/imperative/package.json +++ b/packages/imperative/package.json @@ -1,6 +1,6 @@ { "name": "@zowe/imperative", - "version": "5.19.0", + "version": "5.20.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 488d9569ad..3610259572 100644 --- a/packages/provisioning/package.json +++ b/packages/provisioning/package.json @@ -1,6 +1,6 @@ { "name": "@zowe/provisioning-for-zowe-sdk", - "version": "7.19.0", + "version": "7.21.0", "description": "Zowe SDK to interact with the z/OS provisioning APIs", "author": "Zowe", "license": "EPL-2.0", @@ -49,9 +49,9 @@ }, "devDependencies": { "@types/js-yaml": "^4.0.5", - "@zowe/cli-test-utils": "7.19.0", - "@zowe/core-for-zowe-sdk": "7.19.0", - "@zowe/imperative": "5.19.0" + "@zowe/cli-test-utils": "7.21.0", + "@zowe/core-for-zowe-sdk": "7.21.0", + "@zowe/imperative": "5.20.0" }, "peerDependencies": { "@zowe/core-for-zowe-sdk": "^7.0.0", diff --git a/packages/workflows/package.json b/packages/workflows/package.json index 6d11ff510e..4c58886043 100644 --- a/packages/workflows/package.json +++ b/packages/workflows/package.json @@ -1,6 +1,6 @@ { "name": "@zowe/zos-workflows-for-zowe-sdk", - "version": "7.20.0", + "version": "7.21.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.20.0" + "@zowe/zos-files-for-zowe-sdk": "7.21.0" }, "devDependencies": { - "@zowe/cli-test-utils": "7.19.0", - "@zowe/core-for-zowe-sdk": "7.19.0", - "@zowe/imperative": "5.19.0" + "@zowe/cli-test-utils": "7.21.0", + "@zowe/core-for-zowe-sdk": "7.21.0", + "@zowe/imperative": "5.20.0" }, "peerDependencies": { "@zowe/core-for-zowe-sdk": "^7.0.0", diff --git a/packages/zosconsole/package.json b/packages/zosconsole/package.json index 883c8330c7..5aafbe127f 100644 --- a/packages/zosconsole/package.json +++ b/packages/zosconsole/package.json @@ -1,6 +1,6 @@ { "name": "@zowe/zos-console-for-zowe-sdk", - "version": "7.19.0", + "version": "7.21.0", "description": "Zowe SDK to interact with the z/OS console", "author": "Zowe", "license": "EPL-2.0", @@ -45,9 +45,9 @@ "prepack": "node ../../scripts/prepareLicenses.js" }, "devDependencies": { - "@zowe/cli-test-utils": "7.19.0", - "@zowe/core-for-zowe-sdk": "7.19.0", - "@zowe/imperative": "5.19.0" + "@zowe/cli-test-utils": "7.21.0", + "@zowe/core-for-zowe-sdk": "7.21.0", + "@zowe/imperative": "5.20.0" }, "peerDependencies": { "@zowe/core-for-zowe-sdk": "^7.0.0", diff --git a/packages/zosfiles/package.json b/packages/zosfiles/package.json index 578f1bf276..b756d390a4 100644 --- a/packages/zosfiles/package.json +++ b/packages/zosfiles/package.json @@ -1,6 +1,6 @@ { "name": "@zowe/zos-files-for-zowe-sdk", - "version": "7.20.0", + "version": "7.21.0", "description": "Zowe SDK to interact with files and data sets on z/OS", "author": "Zowe", "license": "EPL-2.0", @@ -50,10 +50,10 @@ "minimatch": "5.0.1" }, "devDependencies": { - "@zowe/cli-test-utils": "7.19.0", - "@zowe/core-for-zowe-sdk": "7.19.0", - "@zowe/imperative": "5.19.0", - "@zowe/zos-uss-for-zowe-sdk": "7.19.0" + "@zowe/cli-test-utils": "7.21.0", + "@zowe/core-for-zowe-sdk": "7.21.0", + "@zowe/imperative": "5.20.0", + "@zowe/zos-uss-for-zowe-sdk": "7.21.0" }, "peerDependencies": { "@zowe/core-for-zowe-sdk": "^7.0.0", diff --git a/packages/zosjobs/package.json b/packages/zosjobs/package.json index 1723ca473a..dcb3e701cd 100644 --- a/packages/zosjobs/package.json +++ b/packages/zosjobs/package.json @@ -1,6 +1,6 @@ { "name": "@zowe/zos-jobs-for-zowe-sdk", - "version": "7.20.0", + "version": "7.21.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.20.0" + "@zowe/zos-files-for-zowe-sdk": "7.21.0" }, "devDependencies": { - "@zowe/cli-test-utils": "7.19.0", - "@zowe/core-for-zowe-sdk": "7.19.0", - "@zowe/imperative": "5.19.0" + "@zowe/cli-test-utils": "7.21.0", + "@zowe/core-for-zowe-sdk": "7.21.0", + "@zowe/imperative": "5.20.0" }, "peerDependencies": { "@zowe/core-for-zowe-sdk": "^7.0.0", diff --git a/packages/zoslogs/package.json b/packages/zoslogs/package.json index ad7a24ef2d..f7011e43c2 100644 --- a/packages/zoslogs/package.json +++ b/packages/zoslogs/package.json @@ -1,6 +1,6 @@ { "name": "@zowe/zos-logs-for-zowe-sdk", - "version": "7.19.0", + "version": "7.21.0", "description": "Zowe SDK to interact with the z/OS logs", "author": "Zowe", "license": "EPL-2.0", @@ -45,9 +45,9 @@ "prepack": "node ../../scripts/prepareLicenses.js" }, "devDependencies": { - "@zowe/cli-test-utils": "7.19.0", - "@zowe/core-for-zowe-sdk": "7.19.0", - "@zowe/imperative": "5.19.0" + "@zowe/cli-test-utils": "7.21.0", + "@zowe/core-for-zowe-sdk": "7.21.0", + "@zowe/imperative": "5.20.0" }, "peerDependencies": { "@zowe/core-for-zowe-sdk": "^7.0.0", diff --git a/packages/zosmf/package.json b/packages/zosmf/package.json index d95113e273..b9d614b5fd 100644 --- a/packages/zosmf/package.json +++ b/packages/zosmf/package.json @@ -1,6 +1,6 @@ { "name": "@zowe/zosmf-for-zowe-sdk", - "version": "7.19.0", + "version": "7.21.0", "description": "Zowe SDK to interact with the z/OS Management Facility", "author": "Zowe", "license": "EPL-2.0", @@ -44,9 +44,9 @@ "prepack": "node ../../scripts/prepareLicenses.js" }, "devDependencies": { - "@zowe/cli-test-utils": "7.19.0", - "@zowe/core-for-zowe-sdk": "7.19.0", - "@zowe/imperative": "5.19.0" + "@zowe/cli-test-utils": "7.21.0", + "@zowe/core-for-zowe-sdk": "7.21.0", + "@zowe/imperative": "5.20.0" }, "peerDependencies": { "@zowe/core-for-zowe-sdk": "^7.0.0", diff --git a/packages/zostso/package.json b/packages/zostso/package.json index 844a90d049..0c3fe4842b 100644 --- a/packages/zostso/package.json +++ b/packages/zostso/package.json @@ -1,6 +1,6 @@ { "name": "@zowe/zos-tso-for-zowe-sdk", - "version": "7.19.0", + "version": "7.21.0", "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.19.0" + "@zowe/zosmf-for-zowe-sdk": "7.21.0" }, "devDependencies": { - "@zowe/cli-test-utils": "7.19.0", - "@zowe/core-for-zowe-sdk": "7.19.0", - "@zowe/imperative": "5.19.0" + "@zowe/cli-test-utils": "7.21.0", + "@zowe/core-for-zowe-sdk": "7.21.0", + "@zowe/imperative": "5.20.0" }, "peerDependencies": { "@zowe/core-for-zowe-sdk": "^7.0.0", diff --git a/packages/zosuss/package.json b/packages/zosuss/package.json index 5aab8bb993..fbe4c02c23 100644 --- a/packages/zosuss/package.json +++ b/packages/zosuss/package.json @@ -1,6 +1,6 @@ { "name": "@zowe/zos-uss-for-zowe-sdk", - "version": "7.19.0", + "version": "7.21.0", "description": "Zowe SDK to interact with USS on z/OS", "author": "Zowe", "license": "EPL-2.0", @@ -49,8 +49,8 @@ }, "devDependencies": { "@types/ssh2": "^1.11.0", - "@zowe/cli-test-utils": "7.19.0", - "@zowe/imperative": "5.19.0" + "@zowe/cli-test-utils": "7.21.0", + "@zowe/imperative": "5.20.0" }, "peerDependencies": { "@zowe/imperative": "^5.2.0" From 79aca7413e8f7de8146c3b976939e85a443eec02 Mon Sep 17 00:00:00 2001 From: Gene Johnston Date: Tue, 12 Dec 2023 10:25:18 -0500 Subject: [PATCH 021/138] Replace 'source' with '.' Signed-off-by: Gene Johnston --- .../__scripts__/profiles/banana_profile_and_specify_cli.sh | 2 +- .../__scripts__/profiles/banana_profile_and_specify_env.sh | 2 +- .../profiles/banana_profile_and_specify_env_and_cli.sh | 2 +- .../cli/profiles/__scripts__/profiles/base_and_kiwi_profile.sh | 2 +- .../cli/profiles/__scripts__/profiles/map_banana_to_options.sh | 2 +- .../profiles/__scripts__/profiles/map_banana_to_positionals.sh | 2 +- .../cli/profiles/__scripts__/profiles/name_type_specify.sh | 2 +- .../cli/profiles/__scripts__/profiles/name_type_undefined.sh | 2 +- .../cli/profiles/__scripts__/profiles/specify_env_for_array.sh | 2 +- .../profiles/__scripts__/profiles/specify_env_for_boolean.sh | 2 +- .../cli/profiles/__scripts__/profiles/specify_env_for_number.sh | 2 +- .../profiles/__scripts__/profiles/specify_env_for_positional.sh | 2 +- .../cli/profiles/__scripts__/profiles/specify_env_sweetness.sh | 2 +- 13 files changed, 13 insertions(+), 13 deletions(-) diff --git a/packages/imperative/__tests__/__integration__/cmd/__tests__/integration/cli/profiles/__scripts__/profiles/banana_profile_and_specify_cli.sh b/packages/imperative/__tests__/__integration__/cmd/__tests__/integration/cli/profiles/__scripts__/profiles/banana_profile_and_specify_cli.sh index de3abf864b..d9bf663fa2 100644 --- a/packages/imperative/__tests__/__integration__/cmd/__tests__/integration/cli/profiles/__scripts__/profiles/banana_profile_and_specify_cli.sh +++ b/packages/imperative/__tests__/__integration__/cmd/__tests__/integration/cli/profiles/__scripts__/profiles/banana_profile_and_specify_cli.sh @@ -10,7 +10,7 @@ cliMoldType=$6 # include exitOnFailure function myScriptDir=`dirname $0` -source $myScriptDir/exitOnFailure.sh +. $myScriptDir/exitOnFailure.sh # set desired properties in our config file cp $myScriptDir/banana.config.json . diff --git a/packages/imperative/__tests__/__integration__/cmd/__tests__/integration/cli/profiles/__scripts__/profiles/banana_profile_and_specify_env.sh b/packages/imperative/__tests__/__integration__/cmd/__tests__/integration/cli/profiles/__scripts__/profiles/banana_profile_and_specify_env.sh index a8fd8fc1c6..c84dfd57ed 100644 --- a/packages/imperative/__tests__/__integration__/cmd/__tests__/integration/cli/profiles/__scripts__/profiles/banana_profile_and_specify_env.sh +++ b/packages/imperative/__tests__/__integration__/cmd/__tests__/integration/cli/profiles/__scripts__/profiles/banana_profile_and_specify_env.sh @@ -10,7 +10,7 @@ envMoldType=$6 # include exitOnFailure function myScriptDir=`dirname $0` -source $myScriptDir/exitOnFailure.sh +. $myScriptDir/exitOnFailure.sh # set desired properties in our config file cp $myScriptDir/banana.config.json . diff --git a/packages/imperative/__tests__/__integration__/cmd/__tests__/integration/cli/profiles/__scripts__/profiles/banana_profile_and_specify_env_and_cli.sh b/packages/imperative/__tests__/__integration__/cmd/__tests__/integration/cli/profiles/__scripts__/profiles/banana_profile_and_specify_env_and_cli.sh index 9bb22d9f17..8a1a23c2f1 100644 --- a/packages/imperative/__tests__/__integration__/cmd/__tests__/integration/cli/profiles/__scripts__/profiles/banana_profile_and_specify_env_and_cli.sh +++ b/packages/imperative/__tests__/__integration__/cmd/__tests__/integration/cli/profiles/__scripts__/profiles/banana_profile_and_specify_env_and_cli.sh @@ -14,7 +14,7 @@ cliMoldType=$9 # include exitOnFailure function myScriptDir=`dirname $0` -source $myScriptDir/exitOnFailure.sh +. $myScriptDir/exitOnFailure.sh # set desired properties in our config file cp $myScriptDir/banana.config.json . diff --git a/packages/imperative/__tests__/__integration__/cmd/__tests__/integration/cli/profiles/__scripts__/profiles/base_and_kiwi_profile.sh b/packages/imperative/__tests__/__integration__/cmd/__tests__/integration/cli/profiles/__scripts__/profiles/base_and_kiwi_profile.sh index c255f1f6f6..65c31718be 100644 --- a/packages/imperative/__tests__/__integration__/cmd/__tests__/integration/cli/profiles/__scripts__/profiles/base_and_kiwi_profile.sh +++ b/packages/imperative/__tests__/__integration__/cmd/__tests__/integration/cli/profiles/__scripts__/profiles/base_and_kiwi_profile.sh @@ -6,7 +6,7 @@ kiwiAmount=$3 # include exitOnFailure function myScriptDir=`dirname $0` -source $myScriptDir/exitOnFailure.sh +. $myScriptDir/exitOnFailure.sh # set desired properties in our config file cp $myScriptDir/base_and_kiwi.config.json . diff --git a/packages/imperative/__tests__/__integration__/cmd/__tests__/integration/cli/profiles/__scripts__/profiles/map_banana_to_options.sh b/packages/imperative/__tests__/__integration__/cmd/__tests__/integration/cli/profiles/__scripts__/profiles/map_banana_to_options.sh index 32eead05a7..64e7e3ea7a 100644 --- a/packages/imperative/__tests__/__integration__/cmd/__tests__/integration/cli/profiles/__scripts__/profiles/map_banana_to_options.sh +++ b/packages/imperative/__tests__/__integration__/cmd/__tests__/integration/cli/profiles/__scripts__/profiles/map_banana_to_options.sh @@ -6,7 +6,7 @@ profileMoldType=$3 # include exitOnFailure function myScriptDir=`dirname $0` -source $myScriptDir/exitOnFailure.sh +. $myScriptDir/exitOnFailure.sh # set desired properties in our config file cp $myScriptDir/banana.config.json . diff --git a/packages/imperative/__tests__/__integration__/cmd/__tests__/integration/cli/profiles/__scripts__/profiles/map_banana_to_positionals.sh b/packages/imperative/__tests__/__integration__/cmd/__tests__/integration/cli/profiles/__scripts__/profiles/map_banana_to_positionals.sh index ac50b8ee4d..9eea7ed56c 100644 --- a/packages/imperative/__tests__/__integration__/cmd/__tests__/integration/cli/profiles/__scripts__/profiles/map_banana_to_positionals.sh +++ b/packages/imperative/__tests__/__integration__/cmd/__tests__/integration/cli/profiles/__scripts__/profiles/map_banana_to_positionals.sh @@ -6,7 +6,7 @@ profileMoldType=$3 # include exitOnFailure function myScriptDir=`dirname $0` -source $myScriptDir/exitOnFailure.sh +. $myScriptDir/exitOnFailure.sh # set desired properties in our config file cp $myScriptDir/banana.config.json . diff --git a/packages/imperative/__tests__/__integration__/cmd/__tests__/integration/cli/profiles/__scripts__/profiles/name_type_specify.sh b/packages/imperative/__tests__/__integration__/cmd/__tests__/integration/cli/profiles/__scripts__/profiles/name_type_specify.sh index 7051a3e107..6985a979fc 100644 --- a/packages/imperative/__tests__/__integration__/cmd/__tests__/integration/cli/profiles/__scripts__/profiles/name_type_specify.sh +++ b/packages/imperative/__tests__/__integration__/cmd/__tests__/integration/cli/profiles/__scripts__/profiles/name_type_specify.sh @@ -8,7 +8,7 @@ cliType=$5 # include exitOnFailure function myScriptDir=`dirname $0` -source $myScriptDir/exitOnFailure.sh +. $myScriptDir/exitOnFailure.sh # set desired properties in our config file cp $myScriptDir/banana.config.json . diff --git a/packages/imperative/__tests__/__integration__/cmd/__tests__/integration/cli/profiles/__scripts__/profiles/name_type_undefined.sh b/packages/imperative/__tests__/__integration__/cmd/__tests__/integration/cli/profiles/__scripts__/profiles/name_type_undefined.sh index a15cb9d517..e39bfd46bd 100644 --- a/packages/imperative/__tests__/__integration__/cmd/__tests__/integration/cli/profiles/__scripts__/profiles/name_type_undefined.sh +++ b/packages/imperative/__tests__/__integration__/cmd/__tests__/integration/cli/profiles/__scripts__/profiles/name_type_undefined.sh @@ -6,7 +6,7 @@ profileMoldType=$3 # include exitOnFailure function myScriptDir=`dirname $0` -source $myScriptDir/exitOnFailure.sh +. $myScriptDir/exitOnFailure.sh # set desired properties in our config file cp $myScriptDir/banana.config.json . diff --git a/packages/imperative/__tests__/__integration__/cmd/__tests__/integration/cli/profiles/__scripts__/profiles/specify_env_for_array.sh b/packages/imperative/__tests__/__integration__/cmd/__tests__/integration/cli/profiles/__scripts__/profiles/specify_env_for_array.sh index 543124e06d..13af50d623 100644 --- a/packages/imperative/__tests__/__integration__/cmd/__tests__/integration/cli/profiles/__scripts__/profiles/specify_env_for_array.sh +++ b/packages/imperative/__tests__/__integration__/cmd/__tests__/integration/cli/profiles/__scripts__/profiles/specify_env_for_array.sh @@ -7,7 +7,7 @@ envNames=$4 # include exitOnFailure function myScriptDir=`dirname $0` -source $myScriptDir/exitOnFailure.sh +. $myScriptDir/exitOnFailure.sh CMD_CLI_OPT_NAMES="$envNames" cmd-cli profile mapping --color "$cliColor" --banana-description "$cliDescription" --mold-type "$cliMoldType" exitOnFailure "The 'profile mapping' command failed." $? diff --git a/packages/imperative/__tests__/__integration__/cmd/__tests__/integration/cli/profiles/__scripts__/profiles/specify_env_for_boolean.sh b/packages/imperative/__tests__/__integration__/cmd/__tests__/integration/cli/profiles/__scripts__/profiles/specify_env_for_boolean.sh index 5d5d614025..bbd3b00dbc 100644 --- a/packages/imperative/__tests__/__integration__/cmd/__tests__/integration/cli/profiles/__scripts__/profiles/specify_env_for_boolean.sh +++ b/packages/imperative/__tests__/__integration__/cmd/__tests__/integration/cli/profiles/__scripts__/profiles/specify_env_for_boolean.sh @@ -7,7 +7,7 @@ envRipe=$4 # include exitOnFailure function myScriptDir=`dirname $0` -source $myScriptDir/exitOnFailure.sh +. $myScriptDir/exitOnFailure.sh CMD_CLI_OPT_RIPE=$envRipe cmd-cli profile mapping --color "$cliColor" --banana-description "$cliDescription" --mold-type "$cliMoldType" exitOnFailure "The 'profile mapping' command failed." $? diff --git a/packages/imperative/__tests__/__integration__/cmd/__tests__/integration/cli/profiles/__scripts__/profiles/specify_env_for_number.sh b/packages/imperative/__tests__/__integration__/cmd/__tests__/integration/cli/profiles/__scripts__/profiles/specify_env_for_number.sh index 6f72f5676d..48443ea47c 100644 --- a/packages/imperative/__tests__/__integration__/cmd/__tests__/integration/cli/profiles/__scripts__/profiles/specify_env_for_number.sh +++ b/packages/imperative/__tests__/__integration__/cmd/__tests__/integration/cli/profiles/__scripts__/profiles/specify_env_for_number.sh @@ -7,7 +7,7 @@ envSides=$4 # include exitOnFailure function myScriptDir=`dirname $0` -source $myScriptDir/exitOnFailure.sh +. $myScriptDir/exitOnFailure.sh CMD_CLI_OPT_SIDES=$envSides cmd-cli profile mapping --color "$cliColor" --banana-description "$cliDescription" --mold-type "$cliMoldType" exitOnFailure "The 'profile mapping' command failed." $? diff --git a/packages/imperative/__tests__/__integration__/cmd/__tests__/integration/cli/profiles/__scripts__/profiles/specify_env_for_positional.sh b/packages/imperative/__tests__/__integration__/cmd/__tests__/integration/cli/profiles/__scripts__/profiles/specify_env_for_positional.sh index f46ea8711a..5554c776c9 100644 --- a/packages/imperative/__tests__/__integration__/cmd/__tests__/integration/cli/profiles/__scripts__/profiles/specify_env_for_positional.sh +++ b/packages/imperative/__tests__/__integration__/cmd/__tests__/integration/cli/profiles/__scripts__/profiles/specify_env_for_positional.sh @@ -6,7 +6,7 @@ envMoldType=$3 # include exitOnFailure function myScriptDir=`dirname $0` -source $myScriptDir/exitOnFailure.sh +. $myScriptDir/exitOnFailure.sh CMD_CLI_OPT_COLOR="$envColor" CMD_CLI_OPT_BANANA_DESCRIPTION="$envDescription" CMD_CLI_OPT_MOLD_TYPE="$envMoldType" \ cmd-cli profile mapping-positional diff --git a/packages/imperative/__tests__/__integration__/cmd/__tests__/integration/cli/profiles/__scripts__/profiles/specify_env_sweetness.sh b/packages/imperative/__tests__/__integration__/cmd/__tests__/integration/cli/profiles/__scripts__/profiles/specify_env_sweetness.sh index c2a9d0ddcd..998edd8967 100644 --- a/packages/imperative/__tests__/__integration__/cmd/__tests__/integration/cli/profiles/__scripts__/profiles/specify_env_sweetness.sh +++ b/packages/imperative/__tests__/__integration__/cmd/__tests__/integration/cli/profiles/__scripts__/profiles/specify_env_sweetness.sh @@ -7,7 +7,7 @@ envSweetness=$4 # include exitOnFailure function myScriptDir=`dirname $0` -source $myScriptDir/exitOnFailure.sh +. $myScriptDir/exitOnFailure.sh CMD_CLI_OPT_SWEETNESS="$envSweetness" cmd-cli profile mapping --color "$cliColor" --banana-description "$cliDescription" --mold-type "$cliMoldType" exitOnFailure "The 'profile mapping' command failed." $? From af8d59f715b6833dce34202106d21cb08dbbf2b9 Mon Sep 17 00:00:00 2001 From: Gene Johnston Date: Tue, 12 Dec 2023 11:26:22 -0500 Subject: [PATCH 022/138] Replace bash-style function with sh-style function. Signed-off-by: Gene Johnston --- .../__scripts__/profiles/banana_profile_and_specify_cli.sh | 2 +- .../__scripts__/profiles/banana_profile_and_specify_env.sh | 2 +- .../profiles/banana_profile_and_specify_env_and_cli.sh | 2 +- .../profiles/__scripts__/profiles/base_and_kiwi_profile.sh | 2 +- .../cli/profiles/__scripts__/profiles/exitOnFailure.sh | 5 ++--- .../profiles/__scripts__/profiles/map_banana_to_options.sh | 2 +- .../__scripts__/profiles/map_banana_to_positionals.sh | 2 +- .../cli/profiles/__scripts__/profiles/name_type_specify.sh | 2 +- .../cli/profiles/__scripts__/profiles/name_type_undefined.sh | 2 +- .../profiles/__scripts__/profiles/specify_env_for_array.sh | 2 +- .../profiles/__scripts__/profiles/specify_env_for_boolean.sh | 2 +- .../profiles/__scripts__/profiles/specify_env_for_number.sh | 2 +- .../__scripts__/profiles/specify_env_for_positional.sh | 2 +- .../profiles/__scripts__/profiles/specify_env_sweetness.sh | 2 +- 14 files changed, 15 insertions(+), 16 deletions(-) diff --git a/packages/imperative/__tests__/__integration__/cmd/__tests__/integration/cli/profiles/__scripts__/profiles/banana_profile_and_specify_cli.sh b/packages/imperative/__tests__/__integration__/cmd/__tests__/integration/cli/profiles/__scripts__/profiles/banana_profile_and_specify_cli.sh index d9bf663fa2..5ed69efb61 100644 --- a/packages/imperative/__tests__/__integration__/cmd/__tests__/integration/cli/profiles/__scripts__/profiles/banana_profile_and_specify_cli.sh +++ b/packages/imperative/__tests__/__integration__/cmd/__tests__/integration/cli/profiles/__scripts__/profiles/banana_profile_and_specify_cli.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/sh profileColor=$1 profileDescription=$2 diff --git a/packages/imperative/__tests__/__integration__/cmd/__tests__/integration/cli/profiles/__scripts__/profiles/banana_profile_and_specify_env.sh b/packages/imperative/__tests__/__integration__/cmd/__tests__/integration/cli/profiles/__scripts__/profiles/banana_profile_and_specify_env.sh index c84dfd57ed..852485a057 100644 --- a/packages/imperative/__tests__/__integration__/cmd/__tests__/integration/cli/profiles/__scripts__/profiles/banana_profile_and_specify_env.sh +++ b/packages/imperative/__tests__/__integration__/cmd/__tests__/integration/cli/profiles/__scripts__/profiles/banana_profile_and_specify_env.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/sh profileColor=$1 profileDescription=$2 diff --git a/packages/imperative/__tests__/__integration__/cmd/__tests__/integration/cli/profiles/__scripts__/profiles/banana_profile_and_specify_env_and_cli.sh b/packages/imperative/__tests__/__integration__/cmd/__tests__/integration/cli/profiles/__scripts__/profiles/banana_profile_and_specify_env_and_cli.sh index 8a1a23c2f1..a813ebeeea 100644 --- a/packages/imperative/__tests__/__integration__/cmd/__tests__/integration/cli/profiles/__scripts__/profiles/banana_profile_and_specify_env_and_cli.sh +++ b/packages/imperative/__tests__/__integration__/cmd/__tests__/integration/cli/profiles/__scripts__/profiles/banana_profile_and_specify_env_and_cli.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/sh profileColor=$1 profileDescription=$2 diff --git a/packages/imperative/__tests__/__integration__/cmd/__tests__/integration/cli/profiles/__scripts__/profiles/base_and_kiwi_profile.sh b/packages/imperative/__tests__/__integration__/cmd/__tests__/integration/cli/profiles/__scripts__/profiles/base_and_kiwi_profile.sh index 65c31718be..f10dc9ce24 100644 --- a/packages/imperative/__tests__/__integration__/cmd/__tests__/integration/cli/profiles/__scripts__/profiles/base_and_kiwi_profile.sh +++ b/packages/imperative/__tests__/__integration__/cmd/__tests__/integration/cli/profiles/__scripts__/profiles/base_and_kiwi_profile.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/sh baseAmount=$1 basePrice=$2 diff --git a/packages/imperative/__tests__/__integration__/cmd/__tests__/integration/cli/profiles/__scripts__/profiles/exitOnFailure.sh b/packages/imperative/__tests__/__integration__/cmd/__tests__/integration/cli/profiles/__scripts__/profiles/exitOnFailure.sh index 3dbf0d5f8f..5e7beb8643 100644 --- a/packages/imperative/__tests__/__integration__/cmd/__tests__/integration/cli/profiles/__scripts__/profiles/exitOnFailure.sh +++ b/packages/imperative/__tests__/__integration__/cmd/__tests__/integration/cli/profiles/__scripts__/profiles/exitOnFailure.sh @@ -1,8 +1,7 @@ -#!/bin/bash +#!/bin/sh # function to exit if we encounter a bad return code -function exitOnFailure -{ +exitOnFailure () { failureMsg=${1:?"First parm (failureMsg) is required."} actualExitCode=${2:?"Second parm (actualExitCode) is required."} goodExitCode=${3:-0} diff --git a/packages/imperative/__tests__/__integration__/cmd/__tests__/integration/cli/profiles/__scripts__/profiles/map_banana_to_options.sh b/packages/imperative/__tests__/__integration__/cmd/__tests__/integration/cli/profiles/__scripts__/profiles/map_banana_to_options.sh index 64e7e3ea7a..9cd881c1ea 100644 --- a/packages/imperative/__tests__/__integration__/cmd/__tests__/integration/cli/profiles/__scripts__/profiles/map_banana_to_options.sh +++ b/packages/imperative/__tests__/__integration__/cmd/__tests__/integration/cli/profiles/__scripts__/profiles/map_banana_to_options.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/sh profileColor=$1 profileDescription=$2 diff --git a/packages/imperative/__tests__/__integration__/cmd/__tests__/integration/cli/profiles/__scripts__/profiles/map_banana_to_positionals.sh b/packages/imperative/__tests__/__integration__/cmd/__tests__/integration/cli/profiles/__scripts__/profiles/map_banana_to_positionals.sh index 9eea7ed56c..851f5ba3c1 100644 --- a/packages/imperative/__tests__/__integration__/cmd/__tests__/integration/cli/profiles/__scripts__/profiles/map_banana_to_positionals.sh +++ b/packages/imperative/__tests__/__integration__/cmd/__tests__/integration/cli/profiles/__scripts__/profiles/map_banana_to_positionals.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/sh profileColor=$1 profileDescription=$2 diff --git a/packages/imperative/__tests__/__integration__/cmd/__tests__/integration/cli/profiles/__scripts__/profiles/name_type_specify.sh b/packages/imperative/__tests__/__integration__/cmd/__tests__/integration/cli/profiles/__scripts__/profiles/name_type_specify.sh index 6985a979fc..920cc3fa1f 100644 --- a/packages/imperative/__tests__/__integration__/cmd/__tests__/integration/cli/profiles/__scripts__/profiles/name_type_specify.sh +++ b/packages/imperative/__tests__/__integration__/cmd/__tests__/integration/cli/profiles/__scripts__/profiles/name_type_specify.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/sh profileColor=$1 profileDescription=$2 diff --git a/packages/imperative/__tests__/__integration__/cmd/__tests__/integration/cli/profiles/__scripts__/profiles/name_type_undefined.sh b/packages/imperative/__tests__/__integration__/cmd/__tests__/integration/cli/profiles/__scripts__/profiles/name_type_undefined.sh index e39bfd46bd..b2bd9e478a 100644 --- a/packages/imperative/__tests__/__integration__/cmd/__tests__/integration/cli/profiles/__scripts__/profiles/name_type_undefined.sh +++ b/packages/imperative/__tests__/__integration__/cmd/__tests__/integration/cli/profiles/__scripts__/profiles/name_type_undefined.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/sh profileColor=$1 profileDescription=$2 diff --git a/packages/imperative/__tests__/__integration__/cmd/__tests__/integration/cli/profiles/__scripts__/profiles/specify_env_for_array.sh b/packages/imperative/__tests__/__integration__/cmd/__tests__/integration/cli/profiles/__scripts__/profiles/specify_env_for_array.sh index 13af50d623..d5f0cff5d3 100644 --- a/packages/imperative/__tests__/__integration__/cmd/__tests__/integration/cli/profiles/__scripts__/profiles/specify_env_for_array.sh +++ b/packages/imperative/__tests__/__integration__/cmd/__tests__/integration/cli/profiles/__scripts__/profiles/specify_env_for_array.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/sh cliColor=$1 cliDescription=$2 diff --git a/packages/imperative/__tests__/__integration__/cmd/__tests__/integration/cli/profiles/__scripts__/profiles/specify_env_for_boolean.sh b/packages/imperative/__tests__/__integration__/cmd/__tests__/integration/cli/profiles/__scripts__/profiles/specify_env_for_boolean.sh index bbd3b00dbc..a906515d3c 100644 --- a/packages/imperative/__tests__/__integration__/cmd/__tests__/integration/cli/profiles/__scripts__/profiles/specify_env_for_boolean.sh +++ b/packages/imperative/__tests__/__integration__/cmd/__tests__/integration/cli/profiles/__scripts__/profiles/specify_env_for_boolean.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/sh cliColor=$1 cliDescription=$2 diff --git a/packages/imperative/__tests__/__integration__/cmd/__tests__/integration/cli/profiles/__scripts__/profiles/specify_env_for_number.sh b/packages/imperative/__tests__/__integration__/cmd/__tests__/integration/cli/profiles/__scripts__/profiles/specify_env_for_number.sh index 48443ea47c..bb0e89dbd1 100644 --- a/packages/imperative/__tests__/__integration__/cmd/__tests__/integration/cli/profiles/__scripts__/profiles/specify_env_for_number.sh +++ b/packages/imperative/__tests__/__integration__/cmd/__tests__/integration/cli/profiles/__scripts__/profiles/specify_env_for_number.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/sh cliColor=$1 cliDescription=$2 diff --git a/packages/imperative/__tests__/__integration__/cmd/__tests__/integration/cli/profiles/__scripts__/profiles/specify_env_for_positional.sh b/packages/imperative/__tests__/__integration__/cmd/__tests__/integration/cli/profiles/__scripts__/profiles/specify_env_for_positional.sh index 5554c776c9..e779a8877a 100644 --- a/packages/imperative/__tests__/__integration__/cmd/__tests__/integration/cli/profiles/__scripts__/profiles/specify_env_for_positional.sh +++ b/packages/imperative/__tests__/__integration__/cmd/__tests__/integration/cli/profiles/__scripts__/profiles/specify_env_for_positional.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/sh envColor=$1 envDescription=$2 diff --git a/packages/imperative/__tests__/__integration__/cmd/__tests__/integration/cli/profiles/__scripts__/profiles/specify_env_sweetness.sh b/packages/imperative/__tests__/__integration__/cmd/__tests__/integration/cli/profiles/__scripts__/profiles/specify_env_sweetness.sh index 998edd8967..7b02bb00da 100644 --- a/packages/imperative/__tests__/__integration__/cmd/__tests__/integration/cli/profiles/__scripts__/profiles/specify_env_sweetness.sh +++ b/packages/imperative/__tests__/__integration__/cmd/__tests__/integration/cli/profiles/__scripts__/profiles/specify_env_sweetness.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/sh cliColor=$1 cliDescription=$2 From 77861de94ff733386d0ad7cd409646c70284684c Mon Sep 17 00:00:00 2001 From: Gene Johnston Date: Wed, 13 Dec 2023 16:30:25 -0500 Subject: [PATCH 023/138] Replace v1 profile commands with team config files Signed-off-by: Gene Johnston --- ...d.cli.auth.login.fruit.integration.test.ts | 210 ++++++++---------- ....cli.auth.logout.fruit.integration.test.ts | 80 +++---- .../auth/__resources__/base_cert.config.json | 15 ++ .../__resources__/base_password.config.json | 15 ++ .../__scripts__/auth_li_config_password.sh | 17 ++ .../cli/auth/__scripts__/auth_lo.sh | 12 + .../__scripts__/auth_login_cmd_line_cert.sh | 27 +++ .../auth_login_cmd_line_password.sh | 20 ++ .../__scripts__/auth_login_config_cert.sh | 24 ++ .../auth_login_config_cert_show_token.sh | 24 ++ .../auth_login_config_cert_show_token_rfj.sh | 13 ++ .../__scripts__/auth_login_config_password.sh | 17 ++ .../auth_login_config_password_show_token.sh | 17 ++ ...th_login_config_password_show_token_rfj.sh | 13 ++ .../cli/auth/__scripts__/auth_logout.sh | 12 + .../__scripts__/auth_logout_specify_token.sh | 14 ++ .../__scripts__/base_profile_and_auth_li.sh | 31 --- .../__scripts__/base_profile_and_auth_lo.sh | 19 -- .../base_profile_and_auth_login.sh | 31 --- .../base_profile_and_auth_login_cert.sh | 31 --- ...e_profile_and_auth_login_create_profile.sh | 13 -- ...file_and_auth_login_create_profile_cert.sh | 13 -- ...se_profile_and_auth_login_show_profiles.sh | 10 - .../base_profile_and_auth_login_show_token.sh | 22 -- ..._profile_and_auth_login_show_token_cert.sh | 22 -- ...e_profile_and_auth_login_show_token_rfj.sh | 10 - .../base_profile_and_auth_logout.sh | 19 -- ...e_profile_and_auth_logout_specify_token.sh | 21 -- .../auth/__scripts__/base_profile_create.sh | 13 -- .../__scripts__/base_profile_create_cert.sh | 13 -- .../cli/auth/__scripts__/exitOnFailure.sh | 12 + .../cli/auth/__scripts__/show_profiles.sh | 10 + .../cmd/src/cli/auth/FruitAuthHandler.ts | 10 +- .../src/cli/auth/FruitAuthHandler.ts | 8 +- .../imperative/src/imperative.ts | 24 +- .../src/abstract/AbstractProfileManager.ts | 2 +- 36 files changed, 437 insertions(+), 427 deletions(-) create mode 100644 packages/imperative/__tests__/__integration__/cmd/__tests__/integration/cli/auth/__resources__/base_cert.config.json create mode 100644 packages/imperative/__tests__/__integration__/cmd/__tests__/integration/cli/auth/__resources__/base_password.config.json create mode 100644 packages/imperative/__tests__/__integration__/cmd/__tests__/integration/cli/auth/__scripts__/auth_li_config_password.sh create mode 100644 packages/imperative/__tests__/__integration__/cmd/__tests__/integration/cli/auth/__scripts__/auth_lo.sh create mode 100644 packages/imperative/__tests__/__integration__/cmd/__tests__/integration/cli/auth/__scripts__/auth_login_cmd_line_cert.sh create mode 100644 packages/imperative/__tests__/__integration__/cmd/__tests__/integration/cli/auth/__scripts__/auth_login_cmd_line_password.sh create mode 100644 packages/imperative/__tests__/__integration__/cmd/__tests__/integration/cli/auth/__scripts__/auth_login_config_cert.sh create mode 100644 packages/imperative/__tests__/__integration__/cmd/__tests__/integration/cli/auth/__scripts__/auth_login_config_cert_show_token.sh create mode 100644 packages/imperative/__tests__/__integration__/cmd/__tests__/integration/cli/auth/__scripts__/auth_login_config_cert_show_token_rfj.sh create mode 100644 packages/imperative/__tests__/__integration__/cmd/__tests__/integration/cli/auth/__scripts__/auth_login_config_password.sh create mode 100644 packages/imperative/__tests__/__integration__/cmd/__tests__/integration/cli/auth/__scripts__/auth_login_config_password_show_token.sh create mode 100644 packages/imperative/__tests__/__integration__/cmd/__tests__/integration/cli/auth/__scripts__/auth_login_config_password_show_token_rfj.sh create mode 100644 packages/imperative/__tests__/__integration__/cmd/__tests__/integration/cli/auth/__scripts__/auth_logout.sh create mode 100644 packages/imperative/__tests__/__integration__/cmd/__tests__/integration/cli/auth/__scripts__/auth_logout_specify_token.sh delete mode 100644 packages/imperative/__tests__/__integration__/cmd/__tests__/integration/cli/auth/__scripts__/base_profile_and_auth_li.sh delete mode 100644 packages/imperative/__tests__/__integration__/cmd/__tests__/integration/cli/auth/__scripts__/base_profile_and_auth_lo.sh delete mode 100644 packages/imperative/__tests__/__integration__/cmd/__tests__/integration/cli/auth/__scripts__/base_profile_and_auth_login.sh delete mode 100644 packages/imperative/__tests__/__integration__/cmd/__tests__/integration/cli/auth/__scripts__/base_profile_and_auth_login_cert.sh delete mode 100644 packages/imperative/__tests__/__integration__/cmd/__tests__/integration/cli/auth/__scripts__/base_profile_and_auth_login_create_profile.sh delete mode 100644 packages/imperative/__tests__/__integration__/cmd/__tests__/integration/cli/auth/__scripts__/base_profile_and_auth_login_create_profile_cert.sh delete mode 100644 packages/imperative/__tests__/__integration__/cmd/__tests__/integration/cli/auth/__scripts__/base_profile_and_auth_login_show_profiles.sh delete mode 100644 packages/imperative/__tests__/__integration__/cmd/__tests__/integration/cli/auth/__scripts__/base_profile_and_auth_login_show_token.sh delete mode 100644 packages/imperative/__tests__/__integration__/cmd/__tests__/integration/cli/auth/__scripts__/base_profile_and_auth_login_show_token_cert.sh delete mode 100644 packages/imperative/__tests__/__integration__/cmd/__tests__/integration/cli/auth/__scripts__/base_profile_and_auth_login_show_token_rfj.sh delete mode 100644 packages/imperative/__tests__/__integration__/cmd/__tests__/integration/cli/auth/__scripts__/base_profile_and_auth_logout.sh delete mode 100644 packages/imperative/__tests__/__integration__/cmd/__tests__/integration/cli/auth/__scripts__/base_profile_and_auth_logout_specify_token.sh delete mode 100644 packages/imperative/__tests__/__integration__/cmd/__tests__/integration/cli/auth/__scripts__/base_profile_create.sh delete mode 100644 packages/imperative/__tests__/__integration__/cmd/__tests__/integration/cli/auth/__scripts__/base_profile_create_cert.sh create mode 100644 packages/imperative/__tests__/__integration__/cmd/__tests__/integration/cli/auth/__scripts__/exitOnFailure.sh create mode 100644 packages/imperative/__tests__/__integration__/cmd/__tests__/integration/cli/auth/__scripts__/show_profiles.sh diff --git a/packages/imperative/__tests__/__integration__/cmd/__tests__/integration/cli/auth/Cmd.cli.auth.login.fruit.integration.test.ts b/packages/imperative/__tests__/__integration__/cmd/__tests__/integration/cli/auth/Cmd.cli.auth.login.fruit.integration.test.ts index 4d6a74f748..076cea490d 100644 --- a/packages/imperative/__tests__/__integration__/cmd/__tests__/integration/cli/auth/Cmd.cli.auth.login.fruit.integration.test.ts +++ b/packages/imperative/__tests__/__integration__/cmd/__tests__/integration/cli/auth/Cmd.cli.auth.login.fruit.integration.test.ts @@ -14,12 +14,12 @@ import { ITestEnvironment } from "../../../../../../__src__/environment/doc/resp import { SetupTestEnvironment } from "../../../../../../__src__/environment/SetupTestEnvironment"; import { join } from "path"; -const fakeCertPath = join(__dirname, "__resources__", "fakeCert.cert"); -const fakeCertKeyPath = join(__dirname, "__resources__", "fakeKey.key"); +const fakeCertPath = "./fakeCert.cert"; +const fakeCertKeyPath = "./fakeKey.key"; // Test Environment populated in the beforeAll(); let TEST_ENVIRONMENT: ITestEnvironment; -describe("cmd-cli auth login", () => { +describe("imperative-test-cli auth login", () => { // Create the unique test environment beforeAll(async () => { TEST_ENVIRONMENT = await SetupTestEnvironment.createTestEnv({ @@ -28,222 +28,199 @@ describe("cmd-cli auth login", () => { }); }); - afterEach(() => { - // delete profiles between tests so that they can be recreated - require("rimraf").sync(join(TEST_ENVIRONMENT.workingDir, "profiles")); - }); - it("should load values from base profile and store token in it with alias", () => { - const response = runCliScript(__dirname + "/__scripts__/base_profile_and_auth_li.sh", - TEST_ENVIRONMENT.workingDir, ["fakeUser", "fakePass"]); - expect(response.stderr.toString()).toContain("command 'profiles create' is deprecated"); - expect(response.status).toBe(0); + const response = runCliScript(__dirname + "/__scripts__/auth_li_config_password.sh", + TEST_ENVIRONMENT.workingDir); // the output of the command should include token value - expect(response.stdout.toString()).toContain("user: fakeUser"); - expect(response.stdout.toString()).toContain("password: fakePass"); + expect(response.stderr.toString()).toBe(""); + expect(response.stdout.toString()).toContain("user: fakeUser"); + expect(response.stdout.toString()).toContain("password: fakePass"); expect(response.stdout.toString()).toContain("tokenType: jwtToken"); - expect(response.stdout.toString()).toContain("tokenValue: fakeUser:fakePass@fakeToken"); + expect(response.stdout.toString()).toContain("tokenValue: (secure value)"); + expect(response.status).toBe(0); }); it("should load values from base profile and store token in it - basic auth", () => { - const response = runCliScript(__dirname + "/__scripts__/base_profile_and_auth_login.sh", - TEST_ENVIRONMENT.workingDir, ["fakeUser", "fakePass"]); - expect(response.stderr.toString()).toContain("command 'profiles create' is deprecated"); - expect(response.status).toBe(0); + const response = runCliScript(__dirname + "/__scripts__/auth_login_config_password.sh", + TEST_ENVIRONMENT.workingDir); // the output of the command should include token value - expect(response.stdout.toString()).toContain("user: fakeUser"); - expect(response.stdout.toString()).toContain("password: fakePass"); + expect(response.stderr.toString()).toBe(""); + expect(response.stdout.toString()).toContain("user: fakeUser"); + expect(response.stdout.toString()).toContain("password: fakePass"); expect(response.stdout.toString()).toContain("tokenType: jwtToken"); - expect(response.stdout.toString()).toContain("tokenValue: fakeUser:fakePass@fakeToken"); + expect(response.stdout.toString()).toContain("tokenValue: (secure value)"); + expect(response.status).toBe(0); }); it("should load values from base profile and store token in it - certificate auth", () => { - const response = runCliScript(__dirname + "/__scripts__/base_profile_and_auth_login_cert.sh", - TEST_ENVIRONMENT.workingDir, [fakeCertPath, fakeCertKeyPath]); - expect(response.stderr.toString()).toContain("command 'profiles create' is deprecated"); - expect(response.status).toBe(0); + const response = runCliScript(__dirname + "/__scripts__/auth_login_config_cert.sh", + TEST_ENVIRONMENT.workingDir); // the output of the command should include token value + expect(response.stderr.toString()).toBe(""); expect(response.stdout.toString()).toContain("certFile: " + fakeCertPath); expect(response.stdout.toString()).toContain("certKeyFile: " + fakeCertKeyPath); expect(response.stdout.toString()).toContain("tokenType: jwtToken"); - expect(response.stdout.toString()).toContain("tokenValue: fakeCertificate@fakeToken"); + expect(response.stdout.toString()).toContain("tokenValue: (secure value)"); + expect(response.status).toBe(0); }); it("should load values from base profile and show token only - basic auth", () => { - let response = runCliScript(__dirname + "/__scripts__/base_profile_and_auth_login_show_token.sh", - TEST_ENVIRONMENT.workingDir, ["fakeUser", "fakePass"]); - expect(response.stderr.toString()).toContain("command 'profiles create' is deprecated"); - expect(response.status).toBe(0); - - // the output of the command should include token value - expect(response.stdout.toString()).toContain("fakeUser:fakePass@fakeToken"); - - response = runCliScript(__dirname + "/__scripts__/base_profile_and_auth_login_show_profiles.sh", TEST_ENVIRONMENT.workingDir); + const response = runCliScript(__dirname + "/__scripts__/auth_login_config_password_show_token.sh", + TEST_ENVIRONMENT.workingDir); // the output of the command should not include token value - expect(response.stderr.toString()).toContain("command 'profiles list' is deprecated"); - expect(response.status).toBe(0); + expect(response.stderr.toString()).toBe(""); + expect(response.stdout.toString()).toContain("Received a token of type = jwtToken"); + expect(response.stdout.toString()).toContain("The following token was retrieved and will not be stored in your profile:"); + expect(response.stdout.toString()).toContain("fakeUser:fakePass@fakeToken"); expect(response.stdout.toString()).not.toContain("tokenType:"); expect(response.stdout.toString()).not.toContain("tokenValue:"); + expect(response.status).toBe(0); }); it("should load values from base profile and show token only - certificate auth", () => { - let response = runCliScript(__dirname + "/__scripts__/base_profile_and_auth_login_show_token_cert.sh", - TEST_ENVIRONMENT.workingDir, [fakeCertPath, fakeCertKeyPath]); - expect(response.stderr.toString()).toContain("command 'profiles create' is deprecated"); - expect(response.status).toBe(0); - - // the output of the command should include token value - expect(response.stdout.toString()).toContain("fakeCertificate@fakeToken"); - - response = runCliScript(__dirname + "/__scripts__/base_profile_and_auth_login_show_profiles.sh", TEST_ENVIRONMENT.workingDir); + const response = runCliScript(__dirname + "/__scripts__/auth_login_config_cert_show_token.sh", + TEST_ENVIRONMENT.workingDir); // the output of the command should not include token value - expect(response.stderr.toString()).toContain("command 'profiles list' is deprecated"); - expect(response.status).toBe(0); + expect(response.stderr.toString()).toBe(""); + expect(response.stdout.toString()).toContain("Received a token of type = jwtToken"); + expect(response.stdout.toString()).toContain("The following token was retrieved and will not be stored in your profile:"); + expect(response.stdout.toString()).toContain("fakeCertificate@fakeToken"); expect(response.stdout.toString()).not.toContain("tokenType:"); expect(response.stdout.toString()).not.toContain("tokenValue:"); + expect(response.status).toBe(0); }); it("should load values from base profile and show token in rfj - basic auth", () => { - let response = runCliScript(__dirname + "/__scripts__/base_profile_create.sh", - TEST_ENVIRONMENT.workingDir, ["fakeUser", "fakePass"]); - expect(response.stderr.toString()).toContain("command 'profiles create' is deprecated"); - expect(response.status).toBe(0); - // the output of the command should include token value - response = runCliScript(__dirname + "/__scripts__/base_profile_and_auth_login_show_token_rfj.sh", + let response = runCliScript(__dirname + "/__scripts__/auth_login_config_password_show_token_rfj.sh", TEST_ENVIRONMENT.workingDir); expect(response.stderr.toString()).toBe(""); - expect(response.status).toBe(0); expect(JSON.parse(response.stdout.toString()).data).toMatchObject({tokenType: "jwtToken", tokenValue: "fakeUser:fakePass@fakeToken"}); + expect(response.status).toBe(0); // the output of the command should not include token value - response = runCliScript(__dirname + "/__scripts__/base_profile_and_auth_login_show_profiles.sh", TEST_ENVIRONMENT.workingDir); - expect(response.stderr.toString()).toContain("command 'profiles list' is deprecated"); - expect(response.status).toBe(0); + response = runCliScript(__dirname + "/__scripts__/show_profiles.sh", TEST_ENVIRONMENT.workingDir); + expect(response.stderr.toString()).toBe(""); expect(response.stdout.toString()).not.toContain("tokenType:"); expect(response.stdout.toString()).not.toContain("tokenValue:"); + expect(response.status).toBe(0); }); it("should load values from base profile and show token in rfj - certificate auth", () => { - let response = runCliScript(__dirname + "/__scripts__/base_profile_create_cert.sh", - TEST_ENVIRONMENT.workingDir, [fakeCertPath, fakeCertKeyPath]); - expect(response.stderr.toString()).toContain("command 'profiles create' is deprecated"); - expect(response.status).toBe(0); - // the output of the command should include token value - response = runCliScript(__dirname + "/__scripts__/base_profile_and_auth_login_show_token_rfj.sh", + let response = runCliScript(__dirname + "/__scripts__/auth_login_config_cert_show_token_rfj.sh", TEST_ENVIRONMENT.workingDir); expect(response.stderr.toString()).toBe(""); - expect(response.status).toBe(0); expect(JSON.parse(response.stdout.toString()).data).toMatchObject({tokenType: "jwtToken", tokenValue: "fakeCertificate@fakeToken"}); + expect(response.status).toBe(0); // the output of the command should not include token value - response = runCliScript(__dirname + "/__scripts__/base_profile_and_auth_login_show_profiles.sh", TEST_ENVIRONMENT.workingDir); - expect(response.stderr.toString()).toContain("command 'profiles list' is deprecated"); - expect(response.status).toBe(0); + response = runCliScript(__dirname + "/__scripts__/show_profiles.sh", TEST_ENVIRONMENT.workingDir); + expect(response.stderr.toString()).toBe(""); expect(response.stdout.toString()).not.toContain("tokenType:"); expect(response.stdout.toString()).not.toContain("tokenValue:"); - }); + expect(response.status).toBe(0); +}); - it("should create a profile, if requested 1", () => { - let response = runCliScript(__dirname + "/__scripts__/base_profile_and_auth_login_create_profile.sh", + it("should store token from cmd line user & password - y", () => { + let response = runCliScript(__dirname + "/__scripts__/auth_login_cmd_line_password.sh", TEST_ENVIRONMENT.workingDir, ["y", "fakeUser", "fakePass"]); expect(response.stderr.toString()).toBe(""); - expect(response.status).toBe(0); expect(response.stdout.toString()).toContain("Login successful."); - expect(response.stdout.toString()).toContain("The authentication token is stored in the 'default' base profile"); - - response = runCliScript(__dirname + "/__scripts__/base_profile_and_auth_login_show_profiles.sh", TEST_ENVIRONMENT.workingDir); - - expect(response.stderr.toString()).toContain("command 'profiles list' is deprecated"); + expect(response.stdout.toString()).toContain( + "The authentication token is stored in the 'baseProfName' base profile for future use"); expect(response.status).toBe(0); + + response = runCliScript(__dirname + "/__scripts__/show_profiles.sh", TEST_ENVIRONMENT.workingDir); + expect(response.stderr.toString()).toBe(""); expect(response.stdout.toString()).toContain("host: fakeHost"); expect(response.stdout.toString()).toContain("port: 3000"); expect(response.stdout.toString()).toContain("tokenType: jwtToken"); - expect(response.stdout.toString()).toContain("tokenValue: fakeUser:fakePass@fakeToken"); + expect(response.stdout.toString()).toContain("tokenValue: (secure value)"); expect(response.stdout.toString()).not.toContain("user:"); expect(response.stdout.toString()).not.toContain("password:"); + expect(response.status).toBe(0); }); - it("should create a profile, if requested 2", () => { - let response = runCliScript(__dirname + "/__scripts__/base_profile_and_auth_login_create_profile.sh", + it("should store token from cmd line user & password - yes", () => { + let response = runCliScript(__dirname + "/__scripts__/auth_login_cmd_line_password.sh", TEST_ENVIRONMENT.workingDir, ["yes", "fakeUser", "fakePass"]); expect(response.stderr.toString()).toBe(""); - expect(response.status).toBe(0); expect(response.stdout.toString()).toContain("Login successful."); - expect(response.stdout.toString()).toContain("The authentication token is stored in the 'default' base profile"); - - response = runCliScript(__dirname + "/__scripts__/base_profile_and_auth_login_show_profiles.sh", TEST_ENVIRONMENT.workingDir); - - expect(response.stderr.toString()).toContain("command 'profiles list' is deprecated"); + expect(response.stdout.toString()).toContain( + "The authentication token is stored in the 'baseProfName' base profile for future use"); expect(response.status).toBe(0); + + response = runCliScript(__dirname + "/__scripts__/show_profiles.sh", TEST_ENVIRONMENT.workingDir); + expect(response.stderr.toString()).toBe(""); expect(response.stdout.toString()).toContain("host: fakeHost"); expect(response.stdout.toString()).toContain("port: 3000"); expect(response.stdout.toString()).toContain("tokenType: jwtToken"); - expect(response.stdout.toString()).toContain("tokenValue: fakeUser:fakePass@fakeToken"); + expect(response.stdout.toString()).toContain("tokenValue: (secure value)"); expect(response.stdout.toString()).not.toContain("user:"); expect(response.stdout.toString()).not.toContain("password:"); + expect(response.status).toBe(0); }); - it("should create a profile, if requested 3", () => { - let response = runCliScript(__dirname + "/__scripts__/base_profile_and_auth_login_create_profile_cert.sh", + it("should store token from cmd line certificate", () => { + let response = runCliScript(__dirname + "/__scripts__/auth_login_cmd_line_cert.sh", TEST_ENVIRONMENT.workingDir, ["y", fakeCertPath, fakeCertKeyPath]); expect(response.stderr.toString()).toBe(""); - expect(response.status).toBe(0); expect(response.stdout.toString()).toContain("Login successful."); - expect(response.stdout.toString()).toContain("The authentication token is stored in the 'default' base profile"); - - response = runCliScript(__dirname + "/__scripts__/base_profile_and_auth_login_show_profiles.sh", TEST_ENVIRONMENT.workingDir); - - expect(response.stderr.toString()).toContain("command 'profiles list' is deprecated"); + expect(response.stdout.toString()).toContain( + "The authentication token is stored in the 'baseProfName' base profile for future use"); expect(response.status).toBe(0); - expect(response.stdout.toString()).toContain("certFile: " + fakeCertPath); - expect(response.stdout.toString()).toContain("certKeyFile: " + fakeCertKeyPath); - expect(response.stdout.toString()).toContain("host: fakeHost"); - expect(response.stdout.toString()).toContain("port: 3000"); - expect(response.stdout.toString()).toContain("tokenType: jwtToken"); - expect(response.stdout.toString()).toContain("tokenValue: fakeCertificate@fakeToken"); + + response = runCliScript(__dirname + "/__scripts__/show_profiles.sh", TEST_ENVIRONMENT.workingDir); + expect(response.stderr.toString()).toBe(""); + expect(response.stdout.toString()).toContain("host: fakeHost"); + expect(response.stdout.toString()).toContain("port: 3000"); + expect(response.stdout.toString()).toContain("tokenType: jwtToken"); + expect(response.stdout.toString()).toContain("secure"); + expect(response.stdout.toString()).toContain("tokenValue"); expect(response.stdout.toString()).not.toContain("user:"); expect(response.stdout.toString()).not.toContain("password:"); + expect(response.stdout.toString()).not.toContain("certFile:"); + expect(response.stdout.toString()).not.toContain("certKeyFile:"); + expect(response.status).toBe(0); }); - it("should not create a profile, if requested 1", () => { - let response = runCliScript(__dirname + "/__scripts__/base_profile_and_auth_login_create_profile.sh", + it("should NOT store token from user & password, if requested", () => { + let response = runCliScript(__dirname + "/__scripts__/auth_login_cmd_line_password.sh", TEST_ENVIRONMENT.workingDir, ["n", "fakeUser", "fakePass"]); - expect(response.status).toBe(0); + expect(response.stderr.toString()).toBe(""); expect(response.stdout.toString()).toContain("Login successful."); expect(response.stdout.toString()).toContain("will not be stored in your profile"); expect(response.stdout.toString()).toContain("fakeUser:fakePass@fakeToken"); - - response = runCliScript(__dirname + "/__scripts__/base_profile_and_auth_login_show_profiles.sh", TEST_ENVIRONMENT.workingDir); - - expect(response.stderr.toString()).toContain("command 'profiles list' is deprecated"); expect(response.status).toBe(0); + + response = runCliScript(__dirname + "/__scripts__/show_profiles.sh", TEST_ENVIRONMENT.workingDir); + expect(response.stderr.toString()).toBe(""); expect(response.stdout.toString()).not.toContain("user:"); expect(response.stdout.toString()).not.toContain("password:"); expect(response.stdout.toString()).not.toContain("host:"); expect(response.stdout.toString()).not.toContain("port:"); expect(response.stdout.toString()).not.toContain("tokenType:"); expect(response.stdout.toString()).not.toContain("tokenValue:"); + expect(response.status).toBe(0); }); - it("should not create a profile, if requested 2", () => { - let response = runCliScript(__dirname + "/__scripts__/base_profile_and_auth_login_create_profile_cert.sh", + it("should NOT store token from cert, if requested", () => { + let response = runCliScript(__dirname + "/__scripts__/auth_login_cmd_line_cert.sh", TEST_ENVIRONMENT.workingDir, ["n", fakeCertPath, fakeCertKeyPath]); - expect(response.status).toBe(0); + expect(response.stderr.toString()).toBe(""); expect(response.stdout.toString()).toContain("Login successful."); expect(response.stdout.toString()).toContain("will not be stored in your profile"); expect(response.stdout.toString()).toContain("fakeCertificate@fakeToken"); - - response = runCliScript(__dirname + "/__scripts__/base_profile_and_auth_login_show_profiles.sh", TEST_ENVIRONMENT.workingDir); - - expect(response.stderr.toString()).toContain("command 'profiles list' is deprecated"); expect(response.status).toBe(0); + + response = runCliScript(__dirname + "/__scripts__/show_profiles.sh", TEST_ENVIRONMENT.workingDir); + expect(response.stderr.toString()).toBe(""); expect(response.stdout.toString()).not.toContain("user:"); expect(response.stdout.toString()).not.toContain("password:"); expect(response.stdout.toString()).not.toContain("host:"); @@ -252,5 +229,6 @@ describe("cmd-cli auth login", () => { expect(response.stdout.toString()).not.toContain("tokenValue:"); expect(response.stdout.toString()).not.toContain("certFile:"); expect(response.stdout.toString()).not.toContain("certKeyFile:"); + expect(response.status).toBe(0); }); }); diff --git a/packages/imperative/__tests__/__integration__/cmd/__tests__/integration/cli/auth/Cmd.cli.auth.logout.fruit.integration.test.ts b/packages/imperative/__tests__/__integration__/cmd/__tests__/integration/cli/auth/Cmd.cli.auth.logout.fruit.integration.test.ts index 6ba8a4648f..2e7c723e92 100644 --- a/packages/imperative/__tests__/__integration__/cmd/__tests__/integration/cli/auth/Cmd.cli.auth.logout.fruit.integration.test.ts +++ b/packages/imperative/__tests__/__integration__/cmd/__tests__/integration/cli/auth/Cmd.cli.auth.logout.fruit.integration.test.ts @@ -16,7 +16,7 @@ import { join } from "path"; // Test Environment populated in the beforeAll(); let TEST_ENVIRONMENT: ITestEnvironment; -describe("cmd-cli auth logout", () => { +describe("imperative-test-cli auth logout", () => { // Create the unique test environment beforeAll(async () => { TEST_ENVIRONMENT = await SetupTestEnvironment.createTestEnv({ @@ -25,69 +25,71 @@ describe("cmd-cli auth logout", () => { }); }); - afterEach(() => { - // delete profiles between tests so that they can be recreated - require("rimraf").sync(join(TEST_ENVIRONMENT.workingDir, "profiles")); - }); - - it("should have auth logout command that loads values from base profile and removes the token with alias", () => { - let response = runCliScript(__dirname + "/__scripts__/base_profile_and_auth_li.sh", - TEST_ENVIRONMENT.workingDir, ["fakeUser", "fakePass"]); - expect(response.stderr.toString()).toContain("command 'profiles create' is deprecated"); - expect(response.status).toBe(0); + it("should have auth lo command that loads values from base profile and removes the token", () => { + let response = runCliScript(__dirname + "/__scripts__/auth_li_config_password.sh", + TEST_ENVIRONMENT.workingDir); - // the output of the command should include token value + // the output of the login command should include token value + expect(response.stderr.toString()).toBe(""); expect(response.stdout.toString()).toContain("tokenType: jwtToken"); - expect(response.stdout.toString()).toContain("tokenValue: fakeUser:fakePass@fakeToken"); + expect(response.stdout.toString()).toContain("tokenValue: (secure value)"); + expect(response.status).toBe(0); - response = runCliScript(__dirname + "/__scripts__/base_profile_and_auth_lo.sh", + response = runCliScript(__dirname + "/__scripts__/auth_lo.sh", TEST_ENVIRONMENT.workingDir); - expect(response.stderr.toString()).toContain("command 'profiles list' is deprecated"); - expect(response.status).toBe(0); - // the output of the command should include token value + // the output of the command should NOT include token value + expect(response.stderr.toString()).toBe(""); + expect(response.stdout.toString()).toContain("Logout successful. The authentication token has been revoked"); + expect(response.stdout.toString()).toContain("Token was removed from your 'baseProfName_fruit' base profile"); expect(response.stdout.toString()).not.toContain("tokenType:"); expect(response.stdout.toString()).not.toContain("tokenValue:"); + expect(response.status).toBe(0); }); it("should have auth logout command that loads values from base profile and removes the token", () => { - let response = runCliScript(__dirname + "/__scripts__/base_profile_and_auth_login.sh", - TEST_ENVIRONMENT.workingDir, ["fakeUser", "fakePass"]); - expect(response.stderr.toString()).toContain("command 'profiles create' is deprecated"); - expect(response.status).toBe(0); + let response = runCliScript(__dirname + "/__scripts__/auth_login_config_password.sh", + TEST_ENVIRONMENT.workingDir); - // the output of the command should include token value + // the output of the login command should include token value + expect(response.stderr.toString()).toBe(""); expect(response.stdout.toString()).toContain("tokenType: jwtToken"); - expect(response.stdout.toString()).toContain("tokenValue: fakeUser:fakePass@fakeToken"); + expect(response.stdout.toString()).toContain("tokenValue: (secure value)"); + expect(response.status).toBe(0); - response = runCliScript(__dirname + "/__scripts__/base_profile_and_auth_logout.sh", + response = runCliScript(__dirname + "/__scripts__/auth_logout.sh", TEST_ENVIRONMENT.workingDir); - expect(response.stderr.toString()).toContain("command 'profiles list' is deprecated"); - expect(response.status).toBe(0); - // the output of the command should include token value + // the output of the command should NOT include token value + expect(response.stderr.toString()).toBe(""); + expect(response.stdout.toString()).toContain("Logout successful. The authentication token has been revoked"); + expect(response.stdout.toString()).toContain("Token was removed from your 'baseProfName_fruit' base profile"); expect(response.stdout.toString()).not.toContain("tokenType:"); expect(response.stdout.toString()).not.toContain("tokenValue:"); + expect(response.status).toBe(0); }); it("should have auth logout command that invalidates another token", () => { - let response = runCliScript(__dirname + "/__scripts__/base_profile_and_auth_login.sh", - TEST_ENVIRONMENT.workingDir, ["fakeUser", "fakePass"]); - expect(response.stderr.toString()).toContain("command 'profiles create' is deprecated"); - expect(response.stderr.toString()).toContain("command 'profiles list' is deprecated"); - expect(response.status).toBe(0); + let response = runCliScript(__dirname + "/__scripts__/auth_login_config_password.sh", + TEST_ENVIRONMENT.workingDir); - // the output of the command should include token value + // the output of the login command should include token value + expect(response.stderr.toString()).toBe(""); expect(response.stdout.toString()).toContain("tokenType: jwtToken"); - expect(response.stdout.toString()).toContain("tokenValue: fakeUser:fakePass@fakeToken"); + expect(response.stdout.toString()).toContain("tokenValue: (secure value)"); + expect(response.status).toBe(0); + - response = runCliScript(__dirname + "/__scripts__/base_profile_and_auth_logout_specify_token.sh", + response = runCliScript(__dirname + "/__scripts__/auth_logout_specify_token.sh", TEST_ENVIRONMENT.workingDir, ["fakeToken:fakeToken@fakeToken"]); - expect(response.stderr.toString()).toContain("command 'profiles list' is deprecated"); - expect(response.status).toBe(0); - // the output of the command should include token value + // the output of the command should still include token value + expect(response.stderr.toString()).toBe(""); + expect(response.stdout.toString()).toContain("Logout successful. The authentication token has been revoked"); + expect(response.stdout.toString()).toContain("Token was not removed from your 'baseProfName_fruit' base profile"); + expect(response.stdout.toString()).toContain("Reason: Token value does not match the securely stored value"); expect(response.stdout.toString()).toContain("tokenType: jwtToken"); - expect(response.stdout.toString()).toContain("tokenValue: fakeUser:fakePass@fakeToken"); + expect(response.stdout.toString()).toContain("tokenValue: (secure value)"); + expect(response.status).toBe(0); }); }); diff --git a/packages/imperative/__tests__/__integration__/cmd/__tests__/integration/cli/auth/__resources__/base_cert.config.json b/packages/imperative/__tests__/__integration__/cmd/__tests__/integration/cli/auth/__resources__/base_cert.config.json new file mode 100644 index 0000000000..028bd34bbc --- /dev/null +++ b/packages/imperative/__tests__/__integration__/cmd/__tests__/integration/cli/auth/__resources__/base_cert.config.json @@ -0,0 +1,15 @@ +{ + "profiles": { + "baseProfName": { + "type": "base", + "properties": { + "certFile": "./fakeCert.cert", + "certKeyFile": "./fakeKey.key" + } + } + }, + "defaults": { + "base": "baseProfName" + }, + "autoStore": true +} \ No newline at end of file diff --git a/packages/imperative/__tests__/__integration__/cmd/__tests__/integration/cli/auth/__resources__/base_password.config.json b/packages/imperative/__tests__/__integration__/cmd/__tests__/integration/cli/auth/__resources__/base_password.config.json new file mode 100644 index 0000000000..b636e8376f --- /dev/null +++ b/packages/imperative/__tests__/__integration__/cmd/__tests__/integration/cli/auth/__resources__/base_password.config.json @@ -0,0 +1,15 @@ +{ + "profiles": { + "baseProfName": { + "type": "base", + "properties": { + "user": "fakeUser", + "password": "fakePass" + } + } + }, + "defaults": { + "base": "baseProfName" + }, + "autoStore": true +} \ No newline at end of file diff --git a/packages/imperative/__tests__/__integration__/cmd/__tests__/integration/cli/auth/__scripts__/auth_li_config_password.sh b/packages/imperative/__tests__/__integration__/cmd/__tests__/integration/cli/auth/__scripts__/auth_li_config_password.sh new file mode 100644 index 0000000000..02f96041b4 --- /dev/null +++ b/packages/imperative/__tests__/__integration__/cmd/__tests__/integration/cli/auth/__scripts__/auth_li_config_password.sh @@ -0,0 +1,17 @@ +#!/bin/sh + +# include exitOnFailure function +myScriptDir=`dirname $0` +. $myScriptDir/exitOnFailure.sh + +# copy our config file +cp $myScriptDir/../__resources__/base_password.config.json imperative-test-cli.config.json +exitOnFailure "Failed to copy config file." $? + +# login to fruit auth +echo Y | imperative-test-cli auth li fruit +exitOnFailure "Logging into auth of type fruit failed!" $? + +# show contents of our config file +imperative-test-cli config list profiles +exitOnFailure "Display of updated imperative-test-cli.config.json failed!" $? diff --git a/packages/imperative/__tests__/__integration__/cmd/__tests__/integration/cli/auth/__scripts__/auth_lo.sh b/packages/imperative/__tests__/__integration__/cmd/__tests__/integration/cli/auth/__scripts__/auth_lo.sh new file mode 100644 index 0000000000..a132ff0a96 --- /dev/null +++ b/packages/imperative/__tests__/__integration__/cmd/__tests__/integration/cli/auth/__scripts__/auth_lo.sh @@ -0,0 +1,12 @@ +#!/bin/sh + +# include exitOnFailure function +myScriptDir=`dirname $0` +. $myScriptDir/exitOnFailure.sh + +imperative-test-cli auth lo fruit +exitOnFailure "Logging out auth of type fruit failed!" $? + +# show contents of our config file +imperative-test-cli config list profiles +exitOnFailure "Display of updated imperative-test-cli.config.json failed!" $? diff --git a/packages/imperative/__tests__/__integration__/cmd/__tests__/integration/cli/auth/__scripts__/auth_login_cmd_line_cert.sh b/packages/imperative/__tests__/__integration__/cmd/__tests__/integration/cli/auth/__scripts__/auth_login_cmd_line_cert.sh new file mode 100644 index 0000000000..dee303c754 --- /dev/null +++ b/packages/imperative/__tests__/__integration__/cmd/__tests__/integration/cli/auth/__scripts__/auth_login_cmd_line_cert.sh @@ -0,0 +1,27 @@ +#!/bin/sh + +echoVal=${1:?"First parm (echoVal) is required."} +baseCertFile=${2:?"Second parm (baseCertFile) is required."} +baseCertKey=${3:?"Third parm (baseCertKey) is required."} + +# include exitOnFailure function +myScriptDir=`dirname $0` +. $myScriptDir/exitOnFailure.sh + +# copy our config file and certificate files +resourceDir=$myScriptDir/../__resources__ +cp $resourceDir/base_cert.config.json . +exitOnFailure "Failed to copy config file." $? + +cp $resourceDir/$baseCertFile . +exitOnFailure "Failed to copy certificate file." $? + +cp $resourceDir/fakeKey.key . +exitOnFailure "Failed to copy certificate key file." $? + +# remove existing cert from our config file +sed -e '/"certFile":/d' -e '/"certKeyFile":/d' < base_cert.config.json > imperative-test-cli.config.json +exitOnFailure "Failed to update config file." $? + +echo $echoVal | imperative-test-cli auth login fruit --certFile "$baseCertFile" --certKeyFile "$baseCertKey" +exitOnFailure "Logging into auth of type fruit failed!" $? diff --git a/packages/imperative/__tests__/__integration__/cmd/__tests__/integration/cli/auth/__scripts__/auth_login_cmd_line_password.sh b/packages/imperative/__tests__/__integration__/cmd/__tests__/integration/cli/auth/__scripts__/auth_login_cmd_line_password.sh new file mode 100644 index 0000000000..0e8b7e0660 --- /dev/null +++ b/packages/imperative/__tests__/__integration__/cmd/__tests__/integration/cli/auth/__scripts__/auth_login_cmd_line_password.sh @@ -0,0 +1,20 @@ +#!/bin/sh + +echoVal=${1:?"First parm (echoVal) is required."} +baseUser=${2:?"Second parm (baseUser) is required."} +basePass=${3:?"Third parm (basePass) is required."} + +# include exitOnFailure function +myScriptDir=`dirname $0` +. $myScriptDir/exitOnFailure.sh + +# copy our config file +cp $myScriptDir/../__resources__/base_password.config.json . +exitOnFailure "Failed to copy config file." $? + +# remove existing user and password from our config file +sed -e '/"user":/d' -e '/"password":/d' < base_password.config.json > imperative-test-cli.config.json +exitOnFailure "Failed to update config file." $? + +echo $echoVal | imperative-test-cli auth login fruit --user "$baseUser" --password "$basePass" +exitOnFailure "Logging into auth of type fruit failed!" $? diff --git a/packages/imperative/__tests__/__integration__/cmd/__tests__/integration/cli/auth/__scripts__/auth_login_config_cert.sh b/packages/imperative/__tests__/__integration__/cmd/__tests__/integration/cli/auth/__scripts__/auth_login_config_cert.sh new file mode 100644 index 0000000000..60d5488711 --- /dev/null +++ b/packages/imperative/__tests__/__integration__/cmd/__tests__/integration/cli/auth/__scripts__/auth_login_config_cert.sh @@ -0,0 +1,24 @@ +#!/bin/sh + +# include exitOnFailure function +myScriptDir=`dirname $0` +. $myScriptDir/exitOnFailure.sh + +# copy our config file and certificate files +resourceDir=$myScriptDir/../__resources__ +cp $resourceDir/base_cert.config.json imperative-test-cli.config.json +exitOnFailure "Failed to copy config file." $? + +cp $resourceDir/fakeCert.cert . +exitOnFailure "Failed to copy certificate file." $? + +cp $resourceDir/fakeKey.key . +exitOnFailure "Failed to copy certificate key file." $? + +# login to fruit auth +echo Y | imperative-test-cli auth login fruit +exitOnFailure "Logging into auth of type fruit failed!" $? + +# show contents of our config file +imperative-test-cli config list profiles +exitOnFailure "Display of updated imperative-test-cli.config.json failed!" $? diff --git a/packages/imperative/__tests__/__integration__/cmd/__tests__/integration/cli/auth/__scripts__/auth_login_config_cert_show_token.sh b/packages/imperative/__tests__/__integration__/cmd/__tests__/integration/cli/auth/__scripts__/auth_login_config_cert_show_token.sh new file mode 100644 index 0000000000..ade6f29099 --- /dev/null +++ b/packages/imperative/__tests__/__integration__/cmd/__tests__/integration/cli/auth/__scripts__/auth_login_config_cert_show_token.sh @@ -0,0 +1,24 @@ +#!/bin/sh + +# include exitOnFailure function +myScriptDir=`dirname $0` +. $myScriptDir/exitOnFailure.sh + +# copy our config file and certificate files +resourceDir=$myScriptDir/../__resources__ +cp $resourceDir/base_cert.config.json imperative-test-cli.config.json +exitOnFailure "Failed to copy config file." $? + +cp $resourceDir/fakeCert.cert . +exitOnFailure "Failed to copy certificate file." $? + +cp $resourceDir/fakeKey.key . +exitOnFailure "Failed to copy certificate key file." $? + +# login to fruit auth +imperative-test-cli auth login fruit --show-token +exitOnFailure "Logging into auth of type fruit failed!" $? + +# show contents of our config file +imperative-test-cli config list profiles +exitOnFailure "Display of updated imperative-test-cli.config.json failed!" $? diff --git a/packages/imperative/__tests__/__integration__/cmd/__tests__/integration/cli/auth/__scripts__/auth_login_config_cert_show_token_rfj.sh b/packages/imperative/__tests__/__integration__/cmd/__tests__/integration/cli/auth/__scripts__/auth_login_config_cert_show_token_rfj.sh new file mode 100644 index 0000000000..6d68c50190 --- /dev/null +++ b/packages/imperative/__tests__/__integration__/cmd/__tests__/integration/cli/auth/__scripts__/auth_login_config_cert_show_token_rfj.sh @@ -0,0 +1,13 @@ +#!/bin/sh + +# include exitOnFailure function +myScriptDir=`dirname $0` +. $myScriptDir/exitOnFailure.sh + +# copy our config file +cp $myScriptDir/../__resources__/base_cert.config.json imperative-test-cli.config.json +exitOnFailure "Failed to copy config file." $? + +# Login to fruit auth. Only show token. Do not store token. +imperative-test-cli auth login fruit --st --rfj +exitOnFailure "Logging into auth of type fruit failed!" $? diff --git a/packages/imperative/__tests__/__integration__/cmd/__tests__/integration/cli/auth/__scripts__/auth_login_config_password.sh b/packages/imperative/__tests__/__integration__/cmd/__tests__/integration/cli/auth/__scripts__/auth_login_config_password.sh new file mode 100644 index 0000000000..0723d6d0a8 --- /dev/null +++ b/packages/imperative/__tests__/__integration__/cmd/__tests__/integration/cli/auth/__scripts__/auth_login_config_password.sh @@ -0,0 +1,17 @@ +#!/bin/sh + +# include exitOnFailure function +myScriptDir=`dirname $0` +. $myScriptDir/exitOnFailure.sh + +# copy our config file +cp $myScriptDir/../__resources__/base_password.config.json imperative-test-cli.config.json +exitOnFailure "Failed to copy config file." $? + +# login to fruit auth +echo Y | imperative-test-cli auth login fruit +exitOnFailure "Logging into auth of type fruit failed!" $? + +# show contents of our config file +imperative-test-cli config list profiles +exitOnFailure "Display of updated imperative-test-cli.config.json failed!" $? diff --git a/packages/imperative/__tests__/__integration__/cmd/__tests__/integration/cli/auth/__scripts__/auth_login_config_password_show_token.sh b/packages/imperative/__tests__/__integration__/cmd/__tests__/integration/cli/auth/__scripts__/auth_login_config_password_show_token.sh new file mode 100644 index 0000000000..ca81b1bb55 --- /dev/null +++ b/packages/imperative/__tests__/__integration__/cmd/__tests__/integration/cli/auth/__scripts__/auth_login_config_password_show_token.sh @@ -0,0 +1,17 @@ +#!/bin/sh + +# include exitOnFailure function +myScriptDir=`dirname $0` +. $myScriptDir/exitOnFailure.sh + +# copy our config file +cp $myScriptDir/../__resources__/base_password.config.json imperative-test-cli.config.json +exitOnFailure "Failed to copy config file." $? + +# login to fruit auth +imperative-test-cli auth login fruit --show-token +exitOnFailure "Logging into auth of type fruit failed!" $? + +# show contents of our config file +imperative-test-cli config list profiles +exitOnFailure "Display of updated imperative-test-cli.config.json failed!" $? diff --git a/packages/imperative/__tests__/__integration__/cmd/__tests__/integration/cli/auth/__scripts__/auth_login_config_password_show_token_rfj.sh b/packages/imperative/__tests__/__integration__/cmd/__tests__/integration/cli/auth/__scripts__/auth_login_config_password_show_token_rfj.sh new file mode 100644 index 0000000000..664e9fbec0 --- /dev/null +++ b/packages/imperative/__tests__/__integration__/cmd/__tests__/integration/cli/auth/__scripts__/auth_login_config_password_show_token_rfj.sh @@ -0,0 +1,13 @@ +#!/bin/sh + +# include exitOnFailure function +myScriptDir=`dirname $0` +. $myScriptDir/exitOnFailure.sh + +# copy our config file +cp $myScriptDir/../__resources__/base_password.config.json imperative-test-cli.config.json +exitOnFailure "Failed to copy config file." $? + +# Login to fruit auth. Only show token. Do not store token. +imperative-test-cli auth login fruit --st --rfj +exitOnFailure "Logging into auth of type fruit failed!" $? diff --git a/packages/imperative/__tests__/__integration__/cmd/__tests__/integration/cli/auth/__scripts__/auth_logout.sh b/packages/imperative/__tests__/__integration__/cmd/__tests__/integration/cli/auth/__scripts__/auth_logout.sh new file mode 100644 index 0000000000..426dcc1853 --- /dev/null +++ b/packages/imperative/__tests__/__integration__/cmd/__tests__/integration/cli/auth/__scripts__/auth_logout.sh @@ -0,0 +1,12 @@ +#!/bin/sh + +# include exitOnFailure function +myScriptDir=`dirname $0` +. $myScriptDir/exitOnFailure.sh + +imperative-test-cli auth logout fruit +exitOnFailure "Logging out auth of type fruit failed!" $? + +# show contents of our config file +imperative-test-cli config list profiles +exitOnFailure "Display of updated imperative-test-cli.config.json failed!" $? diff --git a/packages/imperative/__tests__/__integration__/cmd/__tests__/integration/cli/auth/__scripts__/auth_logout_specify_token.sh b/packages/imperative/__tests__/__integration__/cmd/__tests__/integration/cli/auth/__scripts__/auth_logout_specify_token.sh new file mode 100644 index 0000000000..d8803feaef --- /dev/null +++ b/packages/imperative/__tests__/__integration__/cmd/__tests__/integration/cli/auth/__scripts__/auth_logout_specify_token.sh @@ -0,0 +1,14 @@ +#!/bin/sh + +tokenValue=$1 + +# include exitOnFailure function +myScriptDir=`dirname $0` +. $myScriptDir/exitOnFailure.sh + +imperative-test-cli auth logout fruit --token-value "$tokenValue" +exitOnFailure "Logging out auth of type fruit failed!" $? + +# show contents of our config file +imperative-test-cli config list profiles +exitOnFailure "Display of updated imperative-test-cli.config.json failed!" $? diff --git a/packages/imperative/__tests__/__integration__/cmd/__tests__/integration/cli/auth/__scripts__/base_profile_and_auth_li.sh b/packages/imperative/__tests__/__integration__/cmd/__tests__/integration/cli/auth/__scripts__/base_profile_and_auth_li.sh deleted file mode 100644 index b2807c13e5..0000000000 --- a/packages/imperative/__tests__/__integration__/cmd/__tests__/integration/cli/auth/__scripts__/base_profile_and_auth_li.sh +++ /dev/null @@ -1,31 +0,0 @@ -#!/bin/bash - -baseUser=$1 -basePass=$2 - -# First create a base profile -cmd-cli profiles create base-profile "test_base" --user "$baseUser" --password "$basePass" -CMDRC=$? -if [ $CMDRC -gt 0 ] -then - echo "Creating a test_base profile of type base failed!" 1>&2 - exit $CMDRC -fi - -# Next login to fruit auth -cmd-cli auth li fruit -CMDRC=$? -if [ $CMDRC -gt 0 ] -then - echo "Logging into auth of type fruit failed!" 1>&2 - exit $CMDRC -fi - -# Now show contents of base profile -cmd-cli profiles list base-profiles --sc -CMDRC=$? -if [ $CMDRC -gt 0 ] -then - echo "Listing profiles of type base failed!" 1>&2 - exit $CMDRC -fi diff --git a/packages/imperative/__tests__/__integration__/cmd/__tests__/integration/cli/auth/__scripts__/base_profile_and_auth_lo.sh b/packages/imperative/__tests__/__integration__/cmd/__tests__/integration/cli/auth/__scripts__/base_profile_and_auth_lo.sh deleted file mode 100644 index 16a3af4bfc..0000000000 --- a/packages/imperative/__tests__/__integration__/cmd/__tests__/integration/cli/auth/__scripts__/base_profile_and_auth_lo.sh +++ /dev/null @@ -1,19 +0,0 @@ -#!/bin/bash - -# Next logout of fruit auth -cmd-cli auth lo fruit -CMDRC=$? -if [ $CMDRC -gt 0 ] -then - echo "Logging out of auth of type fruit failed!" 1>&2 - exit $CMDRC -fi - -# Now show contents of base profile -cmd-cli profiles list base-profiles --sc -CMDRC=$? -if [ $CMDRC -gt 0 ] -then - echo "Listing profiles of type base failed!" 1>&2 - exit $CMDRC -fi diff --git a/packages/imperative/__tests__/__integration__/cmd/__tests__/integration/cli/auth/__scripts__/base_profile_and_auth_login.sh b/packages/imperative/__tests__/__integration__/cmd/__tests__/integration/cli/auth/__scripts__/base_profile_and_auth_login.sh deleted file mode 100644 index b8eff2b07e..0000000000 --- a/packages/imperative/__tests__/__integration__/cmd/__tests__/integration/cli/auth/__scripts__/base_profile_and_auth_login.sh +++ /dev/null @@ -1,31 +0,0 @@ -#!/bin/bash - -baseUser=$1 -basePass=$2 - -# First create a base profile -cmd-cli profiles create base-profile "test_base" --user "$baseUser" --password "$basePass" -CMDRC=$? -if [ $CMDRC -gt 0 ] -then - echo "Creating a test_base profile of type base failed!" 1>&2 - exit $CMDRC -fi - -# Next login to fruit auth -cmd-cli auth login fruit -CMDRC=$? -if [ $CMDRC -gt 0 ] -then - echo "Logging into auth of type fruit failed!" 1>&2 - exit $CMDRC -fi - -# Now show contents of base profile -cmd-cli profiles list base-profiles --sc -CMDRC=$? -if [ $CMDRC -gt 0 ] -then - echo "Listing profiles of type base failed!" 1>&2 - exit $CMDRC -fi diff --git a/packages/imperative/__tests__/__integration__/cmd/__tests__/integration/cli/auth/__scripts__/base_profile_and_auth_login_cert.sh b/packages/imperative/__tests__/__integration__/cmd/__tests__/integration/cli/auth/__scripts__/base_profile_and_auth_login_cert.sh deleted file mode 100644 index 2e2dadbb15..0000000000 --- a/packages/imperative/__tests__/__integration__/cmd/__tests__/integration/cli/auth/__scripts__/base_profile_and_auth_login_cert.sh +++ /dev/null @@ -1,31 +0,0 @@ -#!/bin/bash - -baseCertFile=$1 -baseCertKey=$2 - -# First create a base profile -cmd-cli profiles create base-profile "test_base" --certFile "$baseCertFile" --certKeyFile "$baseCertKey" -CMDRC=$? -if [ $CMDRC -gt 0 ] -then - echo "Creating a test_base profile of type base failed!" 1>&2 - exit $CMDRC -fi - -# Next login to fruit auth -cmd-cli auth login fruit -CMDRC=$? -if [ $CMDRC -gt 0 ] -then - echo "Logging into auth of type fruit failed!" 1>&2 - exit $CMDRC -fi - -# Now show contents of base profile -cmd-cli profiles list base-profiles --sc -CMDRC=$? -if [ $CMDRC -gt 0 ] -then - echo "Listing profiles of type base failed!" 1>&2 - exit $CMDRC -fi diff --git a/packages/imperative/__tests__/__integration__/cmd/__tests__/integration/cli/auth/__scripts__/base_profile_and_auth_login_create_profile.sh b/packages/imperative/__tests__/__integration__/cmd/__tests__/integration/cli/auth/__scripts__/base_profile_and_auth_login_create_profile.sh deleted file mode 100644 index 3301161aad..0000000000 --- a/packages/imperative/__tests__/__integration__/cmd/__tests__/integration/cli/auth/__scripts__/base_profile_and_auth_login_create_profile.sh +++ /dev/null @@ -1,13 +0,0 @@ -#!/bin/bash - -echoVal=$1 -baseUser=$2 -basePass=$3 - -echo $echoVal | cmd-cli auth login fruit --user "$baseUser" --password "$basePass" -CMDRC=$? -if [ $CMDRC -gt 0 ] -then - echo "Logging into auth of type fruit failed!" 1>&2 - exit $CMDRC -fi \ No newline at end of file diff --git a/packages/imperative/__tests__/__integration__/cmd/__tests__/integration/cli/auth/__scripts__/base_profile_and_auth_login_create_profile_cert.sh b/packages/imperative/__tests__/__integration__/cmd/__tests__/integration/cli/auth/__scripts__/base_profile_and_auth_login_create_profile_cert.sh deleted file mode 100644 index a900ff0260..0000000000 --- a/packages/imperative/__tests__/__integration__/cmd/__tests__/integration/cli/auth/__scripts__/base_profile_and_auth_login_create_profile_cert.sh +++ /dev/null @@ -1,13 +0,0 @@ -#!/bin/bash - -echoVal=$1 -baseCertFile=$2 -baseCertKey=$3 - -echo $echoVal | cmd-cli auth login fruit --certFile "$baseCertFile" --certKeyFile "$baseCertKey" -CMDRC=$? -if [ $CMDRC -gt 0 ] -then - echo "Logging into auth of type fruit failed!" 1>&2 - exit $CMDRC -fi \ No newline at end of file diff --git a/packages/imperative/__tests__/__integration__/cmd/__tests__/integration/cli/auth/__scripts__/base_profile_and_auth_login_show_profiles.sh b/packages/imperative/__tests__/__integration__/cmd/__tests__/integration/cli/auth/__scripts__/base_profile_and_auth_login_show_profiles.sh deleted file mode 100644 index 72e83fb7ed..0000000000 --- a/packages/imperative/__tests__/__integration__/cmd/__tests__/integration/cli/auth/__scripts__/base_profile_and_auth_login_show_profiles.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash - -# Now show contents of base profile -cmd-cli profiles list base-profiles --sc -CMDRC=$? -if [ $CMDRC -gt 0 ] -then - echo "Listing profiles of type base failed!" 1>&2 - exit $CMDRC -fi diff --git a/packages/imperative/__tests__/__integration__/cmd/__tests__/integration/cli/auth/__scripts__/base_profile_and_auth_login_show_token.sh b/packages/imperative/__tests__/__integration__/cmd/__tests__/integration/cli/auth/__scripts__/base_profile_and_auth_login_show_token.sh deleted file mode 100644 index 20a8c6b370..0000000000 --- a/packages/imperative/__tests__/__integration__/cmd/__tests__/integration/cli/auth/__scripts__/base_profile_and_auth_login_show_token.sh +++ /dev/null @@ -1,22 +0,0 @@ -#!/bin/bash - -baseUser=$1 -basePass=$2 - -# First create a base profile -cmd-cli profiles create base-profile "test_base" --user "$baseUser" --password "$basePass" -CMDRC=$? -if [ $CMDRC -gt 0 ] -then - echo "Creating a test_base profile of type base failed!" 1>&2 - exit $CMDRC -fi - -# Next login to fruit auth -cmd-cli auth login fruit --show-token -CMDRC=$? -if [ $CMDRC -gt 0 ] -then - echo "Logging into auth of type fruit failed!" 1>&2 - exit $CMDRC -fi diff --git a/packages/imperative/__tests__/__integration__/cmd/__tests__/integration/cli/auth/__scripts__/base_profile_and_auth_login_show_token_cert.sh b/packages/imperative/__tests__/__integration__/cmd/__tests__/integration/cli/auth/__scripts__/base_profile_and_auth_login_show_token_cert.sh deleted file mode 100644 index a996a1b5c8..0000000000 --- a/packages/imperative/__tests__/__integration__/cmd/__tests__/integration/cli/auth/__scripts__/base_profile_and_auth_login_show_token_cert.sh +++ /dev/null @@ -1,22 +0,0 @@ -#!/bin/bash - -baseCertFile=$1 -baseCertKey=$2 - -# First create a base profile -cmd-cli profiles create base-profile "test_base" --certFile "$baseCertFile" --certKeyFile "$baseCertKey" -CMDRC=$? -if [ $CMDRC -gt 0 ] -then - echo "Creating a test_base profile of type base failed!" 1>&2 - exit $CMDRC -fi - -# Next login to fruit auth -cmd-cli auth login fruit --show-token -CMDRC=$? -if [ $CMDRC -gt 0 ] -then - echo "Logging into auth of type fruit failed!" 1>&2 - exit $CMDRC -fi diff --git a/packages/imperative/__tests__/__integration__/cmd/__tests__/integration/cli/auth/__scripts__/base_profile_and_auth_login_show_token_rfj.sh b/packages/imperative/__tests__/__integration__/cmd/__tests__/integration/cli/auth/__scripts__/base_profile_and_auth_login_show_token_rfj.sh deleted file mode 100644 index 3bb985706d..0000000000 --- a/packages/imperative/__tests__/__integration__/cmd/__tests__/integration/cli/auth/__scripts__/base_profile_and_auth_login_show_token_rfj.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash - -# Next login to fruit auth -cmd-cli auth login fruit --st --rfj -CMDRC=$? -if [ $CMDRC -gt 0 ] -then - echo "Logging into auth of type fruit failed!" 1>&2 - exit $CMDRC -fi diff --git a/packages/imperative/__tests__/__integration__/cmd/__tests__/integration/cli/auth/__scripts__/base_profile_and_auth_logout.sh b/packages/imperative/__tests__/__integration__/cmd/__tests__/integration/cli/auth/__scripts__/base_profile_and_auth_logout.sh deleted file mode 100644 index f5638b1967..0000000000 --- a/packages/imperative/__tests__/__integration__/cmd/__tests__/integration/cli/auth/__scripts__/base_profile_and_auth_logout.sh +++ /dev/null @@ -1,19 +0,0 @@ -#!/bin/bash - -# Next logout of fruit auth -cmd-cli auth logout fruit -CMDRC=$? -if [ $CMDRC -gt 0 ] -then - echo "Logging out of auth of type fruit failed!" 1>&2 - exit $CMDRC -fi - -# Now show contents of base profile -cmd-cli profiles list base-profiles --sc -CMDRC=$? -if [ $CMDRC -gt 0 ] -then - echo "Listing profiles of type base failed!" 1>&2 - exit $CMDRC -fi diff --git a/packages/imperative/__tests__/__integration__/cmd/__tests__/integration/cli/auth/__scripts__/base_profile_and_auth_logout_specify_token.sh b/packages/imperative/__tests__/__integration__/cmd/__tests__/integration/cli/auth/__scripts__/base_profile_and_auth_logout_specify_token.sh deleted file mode 100644 index 33541b4373..0000000000 --- a/packages/imperative/__tests__/__integration__/cmd/__tests__/integration/cli/auth/__scripts__/base_profile_and_auth_logout_specify_token.sh +++ /dev/null @@ -1,21 +0,0 @@ -#!/bin/bash - -tokenValue=$1 - -# Next logout of fruit auth -cmd-cli auth logout fruit --token-value "$tokenValue" -CMDRC=$? -if [ $CMDRC -gt 0 ] -then - echo "Logging out of auth of type fruit failed!" 1>&2 - exit $CMDRC -fi - -# Now show contents of base profile -cmd-cli profiles list base-profiles --sc -CMDRC=$? -if [ $CMDRC -gt 0 ] -then - echo "Listing profiles of type base failed!" 1>&2 - exit $CMDRC -fi diff --git a/packages/imperative/__tests__/__integration__/cmd/__tests__/integration/cli/auth/__scripts__/base_profile_create.sh b/packages/imperative/__tests__/__integration__/cmd/__tests__/integration/cli/auth/__scripts__/base_profile_create.sh deleted file mode 100644 index 921c1be86d..0000000000 --- a/packages/imperative/__tests__/__integration__/cmd/__tests__/integration/cli/auth/__scripts__/base_profile_create.sh +++ /dev/null @@ -1,13 +0,0 @@ -#!/bin/bash - -baseUser=$1 -basePass=$2 - -# First create a base profile -cmd-cli profiles create base-profile "test_base" --user "$baseUser" --password "$basePass" -CMDRC=$? -if [ $CMDRC -gt 0 ] -then - echo "Creating a test_base profile of type base failed!" 1>&2 - exit $CMDRC -fi diff --git a/packages/imperative/__tests__/__integration__/cmd/__tests__/integration/cli/auth/__scripts__/base_profile_create_cert.sh b/packages/imperative/__tests__/__integration__/cmd/__tests__/integration/cli/auth/__scripts__/base_profile_create_cert.sh deleted file mode 100644 index 5495f01f74..0000000000 --- a/packages/imperative/__tests__/__integration__/cmd/__tests__/integration/cli/auth/__scripts__/base_profile_create_cert.sh +++ /dev/null @@ -1,13 +0,0 @@ -#!/bin/bash - -baseCertFile=$1 -baseCertKey=$2 - -# First create a base profile -cmd-cli profiles create base-profile "test_base" --certFile "$baseCertFile" --certKeyFile "$baseCertKey" -CMDRC=$? -if [ $CMDRC -gt 0 ] -then - echo "Creating a test_base profile of type base failed!" 1>&2 - exit $CMDRC -fi diff --git a/packages/imperative/__tests__/__integration__/cmd/__tests__/integration/cli/auth/__scripts__/exitOnFailure.sh b/packages/imperative/__tests__/__integration__/cmd/__tests__/integration/cli/auth/__scripts__/exitOnFailure.sh new file mode 100644 index 0000000000..5e7beb8643 --- /dev/null +++ b/packages/imperative/__tests__/__integration__/cmd/__tests__/integration/cli/auth/__scripts__/exitOnFailure.sh @@ -0,0 +1,12 @@ +#!/bin/sh + +# function to exit if we encounter a bad return code +exitOnFailure () { + failureMsg=${1:?"First parm (failureMsg) is required."} + actualExitCode=${2:?"Second parm (actualExitCode) is required."} + goodExitCode=${3:-0} + if [ $actualExitCode != $goodExitCode ]; then + echo `basename $0`": $failureMsg" 1>&2 + exit $actualExitCode + fi +} diff --git a/packages/imperative/__tests__/__integration__/cmd/__tests__/integration/cli/auth/__scripts__/show_profiles.sh b/packages/imperative/__tests__/__integration__/cmd/__tests__/integration/cli/auth/__scripts__/show_profiles.sh new file mode 100644 index 0000000000..9562f1c5bf --- /dev/null +++ b/packages/imperative/__tests__/__integration__/cmd/__tests__/integration/cli/auth/__scripts__/show_profiles.sh @@ -0,0 +1,10 @@ +#!/bin/sh +# This script must be called AFTER a script copies a config file into our test directory. + +# include exitOnFailure function +myScriptDir=`dirname $0` +. $myScriptDir/exitOnFailure.sh + +# show contents of our config file +imperative-test-cli config list profiles +exitOnFailure "Display of updated imperative-test-cli.config.json failed!" $? diff --git a/packages/imperative/__tests__/__integration__/cmd/src/cli/auth/FruitAuthHandler.ts b/packages/imperative/__tests__/__integration__/cmd/src/cli/auth/FruitAuthHandler.ts index 1f9f883831..a939a52377 100644 --- a/packages/imperative/__tests__/__integration__/cmd/src/cli/auth/FruitAuthHandler.ts +++ b/packages/imperative/__tests__/__integration__/cmd/src/cli/auth/FruitAuthHandler.ts @@ -9,7 +9,8 @@ * */ -import { BaseAuthHandler, AbstractSession, ICommandArguments, ISession, SessConstants } from "../../../../../../lib"; +import { BaseAuthHandler, AbstractSession, CredentialManagerFactory, ICommandArguments, ISession, SessConstants +} from "../../../../../../lib"; /** * This class is used by the auth command handlers as the base class for their implementation. @@ -52,6 +53,13 @@ export default class ApimlAuthHandler extends BaseAuthHandler { * @returns {Promise} The response from the auth service containing a token */ protected async doLogin(session: AbstractSession) { + await CredentialManagerFactory.initialize({ + service: null, + Manager: null, + displayName: null, + invalidOnFailure: null + }); + if (session.ISession.user) { return `${session.ISession.user}:${session.ISession.password}@fakeToken`; } else { diff --git a/packages/imperative/__tests__/__integration__/imperative/src/cli/auth/FruitAuthHandler.ts b/packages/imperative/__tests__/__integration__/imperative/src/cli/auth/FruitAuthHandler.ts index 1e1fa70006..0cb0fc985f 100644 --- a/packages/imperative/__tests__/__integration__/imperative/src/cli/auth/FruitAuthHandler.ts +++ b/packages/imperative/__tests__/__integration__/imperative/src/cli/auth/FruitAuthHandler.ts @@ -38,6 +38,8 @@ export default class FruitAuthHandler extends BaseAuthHandler { port: 3000, user: args.user, password: args.password, + cert: args.certFile, + certKey: args.certKeyFile, tokenType: args.tokenType, tokenValue: args.tokenValue }; @@ -50,7 +52,11 @@ export default class FruitAuthHandler extends BaseAuthHandler { * @returns {Promise} The response from the auth service containing a token */ protected async doLogin(session: AbstractSession) { - return `${session.ISession.user}:${session.ISession.password}@fakeToken`; + if (session.ISession.user) { + return `${session.ISession.user}:${session.ISession.password}@fakeToken`; + } else { + return `fakeCertificate@fakeToken`; + } } /** diff --git a/packages/imperative/__tests__/__integration__/imperative/src/imperative.ts b/packages/imperative/__tests__/__integration__/imperative/src/imperative.ts index 1047412178..3c3f68e855 100644 --- a/packages/imperative/__tests__/__integration__/imperative/src/imperative.ts +++ b/packages/imperative/__tests__/__integration__/imperative/src/imperative.ts @@ -59,6 +59,18 @@ const tokenValueOption: ICommandOptionDefinition = { type: "string" }; +const certFileOption: ICommandOptionDefinition = { + name: "cert-file", + description: "Fruit certificate file", + type: "existingLocalFile" +}; + +const certKeyFileOption: ICommandOptionDefinition = { + name: "cert-key-file", + description: "Fruit certificate key file", + type: "existingLocalFile" +}; + // Example to use with tsnode: */*CommandDefinitions!(.d).*s export const config: IImperativeConfig = { commandModuleGlobs: ["**/cli/*/*definition!(.d).*s"], @@ -148,6 +160,14 @@ export const config: IImperativeConfig = { type: "string", optionDefinition: tokenValueOption, secure: true + }, + certFile: { + type: "existingLocalFile", + optionDefinition: certFileOption + }, + certKeyFile: { + type: "existingLocalFile", + optionDefinition: certKeyFileOption } }, }, @@ -162,7 +182,9 @@ export const config: IImperativeConfig = { hostOption, portOption, userOption, - passwordOption + passwordOption, + certFileOption, + certKeyFileOption ] }, logout: { diff --git a/packages/imperative/src/profiles/src/abstract/AbstractProfileManager.ts b/packages/imperative/src/profiles/src/abstract/AbstractProfileManager.ts index dca40121b9..36564b38b8 100644 --- a/packages/imperative/src/profiles/src/abstract/AbstractProfileManager.ts +++ b/packages/imperative/src/profiles/src/abstract/AbstractProfileManager.ts @@ -233,7 +233,7 @@ export abstract class AbstractProfileManager Date: Thu, 14 Dec 2023 09:58:16 -0500 Subject: [PATCH 024/138] chore: Add Linux dev pre-reqs to repo README Signed-off-by: Trae Yelovich --- README.md | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/README.md b/README.md index 32abd3e9dc..1cdeba5a02 100644 --- a/README.md +++ b/README.md @@ -52,6 +52,16 @@ Versioning conventions for Zowe CLI and Plug-ins| [Versioning Guidelines](./docs ## **Building Zowe CLI From Source** Zowe CLI requires NPM version 8 and Cargo version 1.72.0 (or newer) to build from source. Before proceeding, check your NPM version with `npm --version` and if it's older than 8.x, update with `npm install -g npm`. To check your version of Cargo, run `cargo --version`. Cargo can be installed using rustup: [https://rustup.rs/](https://rustup.rs/). To update Cargo, run the `rustup update` command. +For developers using Linux, the following packages are required to build Zowe CLI from source: + +- Debian/Ubuntu: + - `sudo apt install build-essential libsecret-1-dev` +- Red Hat-based: + - `sudo dnf group install "Development Tools"` + - `sudo dnf install libsecret-devel` +- Arch Linux: + - `sudo pacman -S base-devel libsecret` + The first time that you download Zowe CLI from the GitHub repository, issue the following command to install the required Zowe CLI dependencies and several development tools: ``` From f79a0a4e5222ca0b33599b607551f8cb9f88f548 Mon Sep 17 00:00:00 2001 From: Gene Johnston Date: Thu, 14 Dec 2023 11:51:47 -0500 Subject: [PATCH 025/138] Remove profile creation from a profile read test Signed-off-by: Gene Johnston --- .../Cmd.cli.read.profile.integration.test.ts | 7 +++-- .../profiles/insecure/insecure_meta.yaml | 30 +++++++++++++++++++ .../profiles/insecure/test_insecure.yaml | 2 ++ .../__scripts__/profile/create_and_read.sh | 18 +++++++++-- .../read/__scripts__/profile/exitOnFailure.sh | 12 ++++++++ 5 files changed, 63 insertions(+), 6 deletions(-) create mode 100644 packages/imperative/__tests__/__integration__/cmd/__tests__/integration/cli/read/__scripts__/__resources__/profiles/insecure/insecure_meta.yaml create mode 100644 packages/imperative/__tests__/__integration__/cmd/__tests__/integration/cli/read/__scripts__/__resources__/profiles/insecure/test_insecure.yaml create mode 100644 packages/imperative/__tests__/__integration__/cmd/__tests__/integration/cli/read/__scripts__/profile/exitOnFailure.sh diff --git a/packages/imperative/__tests__/__integration__/cmd/__tests__/integration/cli/read/Cmd.cli.read.profile.integration.test.ts b/packages/imperative/__tests__/__integration__/cmd/__tests__/integration/cli/read/Cmd.cli.read.profile.integration.test.ts index dc885a4358..940cf53bc7 100644 --- a/packages/imperative/__tests__/__integration__/cmd/__tests__/integration/cli/read/Cmd.cli.read.profile.integration.test.ts +++ b/packages/imperative/__tests__/__integration__/cmd/__tests__/integration/cli/read/Cmd.cli.read.profile.integration.test.ts @@ -23,10 +23,11 @@ describe("cmd-cli profiles read profiles", () => { }); }); - it("should create a profile with a field marked as secure in plain text (no keytar) and be able to read the contents", () => { + it("should read a profile with a secure field stored in plain text and be able to read the contents", () => { const response = runCliScript(__dirname + "/__scripts__/profile/create_and_read.sh", TEST_ENVIRONMENT.workingDir); - expect(response.stderr.toString()).toContain("command 'profiles create' is deprecated"); - expect(response.stdout.toString()).toContain("not so secret info"); + expect(response.stderr.toString()).toBe(""); + expect(response.stdout.toString()).toContain("info: some info"); + expect(response.stdout.toString()).toContain("secret: not so secret info"); expect(response.stdout.toString()).not.toContain("managed by"); expect(response.status).toBe(0); }); diff --git a/packages/imperative/__tests__/__integration__/cmd/__tests__/integration/cli/read/__scripts__/__resources__/profiles/insecure/insecure_meta.yaml b/packages/imperative/__tests__/__integration__/cmd/__tests__/integration/cli/read/__scripts__/__resources__/profiles/insecure/insecure_meta.yaml new file mode 100644 index 0000000000..d1b55364ae --- /dev/null +++ b/packages/imperative/__tests__/__integration__/cmd/__tests__/integration/cli/read/__scripts__/__resources__/profiles/insecure/insecure_meta.yaml @@ -0,0 +1,30 @@ +defaultProfile: test_insecure +configuration: + type: insecure + schema: + type: object + title: 'insecure Profile' + description: 'insecure Profile' + properties: + info: + type: string + optionDefinition: + name: info + aliases: + - i + description: 'The info property.' + type: string + required: false + group: 'insecure group' + secret: + type: string + secure: true + optionDefinition: + name: secret + aliases: + - s + description: 'The secret property.' + type: string + required: false + group: 'insecure group' + required: [] diff --git a/packages/imperative/__tests__/__integration__/cmd/__tests__/integration/cli/read/__scripts__/__resources__/profiles/insecure/test_insecure.yaml b/packages/imperative/__tests__/__integration__/cmd/__tests__/integration/cli/read/__scripts__/__resources__/profiles/insecure/test_insecure.yaml new file mode 100644 index 0000000000..a5125f379a --- /dev/null +++ b/packages/imperative/__tests__/__integration__/cmd/__tests__/integration/cli/read/__scripts__/__resources__/profiles/insecure/test_insecure.yaml @@ -0,0 +1,2 @@ +info: some info +secret: not so secret info diff --git a/packages/imperative/__tests__/__integration__/cmd/__tests__/integration/cli/read/__scripts__/profile/create_and_read.sh b/packages/imperative/__tests__/__integration__/cmd/__tests__/integration/cli/read/__scripts__/profile/create_and_read.sh index d142b03524..0ffe1e3e8a 100644 --- a/packages/imperative/__tests__/__integration__/cmd/__tests__/integration/cli/read/__scripts__/profile/create_and_read.sh +++ b/packages/imperative/__tests__/__integration__/cmd/__tests__/integration/cli/read/__scripts__/profile/create_and_read.sh @@ -1,4 +1,16 @@ -#!/bin/bash -set -e -OUTPUT=$(cmd-cli profiles create insecure "test_insecure" --info "some info" --secret "not so secret info") +#!/bin/sh + +# include exitOnFailure function +myScriptDir=`dirname $0` +. $myScriptDir/exitOnFailure.sh + +# set -e +# OUTPUT=$(cmd-cli profiles create insecure "test_insecure" --info "some info" --secret "not so secret info") + +# copy pre-existing profile to test directory +cp -r $myScriptDir/../__resources__/profiles profiles +exitOnFailure "Failed to copy test profile." $? + +# read the profile and display its information cmd-cli read profile +exitOnFailure "Failed display profile." $? diff --git a/packages/imperative/__tests__/__integration__/cmd/__tests__/integration/cli/read/__scripts__/profile/exitOnFailure.sh b/packages/imperative/__tests__/__integration__/cmd/__tests__/integration/cli/read/__scripts__/profile/exitOnFailure.sh new file mode 100644 index 0000000000..5e7beb8643 --- /dev/null +++ b/packages/imperative/__tests__/__integration__/cmd/__tests__/integration/cli/read/__scripts__/profile/exitOnFailure.sh @@ -0,0 +1,12 @@ +#!/bin/sh + +# function to exit if we encounter a bad return code +exitOnFailure () { + failureMsg=${1:?"First parm (failureMsg) is required."} + actualExitCode=${2:?"Second parm (actualExitCode) is required."} + goodExitCode=${3:-0} + if [ $actualExitCode != $goodExitCode ]; then + echo `basename $0`": $failureMsg" 1>&2 + exit $actualExitCode + fi +} From 1fba202006881a11b633436c691570accd165816 Mon Sep 17 00:00:00 2001 From: Gene Johnston Date: Thu, 14 Dec 2023 12:19:16 -0500 Subject: [PATCH 026/138] Remove test of 'profiles list' command. Signed-off-by: Gene Johnston --- .../secured-profile/create_and_list.sh | 18 -------- ...ate.secured-profile.integration.subtest.ts | 41 ------------------- 2 files changed, 59 deletions(-) delete mode 100644 packages/imperative/__tests__/__integration__/imperative/__tests__/__integration__/cli/profiles/__scripts__/secured-profile/create_and_list.sh delete mode 100644 packages/imperative/__tests__/__integration__/imperative/__tests__/__integration__/cli/profiles/cli.imperative-test-cli.profiles.create.secured-profile.integration.subtest.ts diff --git a/packages/imperative/__tests__/__integration__/imperative/__tests__/__integration__/cli/profiles/__scripts__/secured-profile/create_and_list.sh b/packages/imperative/__tests__/__integration__/imperative/__tests__/__integration__/cli/profiles/__scripts__/secured-profile/create_and_list.sh deleted file mode 100644 index 529e20af12..0000000000 --- a/packages/imperative/__tests__/__integration__/imperative/__tests__/__integration__/cli/profiles/__scripts__/secured-profile/create_and_list.sh +++ /dev/null @@ -1,18 +0,0 @@ -#!/bin/bash -FORCE_COLOR=0 -OUTPUT="$(imperative-test-cli profiles create secured-profile $2 --info "Not a secret" --secret "$1" --ow)" -RC=$? -if [ $RC -ne 0 ] -then - echo "Create profile command returned a non-zero RC: $?" 1>&2 - echo "$OUTPUT" - exit $RC -fi -imperative-test-cli profiles list secured-profiles --show-contents -RC=$? -if [ $RC -ne 0 ] -then - echo "List profiles command returned a non-zero RC: $?" 1>&2 - exit $RC -fi -exit $? \ No newline at end of file diff --git a/packages/imperative/__tests__/__integration__/imperative/__tests__/__integration__/cli/profiles/cli.imperative-test-cli.profiles.create.secured-profile.integration.subtest.ts b/packages/imperative/__tests__/__integration__/imperative/__tests__/__integration__/cli/profiles/cli.imperative-test-cli.profiles.create.secured-profile.integration.subtest.ts deleted file mode 100644 index 4c186d6dbe..0000000000 --- a/packages/imperative/__tests__/__integration__/imperative/__tests__/__integration__/cli/profiles/cli.imperative-test-cli.profiles.create.secured-profile.integration.subtest.ts +++ /dev/null @@ -1,41 +0,0 @@ -/* -* 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 { ITestEnvironment } from "../../../../../../__src__/environment/doc/response/ITestEnvironment"; -import { SetupTestEnvironment } from "../../../../../../__src__/environment/SetupTestEnvironment"; -import { runCliScript } from "../../../../../../src/TestUtil"; - -// Test Environment populated in the beforeAll(); -let TEST_ENVIRONMENT: ITestEnvironment; - -describe("imperative-test-cli profiles create secured-profile", () => { - - // Create the unique test environment - beforeAll(async () => { - TEST_ENVIRONMENT = await SetupTestEnvironment.createTestEnv({ - cliHomeEnvVar: "IMPERATIVE_TEST_CLI_CLI_HOME", - testName: "imperative_test_cli_test_create_secured_profile_command" - }); - }); - - it("should allow us to create a secured profile, list the contents and the secured fields should be hidden", () => { - const secret: string = "supersecretwords"; - const profileName: string = "my_secret"; - const response = runCliScript(__dirname + "/__scripts__/secured-profile/create_and_list.sh", TEST_ENVIRONMENT.workingDir, - [secret, profileName]); - expect(response.stderr.toString()).toContain("command 'profiles create' is deprecated"); - expect(response.stderr.toString()).toContain("command 'profiles list' is deprecated"); - expect(response.status).toBe(0); - expect(response.stdout.toString()).not.toContain(secret); - expect(response.stdout.toString()).toContain(profileName); - expect(response.stdout.toString()).toContain("managed by"); - }); -}); From 1210730d8d88a672b14210af45e946730382eef1 Mon Sep 17 00:00:00 2001 From: Gene Johnston Date: Thu, 14 Dec 2023 17:16:14 -0500 Subject: [PATCH 027/138] Remove tests that write V1 profiles Signed-off-by: Gene Johnston --- ...d.cli.auth.login.fruit.integration.test.ts | 3 +- ....cli.auth.logout.fruit.integration.test.ts | 1 - .../CliProfileManager.integration.test.ts | 146 +++--------------- .../cliprofilemanager/banana/banana_meta.yaml | 13 ++ .../cliprofilemanager/banana/myprofile.yaml | 1 + 5 files changed, 33 insertions(+), 131 deletions(-) create mode 100644 packages/imperative/__tests__/src/packages/cmd/__integration__/__resources__/cliprofilemanager/banana/banana_meta.yaml create mode 100644 packages/imperative/__tests__/src/packages/cmd/__integration__/__resources__/cliprofilemanager/banana/myprofile.yaml diff --git a/packages/imperative/__tests__/__integration__/cmd/__tests__/integration/cli/auth/Cmd.cli.auth.login.fruit.integration.test.ts b/packages/imperative/__tests__/__integration__/cmd/__tests__/integration/cli/auth/Cmd.cli.auth.login.fruit.integration.test.ts index 076cea490d..c6c0a3def1 100644 --- a/packages/imperative/__tests__/__integration__/cmd/__tests__/integration/cli/auth/Cmd.cli.auth.login.fruit.integration.test.ts +++ b/packages/imperative/__tests__/__integration__/cmd/__tests__/integration/cli/auth/Cmd.cli.auth.login.fruit.integration.test.ts @@ -12,7 +12,6 @@ import { runCliScript } from "../../../../../../src/TestUtil"; import { ITestEnvironment } from "../../../../../../__src__/environment/doc/response/ITestEnvironment"; import { SetupTestEnvironment } from "../../../../../../__src__/environment/SetupTestEnvironment"; -import { join } from "path"; const fakeCertPath = "./fakeCert.cert"; const fakeCertKeyPath = "./fakeKey.key"; @@ -125,7 +124,7 @@ describe("imperative-test-cli auth login", () => { expect(response.stdout.toString()).not.toContain("tokenType:"); expect(response.stdout.toString()).not.toContain("tokenValue:"); expect(response.status).toBe(0); -}); + }); it("should store token from cmd line user & password - y", () => { let response = runCliScript(__dirname + "/__scripts__/auth_login_cmd_line_password.sh", diff --git a/packages/imperative/__tests__/__integration__/cmd/__tests__/integration/cli/auth/Cmd.cli.auth.logout.fruit.integration.test.ts b/packages/imperative/__tests__/__integration__/cmd/__tests__/integration/cli/auth/Cmd.cli.auth.logout.fruit.integration.test.ts index 2e7c723e92..a71efbcb9a 100644 --- a/packages/imperative/__tests__/__integration__/cmd/__tests__/integration/cli/auth/Cmd.cli.auth.logout.fruit.integration.test.ts +++ b/packages/imperative/__tests__/__integration__/cmd/__tests__/integration/cli/auth/Cmd.cli.auth.logout.fruit.integration.test.ts @@ -12,7 +12,6 @@ import { runCliScript } from "../../../../../../src/TestUtil"; import { ITestEnvironment } from "../../../../../../__src__/environment/doc/response/ITestEnvironment"; import { SetupTestEnvironment } from "../../../../../../__src__/environment/SetupTestEnvironment"; -import { join } from "path"; // Test Environment populated in the beforeAll(); let TEST_ENVIRONMENT: ITestEnvironment; diff --git a/packages/imperative/__tests__/src/packages/cmd/__integration__/CliProfileManager.integration.test.ts b/packages/imperative/__tests__/src/packages/cmd/__integration__/CliProfileManager.integration.test.ts index ff0d7920f3..714c31d072 100644 --- a/packages/imperative/__tests__/src/packages/cmd/__integration__/CliProfileManager.integration.test.ts +++ b/packages/imperative/__tests__/src/packages/cmd/__integration__/CliProfileManager.integration.test.ts @@ -11,22 +11,16 @@ jest.mock("../../../../../src/utilities/src/ImperativeConfig"); -import { inspect } from "util"; -import { rimraf, TEST_RESULT_DIR } from "../../../TestUtil"; import { TestLogger } from "../../../../src/TestLogger"; import { CliProfileManager } from "../../../../../src/cmd/src/profiles/CliProfileManager"; import { ICommandProfileTypeConfiguration } from "../../../../../src/cmd"; describe("Cli Profile Manager", () => { - const profileDir = TEST_RESULT_DIR + "/cliprofilemanager"; + const profileDir = __dirname + "/__resources__/cliprofilemanager"; + const addTwoNumbersHandler = __dirname + "/../profileHandlers/AddTwoNumbersHandler"; const testLogger = TestLogger.getTestLogger(); const profileTypeOne = "banana"; - const addTwoNumbersHandler = __dirname + "/../profileHandlers/AddTwoNumbersHandler"; - afterEach(() => { - rimraf(profileDir); - }); - const getTypeConfigurations: () => ICommandProfileTypeConfiguration[] = () => { return [{ type: profileTypeOne, @@ -43,117 +37,19 @@ describe("Cli Profile Manager", () => { }, }]; }; - it("should take a handler to create a profile from command line arguments, and " + - "the handler should be called and the resulting profile should have the created fields in it.", async () => { - const configs = getTypeConfigurations(); - configs[0].createProfileFromArgumentsHandler = addTwoNumbersHandler; - const manager = new CliProfileManager({ - profileRootDirectory: profileDir, - type: profileTypeOne, - logger: testLogger, - typeConfigurations: configs - }); - const a = 1; - const b = 2; - const profileName = "myprofile"; - const saveResult = await manager.save({ - name: profileName, type: profileTypeOne, - profile: {}, - args: {_: [], $0: "test", a, b} - }); - testLogger.info("Save profile result: " + inspect(saveResult)); - const loadedProfile: any = await manager.load({name: profileName}); - expect(loadedProfile.profile.sum).toEqual(a + b); - }); - - it("If we provide a non existent handler to create a profile from command line arguments, " + - "we should get a helpful error.", async () => { - const configs = getTypeConfigurations(); - configs[0].createProfileFromArgumentsHandler = __dirname + "/profileHandlers/fakearooni"; - const manager = new CliProfileManager({ - profileRootDirectory: profileDir, - type: profileTypeOne, - logger: testLogger, - typeConfigurations: configs - }); - try { - await manager.save({ - name: "badprofile", type: profileTypeOne, - profile: {sum: 2}, - args: {_: [], $0: "test", doesNotMatter: "hi"} - }); - } catch (e) { - testLogger.info("Received error as expected: " + inspect(e)); - expect(e.message).toContain("handler"); - expect(e.message.toLowerCase()).toContain("error"); - } - }); - - it("should take a handler to update a profile that has already been created," + - " call the handler and update the profile from arguments.", - async () => { - const configs = getTypeConfigurations(); - configs[0].updateProfileFromArgumentsHandler = addTwoNumbersHandler; - const manager = new CliProfileManager({ - profileRootDirectory: profileDir, - type: profileTypeOne, - logger: testLogger, - typeConfigurations: configs - }); - const a = 1; - const b = 2; - const originalSum = 55; + it("should be able to load properties from an existing profile", async () => { const profileName = "myprofile"; - const saveResult = await manager.save({ - name: profileName, type: profileTypeOne, - profile: {sum: originalSum} - }); - expect(saveResult.overwritten).toEqual(false); - - testLogger.info("Save profile result: " + inspect(saveResult)); - - const updateResult = await manager.update({ - name: profileName, type: profileTypeOne, - profile: { - sum: 1 - }, - args: {_: [], $0: "fake", a, b} - }); - expect(updateResult.profile.sum).toEqual(a + b); - - testLogger.info("Update profile result: " + inspect(updateResult)); - const loadedProfile: any = await manager.load({name: profileName}); - testLogger.info("Loaded profile after update: " + inspect(loadedProfile)); - expect(loadedProfile.profile.sum).toEqual(a + b); - }); - - it("If we provide a non existent handler to update a profile from command line arguments, " + - "we should get a helpful error.", async () => { const configs = getTypeConfigurations(); - configs[0].updateProfileFromArgumentsHandler = __dirname + "/profileHandlers/fakearooni"; + configs[0].createProfileFromArgumentsHandler = addTwoNumbersHandler; const manager = new CliProfileManager({ profileRootDirectory: profileDir, type: profileTypeOne, logger: testLogger, typeConfigurations: configs }); - const profileName = "badprofile"; - await manager.save({ - name: profileName, type: profileTypeOne, - profile: {sum: 30} - }); - try { - await manager.update({ - name: profileName, type: profileTypeOne, - profile: {sum: 2}, - args: {_: [], $0: "test", doesNotMatter: "hi"} - }); - } catch (e) { - testLogger.info("Received error as expected: " + inspect(e)); - expect(e.message).toContain("handler"); - expect(e.message.toLowerCase()).toContain("error"); - } + const loadedProfile: any = await manager.load({name: profileName}); + expect(loadedProfile.profile.sum).toEqual(3); }); it("should be able to automatically map command line options to " + @@ -186,23 +82,17 @@ describe("Cli Profile Manager", () => { }, }]; - const manager = new CliProfileManager({ - profileRootDirectory: profileDir, - type: profileTypeOne, - logger: testLogger, - typeConfigurations: configs - }); - const propertyOneValue = 345; - const propertyTwoValue = "cell phone"; - const profileName = "myprofile"; - const saveResult = await manager.save({ - name: profileName, type: profileTypeOne, - profile: {}, - args: {_: [], $0: "test", differentProperty1: propertyOneValue, differentProperty2: propertyTwoValue} - }); - testLogger.info("Save profile result: " + inspect(saveResult)); - const loadedProfile: any = await manager.load({name: profileName}); - expect(loadedProfile.profile.property1).toEqual(propertyOneValue); - expect(loadedProfile.profile.property2).toEqual(propertyTwoValue); + let caughtError; + try { + const manager = new CliProfileManager({ + profileRootDirectory: profileDir, + type: profileTypeOne, + logger: testLogger, + typeConfigurations: configs + }); + } catch (error) { + caughtError = error; + } + expect(caughtError).toBeUndefined(); }); }); diff --git a/packages/imperative/__tests__/src/packages/cmd/__integration__/__resources__/cliprofilemanager/banana/banana_meta.yaml b/packages/imperative/__tests__/src/packages/cmd/__integration__/__resources__/cliprofilemanager/banana/banana_meta.yaml new file mode 100644 index 0000000000..86386d562b --- /dev/null +++ b/packages/imperative/__tests__/src/packages/cmd/__integration__/__resources__/cliprofilemanager/banana/banana_meta.yaml @@ -0,0 +1,13 @@ +defaultProfile: myprofile +configuration: + type: banana + schema: + type: object + title: 'test profile' + description: 'test profile' + properties: + sum: + type: number + required: + - sum + createProfileFromArgumentsHandler: /home/stduser/repos/zowe-cli/packages/imperative/__tests__/src/packages/cmd/__integration__/../profileHandlers/AddTwoNumbersHandler diff --git a/packages/imperative/__tests__/src/packages/cmd/__integration__/__resources__/cliprofilemanager/banana/myprofile.yaml b/packages/imperative/__tests__/src/packages/cmd/__integration__/__resources__/cliprofilemanager/banana/myprofile.yaml new file mode 100644 index 0000000000..79a6a4662a --- /dev/null +++ b/packages/imperative/__tests__/src/packages/cmd/__integration__/__resources__/cliprofilemanager/banana/myprofile.yaml @@ -0,0 +1 @@ +sum: 3 From acbb5ef8344d21c705f4f95dac336d7a248781f5 Mon Sep 17 00:00:00 2001 From: Gene Johnston Date: Fri, 15 Dec 2023 16:06:15 -0500 Subject: [PATCH 028/138] Use pre-existing profile files not v1 profile cmds Signed-off-by: Gene Johnston --- .../ProfileUtils.integration.test.ts | 17 +- .../profiles/base/base_meta.yaml | 230 ++++++++++++++++++ .../profiles/base/fakeBaseProfile.yaml | 1 + .../__resources__/profiles/ssh/ssh_meta.yaml | 96 ++++++++ .../__resources__/profiles/tso/tso_meta.yaml | 94 +++++++ .../profiles/zosmf/fakeServiceProfile.yaml | 1 + .../profiles/zosmf/zosmf_meta.yaml | 139 +++++++++++ .../__scripts__/copy_profiles.sh | 9 + .../__scripts__/create_profile.sh | 12 - .../__scripts__/delete_profile.sh | 12 - .../__scripts__/exitOnFailure.sh | 12 + .../__scripts__/profile/create_and_read.sh | 5 +- 12 files changed, 592 insertions(+), 36 deletions(-) create mode 100644 packages/core/__tests__/utils/__integration__/__resources__/profiles/base/base_meta.yaml create mode 100644 packages/core/__tests__/utils/__integration__/__resources__/profiles/base/fakeBaseProfile.yaml create mode 100644 packages/core/__tests__/utils/__integration__/__resources__/profiles/ssh/ssh_meta.yaml create mode 100644 packages/core/__tests__/utils/__integration__/__resources__/profiles/tso/tso_meta.yaml create mode 100644 packages/core/__tests__/utils/__integration__/__resources__/profiles/zosmf/fakeServiceProfile.yaml create mode 100644 packages/core/__tests__/utils/__integration__/__resources__/profiles/zosmf/zosmf_meta.yaml create mode 100644 packages/core/__tests__/utils/__integration__/__scripts__/copy_profiles.sh delete mode 100755 packages/core/__tests__/utils/__integration__/__scripts__/create_profile.sh delete mode 100755 packages/core/__tests__/utils/__integration__/__scripts__/delete_profile.sh create mode 100644 packages/core/__tests__/utils/__integration__/__scripts__/exitOnFailure.sh diff --git a/packages/core/__tests__/utils/__integration__/ProfileUtils.integration.test.ts b/packages/core/__tests__/utils/__integration__/ProfileUtils.integration.test.ts index dfc0d0ad3d..533d6e525c 100644 --- a/packages/core/__tests__/utils/__integration__/ProfileUtils.integration.test.ts +++ b/packages/core/__tests__/utils/__integration__/ProfileUtils.integration.test.ts @@ -46,14 +46,14 @@ describe("ProfileUtils", () => { testName: "core_utils_get_default_profile", skipProperties: true }); - - // We need the meta YAML files for the ProfileManager to initialize, so create dummy profiles to supply them - runCliScript(__dirname + "/__scripts__/create_profile.sh", TEST_ENVIRONMENT, - ["zosmf", "fakeServiceProfile", "--host fake --dd"]); - runCliScript(__dirname + "/__scripts__/create_profile.sh", TEST_ENVIRONMENT, - ["base", "fakeBaseProfile", "--host fake --dd"]); process.env.ZOWE_CLI_HOME = TEST_ENVIRONMENT.workingDir; + + // copy existing profiles into test directory + const response = runCliScript(__dirname + "/__scripts__/copy_profiles.sh", TEST_ENVIRONMENT); + expect(response.stderr.toString()).toBe(""); + expect(response.status).toBe(0); }); + beforeEach(() => { jest.resetAllMocks(); @@ -67,11 +67,12 @@ describe("ProfileUtils", () => { }) }); }); + afterAll(async () => { - runCliScript(__dirname + "/__scripts__/delete_profile.sh", TEST_ENVIRONMENT, ["zosmf", "fakeServiceProfile"]); - runCliScript(__dirname + "/__scripts__/delete_profile.sh", TEST_ENVIRONMENT, ["base", "fakeBaseProfile"]); await TestEnvironment.cleanUp(TEST_ENVIRONMENT); }); + + it("Should return a service profile", async() => { const profileManagerSpy = jest.spyOn(imperative.CliProfileManager.prototype, "load") .mockResolvedValueOnce({ profile: fakeServiceProfile } as any); diff --git a/packages/core/__tests__/utils/__integration__/__resources__/profiles/base/base_meta.yaml b/packages/core/__tests__/utils/__integration__/__resources__/profiles/base/base_meta.yaml new file mode 100644 index 0000000000..4b73a7496f --- /dev/null +++ b/packages/core/__tests__/utils/__integration__/__resources__/profiles/base/base_meta.yaml @@ -0,0 +1,230 @@ +defaultProfile: fakeBaseProfile +configuration: + type: base + schema: + type: object + title: 'Base Profile' + description: 'Base profile that stores values shared by multiple service profiles' + properties: + host: + type: string + optionDefinition: + name: host + aliases: + - H + description: 'Host name of service on the mainframe.' + type: string + group: 'Base Connection Options' + includeInTemplate: true + port: + type: number + optionDefinition: + name: port + aliases: + - P + description: 'Port number of service on the mainframe.' + type: number + group: 'Base Connection Options' + user: + type: string + secure: true + optionDefinition: + name: user + aliases: + - u + description: 'User name to authenticate to service on the mainframe.' + type: string + group: 'Base Connection Options' + includeInTemplate: true + password: + type: string + secure: true + optionDefinition: + name: password + aliases: + - pass + - pw + description: 'Password to authenticate to service on the mainframe.' + type: string + group: 'Base Connection Options' + includeInTemplate: true + rejectUnauthorized: + type: boolean + optionDefinition: + name: reject-unauthorized + aliases: + - ru + description: 'Reject self-signed certificates.' + type: boolean + defaultValue: true + group: 'Base Connection Options' + includeInTemplate: true + tokenType: + type: string + optionDefinition: + name: token-type + aliases: + - tt + description: 'The type of token to get and use for the API. Omit this option to use the default token type, which is provided by ''zowe auth login''.' + type: string + group: 'Base Connection Options' + tokenValue: + type: string + secure: true + optionDefinition: + name: token-value + aliases: + - tv + description: 'The value of the token to pass to the API.' + type: string + group: 'Base Connection Options' + certFile: + type: string + optionDefinition: + name: cert-file + description: 'The file path to a certificate file to use for authentication' + type: existingLocalFile + group: 'Base Connection Options' + aliases: [] + certKeyFile: + type: string + optionDefinition: + name: cert-key-file + description: 'The file path to a certificate key file to use for authentication' + type: existingLocalFile + group: 'Base Connection Options' + aliases: [] + required: [] + createProfileExamples: + - + options: 'base1 --host example.com --port 443 --user admin --password 123456' + description: 'Create a profile called ''base1'' to connect to host example.com and port 443' + - + options: 'base2 --host example.com --user admin --password 123456 --reject-unauthorized false' + description: 'Create a profile called ''base2'' to connect to host example.com (default port - 443) and allow self-signed certificates' + - + options: 'base3 --host example.com --port 1443' + description: 'Create a profile called ''base3'' to connect to host example.com and port 1443, not specifying a username or password so they are not stored on disk; these will need to be specified on every command' + - + options: 'base4 --reject-unauthorized false' + description: 'Create a zosmf profile called ''base4'' to connect to default port 443 and allow self-signed certificates, not specifying a username, password, or host so they are not stored on disk; these will need to be specified on every command' + updateProfileExamples: + - + options: 'base1 --user newuser --password newp4ss' + description: 'Update a base profile named ''base1'' with a new username and password' + authConfig: + - + serviceName: apiml + handler: /home/stduser/repos/zowe-cli/packages/cli/lib/auth/ApimlAuthHandler + login: + summary: 'Log in to API ML authentication service' + description: "Log in to Zowe API Mediation Layer authentication service and obtain or update a token.\n\nThe token provides authentication to services that support the API ML SSO (Single Sign-On) capability. When you log in, the token is stored in your default base profile until it expires. Base profiles store connection information shared by multiple services (e.g., z/OSMF), and are used if you do not supply connection information in a service profile. To take advantage of the API ML SSO capability, you should omit username and password in service profiles so that the token in the base profile is used." + examples: + - + description: 'Log in to an API ML instance to obtain or update the token stored in your base profile' + options: "" + - + description: 'Log in to an API ML instance to obtain a token without storing it in a profile' + options: '--show-token' + options: + - + name: host + aliases: + - H + description: 'Host name of service on the mainframe.' + type: string + group: 'Base Connection Options' + - + name: port + aliases: + - P + description: 'Port number of service on the mainframe.' + type: number + group: 'Base Connection Options' + - + name: user + aliases: + - u + description: 'User name to authenticate to service on the mainframe.' + type: string + group: 'Base Connection Options' + - + name: password + aliases: + - pass + - pw + description: 'Password to authenticate to service on the mainframe.' + type: string + group: 'Base Connection Options' + - + name: reject-unauthorized + aliases: + - ru + description: 'Reject self-signed certificates.' + type: boolean + defaultValue: true + group: 'Base Connection Options' + - + name: cert-file + description: 'The file path to a certificate file to use for authentication' + type: existingLocalFile + group: 'Base Connection Options' + aliases: [] + - + name: cert-key-file + description: 'The file path to a certificate key file to use for authentication' + type: existingLocalFile + group: 'Base Connection Options' + aliases: [] + logout: + summary: 'Log out of API ML authentication service' + description: 'Log out of the Zowe API Mediation Layer authentication service and revoke the token so it can no longer authenticate. Also remove the token from the default base profile, if it is stored on disk.' + examples: + - + description: 'Log out of an API ML instance to revoke the token that was in use and remove it from your base profile' + options: "" + - + description: 'Log out of an API ML instance to revoke a token that was not stored in a profile' + options: '--token-value ' + options: + - + name: host + aliases: + - H + description: 'Host name of service on the mainframe.' + type: string + group: 'Base Connection Options' + - + name: port + aliases: + - P + description: 'Port number of service on the mainframe.' + type: number + group: 'Base Connection Options' + - + name: token-type + aliases: + - tt + description: 'The type of token to get and use for the API. Omit this option to use the default token type, which is provided by ''zowe auth login''.' + type: string + group: 'Base Connection Options' + allowableValues: + values: + - '^apimlAuthenticationToken.*' + - jwtToken + - LtpaToken2 + - + name: token-value + aliases: + - tv + description: 'The value of the token to pass to the API.' + type: string + group: 'Base Connection Options' + - + name: reject-unauthorized + aliases: + - ru + description: 'Reject self-signed certificates.' + type: boolean + defaultValue: true + group: 'Base Connection Options' diff --git a/packages/core/__tests__/utils/__integration__/__resources__/profiles/base/fakeBaseProfile.yaml b/packages/core/__tests__/utils/__integration__/__resources__/profiles/base/fakeBaseProfile.yaml new file mode 100644 index 0000000000..de51124255 --- /dev/null +++ b/packages/core/__tests__/utils/__integration__/__resources__/profiles/base/fakeBaseProfile.yaml @@ -0,0 +1 @@ +host: fake diff --git a/packages/core/__tests__/utils/__integration__/__resources__/profiles/ssh/ssh_meta.yaml b/packages/core/__tests__/utils/__integration__/__resources__/profiles/ssh/ssh_meta.yaml new file mode 100644 index 0000000000..4d1813374a --- /dev/null +++ b/packages/core/__tests__/utils/__integration__/__resources__/profiles/ssh/ssh_meta.yaml @@ -0,0 +1,96 @@ +defaultProfile: null +configuration: + type: ssh + schema: + type: object + title: 'z/OS SSH Profile' + description: 'z/OS SSH Profile' + properties: + host: + type: string + optionDefinition: + name: host + aliases: + - H + description: 'The z/OS SSH server host name.' + type: string + required: false + group: 'z/OS Ssh Connection Options' + port: + type: number + optionDefinition: + name: port + aliases: + - P + description: 'The z/OS SSH server port.' + type: number + defaultValue: 22 + group: 'z/OS Ssh Connection Options' + includeInTemplate: true + user: + type: string + secure: true + optionDefinition: + name: user + aliases: + - u + description: 'Mainframe user name, which can be the same as your TSO login.' + type: string + required: false + group: 'z/OS Ssh Connection Options' + password: + type: string + secure: true + optionDefinition: + name: password + aliases: + - pass + - pw + description: 'Mainframe password, which can be the same as your TSO password.' + type: string + group: 'z/OS Ssh Connection Options' + privateKey: + type: string + optionDefinition: + name: privateKey + aliases: + - key + - pk + description: 'Path to a file containing your private key, that must match a public key stored in the server for authentication' + type: string + group: 'z/OS Ssh Connection Options' + keyPassphrase: + type: string + secure: true + optionDefinition: + name: keyPassphrase + aliases: + - passphrase + - kp + description: 'Private key passphrase, which unlocks the private key.' + type: string + group: 'z/OS Ssh Connection Options' + handshakeTimeout: + type: number + optionDefinition: + name: handshakeTimeout + aliases: + - timeout + - to + description: 'How long in milliseconds to wait for the SSH handshake to complete.' + type: number + group: 'z/OS Ssh Connection Options' + required: [] + createProfileExamples: + - + options: 'ssh111 --host sshhost --user ibmuser --password myp4ss' + description: 'Create a ssh profile called ''ssh111'' to connect to z/OS SSH server at host ''zos123'' and default port 22' + - + options: 'ssh222 --host sshhost --port 13022 --user ibmuser --password myp4ss' + description: 'Create a ssh profile called ''ssh222'' to connect to z/OS SSH server at host ''zos123'' and port 13022' + - + options: 'ssh333 --host sshhost --user ibmuser --privateKey /path/to/privatekey --keyPassphrase privateKeyPassphrase' + description: 'Create a ssh profile called ''ssh333'' to connect to z/OS SSH server at host ''zos123'' using a privatekey ''/path/to/privatekey'' and its decryption passphrase ''privateKeyPassphrase'' for privatekey authentication' + - + options: 'ssh444 --privateKey /path/to/privatekey' + description: 'Create a ssh profile called ''ssh444'' to connect to z/OS SSH server on default port 22, without specifying username, host, or password, preventing those values from being stored on disk' diff --git a/packages/core/__tests__/utils/__integration__/__resources__/profiles/tso/tso_meta.yaml b/packages/core/__tests__/utils/__integration__/__resources__/profiles/tso/tso_meta.yaml new file mode 100644 index 0000000000..fc0041bd86 --- /dev/null +++ b/packages/core/__tests__/utils/__integration__/__resources__/profiles/tso/tso_meta.yaml @@ -0,0 +1,94 @@ +defaultProfile: null +configuration: + type: tso + schema: + type: object + title: 'TSO Profile' + description: 'z/OS TSO/E User Profile' + properties: + account: + type: string + optionDefinition: + name: account + aliases: + - a + description: 'Your z/OS TSO/E accounting information.' + type: string + required: false + group: 'TSO ADDRESS SPACE OPTIONS' + includeInTemplate: true + characterSet: + type: string + optionDefinition: + name: character-set + aliases: + - cs + description: 'Character set for address space to convert messages and responses from UTF-8 to EBCDIC.' + type: string + defaultValue: '697' + group: 'TSO ADDRESS SPACE OPTIONS' + codePage: + type: string + optionDefinition: + name: code-page + aliases: + - cp + description: 'Codepage value for TSO/E address space to convert messages and responses from UTF-8 to EBCDIC.' + type: string + defaultValue: '1047' + group: 'TSO ADDRESS SPACE OPTIONS' + includeInTemplate: true + columns: + type: number + optionDefinition: + name: columns + aliases: + - cols + description: 'The number of columns on a screen.' + type: number + defaultValue: 80 + group: 'TSO ADDRESS SPACE OPTIONS' + logonProcedure: + type: string + optionDefinition: + name: logon-procedure + aliases: + - l + description: 'The logon procedure to use when creating TSO procedures on your behalf.' + type: string + defaultValue: IZUFPROC + group: 'TSO ADDRESS SPACE OPTIONS' + includeInTemplate: true + regionSize: + type: number + optionDefinition: + name: region-size + aliases: + - rs + description: 'Region size for the TSO/E address space.' + type: number + defaultValue: 4096 + group: 'TSO ADDRESS SPACE OPTIONS' + rows: + type: number + optionDefinition: + name: rows + description: 'The number of rows on a screen.' + type: number + defaultValue: 24 + group: 'TSO ADDRESS SPACE OPTIONS' + required: [] + createProfileExamples: + - + description: 'Create a tso profile called ''myprof'' with default settings and JES accounting information of ''IZUACCT''' + options: 'myprof -a IZUACCT' + - + description: 'Create a tso profile called ''largeregion'' with a region size of 8192, a logon procedure of MYPROC, and JES accounting information of ''1234''' + options: 'largeregion -a 1234 --rs 8192' + - + description: 'Create a tso profile called ''myprof2'' with default settings and region size of 8192, without storing the user account on disk' + options: 'myprof2 --rs 8192' + updateProfileExamples: + - + description: 'Update a tso profile called myprof with new JES accounting information' + options: 'myprof -a NEWACCT' diff --git a/packages/core/__tests__/utils/__integration__/__resources__/profiles/zosmf/fakeServiceProfile.yaml b/packages/core/__tests__/utils/__integration__/__resources__/profiles/zosmf/fakeServiceProfile.yaml new file mode 100644 index 0000000000..de51124255 --- /dev/null +++ b/packages/core/__tests__/utils/__integration__/__resources__/profiles/zosmf/fakeServiceProfile.yaml @@ -0,0 +1 @@ +host: fake diff --git a/packages/core/__tests__/utils/__integration__/__resources__/profiles/zosmf/zosmf_meta.yaml b/packages/core/__tests__/utils/__integration__/__resources__/profiles/zosmf/zosmf_meta.yaml new file mode 100644 index 0000000000..a0fc53b9bf --- /dev/null +++ b/packages/core/__tests__/utils/__integration__/__resources__/profiles/zosmf/zosmf_meta.yaml @@ -0,0 +1,139 @@ +defaultProfile: fakeServiceProfile +configuration: + type: zosmf + schema: + type: object + title: 'z/OSMF Profile' + description: 'z/OSMF Profile' + properties: + host: + type: string + optionDefinition: + name: host + aliases: + - H + description: 'The z/OSMF server host name.' + type: string + required: false + group: 'Zosmf Connection Options' + port: + type: number + optionDefinition: + name: port + aliases: + - P + description: 'The z/OSMF server port.' + type: number + defaultValue: 443 + group: 'Zosmf Connection Options' + includeInTemplate: true + user: + type: string + secure: true + optionDefinition: + name: user + aliases: + - u + description: 'Mainframe (z/OSMF) user name, which can be the same as your TSO login.' + type: string + required: false + group: 'Zosmf Connection Options' + password: + type: string + secure: true + optionDefinition: + name: password + aliases: + - pass + - pw + description: 'Mainframe (z/OSMF) password, which can be the same as your TSO password.' + type: string + required: false + group: 'Zosmf Connection Options' + rejectUnauthorized: + type: boolean + optionDefinition: + name: reject-unauthorized + aliases: + - ru + description: 'Reject self-signed certificates.' + type: boolean + defaultValue: true + group: 'Zosmf Connection Options' + certFile: + type: string + optionDefinition: + name: cert-file + description: 'The file path to a certificate file to use for authentication' + type: existingLocalFile + group: 'Zosmf Connection Options' + certKeyFile: + type: string + optionDefinition: + name: cert-key-file + description: 'The file path to a certificate key file to use for authentication' + type: existingLocalFile + group: 'Zosmf Connection Options' + basePath: + type: string + optionDefinition: + name: base-path + aliases: + - bp + description: 'The base path for your API mediation layer instance. Specify this option to prepend the base path to all z/OSMF resources when making REST requests. Do not specify this option if you are not using an API mediation layer.' + type: string + group: 'Zosmf Connection Options' + protocol: + type: string + optionDefinition: + name: protocol + description: 'The protocol used (HTTP or HTTPS)' + type: string + defaultValue: https + group: 'Zosmf Connection Options' + allowableValues: + values: + - http + - https + caseSensitive: false + encoding: + type: string + optionDefinition: + name: encoding + aliases: + - ec + description: 'The encoding for download and upload of z/OS data set and USS files. The default encoding if not specified is IBM-1047.' + type: string + responseTimeout: + type: number + optionDefinition: + name: response-timeout + aliases: + - rto + description: 'The maximum amount of time in seconds the z/OSMF Files TSO servlet should run before returning a response. Any request exceeding this amount of time will be terminated and return an error. Allowed values: 5 - 600' + type: number + defaultValue: null + numericValueRange: + - 5 + - 600 + required: [] + createProfileExamples: + - + options: 'zos123 --host zos123 --port 1443 --user ibmuser --password myp4ss' + description: 'Create a zosmf profile called ''zos123'' to connect to z/OSMF at host zos123 and port 1443' + - + options: 'zos124 --host zos124 --user ibmuser --password myp4ss --reject-unauthorized false' + description: 'Create a zosmf profile called ''zos124'' to connect to z/OSMF at the host zos124 (default port - 443) and allow self-signed certificates' + - + options: 'zos125 --host zos125 --port 1443' + description: 'Create a zosmf profile called ''zos125'' to connect to z/OSMF at the host zos125 and port 1443, not specifying a username or password so they are not stored on disk; these will need to be specified on every command' + - + options: 'zos126 --reject-unauthorized false' + description: 'Create a zosmf profile called ''zos126'' to connect to z/OSMF on the default port 443 and allow self-signed certificates, not specifying a username, password, or host so they are not stored on disk; these will need to be specified on every command' + - + options: 'zosAPIML --host zosAPIML --port 7554 --user ibmuser --password myp4ss --reject-unauthorized false --base-path ibmzosmf/api/v1' + description: 'Create a zosmf profile called ''zosAPIML'' to connect to z/OSMF via the Zowe API Mediation Layer running at host ''zosAPIML'', port ''7554'', and allow for self-signed certificates. To reduce duplication, you could elect to store the ''host'', ''port'', ''reject-unauthorized'', ''user'', and ''password'' values for the API Mediation Layer in a base profile and only store the ''base-path'' of the service in the zosmf profile' + updateProfileExamples: + - + options: 'zos123 --user newuser --password newp4ss' + description: 'Update a zosmf profile named ''zos123'' with a new username and password' diff --git a/packages/core/__tests__/utils/__integration__/__scripts__/copy_profiles.sh b/packages/core/__tests__/utils/__integration__/__scripts__/copy_profiles.sh new file mode 100644 index 0000000000..aff8bae320 --- /dev/null +++ b/packages/core/__tests__/utils/__integration__/__scripts__/copy_profiles.sh @@ -0,0 +1,9 @@ +#!/bin/sh + +# include exitOnFailure function +myScriptDir=`dirname $0` +. $myScriptDir/exitOnFailure.sh + +# copy pre-existing profiles to test directory +cp -r $myScriptDir/../__resources__/profiles profiles +exitOnFailure "Failed to copy test profile." $? diff --git a/packages/core/__tests__/utils/__integration__/__scripts__/create_profile.sh b/packages/core/__tests__/utils/__integration__/__scripts__/create_profile.sh deleted file mode 100755 index 2adf3a2c35..0000000000 --- a/packages/core/__tests__/utils/__integration__/__scripts__/create_profile.sh +++ /dev/null @@ -1,12 +0,0 @@ -#!/bin/bash -set -e -type=$1 -name=$2 - -echo "================CREATE PROFILE===============" -# Can't use daemon because we need to override ZOWE_CLI_HOME -ZOWE_USE_DAEMON=false zowe profiles create $type $name $3 -if [ $? -gt 0 ] -then - exit $? -fi \ No newline at end of file diff --git a/packages/core/__tests__/utils/__integration__/__scripts__/delete_profile.sh b/packages/core/__tests__/utils/__integration__/__scripts__/delete_profile.sh deleted file mode 100755 index c6ad2a1ea6..0000000000 --- a/packages/core/__tests__/utils/__integration__/__scripts__/delete_profile.sh +++ /dev/null @@ -1,12 +0,0 @@ -#!/bin/bash -set -e -type=$1 -name=$2 - -echo "================DELETE PROFILE===============" -# Can't use daemon because we need to override ZOWE_CLI_HOME -ZOWE_USE_DAEMON=false zowe profiles delete $type $name -if [ $? -gt 0 ] -then - exit $? -fi \ No newline at end of file diff --git a/packages/core/__tests__/utils/__integration__/__scripts__/exitOnFailure.sh b/packages/core/__tests__/utils/__integration__/__scripts__/exitOnFailure.sh new file mode 100644 index 0000000000..5e7beb8643 --- /dev/null +++ b/packages/core/__tests__/utils/__integration__/__scripts__/exitOnFailure.sh @@ -0,0 +1,12 @@ +#!/bin/sh + +# function to exit if we encounter a bad return code +exitOnFailure () { + failureMsg=${1:?"First parm (failureMsg) is required."} + actualExitCode=${2:?"Second parm (actualExitCode) is required."} + goodExitCode=${3:-0} + if [ $actualExitCode != $goodExitCode ]; then + echo `basename $0`": $failureMsg" 1>&2 + exit $actualExitCode + fi +} diff --git a/packages/imperative/__tests__/__integration__/cmd/__tests__/integration/cli/read/__scripts__/profile/create_and_read.sh b/packages/imperative/__tests__/__integration__/cmd/__tests__/integration/cli/read/__scripts__/profile/create_and_read.sh index 0ffe1e3e8a..b70289f909 100644 --- a/packages/imperative/__tests__/__integration__/cmd/__tests__/integration/cli/read/__scripts__/profile/create_and_read.sh +++ b/packages/imperative/__tests__/__integration__/cmd/__tests__/integration/cli/read/__scripts__/profile/create_and_read.sh @@ -4,10 +4,7 @@ myScriptDir=`dirname $0` . $myScriptDir/exitOnFailure.sh -# set -e -# OUTPUT=$(cmd-cli profiles create insecure "test_insecure" --info "some info" --secret "not so secret info") - -# copy pre-existing profile to test directory +# copy pre-existing profiles to test directory cp -r $myScriptDir/../__resources__/profiles profiles exitOnFailure "Failed to copy test profile." $? From 343af43869d0cf7ac909134a2535407c67257aa3 Mon Sep 17 00:00:00 2001 From: Gene Johnston Date: Mon, 18 Dec 2023 14:05:56 -0500 Subject: [PATCH 029/138] Use pre-existing profile files not v1 profile cmds - BasicProfileManager Signed-off-by: Gene Johnston --- .../BasicProfileManager.integration.test.ts | 113 +++++++----------- .../profiles/banana/banana_meta.yaml | 19 +++ .../__resources__/profiles/banana/legit.yaml | 1 + .../secure_orange/secure_orange_meta.yaml | 21 ++++ .../profiles/strawberry/strawberry_meta.yaml | 19 +++ .../__scripts__/copy_profiles.sh | 9 ++ .../__scripts__/exitOnFailure.sh | 12 ++ ...sicProfileManager.integration.test.ts.snap | 13 -- 8 files changed, 124 insertions(+), 83 deletions(-) create mode 100644 packages/imperative/__tests__/src/packages/profiles/__integration__/__resources__/profiles/banana/banana_meta.yaml create mode 100644 packages/imperative/__tests__/src/packages/profiles/__integration__/__resources__/profiles/banana/legit.yaml create mode 100644 packages/imperative/__tests__/src/packages/profiles/__integration__/__resources__/profiles/secure_orange/secure_orange_meta.yaml create mode 100644 packages/imperative/__tests__/src/packages/profiles/__integration__/__resources__/profiles/strawberry/strawberry_meta.yaml create mode 100644 packages/imperative/__tests__/src/packages/profiles/__integration__/__scripts__/copy_profiles.sh create mode 100644 packages/imperative/__tests__/src/packages/profiles/__integration__/__scripts__/exitOnFailure.sh delete mode 100644 packages/imperative/__tests__/src/packages/profiles/__integration__/__snapshots__/BasicProfileManager.integration.test.ts.snap diff --git a/packages/imperative/__tests__/src/packages/profiles/__integration__/BasicProfileManager.integration.test.ts b/packages/imperative/__tests__/src/packages/profiles/__integration__/BasicProfileManager.integration.test.ts index 1d629a28cc..00c8e6461a 100644 --- a/packages/imperative/__tests__/src/packages/profiles/__integration__/BasicProfileManager.integration.test.ts +++ b/packages/imperative/__tests__/src/packages/profiles/__integration__/BasicProfileManager.integration.test.ts @@ -10,12 +10,16 @@ */ import * as TestUtil from "../../../TestUtil"; +import { ITestEnvironment } from "../../../../__src__/environment/doc/response/ITestEnvironment"; +import { SetupTestEnvironment } from "../../../../__src__/environment/SetupTestEnvironment"; import { inspect } from "util"; import { TestLogger } from "../../../../src/TestLogger"; import { ProfileUtils } from "../../../../../src/profiles"; -import { BANANA_AGE, getConfig, PROFILE_TYPE } from "../src/constants/BasicProfileManagerTestConstants"; +import { getConfig, PROFILE_TYPE } from "../src/constants/BasicProfileManagerTestConstants"; -describe("Imperative should allow CLI implementations to configure their own profiles and types", function () { +let TEST_ENVIRONMENT: ITestEnvironment; + +describe("Imperative should allow CLI implementations to read their own profiles and types", function () { const mainModule = process.mainModule; const loadChangingDependencies = () => { return { @@ -27,31 +31,42 @@ describe("Imperative should allow CLI implementations to configure their own pro let {Imperative, ImperativeError, ImperativeConfig} = loadChangingDependencies(); + beforeAll(async () => { + (process.mainModule as any) = { + filename: __filename + }; + + TEST_ENVIRONMENT = await SetupTestEnvironment.createTestEnv({ + cliHomeEnvVar: "CMD_CLI_CLI_HOME", + testName: "basic_profile_mgr" + }); + + // copy existing profiles into test directory + const response = TestUtil.runCliScript(__dirname + "/__scripts__/copy_profiles.sh", TEST_ENVIRONMENT.workingDir); + expect(response.stderr.toString()).toBe(""); + expect(response.status).toBe(0); + }); + // Initialize imperative before each test beforeEach(() => { jest.resetModules(); ({Imperative, ImperativeError, ImperativeConfig} = loadChangingDependencies()); }); - beforeAll(() => { - (process.mainModule as any) = { - filename: __filename - }; - }); - afterAll(() => { process.mainModule = mainModule; + TestUtil.rimraf(TEST_ENVIRONMENT.workingDir); }); - it("should be able to create a profile type and retrieve all defined types after init", async function () { - const config = getConfig(TestUtil.createUniqueTestDataDir("profile-manager-initialize")); + it("should be able to retrieve all defined types after init", async function () { + const config = getConfig(TEST_ENVIRONMENT.workingDir); await Imperative.init(config); expect(ProfileUtils.getAllTypeNames(ImperativeConfig.instance.loadedConfig.profiles).length).toEqual(Object.keys(PROFILE_TYPE).length); expect(ProfileUtils.getAllTypeNames(ImperativeConfig.instance.loadedConfig.profiles)).toContain("banana"); }); - it("should be receive a failure message when attempting to load a profile that doesn't exist", async function () { - const config = getConfig(TestUtil.createUniqueTestDataDir("profile-manager-initialize")); + it("should receive a failure message when attempting to load a profile that doesn't exist", async function () { + const config = getConfig(TEST_ENVIRONMENT.workingDir); await Imperative.init(config); let error; try { @@ -64,72 +79,30 @@ describe("Imperative should allow CLI implementations to configure their own pro expect(error).toBeInstanceOf(ImperativeError); }); - it("should receive a failure message when attempting to create an ill-formed profile", async function () { - const config = getConfig(TestUtil.createUniqueTestDataDir("profile-manager-initialize")); - await Imperative.init(config); - let error; - try { - const response = await Imperative.api.profileManager("banana").save({ - name: "illformed", - profile: { - fail: "this" - } - }); - TestLogger.info(response.message); - } catch (e) { - error = e; - TestLogger.info(error.message); - } - expect(error).toBeInstanceOf(ImperativeError); - }); - - it("should be able to create a basic profile", async function () { - const config = getConfig(TestUtil.createUniqueTestDataDir("profile-manager-initialize")); - await Imperative.init(config); - const response = await Imperative.api.profileManager("banana").save({ - name: "legit", - profile: { - age: BANANA_AGE - } - }); - TestLogger.info(`Profile create success response: ${inspect(response, {depth: null})}`); - expect(response.message).toContain(`Profile ("legit" of type "banana") successfully written:`); - expect(response.overwritten).toEqual(false); - expect(response.path).toContain("legit.yaml"); - }); + it("should be able to load a specific profile", async function () { + const config = getConfig(TEST_ENVIRONMENT.workingDir); - it("should be able to create a basic profile and load that profile", async function () { - const config = getConfig(TestUtil.createUniqueTestDataDir("profile-manager-initialize")); await Imperative.init(config); - const saveResponse = await Imperative.api.profileManager("banana").save({ - name: "legit", - profile: {age: BANANA_AGE}, - overwrite: true, - updateDefault: true - }); - - TestLogger.info("Save response: " + saveResponse.message); const loadResponse = await Imperative.api.profileManager("banana").load({name: "legit"}); TestLogger.info(`Profile loaded success response: ${inspect(loadResponse, {depth: null})}`); - expect(loadResponse.name).toEqual("legit"); + + expect(loadResponse.message).toEqual('Profile "legit" of type "banana" loaded successfully.'); expect(loadResponse.type).toEqual("banana"); + expect(loadResponse.name).toEqual("legit"); expect(loadResponse.profile).toBeDefined(); - expect(loadResponse.profile).toMatchSnapshot(); + expect(loadResponse.profile).toEqual({"age": 1000}); }); - it("should be able to create a basic profile and load as the default", async function () { - const config = getConfig(TestUtil.createUniqueTestDataDir("profile-manager-initialize")); + it("should be able to load a default profile", async function () { + const config = getConfig(TEST_ENVIRONMENT.workingDir); + await Imperative.init(config); - const response = await Imperative.api.profileManager("banana").save({ - name: "legit", - profile: {age: BANANA_AGE}, - overwrite: true, - updateDefault: true - }); - TestLogger.info(`Profile create success response: ${inspect(response, {depth: null})}`); - const load = await Imperative.api.profileManager("banana").load({loadDefault: true}); - expect(load.type).toEqual("banana"); - expect(load.profile).toBeDefined(); - expect(load.profile).toMatchSnapshot(); + const loadResponse = await Imperative.api.profileManager("banana").load({loadDefault: true}); + + expect(loadResponse.message).toEqual('Profile "legit" of type "banana" loaded successfully.'); + expect(loadResponse.type).toEqual("banana"); + expect(loadResponse.name).toEqual("legit"); + expect(loadResponse.profile).toBeDefined(); + expect(loadResponse.profile).toEqual({ "age": 1000 }); }); }); diff --git a/packages/imperative/__tests__/src/packages/profiles/__integration__/__resources__/profiles/banana/banana_meta.yaml b/packages/imperative/__tests__/src/packages/profiles/__integration__/__resources__/profiles/banana/banana_meta.yaml new file mode 100644 index 0000000000..e7cbb9cc9c --- /dev/null +++ b/packages/imperative/__tests__/src/packages/profiles/__integration__/__resources__/profiles/banana/banana_meta.yaml @@ -0,0 +1,19 @@ +defaultProfile: legit +configuration: + type: banana + schema: + type: object + title: 'The Banana command profile schema' + description: 'The Banana command profile schema' + properties: + age: + optionDefinition: + description: 'The age of the Banana' + type: number + name: age + aliases: + - a + required: true + type: number + required: + - age diff --git a/packages/imperative/__tests__/src/packages/profiles/__integration__/__resources__/profiles/banana/legit.yaml b/packages/imperative/__tests__/src/packages/profiles/__integration__/__resources__/profiles/banana/legit.yaml new file mode 100644 index 0000000000..e98b69963c --- /dev/null +++ b/packages/imperative/__tests__/src/packages/profiles/__integration__/__resources__/profiles/banana/legit.yaml @@ -0,0 +1 @@ +age: 1000 diff --git a/packages/imperative/__tests__/src/packages/profiles/__integration__/__resources__/profiles/secure_orange/secure_orange_meta.yaml b/packages/imperative/__tests__/src/packages/profiles/__integration__/__resources__/profiles/secure_orange/secure_orange_meta.yaml new file mode 100644 index 0000000000..97720a614c --- /dev/null +++ b/packages/imperative/__tests__/src/packages/profiles/__integration__/__resources__/profiles/secure_orange/secure_orange_meta.yaml @@ -0,0 +1,21 @@ +defaultProfile: null +configuration: + type: secure_orange + schema: + type: object + title: 'The secure_orange command profile schema' + description: 'The secure_orange command profile schema' + properties: + username: + optionDefinition: + description: 'The username of the secure_orange' + type: string + name: username + type: string + password: + optionDefinition: + description: 'The password of the secure_orange' + type: string + name: password + type: string + required: [] diff --git a/packages/imperative/__tests__/src/packages/profiles/__integration__/__resources__/profiles/strawberry/strawberry_meta.yaml b/packages/imperative/__tests__/src/packages/profiles/__integration__/__resources__/profiles/strawberry/strawberry_meta.yaml new file mode 100644 index 0000000000..28f1719583 --- /dev/null +++ b/packages/imperative/__tests__/src/packages/profiles/__integration__/__resources__/profiles/strawberry/strawberry_meta.yaml @@ -0,0 +1,19 @@ +defaultProfile: null +configuration: + type: strawberry + schema: + type: object + title: 'The strawberry command profile schema' + description: 'The strawberry command profile schema' + properties: + age: + optionDefinition: + description: 'The age of the strawberry' + type: number + name: age + aliases: + - a + required: true + type: number + required: + - age diff --git a/packages/imperative/__tests__/src/packages/profiles/__integration__/__scripts__/copy_profiles.sh b/packages/imperative/__tests__/src/packages/profiles/__integration__/__scripts__/copy_profiles.sh new file mode 100644 index 0000000000..aff8bae320 --- /dev/null +++ b/packages/imperative/__tests__/src/packages/profiles/__integration__/__scripts__/copy_profiles.sh @@ -0,0 +1,9 @@ +#!/bin/sh + +# include exitOnFailure function +myScriptDir=`dirname $0` +. $myScriptDir/exitOnFailure.sh + +# copy pre-existing profiles to test directory +cp -r $myScriptDir/../__resources__/profiles profiles +exitOnFailure "Failed to copy test profile." $? diff --git a/packages/imperative/__tests__/src/packages/profiles/__integration__/__scripts__/exitOnFailure.sh b/packages/imperative/__tests__/src/packages/profiles/__integration__/__scripts__/exitOnFailure.sh new file mode 100644 index 0000000000..5e7beb8643 --- /dev/null +++ b/packages/imperative/__tests__/src/packages/profiles/__integration__/__scripts__/exitOnFailure.sh @@ -0,0 +1,12 @@ +#!/bin/sh + +# function to exit if we encounter a bad return code +exitOnFailure () { + failureMsg=${1:?"First parm (failureMsg) is required."} + actualExitCode=${2:?"Second parm (actualExitCode) is required."} + goodExitCode=${3:-0} + if [ $actualExitCode != $goodExitCode ]; then + echo `basename $0`": $failureMsg" 1>&2 + exit $actualExitCode + fi +} diff --git a/packages/imperative/__tests__/src/packages/profiles/__integration__/__snapshots__/BasicProfileManager.integration.test.ts.snap b/packages/imperative/__tests__/src/packages/profiles/__integration__/__snapshots__/BasicProfileManager.integration.test.ts.snap deleted file mode 100644 index b2866c92d9..0000000000 --- a/packages/imperative/__tests__/src/packages/profiles/__integration__/__snapshots__/BasicProfileManager.integration.test.ts.snap +++ /dev/null @@ -1,13 +0,0 @@ -// Jest Snapshot v1, https://goo.gl/fbAQLP - -exports[`Imperative should allow CLI implementations to configure their own profiles and types should be able to create a basic profile and load as the default 1`] = ` -Object { - "age": 1000, -} -`; - -exports[`Imperative should allow CLI implementations to configure their own profiles and types should be able to create a basic profile and load that profile 1`] = ` -Object { - "age": 1000, -} -`; From 8f6ca664b8ad4e30ce3c041fbbd5fd727a1a09e7 Mon Sep 17 00:00:00 2001 From: Gene Johnston Date: Mon, 18 Dec 2023 14:40:09 -0500 Subject: [PATCH 030/138] Remove profile commands from tests - Cmd.cli.root Signed-off-by: Gene Johnston --- .../cli/root/Cmd.cli.root.integration.test.ts | 8 +- .../cli/root/__scripts__/invalid_command2.sh | 2 +- .../Cmd.cli.root.integration.test.ts.snap | 174 +++--------------- 3 files changed, 29 insertions(+), 155 deletions(-) diff --git a/packages/imperative/__tests__/__integration__/cmd/__tests__/integration/cli/root/Cmd.cli.root.integration.test.ts b/packages/imperative/__tests__/__integration__/cmd/__tests__/integration/cli/root/Cmd.cli.root.integration.test.ts index fb0367fd4c..9d54634a50 100644 --- a/packages/imperative/__tests__/__integration__/cmd/__tests__/integration/cli/root/Cmd.cli.root.integration.test.ts +++ b/packages/imperative/__tests__/__integration__/cmd/__tests__/integration/cli/root/Cmd.cli.root.integration.test.ts @@ -50,11 +50,13 @@ describe("cmd-cli", () => { expect(response.stderr.toString()).toContain('Use "cmd-cli --help" to view groups, commands, and options.'); }); - it("should flag an invalid command and list valid commands", async () => { + it("should flag a valid command with invalid arguments", async () => { const response = runCliScript(__dirname + "/__scripts__/invalid_command2.sh", TEST_ENVIRONMENT.workingDir); expect(response.status).toBe(1); - expect(response.stderr.toString()).toContain( - "Available commands are \"banana-profile, strawberry-profile, kiwi-profile, insecure-profile, base-profile\""); + expect(response.stderr.toString()).toContain("Unknown argument: vegetable"); + expect(response.stderr.toString()).toContain("Command failed due to improper syntax"); + expect(response.stderr.toString()).toContain("Did you mean: auth login fruit?"); + expect(response.stderr.toString()).toContain('Command entered: "auth login vegetable"'); }); it("should display the version", async () => { diff --git a/packages/imperative/__tests__/__integration__/cmd/__tests__/integration/cli/root/__scripts__/invalid_command2.sh b/packages/imperative/__tests__/__integration__/cmd/__tests__/integration/cli/root/__scripts__/invalid_command2.sh index d963a61f76..75e9eeeb23 100644 --- a/packages/imperative/__tests__/__integration__/cmd/__tests__/integration/cli/root/__scripts__/invalid_command2.sh +++ b/packages/imperative/__tests__/__integration__/cmd/__tests__/integration/cli/root/__scripts__/invalid_command2.sh @@ -1,5 +1,5 @@ #!/bin/bash echo "================ISSUING CMD WITH VALID GROUP AND INVALID CMD===============" -cmd-cli profiles cre abc +cmd-cli auth login vegetable exit $? \ No newline at end of file diff --git a/packages/imperative/__tests__/__integration__/cmd/__tests__/integration/cli/root/__snapshots__/Cmd.cli.root.integration.test.ts.snap b/packages/imperative/__tests__/__integration__/cmd/__tests__/integration/cli/root/__snapshots__/Cmd.cli.root.integration.test.ts.snap index cbfc7f11e8..7e5b493eeb 100644 --- a/packages/imperative/__tests__/__integration__/cmd/__tests__/integration/cli/root/__snapshots__/Cmd.cli.root.integration.test.ts.snap +++ b/packages/imperative/__tests__/__integration__/cmd/__tests__/integration/cli/root/__snapshots__/Cmd.cli.root.integration.test.ts.snap @@ -18,18 +18,17 @@ exports[`cmd-cli should display the help 1`] = ` GROUPS ------ - auth Connect to token-based authentication services - auto-format Invoke handlers to test auto-format - chained chained handler test commands - gen-help Commands to test help generator - invalid Invalid definitions - invoke Invoke handlers to test promise reject/fulfill - nested Test a complex structure - profile Validate profile mapping - profiles Create and manage configuration profiles. (deprecated) - read Read some profiles - respond Invoke handlers that will produce messages - validate Validate syntax checking + auth Connect to token-based authentication services + auto-format Invoke handlers to test auto-format + chained chained handler test commands + gen-help Commands to test help generator + invalid Invalid definitions + invoke Invoke handlers to test promise reject/fulfill + nested Test a complex structure + profile Validate profile mapping + read Read some profiles + respond Invoke handlers that will produce messages + validate Validate syntax checking OPTIONS ------- @@ -74,18 +73,17 @@ exports[`cmd-cli should display the help 1`] = ` GROUPS ------ - auth Connect to token-based authentication services - auto-format Invoke handlers to test auto-format - chained chained handler test commands - gen-help Commands to test help generator - invalid Invalid definitions - invoke Invoke handlers to test promise reject/fulfill - nested Test a complex structure - profile Validate profile mapping - profiles Create and manage configuration profiles. (deprecated) - read Read some profiles - respond Invoke handlers that will produce messages - validate Validate syntax checking + auth Connect to token-based authentication services + auto-format Invoke handlers to test auto-format + chained chained handler test commands + gen-help Commands to test help generator + invalid Invalid definitions + invoke Invoke handlers to test promise reject/fulfill + nested Test a complex structure + profile Validate profile mapping + read Read some profiles + respond Invoke handlers that will produce messages + validate Validate syntax checking OPTIONS ------- @@ -118,7 +116,7 @@ exports[`cmd-cli should display the help 1`] = ` \\"success\\": true, \\"exitCode\\": 0, \\"message\\": \\"\\", - \\"stdout\\": \\"\\\\n DESCRIPTION\\\\n -----------\\\\n\\\\n A test CLI for the 'cmd' imperative package\\\\n\\\\n USAGE\\\\n -----\\\\n\\\\n cmd-cli \\\\n\\\\n Where is one of the following:\\\\n\\\\n GROUPS\\\\n ------\\\\n\\\\n auth Connect to token-based authentication services \\\\n auto-format Invoke handlers to test auto-format \\\\n chained chained handler test commands \\\\n gen-help Commands to test help generator \\\\n invalid Invalid definitions \\\\n invoke Invoke handlers to test promise reject/fulfill \\\\n nested Test a complex structure \\\\n profile Validate profile mapping \\\\n profiles Create and manage configuration profiles. (deprecated)\\\\n read Read some profiles \\\\n respond Invoke handlers that will produce messages \\\\n validate Validate syntax checking \\\\n\\\\n OPTIONS\\\\n -------\\\\n\\\\n --version | -V (boolean)\\\\n\\\\n Display the current version of Cmd Package CLI\\\\n\\\\n --available-commands | --ac (boolean)\\\\n\\\\n Displays a list of available commands\\\\n\\\\n GLOBAL OPTIONS\\\\n --------------\\\\n\\\\n --response-format-json | --rfj (boolean)\\\\n\\\\n Produce JSON formatted data from a command\\\\n\\\\n --help | -h (boolean)\\\\n\\\\n Display help text\\\\n\\\\n --help-web | --hw (boolean)\\\\n\\\\n Display HTML help in browser\\\\n\\\\n\\", + \\"stdout\\": \\"\\\\n DESCRIPTION\\\\n -----------\\\\n\\\\n A test CLI for the 'cmd' imperative package\\\\n\\\\n USAGE\\\\n -----\\\\n\\\\n cmd-cli \\\\n\\\\n Where is one of the following:\\\\n\\\\n GROUPS\\\\n ------\\\\n\\\\n auth Connect to token-based authentication services\\\\n auto-format Invoke handlers to test auto-format \\\\n chained chained handler test commands \\\\n gen-help Commands to test help generator \\\\n invalid Invalid definitions \\\\n invoke Invoke handlers to test promise reject/fulfill\\\\n nested Test a complex structure \\\\n profile Validate profile mapping \\\\n read Read some profiles \\\\n respond Invoke handlers that will produce messages \\\\n validate Validate syntax checking \\\\n\\\\n OPTIONS\\\\n -------\\\\n\\\\n --version | -V (boolean)\\\\n\\\\n Display the current version of Cmd Package CLI\\\\n\\\\n --available-commands | --ac (boolean)\\\\n\\\\n Displays a list of available commands\\\\n\\\\n GLOBAL OPTIONS\\\\n --------------\\\\n\\\\n --response-format-json | --rfj (boolean)\\\\n\\\\n Produce JSON formatted data from a command\\\\n\\\\n --help | -h (boolean)\\\\n\\\\n Display help text\\\\n\\\\n --help-web | --hw (boolean)\\\\n\\\\n Display HTML help in browser\\\\n\\\\n\\", \\"stderr\\": \\"\\", \\"data\\": {} }" @@ -261,132 +259,6 @@ cmd-cli profile mapping-positional Tests Imperative's profile to CLI mapping capabilities. -cmd-cli profiles create banana-profile - - Banana Profile - -cmd-cli profiles create base-profile - - Fruit Profile - -cmd-cli profiles create insecure-profile - - Test Secured Fields - -cmd-cli profiles create kiwi-profile - - Kiwi Profile - -cmd-cli profiles create strawberry-profile - - Strawberry Profile - -cmd-cli profiles delete banana-profile - - Delete a banana profile. You must specify a profile name to be deleted. To find - a list of available profiles for deletion, issue the profiles list command. By - default, you will be prompted to confirm the profile removal. - -cmd-cli profiles delete base-profile - - Delete a base profile. You must specify a profile name to be deleted. To find a - list of available profiles for deletion, issue the profiles list command. By - default, you will be prompted to confirm the profile removal. - -cmd-cli profiles delete insecure-profile - - Delete a insecure profile. You must specify a profile name to be deleted. To - find a list of available profiles for deletion, issue the profiles list command. - By default, you will be prompted to confirm the profile removal. - -cmd-cli profiles delete kiwi-profile - - Delete a kiwi profile. You must specify a profile name to be deleted. To find a - list of available profiles for deletion, issue the profiles list command. By - default, you will be prompted to confirm the profile removal. - -cmd-cli profiles delete strawberry-profile - - Delete a strawberry profile. You must specify a profile name to be deleted. To - find a list of available profiles for deletion, issue the profiles list command. - By default, you will be prompted to confirm the profile removal. - -cmd-cli profiles list banana-profiles - - Banana Profile - -cmd-cli profiles list base-profiles - - Fruit Profile - -cmd-cli profiles list insecure-profiles - - Test Secured Fields - -cmd-cli profiles list kiwi-profiles - - Kiwi Profile - -cmd-cli profiles list strawberry-profiles - - Strawberry Profile - -cmd-cli profiles set-default banana-profile - - The banana set default-profiles command allows you to set the default profiles - for this command group. When a banana command is issued and no profile override - options are specified, the default profiles for the command group are - automatically loaded for the command based on the commands profile requirements. - -cmd-cli profiles set-default base-profile - - The base set default-profiles command allows you to set the default profiles for - this command group. When a base command is issued and no profile override - options are specified, the default profiles for the command group are - automatically loaded for the command based on the commands profile requirements. - -cmd-cli profiles set-default insecure-profile - - The insecure set default-profiles command allows you to set the default profiles - for this command group. When a insecure command is issued and no profile - override options are specified, the default profiles for the command group are - automatically loaded for the command based on the commands profile requirements. - -cmd-cli profiles set-default kiwi-profile - - The kiwi set default-profiles command allows you to set the default profiles for - this command group. When a kiwi command is issued and no profile override - options are specified, the default profiles for the command group are - automatically loaded for the command based on the commands profile requirements. - -cmd-cli profiles set-default strawberry-profile - - The strawberry set default-profiles command allows you to set the default - profiles for this command group. When a strawberry command is issued and no - profile override options are specified, the default profiles for the command - group are automatically loaded for the command based on the commands profile - requirements. - -cmd-cli profiles update banana-profile - - Banana Profile - -cmd-cli profiles update base-profile - - Fruit Profile - -cmd-cli profiles update insecure-profile - - Test Secured Fields - -cmd-cli profiles update kiwi-profile - - Kiwi Profile - -cmd-cli profiles update strawberry-profile - - Strawberry Profile - cmd-cli read profile Read some profiles From 00abdf08f3163b4b1366d3f1d1515f23472a88d3 Mon Sep 17 00:00:00 2001 From: KevinLoesch1 Date: Tue, 19 Dec 2023 15:30:10 -0500 Subject: [PATCH 031/138] Fix for Help and compare on Windows Signed-off-by: KevinLoesch1 --- packages/cli/src/zosfiles/-strings-/en.ts | 4 ++-- packages/cli/src/zosfiles/compare/CompareBaseHelper.ts | 6 +++++- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/packages/cli/src/zosfiles/-strings-/en.ts b/packages/cli/src/zosfiles/-strings-/en.ts index cfc919c79a..6f9563b562 100644 --- a/packages/cli/src/zosfiles/-strings-/en.ts +++ b/packages/cli/src/zosfiles/-strings-/en.ts @@ -819,8 +819,8 @@ export default { } }, USS_FILE: { - SUMMARY: "Compare content of a local file and a z/os uss files", - DESCRIPTION: "Compare the contents of a two uss files on your terminal (stdout). browser.", + SUMMARY: "Compare the contents of two z/os uss files", + DESCRIPTION: "Compare the contents of two uss files on your terminal (stdout). browser.", POSITIONALS: { USSFILEPATH1: "The path of the first uss file you want to compare.", USSFILEPATH2: "The path of the second uss file you want to compare." diff --git a/packages/cli/src/zosfiles/compare/CompareBaseHelper.ts b/packages/cli/src/zosfiles/compare/CompareBaseHelper.ts index 379654cb59..42ab1c12c2 100644 --- a/packages/cli/src/zosfiles/compare/CompareBaseHelper.ts +++ b/packages/cli/src/zosfiles/compare/CompareBaseHelper.ts @@ -164,7 +164,11 @@ export class CompareBaseHelper { public prepareContent(content: string | Buffer): string { let contentString = content.toString(); if(this.seqnum === false) { - const seqnumlen = 8; + let seqnumlen = 8; + /* If Windows, account for the carriage return */ + if(process.platform === "win32"){ + seqnumlen = 9; + } contentString = content.toString().split("\n").map((line) => line.slice(0, -seqnumlen)).join("\n"); } return contentString; From 117724ea64c484f69055d5e459fbea329679b79b Mon Sep 17 00:00:00 2001 From: KevinLoesch1 Date: Tue, 19 Dec 2023 15:46:32 -0500 Subject: [PATCH 032/138] Update changelog Signed-off-by: KevinLoesch1 --- packages/cli/CHANGELOG.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/packages/cli/CHANGELOG.md b/packages/cli/CHANGELOG.md index 7ec80fb818..31933ece4e 100644 --- a/packages/cli/CHANGELOG.md +++ b/packages/cli/CHANGELOG.md @@ -2,6 +2,11 @@ All notable changes to the Zowe CLI package will be documented in this file. +## Recent Changes + +- BugFix: Correct extra character being displayed at the end of lines when issuing `zowe files compare` on Windows. [#1992](https://github.com/zowe/zowe-cli/issues/1992) +- BugFix: Correct the online help description for `zowe files compare uss`. [#1754](https://github.com/zowe/zowe-cli/issues/1754) + ## `7.20.1` - BugFix: Add missing npm-shrinkwrap From ec0c1713a92aae085c1cb47a3ea5cd916dbb30e5 Mon Sep 17 00:00:00 2001 From: KevinLoesch1 Date: Tue, 19 Dec 2023 18:59:26 -0500 Subject: [PATCH 033/138] Fix for unit test failures Signed-off-by: KevinLoesch1 --- packages/cli/src/zosfiles/compare/CompareBaseHelper.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/cli/src/zosfiles/compare/CompareBaseHelper.ts b/packages/cli/src/zosfiles/compare/CompareBaseHelper.ts index 42ab1c12c2..15a7cc17c5 100644 --- a/packages/cli/src/zosfiles/compare/CompareBaseHelper.ts +++ b/packages/cli/src/zosfiles/compare/CompareBaseHelper.ts @@ -166,7 +166,7 @@ export class CompareBaseHelper { if(this.seqnum === false) { let seqnumlen = 8; /* If Windows, account for the carriage return */ - if(process.platform === "win32"){ + if(process.platform === "win32" && content.toString().endsWith("\r\n")){ seqnumlen = 9; } contentString = content.toString().split("\n").map((line) => line.slice(0, -seqnumlen)).join("\n"); From 22e38ca6b8edd50ce9bfd7064f5799e7fccee300 Mon Sep 17 00:00:00 2001 From: KevinLoesch1 Date: Wed, 20 Dec 2023 12:22:00 -0500 Subject: [PATCH 034/138] Fix warning and add new unit test Signed-off-by: KevinLoesch1 --- .../compare/ds/Dataset.handler.unit.test.ts | 35 +++++++++++++++++++ .../src/zosfiles/compare/CompareBaseHelper.ts | 2 +- 2 files changed, 36 insertions(+), 1 deletion(-) diff --git a/packages/cli/__tests__/zosfiles/__unit__/compare/ds/Dataset.handler.unit.test.ts b/packages/cli/__tests__/zosfiles/__unit__/compare/ds/Dataset.handler.unit.test.ts index fbaef2113f..7fbed7a0cf 100644 --- a/packages/cli/__tests__/zosfiles/__unit__/compare/ds/Dataset.handler.unit.test.ts +++ b/packages/cli/__tests__/zosfiles/__unit__/compare/ds/Dataset.handler.unit.test.ts @@ -178,6 +178,41 @@ describe("Compare data set handler", () => { expect(getDiffStringSpy).toHaveBeenCalledWith("compared", "compared", options); }); + it("should compare two data sets containing carriage returns in terminal with --seqnum specified(Windows Specific)", async () => { + if(process.platform === "win32") + { + const processArgCopy: any = { + ...processArguments, + arguments:{ + ...processArguments.arguments, + seqnum: false, + } + }; + + //overwrite ds(strings 1 & 2) to include seqnums to chop off in LocalFileDatasetHandler + getDataSetSpy.mockImplementation(jest.fn(async (session) => { + fakeSession = session; + return Buffer.from("compared12345678\r\n"); + })); + + try { + // Invoke the handler with a full set of mocked arguments and response functions + await handler.process(processArgCopy); + } catch (e) { + error = e; + } + + expect(error).toBeUndefined(); + expect(getDataSetSpy).toHaveBeenCalledTimes(2); + expect(getDiffStringSpy).toHaveBeenCalledTimes(1); + expect(apiMessage).toEqual(""); + expect(logMessage).toEqual("compared string"); + expect(getDataSetSpy).toHaveBeenCalledWith(fakeSession as any, dataSetName1, { task: dsTask }); + expect(jsonObj).toMatchObject({commandResponse: "compared string", success: true}); + expect(getDiffStringSpy).toHaveBeenCalledWith("compared\n", "compared\n", options); + } + }); + it("should compare two data sets in browser", async () => { openDiffInbrowserSpy.mockImplementation(jest.fn()); processArguments.arguments.browserView = true ; diff --git a/packages/cli/src/zosfiles/compare/CompareBaseHelper.ts b/packages/cli/src/zosfiles/compare/CompareBaseHelper.ts index 15a7cc17c5..93ba262ecb 100644 --- a/packages/cli/src/zosfiles/compare/CompareBaseHelper.ts +++ b/packages/cli/src/zosfiles/compare/CompareBaseHelper.ts @@ -167,7 +167,7 @@ export class CompareBaseHelper { let seqnumlen = 8; /* If Windows, account for the carriage return */ if(process.platform === "win32" && content.toString().endsWith("\r\n")){ - seqnumlen = 9; + seqnumlen++; } contentString = content.toString().split("\n").map((line) => line.slice(0, -seqnumlen)).join("\n"); } From 9d203ec1bddbc1ab3065da4cead3e8b6f586e81f Mon Sep 17 00:00:00 2001 From: Gene Johnston Date: Wed, 20 Dec 2023 12:45:35 -0500 Subject: [PATCH 035/138] Remove tests of profile commands Signed-off-by: Gene Johnston --- .../imperative_ssh_create_profile.sh | 9 - .../imperative_ssh_delete_profile.sh | 9 - .../imperative_tso_create_profile.sh | 9 - .../imperative_tso_delete_profile.sh | 9 - .../imperative_zosmf_create_profile.sh | 9 - .../imperative_zosmf_delete_profile.sh | 9 - .../imperative.integration.subtest.ts | 164 ------------------ .../imperative.secure.integration.test.ts | 1 - 8 files changed, 219 deletions(-) delete mode 100755 __tests__/__integration__/__scripts__/imperative_ssh_create_profile.sh delete mode 100755 __tests__/__integration__/__scripts__/imperative_ssh_delete_profile.sh delete mode 100755 __tests__/__integration__/__scripts__/imperative_tso_create_profile.sh delete mode 100755 __tests__/__integration__/__scripts__/imperative_tso_delete_profile.sh delete mode 100755 __tests__/__integration__/__scripts__/imperative_zosmf_create_profile.sh delete mode 100755 __tests__/__integration__/__scripts__/imperative_zosmf_delete_profile.sh delete mode 100644 __tests__/__integration__/imperative.integration.subtest.ts diff --git a/__tests__/__integration__/__scripts__/imperative_ssh_create_profile.sh b/__tests__/__integration__/__scripts__/imperative_ssh_create_profile.sh deleted file mode 100755 index 909dbe3793..0000000000 --- a/__tests__/__integration__/__scripts__/imperative_ssh_create_profile.sh +++ /dev/null @@ -1,9 +0,0 @@ -#!/bin/bash -set -e - -echo "================SSH CREATE PROFILE===============" -zowe profiles create ssh $* -if [ $? -gt 0 ] -then - exit $? -fi \ No newline at end of file diff --git a/__tests__/__integration__/__scripts__/imperative_ssh_delete_profile.sh b/__tests__/__integration__/__scripts__/imperative_ssh_delete_profile.sh deleted file mode 100755 index e2af8cdc40..0000000000 --- a/__tests__/__integration__/__scripts__/imperative_ssh_delete_profile.sh +++ /dev/null @@ -1,9 +0,0 @@ -#!/bin/bash -set -e - -echo "================SSH DELETE PROFILE===============" -zowe profiles delete ssh $* -if [ $? -gt 0 ] -then - exit $? -fi \ No newline at end of file diff --git a/__tests__/__integration__/__scripts__/imperative_tso_create_profile.sh b/__tests__/__integration__/__scripts__/imperative_tso_create_profile.sh deleted file mode 100755 index 19d39bf380..0000000000 --- a/__tests__/__integration__/__scripts__/imperative_tso_create_profile.sh +++ /dev/null @@ -1,9 +0,0 @@ -#!/bin/bash -set -e - -echo "================TSO CREATE PROFILE===============" -zowe profiles create tso $* -if [ $? -gt 0 ] -then - exit $? -fi \ No newline at end of file diff --git a/__tests__/__integration__/__scripts__/imperative_tso_delete_profile.sh b/__tests__/__integration__/__scripts__/imperative_tso_delete_profile.sh deleted file mode 100755 index 246b20556a..0000000000 --- a/__tests__/__integration__/__scripts__/imperative_tso_delete_profile.sh +++ /dev/null @@ -1,9 +0,0 @@ -#!/bin/bash -set -e - -echo "================TSO DELETE PROFILE===============" -zowe profiles delete tso $* -if [ $? -gt 0 ] -then - exit $? -fi \ No newline at end of file diff --git a/__tests__/__integration__/__scripts__/imperative_zosmf_create_profile.sh b/__tests__/__integration__/__scripts__/imperative_zosmf_create_profile.sh deleted file mode 100755 index 1fcbf96662..0000000000 --- a/__tests__/__integration__/__scripts__/imperative_zosmf_create_profile.sh +++ /dev/null @@ -1,9 +0,0 @@ -#!/bin/bash -set -e - -echo "================ZOSMF CREATE PROFILE===============" -zowe profiles create zosmf $* -if [ $? -gt 0 ] -then - exit $? -fi \ No newline at end of file diff --git a/__tests__/__integration__/__scripts__/imperative_zosmf_delete_profile.sh b/__tests__/__integration__/__scripts__/imperative_zosmf_delete_profile.sh deleted file mode 100755 index 347b33f57d..0000000000 --- a/__tests__/__integration__/__scripts__/imperative_zosmf_delete_profile.sh +++ /dev/null @@ -1,9 +0,0 @@ -#!/bin/bash -set -e - -echo "================ZOSMF DELETE PROFILE===============" -zowe profiles delete zosmf $* -if [ $? -gt 0 ] -then - exit $? -fi \ No newline at end of file diff --git a/__tests__/__integration__/imperative.integration.subtest.ts b/__tests__/__integration__/imperative.integration.subtest.ts deleted file mode 100644 index b3d42c0247..0000000000 --- a/__tests__/__integration__/imperative.integration.subtest.ts +++ /dev/null @@ -1,164 +0,0 @@ -/* -* 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 { ITestEnvironment, runCliScript } from "../__packages__/cli-test-utils"; -import { TestEnvironment } from "../__src__/environment/TestEnvironment"; -import { ITestPropertiesSchema } from "../__src__/properties/ITestPropertiesSchema"; - -let testEnvironment: ITestEnvironment; - -describe("imperative create profile", () => { - - // Create the unique test environment - beforeAll(async () => { - testEnvironment = await TestEnvironment.setUp({ - testName: "imperative_create_profile", - skipProperties: true - }); - }); - - afterAll(async () => { - await TestEnvironment.cleanUp(testEnvironment); - }); - - describe("create zosmf profile", () => { - - afterEach(async () => { - const opts = ["CreateProfileSystemTest"]; - try { - runCliScript(__dirname + "/__scripts__/imperative_zosmf_delete_profile.sh", testEnvironment, opts); - } catch (err) { /* Do nothing */ } - }); - - it("should successfully create a profile", async () => { - const opts = [ - "CreateProfileSystemTest", - "--host", "FAKEHOST", - "--port", "443", - "--user", "FAKEUSER", - "--password", "FAKEPASS", - "--reject-unauthorized", "false" - ]; - - const response = runCliScript(__dirname + "/__scripts__/imperative_zosmf_create_profile.sh", - testEnvironment, opts - ); - expect(response.stderr.toString()).toContain("deprecated"); - expect(response.status).toBe(0); - expect(response.stdout.toString()).toContain("Profile created successfully!"); - expect(response.stdout.toString()).toContain("FAKEHOST"); - expect(response.stdout.toString()).toContain("443"); - // Two values (user and password) should be stored securely - expect((response.stdout.toString().match(/managed by Zowe CLI/g) || []).length).toBe(2); - }); - - it("should successfully create a profile without username, password, or host", async () => { - const opts = [ - "CreateProfileSystemTest", - "--port", "443", - "--reject-unauthorized", "false" - ]; - - const response = runCliScript(__dirname + "/__scripts__/imperative_zosmf_create_profile.sh", - testEnvironment, opts - ); - expect(response.stderr.toString()).toContain("deprecated"); - expect(response.status).toBe(0); - expect(response.stdout.toString()).toContain("Profile created successfully!"); - expect(response.stdout.toString()).toContain("443"); - }); - }); - - describe("create ssh profile", () => { - - afterEach(async () => { - const opts = ["CreateProfileSystemTest"]; - try { - runCliScript(__dirname + "/__scripts__/imperative_ssh_delete_profile.sh", testEnvironment, opts); - } catch (err) { /* Do nothing */ } - }); - - it("should successfully create a profile", async () => { - const opts = [ - "CreateProfileSystemTest", - "--host", "FAKEHOST", - "--port", "22", - "--user", "FAKEUSER", - "--password", "FAKEPASS" - ]; - - const response = runCliScript(__dirname + "/__scripts__/imperative_ssh_create_profile.sh", - testEnvironment, opts - ); - expect(response.stderr.toString()).toContain("deprecated"); - expect(response.status).toBe(0); - expect(response.stdout.toString()).toContain("Profile created successfully!"); - expect(response.stdout.toString()).toContain("FAKEHOST"); - expect(response.stdout.toString()).toContain("22"); - expect(response.stdout.toString()).not.toContain("FAKEUSER"); - expect(response.stdout.toString()).toContain("user: managed by Zowe CLI"); - expect(response.stdout.toString()).toContain("password: managed by Zowe CLI"); - }); - - it("should successfully create a profile without username, password, or host", async () => { - const opts = [ - "CreateProfileSystemTest", - "--port", "22" - ]; - - const response = runCliScript(__dirname + "/__scripts__/imperative_ssh_create_profile.sh", - testEnvironment, opts - ); - expect(response.stderr.toString()).toContain("deprecated"); - expect(response.status).toBe(0); - expect(response.stdout.toString()).toContain("Profile created successfully!"); - expect(response.stdout.toString()).toContain("22"); - }); - }); - - describe("create tso profile", () => { - - afterEach(async () => { - const opts = ["CreateProfileSystemTest"]; - try { - runCliScript(__dirname + "/__scripts__/imperative_tso_delete_profile.sh", testEnvironment, opts); - } catch (err) { /* Do nothing */ } - }); - - it("should successfully create a profile", async () => { - const opts = [ - "CreateProfileSystemTest", - "--account", "FAKEACCT" - ]; - - const response = runCliScript(__dirname + "/__scripts__/imperative_tso_create_profile.sh", - testEnvironment, opts - ); - expect(response.stderr.toString()).toContain("deprecated"); - expect(response.status).toBe(0); - expect(response.stdout.toString()).toContain("Profile created successfully!"); - }); - - it("should successfully create a profile without username, password, or host", async () => { - const opts = [ - "CreateProfileSystemTest" - ]; - - const response = runCliScript(__dirname + "/__scripts__/imperative_tso_create_profile.sh", - testEnvironment, opts - ); - expect(response.stderr.toString()).toContain("deprecated"); - expect(response.status).toBe(0); - expect(response.stdout.toString()).toContain("Profile created successfully!"); - expect(response.stdout.toString()).not.toContain("FAKEACCT"); - }); - }); -}); diff --git a/__tests__/__integration__/imperative.secure.integration.test.ts b/__tests__/__integration__/imperative.secure.integration.test.ts index 1dfb3f02a1..08852c13f1 100644 --- a/__tests__/__integration__/imperative.secure.integration.test.ts +++ b/__tests__/__integration__/imperative.secure.integration.test.ts @@ -14,7 +14,6 @@ /* eslint-disable max-len */ describe("Imperative Secure Tests", () => { - require("./imperative.integration.subtest"); require("./../../packages/imperative/__tests__/src/packages/profiles/__integration__/CliProfileManager.credentials.integration.subtest"); require("./../../packages/imperative/__tests__/src/packages/imperative/__integration__/PluginManagementFacility.integration.subtest"); require("./../../packages/imperative/__tests__/__integration__/imperative/__tests__/__integration__/cli/config/init/cli.imperative-test-cli.config.init.integration.subtest"); From be9c42a65c010a99d0bf45ae09c3f8d7ceadb53d Mon Sep 17 00:00:00 2001 From: Gene Johnston Date: Wed, 20 Dec 2023 12:48:26 -0500 Subject: [PATCH 036/138] Use pre-existing profile files not v1 profile cmds - CliProfileManager.credentials Signed-off-by: Gene Johnston --- packages/imperative/__tests__/src/TestUtil.ts | 2 +- ...Manager.credentials.integration.subtest.ts | 384 +++++------------- .../username-password/profile-name.yaml | 8 + .../username-password_meta.yaml | 57 +++ .../copy_profiles_cli_prof_mgr_creds.sh | 9 + .../profiles/test_cli/TestConfiguration.ts | 6 +- ...onKeytarHandler.ts => NoSecretsHandler.ts} | 4 +- 7 files changed, 189 insertions(+), 281 deletions(-) create mode 100644 packages/imperative/__tests__/src/packages/profiles/__integration__/__resources__/profiles_cli_prof_mgr_creds/username-password/profile-name.yaml create mode 100644 packages/imperative/__tests__/src/packages/profiles/__integration__/__resources__/profiles_cli_prof_mgr_creds/username-password/username-password_meta.yaml create mode 100644 packages/imperative/__tests__/src/packages/profiles/__integration__/__scripts__/copy_profiles_cli_prof_mgr_creds.sh rename packages/imperative/__tests__/src/packages/profiles/test_cli/handlers/{NonKeytarHandler.ts => NoSecretsHandler.ts} (86%) diff --git a/packages/imperative/__tests__/src/TestUtil.ts b/packages/imperative/__tests__/src/TestUtil.ts index d2070b831b..9582999bd3 100644 --- a/packages/imperative/__tests__/src/TestUtil.ts +++ b/packages/imperative/__tests__/src/TestUtil.ts @@ -440,7 +440,7 @@ export function runCliScript(scriptPath: string, cwd: string, args: any = [], en // Execute the command synchronously return sync("sh", [`${scriptPath}`].concat(args), {cwd, env: childEnv}); } else { - throw new Error("The script directory doesn't exist"); + throw new Error("The script directory doesn't exist: " + scriptPath); } } diff --git a/packages/imperative/__tests__/src/packages/profiles/__integration__/CliProfileManager.credentials.integration.subtest.ts b/packages/imperative/__tests__/src/packages/profiles/__integration__/CliProfileManager.credentials.integration.subtest.ts index 3107317863..e4dbc06258 100644 --- a/packages/imperative/__tests__/src/packages/profiles/__integration__/CliProfileManager.credentials.integration.subtest.ts +++ b/packages/imperative/__tests__/src/packages/profiles/__integration__/CliProfileManager.credentials.integration.subtest.ts @@ -13,78 +13,65 @@ import * as T from "../../../TestUtil"; import * as path from "path"; import * as fs from "fs"; import { IImperativeConfig } from "../../../../../src/imperative"; -import { CliProfileManager } from "../../../../../src/cmd"; -import { ProfileIO } from "../../../../../src/profiles/src/utils"; -import { IProfile } from "../../../../../src/profiles/src/doc/definition"; +import { keyring } from "@zowe/secrets-for-zowe-sdk"; describe("Cli Profile Manager", () => { - let writtenProfile: any; - const credentialManagerErrorMessage = /(Unable to).*(the secure field)/; - - const originalSaveProfile = (CliProfileManager.prototype as any).saveProfile; - afterEach(() => { - (CliProfileManager.prototype as any).saveProfile = originalSaveProfile; - }); - ProfileIO.writeProfile = jest.fn((fullFilePath: string, profile: IProfile) => { - writtenProfile = profile; - }); - - ProfileIO.exists = jest.fn((profilePath: string) => { - return profilePath.indexOf("meta") === -1 ? profilePath : undefined; + const cliBin = path.join(__dirname, "../test_cli/TestCLI.ts"); + const config: IImperativeConfig = require(path.join(__dirname, "../test_cli/TestConfiguration")); + const homeDir: string = config.defaultHome; + const testProfileType = "username-password"; + const username: string = "username"; + const password: number = 0; + const account: string = "account123"; + const secured: string = "secured"; + + beforeAll(async () => { + // ensure the CLI home directory exists before running our copy_profile script + if (!fs.existsSync(homeDir)) { + fs.mkdirSync(homeDir); + } + + // copy existing profiles into test directory + const response = T.runCliScript(path.join(__dirname, "__scripts__/copy_profiles_cli_prof_mgr_creds.sh"), homeDir); + expect(response.stderr.toString()).toBe(""); + expect(response.status).toBe(0); + + // store desired secure properties into the credential vault + await keyring.setPassword("example_with_profiles", "username-password_profile-name_username", + Buffer.from(`"${username}"`).toString("base64") + ); + await keyring.setPassword("example_with_profiles", "username-password_profile-name_password", + Buffer.from(`${password}`).toString("base64") + ); + await keyring.setPassword("example_with_profiles", "username-password_profile-name_account", + Buffer.from(`"${account}"`).toString("base64") + ); + await keyring.setPassword("example_with_profiles", + "username-password_profile-name_myParent_securedProperty_mySecuredChild", + Buffer.from(`"${secured}"`).toString("base64") + ); }); - ProfileIO.readMetaFile = jest.fn((fullFilePath: string) => { - return { - defaultProfile: "mybana", - configuration: { - type: "", - schema: { - type: "object", - title: "test profile", - description: "test profile", - properties: { - sum: { - type: "number" - } - }, - required: ["sum"] - } - } - }; - }) as any; - afterEach(() => { - writtenProfile = undefined; // clear any saved profile to not pollute results across tests + afterAll(async () => { + // delete secure properties from the credential vault + await keyring.deletePassword("example_with_profiles", "username-password_profile-name_username"); + await keyring.deletePassword("example_with_profiles", "username-password_profile-name_password"); + await keyring.deletePassword("example_with_profiles", "username-password_profile-name_account"); + await keyring.deletePassword("example_with_profiles", + "username-password_profile-name_myParent_securedProperty_mySecuredChild" + ); + + // delete the CLI_HOME directory + T.rimraf(homeDir); }); describe("Default Credential Management", () => { - const cliBin = path.join(__dirname, "../test_cli/TestCLI.ts"); - const config: IImperativeConfig = require(path.join(__dirname, "../test_cli/TestConfiguration")); - const homeDir: string = config.defaultHome; - - const testProfileName = "username-password"; - const username: string = "username"; - const password: number = 0; - const account: string = "account123"; - const secured: string = "secured"; - const insecured: string = "insecured"; // playing off insecure child... - const newPass: number = 1; - - beforeEach(() => { - T.rimraf(homeDir); - }); describe("Generic Success Scenarios", () => { - const profileName = "profile-name"; - - it("should create and load a profile with saved credentials", () => { - let cmd = `profiles create ${testProfileName}-profile ${profileName} --username ${username} ` + - `--password ${password} --account ${account} --sec1 ${secured} --insec1 ${insecured}`; - let result = T.executeTestCLICommand(cliBin, this, cmd.split(" ")); - expect(result.stderr).toContain("command 'profiles create' is deprecated"); - expect(result.stdout).toContain("Profile created successfully!"); - cmd = `display-profile`; - result = T.executeTestCLICommand(cliBin, this, cmd.split(" ")); + it("should load a profile with saved credentials", () => { + const cmd = `display-profile`; + const result = T.executeTestCLICommand(cliBin, this, cmd.split(" ")); expect(result.stderr).toEqual(""); expect(JSON.parse(result.stdout)).toEqual({ myParent: { @@ -93,271 +80,118 @@ describe("Cli Profile Manager", () => { }, account, username, password}); }); - - it("should overwrite and load a profile with saved credentials", () => { - let cmd = `profiles create ${testProfileName}-profile ${profileName} --username ${username} ` + - `--password ${password} --account ${account} --sec1 ${secured} --insec1 ${insecured}`; - let result = T.executeTestCLICommand(cliBin, this, cmd.split(" ")); - expect(result.stderr).toContain("command 'profiles create' is deprecated"); - expect(result.stdout).toContain("Profile created successfully!"); - - cmd = `profiles create ${testProfileName}-profile ${profileName} --username ${username} ` + - `--password ${password} --account ${account} --sec1 ${secured} --insec1 ${insecured} --ow`; - result = T.executeTestCLICommand(cliBin, this, cmd.split(" ")); - expect(result.stderr).toContain("command 'profiles create' is deprecated"); - expect(result.stdout).toContain("Overwrote existing profile"); - expect(result.stdout).toContain("Profile created successfully!"); - }); - - it("should update and load a profile with saved credentials", () => { - const newName: string = "newName"; - - let cmd = `profiles create ${testProfileName}-profile ${profileName} --username ${username} ` + - `--password ${password} --account ${account} --sec1 ${secured} --insec1 ${insecured}`; - let result = T.executeTestCLICommand(cliBin, this, cmd.split(" ")); - expect(result.stderr).toContain("command 'profiles create' is deprecated"); - expect(result.stdout).toContain("Profile created successfully!"); - - cmd = `profiles update ${testProfileName}-profile ${profileName} --username ${newName} --password ${newPass}`; - result = T.executeTestCLICommand(cliBin, this, cmd.split(" ")); - expect(result.stderr).toContain("command 'profiles update' is deprecated"); - expect(result.stdout).toContain("Overwrote existing profile"); - expect(result.stdout).toContain("Profile updated successfully!"); - - cmd = `display-profile`; - result = T.executeTestCLICommand(cliBin, this, cmd.split(" ")); - expect(result.stderr).toEqual(""); - expect(JSON.parse(result.stdout)).toEqual({ - myParent: { - insecuredProperty: {myInSecuredChild: "insecured"}, - securedProperty: {mySecuredChild: "secured"} - }, - account, username: newName, password: newPass}); - }); - - it("should delete a profile with saved credentials", () => { - let cmd = `profiles create ${testProfileName}-profile ${profileName} --username ${username} ` + - `--password ${password} --account ${account} --sec1 ${secured} --insec1 ${insecured}`; - let result = T.executeTestCLICommand(cliBin, this, cmd.split(" ")); - expect(result.stderr).toContain("command 'profiles create' is deprecated"); - expect(result.stdout).toContain("Profile created successfully!"); - - cmd = `profiles delete ${testProfileName}-profile ${profileName}`; - result = T.executeTestCLICommand(cliBin, this, cmd.split(" ")); - expect(result.stderr).toContain("command 'profiles delete' is deprecated"); - expect(result.stdout).toContain("successfully deleted"); - }); - - it("should update a password", () => { - let cmd = `profiles create ${testProfileName}-profile ${profileName} --username ${username} ` + - `--password ${password} --account ${account} --sec1 ${secured} --insec1 ${insecured}`; - let result = T.executeTestCLICommand(cliBin, this, cmd.split(" ")); - - expect(result.stderr).toContain("command 'profiles create' is deprecated"); - expect(result.stdout).toContain("Profile created successfully!"); - - // profiles upd username-password username-password --password pass - cmd = `profiles update ${testProfileName}-profile ${profileName} --password ${newPass}`; - result = T.executeTestCLICommand(cliBin, this, cmd.split(" ")); - - expect(T.stripNewLines(result.stdout)).toContain("Overwrote existing profile"); - expect(result.stderr).toMatchSnapshot(); - - cmd = `profiles delete ${testProfileName}-profile ${profileName}`; - result = T.executeTestCLICommand(cliBin, this, cmd.split(" ")); - - expect(result.stderr).toContain("command 'profiles delete' is deprecated"); - expect(T.stripNewLines(result.stdout)).toContain("successfully deleted"); - expect(result.stdout).toMatchSnapshot(); - }); }); describe("Generic Failure Scenarios", () => { const createdName = "profile-name"; const changedName = "profile-name-changed"; - const changedProfileName = "changed-username-password"; - const profilePath = path.join(homeDir, "profiles", testProfileName); + const profilePath = path.join(homeDir, "profiles", testProfileType); const createdPath = path.join(profilePath, createdName + ".yaml"); const changedPath = path.join(profilePath, changedName + ".yaml"); it("should fail if the Credential Manager is unable to find the profile", () => { - let cmd = `profiles create ${testProfileName}-profile ${createdName} --username ${username} ` + - `--password ${password} --account ${account} --sec1 ${secured} --insec1 ${insecured}`; - let result = T.executeTestCLICommand(cliBin, this, cmd.split(" ")); - - expect(result.stderr).toContain("command 'profiles create' is deprecated"); - expect(result.stdout).toContain("Profile created successfully!"); - - // Now change the name of the profile so that we can break it + // change the name of the profile so that we can break it fs.renameSync(createdPath, changedPath); - cmd = `profiles delete ${testProfileName}-profile ${createdName}`; - result = T.executeTestCLICommand(cliBin, this, cmd.split(" ")); - - expect(T.stripNewLines(result.stderr)).toContain(`Profile "${createdName}" of type "${testProfileName}" does not exist.`); - expect(result.stderr).toContain("Profile \"profile-name\" of type \"username-password\" does not exist"); - expect(result.stderr).toContain("The command 'profiles delete' is deprecated"); + const cmd = `display-profile`; + const result = T.executeTestCLICommand(cliBin, this, cmd.split(" ")); - // Now put it back for cleanup + // put the profile back for cleanup fs.renameSync(changedPath, createdPath); - cmd = `profiles delete ${testProfileName}-profile ${createdName}`; - result = T.executeTestCLICommand(cliBin, this, cmd.split(" ")); - - expect(result.stderr).toContain("command 'profiles delete' is deprecated"); - expect(T.stripNewLines(result.stdout)).toContain("successfully deleted"); + expect(result.stderr).toContain( + `Your default profile named ${createdName} does not exist for type ${testProfileType}.` + ); }); it("should fail if the Credential Manager is unable to retrieve a password", () => { - let cmd = `profiles create ${testProfileName}-profile ${createdName} --username ${username} ` + - `--password ${password} --account ${account} --sec1 ${secured} --insec1 ${insecured}`; - let result = T.executeTestCLICommand(cliBin, this, cmd.split(" ")); - - expect(result.stderr).toContain("command 'profiles create' is deprecated"); - expect(result.stdout).toContain("Profile created successfully!"); - - // Now change the name of the profile so that we can break it + // change the name of the profile so that we can break it fs.renameSync(createdPath, changedPath); - cmd = `display-profile --${testProfileName}-profile ${changedName}`; - result = T.executeTestCLICommand(cliBin, this, cmd.split(" ")); - - expect(T.stripNewLines(result.stderr)).toMatch(credentialManagerErrorMessage); - expect(result.stderr).toMatchSnapshot(); + const cmd = `display-profile --${testProfileType}-profile ${changedName}`; + const result = T.executeTestCLICommand(cliBin, this, cmd.split(" ")); - // Now put it back for cleanup + // put the profile back for cleanup fs.renameSync(changedPath, createdPath); - cmd = `profiles delete ${testProfileName}-profile ${createdName}`; - result = T.executeTestCLICommand(cliBin, this, cmd.split(" ")); - - expect(result.stderr).toContain("command 'profiles delete' is deprecated"); - expect(T.stripNewLines(result.stdout)).toContain("successfully deleted"); - expect(result.stdout).toMatchSnapshot(); + expect(T.stripNewLines(result.stderr)).toContain( + `Unable to load the secure field "${username}" associated with ` + + `the profile "${changedName}" of type "${testProfileType}".` + ); + expect(T.stripNewLines(result.stderr)).toContain( + "Could not find an entry in the credential vault for the following:" + ); + expect(T.stripNewLines(result.stderr)).toContain("Service = example_with_profiles"); + expect(T.stripNewLines(result.stderr)).toContain("Account = username-password_profile-name-changed_username"); }); }); - describe("Missing keytar installation", () => { - const profileName = "missing-keytar"; - const keyTarDir = path.join(__dirname, "../../../../../../../node_modules/@zowe/secrets-for-zowe-sdk"); - const renamedKeyTarDir = path.join(__dirname, "../../../../../../../node_modules/@zowe/zowe-for-secrets-sdk"); + describe("Missing secrets SDK installation", () => { + const secretsSdk = path.join(__dirname, "../../../../../../../node_modules/@zowe/secrets-for-zowe-sdk"); + const renamedSecretsSdk = path.join(__dirname, "../../../../../../../node_modules/@zowe/zowe-for-secrets-sdk"); - const renameKeyTar = () => { - if (fs.existsSync(keyTarDir)) { - fs.renameSync(keyTarDir, renamedKeyTarDir); + const renameSecretsSdk = () => { + if (fs.existsSync(secretsSdk)) { + fs.renameSync(secretsSdk, renamedSecretsSdk); } }; - // Make sure that the keytar folder is reset to the original name. + // Make sure that the secrets SDK folder is reset to the original name. afterEach(() => { - if (fs.existsSync(renamedKeyTarDir)) { - fs.renameSync(renamedKeyTarDir, keyTarDir); + if (fs.existsSync(renamedSecretsSdk)) { + fs.renameSync(renamedSecretsSdk, secretsSdk); } }); - it("should fail if keytar is not loaded on profiles create", () => { - renameKeyTar(); + it("should fail if secrets SDK is not loaded on using profile handler", () => { + renameSecretsSdk(); - const cmd = `profiles create ${testProfileName}-profile ${profileName} --username ${username} ` + - `--password ${password} --account ${account} --sec1 ${secured} --insec1 ${insecured}`; + const cmd = `display-profile`; const result = T.executeTestCLICommand(cliBin, this, cmd.split(" ")); - expect(result.stdout).toEqual(""); - expect(result.stderr).toContain(profileName); - expect(result.stderr).toContain("Failed to load Keytar module"); - }); - - it("should fail if keytar is not loaded on using profile handler", () => { - let cmd = `profiles create ${testProfileName}-profile ${profileName} --username ${username} ` + - `--password ${password} --account ${account} --sec1 ${secured} --insec1 ${insecured}`; - let result = T.executeTestCLICommand(cliBin, this, cmd.split(" ")); - expect(result.stderr).toContain("command 'profiles create' is deprecated"); - expect(result.stdout).toContain("Profile created successfully!"); - - renameKeyTar(); - cmd = `display-profile`; - result = T.executeTestCLICommand(cliBin, this, cmd.split(" ")); expect(result.stderr).toContain("Command Preparation Failed"); - expect(result.stderr).toContain("Failed to load Keytar module"); - }); - - it("should fail if keytar is not loaded on profiles delete", () => { - let cmd = `profiles create ${testProfileName}-profile ${profileName} --username ${username} ` + - `--password ${password} --account ${account} --sec1 ${secured} --insec1 ${insecured}`; - let result = T.executeTestCLICommand(cliBin, this, cmd.split(" ")); - expect(result.stderr).toContain("command 'profiles create' is deprecated"); - expect(result.stdout).toContain("Profile created successfully!"); - - renameKeyTar(); - - cmd = `profiles delete ${testProfileName}-profile ${profileName}`; - result = T.executeTestCLICommand(cliBin, this, cmd.split(" ")); - expect(result.stderr).toContain(profileName); - expect(result.stderr).toMatch(credentialManagerErrorMessage); + expect(result.stderr).toContain( + `Unable to load the secure field "${username}" associated with ` + + `the profile "profile-name" of type "${testProfileType}".` + ); + expect(T.stripNewLines(result.stderr)).toContain( + "Failed to load Keytar module: Cannot find module '@zowe/secrets-for-zowe-sdk" + ); }); it("should be able to issue command", () => { - renameKeyTar(); + renameSecretsSdk(); - const cmd = `display-non-keytar`; + const cmd = `display-no-secrets`; const result = T.executeTestCLICommand(cliBin, this, cmd.split(" ")); - expect(result.stdout).toContain("This handler does not require keytar"); + expect(result.stderr).toBe(""); + expect(result.stdout).toContain("This handler does not require secrets"); }); }); }); - describe("Custom Credential Management (Absolute String)", () => { - const cliBin = path.join(__dirname, "../test_cli/TestCustomCredString.ts"); - const config: IImperativeConfig = require(path.join(__dirname, "../test_cli/TestCustomCredStringConfiguration")); - const homeDir: string = config.defaultHome; - - const testProfileName = "username-password"; - const username: string = "username"; - const password: string = "password"; - - beforeEach(() => { - T.rimraf(homeDir); - }); - - it("should use an overwritten credential manager (Absolute String)", () => { - const profileName = "custom-credential-string"; - - let cmd = `profiles create ${testProfileName}-profile ${profileName} --username ${username} --password ${password}`; - let result = T.executeTestCLICommand(cliBin, this, cmd.split(" ")); - expect(result.stderr).toContain("command 'profiles create' is deprecated"); - expect(result.stdout).toContain("Profile created successfully!"); + describe("Custom Credential Management - Absolute String", () => { - cmd = `display-profile`; - result = T.executeTestCLICommand(cliBin, this, cmd.split(" ")); - expect(JSON.parse(result.stdout)).toEqual({username: "custom", password: "custom"}); + it("should use an overwritten credential manager - Absolute String", () => { + const cliBin = path.join(__dirname, "../test_cli/TestCustomCredString.ts"); + const cmd = `display-profile`; + const result = T.executeTestCLICommand(cliBin, this, cmd.split(" ")); + expect(result.stderr).toBe(""); + expect(result.stdout).toContain('"username":"custom"'); + expect(result.stdout).toContain('"password":"custom"'); }); }); - describe("Custom Credential Management (Class)", () => { - const cliBin = path.join(__dirname, "../test_cli/TestCustomCredClass.ts"); - const config: IImperativeConfig = require(path.join(__dirname, "../test_cli/TestCustomCredClassConfiguration")); - const homeDir: string = config.defaultHome; - - const testProfileName = "username-password"; - const username: string = "username"; - const password: string = "password"; - - beforeEach(() => { - T.rimraf(homeDir); - }); - - it("should use an overwritten credential manager (Class)", () => { - const profileName = "custom-credential-class"; - - let cmd = `profiles create ${testProfileName}-profile ${profileName} --username ${username} --password ${password}`; - let result = T.executeTestCLICommand(cliBin, this, cmd.split(" ")); - expect(result.stderr).toContain("command 'profiles create' is deprecated"); - expect(result.stdout).toContain("Profile created successfully!"); + describe("Custom Credential Management - Class", () => { - cmd = `display-profile`; - result = T.executeTestCLICommand(cliBin, this, cmd.split(" ")); - expect(JSON.parse(result.stdout)).toEqual({ username: "custom", password: "custom"}); + it("should use an overwritten credential manager - Class", () => { + const cliBin = path.join(__dirname, "../test_cli/TestCustomCredClass.ts"); + const cmd = `display-profile`; + const result = T.executeTestCLICommand(cliBin, this, cmd.split(" ")); + expect(result.stderr).toBe(""); + expect(result.stdout).toContain('"username":"custom"'); + expect(result.stdout).toContain('"password":"custom"'); }); }); }); diff --git a/packages/imperative/__tests__/src/packages/profiles/__integration__/__resources__/profiles_cli_prof_mgr_creds/username-password/profile-name.yaml b/packages/imperative/__tests__/src/packages/profiles/__integration__/__resources__/profiles_cli_prof_mgr_creds/username-password/profile-name.yaml new file mode 100644 index 0000000000..45141c58b1 --- /dev/null +++ b/packages/imperative/__tests__/src/packages/profiles/__integration__/__resources__/profiles_cli_prof_mgr_creds/username-password/profile-name.yaml @@ -0,0 +1,8 @@ +username: 'managed by Test CLI with Profiles' +password: 'managed by Test CLI with Profiles' +account: 'managed by Test CLI with Profiles' +myParent: + securedProperty: + mySecuredChild: 'managed by Test CLI with Profiles' + insecuredProperty: + myInSecuredChild: insecured diff --git a/packages/imperative/__tests__/src/packages/profiles/__integration__/__resources__/profiles_cli_prof_mgr_creds/username-password/username-password_meta.yaml b/packages/imperative/__tests__/src/packages/profiles/__integration__/__resources__/profiles_cli_prof_mgr_creds/username-password/username-password_meta.yaml new file mode 100644 index 0000000000..e3a32193d8 --- /dev/null +++ b/packages/imperative/__tests__/src/packages/profiles/__integration__/__resources__/profiles_cli_prof_mgr_creds/username-password/username-password_meta.yaml @@ -0,0 +1,57 @@ +defaultProfile: profile-name +configuration: + type: username-password + schema: + type: object + title: 'Profile Manager Test Profile' + description: 'user name and password test profile' + properties: + username: + optionDefinition: + description: 'User Name' + type: string + name: username + required: true + secure: true + type: string + password: + optionDefinition: + description: Password + type: number + name: password + required: true + secure: true + type: number + account: + optionDefinition: + description: Account + type: string + name: account + required: true + secure: true + type: string + myParent: + type: object + properties: + securedProperty: + type: object + properties: + mySecuredChild: + optionDefinition: + description: 'The secured property' + type: string + name: sec1 + required: true + secure: true + type: string + insecuredProperty: + type: object + properties: + myInSecuredChild: + optionDefinition: + description: 'The insecured property' + type: string + name: insec1 + required: true + secure: false + type: string diff --git a/packages/imperative/__tests__/src/packages/profiles/__integration__/__scripts__/copy_profiles_cli_prof_mgr_creds.sh b/packages/imperative/__tests__/src/packages/profiles/__integration__/__scripts__/copy_profiles_cli_prof_mgr_creds.sh new file mode 100644 index 0000000000..b65457bffb --- /dev/null +++ b/packages/imperative/__tests__/src/packages/profiles/__integration__/__scripts__/copy_profiles_cli_prof_mgr_creds.sh @@ -0,0 +1,9 @@ +#!/bin/sh + +# include exitOnFailure function +myScriptDir=`dirname $0` +. $myScriptDir/exitOnFailure.sh + +# copy pre-existing profiles to test directory +cp -r $myScriptDir/../__resources__/profiles_cli_prof_mgr_creds ./profiles +exitOnFailure "Failed to copy test profiles." $? diff --git a/packages/imperative/__tests__/src/packages/profiles/test_cli/TestConfiguration.ts b/packages/imperative/__tests__/src/packages/profiles/test_cli/TestConfiguration.ts index c2fc87d90a..a572b3d57b 100644 --- a/packages/imperative/__tests__/src/packages/profiles/test_cli/TestConfiguration.ts +++ b/packages/imperative/__tests__/src/packages/profiles/test_cli/TestConfiguration.ts @@ -24,10 +24,10 @@ const config: IImperativeConfig = { handler: path.join(__dirname, "handlers", "DisplayProfileHandler.ts") }, { - name: "display-non-keytar", - description: "Display handler without require keytar", + name: "display-no-secrets", + description: "Display handler without secrets", type: "command", - handler: path.join(__dirname, "handlers", "NonKeytarHandler.ts") + handler: path.join(__dirname, "handlers", "NoSecretsHandler.ts") } ], rootCommandDescription: "Sample command line interface", diff --git a/packages/imperative/__tests__/src/packages/profiles/test_cli/handlers/NonKeytarHandler.ts b/packages/imperative/__tests__/src/packages/profiles/test_cli/handlers/NoSecretsHandler.ts similarity index 86% rename from packages/imperative/__tests__/src/packages/profiles/test_cli/handlers/NonKeytarHandler.ts rename to packages/imperative/__tests__/src/packages/profiles/test_cli/handlers/NoSecretsHandler.ts index 2871ebe061..bf175daa47 100644 --- a/packages/imperative/__tests__/src/packages/profiles/test_cli/handlers/NonKeytarHandler.ts +++ b/packages/imperative/__tests__/src/packages/profiles/test_cli/handlers/NoSecretsHandler.ts @@ -11,8 +11,8 @@ import { ICommandHandler, IHandlerParameters } from "../../../../../../src/cmd"; -export default class NoneKeytarHandler implements ICommandHandler { +export default class NoSecretsHandler implements ICommandHandler { public async process(params: IHandlerParameters): Promise { - params.response.console.log("This handler does not require keytar"); + params.response.console.log("This handler does not require secrets"); } } From 2f8e68db5baaa960c28a16214c485e53ac097284 Mon Sep 17 00:00:00 2001 From: Gene Johnston Date: Wed, 20 Dec 2023 14:16:20 -0500 Subject: [PATCH 037/138] Add certFile and certKeyFile to expected schema Signed-off-by: Gene Johnston --- .../cli/config/__resources__/expectedObjects.ts | 8 ++++++++ ....imperative-test-cli.config.schema.integration.test.ts | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/packages/imperative/__tests__/__integration__/imperative/__tests__/__integration__/cli/config/__resources__/expectedObjects.ts b/packages/imperative/__tests__/__integration__/imperative/__tests__/__integration__/cli/config/__resources__/expectedObjects.ts index 39a1965232..294d32cffc 100644 --- a/packages/imperative/__tests__/__integration__/imperative/__tests__/__integration__/cli/config/__resources__/expectedObjects.ts +++ b/packages/imperative/__tests__/__integration__/imperative/__tests__/__integration__/cli/config/__resources__/expectedObjects.ts @@ -147,6 +147,14 @@ export const expectedSchemaObject = { tokenValue: { type: "string", description: "Fruit token value" + }, + certFile: { + type: "existingLocalFile", + description: "Fruit certificate file" + }, + certKeyFile: { + type: "existingLocalFile", + description: "Fruit certificate key file" } } }, diff --git a/packages/imperative/__tests__/__integration__/imperative/__tests__/__integration__/cli/config/schema/cli.imperative-test-cli.config.schema.integration.test.ts b/packages/imperative/__tests__/__integration__/imperative/__tests__/__integration__/cli/config/schema/cli.imperative-test-cli.config.schema.integration.test.ts index 7389551188..ccaad18d91 100644 --- a/packages/imperative/__tests__/__integration__/imperative/__tests__/__integration__/cli/config/schema/cli.imperative-test-cli.config.schema.integration.test.ts +++ b/packages/imperative/__tests__/__integration__/imperative/__tests__/__integration__/cli/config/schema/cli.imperative-test-cli.config.schema.integration.test.ts @@ -38,8 +38,8 @@ describe("imperative-test-cli config schema", () => { }); it("should print the generated schema", () => { const response = runCliScript(__dirname + "/__scripts__/schema.sh", TEST_ENVIRONMENT.workingDir, [""]); - expect(JSON.parse(response.stdout.toString())).toEqual(expectedSchemaObject); expect(response.stderr.toString()).toEqual(""); expect(response.error).toBeFalsy(); + expect(JSON.parse(response.stdout.toString())).toEqual(expectedSchemaObject); }); }); From 6e0c894d7e7a2a708933dce90692a86367baec44 Mon Sep 17 00:00:00 2001 From: Gene Johnston Date: Wed, 20 Dec 2023 16:10:10 -0500 Subject: [PATCH 038/138] Remove "profiles" command from help snapshot Signed-off-by: Gene Johnston --- .../__snapshots__/ZoweHelpTests.integration.test.ts.snap | 2 -- 1 file changed, 2 deletions(-) diff --git a/packages/cli/__tests__/help/__integration__/__snapshots__/ZoweHelpTests.integration.test.ts.snap b/packages/cli/__tests__/help/__integration__/__snapshots__/ZoweHelpTests.integration.test.ts.snap index 23878c0237..1d03c346d3 100644 --- a/packages/cli/__tests__/help/__integration__/__snapshots__/ZoweHelpTests.integration.test.ts.snap +++ b/packages/cli/__tests__/help/__integration__/__snapshots__/ZoweHelpTests.integration.test.ts.snap @@ -29,8 +29,6 @@ exports[`Root level help tests top level help should contain support link 1`] = config Manage JSON project and global configuration daemon Daemon operations plugins Install and manage plug-ins. - profiles Create and manage configuration profiles. - (deprecated) provisioning | pv Perform z/OSMF provisioning tasks zos-console | console Issue z/OS console commands and collect responses From 7d1d4c62c26a82d1c952090e0457482bb242b228 Mon Sep 17 00:00:00 2001 From: Gene Johnston Date: Thu, 21 Dec 2023 16:38:10 -0500 Subject: [PATCH 039/138] Use pre-existing profile files not v1 profile cmds - AutoGeneratedProfileCommands Signed-off-by: Gene Johnston --- ...atedProfileCommands.integration.subtest.ts | 319 +++--------------- .../many-field-profile_meta.yaml | 40 +++ .../autoGenProfiles/profile-a/first.yaml | 2 + .../autoGenProfiles/profile-a/good.yaml | 2 + .../profile-a/profile-a_meta.yaml | 35 ++ .../autoGenProfiles/profile-a/second.yaml | 2 + .../autoGenProfiles/profile-b/first.yaml | 1 + .../profile-b/profile-b_meta.yaml | 19 ++ .../autoGenProfiles/profile-b/second.yaml | 1 + .../profile-c/profile-c_meta.yaml | 19 ++ .../profile-with-dependency/big_profile.yaml | 5 + .../profile-with-dependency_meta.yaml | 25 ++ .../__scripts__/copy_auto_gen_profiles.sh | 9 + .../__scripts__/exitOnFailure.sh | 12 + .../__scripts__/set_default_profile.sh | 16 + 15 files changed, 238 insertions(+), 269 deletions(-) create mode 100644 packages/imperative/__tests__/src/example_clis/with_profiles/__integration__/__resources__/autoGenProfiles/many-field-profile/many-field-profile_meta.yaml create mode 100644 packages/imperative/__tests__/src/example_clis/with_profiles/__integration__/__resources__/autoGenProfiles/profile-a/first.yaml create mode 100644 packages/imperative/__tests__/src/example_clis/with_profiles/__integration__/__resources__/autoGenProfiles/profile-a/good.yaml create mode 100644 packages/imperative/__tests__/src/example_clis/with_profiles/__integration__/__resources__/autoGenProfiles/profile-a/profile-a_meta.yaml create mode 100644 packages/imperative/__tests__/src/example_clis/with_profiles/__integration__/__resources__/autoGenProfiles/profile-a/second.yaml create mode 100644 packages/imperative/__tests__/src/example_clis/with_profiles/__integration__/__resources__/autoGenProfiles/profile-b/first.yaml create mode 100644 packages/imperative/__tests__/src/example_clis/with_profiles/__integration__/__resources__/autoGenProfiles/profile-b/profile-b_meta.yaml create mode 100644 packages/imperative/__tests__/src/example_clis/with_profiles/__integration__/__resources__/autoGenProfiles/profile-b/second.yaml create mode 100644 packages/imperative/__tests__/src/example_clis/with_profiles/__integration__/__resources__/autoGenProfiles/profile-c/profile-c_meta.yaml create mode 100644 packages/imperative/__tests__/src/example_clis/with_profiles/__integration__/__resources__/autoGenProfiles/profile-with-dependency/big_profile.yaml create mode 100644 packages/imperative/__tests__/src/example_clis/with_profiles/__integration__/__resources__/autoGenProfiles/profile-with-dependency/profile-with-dependency_meta.yaml create mode 100644 packages/imperative/__tests__/src/example_clis/with_profiles/__integration__/__scripts__/copy_auto_gen_profiles.sh create mode 100644 packages/imperative/__tests__/src/example_clis/with_profiles/__integration__/__scripts__/exitOnFailure.sh create mode 100644 packages/imperative/__tests__/src/example_clis/with_profiles/__integration__/__scripts__/set_default_profile.sh diff --git a/packages/imperative/__tests__/src/example_clis/with_profiles/__integration__/AutoGeneratedProfileCommands.integration.subtest.ts b/packages/imperative/__tests__/src/example_clis/with_profiles/__integration__/AutoGeneratedProfileCommands.integration.subtest.ts index 4487177c91..9c69126465 100644 --- a/packages/imperative/__tests__/src/example_clis/with_profiles/__integration__/AutoGeneratedProfileCommands.integration.subtest.ts +++ b/packages/imperative/__tests__/src/example_clis/with_profiles/__integration__/AutoGeneratedProfileCommands.integration.subtest.ts @@ -11,6 +11,8 @@ import { IImperativeConfig } from "../../../../../src/imperative"; import * as T from "../../../TestUtil"; +import * as path from "path"; +import * as fs from "fs"; describe("We should provide auto-generated profile commands for convenience, " + "so that Imperative-based CLIs can let users manage configuration profiles", () => { @@ -25,221 +27,81 @@ describe("We should provide auto-generated profile commands for convenience, " + const home = config.defaultHome; beforeAll(() => { + // ensure a clean CLI home directory exists before running our copy_profile script T.rimraf(home); - }); - beforeEach(() => { - T.rimraf(home); // delete profiles - }); - afterAll(() => { - T.rimraf(home); - }); - it("If we accept the default of auto-generating profile commands, " + - "commands should be generated for each profile type, " + - "and able to be invoked with --help", () => { + fs.mkdirSync(home); - T.findExpectedOutputInCommand(cliBin, ["profiles", "--help"], ["create", "set"], - "stdout", true, this); - // validate commands have been generated for each type of profile - T.findExpectedOutputInCommand(cliBin, ["profiles", "create", "--help"], [profileTypeA, profileTypeB], - "stdout", true, this); - T.findExpectedOutputInCommand(cliBin, ["profiles", "create", profileTypeA, "--help"], [profileTypeA], - "stdout", true, this); - T.findExpectedOutputInCommand(cliBin, ["profiles", "set", "--help"], [profileTypeA, profileTypeB], - "stdout", true, this); - T.findExpectedOutputInCommand(cliBin, ["profiles", "list", "--help"], [profileTypeA, profileTypeB], - "stdout", true, this); - T.findExpectedOutputInCommand(cliBin, ["profiles", "delete", "--help"], [profileTypeA, profileTypeB], - "stdout", true, this); - T.findExpectedOutputInCommand(cliBin, ["profiles", "update", "--help"], [profileTypeA, profileTypeB], - "stdout", true, this); - T.findExpectedOutputInCommand(cliBin, ["profiles", "validate", "--help"], [manyFieldProfile], - "stdout", true, this); + // copy existing profiles into test directory + const result = T.runCliScript(path.join(__dirname, "__scripts__/copy_auto_gen_profiles.sh"), home); + expect(result.stderr.toString()).toBe(""); + expect(result.status).toBe(0); }); - it("If we specify updateProfileExamples on our profile configuration, " + - "our examples should appear in the help text", () => { - T.findExpectedOutputInCommand(cliBin, ["profiles", "update", "profile-a", "--help"], ["froggy"], - "stdout", true, this); - - }); - - it("If we turn off auto-generating profile commands, " + - "commands should NOT be generated for each profile type", () => { - const cliBinNoCommands = __dirname + "/../ProfileExampleCLINoAutoGen.ts"; - T.findExpectedOutputInCommand(cliBinNoCommands, ["profiles", "--help"], - ["Command failed due to improper syntax", "Unknown group: profiles"], - "stderr", false, this); - // validate commands have been generated for each type of profile - T.findExpectedOutputInCommand(cliBinNoCommands, ["profiles", "create"], - ["Command failed due to improper syntax", "Unknown group: profiles"], - "stderr", false, this); - T.findExpectedOutputInCommand(cliBinNoCommands, ["profiles", "create", profileTypeA], - ["Command failed due to improper syntax", "Unknown group: profiles"], - "stderr", false, this); - T.findExpectedOutputInCommand(cliBinNoCommands, ["profiles", "set"], - ["Command failed due to improper syntax", "Unknown group: profiles"], - "stderr", false, this); - T.findExpectedOutputInCommand(cliBinNoCommands, ["profiles", "list"], - ["Command failed due to improper syntax", "Unknown group: profiles"], - "stderr", false, this); - T.findExpectedOutputInCommand(cliBinNoCommands, ["profiles", "delete"], - ["Command failed due to improper syntax", "Unknown group: profiles"], - "stderr", false, this); - T.findExpectedOutputInCommand(cliBinNoCommands, ["profiles", "update"], - ["Command failed due to improper syntax", "Unknown group: profiles"], - "stderr", false, this); + afterAll(() => { + T.rimraf(home); }); - it("If we have a profile type defined with a dependent profile, if we specify a non-existent " + - "profile-a profile, the command should fail", () => { - T.findExpectedOutputInCommand(cliBin, - ["profiles", "create", "profile-with-dependency", - "bad", - "--profile-a-profile", "fake", - "--ghost", "lenore"], - ["fake", "depend"], - "stderr", false, this, T.CMD_TYPE.ALL, {ignoreCase: true}); + it("should use a profile with a valid dependent profile", () => { + const result = T.executeTestCLICommand(cliBin, this, ["use-dependent-profile"]); + expect(result.stderr).toBe(""); + expect(result.stdout).toContain("Loaded profile dependency of type profile-a"); + expect(result.stdout).toContain("Loaded main profile of type profile-with-dependency"); + expect(result.status).toBe(0); }); - it("If we have a profile type defined with a dependent profile, if we specify a valid " + - "dependent profile, the command should succeed and we should be able to " + - "use the profile on a command", () => { - // basically the simple positive test case for dependent profile creation - const goodDependency = "good"; - const mainProfileName = "big_profile"; - T.findExpectedOutputInCommand(cliBin, ["profiles", "create", profileTypeA, goodDependency, "--animal", "doggy", - ], - ["doggy", "success", "numberWithDefault", "8080"], // expect default number value to be filled in - "stdout", true, this, T.CMD_TYPE.JSON, {ignoreCase: true}); - - T.findExpectedOutputInCommand(cliBin, - ["profiles", "create", "profile-with-dependency", - mainProfileName, - "--profile-a-profile", goodDependency, - "--ghost", "lenore"], - ["success"], - "stdout", true, this, T.CMD_TYPE.JSON, {ignoreCase: true}); + it("should use a profile with a dependent profile that is not the default for its type", () => { + // set the default profile for type profile-a + let result: any = T.runCliScript(path.join(__dirname, "__scripts__/set_default_profile.sh"), home, + [profileTypeA, "non_existent_default_a_profile"] + ); + expect(result.stderr.toString()).toBe(""); + expect(result.status).toBe(0); - // issue a command that uses the new profile with dependency - T.findExpectedOutputInCommand(cliBin, - ["use-dependent-profile"], [], "stdout", - true, this); + // use a profile that has a dependency which is now NOT the default profile for that dependency + result = T.executeTestCLICommand(cliBin, this, ["use-dependent-profile"]); + expect(result.stderr).toBe(""); + expect(result.stdout).toContain(`Loaded profile dependency of type ${profileTypeA}`); + expect(result.stdout).toContain("Loaded main profile of type profile-with-dependency"); + expect(result.status).toBe(0); }); - it("If we create a profile-with-dependencies, and the profile-a dependency is different than the default " + - "profile-a profile, the default profile-a profile should not be" + - " loaded when the profile-with-dependencies is used on a command", () => { - const defaultProfileA = "the_default_a_profile"; - const goodDependency = "good"; - const mainProfileName = "big_profile"; - T.findExpectedOutputInCommand(cliBin, ["profiles", "create", profileTypeA, defaultProfileA, "--animal", "emu"], - ["emu", "success"], - "stdout", true, this, T.CMD_TYPE.JSON, {ignoreCase: true}); - - T.findExpectedOutputInCommand(cliBin, ["profiles", "create", profileTypeA, goodDependency, "--animal", "doggy", - ], - ["doggy", "success"], - "stdout", true, this, T.CMD_TYPE.JSON, {ignoreCase: true}); - - T.findExpectedOutputInCommand(cliBin, - ["profiles", "create", "profile-with-dependency", - mainProfileName, - "--profile-a-profile", goodDependency, - "--ghost", "lenore"], - ["success"], - "stdout", true, this, T.CMD_TYPE.JSON, {ignoreCase: true}); - - // issue a command that uses the new profile with dependency - const useProfileOutput = T.findExpectedOutputInCommand(cliBin, - ["use-dependent-profile"], [], "stdout", - true, this); - // default profile shouldn't show up in output - expect(useProfileOutput.stdout.toString().indexOf(defaultProfileA)).toEqual(-1); - }); - - it("If we omit a required option definition on a generate create profile command," + - "defined in the profile schema, " + - "we should get a syntax error", () => { - T.findExpectedOutputInCommand(cliBin, ["profiles", "create", profileTypeA, "bad"], - ["animal"], - "stderr", false, this, T.CMD_TYPE.JSON, {ignoreCase: true}); - }); - - it("We should be able to run through all auto-generated profile commands for two types of profiles", () => { + it("should be able to use two types of profiles", () => { const firstProfile = "first"; const secondProfile = "second"; - // create two A profiles - T.findExpectedOutputInCommand(cliBin, ["profiles", "create", profileTypeA, firstProfile, "--animal", "doggy"], - ["doggy", "success"], - "stdout", true, this, T.CMD_TYPE.JSON, {ignoreCase: true}); - T.findExpectedOutputInCommand(cliBin, ["profiles", "create", - profileTypeA, secondProfile, "--animal", "sloth"], - ["sloth", "success"], - "stdout", true, this, T.CMD_TYPE.JSON, {ignoreCase: true}); + // set the default profile for type profile-a + let result: any = T.runCliScript(path.join(__dirname, "__scripts__/set_default_profile.sh"), home, + [profileTypeA, firstProfile] + ); + expect(result.stderr.toString()).toBe(""); + expect(result.status).toBe(0); - // Create two B profiles - T.findExpectedOutputInCommand(cliBin, ["profiles", "create", profileTypeB, firstProfile, "--bumblebee", "dumbledore"], - ["dumbledore", "success"], - "stdout", true, this, T.CMD_TYPE.JSON, {ignoreCase: true}); - T.findExpectedOutputInCommand(cliBin, ["profiles", "create", profileTypeB, secondProfile, "--bumblebee", "jerry"], - ["jerry", "success"], - "stdout", true, this, T.CMD_TYPE.JSON, {ignoreCase: true}); - - // update second B profile - T.findExpectedOutputInCommand(cliBin, ["profiles", "update", profileTypeB, secondProfile, "--bumblebee", "seinfeld"], - ["seinfeld", "success"], - "stdout", true, this, T.CMD_TYPE.JSON, {ignoreCase: true}); - - // list A type profiles - T.findExpectedOutputInCommand(cliBin, ["profiles", "list", profileTypeA], - [firstProfile, secondProfile], - "stdout", true, this, T.CMD_TYPE.JSON, {ignoreCase: true}); - - // list B type profiles - T.findExpectedOutputInCommand(cliBin, ["profiles", "list", profileTypeB], - [firstProfile, secondProfile], - "stdout", true, this, T.CMD_TYPE.JSON, {ignoreCase: true}); + // set the default profile for type profile-b + result = T.runCliScript(path.join(__dirname, "__scripts__/set_default_profile.sh"), home, + [profileTypeB, firstProfile] + ); + expect(result.stderr.toString()).toBe(""); + expect(result.status).toBe(0); // use both A profiles T.findExpectedOutputInCommand(cliBin, ["use-profile-a"], [], // default A profile - "stdout", true, this, T.CMD_TYPE.JSON, {ignoreCase: true}); + "stdout", true, this, T.CMD_TYPE.JSON, { ignoreCase: true } + ); T.findExpectedOutputInCommand(cliBin, ["use-profile-a", "--profile-a-profile", secondProfile], [], - "stdout", true, this, T.CMD_TYPE.JSON, {ignoreCase: true}); + "stdout", true, this, T.CMD_TYPE.JSON, { ignoreCase: true } + ); // use both B profiles T.findExpectedOutputInCommand(cliBin, ["use-profile-b"], // default B profile [], - "stdout", true, this, T.CMD_TYPE.JSON, {ignoreCase: true}); + "stdout", true, this, T.CMD_TYPE.JSON, { ignoreCase: true } + ); T.findExpectedOutputInCommand(cliBin, ["use-profile-b", "--profile-b-profile", secondProfile], [], - "stdout", true, this, T.CMD_TYPE.JSON, {ignoreCase: true}); - - // set the default A profile to the second and make sure it is used - T.findExpectedOutputInCommand(cliBin, ["profiles", "set", profileTypeA, secondProfile], // default B profile - [], - "stdout", true, this, T.CMD_TYPE.JSON, {ignoreCase: true}); - T.findExpectedOutputInCommand(cliBin, ["use-profile-a"], // second profile should be used - [], - "stdout", true, this, T.CMD_TYPE.JSON, {ignoreCase: true}); - - // set the default B profile to the second and make sure it is used - T.findExpectedOutputInCommand(cliBin, ["profiles", "set", profileTypeB, secondProfile], // default B profile - [], - "stdout", true, this, T.CMD_TYPE.JSON, {ignoreCase: true}); - T.findExpectedOutputInCommand(cliBin, ["use-profile-b"], // second profile should be used - [], - "stdout", true, this, T.CMD_TYPE.JSON, {ignoreCase: true}); - - // delete the profiles - T.findExpectedOutputInCommand(cliBin, ["profiles", "delete", profileTypeA, firstProfile, "--force"], - ["success", "delete", firstProfile], "stdout", - true, this, T.CMD_TYPE.JSON, {ignoreCase: true}); - T.findExpectedOutputInCommand(cliBin, ["profiles", "delete", profileTypeB, secondProfile, "--force"], - ["success", "delete", secondProfile], "stdout", - true, this, T.CMD_TYPE.JSON, {ignoreCase: true}); + "stdout", true, this, T.CMD_TYPE.JSON, { ignoreCase: true } + ); }); it("should not fail a command where the profile is listed as optional and not specified", () => { @@ -249,85 +111,4 @@ describe("We should provide auto-generated profile commands for convenience, " + "stdout", true, this, T.CMD_TYPE.JSON, {ignoreCase: true}); expect(output.stderr).toEqual(""); }); - - it("If we update an existing profile, the contents of the old profile should be merged with teh", () => { - const profileName = "merge_me"; - const oldTea = "earl_grey"; - const oldSoda = "diet_coke"; - const oldWater = "dirty"; - - T.findExpectedOutputInCommand(cliBin, ["profiles", "create", manyFieldProfile, profileName, - "--tea", oldTea, "--soda", oldSoda, "--water", oldWater], - [oldSoda, oldWater, oldTea], - "stdout", true, this, T.CMD_TYPE.JSON, {ignoreCase: true}); - - const newWater = "clean"; - T.findExpectedOutputInCommand(cliBin, ["profiles", "update", manyFieldProfile, profileName, - "--water", newWater], - [oldSoda, newWater, oldTea], - "stdout", true, this, T.CMD_TYPE.JSON, {ignoreCase: true}); - - T.findExpectedOutputInCommand(cliBin, ["profiles", "list", manyFieldProfile, "--show-contents"], - [oldSoda, newWater, oldTea], - "stdout", true, this, T.CMD_TYPE.JSON, {ignoreCase: true}); - }); - - it("should contain examples specified on profile config in the help text", () => { - T.findExpectedOutputInCommand(cliBin, ["profiles", "create", profileTypeA, "--help"], - ["Examples", "--animal doggy"], - "stdout", true, this, T.CMD_TYPE.JSON, {ignoreCase: true}); - }); - - it("should be able to validate a many-field-profile with an auto generated validate command", () => { - const profileName = "validate_me"; - const tea = "earl_grey"; - const soda = "diet_coke"; - const water = "dirty"; - - T.findExpectedOutputInCommand(cliBin, ["profiles", "create", manyFieldProfile, profileName, - "--tea", tea, "--soda", soda, "--water", water], - [soda, water, tea], - "stdout", true, this, T.CMD_TYPE.JSON, {ignoreCase: true}); - - T.findExpectedOutputInCommand(cliBin, ["profiles", "validate", manyFieldProfile, profileName], - ["perfect", profileName, "many-field-profile"], - "stdout", true, this, T.CMD_TYPE.JSON, {ignoreCase: true}); - - }); - - it("should not print output more than once if a progress bar is used in a profiles validate command", () => { - const profileName = "validate_me"; - const tea = "earl_grey"; - const soda = "diet_coke"; - const water = "dirty"; - - T.findExpectedOutputInCommand(cliBin, ["profiles", "create", manyFieldProfile, profileName, - "--tea", tea, "--soda", soda, "--water", water], - [soda, water, tea], - "stdout", true, this, T.CMD_TYPE.INTERACTIVE, {ignoreCase: true}); - - const output = T.executeTestCLICommand(cliBin, this, ["profiles", "validate", manyFieldProfile, profileName]); - expect(output.status).toEqual(0); - const stdout = output.stdout.toString(); - // profile summary should only appear once - expect(stdout.match(/PROFILE SUMMARY/gi).length).toEqual(1); - // - }); - - it("should be fail to validate an invalid many-fields-profile", () => { - const profileName = "validate_me"; - const tea = "not_earl_grey"; - const soda = "diet_coke"; - const water = "dirty"; - - T.findExpectedOutputInCommand(cliBin, ["profiles", "create", manyFieldProfile, profileName, - "--tea", tea, "--soda", soda, "--water", water], - [soda, water, tea], - "stdout", true, this, T.CMD_TYPE.JSON, {ignoreCase: true}); - - T.findExpectedOutputInCommand(cliBin, ["profiles", "validate", manyFieldProfile, profileName], - ["failed"], - "stdout", false, this, T.CMD_TYPE.JSON, {ignoreCase: true}); - - }); }); diff --git a/packages/imperative/__tests__/src/example_clis/with_profiles/__integration__/__resources__/autoGenProfiles/many-field-profile/many-field-profile_meta.yaml b/packages/imperative/__tests__/src/example_clis/with_profiles/__integration__/__resources__/autoGenProfiles/many-field-profile/many-field-profile_meta.yaml new file mode 100644 index 0000000000..2eacfe0579 --- /dev/null +++ b/packages/imperative/__tests__/src/example_clis/with_profiles/__integration__/__resources__/autoGenProfiles/many-field-profile/many-field-profile_meta.yaml @@ -0,0 +1,40 @@ +defaultProfile: null +configuration: + type: many-field-profile + validationPlanModule: /home/stduser/repos/zowe-cli/packages/imperative/__tests__/src/example_clis/with_profiles/plans/ManyFieldValidationPlan + schema: + type: object + title: 'Example profile with multiple fields' + description: 'Example profile type with multiple fields' + properties: + tea: + optionDefinition: + description: 'The tea' + type: string + name: tea + aliases: + - t + required: true + type: string + soda: + optionDefinition: + description: 'The soda' + type: string + name: soda + aliases: + - s + required: true + type: string + water: + optionDefinition: + description: 'The water' + type: string + name: water + aliases: + - w + required: true + type: string + required: + - tea + - soda + - water diff --git a/packages/imperative/__tests__/src/example_clis/with_profiles/__integration__/__resources__/autoGenProfiles/profile-a/first.yaml b/packages/imperative/__tests__/src/example_clis/with_profiles/__integration__/__resources__/autoGenProfiles/profile-a/first.yaml new file mode 100644 index 0000000000..80f1e54e7c --- /dev/null +++ b/packages/imperative/__tests__/src/example_clis/with_profiles/__integration__/__resources__/autoGenProfiles/profile-a/first.yaml @@ -0,0 +1,2 @@ +animal: doggy +numberWithDefault: 8080 diff --git a/packages/imperative/__tests__/src/example_clis/with_profiles/__integration__/__resources__/autoGenProfiles/profile-a/good.yaml b/packages/imperative/__tests__/src/example_clis/with_profiles/__integration__/__resources__/autoGenProfiles/profile-a/good.yaml new file mode 100644 index 0000000000..80f1e54e7c --- /dev/null +++ b/packages/imperative/__tests__/src/example_clis/with_profiles/__integration__/__resources__/autoGenProfiles/profile-a/good.yaml @@ -0,0 +1,2 @@ +animal: doggy +numberWithDefault: 8080 diff --git a/packages/imperative/__tests__/src/example_clis/with_profiles/__integration__/__resources__/autoGenProfiles/profile-a/profile-a_meta.yaml b/packages/imperative/__tests__/src/example_clis/with_profiles/__integration__/__resources__/autoGenProfiles/profile-a/profile-a_meta.yaml new file mode 100644 index 0000000000..3186d43175 --- /dev/null +++ b/packages/imperative/__tests__/src/example_clis/with_profiles/__integration__/__resources__/autoGenProfiles/profile-a/profile-a_meta.yaml @@ -0,0 +1,35 @@ +defaultProfile: good +configuration: + type: profile-a + schema: + type: object + title: 'Example profile type A' + description: 'Example profile type A' + properties: + animal: + optionDefinition: + description: 'The animal' + type: string + name: animal + aliases: + - a + required: true + type: string + numberWithDefault: + optionDefinition: + defaultValue: 8080 + name: number-with-default + type: number + description: 'A number field with default value' + type: number + required: + - animal + - numberWithDefault + createProfileExamples: + - + options: '--animal doggy' + description: 'Create a profile-a profile with a doggy as the animal' + updateProfileExamples: + - + options: '--animal froggy' + description: 'Update a profile-a profile to use froggy as the animal' diff --git a/packages/imperative/__tests__/src/example_clis/with_profiles/__integration__/__resources__/autoGenProfiles/profile-a/second.yaml b/packages/imperative/__tests__/src/example_clis/with_profiles/__integration__/__resources__/autoGenProfiles/profile-a/second.yaml new file mode 100644 index 0000000000..9b70f0f916 --- /dev/null +++ b/packages/imperative/__tests__/src/example_clis/with_profiles/__integration__/__resources__/autoGenProfiles/profile-a/second.yaml @@ -0,0 +1,2 @@ +animal: sloth +numberWithDefault: 8080 diff --git a/packages/imperative/__tests__/src/example_clis/with_profiles/__integration__/__resources__/autoGenProfiles/profile-b/first.yaml b/packages/imperative/__tests__/src/example_clis/with_profiles/__integration__/__resources__/autoGenProfiles/profile-b/first.yaml new file mode 100644 index 0000000000..2add236402 --- /dev/null +++ b/packages/imperative/__tests__/src/example_clis/with_profiles/__integration__/__resources__/autoGenProfiles/profile-b/first.yaml @@ -0,0 +1 @@ +bumblebee: dumbledore diff --git a/packages/imperative/__tests__/src/example_clis/with_profiles/__integration__/__resources__/autoGenProfiles/profile-b/profile-b_meta.yaml b/packages/imperative/__tests__/src/example_clis/with_profiles/__integration__/__resources__/autoGenProfiles/profile-b/profile-b_meta.yaml new file mode 100644 index 0000000000..0606ccecb9 --- /dev/null +++ b/packages/imperative/__tests__/src/example_clis/with_profiles/__integration__/__resources__/autoGenProfiles/profile-b/profile-b_meta.yaml @@ -0,0 +1,19 @@ +defaultProfile: null +configuration: + type: profile-b + schema: + type: object + title: 'Example profile type B' + description: 'Example profile type B' + properties: + bumblebee: + optionDefinition: + description: 'The bumblebee' + type: string + name: bumblebee + aliases: + - b + required: true + type: string + required: + - bumblebee diff --git a/packages/imperative/__tests__/src/example_clis/with_profiles/__integration__/__resources__/autoGenProfiles/profile-b/second.yaml b/packages/imperative/__tests__/src/example_clis/with_profiles/__integration__/__resources__/autoGenProfiles/profile-b/second.yaml new file mode 100644 index 0000000000..90ad5c49d9 --- /dev/null +++ b/packages/imperative/__tests__/src/example_clis/with_profiles/__integration__/__resources__/autoGenProfiles/profile-b/second.yaml @@ -0,0 +1 @@ +bumblebee: seinfeld diff --git a/packages/imperative/__tests__/src/example_clis/with_profiles/__integration__/__resources__/autoGenProfiles/profile-c/profile-c_meta.yaml b/packages/imperative/__tests__/src/example_clis/with_profiles/__integration__/__resources__/autoGenProfiles/profile-c/profile-c_meta.yaml new file mode 100644 index 0000000000..2192f53d30 --- /dev/null +++ b/packages/imperative/__tests__/src/example_clis/with_profiles/__integration__/__resources__/autoGenProfiles/profile-c/profile-c_meta.yaml @@ -0,0 +1,19 @@ +defaultProfile: null +configuration: + type: profile-c + schema: + type: object + title: 'Example profile type C' + description: 'Example profile type C' + properties: + animal: + optionDefinition: + description: 'The animal' + type: string + name: animal + aliases: + - a + required: true + type: string + required: + - animal diff --git a/packages/imperative/__tests__/src/example_clis/with_profiles/__integration__/__resources__/autoGenProfiles/profile-with-dependency/big_profile.yaml b/packages/imperative/__tests__/src/example_clis/with_profiles/__integration__/__resources__/autoGenProfiles/profile-with-dependency/big_profile.yaml new file mode 100644 index 0000000000..2b11630ebd --- /dev/null +++ b/packages/imperative/__tests__/src/example_clis/with_profiles/__integration__/__resources__/autoGenProfiles/profile-with-dependency/big_profile.yaml @@ -0,0 +1,5 @@ +ghost: lenore +dependencies: + - + type: profile-a + name: good diff --git a/packages/imperative/__tests__/src/example_clis/with_profiles/__integration__/__resources__/autoGenProfiles/profile-with-dependency/profile-with-dependency_meta.yaml b/packages/imperative/__tests__/src/example_clis/with_profiles/__integration__/__resources__/autoGenProfiles/profile-with-dependency/profile-with-dependency_meta.yaml new file mode 100644 index 0000000000..296d066641 --- /dev/null +++ b/packages/imperative/__tests__/src/example_clis/with_profiles/__integration__/__resources__/autoGenProfiles/profile-with-dependency/profile-with-dependency_meta.yaml @@ -0,0 +1,25 @@ +defaultProfile: big_profile +configuration: + type: profile-with-dependency + schema: + type: object + title: 'Example profile with dependent profiles' + description: 'Example profile type with dependent profiles' + properties: + ghost: + optionDefinition: + description: 'The ghost' + type: string + name: ghost + aliases: + - g + required: true + type: string + required: + - ghost + - dependencies + dependencies: + - + description: 'The profile-a profile to use as a dependency.' + type: profile-a + required: true diff --git a/packages/imperative/__tests__/src/example_clis/with_profiles/__integration__/__scripts__/copy_auto_gen_profiles.sh b/packages/imperative/__tests__/src/example_clis/with_profiles/__integration__/__scripts__/copy_auto_gen_profiles.sh new file mode 100644 index 0000000000..f34cdaf81c --- /dev/null +++ b/packages/imperative/__tests__/src/example_clis/with_profiles/__integration__/__scripts__/copy_auto_gen_profiles.sh @@ -0,0 +1,9 @@ +#!/bin/sh + +# include exitOnFailure function +myScriptDir=`dirname $0` +. $myScriptDir/exitOnFailure.sh + +# copy pre-existing profiles to test directory +cp -r $myScriptDir/../__resources__/autoGenProfiles profiles +exitOnFailure "Failed to copy test profile." $? diff --git a/packages/imperative/__tests__/src/example_clis/with_profiles/__integration__/__scripts__/exitOnFailure.sh b/packages/imperative/__tests__/src/example_clis/with_profiles/__integration__/__scripts__/exitOnFailure.sh new file mode 100644 index 0000000000..5e7beb8643 --- /dev/null +++ b/packages/imperative/__tests__/src/example_clis/with_profiles/__integration__/__scripts__/exitOnFailure.sh @@ -0,0 +1,12 @@ +#!/bin/sh + +# function to exit if we encounter a bad return code +exitOnFailure () { + failureMsg=${1:?"First parm (failureMsg) is required."} + actualExitCode=${2:?"Second parm (actualExitCode) is required."} + goodExitCode=${3:-0} + if [ $actualExitCode != $goodExitCode ]; then + echo `basename $0`": $failureMsg" 1>&2 + exit $actualExitCode + fi +} diff --git a/packages/imperative/__tests__/src/example_clis/with_profiles/__integration__/__scripts__/set_default_profile.sh b/packages/imperative/__tests__/src/example_clis/with_profiles/__integration__/__scripts__/set_default_profile.sh new file mode 100644 index 0000000000..c7a3d6c98e --- /dev/null +++ b/packages/imperative/__tests__/src/example_clis/with_profiles/__integration__/__scripts__/set_default_profile.sh @@ -0,0 +1,16 @@ +#!/bin/sh + +profileType=${1:?"First parm (profileType) is required."} +defaultProfName=${2:?"First parm (defaultProfName) is required."} + +# include exitOnFailure function +myScriptDir=`dirname $0` +. $myScriptDir/exitOnFailure.sh + +# This script expects that pre-existing profiles have already been copied to the test directory +mv profiles/$profileType/${profileType}_meta.yaml profiles/$profileType/${profileType}_meta_orig.yaml +exitOnFailure "Failed to backup '$profileType' meta file." $? + +sed -e "s/defaultProfile:.*/defaultProfile: $defaultProfName/" \ + < profiles/$profileType/${profileType}_meta_orig.yaml > profiles/$profileType/${profileType}_meta.yaml +exitOnFailure "Failed to set default profile to '$defaultProfName' for type '$profileType'." $? From 40f48685c381e52d22e5f59b87f77e74393c7a8a Mon Sep 17 00:00:00 2001 From: Gene Johnston Date: Thu, 21 Dec 2023 17:10:17 -0500 Subject: [PATCH 040/138] create.secured-profile subtest was removed, so don't require it Signed-off-by: Gene Johnston --- __tests__/__integration__/imperative.secure.integration.test.ts | 1 - 1 file changed, 1 deletion(-) diff --git a/__tests__/__integration__/imperative.secure.integration.test.ts b/__tests__/__integration__/imperative.secure.integration.test.ts index 08852c13f1..19393d71ce 100644 --- a/__tests__/__integration__/imperative.secure.integration.test.ts +++ b/__tests__/__integration__/imperative.secure.integration.test.ts @@ -22,7 +22,6 @@ describe("Imperative Secure Tests", () => { require("./../../packages/imperative/__tests__/__integration__/imperative/__tests__/__integration__/cli/config/profiles/cli.imperative-test-cli.config.profiles.integration.subtest"); require("./../../packages/imperative/__tests__/__integration__/imperative/__tests__/__integration__/cli/config/secure/cli.imperative-test-cli.config.secure.integration.subtest"); require("./../../packages/imperative/__tests__/__integration__/imperative/__tests__/__integration__/cli/config/set/cli.imperative-test-cli.config.set.integration.subtest"); - require("./../../packages/imperative/__tests__/__integration__/imperative/__tests__/__integration__/cli/profiles/cli.imperative-test-cli.profiles.create.secured-profile.integration.subtest"); require("./../../packages/imperative/__tests__/__integration__/imperative/__tests__/__integration__/cli/test/cli.imperative-test-cli.test.config-auto-store.integration.subtest"); require("./../../packages/imperative/__tests__/__integration__/imperative/__tests__/__integration__/cli/test/cli.imperative-test-cli.test.config-override.integration.subtest"); }); From db1499beb1294da3c1cc42a2dcf7104cee9ab81c Mon Sep 17 00:00:00 2001 From: Timothy Johnson Date: Tue, 2 Jan 2024 13:16:59 -0500 Subject: [PATCH 041/138] Add workflow that adds PRs to GH project with In Progress status Signed-off-by: Timothy Johnson --- .github/workflows/update-project.yml | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) create mode 100644 .github/workflows/update-project.yml diff --git a/.github/workflows/update-project.yml b/.github/workflows/update-project.yml new file mode 100644 index 0000000000..7387d48ea2 --- /dev/null +++ b/.github/workflows/update-project.yml @@ -0,0 +1,25 @@ +name: Update GitHub project + +on: + pull_request: + types: + - opened + +jobs: + update-project: + name: Add PR to project + runs-on: ubuntu-latest + steps: + - uses: actions/add-to-project@v0.5.0 + id: add-to-project + with: + project-url: https://github.com/orgs/zowe/projects/21 + github-token: ${{ secrets.ZOWE_ROBOT_TOKEN }} + + - uses: titoportas/update-project-fields@v0.1.0 + with: + project-url: https://github.com/orgs/zowe/projects/21 + github-token: ${{ secrets.ZOWE_ROBOT_TOKEN }} + item-id: ${{ steps.add-to-project.outputs.itemId }} + field-keys: Status + field-values: In Progress From f22b00182ad8cfc88d77c666b9f121c07cec873c Mon Sep 17 00:00:00 2001 From: "Andrew W. Harn" Date: Tue, 2 Jan 2024 14:33:26 -0500 Subject: [PATCH 042/138] Update ssh2 (v2) Signed-off-by: Andrew W. Harn --- npm-shrinkwrap.json | 72 ++++++++++++++++++------------------ packages/zosuss/CHANGELOG.md | 5 +++ packages/zosuss/package.json | 2 +- 3 files changed, 42 insertions(+), 37 deletions(-) diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json index fc11dc3409..e06a99a206 100644 --- a/npm-shrinkwrap.json +++ b/npm-shrinkwrap.json @@ -9897,9 +9897,9 @@ "dev": true }, "node_modules/buildcheck": { - "version": "0.0.3", - "resolved": "https://registry.npmjs.org/buildcheck/-/buildcheck-0.0.3.tgz", - "integrity": "sha512-pziaA+p/wdVImfcbsZLNF32EiWyujlQLwolMqUQE8xpKNOH7KmZQaY8sXN7DGOEzPAElo9QTaeNRfGnf3iOJbA==", + "version": "0.0.6", + "resolved": "https://registry.npmjs.org/buildcheck/-/buildcheck-0.0.6.tgz", + "integrity": "sha512-8f9ZJCUXyT1M35Jx7MkBgmBMo3oHTTBIPLiY9xyL0pl3T5RwcPEY8cUHr5LBNfu/fk6c2T4DJZuVM/8ZZT2D2A==", "optional": true, "engines": { "node": ">=10.0.0" @@ -11529,14 +11529,14 @@ } }, "node_modules/cpu-features": { - "version": "0.0.4", - "resolved": "https://registry.npmjs.org/cpu-features/-/cpu-features-0.0.4.tgz", - "integrity": "sha512-fKiZ/zp1mUwQbnzb9IghXtHtDoTMtNeb8oYGx6kX2SYfhnG0HNdBEBIzB9b5KlXu5DQPhfy3mInbBxFcgwAr3A==", + "version": "0.0.9", + "resolved": "https://registry.npmjs.org/cpu-features/-/cpu-features-0.0.9.tgz", + "integrity": "sha512-AKjgn2rP2yJyfbepsmLfiYcmtNn/2eUvocUyM/09yB0YDiz39HteK/5/T4Onf0pmdYDMgkBoGvRLvEguzyL7wQ==", "hasInstallScript": true, "optional": true, "dependencies": { - "buildcheck": "0.0.3", - "nan": "^2.15.0" + "buildcheck": "~0.0.6", + "nan": "^2.17.0" }, "engines": { "node": ">=10.0.0" @@ -18692,9 +18692,9 @@ "integrity": "sha512-nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA==" }, "node_modules/nan": { - "version": "2.17.0", - "resolved": "https://registry.npmjs.org/nan/-/nan-2.17.0.tgz", - "integrity": "sha512-2ZTgtl0nJsO0KQCjEpxcIr5D+Yv90plTitZt9JBfQvVJDS5seMl3FOvsh3+9CoYWXf/1l5OaZzzF6nDm4cagaQ==", + "version": "2.18.0", + "resolved": "https://registry.npmjs.org/nan/-/nan-2.18.0.tgz", + "integrity": "sha512-W7tfG7vMOGtD30sHoZSSc/JVYiyDPEyQVso/Zz+/uQd0B0L46gtC+pHha5FFMRpil6fm/AoEcRWyOVi4+E/f8w==", "optional": true }, "node_modules/nanoid": { @@ -22784,20 +22784,20 @@ "integrity": "sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw=" }, "node_modules/ssh2": { - "version": "1.11.0", - "resolved": "https://registry.npmjs.org/ssh2/-/ssh2-1.11.0.tgz", - "integrity": "sha512-nfg0wZWGSsfUe/IBJkXVll3PEZ//YH2guww+mP88gTpuSU4FtZN7zu9JoeTGOyCNx2dTDtT9fOpWwlzyj4uOOw==", + "version": "1.15.0", + "resolved": "https://registry.npmjs.org/ssh2/-/ssh2-1.15.0.tgz", + "integrity": "sha512-C0PHgX4h6lBxYx7hcXwu3QWdh4tg6tZZsTfXcdvc5caW/EMxaB4H9dWsl7qk+F7LAW762hp8VbXOX7x4xUYvEw==", "hasInstallScript": true, "dependencies": { - "asn1": "^0.2.4", + "asn1": "^0.2.6", "bcrypt-pbkdf": "^1.0.2" }, "engines": { "node": ">=10.16.0" }, "optionalDependencies": { - "cpu-features": "~0.0.4", - "nan": "^2.16.0" + "cpu-features": "~0.0.9", + "nan": "^2.18.0" } }, "node_modules/ssri": { @@ -25295,7 +25295,7 @@ "version": "7.21.0", "license": "EPL-2.0", "dependencies": { - "ssh2": "1.11.0" + "ssh2": "1.15.0" }, "devDependencies": { "@types/ssh2": "^1.11.0", @@ -32382,7 +32382,7 @@ "@types/ssh2": "^1.11.0", "@zowe/cli-test-utils": "7.21.0", "@zowe/imperative": "5.20.0", - "ssh2": "1.11.0" + "ssh2": "1.15.0" } }, "@zowe/zos-workflows-for-zowe-sdk": { @@ -33421,9 +33421,9 @@ "dev": true }, "buildcheck": { - "version": "0.0.3", - "resolved": "https://registry.npmjs.org/buildcheck/-/buildcheck-0.0.3.tgz", - "integrity": "sha512-pziaA+p/wdVImfcbsZLNF32EiWyujlQLwolMqUQE8xpKNOH7KmZQaY8sXN7DGOEzPAElo9QTaeNRfGnf3iOJbA==", + "version": "0.0.6", + "resolved": "https://registry.npmjs.org/buildcheck/-/buildcheck-0.0.6.tgz", + "integrity": "sha512-8f9ZJCUXyT1M35Jx7MkBgmBMo3oHTTBIPLiY9xyL0pl3T5RwcPEY8cUHr5LBNfu/fk6c2T4DJZuVM/8ZZT2D2A==", "optional": true }, "builtins": { @@ -34684,13 +34684,13 @@ } }, "cpu-features": { - "version": "0.0.4", - "resolved": "https://registry.npmjs.org/cpu-features/-/cpu-features-0.0.4.tgz", - "integrity": "sha512-fKiZ/zp1mUwQbnzb9IghXtHtDoTMtNeb8oYGx6kX2SYfhnG0HNdBEBIzB9b5KlXu5DQPhfy3mInbBxFcgwAr3A==", + "version": "0.0.9", + "resolved": "https://registry.npmjs.org/cpu-features/-/cpu-features-0.0.9.tgz", + "integrity": "sha512-AKjgn2rP2yJyfbepsmLfiYcmtNn/2eUvocUyM/09yB0YDiz39HteK/5/T4Onf0pmdYDMgkBoGvRLvEguzyL7wQ==", "optional": true, "requires": { - "buildcheck": "0.0.3", - "nan": "^2.15.0" + "buildcheck": "~0.0.6", + "nan": "^2.17.0" } }, "create-jest": { @@ -40174,9 +40174,9 @@ "integrity": "sha512-nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA==" }, "nan": { - "version": "2.17.0", - "resolved": "https://registry.npmjs.org/nan/-/nan-2.17.0.tgz", - "integrity": "sha512-2ZTgtl0nJsO0KQCjEpxcIr5D+Yv90plTitZt9JBfQvVJDS5seMl3FOvsh3+9CoYWXf/1l5OaZzzF6nDm4cagaQ==", + "version": "2.18.0", + "resolved": "https://registry.npmjs.org/nan/-/nan-2.18.0.tgz", + "integrity": "sha512-W7tfG7vMOGtD30sHoZSSc/JVYiyDPEyQVso/Zz+/uQd0B0L46gtC+pHha5FFMRpil6fm/AoEcRWyOVi4+E/f8w==", "optional": true }, "nanoid": { @@ -43300,14 +43300,14 @@ "integrity": "sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw=" }, "ssh2": { - "version": "1.11.0", - "resolved": "https://registry.npmjs.org/ssh2/-/ssh2-1.11.0.tgz", - "integrity": "sha512-nfg0wZWGSsfUe/IBJkXVll3PEZ//YH2guww+mP88gTpuSU4FtZN7zu9JoeTGOyCNx2dTDtT9fOpWwlzyj4uOOw==", + "version": "1.15.0", + "resolved": "https://registry.npmjs.org/ssh2/-/ssh2-1.15.0.tgz", + "integrity": "sha512-C0PHgX4h6lBxYx7hcXwu3QWdh4tg6tZZsTfXcdvc5caW/EMxaB4H9dWsl7qk+F7LAW762hp8VbXOX7x4xUYvEw==", "requires": { - "asn1": "^0.2.4", + "asn1": "^0.2.6", "bcrypt-pbkdf": "^1.0.2", - "cpu-features": "~0.0.4", - "nan": "^2.16.0" + "cpu-features": "~0.0.9", + "nan": "^2.18.0" } }, "ssri": { diff --git a/packages/zosuss/CHANGELOG.md b/packages/zosuss/CHANGELOG.md index 9e953f4c51..79bbb74ca8 100644 --- a/packages/zosuss/CHANGELOG.md +++ b/packages/zosuss/CHANGELOG.md @@ -2,7 +2,12 @@ All notable changes to the Zowe z/OS USS SDK package will be documented in this file. +## Recent Changes + +- BugFix: Updated `ssh2` package to resolve technical currency + ## `7.18.2` + - BugFix: Updated `zowe zos-ssh issue cmd` to return just the command output in `stdout` instead of both the command and its output. [#1724](https://github.com/zowe/zowe-cli/issues/1724) ## `7.6.1` diff --git a/packages/zosuss/package.json b/packages/zosuss/package.json index fbe4c02c23..fd81f2dd4d 100644 --- a/packages/zosuss/package.json +++ b/packages/zosuss/package.json @@ -45,7 +45,7 @@ "prepack": "node ../../scripts/prepareLicenses.js" }, "dependencies": { - "ssh2": "1.11.0" + "ssh2": "1.15.0" }, "devDependencies": { "@types/ssh2": "^1.11.0", From 80f059e61b12d3afd43e20f07b0f7422f401cfb2 Mon Sep 17 00:00:00 2001 From: zowe-robot Date: Tue, 2 Jan 2024 21:07:48 +0000 Subject: [PATCH 043/138] Bump version to 7.21.1 [ci skip] Signed-off-by: zowe-robot --- lerna.json | 2 +- npm-shrinkwrap.json | 38 ++++++++++++++++----------------- packages/cli/package.json | 10 ++++----- packages/workflows/package.json | 4 ++-- packages/zosfiles/package.json | 4 ++-- packages/zosjobs/package.json | 4 ++-- packages/zosuss/CHANGELOG.md | 2 +- packages/zosuss/package.json | 2 +- 8 files changed, 33 insertions(+), 33 deletions(-) diff --git a/lerna.json b/lerna.json index 8069b0c093..a23ccb8265 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "7.21.0", + "version": "7.21.1", "command": { "publish": { "ignoreChanges": [ diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json index e06a99a206..8c2b660ee4 100644 --- a/npm-shrinkwrap.json +++ b/npm-shrinkwrap.json @@ -24704,7 +24704,7 @@ }, "packages/cli": { "name": "@zowe/cli", - "version": "7.21.0", + "version": "7.21.1", "hasInstallScript": true, "license": "EPL-2.0", "dependencies": { @@ -24712,12 +24712,12 @@ "@zowe/imperative": "5.20.0", "@zowe/provisioning-for-zowe-sdk": "7.21.0", "@zowe/zos-console-for-zowe-sdk": "7.21.0", - "@zowe/zos-files-for-zowe-sdk": "7.21.0", - "@zowe/zos-jobs-for-zowe-sdk": "7.21.0", + "@zowe/zos-files-for-zowe-sdk": "7.21.1", + "@zowe/zos-jobs-for-zowe-sdk": "7.21.1", "@zowe/zos-logs-for-zowe-sdk": "7.21.0", "@zowe/zos-tso-for-zowe-sdk": "7.21.0", - "@zowe/zos-uss-for-zowe-sdk": "7.21.0", - "@zowe/zos-workflows-for-zowe-sdk": "7.21.0", + "@zowe/zos-uss-for-zowe-sdk": "7.21.1", + "@zowe/zos-workflows-for-zowe-sdk": "7.21.1", "@zowe/zosmf-for-zowe-sdk": "7.21.0", "find-process": "1.4.7", "get-stream": "6.0.1", @@ -25161,10 +25161,10 @@ }, "packages/workflows": { "name": "@zowe/zos-workflows-for-zowe-sdk", - "version": "7.21.0", + "version": "7.21.1", "license": "EPL-2.0", "dependencies": { - "@zowe/zos-files-for-zowe-sdk": "7.21.0" + "@zowe/zos-files-for-zowe-sdk": "7.21.1" }, "devDependencies": { "@zowe/cli-test-utils": "7.21.0", @@ -25192,7 +25192,7 @@ }, "packages/zosfiles": { "name": "@zowe/zos-files-for-zowe-sdk", - "version": "7.21.0", + "version": "7.21.1", "license": "EPL-2.0", "dependencies": { "get-stream": "6.0.1", @@ -25202,7 +25202,7 @@ "@zowe/cli-test-utils": "7.21.0", "@zowe/core-for-zowe-sdk": "7.21.0", "@zowe/imperative": "5.20.0", - "@zowe/zos-uss-for-zowe-sdk": "7.21.0" + "@zowe/zos-uss-for-zowe-sdk": "7.21.1" }, "peerDependencies": { "@zowe/core-for-zowe-sdk": "^7.0.0", @@ -25230,10 +25230,10 @@ }, "packages/zosjobs": { "name": "@zowe/zos-jobs-for-zowe-sdk", - "version": "7.21.0", + "version": "7.21.1", "license": "EPL-2.0", "dependencies": { - "@zowe/zos-files-for-zowe-sdk": "7.21.0" + "@zowe/zos-files-for-zowe-sdk": "7.21.1" }, "devDependencies": { "@zowe/cli-test-utils": "7.21.0", @@ -25292,7 +25292,7 @@ }, "packages/zosuss": { "name": "@zowe/zos-uss-for-zowe-sdk", - "version": "7.21.0", + "version": "7.21.1", "license": "EPL-2.0", "dependencies": { "ssh2": "1.15.0" @@ -31980,12 +31980,12 @@ "@zowe/provisioning-for-zowe-sdk": "7.21.0", "@zowe/secrets-for-zowe-sdk": "7.18.6", "@zowe/zos-console-for-zowe-sdk": "7.21.0", - "@zowe/zos-files-for-zowe-sdk": "7.21.0", - "@zowe/zos-jobs-for-zowe-sdk": "7.21.0", + "@zowe/zos-files-for-zowe-sdk": "7.21.1", + "@zowe/zos-jobs-for-zowe-sdk": "7.21.1", "@zowe/zos-logs-for-zowe-sdk": "7.21.0", "@zowe/zos-tso-for-zowe-sdk": "7.21.0", - "@zowe/zos-uss-for-zowe-sdk": "7.21.0", - "@zowe/zos-workflows-for-zowe-sdk": "7.21.0", + "@zowe/zos-uss-for-zowe-sdk": "7.21.1", + "@zowe/zos-workflows-for-zowe-sdk": "7.21.1", "@zowe/zosmf-for-zowe-sdk": "7.21.0", "comment-json": "^4.1.1", "find-process": "1.4.7", @@ -32327,7 +32327,7 @@ "@zowe/cli-test-utils": "7.21.0", "@zowe/core-for-zowe-sdk": "7.21.0", "@zowe/imperative": "5.20.0", - "@zowe/zos-uss-for-zowe-sdk": "7.21.0", + "@zowe/zos-uss-for-zowe-sdk": "7.21.1", "get-stream": "6.0.1", "minimatch": "5.0.1" }, @@ -32356,7 +32356,7 @@ "@zowe/cli-test-utils": "7.21.0", "@zowe/core-for-zowe-sdk": "7.21.0", "@zowe/imperative": "5.20.0", - "@zowe/zos-files-for-zowe-sdk": "7.21.0" + "@zowe/zos-files-for-zowe-sdk": "7.21.1" } }, "@zowe/zos-logs-for-zowe-sdk": { @@ -32391,7 +32391,7 @@ "@zowe/cli-test-utils": "7.21.0", "@zowe/core-for-zowe-sdk": "7.21.0", "@zowe/imperative": "5.20.0", - "@zowe/zos-files-for-zowe-sdk": "7.21.0" + "@zowe/zos-files-for-zowe-sdk": "7.21.1" } }, "@zowe/zosmf-for-zowe-sdk": { diff --git a/packages/cli/package.json b/packages/cli/package.json index 456eebf130..cebd0ec9cb 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -1,6 +1,6 @@ { "name": "@zowe/cli", - "version": "7.21.0", + "version": "7.21.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.20.0", "@zowe/provisioning-for-zowe-sdk": "7.21.0", "@zowe/zos-console-for-zowe-sdk": "7.21.0", - "@zowe/zos-files-for-zowe-sdk": "7.21.0", - "@zowe/zos-jobs-for-zowe-sdk": "7.21.0", + "@zowe/zos-files-for-zowe-sdk": "7.21.1", + "@zowe/zos-jobs-for-zowe-sdk": "7.21.1", "@zowe/zos-logs-for-zowe-sdk": "7.21.0", "@zowe/zos-tso-for-zowe-sdk": "7.21.0", - "@zowe/zos-uss-for-zowe-sdk": "7.21.0", - "@zowe/zos-workflows-for-zowe-sdk": "7.21.0", + "@zowe/zos-uss-for-zowe-sdk": "7.21.1", + "@zowe/zos-workflows-for-zowe-sdk": "7.21.1", "@zowe/zosmf-for-zowe-sdk": "7.21.0", "find-process": "1.4.7", "get-stream": "6.0.1", diff --git a/packages/workflows/package.json b/packages/workflows/package.json index 4c58886043..de9adca877 100644 --- a/packages/workflows/package.json +++ b/packages/workflows/package.json @@ -1,6 +1,6 @@ { "name": "@zowe/zos-workflows-for-zowe-sdk", - "version": "7.21.0", + "version": "7.21.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.21.0" + "@zowe/zos-files-for-zowe-sdk": "7.21.1" }, "devDependencies": { "@zowe/cli-test-utils": "7.21.0", diff --git a/packages/zosfiles/package.json b/packages/zosfiles/package.json index b756d390a4..3bdf0a92d4 100644 --- a/packages/zosfiles/package.json +++ b/packages/zosfiles/package.json @@ -1,6 +1,6 @@ { "name": "@zowe/zos-files-for-zowe-sdk", - "version": "7.21.0", + "version": "7.21.1", "description": "Zowe SDK to interact with files and data sets on z/OS", "author": "Zowe", "license": "EPL-2.0", @@ -53,7 +53,7 @@ "@zowe/cli-test-utils": "7.21.0", "@zowe/core-for-zowe-sdk": "7.21.0", "@zowe/imperative": "5.20.0", - "@zowe/zos-uss-for-zowe-sdk": "7.21.0" + "@zowe/zos-uss-for-zowe-sdk": "7.21.1" }, "peerDependencies": { "@zowe/core-for-zowe-sdk": "^7.0.0", diff --git a/packages/zosjobs/package.json b/packages/zosjobs/package.json index dcb3e701cd..ecb05fd2ad 100644 --- a/packages/zosjobs/package.json +++ b/packages/zosjobs/package.json @@ -1,6 +1,6 @@ { "name": "@zowe/zos-jobs-for-zowe-sdk", - "version": "7.21.0", + "version": "7.21.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.21.0" + "@zowe/zos-files-for-zowe-sdk": "7.21.1" }, "devDependencies": { "@zowe/cli-test-utils": "7.21.0", diff --git a/packages/zosuss/CHANGELOG.md b/packages/zosuss/CHANGELOG.md index 79bbb74ca8..f8928621e4 100644 --- a/packages/zosuss/CHANGELOG.md +++ b/packages/zosuss/CHANGELOG.md @@ -2,7 +2,7 @@ All notable changes to the Zowe z/OS USS SDK package will be documented in this file. -## Recent Changes +## `7.21.1` - BugFix: Updated `ssh2` package to resolve technical currency diff --git a/packages/zosuss/package.json b/packages/zosuss/package.json index fd81f2dd4d..fff4c9f297 100644 --- a/packages/zosuss/package.json +++ b/packages/zosuss/package.json @@ -1,6 +1,6 @@ { "name": "@zowe/zos-uss-for-zowe-sdk", - "version": "7.21.0", + "version": "7.21.1", "description": "Zowe SDK to interact with USS on z/OS", "author": "Zowe", "license": "EPL-2.0", From 33ca0873eaa8b96d10f4b6da50053c5276f5ee1f Mon Sep 17 00:00:00 2001 From: Gene Johnston Date: Tue, 2 Jan 2024 17:50:42 -0500 Subject: [PATCH 044/138] Replace profile commands with config init, config list, and config set Signed-off-by: Gene Johnston --- .../imperative/plugins/suites/UsingPlugins.ts | 53 ++++++++++--------- .../lib/sample-plugin/cmd/foo/foo.handler.js | 6 +-- 2 files changed, 29 insertions(+), 30 deletions(-) diff --git a/packages/imperative/__tests__/src/packages/imperative/plugins/suites/UsingPlugins.ts b/packages/imperative/__tests__/src/packages/imperative/plugins/suites/UsingPlugins.ts index a83a30019f..f90a5a3cd2 100644 --- a/packages/imperative/__tests__/src/packages/imperative/plugins/suites/UsingPlugins.ts +++ b/packages/imperative/__tests__/src/packages/imperative/plugins/suites/UsingPlugins.ts @@ -30,12 +30,6 @@ describe("Using a Plugin", () => { */ const pluginJsonFile = join(config.defaultHome, "plugins", "plugins.json"); - /** - * Location of the profiles created for test plugins - * @type {string} - */ - const pluginProfDir = join(config.defaultHome, "profiles"); - /** * Specifies whether warnings about missing peer dependencies should be * expected in stderr output of `npm install`. This defaults to true and is @@ -51,7 +45,6 @@ describe("Using a Plugin", () => { beforeEach(() => { // ensure that each test starts with no installed plugins T.rimraf(pluginJsonFile); - T.rimraf(pluginProfDir); }); it("should create plugin commands from in-line JSON text", () => { @@ -138,30 +131,32 @@ describe("Using a Plugin", () => { expect(result.stdout).toContain("globcmd1 First command created by globs"); expect(result.stdout).toContain("globcmd2 Second command created by globs"); - cmd = "profiles list"; + cmd = "config init --global-config"; result = T.executeTestCLICommand(cliBin, this, cmd.split(" ")); expect(result.stderr).toBe(""); - expect(result.stdout).toContain("bar-profiles | bar"); - expect(result.stdout).toContain("foo-profiles | foo"); + expect(result.stdout).toContain(`Saved config template to ${config.defaultHome}`); + expect(result.stdout).toContain("plugins_test.config.json"); + + cmd = "config list"; + result = T.executeTestCLICommand(cliBin, this, cmd.split(" ")); + expect(result.stderr).toBe(""); + expect(result.stdout).toContain("foo:"); + expect(result.stdout).toContain("type: foo"); + expect(result.stdout).toContain("bar:"); + expect(result.stdout).toContain("type: bar"); cmd = pluginName + " foo"; result = T.executeTestCLICommand(cliBin, this, cmd.split(" ")); - expect(result.stderr).toContain("Command Preparation Failed:"); - expect(result.stderr).toContain("No default profile set for type \"foo\""); + expect(result.stderr).toBe(""); + expect(result.stdout).toContain("You executed the Foo command with size = undefined and duration = undefined"); - cmd = "profiles create foo myFooProfile --duration 5"; + cmd = "config set profiles.foo.properties.size small --global-config"; result = T.executeTestCLICommand(cliBin, this, cmd.split(" ")); - expect(result.stderr).toContain("command 'profiles create' is deprecated"); - expect(result.stdout).toContain("Profile created successfully!"); - expect(result.stdout.replace(/\s+/g, " ")).toContain("size: small"); - expect(result.stdout.replace(/\s+/g, " ")).toContain("duration: 5"); + expect(result.stderr).toBe(""); - cmd = "profiles validate foo-profile"; + cmd = "config set profiles.foo.properties.duration 5 --global-config"; result = T.executeTestCLICommand(cliBin, this, cmd.split(" ")); - expect(result.stderr).toContain("command 'profiles validate' is deprecated"); - expect(result.stdout).toContain("Check the size of the Foo"); - expect(result.stdout).toContain("Repair in time"); - expect(result.stdout).toContain("Of 2 tests, 2 succeeded, 0 failed, and 0 had warnings or undetermined results."); + expect(result.stderr).toBe(""); cmd = pluginName + " foo"; result = T.executeTestCLICommand(cliBin, this, cmd.split(" ")); @@ -297,12 +292,18 @@ describe("Using a Plugin", () => { const knownOverridePluginNm = CredentialManagerOverride.getKnownCredMgrs()[1].credMgrDisplayName as string; setCredMgrOverride(knownOverridePluginNm); - // Create a zosmf profile. That will trigger the CredMgr. - cmd = "profiles create secure-pass-profile TestProfileName --password 'AnyPass' --overwrite"; + /* config init will add the secure-pass profile for the newly installed override-plugin. + * It will also trigger the CredMgr. + */ + cmd = "config init --global-config"; result = T.executeTestCLICommand(cliBin, this, cmd.split(" ")); - expect(result.stderr).toContain("command 'profiles create' is deprecated"); + expect(result.stderr).toBe(""); expect(result.stdout).toContain("CredentialManager in sample-plugin is saving these creds:"); - expect(result.stdout).toContain(`password: managed by ${knownOverridePluginNm}`); + expect(result.stdout).toContain("service = plugins_test"); + expect(result.stdout).toContain("account = secure_config_props"); + expect(result.stdout).toContain("credentials = "); + expect(result.stdout).toContain(`Saved config template to ${config.defaultHome}`); + expect(result.stdout).toContain("plugins_test.config.json"); // Restore our name and remove our lifecycle class from package.json pkgContents = fsExtra.readJsonSync(pkgFileNm); diff --git a/packages/imperative/__tests__/src/packages/imperative/plugins/test_plugins/normal_plugin_3/lib/sample-plugin/cmd/foo/foo.handler.js b/packages/imperative/__tests__/src/packages/imperative/plugins/test_plugins/normal_plugin_3/lib/sample-plugin/cmd/foo/foo.handler.js index b5a3ca2d8e..5324183c38 100644 --- a/packages/imperative/__tests__/src/packages/imperative/plugins/test_plugins/normal_plugin_3/lib/sample-plugin/cmd/foo/foo.handler.js +++ b/packages/imperative/__tests__/src/packages/imperative/plugins/test_plugins/normal_plugin_3/lib/sample-plugin/cmd/foo/foo.handler.js @@ -8,15 +8,13 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge }); }; Object.defineProperty(exports, "__esModule", { value: true }); -// const imperative_cli_1 = require("imperative"); +const imperative_cli_1 = require("@zowe/imperative"); class FooHandler { process(params) { return __awaiter(this, void 0, void 0, function* () { - // const impFileLogger = imperative_cli_1.Logger.getImperativeLogger(); - const profile = params.profiles.get("foo"); + const profile = imperative_cli_1.ImperativeConfig.instance.config.api.profiles.get("foo"); const successMsg = "You executed the Foo command with size = " + profile.size + " and duration = " + profile.duration; - // impFileLogger.debug(successMsg); params.response.console.log(successMsg); }); } From 7ab146e1f212815d05b12d512b8fee29ce27c5cf Mon Sep 17 00:00:00 2001 From: Gene Johnston Date: Wed, 3 Jan 2024 12:51:28 -0500 Subject: [PATCH 045/138] Replace profile commands with pre-created profile files and keyring.setPassword Signed-off-by: Gene Johnston --- .../base/base_meta.yaml | 157 ++++++++++++++++++ .../profiles_secured_and_base/base/test.yaml | 1 + .../secured/secured_meta.yaml | 24 +++ .../secured/test.yaml | 2 + .../create_profiles_secured_and_base.sh | 10 -- .../__scripts__/delete_profiles.sh | 8 + .../delete_profiles_secured_and_base.sh | 16 -- .../delete_profiles_secured_and_base_noerr.sh | 7 - ...ig.convert-profiles.integration.subtest.ts | 38 +++-- 9 files changed, 218 insertions(+), 45 deletions(-) create mode 100644 packages/imperative/__tests__/__integration__/imperative/__tests__/__integration__/cli/config/__resources__/profiles_secured_and_base/base/base_meta.yaml create mode 100644 packages/imperative/__tests__/__integration__/imperative/__tests__/__integration__/cli/config/__resources__/profiles_secured_and_base/base/test.yaml create mode 100644 packages/imperative/__tests__/__integration__/imperative/__tests__/__integration__/cli/config/__resources__/profiles_secured_and_base/secured/secured_meta.yaml create mode 100644 packages/imperative/__tests__/__integration__/imperative/__tests__/__integration__/cli/config/__resources__/profiles_secured_and_base/secured/test.yaml delete mode 100644 packages/imperative/__tests__/__integration__/imperative/__tests__/__integration__/cli/config/convert-profiles/__scripts__/create_profiles_secured_and_base.sh create mode 100644 packages/imperative/__tests__/__integration__/imperative/__tests__/__integration__/cli/config/convert-profiles/__scripts__/delete_profiles.sh delete mode 100644 packages/imperative/__tests__/__integration__/imperative/__tests__/__integration__/cli/config/convert-profiles/__scripts__/delete_profiles_secured_and_base.sh delete mode 100644 packages/imperative/__tests__/__integration__/imperative/__tests__/__integration__/cli/config/convert-profiles/__scripts__/delete_profiles_secured_and_base_noerr.sh diff --git a/packages/imperative/__tests__/__integration__/imperative/__tests__/__integration__/cli/config/__resources__/profiles_secured_and_base/base/base_meta.yaml b/packages/imperative/__tests__/__integration__/imperative/__tests__/__integration__/cli/config/__resources__/profiles_secured_and_base/base/base_meta.yaml new file mode 100644 index 0000000000..40afa6c96b --- /dev/null +++ b/packages/imperative/__tests__/__integration__/imperative/__tests__/__integration__/cli/config/__resources__/profiles_secured_and_base/base/base_meta.yaml @@ -0,0 +1,157 @@ +defaultProfile: test +configuration: + type: base + schema: + type: object + title: 'Secure Profile' + description: 'Secure Profile' + properties: + info: + type: string + optionDefinition: + name: info + description: 'The info the keep in the profile.' + type: string + group: Options + aliases: [] + secret: + type: string + secure: true + includeInTemplate: true + optionDefinition: + name: secret + description: 'The secret info the keep in the profile.' + type: string + group: Options + aliases: [] + host: + type: string + optionDefinition: + name: host + description: 'Fruit host' + type: string + group: Options + aliases: [] + port: + type: number + optionDefinition: + name: port + description: 'Fruit port' + type: number + group: Options + aliases: [] + user: + type: string + optionDefinition: + name: user + description: 'Fruit username' + type: string + group: Options + aliases: [] + secure: true + password: + type: string + optionDefinition: + name: password + description: 'Fruit password' + type: string + group: Options + aliases: [] + secure: true + tokenType: + type: string + optionDefinition: + name: token-type + description: 'Fruit token type' + type: string + group: Options + aliases: [] + tokenValue: + type: string + optionDefinition: + name: token-value + description: 'Fruit token value' + type: string + group: Options + aliases: [] + secure: true + authConfig: + - + serviceName: fruit + handler: /home/stduser/repos/zowe-cli/packages/imperative/__tests__/__integration__/imperative/lib/cli/auth/FruitAuthHandler + login: + options: + - + name: info + description: 'The info the keep in the profile.' + type: string + group: Options + aliases: [] + - + name: secret + description: 'The secret info the keep in the profile.' + type: string + group: Options + aliases: [] + - + name: host + description: 'Fruit host' + type: string + group: Options + aliases: [] + - + name: port + description: 'Fruit port' + type: number + group: Options + aliases: [] + - + name: user + description: 'Fruit username' + type: string + group: Options + aliases: [] + - + name: password + description: 'Fruit password' + type: string + group: Options + aliases: [] + logout: + options: + - + name: info + description: 'The info the keep in the profile.' + type: string + group: Options + aliases: [] + - + name: secret + description: 'The secret info the keep in the profile.' + type: string + group: Options + aliases: [] + - + name: host + description: 'Fruit host' + type: string + group: Options + aliases: [] + - + name: port + description: 'Fruit port' + type: number + group: Options + aliases: [] + - + name: token-type + description: 'Fruit token type' + type: string + group: Options + aliases: [] + - + name: token-value + description: 'Fruit token value' + type: string + group: Options + aliases: [] diff --git a/packages/imperative/__tests__/__integration__/imperative/__tests__/__integration__/cli/config/__resources__/profiles_secured_and_base/base/test.yaml b/packages/imperative/__tests__/__integration__/imperative/__tests__/__integration__/cli/config/__resources__/profiles_secured_and_base/base/test.yaml new file mode 100644 index 0000000000..b5263a8558 --- /dev/null +++ b/packages/imperative/__tests__/__integration__/imperative/__tests__/__integration__/cli/config/__resources__/profiles_secured_and_base/base/test.yaml @@ -0,0 +1 @@ +host: example.com diff --git a/packages/imperative/__tests__/__integration__/imperative/__tests__/__integration__/cli/config/__resources__/profiles_secured_and_base/secured/secured_meta.yaml b/packages/imperative/__tests__/__integration__/imperative/__tests__/__integration__/cli/config/__resources__/profiles_secured_and_base/secured/secured_meta.yaml new file mode 100644 index 0000000000..d3cc574273 --- /dev/null +++ b/packages/imperative/__tests__/__integration__/imperative/__tests__/__integration__/cli/config/__resources__/profiles_secured_and_base/secured/secured_meta.yaml @@ -0,0 +1,24 @@ +defaultProfile: test +configuration: + type: secured + schema: + type: object + title: 'Test Secured Fields' + description: 'Test Secured Fields' + properties: + info: + type: string + includeInTemplate: true + optionDefinition: + name: info + description: 'The info the keep in the profile.' + type: string + required: true + secret: + type: string + secure: true + optionDefinition: + name: secret + description: 'The secret info the keep in the profile.' + type: string + required: true diff --git a/packages/imperative/__tests__/__integration__/imperative/__tests__/__integration__/cli/config/__resources__/profiles_secured_and_base/secured/test.yaml b/packages/imperative/__tests__/__integration__/imperative/__tests__/__integration__/cli/config/__resources__/profiles_secured_and_base/secured/test.yaml new file mode 100644 index 0000000000..2e7290be7d --- /dev/null +++ b/packages/imperative/__tests__/__integration__/imperative/__tests__/__integration__/cli/config/__resources__/profiles_secured_and_base/secured/test.yaml @@ -0,0 +1,2 @@ +info: hello +secret: 'managed by Imperative Package Test CLI' diff --git a/packages/imperative/__tests__/__integration__/imperative/__tests__/__integration__/cli/config/convert-profiles/__scripts__/create_profiles_secured_and_base.sh b/packages/imperative/__tests__/__integration__/imperative/__tests__/__integration__/cli/config/convert-profiles/__scripts__/create_profiles_secured_and_base.sh deleted file mode 100644 index c9428deec7..0000000000 --- a/packages/imperative/__tests__/__integration__/imperative/__tests__/__integration__/cli/config/convert-profiles/__scripts__/create_profiles_secured_and_base.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash - -imperative-test-cli profiles create secured test --info hello --secret world -if [ $? -gt 0 ] -then - exit $? -fi - -imperative-test-cli profiles create base test --host example.com -exit $? diff --git a/packages/imperative/__tests__/__integration__/imperative/__tests__/__integration__/cli/config/convert-profiles/__scripts__/delete_profiles.sh b/packages/imperative/__tests__/__integration__/imperative/__tests__/__integration__/cli/config/convert-profiles/__scripts__/delete_profiles.sh new file mode 100644 index 0000000000..baad2b2114 --- /dev/null +++ b/packages/imperative/__tests__/__integration__/imperative/__tests__/__integration__/cli/config/convert-profiles/__scripts__/delete_profiles.sh @@ -0,0 +1,8 @@ +#!/bin/sh + +# Delete all available profiles, but leave the profile type definitions +for profile in profiles/base/test.yaml profiles/secured/test.yaml profiles/v1profile/myv1profile.yaml; do + if [ -e $profile ]; then + rm $profile + fi +done diff --git a/packages/imperative/__tests__/__integration__/imperative/__tests__/__integration__/cli/config/convert-profiles/__scripts__/delete_profiles_secured_and_base.sh b/packages/imperative/__tests__/__integration__/imperative/__tests__/__integration__/cli/config/convert-profiles/__scripts__/delete_profiles_secured_and_base.sh deleted file mode 100644 index db09b2ab45..0000000000 --- a/packages/imperative/__tests__/__integration__/imperative/__tests__/__integration__/cli/config/convert-profiles/__scripts__/delete_profiles_secured_and_base.sh +++ /dev/null @@ -1,16 +0,0 @@ -#!/bin/bash - -imperative-test-cli profiles delete secured test -if [ $? -gt 0 ] -then - exit $? -fi - -imperative-test-cli profiles delete base test -if [ $? -gt 0 ] -then - exit $? -fi - -imperative-test-cli profiles delete v1profile myv1profile -exit $? diff --git a/packages/imperative/__tests__/__integration__/imperative/__tests__/__integration__/cli/config/convert-profiles/__scripts__/delete_profiles_secured_and_base_noerr.sh b/packages/imperative/__tests__/__integration__/imperative/__tests__/__integration__/cli/config/convert-profiles/__scripts__/delete_profiles_secured_and_base_noerr.sh deleted file mode 100644 index 8985bbed3f..0000000000 --- a/packages/imperative/__tests__/__integration__/imperative/__tests__/__integration__/cli/config/convert-profiles/__scripts__/delete_profiles_secured_and_base_noerr.sh +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/bash - -imperative-test-cli profiles delete secured test || true - -imperative-test-cli profiles delete base test || true - -imperative-test-cli profiles delete v1profile myv1profile || true diff --git a/packages/imperative/__tests__/__integration__/imperative/__tests__/__integration__/cli/config/convert-profiles/cli.imperative-test-cli.config.convert-profiles.integration.subtest.ts b/packages/imperative/__tests__/__integration__/imperative/__tests__/__integration__/cli/config/convert-profiles/cli.imperative-test-cli.config.convert-profiles.integration.subtest.ts index c849cc4f34..b6de408423 100644 --- a/packages/imperative/__tests__/__integration__/imperative/__tests__/__integration__/cli/config/convert-profiles/cli.imperative-test-cli.config.convert-profiles.integration.subtest.ts +++ b/packages/imperative/__tests__/__integration__/imperative/__tests__/__integration__/cli/config/convert-profiles/cli.imperative-test-cli.config.convert-profiles.integration.subtest.ts @@ -12,7 +12,7 @@ import * as fs from "fs"; import * as fsExtra from "fs-extra"; import * as path from "path"; -import { keyring as keytar } from "@zowe/secrets-for-zowe-sdk"; +import { keyring } from "@zowe/secrets-for-zowe-sdk"; import { ITestEnvironment } from "../../../../../../../__src__/environment/doc/response/ITestEnvironment"; import { SetupTestEnvironment } from "../../../../../../../__src__/environment/SetupTestEnvironment"; import { runCliScript } from "../../../../../../../src/TestUtil"; @@ -33,11 +33,14 @@ describe("imperative-test-cli config convert-profiles", () => { }); beforeEach(() => { - runCliScript(__dirname + "/__scripts__/create_profiles_secured_and_base.sh", TEST_ENVIRONMENT.workingDir); + fsExtra.copySync(__dirname + "/../../config/__resources__/profiles_secured_and_base", TEST_ENVIRONMENT.workingDir + "/profiles"); }); afterEach(() => { - runCliScript(__dirname + "/__scripts__/delete_profiles_secured_and_base_noerr.sh", TEST_ENVIRONMENT.workingDir); + const response = runCliScript(__dirname + "/__scripts__/delete_profiles.sh", TEST_ENVIRONMENT.workingDir); + expect(response.stdout.toString()).toEqual(""); + expect(response.stderr.toString()).toEqual(""); + if (fs.existsSync(configJsonPath)) { fs.unlinkSync(configJsonPath); } @@ -53,12 +56,17 @@ describe("imperative-test-cli config convert-profiles", () => { }); it("should convert profiles to team config", async () => { + // set a value in the secure vault that would have been created for the V1 secured profile + await keyring.setPassword("imperative-test-cli", "secured_test_secret", + Buffer.from('"world"').toString("base64") + ); + const response = runCliScript(__dirname + "/__scripts__/convert_profiles.sh", TEST_ENVIRONMENT.workingDir, ["y"]); - expect(response.status).toBe(0); + expect(response.stderr.toString()).toEqual(""); expect(response.stdout.toString()).toContain("Detected 2 old profile(s) to convert"); expect(response.stdout.toString()).toContain("Your new profiles have been saved"); expect(response.stdout.toString()).toContain("Your old profiles have been moved"); - expect(response.stderr.toString()).toEqual(""); + expect(response.status).toBe(0); // Check contents of config JSON const configJson = JSON.parse(fs.readFileSync(configJsonPath, "utf-8")); @@ -87,7 +95,7 @@ describe("imperative-test-cli config convert-profiles", () => { }); // Check secure credentials stored in vault - const securedValue = await keytar.getPassword("imperative-test-cli", "secure_config_props"); + const securedValue = await keyring.getPassword("imperative-test-cli", "secure_config_props"); const secureConfigProps = JSON.parse(Buffer.from(securedValue, "base64").toString()); expect(secureConfigProps).toMatchObject({ [configJsonPath]: { @@ -104,10 +112,13 @@ describe("imperative-test-cli config convert-profiles", () => { it("should convert v1 profile property names to v2 names", async () => { // we don't want the profiles created by beforeEach(). We only want an old profile. - runCliScript(__dirname + "/__scripts__/delete_profiles_secured_and_base_noerr.sh", TEST_ENVIRONMENT.workingDir); + let response = runCliScript(__dirname + "/__scripts__/delete_profiles.sh", TEST_ENVIRONMENT.workingDir); + expect(response.stdout.toString()).toEqual(""); + expect(response.stderr.toString()).toEqual(""); + fsExtra.copySync(__dirname + "/../../config/__resources__/profiles_with_v1_names", TEST_ENVIRONMENT.workingDir + "/profiles"); - const response = runCliScript(__dirname + "/__scripts__/convert_profiles.sh", TEST_ENVIRONMENT.workingDir, ["y"]); + response = runCliScript(__dirname + "/__scripts__/convert_profiles.sh", TEST_ENVIRONMENT.workingDir, ["y"]); expect(response.status).toBe(0); expect(response.stdout.toString()).toContain("Detected 1 old profile(s) to convert"); expect(response.stdout.toString()).toContain("Your new profiles have been saved"); @@ -142,17 +153,20 @@ describe("imperative-test-cli config convert-profiles", () => { describe("failure scenarios", () => { it("should not convert profiles if prompt is rejected", () => { const response = runCliScript(__dirname + "/__scripts__/convert_profiles.sh", TEST_ENVIRONMENT.workingDir, ["n"]); - expect(response.status).toBe(0); + expect(response.stderr.toString()).toEqual(""); expect(response.stdout.toString()).toContain("Detected 2 old profile(s) to convert"); expect(response.stdout.toString()).not.toContain("Your new profiles have been saved"); expect(response.stdout.toString()).not.toContain("Your old profiles have been moved"); - expect(response.stderr.toString()).toEqual(""); + expect(response.status).toBe(0); expect(fs.existsSync(configJsonPath)).toBe(false); }); it("should not delete profiles if prompt is rejected", () => { - runCliScript(__dirname + "/__scripts__/delete_profiles_secured_and_base.sh", TEST_ENVIRONMENT.workingDir); + // delete profiles previously created, but leave the profile type definitions + let response = runCliScript(__dirname + "/__scripts__/delete_profiles.sh", TEST_ENVIRONMENT.workingDir); + expect(response.stdout.toString()).toEqual(""); + expect(response.stderr.toString()).toEqual(""); - const response = runCliScript(__dirname + "/__scripts__/convert_profiles_delete.sh", TEST_ENVIRONMENT.workingDir, ["n"]); + response = runCliScript(__dirname + "/__scripts__/convert_profiles_delete.sh", TEST_ENVIRONMENT.workingDir, ["n"]); expect(response.status).toBe(0); expect(response.stdout.toString()).toContain("No old profiles were found"); expect(response.stdout.toString()).toContain("Are you sure you want to delete your v1 profiles?"); From ff1bec5e173e415c35388b5caf1a8ef6c2dbd7fa Mon Sep 17 00:00:00 2001 From: Timothy Johnson Date: Wed, 3 Jan 2024 15:02:04 -0500 Subject: [PATCH 046/138] Improve error message for null option definition Signed-off-by: Timothy Johnson --- packages/cli/CHANGELOG.md | 4 ++ ...create.workflowDs.integration.test.ts.snap | 6 +-- ...workflowLocalFile.integration.test.ts.snap | 6 +-- ...reate.workflowUss.integration.test.ts.snap | 6 +-- .../command/command_list_workflow.sh | 2 +- .../command/command_list_workflow.sh | 2 +- .../command/command_create_workflow_ds.sh | 4 +- .../command_create_workflow_local_file.sh | 4 +- .../command/command_create_workflow_uss.sh | 4 +- .../Dataset.definition.unit.test.ts.snap | 2 +- .../LocalFile.definition.unit.test.ts.snap | 2 +- .../UssFile.definition.unit.test.ts.snap | 2 +- .../workflows/create/Create.common.options.ts | 12 ++--- packages/imperative/CHANGELOG.md | 4 ++ .../__tests__/CommandPreparer.unit.test.ts | 6 +-- .../imperative/src/cmd/src/CommandPreparer.ts | 52 +++++++++---------- 16 files changed, 62 insertions(+), 56 deletions(-) diff --git a/packages/cli/CHANGELOG.md b/packages/cli/CHANGELOG.md index 7ec80fb818..258ed9eb09 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: Fixed typo in command help for `zowe workflows create workflow-from-data-set`. + ## `7.20.1` - BugFix: Add missing npm-shrinkwrap diff --git a/packages/cli/__tests__/workflows/__integration__/create/dataset/__snapshots__/cli.workflows.create.workflowDs.integration.test.ts.snap b/packages/cli/__tests__/workflows/__integration__/create/dataset/__snapshots__/cli.workflows.create.workflowDs.integration.test.ts.snap index acfdd3f3f0..2eeb06ba3a 100644 --- a/packages/cli/__tests__/workflows/__integration__/create/dataset/__snapshots__/cli.workflows.create.workflowDs.integration.test.ts.snap +++ b/packages/cli/__tests__/workflows/__integration__/create/dataset/__snapshots__/cli.workflows.create.workflowDs.integration.test.ts.snap @@ -30,7 +30,7 @@ exports[`Create workflow with data set integration test should display create wo --data-set | --ds (string) - Data set that contains a workflow definiton. + Data set that contains a workflow definition. --system-name | --sn (string) @@ -235,8 +235,8 @@ exports[`Create workflow with data set integration test should display create wo \\"success\\": true, \\"exitCode\\": 0, \\"message\\": \\"The help was constructed for command: workflow-from-data-set.\\", - \\"stdout\\": \\"\\\\n COMMAND NAME\\\\n ------------\\\\n\\\\n workflow-from-data-set | wfds\\\\n\\\\n DESCRIPTION\\\\n -----------\\\\n\\\\n Create a z/OSMF workflow on a z/OS system using a Data set\\\\n\\\\n USAGE\\\\n -----\\\\n\\\\n zowe zos-workflows create workflow-from-data-set [options]\\\\n\\\\n POSITIONAL ARGUMENTS\\\\n --------------------\\\\n\\\\n workflowName\\\\t\\\\t (string)\\\\n\\\\n Name of the workflow\\\\n\\\\n REQUIRED OPTIONS\\\\n ----------------\\\\n\\\\n --data-set | --ds (string)\\\\n\\\\n Data set that contains a workflow definiton.\\\\n\\\\n --system-name | --sn (string)\\\\n\\\\n z/OS system to execute the workflow.\\\\n\\\\n --owner | --ow (string)\\\\n\\\\n User ID of the workflow owner. This user can perform the workflow steps or\\\\n delegate the steps to other users.\\\\n\\\\n OPTIONS\\\\n -------\\\\n\\\\n --variables-input-file | --vif (string)\\\\n\\\\n Specifies an optional properties file that you can use to pre-specify values for\\\\n one or more of the variables that are defined in the workflow definition file.\\\\n\\\\n --variables | --vs (string)\\\\n\\\\n Includes a list of variables for the workflow. The variables that you specify\\\\n here take precedence over the variables that are specified in the workflow\\\\n variable input file. Make sure the value meets all regular expression\\\\n requirements set for the corresponding variable.\\\\n\\\\n --assign-to-owner | --ato (boolean)\\\\n\\\\n Indicates whether the workflow steps are assigned to the workflow owner.\\\\n\\\\n --access-type | --at (string)\\\\n\\\\n Specifies the access type for the workflow. Public, Restricted or Private.\\\\n\\\\n Allowed values: Public, Restricted, Private\\\\n\\\\n --delete-completed | --dc (boolean)\\\\n\\\\n Whether the successfully completed jobs to be deleted from the JES spool.\\\\n\\\\n --overwrite | --ov (boolean)\\\\n\\\\n Replaces an existing workflow with a new workflow.\\\\n\\\\n ZOSMF CONNECTION OPTIONS\\\\n ------------------------\\\\n\\\\n --host | -H (string)\\\\n\\\\n The z/OSMF server host name.\\\\n\\\\n --port | -P (number)\\\\n\\\\n The z/OSMF server port.\\\\n\\\\n Default value: 443\\\\n\\\\n --user | -u (string)\\\\n\\\\n Mainframe (z/OSMF) user name, which can be the same as your TSO login.\\\\n\\\\n --password | --pass | --pw (string)\\\\n\\\\n Mainframe (z/OSMF) password, which can be the same as your TSO password.\\\\n\\\\n --reject-unauthorized | --ru (boolean)\\\\n\\\\n Reject self-signed certificates.\\\\n\\\\n Default value: true\\\\n\\\\n --base-path | --bp (string)\\\\n\\\\n The base path for your API mediation layer instance. Specify this option to\\\\n prepend the base path to all z/OSMF resources when making REST requests. Do not\\\\n specify this option if you are not using an API mediation layer.\\\\n\\\\n --protocol (string)\\\\n\\\\n The protocol used (HTTP or HTTPS)\\\\n\\\\n Default value: https\\\\n Allowed values: http, https\\\\n\\\\n --cert-file (local file path)\\\\n\\\\n The file path to a certificate file to use for authentication\\\\n\\\\n --cert-key-file (local file path)\\\\n\\\\n The file path to a certificate key file to use for authentication\\\\n\\\\n PROFILE OPTIONS\\\\n ---------------\\\\n\\\\n --zosmf-profile | --zosmf-p (string)\\\\n\\\\n The name of a (zosmf) profile to load for this command execution.\\\\n\\\\n --base-profile | --base-p (string)\\\\n\\\\n The name of a (base) profile to load for this command execution.\\\\n\\\\n BASE CONNECTION OPTIONS\\\\n -----------------------\\\\n\\\\n --token-type | --tt (string)\\\\n\\\\n The type of token to get and use for the API. Omit this option to use the\\\\n default token type, which is provided by 'zowe auth login'.\\\\n\\\\n --token-value | --tv (string)\\\\n\\\\n The value of the token to pass to the API.\\\\n\\\\n RESPONSE FORMAT OPTIONS\\\\n -----------------------\\\\n\\\\n --response-format-filter | --rff (array)\\\\n\\\\n Filter (include) fields in the response. Accepts an array of field/property\\\\n names to include in the output response. You can filter JSON objects properties\\\\n OR table columns/fields. In addition, you can use this option in conjunction\\\\n with '--response-format-type' to reduce the output of a command to a single\\\\n field/property or a list of a single field/property.\\\\n\\\\n --response-format-type | --rft (string)\\\\n\\\\n The command response output format type. Must be one of the following:\\\\n\\\\n table: Formats output data as a table. Use this option when the output data is\\\\n an array of homogeneous JSON objects. Each property of the object will become a\\\\n column in the table.\\\\n\\\\n list: Formats output data as a list of strings. Can be used on any data type\\\\n (JSON objects/arrays) are stringified and a new line is added after each entry\\\\n in an array.\\\\n\\\\n object: Formats output data as a list of prettified objects (or single object).\\\\n Can be used in place of \\\\\\"table\\\\\\" to change from tabular output to a list of\\\\n prettified objects.\\\\n\\\\n string: Formats output data as a string. JSON objects/arrays are stringified.\\\\n\\\\n Allowed values: table, list, object, string\\\\n\\\\n --response-format-header | --rfh (boolean)\\\\n\\\\n If \\\\\\"--response-format-type table\\\\\\" is specified, include the column headers in\\\\n the output.\\\\n\\\\n GLOBAL OPTIONS\\\\n --------------\\\\n\\\\n --show-inputs-only (boolean)\\\\n\\\\n Show command inputs and do not run the command\\\\n\\\\n --response-format-json | --rfj (boolean)\\\\n\\\\n Produce JSON formatted data from a command\\\\n\\\\n --help | -h (boolean)\\\\n\\\\n Display help text\\\\n\\\\n --help-web | --hw (boolean)\\\\n\\\\n Display HTML help in browser\\\\n\\\\n EXAMPLES\\\\n --------\\\\n\\\\n - Create a workflow with name \\\\\\"testworkflow\\\\\\" using the data\\\\n set \\\\\\"TESTID.WKFLOW\\\\\\" that contains the workflow definition xml on the system\\\\n \\\\\\"TESTM1\\\\\\" with owner \\\\\\"OTHERID\\\\\\" and delete workflow with the same name if it\\\\n already exist in z/OSMF:\\\\n\\\\n $ zowe zos-workflows create workflow-from-data-set \\\\\\"testworkflow\\\\\\" --data-set \\\\\\"TESTID.WKFLOW\\\\\\" --system-name \\\\\\"TESTM1\\\\\\" --owner \\\\\\"OTHERID\\\\\\" --overwrite\\\\n\\\\n - Create a workflow with name \\\\\\"testworkflow\\\\\\" using data set\\\\n \\\\\\"TESTID.WKFLOW\\\\\\" containing workflow definition xml, on system \\\\\\"TESTM1\\\\\\" with\\\\n owner \\\\\\"MYSYSID\\\\\\" and delete succesfully completed jobs:\\\\n\\\\n $ zowe zos-workflows create workflow-from-data-set \\\\\\"testworkflow\\\\\\" --data-set \\\\\\"TESTID.WKFLOW\\\\\\" --system-name \\\\\\"TESTM1\\\\\\" --owner \\\\\\"MYSYSID\\\\\\" --delete-completed\\\\n\\\\n - Create a workflow with name \\\\\\"testworkflow\\\\\\" using data set\\\\n \\\\\\"TESTID.WKFLOW\\\\\\" containing workflow definition xml, on system \\\\\\"TESTM1\\\\\\" with\\\\n owner \\\\\\"MYSYSID\\\\\\" and with variable values in the member PROPERTIES of data set\\\\n TESTID.DATA:\\\\n\\\\n $ zowe zos-workflows create workflow-from-data-set \\\\\\"testworkflow\\\\\\" --data-set \\\\\\"TESTID.WKFLOW\\\\\\" --system-name \\\\\\"TESTM1\\\\\\" --owner \\\\\\"MYSYSID\\\\\\" --variables-input-file TESTID.DATA(PROPERTIES)\\\\n\\\\n - Create a workflow with name \\\\\\"testworkflow\\\\\\" using the data\\\\n set \\\\\\"TESTID.WKFLOW\\\\\\" that contains a workflow definition xml, on a system\\\\n \\\\\\"TESTM1\\\\\\" with owner \\\\\\"MYSYSID\\\\\\" and with the variable name DUMMYVAR and the value\\\\n DUMMYVAL. Assign it to the owner:\\\\n\\\\n $ zowe zos-workflows create workflow-from-data-set \\\\\\"testworkflow\\\\\\" --data-set \\\\\\"TESTID.WKFLOW\\\\\\" --system-name \\\\\\"TESTM1\\\\\\" --owner \\\\\\"MYSYSID\\\\\\" --variables DUMMYVAR=DUMMYVAL --assign-to-owner\\\\n\\\\n\\", + \\"stdout\\": \\"\\\\n COMMAND NAME\\\\n ------------\\\\n\\\\n workflow-from-data-set | wfds\\\\n\\\\n DESCRIPTION\\\\n -----------\\\\n\\\\n Create a z/OSMF workflow on a z/OS system using a Data set\\\\n\\\\n USAGE\\\\n -----\\\\n\\\\n zowe zos-workflows create workflow-from-data-set [options]\\\\n\\\\n POSITIONAL ARGUMENTS\\\\n --------------------\\\\n\\\\n workflowName\\\\t\\\\t (string)\\\\n\\\\n Name of the workflow\\\\n\\\\n REQUIRED OPTIONS\\\\n ----------------\\\\n\\\\n --data-set | --ds (string)\\\\n\\\\n Data set that contains a workflow definition.\\\\n\\\\n --system-name | --sn (string)\\\\n\\\\n z/OS system to execute the workflow.\\\\n\\\\n --owner | --ow (string)\\\\n\\\\n User ID of the workflow owner. This user can perform the workflow steps or\\\\n delegate the steps to other users.\\\\n\\\\n OPTIONS\\\\n -------\\\\n\\\\n --variables-input-file | --vif (string)\\\\n\\\\n Specifies an optional properties file that you can use to pre-specify values for\\\\n one or more of the variables that are defined in the workflow definition file.\\\\n\\\\n --variables | --vs (string)\\\\n\\\\n Includes a list of variables for the workflow. The variables that you specify\\\\n here take precedence over the variables that are specified in the workflow\\\\n variable input file. Make sure the value meets all regular expression\\\\n requirements set for the corresponding variable.\\\\n\\\\n --assign-to-owner | --ato (boolean)\\\\n\\\\n Indicates whether the workflow steps are assigned to the workflow owner.\\\\n\\\\n --access-type | --at (string)\\\\n\\\\n Specifies the access type for the workflow. Public, Restricted or Private.\\\\n\\\\n Allowed values: Public, Restricted, Private\\\\n\\\\n --delete-completed | --dc (boolean)\\\\n\\\\n Whether the successfully completed jobs to be deleted from the JES spool.\\\\n\\\\n --overwrite | --ov (boolean)\\\\n\\\\n Replaces an existing workflow with a new workflow.\\\\n\\\\n ZOSMF CONNECTION OPTIONS\\\\n ------------------------\\\\n\\\\n --host | -H (string)\\\\n\\\\n The z/OSMF server host name.\\\\n\\\\n --port | -P (number)\\\\n\\\\n The z/OSMF server port.\\\\n\\\\n Default value: 443\\\\n\\\\n --user | -u (string)\\\\n\\\\n Mainframe (z/OSMF) user name, which can be the same as your TSO login.\\\\n\\\\n --password | --pass | --pw (string)\\\\n\\\\n Mainframe (z/OSMF) password, which can be the same as your TSO password.\\\\n\\\\n --reject-unauthorized | --ru (boolean)\\\\n\\\\n Reject self-signed certificates.\\\\n\\\\n Default value: true\\\\n\\\\n --base-path | --bp (string)\\\\n\\\\n The base path for your API mediation layer instance. Specify this option to\\\\n prepend the base path to all z/OSMF resources when making REST requests. Do not\\\\n specify this option if you are not using an API mediation layer.\\\\n\\\\n --protocol (string)\\\\n\\\\n The protocol used (HTTP or HTTPS)\\\\n\\\\n Default value: https\\\\n Allowed values: http, https\\\\n\\\\n --cert-file (local file path)\\\\n\\\\n The file path to a certificate file to use for authentication\\\\n\\\\n --cert-key-file (local file path)\\\\n\\\\n The file path to a certificate key file to use for authentication\\\\n\\\\n PROFILE OPTIONS\\\\n ---------------\\\\n\\\\n --zosmf-profile | --zosmf-p (string)\\\\n\\\\n The name of a (zosmf) profile to load for this command execution.\\\\n\\\\n --base-profile | --base-p (string)\\\\n\\\\n The name of a (base) profile to load for this command execution.\\\\n\\\\n BASE CONNECTION OPTIONS\\\\n -----------------------\\\\n\\\\n --token-type | --tt (string)\\\\n\\\\n The type of token to get and use for the API. Omit this option to use the\\\\n default token type, which is provided by 'zowe auth login'.\\\\n\\\\n --token-value | --tv (string)\\\\n\\\\n The value of the token to pass to the API.\\\\n\\\\n RESPONSE FORMAT OPTIONS\\\\n -----------------------\\\\n\\\\n --response-format-filter | --rff (array)\\\\n\\\\n Filter (include) fields in the response. Accepts an array of field/property\\\\n names to include in the output response. You can filter JSON objects properties\\\\n OR table columns/fields. In addition, you can use this option in conjunction\\\\n with '--response-format-type' to reduce the output of a command to a single\\\\n field/property or a list of a single field/property.\\\\n\\\\n --response-format-type | --rft (string)\\\\n\\\\n The command response output format type. Must be one of the following:\\\\n\\\\n table: Formats output data as a table. Use this option when the output data is\\\\n an array of homogeneous JSON objects. Each property of the object will become a\\\\n column in the table.\\\\n\\\\n list: Formats output data as a list of strings. Can be used on any data type\\\\n (JSON objects/arrays) are stringified and a new line is added after each entry\\\\n in an array.\\\\n\\\\n object: Formats output data as a list of prettified objects (or single object).\\\\n Can be used in place of \\\\\\"table\\\\\\" to change from tabular output to a list of\\\\n prettified objects.\\\\n\\\\n string: Formats output data as a string. JSON objects/arrays are stringified.\\\\n\\\\n Allowed values: table, list, object, string\\\\n\\\\n --response-format-header | --rfh (boolean)\\\\n\\\\n If \\\\\\"--response-format-type table\\\\\\" is specified, include the column headers in\\\\n the output.\\\\n\\\\n GLOBAL OPTIONS\\\\n --------------\\\\n\\\\n --show-inputs-only (boolean)\\\\n\\\\n Show command inputs and do not run the command\\\\n\\\\n --response-format-json | --rfj (boolean)\\\\n\\\\n Produce JSON formatted data from a command\\\\n\\\\n --help | -h (boolean)\\\\n\\\\n Display help text\\\\n\\\\n --help-web | --hw (boolean)\\\\n\\\\n Display HTML help in browser\\\\n\\\\n EXAMPLES\\\\n --------\\\\n\\\\n - Create a workflow with name \\\\\\"testworkflow\\\\\\" using the data\\\\n set \\\\\\"TESTID.WKFLOW\\\\\\" that contains the workflow definition xml on the system\\\\n \\\\\\"TESTM1\\\\\\" with owner \\\\\\"OTHERID\\\\\\" and delete workflow with the same name if it\\\\n already exist in z/OSMF:\\\\n\\\\n $ zowe zos-workflows create workflow-from-data-set \\\\\\"testworkflow\\\\\\" --data-set \\\\\\"TESTID.WKFLOW\\\\\\" --system-name \\\\\\"TESTM1\\\\\\" --owner \\\\\\"OTHERID\\\\\\" --overwrite\\\\n\\\\n - Create a workflow with name \\\\\\"testworkflow\\\\\\" using data set\\\\n \\\\\\"TESTID.WKFLOW\\\\\\" containing workflow definition xml, on system \\\\\\"TESTM1\\\\\\" with\\\\n owner \\\\\\"MYSYSID\\\\\\" and delete succesfully completed jobs:\\\\n\\\\n $ zowe zos-workflows create workflow-from-data-set \\\\\\"testworkflow\\\\\\" --data-set \\\\\\"TESTID.WKFLOW\\\\\\" --system-name \\\\\\"TESTM1\\\\\\" --owner \\\\\\"MYSYSID\\\\\\" --delete-completed\\\\n\\\\n - Create a workflow with name \\\\\\"testworkflow\\\\\\" using data set\\\\n \\\\\\"TESTID.WKFLOW\\\\\\" containing workflow definition xml, on system \\\\\\"TESTM1\\\\\\" with\\\\n owner \\\\\\"MYSYSID\\\\\\" and with variable values in the member PROPERTIES of data set\\\\n TESTID.DATA:\\\\n\\\\n $ zowe zos-workflows create workflow-from-data-set \\\\\\"testworkflow\\\\\\" --data-set \\\\\\"TESTID.WKFLOW\\\\\\" --system-name \\\\\\"TESTM1\\\\\\" --owner \\\\\\"MYSYSID\\\\\\" --variables-input-file TESTID.DATA(PROPERTIES)\\\\n\\\\n - Create a workflow with name \\\\\\"testworkflow\\\\\\" using the data\\\\n set \\\\\\"TESTID.WKFLOW\\\\\\" that contains a workflow definition xml, on a system\\\\n \\\\\\"TESTM1\\\\\\" with owner \\\\\\"MYSYSID\\\\\\" and with the variable name DUMMYVAR and the value\\\\n DUMMYVAL. Assign it to the owner:\\\\n\\\\n $ zowe zos-workflows create workflow-from-data-set \\\\\\"testworkflow\\\\\\" --data-set \\\\\\"TESTID.WKFLOW\\\\\\" --system-name \\\\\\"TESTM1\\\\\\" --owner \\\\\\"MYSYSID\\\\\\" --variables DUMMYVAR=DUMMYVAL --assign-to-owner\\\\n\\\\n\\", \\"stderr\\": \\"\\", - \\"data\\": \\"\\\\n COMMAND NAME\\\\n ------------\\\\n\\\\n workflow-from-data-set | wfds\\\\n\\\\n DESCRIPTION\\\\n -----------\\\\n\\\\n Create a z/OSMF workflow on a z/OS system using a Data set\\\\n\\\\n USAGE\\\\n -----\\\\n\\\\n zowe zos-workflows create workflow-from-data-set [options]\\\\n\\\\n POSITIONAL ARGUMENTS\\\\n --------------------\\\\n\\\\n workflowName\\\\t\\\\t (string)\\\\n\\\\n Name of the workflow\\\\n\\\\n REQUIRED OPTIONS\\\\n ----------------\\\\n\\\\n --data-set | --ds (string)\\\\n\\\\n Data set that contains a workflow definiton.\\\\n\\\\n --system-name | --sn (string)\\\\n\\\\n z/OS system to execute the workflow.\\\\n\\\\n --owner | --ow (string)\\\\n\\\\n User ID of the workflow owner. This user can perform the workflow steps or\\\\n delegate the steps to other users.\\\\n\\\\n OPTIONS\\\\n -------\\\\n\\\\n --variables-input-file | --vif (string)\\\\n\\\\n Specifies an optional properties file that you can use to pre-specify values for\\\\n one or more of the variables that are defined in the workflow definition file.\\\\n\\\\n --variables | --vs (string)\\\\n\\\\n Includes a list of variables for the workflow. The variables that you specify\\\\n here take precedence over the variables that are specified in the workflow\\\\n variable input file. Make sure the value meets all regular expression\\\\n requirements set for the corresponding variable.\\\\n\\\\n --assign-to-owner | --ato (boolean)\\\\n\\\\n Indicates whether the workflow steps are assigned to the workflow owner.\\\\n\\\\n --access-type | --at (string)\\\\n\\\\n Specifies the access type for the workflow. Public, Restricted or Private.\\\\n\\\\n Allowed values: Public, Restricted, Private\\\\n\\\\n --delete-completed | --dc (boolean)\\\\n\\\\n Whether the successfully completed jobs to be deleted from the JES spool.\\\\n\\\\n --overwrite | --ov (boolean)\\\\n\\\\n Replaces an existing workflow with a new workflow.\\\\n\\\\n ZOSMF CONNECTION OPTIONS\\\\n ------------------------\\\\n\\\\n --host | -H (string)\\\\n\\\\n The z/OSMF server host name.\\\\n\\\\n --port | -P (number)\\\\n\\\\n The z/OSMF server port.\\\\n\\\\n Default value: 443\\\\n\\\\n --user | -u (string)\\\\n\\\\n Mainframe (z/OSMF) user name, which can be the same as your TSO login.\\\\n\\\\n --password | --pass | --pw (string)\\\\n\\\\n Mainframe (z/OSMF) password, which can be the same as your TSO password.\\\\n\\\\n --reject-unauthorized | --ru (boolean)\\\\n\\\\n Reject self-signed certificates.\\\\n\\\\n Default value: true\\\\n\\\\n --base-path | --bp (string)\\\\n\\\\n The base path for your API mediation layer instance. Specify this option to\\\\n prepend the base path to all z/OSMF resources when making REST requests. Do not\\\\n specify this option if you are not using an API mediation layer.\\\\n\\\\n --protocol (string)\\\\n\\\\n The protocol used (HTTP or HTTPS)\\\\n\\\\n Default value: https\\\\n Allowed values: http, https\\\\n\\\\n --cert-file (local file path)\\\\n\\\\n The file path to a certificate file to use for authentication\\\\n\\\\n --cert-key-file (local file path)\\\\n\\\\n The file path to a certificate key file to use for authentication\\\\n\\\\n PROFILE OPTIONS\\\\n ---------------\\\\n\\\\n --zosmf-profile | --zosmf-p (string)\\\\n\\\\n The name of a (zosmf) profile to load for this command execution.\\\\n\\\\n --base-profile | --base-p (string)\\\\n\\\\n The name of a (base) profile to load for this command execution.\\\\n\\\\n BASE CONNECTION OPTIONS\\\\n -----------------------\\\\n\\\\n --token-type | --tt (string)\\\\n\\\\n The type of token to get and use for the API. Omit this option to use the\\\\n default token type, which is provided by 'zowe auth login'.\\\\n\\\\n --token-value | --tv (string)\\\\n\\\\n The value of the token to pass to the API.\\\\n\\\\n RESPONSE FORMAT OPTIONS\\\\n -----------------------\\\\n\\\\n --response-format-filter | --rff (array)\\\\n\\\\n Filter (include) fields in the response. Accepts an array of field/property\\\\n names to include in the output response. You can filter JSON objects properties\\\\n OR table columns/fields. In addition, you can use this option in conjunction\\\\n with '--response-format-type' to reduce the output of a command to a single\\\\n field/property or a list of a single field/property.\\\\n\\\\n --response-format-type | --rft (string)\\\\n\\\\n The command response output format type. Must be one of the following:\\\\n\\\\n table: Formats output data as a table. Use this option when the output data is\\\\n an array of homogeneous JSON objects. Each property of the object will become a\\\\n column in the table.\\\\n\\\\n list: Formats output data as a list of strings. Can be used on any data type\\\\n (JSON objects/arrays) are stringified and a new line is added after each entry\\\\n in an array.\\\\n\\\\n object: Formats output data as a list of prettified objects (or single object).\\\\n Can be used in place of \\\\\\"table\\\\\\" to change from tabular output to a list of\\\\n prettified objects.\\\\n\\\\n string: Formats output data as a string. JSON objects/arrays are stringified.\\\\n\\\\n Allowed values: table, list, object, string\\\\n\\\\n --response-format-header | --rfh (boolean)\\\\n\\\\n If \\\\\\"--response-format-type table\\\\\\" is specified, include the column headers in\\\\n the output.\\\\n\\\\n GLOBAL OPTIONS\\\\n --------------\\\\n\\\\n --show-inputs-only (boolean)\\\\n\\\\n Show command inputs and do not run the command\\\\n\\\\n --response-format-json | --rfj (boolean)\\\\n\\\\n Produce JSON formatted data from a command\\\\n\\\\n --help | -h (boolean)\\\\n\\\\n Display help text\\\\n\\\\n --help-web | --hw (boolean)\\\\n\\\\n Display HTML help in browser\\\\n\\\\n EXAMPLES\\\\n --------\\\\n\\\\n - Create a workflow with name \\\\\\"testworkflow\\\\\\" using the data\\\\n set \\\\\\"TESTID.WKFLOW\\\\\\" that contains the workflow definition xml on the system\\\\n \\\\\\"TESTM1\\\\\\" with owner \\\\\\"OTHERID\\\\\\" and delete workflow with the same name if it\\\\n already exist in z/OSMF:\\\\n\\\\n $ zowe zos-workflows create workflow-from-data-set \\\\\\"testworkflow\\\\\\" --data-set \\\\\\"TESTID.WKFLOW\\\\\\" --system-name \\\\\\"TESTM1\\\\\\" --owner \\\\\\"OTHERID\\\\\\" --overwrite\\\\n\\\\n - Create a workflow with name \\\\\\"testworkflow\\\\\\" using data set\\\\n \\\\\\"TESTID.WKFLOW\\\\\\" containing workflow definition xml, on system \\\\\\"TESTM1\\\\\\" with\\\\n owner \\\\\\"MYSYSID\\\\\\" and delete succesfully completed jobs:\\\\n\\\\n $ zowe zos-workflows create workflow-from-data-set \\\\\\"testworkflow\\\\\\" --data-set \\\\\\"TESTID.WKFLOW\\\\\\" --system-name \\\\\\"TESTM1\\\\\\" --owner \\\\\\"MYSYSID\\\\\\" --delete-completed\\\\n\\\\n - Create a workflow with name \\\\\\"testworkflow\\\\\\" using data set\\\\n \\\\\\"TESTID.WKFLOW\\\\\\" containing workflow definition xml, on system \\\\\\"TESTM1\\\\\\" with\\\\n owner \\\\\\"MYSYSID\\\\\\" and with variable values in the member PROPERTIES of data set\\\\n TESTID.DATA:\\\\n\\\\n $ zowe zos-workflows create workflow-from-data-set \\\\\\"testworkflow\\\\\\" --data-set \\\\\\"TESTID.WKFLOW\\\\\\" --system-name \\\\\\"TESTM1\\\\\\" --owner \\\\\\"MYSYSID\\\\\\" --variables-input-file TESTID.DATA(PROPERTIES)\\\\n\\\\n - Create a workflow with name \\\\\\"testworkflow\\\\\\" using the data\\\\n set \\\\\\"TESTID.WKFLOW\\\\\\" that contains a workflow definition xml, on a system\\\\n \\\\\\"TESTM1\\\\\\" with owner \\\\\\"MYSYSID\\\\\\" and with the variable name DUMMYVAR and the value\\\\n DUMMYVAL. Assign it to the owner:\\\\n\\\\n $ zowe zos-workflows create workflow-from-data-set \\\\\\"testworkflow\\\\\\" --data-set \\\\\\"TESTID.WKFLOW\\\\\\" --system-name \\\\\\"TESTM1\\\\\\" --owner \\\\\\"MYSYSID\\\\\\" --variables DUMMYVAR=DUMMYVAL --assign-to-owner\\\\n\\\\n\\" + \\"data\\": \\"\\\\n COMMAND NAME\\\\n ------------\\\\n\\\\n workflow-from-data-set | wfds\\\\n\\\\n DESCRIPTION\\\\n -----------\\\\n\\\\n Create a z/OSMF workflow on a z/OS system using a Data set\\\\n\\\\n USAGE\\\\n -----\\\\n\\\\n zowe zos-workflows create workflow-from-data-set [options]\\\\n\\\\n POSITIONAL ARGUMENTS\\\\n --------------------\\\\n\\\\n workflowName\\\\t\\\\t (string)\\\\n\\\\n Name of the workflow\\\\n\\\\n REQUIRED OPTIONS\\\\n ----------------\\\\n\\\\n --data-set | --ds (string)\\\\n\\\\n Data set that contains a workflow definition.\\\\n\\\\n --system-name | --sn (string)\\\\n\\\\n z/OS system to execute the workflow.\\\\n\\\\n --owner | --ow (string)\\\\n\\\\n User ID of the workflow owner. This user can perform the workflow steps or\\\\n delegate the steps to other users.\\\\n\\\\n OPTIONS\\\\n -------\\\\n\\\\n --variables-input-file | --vif (string)\\\\n\\\\n Specifies an optional properties file that you can use to pre-specify values for\\\\n one or more of the variables that are defined in the workflow definition file.\\\\n\\\\n --variables | --vs (string)\\\\n\\\\n Includes a list of variables for the workflow. The variables that you specify\\\\n here take precedence over the variables that are specified in the workflow\\\\n variable input file. Make sure the value meets all regular expression\\\\n requirements set for the corresponding variable.\\\\n\\\\n --assign-to-owner | --ato (boolean)\\\\n\\\\n Indicates whether the workflow steps are assigned to the workflow owner.\\\\n\\\\n --access-type | --at (string)\\\\n\\\\n Specifies the access type for the workflow. Public, Restricted or Private.\\\\n\\\\n Allowed values: Public, Restricted, Private\\\\n\\\\n --delete-completed | --dc (boolean)\\\\n\\\\n Whether the successfully completed jobs to be deleted from the JES spool.\\\\n\\\\n --overwrite | --ov (boolean)\\\\n\\\\n Replaces an existing workflow with a new workflow.\\\\n\\\\n ZOSMF CONNECTION OPTIONS\\\\n ------------------------\\\\n\\\\n --host | -H (string)\\\\n\\\\n The z/OSMF server host name.\\\\n\\\\n --port | -P (number)\\\\n\\\\n The z/OSMF server port.\\\\n\\\\n Default value: 443\\\\n\\\\n --user | -u (string)\\\\n\\\\n Mainframe (z/OSMF) user name, which can be the same as your TSO login.\\\\n\\\\n --password | --pass | --pw (string)\\\\n\\\\n Mainframe (z/OSMF) password, which can be the same as your TSO password.\\\\n\\\\n --reject-unauthorized | --ru (boolean)\\\\n\\\\n Reject self-signed certificates.\\\\n\\\\n Default value: true\\\\n\\\\n --base-path | --bp (string)\\\\n\\\\n The base path for your API mediation layer instance. Specify this option to\\\\n prepend the base path to all z/OSMF resources when making REST requests. Do not\\\\n specify this option if you are not using an API mediation layer.\\\\n\\\\n --protocol (string)\\\\n\\\\n The protocol used (HTTP or HTTPS)\\\\n\\\\n Default value: https\\\\n Allowed values: http, https\\\\n\\\\n --cert-file (local file path)\\\\n\\\\n The file path to a certificate file to use for authentication\\\\n\\\\n --cert-key-file (local file path)\\\\n\\\\n The file path to a certificate key file to use for authentication\\\\n\\\\n PROFILE OPTIONS\\\\n ---------------\\\\n\\\\n --zosmf-profile | --zosmf-p (string)\\\\n\\\\n The name of a (zosmf) profile to load for this command execution.\\\\n\\\\n --base-profile | --base-p (string)\\\\n\\\\n The name of a (base) profile to load for this command execution.\\\\n\\\\n BASE CONNECTION OPTIONS\\\\n -----------------------\\\\n\\\\n --token-type | --tt (string)\\\\n\\\\n The type of token to get and use for the API. Omit this option to use the\\\\n default token type, which is provided by 'zowe auth login'.\\\\n\\\\n --token-value | --tv (string)\\\\n\\\\n The value of the token to pass to the API.\\\\n\\\\n RESPONSE FORMAT OPTIONS\\\\n -----------------------\\\\n\\\\n --response-format-filter | --rff (array)\\\\n\\\\n Filter (include) fields in the response. Accepts an array of field/property\\\\n names to include in the output response. You can filter JSON objects properties\\\\n OR table columns/fields. In addition, you can use this option in conjunction\\\\n with '--response-format-type' to reduce the output of a command to a single\\\\n field/property or a list of a single field/property.\\\\n\\\\n --response-format-type | --rft (string)\\\\n\\\\n The command response output format type. Must be one of the following:\\\\n\\\\n table: Formats output data as a table. Use this option when the output data is\\\\n an array of homogeneous JSON objects. Each property of the object will become a\\\\n column in the table.\\\\n\\\\n list: Formats output data as a list of strings. Can be used on any data type\\\\n (JSON objects/arrays) are stringified and a new line is added after each entry\\\\n in an array.\\\\n\\\\n object: Formats output data as a list of prettified objects (or single object).\\\\n Can be used in place of \\\\\\"table\\\\\\" to change from tabular output to a list of\\\\n prettified objects.\\\\n\\\\n string: Formats output data as a string. JSON objects/arrays are stringified.\\\\n\\\\n Allowed values: table, list, object, string\\\\n\\\\n --response-format-header | --rfh (boolean)\\\\n\\\\n If \\\\\\"--response-format-type table\\\\\\" is specified, include the column headers in\\\\n the output.\\\\n\\\\n GLOBAL OPTIONS\\\\n --------------\\\\n\\\\n --show-inputs-only (boolean)\\\\n\\\\n Show command inputs and do not run the command\\\\n\\\\n --response-format-json | --rfj (boolean)\\\\n\\\\n Produce JSON formatted data from a command\\\\n\\\\n --help | -h (boolean)\\\\n\\\\n Display help text\\\\n\\\\n --help-web | --hw (boolean)\\\\n\\\\n Display HTML help in browser\\\\n\\\\n EXAMPLES\\\\n --------\\\\n\\\\n - Create a workflow with name \\\\\\"testworkflow\\\\\\" using the data\\\\n set \\\\\\"TESTID.WKFLOW\\\\\\" that contains the workflow definition xml on the system\\\\n \\\\\\"TESTM1\\\\\\" with owner \\\\\\"OTHERID\\\\\\" and delete workflow with the same name if it\\\\n already exist in z/OSMF:\\\\n\\\\n $ zowe zos-workflows create workflow-from-data-set \\\\\\"testworkflow\\\\\\" --data-set \\\\\\"TESTID.WKFLOW\\\\\\" --system-name \\\\\\"TESTM1\\\\\\" --owner \\\\\\"OTHERID\\\\\\" --overwrite\\\\n\\\\n - Create a workflow with name \\\\\\"testworkflow\\\\\\" using data set\\\\n \\\\\\"TESTID.WKFLOW\\\\\\" containing workflow definition xml, on system \\\\\\"TESTM1\\\\\\" with\\\\n owner \\\\\\"MYSYSID\\\\\\" and delete succesfully completed jobs:\\\\n\\\\n $ zowe zos-workflows create workflow-from-data-set \\\\\\"testworkflow\\\\\\" --data-set \\\\\\"TESTID.WKFLOW\\\\\\" --system-name \\\\\\"TESTM1\\\\\\" --owner \\\\\\"MYSYSID\\\\\\" --delete-completed\\\\n\\\\n - Create a workflow with name \\\\\\"testworkflow\\\\\\" using data set\\\\n \\\\\\"TESTID.WKFLOW\\\\\\" containing workflow definition xml, on system \\\\\\"TESTM1\\\\\\" with\\\\n owner \\\\\\"MYSYSID\\\\\\" and with variable values in the member PROPERTIES of data set\\\\n TESTID.DATA:\\\\n\\\\n $ zowe zos-workflows create workflow-from-data-set \\\\\\"testworkflow\\\\\\" --data-set \\\\\\"TESTID.WKFLOW\\\\\\" --system-name \\\\\\"TESTM1\\\\\\" --owner \\\\\\"MYSYSID\\\\\\" --variables-input-file TESTID.DATA(PROPERTIES)\\\\n\\\\n - Create a workflow with name \\\\\\"testworkflow\\\\\\" using the data\\\\n set \\\\\\"TESTID.WKFLOW\\\\\\" that contains a workflow definition xml, on a system\\\\n \\\\\\"TESTM1\\\\\\" with owner \\\\\\"MYSYSID\\\\\\" and with the variable name DUMMYVAR and the value\\\\n DUMMYVAL. Assign it to the owner:\\\\n\\\\n $ zowe zos-workflows create workflow-from-data-set \\\\\\"testworkflow\\\\\\" --data-set \\\\\\"TESTID.WKFLOW\\\\\\" --system-name \\\\\\"TESTM1\\\\\\" --owner \\\\\\"MYSYSID\\\\\\" --variables DUMMYVAR=DUMMYVAL --assign-to-owner\\\\n\\\\n\\" }" `; diff --git a/packages/cli/__tests__/workflows/__integration__/create/localfile/__snapshots__/cli.workflows.create.workflowLocalFile.integration.test.ts.snap b/packages/cli/__tests__/workflows/__integration__/create/localfile/__snapshots__/cli.workflows.create.workflowLocalFile.integration.test.ts.snap index 46f8ea1177..fc93e84a0b 100644 --- a/packages/cli/__tests__/workflows/__integration__/create/localfile/__snapshots__/cli.workflows.create.workflowLocalFile.integration.test.ts.snap +++ b/packages/cli/__tests__/workflows/__integration__/create/localfile/__snapshots__/cli.workflows.create.workflowLocalFile.integration.test.ts.snap @@ -30,7 +30,7 @@ exports[`Create workflow with local file integration test should display create --local-file | --lf (string) - Local file that contains workflow definiton. + Local file that contains workflow definition. --system-name | --sn (string) @@ -227,8 +227,8 @@ exports[`Create workflow with local file integration test should display create \\"success\\": true, \\"exitCode\\": 0, \\"message\\": \\"The help was constructed for command: workflow-from-local-file.\\", - \\"stdout\\": \\"\\\\n COMMAND NAME\\\\n ------------\\\\n\\\\n workflow-from-local-file | wflf\\\\n\\\\n DESCRIPTION\\\\n -----------\\\\n\\\\n Create a z/OSMF workflow on a z/OS system using a Local file\\\\n\\\\n USAGE\\\\n -----\\\\n\\\\n zowe zos-workflows create workflow-from-local-file [options]\\\\n\\\\n POSITIONAL ARGUMENTS\\\\n --------------------\\\\n\\\\n workflowName\\\\t\\\\t (string)\\\\n\\\\n Name of the workflow\\\\n\\\\n REQUIRED OPTIONS\\\\n ----------------\\\\n\\\\n --local-file | --lf (string)\\\\n\\\\n Local file that contains workflow definiton.\\\\n\\\\n --system-name | --sn (string)\\\\n\\\\n z/OS system to execute the workflow.\\\\n\\\\n --owner | --ow (string)\\\\n\\\\n User ID of the workflow owner. This user can perform the workflow steps or\\\\n delegate the steps to other users.\\\\n\\\\n OPTIONS\\\\n -------\\\\n\\\\n --variables-input-file | --vif (string)\\\\n\\\\n Specifies an optional properties file that you can use to pre-specify values for\\\\n one or more of the variables that are defined in the workflow definition file.\\\\n\\\\n --variables | --vs (string)\\\\n\\\\n Includes a list of variables for the workflow. The variables that you specify\\\\n here take precedence over the variables that are specified in the workflow\\\\n variable input file. Make sure the value meets all regular expression\\\\n requirements set for the corresponding variable.\\\\n\\\\n --assign-to-owner | --ato (boolean)\\\\n\\\\n Indicates whether the workflow steps are assigned to the workflow owner.\\\\n\\\\n --access-type | --at (string)\\\\n\\\\n Specifies the access type for the workflow. Public, Restricted or Private.\\\\n\\\\n Allowed values: Public, Restricted, Private\\\\n\\\\n --delete-completed | --dc (boolean)\\\\n\\\\n Whether the successfully completed jobs to be deleted from the JES spool.\\\\n\\\\n --overwrite | --ov (boolean)\\\\n\\\\n Replaces an existing workflow with a new workflow.\\\\n\\\\n --remote-directory | --rd (string)\\\\n\\\\n The remote uss directory where the files are to be uploaded. The directory has\\\\n to exist\\\\n\\\\n --keep-files | --kf (boolean)\\\\n\\\\n Avoid deletion the uploaded files in /tmp or another specified directory after\\\\n successful execution.\\\\n\\\\n Default value: false\\\\n\\\\n ZOSMF CONNECTION OPTIONS\\\\n ------------------------\\\\n\\\\n --host | -H (string)\\\\n\\\\n The z/OSMF server host name.\\\\n\\\\n --port | -P (number)\\\\n\\\\n The z/OSMF server port.\\\\n\\\\n Default value: 443\\\\n\\\\n --user | -u (string)\\\\n\\\\n Mainframe (z/OSMF) user name, which can be the same as your TSO login.\\\\n\\\\n --password | --pass | --pw (string)\\\\n\\\\n Mainframe (z/OSMF) password, which can be the same as your TSO password.\\\\n\\\\n --reject-unauthorized | --ru (boolean)\\\\n\\\\n Reject self-signed certificates.\\\\n\\\\n Default value: true\\\\n\\\\n --base-path | --bp (string)\\\\n\\\\n The base path for your API mediation layer instance. Specify this option to\\\\n prepend the base path to all z/OSMF resources when making REST requests. Do not\\\\n specify this option if you are not using an API mediation layer.\\\\n\\\\n --protocol (string)\\\\n\\\\n The protocol used (HTTP or HTTPS)\\\\n\\\\n Default value: https\\\\n Allowed values: http, https\\\\n\\\\n --cert-file (local file path)\\\\n\\\\n The file path to a certificate file to use for authentication\\\\n\\\\n --cert-key-file (local file path)\\\\n\\\\n The file path to a certificate key file to use for authentication\\\\n\\\\n PROFILE OPTIONS\\\\n ---------------\\\\n\\\\n --zosmf-profile | --zosmf-p (string)\\\\n\\\\n The name of a (zosmf) profile to load for this command execution.\\\\n\\\\n --base-profile | --base-p (string)\\\\n\\\\n The name of a (base) profile to load for this command execution.\\\\n\\\\n BASE CONNECTION OPTIONS\\\\n -----------------------\\\\n\\\\n --token-type | --tt (string)\\\\n\\\\n The type of token to get and use for the API. Omit this option to use the\\\\n default token type, which is provided by 'zowe auth login'.\\\\n\\\\n --token-value | --tv (string)\\\\n\\\\n The value of the token to pass to the API.\\\\n\\\\n RESPONSE FORMAT OPTIONS\\\\n -----------------------\\\\n\\\\n --response-format-filter | --rff (array)\\\\n\\\\n Filter (include) fields in the response. Accepts an array of field/property\\\\n names to include in the output response. You can filter JSON objects properties\\\\n OR table columns/fields. In addition, you can use this option in conjunction\\\\n with '--response-format-type' to reduce the output of a command to a single\\\\n field/property or a list of a single field/property.\\\\n\\\\n --response-format-type | --rft (string)\\\\n\\\\n The command response output format type. Must be one of the following:\\\\n\\\\n table: Formats output data as a table. Use this option when the output data is\\\\n an array of homogeneous JSON objects. Each property of the object will become a\\\\n column in the table.\\\\n\\\\n list: Formats output data as a list of strings. Can be used on any data type\\\\n (JSON objects/arrays) are stringified and a new line is added after each entry\\\\n in an array.\\\\n\\\\n object: Formats output data as a list of prettified objects (or single object).\\\\n Can be used in place of \\\\\\"table\\\\\\" to change from tabular output to a list of\\\\n prettified objects.\\\\n\\\\n string: Formats output data as a string. JSON objects/arrays are stringified.\\\\n\\\\n Allowed values: table, list, object, string\\\\n\\\\n --response-format-header | --rfh (boolean)\\\\n\\\\n If \\\\\\"--response-format-type table\\\\\\" is specified, include the column headers in\\\\n the output.\\\\n\\\\n GLOBAL OPTIONS\\\\n --------------\\\\n\\\\n --show-inputs-only (boolean)\\\\n\\\\n Show command inputs and do not run the command\\\\n\\\\n --response-format-json | --rfj (boolean)\\\\n\\\\n Produce JSON formatted data from a command\\\\n\\\\n --help | -h (boolean)\\\\n\\\\n Display help text\\\\n\\\\n --help-web | --hw (boolean)\\\\n\\\\n Display HTML help in browser\\\\n\\\\n EXAMPLES\\\\n --------\\\\n\\\\n - Create a workflow with name \\\\\\"testworkflow\\\\\\" using the local\\\\n file \\\\\\"TESTID_WKFLOW.xml\\\\\\" that contains the workflow definition xml on the system\\\\n \\\\\\"TESTM1\\\\\\" with owner \\\\\\"OTHERID\\\\\\" and delete workflow with the same name if it\\\\n already exist in z/OSMF:\\\\n\\\\n $ zowe zos-workflows create workflow-from-local-file \\\\\\"testworkflow\\\\\\" --local-file \\\\\\"TESTID_WKFLOW.xml\\\\\\" --system-name \\\\\\"TESTM1\\\\\\" --owner \\\\\\"OTHERID\\\\\\" --overwrite\\\\n\\\\n\\", + \\"stdout\\": \\"\\\\n COMMAND NAME\\\\n ------------\\\\n\\\\n workflow-from-local-file | wflf\\\\n\\\\n DESCRIPTION\\\\n -----------\\\\n\\\\n Create a z/OSMF workflow on a z/OS system using a Local file\\\\n\\\\n USAGE\\\\n -----\\\\n\\\\n zowe zos-workflows create workflow-from-local-file [options]\\\\n\\\\n POSITIONAL ARGUMENTS\\\\n --------------------\\\\n\\\\n workflowName\\\\t\\\\t (string)\\\\n\\\\n Name of the workflow\\\\n\\\\n REQUIRED OPTIONS\\\\n ----------------\\\\n\\\\n --local-file | --lf (string)\\\\n\\\\n Local file that contains workflow definition.\\\\n\\\\n --system-name | --sn (string)\\\\n\\\\n z/OS system to execute the workflow.\\\\n\\\\n --owner | --ow (string)\\\\n\\\\n User ID of the workflow owner. This user can perform the workflow steps or\\\\n delegate the steps to other users.\\\\n\\\\n OPTIONS\\\\n -------\\\\n\\\\n --variables-input-file | --vif (string)\\\\n\\\\n Specifies an optional properties file that you can use to pre-specify values for\\\\n one or more of the variables that are defined in the workflow definition file.\\\\n\\\\n --variables | --vs (string)\\\\n\\\\n Includes a list of variables for the workflow. The variables that you specify\\\\n here take precedence over the variables that are specified in the workflow\\\\n variable input file. Make sure the value meets all regular expression\\\\n requirements set for the corresponding variable.\\\\n\\\\n --assign-to-owner | --ato (boolean)\\\\n\\\\n Indicates whether the workflow steps are assigned to the workflow owner.\\\\n\\\\n --access-type | --at (string)\\\\n\\\\n Specifies the access type for the workflow. Public, Restricted or Private.\\\\n\\\\n Allowed values: Public, Restricted, Private\\\\n\\\\n --delete-completed | --dc (boolean)\\\\n\\\\n Whether the successfully completed jobs to be deleted from the JES spool.\\\\n\\\\n --overwrite | --ov (boolean)\\\\n\\\\n Replaces an existing workflow with a new workflow.\\\\n\\\\n --remote-directory | --rd (string)\\\\n\\\\n The remote uss directory where the files are to be uploaded. The directory has\\\\n to exist\\\\n\\\\n --keep-files | --kf (boolean)\\\\n\\\\n Avoid deletion the uploaded files in /tmp or another specified directory after\\\\n successful execution.\\\\n\\\\n Default value: false\\\\n\\\\n ZOSMF CONNECTION OPTIONS\\\\n ------------------------\\\\n\\\\n --host | -H (string)\\\\n\\\\n The z/OSMF server host name.\\\\n\\\\n --port | -P (number)\\\\n\\\\n The z/OSMF server port.\\\\n\\\\n Default value: 443\\\\n\\\\n --user | -u (string)\\\\n\\\\n Mainframe (z/OSMF) user name, which can be the same as your TSO login.\\\\n\\\\n --password | --pass | --pw (string)\\\\n\\\\n Mainframe (z/OSMF) password, which can be the same as your TSO password.\\\\n\\\\n --reject-unauthorized | --ru (boolean)\\\\n\\\\n Reject self-signed certificates.\\\\n\\\\n Default value: true\\\\n\\\\n --base-path | --bp (string)\\\\n\\\\n The base path for your API mediation layer instance. Specify this option to\\\\n prepend the base path to all z/OSMF resources when making REST requests. Do not\\\\n specify this option if you are not using an API mediation layer.\\\\n\\\\n --protocol (string)\\\\n\\\\n The protocol used (HTTP or HTTPS)\\\\n\\\\n Default value: https\\\\n Allowed values: http, https\\\\n\\\\n --cert-file (local file path)\\\\n\\\\n The file path to a certificate file to use for authentication\\\\n\\\\n --cert-key-file (local file path)\\\\n\\\\n The file path to a certificate key file to use for authentication\\\\n\\\\n PROFILE OPTIONS\\\\n ---------------\\\\n\\\\n --zosmf-profile | --zosmf-p (string)\\\\n\\\\n The name of a (zosmf) profile to load for this command execution.\\\\n\\\\n --base-profile | --base-p (string)\\\\n\\\\n The name of a (base) profile to load for this command execution.\\\\n\\\\n BASE CONNECTION OPTIONS\\\\n -----------------------\\\\n\\\\n --token-type | --tt (string)\\\\n\\\\n The type of token to get and use for the API. Omit this option to use the\\\\n default token type, which is provided by 'zowe auth login'.\\\\n\\\\n --token-value | --tv (string)\\\\n\\\\n The value of the token to pass to the API.\\\\n\\\\n RESPONSE FORMAT OPTIONS\\\\n -----------------------\\\\n\\\\n --response-format-filter | --rff (array)\\\\n\\\\n Filter (include) fields in the response. Accepts an array of field/property\\\\n names to include in the output response. You can filter JSON objects properties\\\\n OR table columns/fields. In addition, you can use this option in conjunction\\\\n with '--response-format-type' to reduce the output of a command to a single\\\\n field/property or a list of a single field/property.\\\\n\\\\n --response-format-type | --rft (string)\\\\n\\\\n The command response output format type. Must be one of the following:\\\\n\\\\n table: Formats output data as a table. Use this option when the output data is\\\\n an array of homogeneous JSON objects. Each property of the object will become a\\\\n column in the table.\\\\n\\\\n list: Formats output data as a list of strings. Can be used on any data type\\\\n (JSON objects/arrays) are stringified and a new line is added after each entry\\\\n in an array.\\\\n\\\\n object: Formats output data as a list of prettified objects (or single object).\\\\n Can be used in place of \\\\\\"table\\\\\\" to change from tabular output to a list of\\\\n prettified objects.\\\\n\\\\n string: Formats output data as a string. JSON objects/arrays are stringified.\\\\n\\\\n Allowed values: table, list, object, string\\\\n\\\\n --response-format-header | --rfh (boolean)\\\\n\\\\n If \\\\\\"--response-format-type table\\\\\\" is specified, include the column headers in\\\\n the output.\\\\n\\\\n GLOBAL OPTIONS\\\\n --------------\\\\n\\\\n --show-inputs-only (boolean)\\\\n\\\\n Show command inputs and do not run the command\\\\n\\\\n --response-format-json | --rfj (boolean)\\\\n\\\\n Produce JSON formatted data from a command\\\\n\\\\n --help | -h (boolean)\\\\n\\\\n Display help text\\\\n\\\\n --help-web | --hw (boolean)\\\\n\\\\n Display HTML help in browser\\\\n\\\\n EXAMPLES\\\\n --------\\\\n\\\\n - Create a workflow with name \\\\\\"testworkflow\\\\\\" using the local\\\\n file \\\\\\"TESTID_WKFLOW.xml\\\\\\" that contains the workflow definition xml on the system\\\\n \\\\\\"TESTM1\\\\\\" with owner \\\\\\"OTHERID\\\\\\" and delete workflow with the same name if it\\\\n already exist in z/OSMF:\\\\n\\\\n $ zowe zos-workflows create workflow-from-local-file \\\\\\"testworkflow\\\\\\" --local-file \\\\\\"TESTID_WKFLOW.xml\\\\\\" --system-name \\\\\\"TESTM1\\\\\\" --owner \\\\\\"OTHERID\\\\\\" --overwrite\\\\n\\\\n\\", \\"stderr\\": \\"\\", - \\"data\\": \\"\\\\n COMMAND NAME\\\\n ------------\\\\n\\\\n workflow-from-local-file | wflf\\\\n\\\\n DESCRIPTION\\\\n -----------\\\\n\\\\n Create a z/OSMF workflow on a z/OS system using a Local file\\\\n\\\\n USAGE\\\\n -----\\\\n\\\\n zowe zos-workflows create workflow-from-local-file [options]\\\\n\\\\n POSITIONAL ARGUMENTS\\\\n --------------------\\\\n\\\\n workflowName\\\\t\\\\t (string)\\\\n\\\\n Name of the workflow\\\\n\\\\n REQUIRED OPTIONS\\\\n ----------------\\\\n\\\\n --local-file | --lf (string)\\\\n\\\\n Local file that contains workflow definiton.\\\\n\\\\n --system-name | --sn (string)\\\\n\\\\n z/OS system to execute the workflow.\\\\n\\\\n --owner | --ow (string)\\\\n\\\\n User ID of the workflow owner. This user can perform the workflow steps or\\\\n delegate the steps to other users.\\\\n\\\\n OPTIONS\\\\n -------\\\\n\\\\n --variables-input-file | --vif (string)\\\\n\\\\n Specifies an optional properties file that you can use to pre-specify values for\\\\n one or more of the variables that are defined in the workflow definition file.\\\\n\\\\n --variables | --vs (string)\\\\n\\\\n Includes a list of variables for the workflow. The variables that you specify\\\\n here take precedence over the variables that are specified in the workflow\\\\n variable input file. Make sure the value meets all regular expression\\\\n requirements set for the corresponding variable.\\\\n\\\\n --assign-to-owner | --ato (boolean)\\\\n\\\\n Indicates whether the workflow steps are assigned to the workflow owner.\\\\n\\\\n --access-type | --at (string)\\\\n\\\\n Specifies the access type for the workflow. Public, Restricted or Private.\\\\n\\\\n Allowed values: Public, Restricted, Private\\\\n\\\\n --delete-completed | --dc (boolean)\\\\n\\\\n Whether the successfully completed jobs to be deleted from the JES spool.\\\\n\\\\n --overwrite | --ov (boolean)\\\\n\\\\n Replaces an existing workflow with a new workflow.\\\\n\\\\n --remote-directory | --rd (string)\\\\n\\\\n The remote uss directory where the files are to be uploaded. The directory has\\\\n to exist\\\\n\\\\n --keep-files | --kf (boolean)\\\\n\\\\n Avoid deletion the uploaded files in /tmp or another specified directory after\\\\n successful execution.\\\\n\\\\n Default value: false\\\\n\\\\n ZOSMF CONNECTION OPTIONS\\\\n ------------------------\\\\n\\\\n --host | -H (string)\\\\n\\\\n The z/OSMF server host name.\\\\n\\\\n --port | -P (number)\\\\n\\\\n The z/OSMF server port.\\\\n\\\\n Default value: 443\\\\n\\\\n --user | -u (string)\\\\n\\\\n Mainframe (z/OSMF) user name, which can be the same as your TSO login.\\\\n\\\\n --password | --pass | --pw (string)\\\\n\\\\n Mainframe (z/OSMF) password, which can be the same as your TSO password.\\\\n\\\\n --reject-unauthorized | --ru (boolean)\\\\n\\\\n Reject self-signed certificates.\\\\n\\\\n Default value: true\\\\n\\\\n --base-path | --bp (string)\\\\n\\\\n The base path for your API mediation layer instance. Specify this option to\\\\n prepend the base path to all z/OSMF resources when making REST requests. Do not\\\\n specify this option if you are not using an API mediation layer.\\\\n\\\\n --protocol (string)\\\\n\\\\n The protocol used (HTTP or HTTPS)\\\\n\\\\n Default value: https\\\\n Allowed values: http, https\\\\n\\\\n --cert-file (local file path)\\\\n\\\\n The file path to a certificate file to use for authentication\\\\n\\\\n --cert-key-file (local file path)\\\\n\\\\n The file path to a certificate key file to use for authentication\\\\n\\\\n PROFILE OPTIONS\\\\n ---------------\\\\n\\\\n --zosmf-profile | --zosmf-p (string)\\\\n\\\\n The name of a (zosmf) profile to load for this command execution.\\\\n\\\\n --base-profile | --base-p (string)\\\\n\\\\n The name of a (base) profile to load for this command execution.\\\\n\\\\n BASE CONNECTION OPTIONS\\\\n -----------------------\\\\n\\\\n --token-type | --tt (string)\\\\n\\\\n The type of token to get and use for the API. Omit this option to use the\\\\n default token type, which is provided by 'zowe auth login'.\\\\n\\\\n --token-value | --tv (string)\\\\n\\\\n The value of the token to pass to the API.\\\\n\\\\n RESPONSE FORMAT OPTIONS\\\\n -----------------------\\\\n\\\\n --response-format-filter | --rff (array)\\\\n\\\\n Filter (include) fields in the response. Accepts an array of field/property\\\\n names to include in the output response. You can filter JSON objects properties\\\\n OR table columns/fields. In addition, you can use this option in conjunction\\\\n with '--response-format-type' to reduce the output of a command to a single\\\\n field/property or a list of a single field/property.\\\\n\\\\n --response-format-type | --rft (string)\\\\n\\\\n The command response output format type. Must be one of the following:\\\\n\\\\n table: Formats output data as a table. Use this option when the output data is\\\\n an array of homogeneous JSON objects. Each property of the object will become a\\\\n column in the table.\\\\n\\\\n list: Formats output data as a list of strings. Can be used on any data type\\\\n (JSON objects/arrays) are stringified and a new line is added after each entry\\\\n in an array.\\\\n\\\\n object: Formats output data as a list of prettified objects (or single object).\\\\n Can be used in place of \\\\\\"table\\\\\\" to change from tabular output to a list of\\\\n prettified objects.\\\\n\\\\n string: Formats output data as a string. JSON objects/arrays are stringified.\\\\n\\\\n Allowed values: table, list, object, string\\\\n\\\\n --response-format-header | --rfh (boolean)\\\\n\\\\n If \\\\\\"--response-format-type table\\\\\\" is specified, include the column headers in\\\\n the output.\\\\n\\\\n GLOBAL OPTIONS\\\\n --------------\\\\n\\\\n --show-inputs-only (boolean)\\\\n\\\\n Show command inputs and do not run the command\\\\n\\\\n --response-format-json | --rfj (boolean)\\\\n\\\\n Produce JSON formatted data from a command\\\\n\\\\n --help | -h (boolean)\\\\n\\\\n Display help text\\\\n\\\\n --help-web | --hw (boolean)\\\\n\\\\n Display HTML help in browser\\\\n\\\\n EXAMPLES\\\\n --------\\\\n\\\\n - Create a workflow with name \\\\\\"testworkflow\\\\\\" using the local\\\\n file \\\\\\"TESTID_WKFLOW.xml\\\\\\" that contains the workflow definition xml on the system\\\\n \\\\\\"TESTM1\\\\\\" with owner \\\\\\"OTHERID\\\\\\" and delete workflow with the same name if it\\\\n already exist in z/OSMF:\\\\n\\\\n $ zowe zos-workflows create workflow-from-local-file \\\\\\"testworkflow\\\\\\" --local-file \\\\\\"TESTID_WKFLOW.xml\\\\\\" --system-name \\\\\\"TESTM1\\\\\\" --owner \\\\\\"OTHERID\\\\\\" --overwrite\\\\n\\\\n\\" + \\"data\\": \\"\\\\n COMMAND NAME\\\\n ------------\\\\n\\\\n workflow-from-local-file | wflf\\\\n\\\\n DESCRIPTION\\\\n -----------\\\\n\\\\n Create a z/OSMF workflow on a z/OS system using a Local file\\\\n\\\\n USAGE\\\\n -----\\\\n\\\\n zowe zos-workflows create workflow-from-local-file [options]\\\\n\\\\n POSITIONAL ARGUMENTS\\\\n --------------------\\\\n\\\\n workflowName\\\\t\\\\t (string)\\\\n\\\\n Name of the workflow\\\\n\\\\n REQUIRED OPTIONS\\\\n ----------------\\\\n\\\\n --local-file | --lf (string)\\\\n\\\\n Local file that contains workflow definition.\\\\n\\\\n --system-name | --sn (string)\\\\n\\\\n z/OS system to execute the workflow.\\\\n\\\\n --owner | --ow (string)\\\\n\\\\n User ID of the workflow owner. This user can perform the workflow steps or\\\\n delegate the steps to other users.\\\\n\\\\n OPTIONS\\\\n -------\\\\n\\\\n --variables-input-file | --vif (string)\\\\n\\\\n Specifies an optional properties file that you can use to pre-specify values for\\\\n one or more of the variables that are defined in the workflow definition file.\\\\n\\\\n --variables | --vs (string)\\\\n\\\\n Includes a list of variables for the workflow. The variables that you specify\\\\n here take precedence over the variables that are specified in the workflow\\\\n variable input file. Make sure the value meets all regular expression\\\\n requirements set for the corresponding variable.\\\\n\\\\n --assign-to-owner | --ato (boolean)\\\\n\\\\n Indicates whether the workflow steps are assigned to the workflow owner.\\\\n\\\\n --access-type | --at (string)\\\\n\\\\n Specifies the access type for the workflow. Public, Restricted or Private.\\\\n\\\\n Allowed values: Public, Restricted, Private\\\\n\\\\n --delete-completed | --dc (boolean)\\\\n\\\\n Whether the successfully completed jobs to be deleted from the JES spool.\\\\n\\\\n --overwrite | --ov (boolean)\\\\n\\\\n Replaces an existing workflow with a new workflow.\\\\n\\\\n --remote-directory | --rd (string)\\\\n\\\\n The remote uss directory where the files are to be uploaded. The directory has\\\\n to exist\\\\n\\\\n --keep-files | --kf (boolean)\\\\n\\\\n Avoid deletion the uploaded files in /tmp or another specified directory after\\\\n successful execution.\\\\n\\\\n Default value: false\\\\n\\\\n ZOSMF CONNECTION OPTIONS\\\\n ------------------------\\\\n\\\\n --host | -H (string)\\\\n\\\\n The z/OSMF server host name.\\\\n\\\\n --port | -P (number)\\\\n\\\\n The z/OSMF server port.\\\\n\\\\n Default value: 443\\\\n\\\\n --user | -u (string)\\\\n\\\\n Mainframe (z/OSMF) user name, which can be the same as your TSO login.\\\\n\\\\n --password | --pass | --pw (string)\\\\n\\\\n Mainframe (z/OSMF) password, which can be the same as your TSO password.\\\\n\\\\n --reject-unauthorized | --ru (boolean)\\\\n\\\\n Reject self-signed certificates.\\\\n\\\\n Default value: true\\\\n\\\\n --base-path | --bp (string)\\\\n\\\\n The base path for your API mediation layer instance. Specify this option to\\\\n prepend the base path to all z/OSMF resources when making REST requests. Do not\\\\n specify this option if you are not using an API mediation layer.\\\\n\\\\n --protocol (string)\\\\n\\\\n The protocol used (HTTP or HTTPS)\\\\n\\\\n Default value: https\\\\n Allowed values: http, https\\\\n\\\\n --cert-file (local file path)\\\\n\\\\n The file path to a certificate file to use for authentication\\\\n\\\\n --cert-key-file (local file path)\\\\n\\\\n The file path to a certificate key file to use for authentication\\\\n\\\\n PROFILE OPTIONS\\\\n ---------------\\\\n\\\\n --zosmf-profile | --zosmf-p (string)\\\\n\\\\n The name of a (zosmf) profile to load for this command execution.\\\\n\\\\n --base-profile | --base-p (string)\\\\n\\\\n The name of a (base) profile to load for this command execution.\\\\n\\\\n BASE CONNECTION OPTIONS\\\\n -----------------------\\\\n\\\\n --token-type | --tt (string)\\\\n\\\\n The type of token to get and use for the API. Omit this option to use the\\\\n default token type, which is provided by 'zowe auth login'.\\\\n\\\\n --token-value | --tv (string)\\\\n\\\\n The value of the token to pass to the API.\\\\n\\\\n RESPONSE FORMAT OPTIONS\\\\n -----------------------\\\\n\\\\n --response-format-filter | --rff (array)\\\\n\\\\n Filter (include) fields in the response. Accepts an array of field/property\\\\n names to include in the output response. You can filter JSON objects properties\\\\n OR table columns/fields. In addition, you can use this option in conjunction\\\\n with '--response-format-type' to reduce the output of a command to a single\\\\n field/property or a list of a single field/property.\\\\n\\\\n --response-format-type | --rft (string)\\\\n\\\\n The command response output format type. Must be one of the following:\\\\n\\\\n table: Formats output data as a table. Use this option when the output data is\\\\n an array of homogeneous JSON objects. Each property of the object will become a\\\\n column in the table.\\\\n\\\\n list: Formats output data as a list of strings. Can be used on any data type\\\\n (JSON objects/arrays) are stringified and a new line is added after each entry\\\\n in an array.\\\\n\\\\n object: Formats output data as a list of prettified objects (or single object).\\\\n Can be used in place of \\\\\\"table\\\\\\" to change from tabular output to a list of\\\\n prettified objects.\\\\n\\\\n string: Formats output data as a string. JSON objects/arrays are stringified.\\\\n\\\\n Allowed values: table, list, object, string\\\\n\\\\n --response-format-header | --rfh (boolean)\\\\n\\\\n If \\\\\\"--response-format-type table\\\\\\" is specified, include the column headers in\\\\n the output.\\\\n\\\\n GLOBAL OPTIONS\\\\n --------------\\\\n\\\\n --show-inputs-only (boolean)\\\\n\\\\n Show command inputs and do not run the command\\\\n\\\\n --response-format-json | --rfj (boolean)\\\\n\\\\n Produce JSON formatted data from a command\\\\n\\\\n --help | -h (boolean)\\\\n\\\\n Display help text\\\\n\\\\n --help-web | --hw (boolean)\\\\n\\\\n Display HTML help in browser\\\\n\\\\n EXAMPLES\\\\n --------\\\\n\\\\n - Create a workflow with name \\\\\\"testworkflow\\\\\\" using the local\\\\n file \\\\\\"TESTID_WKFLOW.xml\\\\\\" that contains the workflow definition xml on the system\\\\n \\\\\\"TESTM1\\\\\\" with owner \\\\\\"OTHERID\\\\\\" and delete workflow with the same name if it\\\\n already exist in z/OSMF:\\\\n\\\\n $ zowe zos-workflows create workflow-from-local-file \\\\\\"testworkflow\\\\\\" --local-file \\\\\\"TESTID_WKFLOW.xml\\\\\\" --system-name \\\\\\"TESTM1\\\\\\" --owner \\\\\\"OTHERID\\\\\\" --overwrite\\\\n\\\\n\\" }" `; diff --git a/packages/cli/__tests__/workflows/__integration__/create/ussfile/__snapshots__/cli.workflows.create.workflowUss.integration.test.ts.snap b/packages/cli/__tests__/workflows/__integration__/create/ussfile/__snapshots__/cli.workflows.create.workflowUss.integration.test.ts.snap index 02f263b897..4385bffd3b 100644 --- a/packages/cli/__tests__/workflows/__integration__/create/ussfile/__snapshots__/cli.workflows.create.workflowUss.integration.test.ts.snap +++ b/packages/cli/__tests__/workflows/__integration__/create/ussfile/__snapshots__/cli.workflows.create.workflowUss.integration.test.ts.snap @@ -30,7 +30,7 @@ exports[`Create workflow with uss file integration test should display create wo --uss-file | --uf (string) - Uss file that contains workflow definiton. + Uss file that contains workflow definition. --system-name | --sn (string) @@ -235,8 +235,8 @@ exports[`Create workflow with uss file integration test should display create wo \\"success\\": true, \\"exitCode\\": 0, \\"message\\": \\"The help was constructed for command: workflow-from-uss-file.\\", - \\"stdout\\": \\"\\\\n COMMAND NAME\\\\n ------------\\\\n\\\\n workflow-from-uss-file | wfuf\\\\n\\\\n DESCRIPTION\\\\n -----------\\\\n\\\\n Create a workflow instance in z/OSMF using a USS file\\\\n\\\\n USAGE\\\\n -----\\\\n\\\\n zowe zos-workflows create workflow-from-uss-file [options]\\\\n\\\\n POSITIONAL ARGUMENTS\\\\n --------------------\\\\n\\\\n workflowName\\\\t\\\\t (string)\\\\n\\\\n Name of the workflow instance to create\\\\n\\\\n REQUIRED OPTIONS\\\\n ----------------\\\\n\\\\n --uss-file | --uf (string)\\\\n\\\\n Uss file that contains workflow definiton.\\\\n\\\\n --system-name | --sn (string)\\\\n\\\\n z/OS system to execute the workflow.\\\\n\\\\n --owner | --ow (string)\\\\n\\\\n User ID of the workflow owner. This user can perform the workflow steps or\\\\n delegate the steps to other users.\\\\n\\\\n OPTIONS\\\\n -------\\\\n\\\\n --variables-input-file | --vif (string)\\\\n\\\\n Specifies an optional properties file that you can use to pre-specify values for\\\\n one or more of the variables that are defined in the workflow definition file.\\\\n\\\\n --variables | --vs (string)\\\\n\\\\n Includes a list of variables for the workflow. The variables that you specify\\\\n here take precedence over the variables that are specified in the workflow\\\\n variable input file. Make sure the value meets all regular expression\\\\n requirements set for the corresponding variable.\\\\n\\\\n --assign-to-owner | --ato (boolean)\\\\n\\\\n Indicates whether the workflow steps are assigned to the workflow owner.\\\\n\\\\n --access-type | --at (string)\\\\n\\\\n Specifies the access type for the workflow. Public, Restricted or Private.\\\\n\\\\n Allowed values: Public, Restricted, Private\\\\n\\\\n --delete-completed | --dc (boolean)\\\\n\\\\n Whether the successfully completed jobs to be deleted from the JES spool.\\\\n\\\\n --overwrite | --ov (boolean)\\\\n\\\\n Replaces an existing workflow with a new workflow.\\\\n\\\\n ZOSMF CONNECTION OPTIONS\\\\n ------------------------\\\\n\\\\n --host | -H (string)\\\\n\\\\n The z/OSMF server host name.\\\\n\\\\n --port | -P (number)\\\\n\\\\n The z/OSMF server port.\\\\n\\\\n Default value: 443\\\\n\\\\n --user | -u (string)\\\\n\\\\n Mainframe (z/OSMF) user name, which can be the same as your TSO login.\\\\n\\\\n --password | --pass | --pw (string)\\\\n\\\\n Mainframe (z/OSMF) password, which can be the same as your TSO password.\\\\n\\\\n --reject-unauthorized | --ru (boolean)\\\\n\\\\n Reject self-signed certificates.\\\\n\\\\n Default value: true\\\\n\\\\n --base-path | --bp (string)\\\\n\\\\n The base path for your API mediation layer instance. Specify this option to\\\\n prepend the base path to all z/OSMF resources when making REST requests. Do not\\\\n specify this option if you are not using an API mediation layer.\\\\n\\\\n --protocol (string)\\\\n\\\\n The protocol used (HTTP or HTTPS)\\\\n\\\\n Default value: https\\\\n Allowed values: http, https\\\\n\\\\n --cert-file (local file path)\\\\n\\\\n The file path to a certificate file to use for authentication\\\\n\\\\n --cert-key-file (local file path)\\\\n\\\\n The file path to a certificate key file to use for authentication\\\\n\\\\n PROFILE OPTIONS\\\\n ---------------\\\\n\\\\n --zosmf-profile | --zosmf-p (string)\\\\n\\\\n The name of a (zosmf) profile to load for this command execution.\\\\n\\\\n --base-profile | --base-p (string)\\\\n\\\\n The name of a (base) profile to load for this command execution.\\\\n\\\\n BASE CONNECTION OPTIONS\\\\n -----------------------\\\\n\\\\n --token-type | --tt (string)\\\\n\\\\n The type of token to get and use for the API. Omit this option to use the\\\\n default token type, which is provided by 'zowe auth login'.\\\\n\\\\n --token-value | --tv (string)\\\\n\\\\n The value of the token to pass to the API.\\\\n\\\\n RESPONSE FORMAT OPTIONS\\\\n -----------------------\\\\n\\\\n --response-format-filter | --rff (array)\\\\n\\\\n Filter (include) fields in the response. Accepts an array of field/property\\\\n names to include in the output response. You can filter JSON objects properties\\\\n OR table columns/fields. In addition, you can use this option in conjunction\\\\n with '--response-format-type' to reduce the output of a command to a single\\\\n field/property or a list of a single field/property.\\\\n\\\\n --response-format-type | --rft (string)\\\\n\\\\n The command response output format type. Must be one of the following:\\\\n\\\\n table: Formats output data as a table. Use this option when the output data is\\\\n an array of homogeneous JSON objects. Each property of the object will become a\\\\n column in the table.\\\\n\\\\n list: Formats output data as a list of strings. Can be used on any data type\\\\n (JSON objects/arrays) are stringified and a new line is added after each entry\\\\n in an array.\\\\n\\\\n object: Formats output data as a list of prettified objects (or single object).\\\\n Can be used in place of \\\\\\"table\\\\\\" to change from tabular output to a list of\\\\n prettified objects.\\\\n\\\\n string: Formats output data as a string. JSON objects/arrays are stringified.\\\\n\\\\n Allowed values: table, list, object, string\\\\n\\\\n --response-format-header | --rfh (boolean)\\\\n\\\\n If \\\\\\"--response-format-type table\\\\\\" is specified, include the column headers in\\\\n the output.\\\\n\\\\n GLOBAL OPTIONS\\\\n --------------\\\\n\\\\n --show-inputs-only (boolean)\\\\n\\\\n Show command inputs and do not run the command\\\\n\\\\n --response-format-json | --rfj (boolean)\\\\n\\\\n Produce JSON formatted data from a command\\\\n\\\\n --help | -h (boolean)\\\\n\\\\n Display help text\\\\n\\\\n --help-web | --hw (boolean)\\\\n\\\\n Display HTML help in browser\\\\n\\\\n EXAMPLES\\\\n --------\\\\n\\\\n - Create a workflow with name \\\\\\"testworkflow\\\\\\" using uss file\\\\n \\\\\\"/path/workflow.xml\\\\\\" containing workflow definition, on system \\\\\\"TESTM1\\\\\\" with\\\\n owner \\\\\\"OTHERID\\\\\\" and delete workflow with the same name if it already exist in\\\\n z/OSMF:\\\\n\\\\n $ zowe zos-workflows create workflow-from-uss-file \\\\\\"testworkflow\\\\\\" --uss-file \\\\\\"/path/workflow.xml\\\\\\" --system-name \\\\\\"TESTM1\\\\\\" --owner \\\\\\"OTHERID\\\\\\" --overwrite\\\\n\\\\n - Create a workflow with name \\\\\\"testworkflow\\\\\\" using uss file\\\\n \\\\\\"/path/workflow.xml\\\\\\" containing workflow definition, on system \\\\\\"TESTM1\\\\\\" with\\\\n owner \\\\\\"MYSYSID\\\\\\" and delete successfully completed jobs:\\\\n\\\\n $ zowe zos-workflows create workflow-from-uss-file \\\\\\"testworkflow\\\\\\" --uss-file \\\\\\"/path/workflow.xml\\\\\\" --system-name \\\\\\"TESTM1\\\\\\" --owner \\\\\\"MYSYSID\\\\\\" --delete-completed\\\\n\\\\n - Create a workflow with name \\\\\\"testworkflow\\\\\\" using uss file\\\\n \\\\\\"/path/workflow.xml\\\\\\" containing workflow definition, on system \\\\\\"TESTM1\\\\\\" with\\\\n owner \\\\\\"MYSYSID\\\\\\" and with variable values in the member PROPERTIES of data set\\\\n TESTID.DATA:\\\\n\\\\n $ zowe zos-workflows create workflow-from-uss-file \\\\\\"testworkflow\\\\\\" --uss-file \\\\\\"/path/workflow.xml\\\\\\" --system-name \\\\\\"TESTM1\\\\\\" --owner \\\\\\"MYSYSID\\\\\\" --variables-input-file TESTID.DATA(PROPERTIES)\\\\n\\\\n - Create a workflow with name \\\\\\"testworkflow\\\\\\" using uss file\\\\n \\\\\\"/path/workflow.xml\\\\\\" containing workflow definition, on system \\\\\\"TESTM1\\\\\\" with\\\\n owner \\\\\\"MYSYSID\\\\\\" and with variables VAR1 and VAR2 with values DUMMYVAL1 and\\\\n DUMMYVAL2, and assign it to the owner:\\\\n\\\\n $ zowe zos-workflows create workflow-from-uss-file \\\\\\"testworkflow\\\\\\" --uss-file \\\\\\"/path/workflow.xml\\\\\\" --system-name \\\\\\"TESTM1\\\\\\"--variables VAR1=DUMMYVAL1,VAR2=DUMMYVAL2 --owner \\\\\\"MYSYSID\\\\\\" --assign-to-owner\\\\n\\\\n\\", + \\"stdout\\": \\"\\\\n COMMAND NAME\\\\n ------------\\\\n\\\\n workflow-from-uss-file | wfuf\\\\n\\\\n DESCRIPTION\\\\n -----------\\\\n\\\\n Create a workflow instance in z/OSMF using a USS file\\\\n\\\\n USAGE\\\\n -----\\\\n\\\\n zowe zos-workflows create workflow-from-uss-file [options]\\\\n\\\\n POSITIONAL ARGUMENTS\\\\n --------------------\\\\n\\\\n workflowName\\\\t\\\\t (string)\\\\n\\\\n Name of the workflow instance to create\\\\n\\\\n REQUIRED OPTIONS\\\\n ----------------\\\\n\\\\n --uss-file | --uf (string)\\\\n\\\\n Uss file that contains workflow definition.\\\\n\\\\n --system-name | --sn (string)\\\\n\\\\n z/OS system to execute the workflow.\\\\n\\\\n --owner | --ow (string)\\\\n\\\\n User ID of the workflow owner. This user can perform the workflow steps or\\\\n delegate the steps to other users.\\\\n\\\\n OPTIONS\\\\n -------\\\\n\\\\n --variables-input-file | --vif (string)\\\\n\\\\n Specifies an optional properties file that you can use to pre-specify values for\\\\n one or more of the variables that are defined in the workflow definition file.\\\\n\\\\n --variables | --vs (string)\\\\n\\\\n Includes a list of variables for the workflow. The variables that you specify\\\\n here take precedence over the variables that are specified in the workflow\\\\n variable input file. Make sure the value meets all regular expression\\\\n requirements set for the corresponding variable.\\\\n\\\\n --assign-to-owner | --ato (boolean)\\\\n\\\\n Indicates whether the workflow steps are assigned to the workflow owner.\\\\n\\\\n --access-type | --at (string)\\\\n\\\\n Specifies the access type for the workflow. Public, Restricted or Private.\\\\n\\\\n Allowed values: Public, Restricted, Private\\\\n\\\\n --delete-completed | --dc (boolean)\\\\n\\\\n Whether the successfully completed jobs to be deleted from the JES spool.\\\\n\\\\n --overwrite | --ov (boolean)\\\\n\\\\n Replaces an existing workflow with a new workflow.\\\\n\\\\n ZOSMF CONNECTION OPTIONS\\\\n ------------------------\\\\n\\\\n --host | -H (string)\\\\n\\\\n The z/OSMF server host name.\\\\n\\\\n --port | -P (number)\\\\n\\\\n The z/OSMF server port.\\\\n\\\\n Default value: 443\\\\n\\\\n --user | -u (string)\\\\n\\\\n Mainframe (z/OSMF) user name, which can be the same as your TSO login.\\\\n\\\\n --password | --pass | --pw (string)\\\\n\\\\n Mainframe (z/OSMF) password, which can be the same as your TSO password.\\\\n\\\\n --reject-unauthorized | --ru (boolean)\\\\n\\\\n Reject self-signed certificates.\\\\n\\\\n Default value: true\\\\n\\\\n --base-path | --bp (string)\\\\n\\\\n The base path for your API mediation layer instance. Specify this option to\\\\n prepend the base path to all z/OSMF resources when making REST requests. Do not\\\\n specify this option if you are not using an API mediation layer.\\\\n\\\\n --protocol (string)\\\\n\\\\n The protocol used (HTTP or HTTPS)\\\\n\\\\n Default value: https\\\\n Allowed values: http, https\\\\n\\\\n --cert-file (local file path)\\\\n\\\\n The file path to a certificate file to use for authentication\\\\n\\\\n --cert-key-file (local file path)\\\\n\\\\n The file path to a certificate key file to use for authentication\\\\n\\\\n PROFILE OPTIONS\\\\n ---------------\\\\n\\\\n --zosmf-profile | --zosmf-p (string)\\\\n\\\\n The name of a (zosmf) profile to load for this command execution.\\\\n\\\\n --base-profile | --base-p (string)\\\\n\\\\n The name of a (base) profile to load for this command execution.\\\\n\\\\n BASE CONNECTION OPTIONS\\\\n -----------------------\\\\n\\\\n --token-type | --tt (string)\\\\n\\\\n The type of token to get and use for the API. Omit this option to use the\\\\n default token type, which is provided by 'zowe auth login'.\\\\n\\\\n --token-value | --tv (string)\\\\n\\\\n The value of the token to pass to the API.\\\\n\\\\n RESPONSE FORMAT OPTIONS\\\\n -----------------------\\\\n\\\\n --response-format-filter | --rff (array)\\\\n\\\\n Filter (include) fields in the response. Accepts an array of field/property\\\\n names to include in the output response. You can filter JSON objects properties\\\\n OR table columns/fields. In addition, you can use this option in conjunction\\\\n with '--response-format-type' to reduce the output of a command to a single\\\\n field/property or a list of a single field/property.\\\\n\\\\n --response-format-type | --rft (string)\\\\n\\\\n The command response output format type. Must be one of the following:\\\\n\\\\n table: Formats output data as a table. Use this option when the output data is\\\\n an array of homogeneous JSON objects. Each property of the object will become a\\\\n column in the table.\\\\n\\\\n list: Formats output data as a list of strings. Can be used on any data type\\\\n (JSON objects/arrays) are stringified and a new line is added after each entry\\\\n in an array.\\\\n\\\\n object: Formats output data as a list of prettified objects (or single object).\\\\n Can be used in place of \\\\\\"table\\\\\\" to change from tabular output to a list of\\\\n prettified objects.\\\\n\\\\n string: Formats output data as a string. JSON objects/arrays are stringified.\\\\n\\\\n Allowed values: table, list, object, string\\\\n\\\\n --response-format-header | --rfh (boolean)\\\\n\\\\n If \\\\\\"--response-format-type table\\\\\\" is specified, include the column headers in\\\\n the output.\\\\n\\\\n GLOBAL OPTIONS\\\\n --------------\\\\n\\\\n --show-inputs-only (boolean)\\\\n\\\\n Show command inputs and do not run the command\\\\n\\\\n --response-format-json | --rfj (boolean)\\\\n\\\\n Produce JSON formatted data from a command\\\\n\\\\n --help | -h (boolean)\\\\n\\\\n Display help text\\\\n\\\\n --help-web | --hw (boolean)\\\\n\\\\n Display HTML help in browser\\\\n\\\\n EXAMPLES\\\\n --------\\\\n\\\\n - Create a workflow with name \\\\\\"testworkflow\\\\\\" using uss file\\\\n \\\\\\"/path/workflow.xml\\\\\\" containing workflow definition, on system \\\\\\"TESTM1\\\\\\" with\\\\n owner \\\\\\"OTHERID\\\\\\" and delete workflow with the same name if it already exist in\\\\n z/OSMF:\\\\n\\\\n $ zowe zos-workflows create workflow-from-uss-file \\\\\\"testworkflow\\\\\\" --uss-file \\\\\\"/path/workflow.xml\\\\\\" --system-name \\\\\\"TESTM1\\\\\\" --owner \\\\\\"OTHERID\\\\\\" --overwrite\\\\n\\\\n - Create a workflow with name \\\\\\"testworkflow\\\\\\" using uss file\\\\n \\\\\\"/path/workflow.xml\\\\\\" containing workflow definition, on system \\\\\\"TESTM1\\\\\\" with\\\\n owner \\\\\\"MYSYSID\\\\\\" and delete successfully completed jobs:\\\\n\\\\n $ zowe zos-workflows create workflow-from-uss-file \\\\\\"testworkflow\\\\\\" --uss-file \\\\\\"/path/workflow.xml\\\\\\" --system-name \\\\\\"TESTM1\\\\\\" --owner \\\\\\"MYSYSID\\\\\\" --delete-completed\\\\n\\\\n - Create a workflow with name \\\\\\"testworkflow\\\\\\" using uss file\\\\n \\\\\\"/path/workflow.xml\\\\\\" containing workflow definition, on system \\\\\\"TESTM1\\\\\\" with\\\\n owner \\\\\\"MYSYSID\\\\\\" and with variable values in the member PROPERTIES of data set\\\\n TESTID.DATA:\\\\n\\\\n $ zowe zos-workflows create workflow-from-uss-file \\\\\\"testworkflow\\\\\\" --uss-file \\\\\\"/path/workflow.xml\\\\\\" --system-name \\\\\\"TESTM1\\\\\\" --owner \\\\\\"MYSYSID\\\\\\" --variables-input-file TESTID.DATA(PROPERTIES)\\\\n\\\\n - Create a workflow with name \\\\\\"testworkflow\\\\\\" using uss file\\\\n \\\\\\"/path/workflow.xml\\\\\\" containing workflow definition, on system \\\\\\"TESTM1\\\\\\" with\\\\n owner \\\\\\"MYSYSID\\\\\\" and with variables VAR1 and VAR2 with values DUMMYVAL1 and\\\\n DUMMYVAL2, and assign it to the owner:\\\\n\\\\n $ zowe zos-workflows create workflow-from-uss-file \\\\\\"testworkflow\\\\\\" --uss-file \\\\\\"/path/workflow.xml\\\\\\" --system-name \\\\\\"TESTM1\\\\\\"--variables VAR1=DUMMYVAL1,VAR2=DUMMYVAL2 --owner \\\\\\"MYSYSID\\\\\\" --assign-to-owner\\\\n\\\\n\\", \\"stderr\\": \\"\\", - \\"data\\": \\"\\\\n COMMAND NAME\\\\n ------------\\\\n\\\\n workflow-from-uss-file | wfuf\\\\n\\\\n DESCRIPTION\\\\n -----------\\\\n\\\\n Create a workflow instance in z/OSMF using a USS file\\\\n\\\\n USAGE\\\\n -----\\\\n\\\\n zowe zos-workflows create workflow-from-uss-file [options]\\\\n\\\\n POSITIONAL ARGUMENTS\\\\n --------------------\\\\n\\\\n workflowName\\\\t\\\\t (string)\\\\n\\\\n Name of the workflow instance to create\\\\n\\\\n REQUIRED OPTIONS\\\\n ----------------\\\\n\\\\n --uss-file | --uf (string)\\\\n\\\\n Uss file that contains workflow definiton.\\\\n\\\\n --system-name | --sn (string)\\\\n\\\\n z/OS system to execute the workflow.\\\\n\\\\n --owner | --ow (string)\\\\n\\\\n User ID of the workflow owner. This user can perform the workflow steps or\\\\n delegate the steps to other users.\\\\n\\\\n OPTIONS\\\\n -------\\\\n\\\\n --variables-input-file | --vif (string)\\\\n\\\\n Specifies an optional properties file that you can use to pre-specify values for\\\\n one or more of the variables that are defined in the workflow definition file.\\\\n\\\\n --variables | --vs (string)\\\\n\\\\n Includes a list of variables for the workflow. The variables that you specify\\\\n here take precedence over the variables that are specified in the workflow\\\\n variable input file. Make sure the value meets all regular expression\\\\n requirements set for the corresponding variable.\\\\n\\\\n --assign-to-owner | --ato (boolean)\\\\n\\\\n Indicates whether the workflow steps are assigned to the workflow owner.\\\\n\\\\n --access-type | --at (string)\\\\n\\\\n Specifies the access type for the workflow. Public, Restricted or Private.\\\\n\\\\n Allowed values: Public, Restricted, Private\\\\n\\\\n --delete-completed | --dc (boolean)\\\\n\\\\n Whether the successfully completed jobs to be deleted from the JES spool.\\\\n\\\\n --overwrite | --ov (boolean)\\\\n\\\\n Replaces an existing workflow with a new workflow.\\\\n\\\\n ZOSMF CONNECTION OPTIONS\\\\n ------------------------\\\\n\\\\n --host | -H (string)\\\\n\\\\n The z/OSMF server host name.\\\\n\\\\n --port | -P (number)\\\\n\\\\n The z/OSMF server port.\\\\n\\\\n Default value: 443\\\\n\\\\n --user | -u (string)\\\\n\\\\n Mainframe (z/OSMF) user name, which can be the same as your TSO login.\\\\n\\\\n --password | --pass | --pw (string)\\\\n\\\\n Mainframe (z/OSMF) password, which can be the same as your TSO password.\\\\n\\\\n --reject-unauthorized | --ru (boolean)\\\\n\\\\n Reject self-signed certificates.\\\\n\\\\n Default value: true\\\\n\\\\n --base-path | --bp (string)\\\\n\\\\n The base path for your API mediation layer instance. Specify this option to\\\\n prepend the base path to all z/OSMF resources when making REST requests. Do not\\\\n specify this option if you are not using an API mediation layer.\\\\n\\\\n --protocol (string)\\\\n\\\\n The protocol used (HTTP or HTTPS)\\\\n\\\\n Default value: https\\\\n Allowed values: http, https\\\\n\\\\n --cert-file (local file path)\\\\n\\\\n The file path to a certificate file to use for authentication\\\\n\\\\n --cert-key-file (local file path)\\\\n\\\\n The file path to a certificate key file to use for authentication\\\\n\\\\n PROFILE OPTIONS\\\\n ---------------\\\\n\\\\n --zosmf-profile | --zosmf-p (string)\\\\n\\\\n The name of a (zosmf) profile to load for this command execution.\\\\n\\\\n --base-profile | --base-p (string)\\\\n\\\\n The name of a (base) profile to load for this command execution.\\\\n\\\\n BASE CONNECTION OPTIONS\\\\n -----------------------\\\\n\\\\n --token-type | --tt (string)\\\\n\\\\n The type of token to get and use for the API. Omit this option to use the\\\\n default token type, which is provided by 'zowe auth login'.\\\\n\\\\n --token-value | --tv (string)\\\\n\\\\n The value of the token to pass to the API.\\\\n\\\\n RESPONSE FORMAT OPTIONS\\\\n -----------------------\\\\n\\\\n --response-format-filter | --rff (array)\\\\n\\\\n Filter (include) fields in the response. Accepts an array of field/property\\\\n names to include in the output response. You can filter JSON objects properties\\\\n OR table columns/fields. In addition, you can use this option in conjunction\\\\n with '--response-format-type' to reduce the output of a command to a single\\\\n field/property or a list of a single field/property.\\\\n\\\\n --response-format-type | --rft (string)\\\\n\\\\n The command response output format type. Must be one of the following:\\\\n\\\\n table: Formats output data as a table. Use this option when the output data is\\\\n an array of homogeneous JSON objects. Each property of the object will become a\\\\n column in the table.\\\\n\\\\n list: Formats output data as a list of strings. Can be used on any data type\\\\n (JSON objects/arrays) are stringified and a new line is added after each entry\\\\n in an array.\\\\n\\\\n object: Formats output data as a list of prettified objects (or single object).\\\\n Can be used in place of \\\\\\"table\\\\\\" to change from tabular output to a list of\\\\n prettified objects.\\\\n\\\\n string: Formats output data as a string. JSON objects/arrays are stringified.\\\\n\\\\n Allowed values: table, list, object, string\\\\n\\\\n --response-format-header | --rfh (boolean)\\\\n\\\\n If \\\\\\"--response-format-type table\\\\\\" is specified, include the column headers in\\\\n the output.\\\\n\\\\n GLOBAL OPTIONS\\\\n --------------\\\\n\\\\n --show-inputs-only (boolean)\\\\n\\\\n Show command inputs and do not run the command\\\\n\\\\n --response-format-json | --rfj (boolean)\\\\n\\\\n Produce JSON formatted data from a command\\\\n\\\\n --help | -h (boolean)\\\\n\\\\n Display help text\\\\n\\\\n --help-web | --hw (boolean)\\\\n\\\\n Display HTML help in browser\\\\n\\\\n EXAMPLES\\\\n --------\\\\n\\\\n - Create a workflow with name \\\\\\"testworkflow\\\\\\" using uss file\\\\n \\\\\\"/path/workflow.xml\\\\\\" containing workflow definition, on system \\\\\\"TESTM1\\\\\\" with\\\\n owner \\\\\\"OTHERID\\\\\\" and delete workflow with the same name if it already exist in\\\\n z/OSMF:\\\\n\\\\n $ zowe zos-workflows create workflow-from-uss-file \\\\\\"testworkflow\\\\\\" --uss-file \\\\\\"/path/workflow.xml\\\\\\" --system-name \\\\\\"TESTM1\\\\\\" --owner \\\\\\"OTHERID\\\\\\" --overwrite\\\\n\\\\n - Create a workflow with name \\\\\\"testworkflow\\\\\\" using uss file\\\\n \\\\\\"/path/workflow.xml\\\\\\" containing workflow definition, on system \\\\\\"TESTM1\\\\\\" with\\\\n owner \\\\\\"MYSYSID\\\\\\" and delete successfully completed jobs:\\\\n\\\\n $ zowe zos-workflows create workflow-from-uss-file \\\\\\"testworkflow\\\\\\" --uss-file \\\\\\"/path/workflow.xml\\\\\\" --system-name \\\\\\"TESTM1\\\\\\" --owner \\\\\\"MYSYSID\\\\\\" --delete-completed\\\\n\\\\n - Create a workflow with name \\\\\\"testworkflow\\\\\\" using uss file\\\\n \\\\\\"/path/workflow.xml\\\\\\" containing workflow definition, on system \\\\\\"TESTM1\\\\\\" with\\\\n owner \\\\\\"MYSYSID\\\\\\" and with variable values in the member PROPERTIES of data set\\\\n TESTID.DATA:\\\\n\\\\n $ zowe zos-workflows create workflow-from-uss-file \\\\\\"testworkflow\\\\\\" --uss-file \\\\\\"/path/workflow.xml\\\\\\" --system-name \\\\\\"TESTM1\\\\\\" --owner \\\\\\"MYSYSID\\\\\\" --variables-input-file TESTID.DATA(PROPERTIES)\\\\n\\\\n - Create a workflow with name \\\\\\"testworkflow\\\\\\" using uss file\\\\n \\\\\\"/path/workflow.xml\\\\\\" containing workflow definition, on system \\\\\\"TESTM1\\\\\\" with\\\\n owner \\\\\\"MYSYSID\\\\\\" and with variables VAR1 and VAR2 with values DUMMYVAL1 and\\\\n DUMMYVAL2, and assign it to the owner:\\\\n\\\\n $ zowe zos-workflows create workflow-from-uss-file \\\\\\"testworkflow\\\\\\" --uss-file \\\\\\"/path/workflow.xml\\\\\\" --system-name \\\\\\"TESTM1\\\\\\"--variables VAR1=DUMMYVAL1,VAR2=DUMMYVAL2 --owner \\\\\\"MYSYSID\\\\\\" --assign-to-owner\\\\n\\\\n\\" + \\"data\\": \\"\\\\n COMMAND NAME\\\\n ------------\\\\n\\\\n workflow-from-uss-file | wfuf\\\\n\\\\n DESCRIPTION\\\\n -----------\\\\n\\\\n Create a workflow instance in z/OSMF using a USS file\\\\n\\\\n USAGE\\\\n -----\\\\n\\\\n zowe zos-workflows create workflow-from-uss-file [options]\\\\n\\\\n POSITIONAL ARGUMENTS\\\\n --------------------\\\\n\\\\n workflowName\\\\t\\\\t (string)\\\\n\\\\n Name of the workflow instance to create\\\\n\\\\n REQUIRED OPTIONS\\\\n ----------------\\\\n\\\\n --uss-file | --uf (string)\\\\n\\\\n Uss file that contains workflow definition.\\\\n\\\\n --system-name | --sn (string)\\\\n\\\\n z/OS system to execute the workflow.\\\\n\\\\n --owner | --ow (string)\\\\n\\\\n User ID of the workflow owner. This user can perform the workflow steps or\\\\n delegate the steps to other users.\\\\n\\\\n OPTIONS\\\\n -------\\\\n\\\\n --variables-input-file | --vif (string)\\\\n\\\\n Specifies an optional properties file that you can use to pre-specify values for\\\\n one or more of the variables that are defined in the workflow definition file.\\\\n\\\\n --variables | --vs (string)\\\\n\\\\n Includes a list of variables for the workflow. The variables that you specify\\\\n here take precedence over the variables that are specified in the workflow\\\\n variable input file. Make sure the value meets all regular expression\\\\n requirements set for the corresponding variable.\\\\n\\\\n --assign-to-owner | --ato (boolean)\\\\n\\\\n Indicates whether the workflow steps are assigned to the workflow owner.\\\\n\\\\n --access-type | --at (string)\\\\n\\\\n Specifies the access type for the workflow. Public, Restricted or Private.\\\\n\\\\n Allowed values: Public, Restricted, Private\\\\n\\\\n --delete-completed | --dc (boolean)\\\\n\\\\n Whether the successfully completed jobs to be deleted from the JES spool.\\\\n\\\\n --overwrite | --ov (boolean)\\\\n\\\\n Replaces an existing workflow with a new workflow.\\\\n\\\\n ZOSMF CONNECTION OPTIONS\\\\n ------------------------\\\\n\\\\n --host | -H (string)\\\\n\\\\n The z/OSMF server host name.\\\\n\\\\n --port | -P (number)\\\\n\\\\n The z/OSMF server port.\\\\n\\\\n Default value: 443\\\\n\\\\n --user | -u (string)\\\\n\\\\n Mainframe (z/OSMF) user name, which can be the same as your TSO login.\\\\n\\\\n --password | --pass | --pw (string)\\\\n\\\\n Mainframe (z/OSMF) password, which can be the same as your TSO password.\\\\n\\\\n --reject-unauthorized | --ru (boolean)\\\\n\\\\n Reject self-signed certificates.\\\\n\\\\n Default value: true\\\\n\\\\n --base-path | --bp (string)\\\\n\\\\n The base path for your API mediation layer instance. Specify this option to\\\\n prepend the base path to all z/OSMF resources when making REST requests. Do not\\\\n specify this option if you are not using an API mediation layer.\\\\n\\\\n --protocol (string)\\\\n\\\\n The protocol used (HTTP or HTTPS)\\\\n\\\\n Default value: https\\\\n Allowed values: http, https\\\\n\\\\n --cert-file (local file path)\\\\n\\\\n The file path to a certificate file to use for authentication\\\\n\\\\n --cert-key-file (local file path)\\\\n\\\\n The file path to a certificate key file to use for authentication\\\\n\\\\n PROFILE OPTIONS\\\\n ---------------\\\\n\\\\n --zosmf-profile | --zosmf-p (string)\\\\n\\\\n The name of a (zosmf) profile to load for this command execution.\\\\n\\\\n --base-profile | --base-p (string)\\\\n\\\\n The name of a (base) profile to load for this command execution.\\\\n\\\\n BASE CONNECTION OPTIONS\\\\n -----------------------\\\\n\\\\n --token-type | --tt (string)\\\\n\\\\n The type of token to get and use for the API. Omit this option to use the\\\\n default token type, which is provided by 'zowe auth login'.\\\\n\\\\n --token-value | --tv (string)\\\\n\\\\n The value of the token to pass to the API.\\\\n\\\\n RESPONSE FORMAT OPTIONS\\\\n -----------------------\\\\n\\\\n --response-format-filter | --rff (array)\\\\n\\\\n Filter (include) fields in the response. Accepts an array of field/property\\\\n names to include in the output response. You can filter JSON objects properties\\\\n OR table columns/fields. In addition, you can use this option in conjunction\\\\n with '--response-format-type' to reduce the output of a command to a single\\\\n field/property or a list of a single field/property.\\\\n\\\\n --response-format-type | --rft (string)\\\\n\\\\n The command response output format type. Must be one of the following:\\\\n\\\\n table: Formats output data as a table. Use this option when the output data is\\\\n an array of homogeneous JSON objects. Each property of the object will become a\\\\n column in the table.\\\\n\\\\n list: Formats output data as a list of strings. Can be used on any data type\\\\n (JSON objects/arrays) are stringified and a new line is added after each entry\\\\n in an array.\\\\n\\\\n object: Formats output data as a list of prettified objects (or single object).\\\\n Can be used in place of \\\\\\"table\\\\\\" to change from tabular output to a list of\\\\n prettified objects.\\\\n\\\\n string: Formats output data as a string. JSON objects/arrays are stringified.\\\\n\\\\n Allowed values: table, list, object, string\\\\n\\\\n --response-format-header | --rfh (boolean)\\\\n\\\\n If \\\\\\"--response-format-type table\\\\\\" is specified, include the column headers in\\\\n the output.\\\\n\\\\n GLOBAL OPTIONS\\\\n --------------\\\\n\\\\n --show-inputs-only (boolean)\\\\n\\\\n Show command inputs and do not run the command\\\\n\\\\n --response-format-json | --rfj (boolean)\\\\n\\\\n Produce JSON formatted data from a command\\\\n\\\\n --help | -h (boolean)\\\\n\\\\n Display help text\\\\n\\\\n --help-web | --hw (boolean)\\\\n\\\\n Display HTML help in browser\\\\n\\\\n EXAMPLES\\\\n --------\\\\n\\\\n - Create a workflow with name \\\\\\"testworkflow\\\\\\" using uss file\\\\n \\\\\\"/path/workflow.xml\\\\\\" containing workflow definition, on system \\\\\\"TESTM1\\\\\\" with\\\\n owner \\\\\\"OTHERID\\\\\\" and delete workflow with the same name if it already exist in\\\\n z/OSMF:\\\\n\\\\n $ zowe zos-workflows create workflow-from-uss-file \\\\\\"testworkflow\\\\\\" --uss-file \\\\\\"/path/workflow.xml\\\\\\" --system-name \\\\\\"TESTM1\\\\\\" --owner \\\\\\"OTHERID\\\\\\" --overwrite\\\\n\\\\n - Create a workflow with name \\\\\\"testworkflow\\\\\\" using uss file\\\\n \\\\\\"/path/workflow.xml\\\\\\" containing workflow definition, on system \\\\\\"TESTM1\\\\\\" with\\\\n owner \\\\\\"MYSYSID\\\\\\" and delete successfully completed jobs:\\\\n\\\\n $ zowe zos-workflows create workflow-from-uss-file \\\\\\"testworkflow\\\\\\" --uss-file \\\\\\"/path/workflow.xml\\\\\\" --system-name \\\\\\"TESTM1\\\\\\" --owner \\\\\\"MYSYSID\\\\\\" --delete-completed\\\\n\\\\n - Create a workflow with name \\\\\\"testworkflow\\\\\\" using uss file\\\\n \\\\\\"/path/workflow.xml\\\\\\" containing workflow definition, on system \\\\\\"TESTM1\\\\\\" with\\\\n owner \\\\\\"MYSYSID\\\\\\" and with variable values in the member PROPERTIES of data set\\\\n TESTID.DATA:\\\\n\\\\n $ zowe zos-workflows create workflow-from-uss-file \\\\\\"testworkflow\\\\\\" --uss-file \\\\\\"/path/workflow.xml\\\\\\" --system-name \\\\\\"TESTM1\\\\\\" --owner \\\\\\"MYSYSID\\\\\\" --variables-input-file TESTID.DATA(PROPERTIES)\\\\n\\\\n - Create a workflow with name \\\\\\"testworkflow\\\\\\" using uss file\\\\n \\\\\\"/path/workflow.xml\\\\\\" containing workflow definition, on system \\\\\\"TESTM1\\\\\\" with\\\\n owner \\\\\\"MYSYSID\\\\\\" and with variables VAR1 and VAR2 with values DUMMYVAL1 and\\\\n DUMMYVAL2, and assign it to the owner:\\\\n\\\\n $ zowe zos-workflows create workflow-from-uss-file \\\\\\"testworkflow\\\\\\" --uss-file \\\\\\"/path/workflow.xml\\\\\\" --system-name \\\\\\"TESTM1\\\\\\"--variables VAR1=DUMMYVAL1,VAR2=DUMMYVAL2 --owner \\\\\\"MYSYSID\\\\\\" --assign-to-owner\\\\n\\\\n\\" }" `; diff --git a/packages/cli/__tests__/workflows/__system__/List/activeWorkflows/__scripts__/command/command_list_workflow.sh b/packages/cli/__tests__/workflows/__system__/List/activeWorkflows/__scripts__/command/command_list_workflow.sh index 4c2e9b0ed4..448c2043cd 100755 --- a/packages/cli/__tests__/workflows/__system__/List/activeWorkflows/__scripts__/command/command_list_workflow.sh +++ b/packages/cli/__tests__/workflows/__system__/List/activeWorkflows/__scripts__/command/command_list_workflow.sh @@ -1,6 +1,6 @@ #!/bin/bash wname=$1 -definiton=$2 +definition=$2 sysname=$3 owner=$4 set -e diff --git a/packages/cli/__tests__/workflows/__system__/List/archivedWorkflows/__scripts__/command/command_list_workflow.sh b/packages/cli/__tests__/workflows/__system__/List/archivedWorkflows/__scripts__/command/command_list_workflow.sh index 8c3ad84f2c..b5954e693d 100755 --- a/packages/cli/__tests__/workflows/__system__/List/archivedWorkflows/__scripts__/command/command_list_workflow.sh +++ b/packages/cli/__tests__/workflows/__system__/List/archivedWorkflows/__scripts__/command/command_list_workflow.sh @@ -1,6 +1,6 @@ #!/bin/bash wname=$1 -definiton=$2 +definition=$2 sysname=$3 owner=$4 set -e diff --git a/packages/cli/__tests__/workflows/__system__/create/__scripts__/command/command_create_workflow_ds.sh b/packages/cli/__tests__/workflows/__system__/create/__scripts__/command/command_create_workflow_ds.sh index e1ba8eba23..bcb62c6299 100755 --- a/packages/cli/__tests__/workflows/__system__/create/__scripts__/command/command_create_workflow_ds.sh +++ b/packages/cli/__tests__/workflows/__system__/create/__scripts__/command/command_create_workflow_ds.sh @@ -1,12 +1,12 @@ #!/bin/bash wname=$1 -definiton=$2 +definition=$2 sysname=$3 owner=$4 set -e echo "================Z/OS WORKFLOWS CREATE DATA-SET ===============" -zowe zos-workflows create workflow-from-data-set $wname --data-set "$definiton" --system-name $sysname --owner $owner $5 +zowe zos-workflows create workflow-from-data-set $wname --data-set "$definition" --system-name $sysname --owner $owner $5 if [ $? -gt 0 ] then exit $? diff --git a/packages/cli/__tests__/workflows/__system__/create/__scripts__/command/command_create_workflow_local_file.sh b/packages/cli/__tests__/workflows/__system__/create/__scripts__/command/command_create_workflow_local_file.sh index c2e34609a9..f59e98fc08 100755 --- a/packages/cli/__tests__/workflows/__system__/create/__scripts__/command/command_create_workflow_local_file.sh +++ b/packages/cli/__tests__/workflows/__system__/create/__scripts__/command/command_create_workflow_local_file.sh @@ -1,12 +1,12 @@ #!/bin/bash wname=$1 -definiton=$2 +definition=$2 sysname=$3 owner=$4 set -e echo "================Z/OS WORKFLOWS CREATE LOCAL-FILE ===============" -zowe zos-workflows create workflow-from-local-file $wname --local-file "$definiton" --system-name $sysname --owner $owner $5 +zowe zos-workflows create workflow-from-local-file $wname --local-file "$definition" --system-name $sysname --owner $owner $5 if [ $? -gt 0 ] then exit $? diff --git a/packages/cli/__tests__/workflows/__system__/create/__scripts__/command/command_create_workflow_uss.sh b/packages/cli/__tests__/workflows/__system__/create/__scripts__/command/command_create_workflow_uss.sh index 58af3e2fd4..ebe82a6814 100755 --- a/packages/cli/__tests__/workflows/__system__/create/__scripts__/command/command_create_workflow_uss.sh +++ b/packages/cli/__tests__/workflows/__system__/create/__scripts__/command/command_create_workflow_uss.sh @@ -1,12 +1,12 @@ #!/bin/bash wname=$1 -definiton=$2 +definition=$2 sysname=$3 owner=$4 set -e echo "================Z/OS WORKFLOWS CREATE USS-FILE ===============" -zowe zos-workflows create workflow-from-uss-file $wname --uss-file "$definiton" --system-name $sysname --owner $owner $5 +zowe zos-workflows create workflow-from-uss-file $wname --uss-file "$definition" --system-name $sysname --owner $owner $5 if [ $? -gt 0 ] then exit $? diff --git a/packages/cli/__tests__/workflows/__unit__/create/dataset/__snapshots__/Dataset.definition.unit.test.ts.snap b/packages/cli/__tests__/workflows/__unit__/create/dataset/__snapshots__/Dataset.definition.unit.test.ts.snap index 31f91ad413..5ae7d931d5 100644 --- a/packages/cli/__tests__/workflows/__unit__/create/dataset/__snapshots__/Dataset.definition.unit.test.ts.snap +++ b/packages/cli/__tests__/workflows/__unit__/create/dataset/__snapshots__/Dataset.definition.unit.test.ts.snap @@ -30,7 +30,7 @@ Object { "aliases": Array [ "ds", ], - "description": "Data set that contains a workflow definiton.", + "description": "Data set that contains a workflow definition.", "name": "data-set", "required": true, "type": "string", diff --git a/packages/cli/__tests__/workflows/__unit__/create/localfile/__snapshots__/LocalFile.definition.unit.test.ts.snap b/packages/cli/__tests__/workflows/__unit__/create/localfile/__snapshots__/LocalFile.definition.unit.test.ts.snap index 8be11b3c8b..626c6c1388 100644 --- a/packages/cli/__tests__/workflows/__unit__/create/localfile/__snapshots__/LocalFile.definition.unit.test.ts.snap +++ b/packages/cli/__tests__/workflows/__unit__/create/localfile/__snapshots__/LocalFile.definition.unit.test.ts.snap @@ -18,7 +18,7 @@ Object { "aliases": Array [ "lf", ], - "description": "Local file that contains workflow definiton.", + "description": "Local file that contains workflow definition.", "name": "local-file", "required": true, "type": "string", diff --git a/packages/cli/__tests__/workflows/__unit__/create/ussfile/__snapshots__/UssFile.definition.unit.test.ts.snap b/packages/cli/__tests__/workflows/__unit__/create/ussfile/__snapshots__/UssFile.definition.unit.test.ts.snap index 4630a020e0..fd373251be 100644 --- a/packages/cli/__tests__/workflows/__unit__/create/ussfile/__snapshots__/UssFile.definition.unit.test.ts.snap +++ b/packages/cli/__tests__/workflows/__unit__/create/ussfile/__snapshots__/UssFile.definition.unit.test.ts.snap @@ -30,7 +30,7 @@ Object { "aliases": Array [ "uf", ], - "description": "Uss file that contains workflow definiton.", + "description": "Uss file that contains workflow definition.", "name": "uss-file", "required": true, "type": "string", diff --git a/packages/cli/src/workflows/create/Create.common.options.ts b/packages/cli/src/workflows/create/Create.common.options.ts index 521d877599..bd69c962ed 100644 --- a/packages/cli/src/workflows/create/Create.common.options.ts +++ b/packages/cli/src/workflows/create/Create.common.options.ts @@ -17,38 +17,38 @@ import { ICommandOptionDefinition } from "@zowe/imperative"; export const CreateCommonOptions: { [key: string]: ICommandOptionDefinition } = { /** - * Data set containing workflow definiton option. + * Data set containing workflow definition option. * @type {ICommandOptionDefinition} */ dataSet: { name: "data-set", aliases: ["ds"], type: "string", - description: "Data set that contains a workflow definiton.", + description: "Data set that contains a workflow definition.", required: true }, /** - * Uss file containing workflow definiton option. + * Uss file containing workflow definition option. * @type {ICommandOptionDefinition} */ ussFile: { name: "uss-file", aliases: ["uf"], type: "string", - description: "Uss file that contains workflow definiton.", + description: "Uss file that contains workflow definition.", required: true }, /** - * Local file containing workflow definiton option. + * Local file containing workflow definition option. * @type {ICommandOptionDefinition} */ localFile: { name: "local-file", aliases: ["lf"], type: "string", - description: "Local file that contains workflow definiton.", + description: "Local file that contains workflow definition.", required: true }, diff --git a/packages/imperative/CHANGELOG.md b/packages/imperative/CHANGELOG.md index f87cd19d32..82399ff0cb 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: Fixed error message shown for null option definition to include details about which command caused the error. [#2002](https://github.com/zowe/zowe-cli/issues/2002) + ## `5.19.0` - Enhancement: Deprecated function AbstractCommandYargs.getBrightYargsResponse in favor of AbstractCommandYargs.getZoweYargsResponse diff --git a/packages/imperative/src/cmd/__tests__/CommandPreparer.unit.test.ts b/packages/imperative/src/cmd/__tests__/CommandPreparer.unit.test.ts index eaca292c2a..13345b0adf 100644 --- a/packages/imperative/src/cmd/__tests__/CommandPreparer.unit.test.ts +++ b/packages/imperative/src/cmd/__tests__/CommandPreparer.unit.test.ts @@ -265,7 +265,7 @@ describe("Command Preparer", () => { expect(error.message).toMatchSnapshot(); }); - it("should be able to detect if a chained handlers index is out of bounds", () => { + it("should be able to detect if a chained handlers index is out of bounds", () => { let error: ImperativeError; try { const newDef: ICommandDefinition = { @@ -294,7 +294,7 @@ describe("Command Preparer", () => { }); - it("should be able to detect if a chained handler mapping has no 'to' field", () => { + it("should be able to detect if a chained handler mapping has no 'to' field", () => { let error: Error; try { const newDef: ICommandDefinition = { @@ -326,7 +326,7 @@ describe("Command Preparer", () => { }); - it("should be able to detect if a chained handler mapping has both a 'from' field and a 'value' field", () => { + it("should be able to detect if a chained handler mapping has both a 'from' field and a 'value' field", () => { let error: Error; try { const newDef: ICommandDefinition = { diff --git a/packages/imperative/src/cmd/src/CommandPreparer.ts b/packages/imperative/src/cmd/src/CommandPreparer.ts index 379d528542..9f14695d72 100644 --- a/packages/imperative/src/cmd/src/CommandPreparer.ts +++ b/packages/imperative/src/cmd/src/CommandPreparer.ts @@ -128,7 +128,7 @@ export class CommandPreparer { * @param {ICommandDefinition[]} definitions - the current set of definitions we've traversed - for diagnostics */ private static perfomBasicValidation(definition: ICommandDefinition, definitions: ICommandDefinition[]) { - const definitonDetails: string = "The definition in error has been placed in the additional details field of this error object."; + const definitionDetails: string = "The definition in error has been placed in the additional details field of this error object."; // Do a quick check for required properties. If none are present, assume that either the definition // is completely incorrect OR the user did NOT export the definition in a module glob @@ -138,7 +138,7 @@ export class CommandPreparer { msg: `The command definition node being validated does NOT contain any of the required fields (name, description, type). ` + `Either the definition supplied is completely incorrect (see ICommandDefinition interface for required fields) ` + `OR you did NOT export the definition in your command definition module (found via the command definition glob). ` + - `Keys/properties present on the definition: ${props.join(",")}. ${definitonDetails}`, + `Keys/properties present on the definition: ${props.join(",")}. ${definitionDetails}`, additionalDetails: JSON.stringify(definition) }); } @@ -146,7 +146,7 @@ export class CommandPreparer { // All nodes must have a non-blank name if (!(definition as any).isRoot && (definition.name == null || definition.name.trim().length === 0)) { throw new ImperativeError({ - msg: `A command definition node contains an undefined or empty name. ${definitonDetails}`, + msg: `A command definition node contains an undefined or empty name. ${definitionDetails}`, additionalDetails: JSON.stringify(definition) }); } @@ -155,7 +155,7 @@ export class CommandPreparer { if (definition.handler != null && definition.chainedHandlers != null && definition.chainedHandlers.length > 0) { throw new ImperativeError({ msg: `A command definition node (${definition.name}) contains both a handler and chained handler ` + - `configuration. The two are mutually exclusive. ${definitonDetails}`, + `configuration. The two are mutually exclusive. ${definitionDetails}`, additionalDetails: JSON.stringify(definition) }); } @@ -204,7 +204,7 @@ export class CommandPreparer { // All nodes must have a type if (definition.type == null || definition.type.trim().length === 0) { throw new ImperativeError({ - msg: `A command definition node (${definition.name}) contains an undefined or empty type. ${definitonDetails}`, + msg: `A command definition node (${definition.name}) contains an undefined or empty type. ${definitionDetails}`, additionalDetails: JSON.stringify(definition) }); } @@ -214,7 +214,7 @@ export class CommandPreparer { (definition.description == null || definition.description.trim().length === 0)) { throw new ImperativeError({ msg: `A command definition node (${definition.name} of type ${definition.type}) contains an ` + - `undefined or empty description. ${definitonDetails}`, + `undefined or empty description. ${definitionDetails}`, additionalDetails: JSON.stringify(definition) }); } @@ -225,13 +225,13 @@ export class CommandPreparer { if (!Array.isArray(definition.options)) { throw new ImperativeError({ msg: `A command definition node (${definition.name} of type ${definition.type}) options are invalid (not an array). ` + - `${definitonDetails}`, + `${definitionDetails}`, additionalDetails: JSON.stringify(definition) }); } // If options are specified, perform validation - CommandPreparer.performBasicOptionValidation(definition.options, definitions); + CommandPreparer.performBasicOptionValidation(definition); } // Check positional arguments are an array @@ -239,19 +239,19 @@ export class CommandPreparer { if (!Array.isArray(definition.positionals)) { throw new ImperativeError({ msg: `A command definition node (${definition.name} of type ${definition.type}) positionals are invalid (not an array). ` + - `${definitonDetails}`, + `${definitionDetails}`, additionalDetails: JSON.stringify(definition) }); } // If positionals are specified, perform validation - CommandPreparer.performBasicPositionalValidation(definition.positionals, definitions); + CommandPreparer.performBasicPositionalValidation(definition); } // Children must be an array if (definition.children != null && !Array.isArray(definition.children)) { throw new ImperativeError({ - msg: `A command definition node (${definition.name} of type ${definition.type}) contains ill-formed children. ${definitonDetails}`, + msg: `A command definition node (${definition.name} of type ${definition.type}) contains ill-formed children. ${definitionDetails}`, additionalDetails: JSON.stringify(definition) }); } @@ -259,7 +259,7 @@ export class CommandPreparer { // A group must have children if (definition.type === "group" && (definition.children == null || definition.children.length === 0)) { throw new ImperativeError({ - msg: `A "group" command definition node (${definition.name}) contains no children. A group implies children. ${definitonDetails}`, + msg: `A "group" command definition node (${definition.name}) contains no children. A group implies children. ${definitionDetails}`, additionalDetails: JSON.stringify(definition) }); } @@ -276,19 +276,18 @@ export class CommandPreparer { * Perform basic positional operand validation. Ensure that the positional operands are valid and well formed. * @private * @static - * @param {ICommandPositionalDefinition[]} positionals - The array of positional operands - * @param {ICommandDefinition[]} currentDefinitions - The current command definitions for assistance in diagnostics + * @param {ICommandDefinition} definition - The command definition containing positionals to be validated * @memberof CommandPreparer */ - private static performBasicPositionalValidation(positionals: ICommandPositionalDefinition[], currentDefinitions: ICommandDefinition[]) { - for (const pos of positionals) { + private static performBasicPositionalValidation(definition: ICommandDefinition) { + for (const pos of definition.positionals) { /** * All positionals must have a name */ if (pos.name == null || pos.name.trim().length === 0) { throw new ImperativeError({ msg: `A positional definition contains an undefined or empty name.`, - additionalDetails: "POSITIONAL_DEFINITION:\n" + JSON.stringify(pos) + "\nCURRENT_TREE:\n" + JSON.stringify(currentDefinitions) + additionalDetails: "POSITIONAL_DEFINITION:\n" + JSON.stringify(pos) + "\nCOMMAND_DEFINITION:\n" + JSON.stringify(definition) }); } @@ -298,7 +297,7 @@ export class CommandPreparer { if (pos.type == null || pos.type.trim().length === 0) { throw new ImperativeError({ msg: `A positional definition (${pos.name}) contains an undefined or empty type.`, - additionalDetails: "POSITIONAL_DEFINITION:\n" + JSON.stringify(pos) + "\nCURRENT_TREE:\n" + JSON.stringify(currentDefinitions) + additionalDetails: "POSITIONAL_DEFINITION:\n" + JSON.stringify(pos) + "\nCOMMAND_DEFINITION:\n" + JSON.stringify(definition) }); } @@ -309,7 +308,7 @@ export class CommandPreparer { throw new ImperativeError({ msg: `A positional definition (${pos.name} of type ${pos.type}) contains an ` + `undefined or empty description.`, - additionalDetails: "POSITIONAL_DEFINITION:\n" + JSON.stringify(pos) + "\nCURRENT_TREE:\n" + JSON.stringify(currentDefinitions) + additionalDetails: "POSITIONAL_DEFINITION:\n" + JSON.stringify(pos) + "\nCOMMAND_DEFINITION:\n" + JSON.stringify(definition) }); } } @@ -319,16 +318,15 @@ export class CommandPreparer { * Perform basic option operand validation. Ensure that the option operands are valid and well formed. * @private * @static - * @param {ICommandOptionDefinition[]} options - The array of options operands - * @param {ICommandDefinition[]} currentDefinitions - The current command definitions for assistance in diagnostics + * @param {ICommandDefinition} definition - The command definition containing options to be validated * @memberof CommandPreparer */ - private static performBasicOptionValidation(options: ICommandOptionDefinition[], currentDefinitions: ICommandDefinition[]) { - for (const opt of options) { + private static performBasicOptionValidation(definition: ICommandDefinition) { + for (const opt of definition.options) { if (opt == null) { throw new ImperativeError({ msg: `An option definition is null or undefined.`, - additionalDetails: `CURRENT_TREE:\n${JSON.stringify(currentDefinitions)}` + additionalDetails: `COMMAND_DEFINITION:\n${JSON.stringify(definition)}` }); } @@ -338,7 +336,7 @@ export class CommandPreparer { if (opt.name == null || opt.name.trim().length === 0) { throw new ImperativeError({ msg: `An option definition contains an undefined or empty name.`, - additionalDetails: "OPTION_DEFINITION:\n" + JSON.stringify(opt) + "\nCURRENT_TREE:\n" + JSON.stringify(currentDefinitions) + additionalDetails: "OPTION_DEFINITION:\n" + JSON.stringify(opt) + "\nCOMMAND_DEFINITION:\n" + JSON.stringify(definition) }); } @@ -348,7 +346,7 @@ export class CommandPreparer { if (opt.type == null || opt.type.trim().length === 0) { throw new ImperativeError({ msg: `An option definition (${opt.name}) contains an undefined or empty type.`, - additionalDetails: "OPTION_DEFINITION:\n" + JSON.stringify(opt) + "\nCURRENT_TREE:\n" + JSON.stringify(currentDefinitions) + additionalDetails: "OPTION_DEFINITION:\n" + JSON.stringify(opt) + "\nCOMMAND_DEFINITION:\n" + JSON.stringify(definition) }); } @@ -359,7 +357,7 @@ export class CommandPreparer { throw new ImperativeError({ msg: `An option definition (${opt.name} of type ${opt.type}) contains an ` + `undefined or empty description.`, - additionalDetails: "OPTION_DEFINITION:\n" + JSON.stringify(opt) + "\nCURRENT_TREE:\n" + JSON.stringify(currentDefinitions) + additionalDetails: "OPTION_DEFINITION:\n" + JSON.stringify(opt) + "\nCOMMAND_DEFINITION:\n" + JSON.stringify(definition) }); } } From af76bba9c3462803ce7c9311c74c70a7ae4fe934 Mon Sep 17 00:00:00 2001 From: Timothy Johnson Date: Wed, 3 Jan 2024 15:07:59 -0500 Subject: [PATCH 047/138] Remove unused import and correct changelog Signed-off-by: Timothy Johnson --- packages/cli/CHANGELOG.md | 2 +- packages/imperative/src/cmd/src/CommandPreparer.ts | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/packages/cli/CHANGELOG.md b/packages/cli/CHANGELOG.md index 258ed9eb09..f1eade2004 100644 --- a/packages/cli/CHANGELOG.md +++ b/packages/cli/CHANGELOG.md @@ -4,7 +4,7 @@ All notable changes to the Zowe CLI package will be documented in this file. ## Recent Changes -- BugFix: Fixed typo in command help for `zowe workflows create workflow-from-data-set`. +- BugFix: Fixed typo in command help for `zowe zos-workflows create` commands. ## `7.20.1` diff --git a/packages/imperative/src/cmd/src/CommandPreparer.ts b/packages/imperative/src/cmd/src/CommandPreparer.ts index 9f14695d72..5903f2533a 100644 --- a/packages/imperative/src/cmd/src/CommandPreparer.ts +++ b/packages/imperative/src/cmd/src/CommandPreparer.ts @@ -19,7 +19,6 @@ import { OptionConstants } from "./constants/OptionConstants"; import * as DeepMerge from "deepmerge"; import { ICommandProfileTypeConfiguration } from "./doc/profiles/definition/ICommandProfileTypeConfiguration"; import { ICommandOptionDefinition } from "./doc/option/ICommandOptionDefinition"; -import { ICommandPositionalDefinition } from "./doc/option/ICommandPositionalDefinition"; /** * Command preparer provides static utilities to ensure that command definitions are suitable for Imperative definition. From eed308b4337db100a4fcb6911d36d95b806380a6 Mon Sep 17 00:00:00 2001 From: Gene Johnston Date: Wed, 3 Jan 2024 15:23:34 -0500 Subject: [PATCH 048/138] Removed obsolete snapshots Signed-off-by: Gene Johnston --- ...imperative.secure.integration.test.ts.snap | 40 ------------------- 1 file changed, 40 deletions(-) diff --git a/__tests__/__integration__/__snapshots__/imperative.secure.integration.test.ts.snap b/__tests__/__integration__/__snapshots__/imperative.secure.integration.test.ts.snap index cc24441879..b2f87f5e74 100644 --- a/__tests__/__integration__/__snapshots__/imperative.secure.integration.test.ts.snap +++ b/__tests__/__integration__/__snapshots__/imperative.secure.integration.test.ts.snap @@ -1,45 +1,5 @@ // Jest Snapshot v1, https://goo.gl/fbAQLP -exports[`Imperative Secure Tests Cli Profile Manager Default Credential Management Generic Failure Scenarios should fail if the Credential Manager is unable to retrieve a password 1`] = ` -"Command Preparation Failed: -Unable to load the secure field \\"username\\" associated with the profile \\"profile-name-changed\\" of type \\"username-password\\". -Error Details: -Unable to load credentials. -Could not find an entry in the credential vault for the following: - Service = example_with_profiles - Account = username-password_profile-name-changed_username - -Possible Causes: - This could have been caused by any manual removal of credentials from your vault. - -Resolutions: - Recreate the credentials in the vault for the particular service in the vault. - To recreate credentials, issue a 'profiles create' sub-command with the --ow flag. - -" -`; - -exports[`Imperative Secure Tests Cli Profile Manager Default Credential Management Generic Failure Scenarios should fail if the Credential Manager is unable to retrieve a password 2`] = ` -"Your default profile named profile-name of type username-password was successfully deleted. -Because you deleted it, the default profile for type username-password has been cleared. -To set a new default profile, run \\"zowe profiles set-default username-password \\". -" -`; - -exports[`Imperative Secure Tests Cli Profile Manager Default Credential Management Generic Success Scenarios should update a password 1`] = ` -" -Warning: The command 'profiles update' is deprecated. -Recommended replacement: The 'config set' command -" -`; - -exports[`Imperative Secure Tests Cli Profile Manager Default Credential Management Generic Success Scenarios should update a password 2`] = ` -"Your default profile named profile-name of type username-password was successfully deleted. -Because you deleted it, the default profile for type username-password has been cleared. -To set a new default profile, run \\"zowe profiles set-default username-password \\". -" -`; - exports[`Imperative Secure Tests imperative-test-cli config profiles should list profiles 1`] = ` "secured base From b04d3f0afba1b0a5d955587eab2bc6c59e85650e Mon Sep 17 00:00:00 2001 From: KevinLoesch1 Date: Wed, 3 Jan 2024 15:36:40 -0500 Subject: [PATCH 049/138] Update unit test Signed-off-by: KevinLoesch1 --- .../compare/ds/Dataset.handler.unit.test.ts | 64 +++++++++---------- 1 file changed, 32 insertions(+), 32 deletions(-) diff --git a/packages/cli/__tests__/zosfiles/__unit__/compare/ds/Dataset.handler.unit.test.ts b/packages/cli/__tests__/zosfiles/__unit__/compare/ds/Dataset.handler.unit.test.ts index 7fbed7a0cf..6baac9018d 100644 --- a/packages/cli/__tests__/zosfiles/__unit__/compare/ds/Dataset.handler.unit.test.ts +++ b/packages/cli/__tests__/zosfiles/__unit__/compare/ds/Dataset.handler.unit.test.ts @@ -178,40 +178,40 @@ describe("Compare data set handler", () => { expect(getDiffStringSpy).toHaveBeenCalledWith("compared", "compared", options); }); - it("should compare two data sets containing carriage returns in terminal with --seqnum specified(Windows Specific)", async () => { - if(process.platform === "win32") - { - const processArgCopy: any = { - ...processArguments, - arguments:{ - ...processArguments.arguments, - seqnum: false, + (process.platform === "win32" ? it : it.skip)( + "should compare two data sets containing carriage returns in terminal with --seqnum specified(Windows Specific)", async() => { + { + const processArgCopy: any = { + ...processArguments, + arguments:{ + ...processArguments.arguments, + seqnum: false, + } + }; + + //overwrite ds(strings 1 & 2) to include seqnums to chop off in LocalFileDatasetHandler + getDataSetSpy.mockImplementation(jest.fn(async (session) => { + fakeSession = session; + return Buffer.from("compared12345678\r\n"); + })); + + try { + // Invoke the handler with a full set of mocked arguments and response functions + await handler.process(processArgCopy); + } catch (e) { + error = e; } - }; - - //overwrite ds(strings 1 & 2) to include seqnums to chop off in LocalFileDatasetHandler - getDataSetSpy.mockImplementation(jest.fn(async (session) => { - fakeSession = session; - return Buffer.from("compared12345678\r\n"); - })); - - try { - // Invoke the handler with a full set of mocked arguments and response functions - await handler.process(processArgCopy); - } catch (e) { - error = e; - } - expect(error).toBeUndefined(); - expect(getDataSetSpy).toHaveBeenCalledTimes(2); - expect(getDiffStringSpy).toHaveBeenCalledTimes(1); - expect(apiMessage).toEqual(""); - expect(logMessage).toEqual("compared string"); - expect(getDataSetSpy).toHaveBeenCalledWith(fakeSession as any, dataSetName1, { task: dsTask }); - expect(jsonObj).toMatchObject({commandResponse: "compared string", success: true}); - expect(getDiffStringSpy).toHaveBeenCalledWith("compared\n", "compared\n", options); - } - }); + expect(error).toBeUndefined(); + expect(getDataSetSpy).toHaveBeenCalledTimes(2); + expect(getDiffStringSpy).toHaveBeenCalledTimes(1); + expect(apiMessage).toEqual(""); + expect(logMessage).toEqual("compared string"); + expect(getDataSetSpy).toHaveBeenCalledWith(fakeSession as any, dataSetName1, { task: dsTask }); + expect(jsonObj).toMatchObject({commandResponse: "compared string", success: true}); + expect(getDiffStringSpy).toHaveBeenCalledWith("compared\n", "compared\n", options); + } + }); it("should compare two data sets in browser", async () => { openDiffInbrowserSpy.mockImplementation(jest.fn()); From b5aa0ec6601ac6ec5df3bd4c5d365dfb2e7272a5 Mon Sep 17 00:00:00 2001 From: Timothy Johnson Date: Wed, 3 Jan 2024 15:43:09 -0500 Subject: [PATCH 050/138] Fix more typos in workflow create commands Signed-off-by: Timothy Johnson --- ...cli.workflows.create.workflowDs.integration.test.ts.snap | 6 +++--- ...li.workflows.create.workflowUss.integration.test.ts.snap | 6 +++--- .../__snapshots__/Dataset.definition.unit.test.ts.snap | 4 ++-- .../__snapshots__/LocalFile.definition.unit.test.ts.snap | 2 +- .../__snapshots__/UssFile.definition.unit.test.ts.snap | 2 +- .../cli/src/workflows/create/dataset/Dataset.definition.ts | 4 ++-- .../src/workflows/create/localfile/LocalFile.definition.ts | 2 +- .../cli/src/workflows/create/ussfile/UssFile.definition.ts | 2 +- 8 files changed, 14 insertions(+), 14 deletions(-) diff --git a/packages/cli/__tests__/workflows/__integration__/create/dataset/__snapshots__/cli.workflows.create.workflowDs.integration.test.ts.snap b/packages/cli/__tests__/workflows/__integration__/create/dataset/__snapshots__/cli.workflows.create.workflowDs.integration.test.ts.snap index 2eeb06ba3a..64c609dd66 100644 --- a/packages/cli/__tests__/workflows/__integration__/create/dataset/__snapshots__/cli.workflows.create.workflowDs.integration.test.ts.snap +++ b/packages/cli/__tests__/workflows/__integration__/create/dataset/__snapshots__/cli.workflows.create.workflowDs.integration.test.ts.snap @@ -212,7 +212,7 @@ exports[`Create workflow with data set integration test should display create wo - Create a workflow with name \\"testworkflow\\" using data set \\"TESTID.WKFLOW\\" containing workflow definition xml, on system \\"TESTM1\\" with - owner \\"MYSYSID\\" and delete succesfully completed jobs: + owner \\"MYSYSID\\" and delete successfully completed jobs: $ zowe zos-workflows create workflow-from-data-set \\"testworkflow\\" --data-set \\"TESTID.WKFLOW\\" --system-name \\"TESTM1\\" --owner \\"MYSYSID\\" --delete-completed @@ -235,8 +235,8 @@ exports[`Create workflow with data set integration test should display create wo \\"success\\": true, \\"exitCode\\": 0, \\"message\\": \\"The help was constructed for command: workflow-from-data-set.\\", - \\"stdout\\": \\"\\\\n COMMAND NAME\\\\n ------------\\\\n\\\\n workflow-from-data-set | wfds\\\\n\\\\n DESCRIPTION\\\\n -----------\\\\n\\\\n Create a z/OSMF workflow on a z/OS system using a Data set\\\\n\\\\n USAGE\\\\n -----\\\\n\\\\n zowe zos-workflows create workflow-from-data-set [options]\\\\n\\\\n POSITIONAL ARGUMENTS\\\\n --------------------\\\\n\\\\n workflowName\\\\t\\\\t (string)\\\\n\\\\n Name of the workflow\\\\n\\\\n REQUIRED OPTIONS\\\\n ----------------\\\\n\\\\n --data-set | --ds (string)\\\\n\\\\n Data set that contains a workflow definition.\\\\n\\\\n --system-name | --sn (string)\\\\n\\\\n z/OS system to execute the workflow.\\\\n\\\\n --owner | --ow (string)\\\\n\\\\n User ID of the workflow owner. This user can perform the workflow steps or\\\\n delegate the steps to other users.\\\\n\\\\n OPTIONS\\\\n -------\\\\n\\\\n --variables-input-file | --vif (string)\\\\n\\\\n Specifies an optional properties file that you can use to pre-specify values for\\\\n one or more of the variables that are defined in the workflow definition file.\\\\n\\\\n --variables | --vs (string)\\\\n\\\\n Includes a list of variables for the workflow. The variables that you specify\\\\n here take precedence over the variables that are specified in the workflow\\\\n variable input file. Make sure the value meets all regular expression\\\\n requirements set for the corresponding variable.\\\\n\\\\n --assign-to-owner | --ato (boolean)\\\\n\\\\n Indicates whether the workflow steps are assigned to the workflow owner.\\\\n\\\\n --access-type | --at (string)\\\\n\\\\n Specifies the access type for the workflow. Public, Restricted or Private.\\\\n\\\\n Allowed values: Public, Restricted, Private\\\\n\\\\n --delete-completed | --dc (boolean)\\\\n\\\\n Whether the successfully completed jobs to be deleted from the JES spool.\\\\n\\\\n --overwrite | --ov (boolean)\\\\n\\\\n Replaces an existing workflow with a new workflow.\\\\n\\\\n ZOSMF CONNECTION OPTIONS\\\\n ------------------------\\\\n\\\\n --host | -H (string)\\\\n\\\\n The z/OSMF server host name.\\\\n\\\\n --port | -P (number)\\\\n\\\\n The z/OSMF server port.\\\\n\\\\n Default value: 443\\\\n\\\\n --user | -u (string)\\\\n\\\\n Mainframe (z/OSMF) user name, which can be the same as your TSO login.\\\\n\\\\n --password | --pass | --pw (string)\\\\n\\\\n Mainframe (z/OSMF) password, which can be the same as your TSO password.\\\\n\\\\n --reject-unauthorized | --ru (boolean)\\\\n\\\\n Reject self-signed certificates.\\\\n\\\\n Default value: true\\\\n\\\\n --base-path | --bp (string)\\\\n\\\\n The base path for your API mediation layer instance. Specify this option to\\\\n prepend the base path to all z/OSMF resources when making REST requests. Do not\\\\n specify this option if you are not using an API mediation layer.\\\\n\\\\n --protocol (string)\\\\n\\\\n The protocol used (HTTP or HTTPS)\\\\n\\\\n Default value: https\\\\n Allowed values: http, https\\\\n\\\\n --cert-file (local file path)\\\\n\\\\n The file path to a certificate file to use for authentication\\\\n\\\\n --cert-key-file (local file path)\\\\n\\\\n The file path to a certificate key file to use for authentication\\\\n\\\\n PROFILE OPTIONS\\\\n ---------------\\\\n\\\\n --zosmf-profile | --zosmf-p (string)\\\\n\\\\n The name of a (zosmf) profile to load for this command execution.\\\\n\\\\n --base-profile | --base-p (string)\\\\n\\\\n The name of a (base) profile to load for this command execution.\\\\n\\\\n BASE CONNECTION OPTIONS\\\\n -----------------------\\\\n\\\\n --token-type | --tt (string)\\\\n\\\\n The type of token to get and use for the API. Omit this option to use the\\\\n default token type, which is provided by 'zowe auth login'.\\\\n\\\\n --token-value | --tv (string)\\\\n\\\\n The value of the token to pass to the API.\\\\n\\\\n RESPONSE FORMAT OPTIONS\\\\n -----------------------\\\\n\\\\n --response-format-filter | --rff (array)\\\\n\\\\n Filter (include) fields in the response. Accepts an array of field/property\\\\n names to include in the output response. You can filter JSON objects properties\\\\n OR table columns/fields. In addition, you can use this option in conjunction\\\\n with '--response-format-type' to reduce the output of a command to a single\\\\n field/property or a list of a single field/property.\\\\n\\\\n --response-format-type | --rft (string)\\\\n\\\\n The command response output format type. Must be one of the following:\\\\n\\\\n table: Formats output data as a table. Use this option when the output data is\\\\n an array of homogeneous JSON objects. Each property of the object will become a\\\\n column in the table.\\\\n\\\\n list: Formats output data as a list of strings. Can be used on any data type\\\\n (JSON objects/arrays) are stringified and a new line is added after each entry\\\\n in an array.\\\\n\\\\n object: Formats output data as a list of prettified objects (or single object).\\\\n Can be used in place of \\\\\\"table\\\\\\" to change from tabular output to a list of\\\\n prettified objects.\\\\n\\\\n string: Formats output data as a string. JSON objects/arrays are stringified.\\\\n\\\\n Allowed values: table, list, object, string\\\\n\\\\n --response-format-header | --rfh (boolean)\\\\n\\\\n If \\\\\\"--response-format-type table\\\\\\" is specified, include the column headers in\\\\n the output.\\\\n\\\\n GLOBAL OPTIONS\\\\n --------------\\\\n\\\\n --show-inputs-only (boolean)\\\\n\\\\n Show command inputs and do not run the command\\\\n\\\\n --response-format-json | --rfj (boolean)\\\\n\\\\n Produce JSON formatted data from a command\\\\n\\\\n --help | -h (boolean)\\\\n\\\\n Display help text\\\\n\\\\n --help-web | --hw (boolean)\\\\n\\\\n Display HTML help in browser\\\\n\\\\n EXAMPLES\\\\n --------\\\\n\\\\n - Create a workflow with name \\\\\\"testworkflow\\\\\\" using the data\\\\n set \\\\\\"TESTID.WKFLOW\\\\\\" that contains the workflow definition xml on the system\\\\n \\\\\\"TESTM1\\\\\\" with owner \\\\\\"OTHERID\\\\\\" and delete workflow with the same name if it\\\\n already exist in z/OSMF:\\\\n\\\\n $ zowe zos-workflows create workflow-from-data-set \\\\\\"testworkflow\\\\\\" --data-set \\\\\\"TESTID.WKFLOW\\\\\\" --system-name \\\\\\"TESTM1\\\\\\" --owner \\\\\\"OTHERID\\\\\\" --overwrite\\\\n\\\\n - Create a workflow with name \\\\\\"testworkflow\\\\\\" using data set\\\\n \\\\\\"TESTID.WKFLOW\\\\\\" containing workflow definition xml, on system \\\\\\"TESTM1\\\\\\" with\\\\n owner \\\\\\"MYSYSID\\\\\\" and delete succesfully completed jobs:\\\\n\\\\n $ zowe zos-workflows create workflow-from-data-set \\\\\\"testworkflow\\\\\\" --data-set \\\\\\"TESTID.WKFLOW\\\\\\" --system-name \\\\\\"TESTM1\\\\\\" --owner \\\\\\"MYSYSID\\\\\\" --delete-completed\\\\n\\\\n - Create a workflow with name \\\\\\"testworkflow\\\\\\" using data set\\\\n \\\\\\"TESTID.WKFLOW\\\\\\" containing workflow definition xml, on system \\\\\\"TESTM1\\\\\\" with\\\\n owner \\\\\\"MYSYSID\\\\\\" and with variable values in the member PROPERTIES of data set\\\\n TESTID.DATA:\\\\n\\\\n $ zowe zos-workflows create workflow-from-data-set \\\\\\"testworkflow\\\\\\" --data-set \\\\\\"TESTID.WKFLOW\\\\\\" --system-name \\\\\\"TESTM1\\\\\\" --owner \\\\\\"MYSYSID\\\\\\" --variables-input-file TESTID.DATA(PROPERTIES)\\\\n\\\\n - Create a workflow with name \\\\\\"testworkflow\\\\\\" using the data\\\\n set \\\\\\"TESTID.WKFLOW\\\\\\" that contains a workflow definition xml, on a system\\\\n \\\\\\"TESTM1\\\\\\" with owner \\\\\\"MYSYSID\\\\\\" and with the variable name DUMMYVAR and the value\\\\n DUMMYVAL. Assign it to the owner:\\\\n\\\\n $ zowe zos-workflows create workflow-from-data-set \\\\\\"testworkflow\\\\\\" --data-set \\\\\\"TESTID.WKFLOW\\\\\\" --system-name \\\\\\"TESTM1\\\\\\" --owner \\\\\\"MYSYSID\\\\\\" --variables DUMMYVAR=DUMMYVAL --assign-to-owner\\\\n\\\\n\\", + \\"stdout\\": \\"\\\\n COMMAND NAME\\\\n ------------\\\\n\\\\n workflow-from-data-set | wfds\\\\n\\\\n DESCRIPTION\\\\n -----------\\\\n\\\\n Create a z/OSMF workflow on a z/OS system using a Data set\\\\n\\\\n USAGE\\\\n -----\\\\n\\\\n zowe zos-workflows create workflow-from-data-set [options]\\\\n\\\\n POSITIONAL ARGUMENTS\\\\n --------------------\\\\n\\\\n workflowName\\\\t\\\\t (string)\\\\n\\\\n Name of the workflow\\\\n\\\\n REQUIRED OPTIONS\\\\n ----------------\\\\n\\\\n --data-set | --ds (string)\\\\n\\\\n Data set that contains a workflow definition.\\\\n\\\\n --system-name | --sn (string)\\\\n\\\\n z/OS system to execute the workflow.\\\\n\\\\n --owner | --ow (string)\\\\n\\\\n User ID of the workflow owner. This user can perform the workflow steps or\\\\n delegate the steps to other users.\\\\n\\\\n OPTIONS\\\\n -------\\\\n\\\\n --variables-input-file | --vif (string)\\\\n\\\\n Specifies an optional properties file that you can use to pre-specify values for\\\\n one or more of the variables that are defined in the workflow definition file.\\\\n\\\\n --variables | --vs (string)\\\\n\\\\n Includes a list of variables for the workflow. The variables that you specify\\\\n here take precedence over the variables that are specified in the workflow\\\\n variable input file. Make sure the value meets all regular expression\\\\n requirements set for the corresponding variable.\\\\n\\\\n --assign-to-owner | --ato (boolean)\\\\n\\\\n Indicates whether the workflow steps are assigned to the workflow owner.\\\\n\\\\n --access-type | --at (string)\\\\n\\\\n Specifies the access type for the workflow. Public, Restricted or Private.\\\\n\\\\n Allowed values: Public, Restricted, Private\\\\n\\\\n --delete-completed | --dc (boolean)\\\\n\\\\n Whether the successfully completed jobs to be deleted from the JES spool.\\\\n\\\\n --overwrite | --ov (boolean)\\\\n\\\\n Replaces an existing workflow with a new workflow.\\\\n\\\\n ZOSMF CONNECTION OPTIONS\\\\n ------------------------\\\\n\\\\n --host | -H (string)\\\\n\\\\n The z/OSMF server host name.\\\\n\\\\n --port | -P (number)\\\\n\\\\n The z/OSMF server port.\\\\n\\\\n Default value: 443\\\\n\\\\n --user | -u (string)\\\\n\\\\n Mainframe (z/OSMF) user name, which can be the same as your TSO login.\\\\n\\\\n --password | --pass | --pw (string)\\\\n\\\\n Mainframe (z/OSMF) password, which can be the same as your TSO password.\\\\n\\\\n --reject-unauthorized | --ru (boolean)\\\\n\\\\n Reject self-signed certificates.\\\\n\\\\n Default value: true\\\\n\\\\n --base-path | --bp (string)\\\\n\\\\n The base path for your API mediation layer instance. Specify this option to\\\\n prepend the base path to all z/OSMF resources when making REST requests. Do not\\\\n specify this option if you are not using an API mediation layer.\\\\n\\\\n --protocol (string)\\\\n\\\\n The protocol used (HTTP or HTTPS)\\\\n\\\\n Default value: https\\\\n Allowed values: http, https\\\\n\\\\n --cert-file (local file path)\\\\n\\\\n The file path to a certificate file to use for authentication\\\\n\\\\n --cert-key-file (local file path)\\\\n\\\\n The file path to a certificate key file to use for authentication\\\\n\\\\n PROFILE OPTIONS\\\\n ---------------\\\\n\\\\n --zosmf-profile | --zosmf-p (string)\\\\n\\\\n The name of a (zosmf) profile to load for this command execution.\\\\n\\\\n --base-profile | --base-p (string)\\\\n\\\\n The name of a (base) profile to load for this command execution.\\\\n\\\\n BASE CONNECTION OPTIONS\\\\n -----------------------\\\\n\\\\n --token-type | --tt (string)\\\\n\\\\n The type of token to get and use for the API. Omit this option to use the\\\\n default token type, which is provided by 'zowe auth login'.\\\\n\\\\n --token-value | --tv (string)\\\\n\\\\n The value of the token to pass to the API.\\\\n\\\\n RESPONSE FORMAT OPTIONS\\\\n -----------------------\\\\n\\\\n --response-format-filter | --rff (array)\\\\n\\\\n Filter (include) fields in the response. Accepts an array of field/property\\\\n names to include in the output response. You can filter JSON objects properties\\\\n OR table columns/fields. In addition, you can use this option in conjunction\\\\n with '--response-format-type' to reduce the output of a command to a single\\\\n field/property or a list of a single field/property.\\\\n\\\\n --response-format-type | --rft (string)\\\\n\\\\n The command response output format type. Must be one of the following:\\\\n\\\\n table: Formats output data as a table. Use this option when the output data is\\\\n an array of homogeneous JSON objects. Each property of the object will become a\\\\n column in the table.\\\\n\\\\n list: Formats output data as a list of strings. Can be used on any data type\\\\n (JSON objects/arrays) are stringified and a new line is added after each entry\\\\n in an array.\\\\n\\\\n object: Formats output data as a list of prettified objects (or single object).\\\\n Can be used in place of \\\\\\"table\\\\\\" to change from tabular output to a list of\\\\n prettified objects.\\\\n\\\\n string: Formats output data as a string. JSON objects/arrays are stringified.\\\\n\\\\n Allowed values: table, list, object, string\\\\n\\\\n --response-format-header | --rfh (boolean)\\\\n\\\\n If \\\\\\"--response-format-type table\\\\\\" is specified, include the column headers in\\\\n the output.\\\\n\\\\n GLOBAL OPTIONS\\\\n --------------\\\\n\\\\n --show-inputs-only (boolean)\\\\n\\\\n Show command inputs and do not run the command\\\\n\\\\n --response-format-json | --rfj (boolean)\\\\n\\\\n Produce JSON formatted data from a command\\\\n\\\\n --help | -h (boolean)\\\\n\\\\n Display help text\\\\n\\\\n --help-web | --hw (boolean)\\\\n\\\\n Display HTML help in browser\\\\n\\\\n EXAMPLES\\\\n --------\\\\n\\\\n - Create a workflow with name \\\\\\"testworkflow\\\\\\" using the data\\\\n set \\\\\\"TESTID.WKFLOW\\\\\\" that contains the workflow definition xml on the system\\\\n \\\\\\"TESTM1\\\\\\" with owner \\\\\\"OTHERID\\\\\\" and delete workflow with the same name if it\\\\n already exist in z/OSMF:\\\\n\\\\n $ zowe zos-workflows create workflow-from-data-set \\\\\\"testworkflow\\\\\\" --data-set \\\\\\"TESTID.WKFLOW\\\\\\" --system-name \\\\\\"TESTM1\\\\\\" --owner \\\\\\"OTHERID\\\\\\" --overwrite\\\\n\\\\n - Create a workflow with name \\\\\\"testworkflow\\\\\\" using data set\\\\n \\\\\\"TESTID.WKFLOW\\\\\\" containing workflow definition xml, on system \\\\\\"TESTM1\\\\\\" with\\\\n owner \\\\\\"MYSYSID\\\\\\" and delete successfully completed jobs:\\\\n\\\\n $ zowe zos-workflows create workflow-from-data-set \\\\\\"testworkflow\\\\\\" --data-set \\\\\\"TESTID.WKFLOW\\\\\\" --system-name \\\\\\"TESTM1\\\\\\" --owner \\\\\\"MYSYSID\\\\\\" --delete-completed\\\\n\\\\n - Create a workflow with name \\\\\\"testworkflow\\\\\\" using data set\\\\n \\\\\\"TESTID.WKFLOW\\\\\\" containing workflow definition xml, on system \\\\\\"TESTM1\\\\\\" with\\\\n owner \\\\\\"MYSYSID\\\\\\" and with variable values in the member PROPERTIES of data set\\\\n TESTID.DATA:\\\\n\\\\n $ zowe zos-workflows create workflow-from-data-set \\\\\\"testworkflow\\\\\\" --data-set \\\\\\"TESTID.WKFLOW\\\\\\" --system-name \\\\\\"TESTM1\\\\\\" --owner \\\\\\"MYSYSID\\\\\\" --variables-input-file TESTID.DATA(PROPERTIES)\\\\n\\\\n - Create a workflow with name \\\\\\"testworkflow\\\\\\" using the data\\\\n set \\\\\\"TESTID.WKFLOW\\\\\\" that contains a workflow definition xml, on a system\\\\n \\\\\\"TESTM1\\\\\\" with owner \\\\\\"MYSYSID\\\\\\" and with the variable name DUMMYVAR and the value\\\\n DUMMYVAL. Assign it to the owner:\\\\n\\\\n $ zowe zos-workflows create workflow-from-data-set \\\\\\"testworkflow\\\\\\" --data-set \\\\\\"TESTID.WKFLOW\\\\\\" --system-name \\\\\\"TESTM1\\\\\\" --owner \\\\\\"MYSYSID\\\\\\" --variables DUMMYVAR=DUMMYVAL --assign-to-owner\\\\n\\\\n\\", \\"stderr\\": \\"\\", - \\"data\\": \\"\\\\n COMMAND NAME\\\\n ------------\\\\n\\\\n workflow-from-data-set | wfds\\\\n\\\\n DESCRIPTION\\\\n -----------\\\\n\\\\n Create a z/OSMF workflow on a z/OS system using a Data set\\\\n\\\\n USAGE\\\\n -----\\\\n\\\\n zowe zos-workflows create workflow-from-data-set [options]\\\\n\\\\n POSITIONAL ARGUMENTS\\\\n --------------------\\\\n\\\\n workflowName\\\\t\\\\t (string)\\\\n\\\\n Name of the workflow\\\\n\\\\n REQUIRED OPTIONS\\\\n ----------------\\\\n\\\\n --data-set | --ds (string)\\\\n\\\\n Data set that contains a workflow definition.\\\\n\\\\n --system-name | --sn (string)\\\\n\\\\n z/OS system to execute the workflow.\\\\n\\\\n --owner | --ow (string)\\\\n\\\\n User ID of the workflow owner. This user can perform the workflow steps or\\\\n delegate the steps to other users.\\\\n\\\\n OPTIONS\\\\n -------\\\\n\\\\n --variables-input-file | --vif (string)\\\\n\\\\n Specifies an optional properties file that you can use to pre-specify values for\\\\n one or more of the variables that are defined in the workflow definition file.\\\\n\\\\n --variables | --vs (string)\\\\n\\\\n Includes a list of variables for the workflow. The variables that you specify\\\\n here take precedence over the variables that are specified in the workflow\\\\n variable input file. Make sure the value meets all regular expression\\\\n requirements set for the corresponding variable.\\\\n\\\\n --assign-to-owner | --ato (boolean)\\\\n\\\\n Indicates whether the workflow steps are assigned to the workflow owner.\\\\n\\\\n --access-type | --at (string)\\\\n\\\\n Specifies the access type for the workflow. Public, Restricted or Private.\\\\n\\\\n Allowed values: Public, Restricted, Private\\\\n\\\\n --delete-completed | --dc (boolean)\\\\n\\\\n Whether the successfully completed jobs to be deleted from the JES spool.\\\\n\\\\n --overwrite | --ov (boolean)\\\\n\\\\n Replaces an existing workflow with a new workflow.\\\\n\\\\n ZOSMF CONNECTION OPTIONS\\\\n ------------------------\\\\n\\\\n --host | -H (string)\\\\n\\\\n The z/OSMF server host name.\\\\n\\\\n --port | -P (number)\\\\n\\\\n The z/OSMF server port.\\\\n\\\\n Default value: 443\\\\n\\\\n --user | -u (string)\\\\n\\\\n Mainframe (z/OSMF) user name, which can be the same as your TSO login.\\\\n\\\\n --password | --pass | --pw (string)\\\\n\\\\n Mainframe (z/OSMF) password, which can be the same as your TSO password.\\\\n\\\\n --reject-unauthorized | --ru (boolean)\\\\n\\\\n Reject self-signed certificates.\\\\n\\\\n Default value: true\\\\n\\\\n --base-path | --bp (string)\\\\n\\\\n The base path for your API mediation layer instance. Specify this option to\\\\n prepend the base path to all z/OSMF resources when making REST requests. Do not\\\\n specify this option if you are not using an API mediation layer.\\\\n\\\\n --protocol (string)\\\\n\\\\n The protocol used (HTTP or HTTPS)\\\\n\\\\n Default value: https\\\\n Allowed values: http, https\\\\n\\\\n --cert-file (local file path)\\\\n\\\\n The file path to a certificate file to use for authentication\\\\n\\\\n --cert-key-file (local file path)\\\\n\\\\n The file path to a certificate key file to use for authentication\\\\n\\\\n PROFILE OPTIONS\\\\n ---------------\\\\n\\\\n --zosmf-profile | --zosmf-p (string)\\\\n\\\\n The name of a (zosmf) profile to load for this command execution.\\\\n\\\\n --base-profile | --base-p (string)\\\\n\\\\n The name of a (base) profile to load for this command execution.\\\\n\\\\n BASE CONNECTION OPTIONS\\\\n -----------------------\\\\n\\\\n --token-type | --tt (string)\\\\n\\\\n The type of token to get and use for the API. Omit this option to use the\\\\n default token type, which is provided by 'zowe auth login'.\\\\n\\\\n --token-value | --tv (string)\\\\n\\\\n The value of the token to pass to the API.\\\\n\\\\n RESPONSE FORMAT OPTIONS\\\\n -----------------------\\\\n\\\\n --response-format-filter | --rff (array)\\\\n\\\\n Filter (include) fields in the response. Accepts an array of field/property\\\\n names to include in the output response. You can filter JSON objects properties\\\\n OR table columns/fields. In addition, you can use this option in conjunction\\\\n with '--response-format-type' to reduce the output of a command to a single\\\\n field/property or a list of a single field/property.\\\\n\\\\n --response-format-type | --rft (string)\\\\n\\\\n The command response output format type. Must be one of the following:\\\\n\\\\n table: Formats output data as a table. Use this option when the output data is\\\\n an array of homogeneous JSON objects. Each property of the object will become a\\\\n column in the table.\\\\n\\\\n list: Formats output data as a list of strings. Can be used on any data type\\\\n (JSON objects/arrays) are stringified and a new line is added after each entry\\\\n in an array.\\\\n\\\\n object: Formats output data as a list of prettified objects (or single object).\\\\n Can be used in place of \\\\\\"table\\\\\\" to change from tabular output to a list of\\\\n prettified objects.\\\\n\\\\n string: Formats output data as a string. JSON objects/arrays are stringified.\\\\n\\\\n Allowed values: table, list, object, string\\\\n\\\\n --response-format-header | --rfh (boolean)\\\\n\\\\n If \\\\\\"--response-format-type table\\\\\\" is specified, include the column headers in\\\\n the output.\\\\n\\\\n GLOBAL OPTIONS\\\\n --------------\\\\n\\\\n --show-inputs-only (boolean)\\\\n\\\\n Show command inputs and do not run the command\\\\n\\\\n --response-format-json | --rfj (boolean)\\\\n\\\\n Produce JSON formatted data from a command\\\\n\\\\n --help | -h (boolean)\\\\n\\\\n Display help text\\\\n\\\\n --help-web | --hw (boolean)\\\\n\\\\n Display HTML help in browser\\\\n\\\\n EXAMPLES\\\\n --------\\\\n\\\\n - Create a workflow with name \\\\\\"testworkflow\\\\\\" using the data\\\\n set \\\\\\"TESTID.WKFLOW\\\\\\" that contains the workflow definition xml on the system\\\\n \\\\\\"TESTM1\\\\\\" with owner \\\\\\"OTHERID\\\\\\" and delete workflow with the same name if it\\\\n already exist in z/OSMF:\\\\n\\\\n $ zowe zos-workflows create workflow-from-data-set \\\\\\"testworkflow\\\\\\" --data-set \\\\\\"TESTID.WKFLOW\\\\\\" --system-name \\\\\\"TESTM1\\\\\\" --owner \\\\\\"OTHERID\\\\\\" --overwrite\\\\n\\\\n - Create a workflow with name \\\\\\"testworkflow\\\\\\" using data set\\\\n \\\\\\"TESTID.WKFLOW\\\\\\" containing workflow definition xml, on system \\\\\\"TESTM1\\\\\\" with\\\\n owner \\\\\\"MYSYSID\\\\\\" and delete succesfully completed jobs:\\\\n\\\\n $ zowe zos-workflows create workflow-from-data-set \\\\\\"testworkflow\\\\\\" --data-set \\\\\\"TESTID.WKFLOW\\\\\\" --system-name \\\\\\"TESTM1\\\\\\" --owner \\\\\\"MYSYSID\\\\\\" --delete-completed\\\\n\\\\n - Create a workflow with name \\\\\\"testworkflow\\\\\\" using data set\\\\n \\\\\\"TESTID.WKFLOW\\\\\\" containing workflow definition xml, on system \\\\\\"TESTM1\\\\\\" with\\\\n owner \\\\\\"MYSYSID\\\\\\" and with variable values in the member PROPERTIES of data set\\\\n TESTID.DATA:\\\\n\\\\n $ zowe zos-workflows create workflow-from-data-set \\\\\\"testworkflow\\\\\\" --data-set \\\\\\"TESTID.WKFLOW\\\\\\" --system-name \\\\\\"TESTM1\\\\\\" --owner \\\\\\"MYSYSID\\\\\\" --variables-input-file TESTID.DATA(PROPERTIES)\\\\n\\\\n - Create a workflow with name \\\\\\"testworkflow\\\\\\" using the data\\\\n set \\\\\\"TESTID.WKFLOW\\\\\\" that contains a workflow definition xml, on a system\\\\n \\\\\\"TESTM1\\\\\\" with owner \\\\\\"MYSYSID\\\\\\" and with the variable name DUMMYVAR and the value\\\\n DUMMYVAL. Assign it to the owner:\\\\n\\\\n $ zowe zos-workflows create workflow-from-data-set \\\\\\"testworkflow\\\\\\" --data-set \\\\\\"TESTID.WKFLOW\\\\\\" --system-name \\\\\\"TESTM1\\\\\\" --owner \\\\\\"MYSYSID\\\\\\" --variables DUMMYVAR=DUMMYVAL --assign-to-owner\\\\n\\\\n\\" + \\"data\\": \\"\\\\n COMMAND NAME\\\\n ------------\\\\n\\\\n workflow-from-data-set | wfds\\\\n\\\\n DESCRIPTION\\\\n -----------\\\\n\\\\n Create a z/OSMF workflow on a z/OS system using a Data set\\\\n\\\\n USAGE\\\\n -----\\\\n\\\\n zowe zos-workflows create workflow-from-data-set [options]\\\\n\\\\n POSITIONAL ARGUMENTS\\\\n --------------------\\\\n\\\\n workflowName\\\\t\\\\t (string)\\\\n\\\\n Name of the workflow\\\\n\\\\n REQUIRED OPTIONS\\\\n ----------------\\\\n\\\\n --data-set | --ds (string)\\\\n\\\\n Data set that contains a workflow definition.\\\\n\\\\n --system-name | --sn (string)\\\\n\\\\n z/OS system to execute the workflow.\\\\n\\\\n --owner | --ow (string)\\\\n\\\\n User ID of the workflow owner. This user can perform the workflow steps or\\\\n delegate the steps to other users.\\\\n\\\\n OPTIONS\\\\n -------\\\\n\\\\n --variables-input-file | --vif (string)\\\\n\\\\n Specifies an optional properties file that you can use to pre-specify values for\\\\n one or more of the variables that are defined in the workflow definition file.\\\\n\\\\n --variables | --vs (string)\\\\n\\\\n Includes a list of variables for the workflow. The variables that you specify\\\\n here take precedence over the variables that are specified in the workflow\\\\n variable input file. Make sure the value meets all regular expression\\\\n requirements set for the corresponding variable.\\\\n\\\\n --assign-to-owner | --ato (boolean)\\\\n\\\\n Indicates whether the workflow steps are assigned to the workflow owner.\\\\n\\\\n --access-type | --at (string)\\\\n\\\\n Specifies the access type for the workflow. Public, Restricted or Private.\\\\n\\\\n Allowed values: Public, Restricted, Private\\\\n\\\\n --delete-completed | --dc (boolean)\\\\n\\\\n Whether the successfully completed jobs to be deleted from the JES spool.\\\\n\\\\n --overwrite | --ov (boolean)\\\\n\\\\n Replaces an existing workflow with a new workflow.\\\\n\\\\n ZOSMF CONNECTION OPTIONS\\\\n ------------------------\\\\n\\\\n --host | -H (string)\\\\n\\\\n The z/OSMF server host name.\\\\n\\\\n --port | -P (number)\\\\n\\\\n The z/OSMF server port.\\\\n\\\\n Default value: 443\\\\n\\\\n --user | -u (string)\\\\n\\\\n Mainframe (z/OSMF) user name, which can be the same as your TSO login.\\\\n\\\\n --password | --pass | --pw (string)\\\\n\\\\n Mainframe (z/OSMF) password, which can be the same as your TSO password.\\\\n\\\\n --reject-unauthorized | --ru (boolean)\\\\n\\\\n Reject self-signed certificates.\\\\n\\\\n Default value: true\\\\n\\\\n --base-path | --bp (string)\\\\n\\\\n The base path for your API mediation layer instance. Specify this option to\\\\n prepend the base path to all z/OSMF resources when making REST requests. Do not\\\\n specify this option if you are not using an API mediation layer.\\\\n\\\\n --protocol (string)\\\\n\\\\n The protocol used (HTTP or HTTPS)\\\\n\\\\n Default value: https\\\\n Allowed values: http, https\\\\n\\\\n --cert-file (local file path)\\\\n\\\\n The file path to a certificate file to use for authentication\\\\n\\\\n --cert-key-file (local file path)\\\\n\\\\n The file path to a certificate key file to use for authentication\\\\n\\\\n PROFILE OPTIONS\\\\n ---------------\\\\n\\\\n --zosmf-profile | --zosmf-p (string)\\\\n\\\\n The name of a (zosmf) profile to load for this command execution.\\\\n\\\\n --base-profile | --base-p (string)\\\\n\\\\n The name of a (base) profile to load for this command execution.\\\\n\\\\n BASE CONNECTION OPTIONS\\\\n -----------------------\\\\n\\\\n --token-type | --tt (string)\\\\n\\\\n The type of token to get and use for the API. Omit this option to use the\\\\n default token type, which is provided by 'zowe auth login'.\\\\n\\\\n --token-value | --tv (string)\\\\n\\\\n The value of the token to pass to the API.\\\\n\\\\n RESPONSE FORMAT OPTIONS\\\\n -----------------------\\\\n\\\\n --response-format-filter | --rff (array)\\\\n\\\\n Filter (include) fields in the response. Accepts an array of field/property\\\\n names to include in the output response. You can filter JSON objects properties\\\\n OR table columns/fields. In addition, you can use this option in conjunction\\\\n with '--response-format-type' to reduce the output of a command to a single\\\\n field/property or a list of a single field/property.\\\\n\\\\n --response-format-type | --rft (string)\\\\n\\\\n The command response output format type. Must be one of the following:\\\\n\\\\n table: Formats output data as a table. Use this option when the output data is\\\\n an array of homogeneous JSON objects. Each property of the object will become a\\\\n column in the table.\\\\n\\\\n list: Formats output data as a list of strings. Can be used on any data type\\\\n (JSON objects/arrays) are stringified and a new line is added after each entry\\\\n in an array.\\\\n\\\\n object: Formats output data as a list of prettified objects (or single object).\\\\n Can be used in place of \\\\\\"table\\\\\\" to change from tabular output to a list of\\\\n prettified objects.\\\\n\\\\n string: Formats output data as a string. JSON objects/arrays are stringified.\\\\n\\\\n Allowed values: table, list, object, string\\\\n\\\\n --response-format-header | --rfh (boolean)\\\\n\\\\n If \\\\\\"--response-format-type table\\\\\\" is specified, include the column headers in\\\\n the output.\\\\n\\\\n GLOBAL OPTIONS\\\\n --------------\\\\n\\\\n --show-inputs-only (boolean)\\\\n\\\\n Show command inputs and do not run the command\\\\n\\\\n --response-format-json | --rfj (boolean)\\\\n\\\\n Produce JSON formatted data from a command\\\\n\\\\n --help | -h (boolean)\\\\n\\\\n Display help text\\\\n\\\\n --help-web | --hw (boolean)\\\\n\\\\n Display HTML help in browser\\\\n\\\\n EXAMPLES\\\\n --------\\\\n\\\\n - Create a workflow with name \\\\\\"testworkflow\\\\\\" using the data\\\\n set \\\\\\"TESTID.WKFLOW\\\\\\" that contains the workflow definition xml on the system\\\\n \\\\\\"TESTM1\\\\\\" with owner \\\\\\"OTHERID\\\\\\" and delete workflow with the same name if it\\\\n already exist in z/OSMF:\\\\n\\\\n $ zowe zos-workflows create workflow-from-data-set \\\\\\"testworkflow\\\\\\" --data-set \\\\\\"TESTID.WKFLOW\\\\\\" --system-name \\\\\\"TESTM1\\\\\\" --owner \\\\\\"OTHERID\\\\\\" --overwrite\\\\n\\\\n - Create a workflow with name \\\\\\"testworkflow\\\\\\" using data set\\\\n \\\\\\"TESTID.WKFLOW\\\\\\" containing workflow definition xml, on system \\\\\\"TESTM1\\\\\\" with\\\\n owner \\\\\\"MYSYSID\\\\\\" and delete successfully completed jobs:\\\\n\\\\n $ zowe zos-workflows create workflow-from-data-set \\\\\\"testworkflow\\\\\\" --data-set \\\\\\"TESTID.WKFLOW\\\\\\" --system-name \\\\\\"TESTM1\\\\\\" --owner \\\\\\"MYSYSID\\\\\\" --delete-completed\\\\n\\\\n - Create a workflow with name \\\\\\"testworkflow\\\\\\" using data set\\\\n \\\\\\"TESTID.WKFLOW\\\\\\" containing workflow definition xml, on system \\\\\\"TESTM1\\\\\\" with\\\\n owner \\\\\\"MYSYSID\\\\\\" and with variable values in the member PROPERTIES of data set\\\\n TESTID.DATA:\\\\n\\\\n $ zowe zos-workflows create workflow-from-data-set \\\\\\"testworkflow\\\\\\" --data-set \\\\\\"TESTID.WKFLOW\\\\\\" --system-name \\\\\\"TESTM1\\\\\\" --owner \\\\\\"MYSYSID\\\\\\" --variables-input-file TESTID.DATA(PROPERTIES)\\\\n\\\\n - Create a workflow with name \\\\\\"testworkflow\\\\\\" using the data\\\\n set \\\\\\"TESTID.WKFLOW\\\\\\" that contains a workflow definition xml, on a system\\\\n \\\\\\"TESTM1\\\\\\" with owner \\\\\\"MYSYSID\\\\\\" and with the variable name DUMMYVAR and the value\\\\n DUMMYVAL. Assign it to the owner:\\\\n\\\\n $ zowe zos-workflows create workflow-from-data-set \\\\\\"testworkflow\\\\\\" --data-set \\\\\\"TESTID.WKFLOW\\\\\\" --system-name \\\\\\"TESTM1\\\\\\" --owner \\\\\\"MYSYSID\\\\\\" --variables DUMMYVAR=DUMMYVAL --assign-to-owner\\\\n\\\\n\\" }" `; diff --git a/packages/cli/__tests__/workflows/__integration__/create/ussfile/__snapshots__/cli.workflows.create.workflowUss.integration.test.ts.snap b/packages/cli/__tests__/workflows/__integration__/create/ussfile/__snapshots__/cli.workflows.create.workflowUss.integration.test.ts.snap index 4385bffd3b..016a59a445 100644 --- a/packages/cli/__tests__/workflows/__integration__/create/ussfile/__snapshots__/cli.workflows.create.workflowUss.integration.test.ts.snap +++ b/packages/cli/__tests__/workflows/__integration__/create/ussfile/__snapshots__/cli.workflows.create.workflowUss.integration.test.ts.snap @@ -205,7 +205,7 @@ exports[`Create workflow with uss file integration test should display create wo - Create a workflow with name \\"testworkflow\\" using uss file \\"/path/workflow.xml\\" containing workflow definition, on system \\"TESTM1\\" with - owner \\"OTHERID\\" and delete workflow with the same name if it already exist in + owner \\"OTHERID\\" and delete workflow with the same name if it already exists in z/OSMF: $ zowe zos-workflows create workflow-from-uss-file \\"testworkflow\\" --uss-file \\"/path/workflow.xml\\" --system-name \\"TESTM1\\" --owner \\"OTHERID\\" --overwrite @@ -235,8 +235,8 @@ exports[`Create workflow with uss file integration test should display create wo \\"success\\": true, \\"exitCode\\": 0, \\"message\\": \\"The help was constructed for command: workflow-from-uss-file.\\", - \\"stdout\\": \\"\\\\n COMMAND NAME\\\\n ------------\\\\n\\\\n workflow-from-uss-file | wfuf\\\\n\\\\n DESCRIPTION\\\\n -----------\\\\n\\\\n Create a workflow instance in z/OSMF using a USS file\\\\n\\\\n USAGE\\\\n -----\\\\n\\\\n zowe zos-workflows create workflow-from-uss-file [options]\\\\n\\\\n POSITIONAL ARGUMENTS\\\\n --------------------\\\\n\\\\n workflowName\\\\t\\\\t (string)\\\\n\\\\n Name of the workflow instance to create\\\\n\\\\n REQUIRED OPTIONS\\\\n ----------------\\\\n\\\\n --uss-file | --uf (string)\\\\n\\\\n Uss file that contains workflow definition.\\\\n\\\\n --system-name | --sn (string)\\\\n\\\\n z/OS system to execute the workflow.\\\\n\\\\n --owner | --ow (string)\\\\n\\\\n User ID of the workflow owner. This user can perform the workflow steps or\\\\n delegate the steps to other users.\\\\n\\\\n OPTIONS\\\\n -------\\\\n\\\\n --variables-input-file | --vif (string)\\\\n\\\\n Specifies an optional properties file that you can use to pre-specify values for\\\\n one or more of the variables that are defined in the workflow definition file.\\\\n\\\\n --variables | --vs (string)\\\\n\\\\n Includes a list of variables for the workflow. The variables that you specify\\\\n here take precedence over the variables that are specified in the workflow\\\\n variable input file. Make sure the value meets all regular expression\\\\n requirements set for the corresponding variable.\\\\n\\\\n --assign-to-owner | --ato (boolean)\\\\n\\\\n Indicates whether the workflow steps are assigned to the workflow owner.\\\\n\\\\n --access-type | --at (string)\\\\n\\\\n Specifies the access type for the workflow. Public, Restricted or Private.\\\\n\\\\n Allowed values: Public, Restricted, Private\\\\n\\\\n --delete-completed | --dc (boolean)\\\\n\\\\n Whether the successfully completed jobs to be deleted from the JES spool.\\\\n\\\\n --overwrite | --ov (boolean)\\\\n\\\\n Replaces an existing workflow with a new workflow.\\\\n\\\\n ZOSMF CONNECTION OPTIONS\\\\n ------------------------\\\\n\\\\n --host | -H (string)\\\\n\\\\n The z/OSMF server host name.\\\\n\\\\n --port | -P (number)\\\\n\\\\n The z/OSMF server port.\\\\n\\\\n Default value: 443\\\\n\\\\n --user | -u (string)\\\\n\\\\n Mainframe (z/OSMF) user name, which can be the same as your TSO login.\\\\n\\\\n --password | --pass | --pw (string)\\\\n\\\\n Mainframe (z/OSMF) password, which can be the same as your TSO password.\\\\n\\\\n --reject-unauthorized | --ru (boolean)\\\\n\\\\n Reject self-signed certificates.\\\\n\\\\n Default value: true\\\\n\\\\n --base-path | --bp (string)\\\\n\\\\n The base path for your API mediation layer instance. Specify this option to\\\\n prepend the base path to all z/OSMF resources when making REST requests. Do not\\\\n specify this option if you are not using an API mediation layer.\\\\n\\\\n --protocol (string)\\\\n\\\\n The protocol used (HTTP or HTTPS)\\\\n\\\\n Default value: https\\\\n Allowed values: http, https\\\\n\\\\n --cert-file (local file path)\\\\n\\\\n The file path to a certificate file to use for authentication\\\\n\\\\n --cert-key-file (local file path)\\\\n\\\\n The file path to a certificate key file to use for authentication\\\\n\\\\n PROFILE OPTIONS\\\\n ---------------\\\\n\\\\n --zosmf-profile | --zosmf-p (string)\\\\n\\\\n The name of a (zosmf) profile to load for this command execution.\\\\n\\\\n --base-profile | --base-p (string)\\\\n\\\\n The name of a (base) profile to load for this command execution.\\\\n\\\\n BASE CONNECTION OPTIONS\\\\n -----------------------\\\\n\\\\n --token-type | --tt (string)\\\\n\\\\n The type of token to get and use for the API. Omit this option to use the\\\\n default token type, which is provided by 'zowe auth login'.\\\\n\\\\n --token-value | --tv (string)\\\\n\\\\n The value of the token to pass to the API.\\\\n\\\\n RESPONSE FORMAT OPTIONS\\\\n -----------------------\\\\n\\\\n --response-format-filter | --rff (array)\\\\n\\\\n Filter (include) fields in the response. Accepts an array of field/property\\\\n names to include in the output response. You can filter JSON objects properties\\\\n OR table columns/fields. In addition, you can use this option in conjunction\\\\n with '--response-format-type' to reduce the output of a command to a single\\\\n field/property or a list of a single field/property.\\\\n\\\\n --response-format-type | --rft (string)\\\\n\\\\n The command response output format type. Must be one of the following:\\\\n\\\\n table: Formats output data as a table. Use this option when the output data is\\\\n an array of homogeneous JSON objects. Each property of the object will become a\\\\n column in the table.\\\\n\\\\n list: Formats output data as a list of strings. Can be used on any data type\\\\n (JSON objects/arrays) are stringified and a new line is added after each entry\\\\n in an array.\\\\n\\\\n object: Formats output data as a list of prettified objects (or single object).\\\\n Can be used in place of \\\\\\"table\\\\\\" to change from tabular output to a list of\\\\n prettified objects.\\\\n\\\\n string: Formats output data as a string. JSON objects/arrays are stringified.\\\\n\\\\n Allowed values: table, list, object, string\\\\n\\\\n --response-format-header | --rfh (boolean)\\\\n\\\\n If \\\\\\"--response-format-type table\\\\\\" is specified, include the column headers in\\\\n the output.\\\\n\\\\n GLOBAL OPTIONS\\\\n --------------\\\\n\\\\n --show-inputs-only (boolean)\\\\n\\\\n Show command inputs and do not run the command\\\\n\\\\n --response-format-json | --rfj (boolean)\\\\n\\\\n Produce JSON formatted data from a command\\\\n\\\\n --help | -h (boolean)\\\\n\\\\n Display help text\\\\n\\\\n --help-web | --hw (boolean)\\\\n\\\\n Display HTML help in browser\\\\n\\\\n EXAMPLES\\\\n --------\\\\n\\\\n - Create a workflow with name \\\\\\"testworkflow\\\\\\" using uss file\\\\n \\\\\\"/path/workflow.xml\\\\\\" containing workflow definition, on system \\\\\\"TESTM1\\\\\\" with\\\\n owner \\\\\\"OTHERID\\\\\\" and delete workflow with the same name if it already exist in\\\\n z/OSMF:\\\\n\\\\n $ zowe zos-workflows create workflow-from-uss-file \\\\\\"testworkflow\\\\\\" --uss-file \\\\\\"/path/workflow.xml\\\\\\" --system-name \\\\\\"TESTM1\\\\\\" --owner \\\\\\"OTHERID\\\\\\" --overwrite\\\\n\\\\n - Create a workflow with name \\\\\\"testworkflow\\\\\\" using uss file\\\\n \\\\\\"/path/workflow.xml\\\\\\" containing workflow definition, on system \\\\\\"TESTM1\\\\\\" with\\\\n owner \\\\\\"MYSYSID\\\\\\" and delete successfully completed jobs:\\\\n\\\\n $ zowe zos-workflows create workflow-from-uss-file \\\\\\"testworkflow\\\\\\" --uss-file \\\\\\"/path/workflow.xml\\\\\\" --system-name \\\\\\"TESTM1\\\\\\" --owner \\\\\\"MYSYSID\\\\\\" --delete-completed\\\\n\\\\n - Create a workflow with name \\\\\\"testworkflow\\\\\\" using uss file\\\\n \\\\\\"/path/workflow.xml\\\\\\" containing workflow definition, on system \\\\\\"TESTM1\\\\\\" with\\\\n owner \\\\\\"MYSYSID\\\\\\" and with variable values in the member PROPERTIES of data set\\\\n TESTID.DATA:\\\\n\\\\n $ zowe zos-workflows create workflow-from-uss-file \\\\\\"testworkflow\\\\\\" --uss-file \\\\\\"/path/workflow.xml\\\\\\" --system-name \\\\\\"TESTM1\\\\\\" --owner \\\\\\"MYSYSID\\\\\\" --variables-input-file TESTID.DATA(PROPERTIES)\\\\n\\\\n - Create a workflow with name \\\\\\"testworkflow\\\\\\" using uss file\\\\n \\\\\\"/path/workflow.xml\\\\\\" containing workflow definition, on system \\\\\\"TESTM1\\\\\\" with\\\\n owner \\\\\\"MYSYSID\\\\\\" and with variables VAR1 and VAR2 with values DUMMYVAL1 and\\\\n DUMMYVAL2, and assign it to the owner:\\\\n\\\\n $ zowe zos-workflows create workflow-from-uss-file \\\\\\"testworkflow\\\\\\" --uss-file \\\\\\"/path/workflow.xml\\\\\\" --system-name \\\\\\"TESTM1\\\\\\"--variables VAR1=DUMMYVAL1,VAR2=DUMMYVAL2 --owner \\\\\\"MYSYSID\\\\\\" --assign-to-owner\\\\n\\\\n\\", + \\"stdout\\": \\"\\\\n COMMAND NAME\\\\n ------------\\\\n\\\\n workflow-from-uss-file | wfuf\\\\n\\\\n DESCRIPTION\\\\n -----------\\\\n\\\\n Create a workflow instance in z/OSMF using a USS file\\\\n\\\\n USAGE\\\\n -----\\\\n\\\\n zowe zos-workflows create workflow-from-uss-file [options]\\\\n\\\\n POSITIONAL ARGUMENTS\\\\n --------------------\\\\n\\\\n workflowName\\\\t\\\\t (string)\\\\n\\\\n Name of the workflow instance to create\\\\n\\\\n REQUIRED OPTIONS\\\\n ----------------\\\\n\\\\n --uss-file | --uf (string)\\\\n\\\\n Uss file that contains workflow definition.\\\\n\\\\n --system-name | --sn (string)\\\\n\\\\n z/OS system to execute the workflow.\\\\n\\\\n --owner | --ow (string)\\\\n\\\\n User ID of the workflow owner. This user can perform the workflow steps or\\\\n delegate the steps to other users.\\\\n\\\\n OPTIONS\\\\n -------\\\\n\\\\n --variables-input-file | --vif (string)\\\\n\\\\n Specifies an optional properties file that you can use to pre-specify values for\\\\n one or more of the variables that are defined in the workflow definition file.\\\\n\\\\n --variables | --vs (string)\\\\n\\\\n Includes a list of variables for the workflow. The variables that you specify\\\\n here take precedence over the variables that are specified in the workflow\\\\n variable input file. Make sure the value meets all regular expression\\\\n requirements set for the corresponding variable.\\\\n\\\\n --assign-to-owner | --ato (boolean)\\\\n\\\\n Indicates whether the workflow steps are assigned to the workflow owner.\\\\n\\\\n --access-type | --at (string)\\\\n\\\\n Specifies the access type for the workflow. Public, Restricted or Private.\\\\n\\\\n Allowed values: Public, Restricted, Private\\\\n\\\\n --delete-completed | --dc (boolean)\\\\n\\\\n Whether the successfully completed jobs to be deleted from the JES spool.\\\\n\\\\n --overwrite | --ov (boolean)\\\\n\\\\n Replaces an existing workflow with a new workflow.\\\\n\\\\n ZOSMF CONNECTION OPTIONS\\\\n ------------------------\\\\n\\\\n --host | -H (string)\\\\n\\\\n The z/OSMF server host name.\\\\n\\\\n --port | -P (number)\\\\n\\\\n The z/OSMF server port.\\\\n\\\\n Default value: 443\\\\n\\\\n --user | -u (string)\\\\n\\\\n Mainframe (z/OSMF) user name, which can be the same as your TSO login.\\\\n\\\\n --password | --pass | --pw (string)\\\\n\\\\n Mainframe (z/OSMF) password, which can be the same as your TSO password.\\\\n\\\\n --reject-unauthorized | --ru (boolean)\\\\n\\\\n Reject self-signed certificates.\\\\n\\\\n Default value: true\\\\n\\\\n --base-path | --bp (string)\\\\n\\\\n The base path for your API mediation layer instance. Specify this option to\\\\n prepend the base path to all z/OSMF resources when making REST requests. Do not\\\\n specify this option if you are not using an API mediation layer.\\\\n\\\\n --protocol (string)\\\\n\\\\n The protocol used (HTTP or HTTPS)\\\\n\\\\n Default value: https\\\\n Allowed values: http, https\\\\n\\\\n --cert-file (local file path)\\\\n\\\\n The file path to a certificate file to use for authentication\\\\n\\\\n --cert-key-file (local file path)\\\\n\\\\n The file path to a certificate key file to use for authentication\\\\n\\\\n PROFILE OPTIONS\\\\n ---------------\\\\n\\\\n --zosmf-profile | --zosmf-p (string)\\\\n\\\\n The name of a (zosmf) profile to load for this command execution.\\\\n\\\\n --base-profile | --base-p (string)\\\\n\\\\n The name of a (base) profile to load for this command execution.\\\\n\\\\n BASE CONNECTION OPTIONS\\\\n -----------------------\\\\n\\\\n --token-type | --tt (string)\\\\n\\\\n The type of token to get and use for the API. Omit this option to use the\\\\n default token type, which is provided by 'zowe auth login'.\\\\n\\\\n --token-value | --tv (string)\\\\n\\\\n The value of the token to pass to the API.\\\\n\\\\n RESPONSE FORMAT OPTIONS\\\\n -----------------------\\\\n\\\\n --response-format-filter | --rff (array)\\\\n\\\\n Filter (include) fields in the response. Accepts an array of field/property\\\\n names to include in the output response. You can filter JSON objects properties\\\\n OR table columns/fields. In addition, you can use this option in conjunction\\\\n with '--response-format-type' to reduce the output of a command to a single\\\\n field/property or a list of a single field/property.\\\\n\\\\n --response-format-type | --rft (string)\\\\n\\\\n The command response output format type. Must be one of the following:\\\\n\\\\n table: Formats output data as a table. Use this option when the output data is\\\\n an array of homogeneous JSON objects. Each property of the object will become a\\\\n column in the table.\\\\n\\\\n list: Formats output data as a list of strings. Can be used on any data type\\\\n (JSON objects/arrays) are stringified and a new line is added after each entry\\\\n in an array.\\\\n\\\\n object: Formats output data as a list of prettified objects (or single object).\\\\n Can be used in place of \\\\\\"table\\\\\\" to change from tabular output to a list of\\\\n prettified objects.\\\\n\\\\n string: Formats output data as a string. JSON objects/arrays are stringified.\\\\n\\\\n Allowed values: table, list, object, string\\\\n\\\\n --response-format-header | --rfh (boolean)\\\\n\\\\n If \\\\\\"--response-format-type table\\\\\\" is specified, include the column headers in\\\\n the output.\\\\n\\\\n GLOBAL OPTIONS\\\\n --------------\\\\n\\\\n --show-inputs-only (boolean)\\\\n\\\\n Show command inputs and do not run the command\\\\n\\\\n --response-format-json | --rfj (boolean)\\\\n\\\\n Produce JSON formatted data from a command\\\\n\\\\n --help | -h (boolean)\\\\n\\\\n Display help text\\\\n\\\\n --help-web | --hw (boolean)\\\\n\\\\n Display HTML help in browser\\\\n\\\\n EXAMPLES\\\\n --------\\\\n\\\\n - Create a workflow with name \\\\\\"testworkflow\\\\\\" using uss file\\\\n \\\\\\"/path/workflow.xml\\\\\\" containing workflow definition, on system \\\\\\"TESTM1\\\\\\" with\\\\n owner \\\\\\"OTHERID\\\\\\" and delete workflow with the same name if it already exists in\\\\n z/OSMF:\\\\n\\\\n $ zowe zos-workflows create workflow-from-uss-file \\\\\\"testworkflow\\\\\\" --uss-file \\\\\\"/path/workflow.xml\\\\\\" --system-name \\\\\\"TESTM1\\\\\\" --owner \\\\\\"OTHERID\\\\\\" --overwrite\\\\n\\\\n - Create a workflow with name \\\\\\"testworkflow\\\\\\" using uss file\\\\n \\\\\\"/path/workflow.xml\\\\\\" containing workflow definition, on system \\\\\\"TESTM1\\\\\\" with\\\\n owner \\\\\\"MYSYSID\\\\\\" and delete successfully completed jobs:\\\\n\\\\n $ zowe zos-workflows create workflow-from-uss-file \\\\\\"testworkflow\\\\\\" --uss-file \\\\\\"/path/workflow.xml\\\\\\" --system-name \\\\\\"TESTM1\\\\\\" --owner \\\\\\"MYSYSID\\\\\\" --delete-completed\\\\n\\\\n - Create a workflow with name \\\\\\"testworkflow\\\\\\" using uss file\\\\n \\\\\\"/path/workflow.xml\\\\\\" containing workflow definition, on system \\\\\\"TESTM1\\\\\\" with\\\\n owner \\\\\\"MYSYSID\\\\\\" and with variable values in the member PROPERTIES of data set\\\\n TESTID.DATA:\\\\n\\\\n $ zowe zos-workflows create workflow-from-uss-file \\\\\\"testworkflow\\\\\\" --uss-file \\\\\\"/path/workflow.xml\\\\\\" --system-name \\\\\\"TESTM1\\\\\\" --owner \\\\\\"MYSYSID\\\\\\" --variables-input-file TESTID.DATA(PROPERTIES)\\\\n\\\\n - Create a workflow with name \\\\\\"testworkflow\\\\\\" using uss file\\\\n \\\\\\"/path/workflow.xml\\\\\\" containing workflow definition, on system \\\\\\"TESTM1\\\\\\" with\\\\n owner \\\\\\"MYSYSID\\\\\\" and with variables VAR1 and VAR2 with values DUMMYVAL1 and\\\\n DUMMYVAL2, and assign it to the owner:\\\\n\\\\n $ zowe zos-workflows create workflow-from-uss-file \\\\\\"testworkflow\\\\\\" --uss-file \\\\\\"/path/workflow.xml\\\\\\" --system-name \\\\\\"TESTM1\\\\\\"--variables VAR1=DUMMYVAL1,VAR2=DUMMYVAL2 --owner \\\\\\"MYSYSID\\\\\\" --assign-to-owner\\\\n\\\\n\\", \\"stderr\\": \\"\\", - \\"data\\": \\"\\\\n COMMAND NAME\\\\n ------------\\\\n\\\\n workflow-from-uss-file | wfuf\\\\n\\\\n DESCRIPTION\\\\n -----------\\\\n\\\\n Create a workflow instance in z/OSMF using a USS file\\\\n\\\\n USAGE\\\\n -----\\\\n\\\\n zowe zos-workflows create workflow-from-uss-file [options]\\\\n\\\\n POSITIONAL ARGUMENTS\\\\n --------------------\\\\n\\\\n workflowName\\\\t\\\\t (string)\\\\n\\\\n Name of the workflow instance to create\\\\n\\\\n REQUIRED OPTIONS\\\\n ----------------\\\\n\\\\n --uss-file | --uf (string)\\\\n\\\\n Uss file that contains workflow definition.\\\\n\\\\n --system-name | --sn (string)\\\\n\\\\n z/OS system to execute the workflow.\\\\n\\\\n --owner | --ow (string)\\\\n\\\\n User ID of the workflow owner. This user can perform the workflow steps or\\\\n delegate the steps to other users.\\\\n\\\\n OPTIONS\\\\n -------\\\\n\\\\n --variables-input-file | --vif (string)\\\\n\\\\n Specifies an optional properties file that you can use to pre-specify values for\\\\n one or more of the variables that are defined in the workflow definition file.\\\\n\\\\n --variables | --vs (string)\\\\n\\\\n Includes a list of variables for the workflow. The variables that you specify\\\\n here take precedence over the variables that are specified in the workflow\\\\n variable input file. Make sure the value meets all regular expression\\\\n requirements set for the corresponding variable.\\\\n\\\\n --assign-to-owner | --ato (boolean)\\\\n\\\\n Indicates whether the workflow steps are assigned to the workflow owner.\\\\n\\\\n --access-type | --at (string)\\\\n\\\\n Specifies the access type for the workflow. Public, Restricted or Private.\\\\n\\\\n Allowed values: Public, Restricted, Private\\\\n\\\\n --delete-completed | --dc (boolean)\\\\n\\\\n Whether the successfully completed jobs to be deleted from the JES spool.\\\\n\\\\n --overwrite | --ov (boolean)\\\\n\\\\n Replaces an existing workflow with a new workflow.\\\\n\\\\n ZOSMF CONNECTION OPTIONS\\\\n ------------------------\\\\n\\\\n --host | -H (string)\\\\n\\\\n The z/OSMF server host name.\\\\n\\\\n --port | -P (number)\\\\n\\\\n The z/OSMF server port.\\\\n\\\\n Default value: 443\\\\n\\\\n --user | -u (string)\\\\n\\\\n Mainframe (z/OSMF) user name, which can be the same as your TSO login.\\\\n\\\\n --password | --pass | --pw (string)\\\\n\\\\n Mainframe (z/OSMF) password, which can be the same as your TSO password.\\\\n\\\\n --reject-unauthorized | --ru (boolean)\\\\n\\\\n Reject self-signed certificates.\\\\n\\\\n Default value: true\\\\n\\\\n --base-path | --bp (string)\\\\n\\\\n The base path for your API mediation layer instance. Specify this option to\\\\n prepend the base path to all z/OSMF resources when making REST requests. Do not\\\\n specify this option if you are not using an API mediation layer.\\\\n\\\\n --protocol (string)\\\\n\\\\n The protocol used (HTTP or HTTPS)\\\\n\\\\n Default value: https\\\\n Allowed values: http, https\\\\n\\\\n --cert-file (local file path)\\\\n\\\\n The file path to a certificate file to use for authentication\\\\n\\\\n --cert-key-file (local file path)\\\\n\\\\n The file path to a certificate key file to use for authentication\\\\n\\\\n PROFILE OPTIONS\\\\n ---------------\\\\n\\\\n --zosmf-profile | --zosmf-p (string)\\\\n\\\\n The name of a (zosmf) profile to load for this command execution.\\\\n\\\\n --base-profile | --base-p (string)\\\\n\\\\n The name of a (base) profile to load for this command execution.\\\\n\\\\n BASE CONNECTION OPTIONS\\\\n -----------------------\\\\n\\\\n --token-type | --tt (string)\\\\n\\\\n The type of token to get and use for the API. Omit this option to use the\\\\n default token type, which is provided by 'zowe auth login'.\\\\n\\\\n --token-value | --tv (string)\\\\n\\\\n The value of the token to pass to the API.\\\\n\\\\n RESPONSE FORMAT OPTIONS\\\\n -----------------------\\\\n\\\\n --response-format-filter | --rff (array)\\\\n\\\\n Filter (include) fields in the response. Accepts an array of field/property\\\\n names to include in the output response. You can filter JSON objects properties\\\\n OR table columns/fields. In addition, you can use this option in conjunction\\\\n with '--response-format-type' to reduce the output of a command to a single\\\\n field/property or a list of a single field/property.\\\\n\\\\n --response-format-type | --rft (string)\\\\n\\\\n The command response output format type. Must be one of the following:\\\\n\\\\n table: Formats output data as a table. Use this option when the output data is\\\\n an array of homogeneous JSON objects. Each property of the object will become a\\\\n column in the table.\\\\n\\\\n list: Formats output data as a list of strings. Can be used on any data type\\\\n (JSON objects/arrays) are stringified and a new line is added after each entry\\\\n in an array.\\\\n\\\\n object: Formats output data as a list of prettified objects (or single object).\\\\n Can be used in place of \\\\\\"table\\\\\\" to change from tabular output to a list of\\\\n prettified objects.\\\\n\\\\n string: Formats output data as a string. JSON objects/arrays are stringified.\\\\n\\\\n Allowed values: table, list, object, string\\\\n\\\\n --response-format-header | --rfh (boolean)\\\\n\\\\n If \\\\\\"--response-format-type table\\\\\\" is specified, include the column headers in\\\\n the output.\\\\n\\\\n GLOBAL OPTIONS\\\\n --------------\\\\n\\\\n --show-inputs-only (boolean)\\\\n\\\\n Show command inputs and do not run the command\\\\n\\\\n --response-format-json | --rfj (boolean)\\\\n\\\\n Produce JSON formatted data from a command\\\\n\\\\n --help | -h (boolean)\\\\n\\\\n Display help text\\\\n\\\\n --help-web | --hw (boolean)\\\\n\\\\n Display HTML help in browser\\\\n\\\\n EXAMPLES\\\\n --------\\\\n\\\\n - Create a workflow with name \\\\\\"testworkflow\\\\\\" using uss file\\\\n \\\\\\"/path/workflow.xml\\\\\\" containing workflow definition, on system \\\\\\"TESTM1\\\\\\" with\\\\n owner \\\\\\"OTHERID\\\\\\" and delete workflow with the same name if it already exist in\\\\n z/OSMF:\\\\n\\\\n $ zowe zos-workflows create workflow-from-uss-file \\\\\\"testworkflow\\\\\\" --uss-file \\\\\\"/path/workflow.xml\\\\\\" --system-name \\\\\\"TESTM1\\\\\\" --owner \\\\\\"OTHERID\\\\\\" --overwrite\\\\n\\\\n - Create a workflow with name \\\\\\"testworkflow\\\\\\" using uss file\\\\n \\\\\\"/path/workflow.xml\\\\\\" containing workflow definition, on system \\\\\\"TESTM1\\\\\\" with\\\\n owner \\\\\\"MYSYSID\\\\\\" and delete successfully completed jobs:\\\\n\\\\n $ zowe zos-workflows create workflow-from-uss-file \\\\\\"testworkflow\\\\\\" --uss-file \\\\\\"/path/workflow.xml\\\\\\" --system-name \\\\\\"TESTM1\\\\\\" --owner \\\\\\"MYSYSID\\\\\\" --delete-completed\\\\n\\\\n - Create a workflow with name \\\\\\"testworkflow\\\\\\" using uss file\\\\n \\\\\\"/path/workflow.xml\\\\\\" containing workflow definition, on system \\\\\\"TESTM1\\\\\\" with\\\\n owner \\\\\\"MYSYSID\\\\\\" and with variable values in the member PROPERTIES of data set\\\\n TESTID.DATA:\\\\n\\\\n $ zowe zos-workflows create workflow-from-uss-file \\\\\\"testworkflow\\\\\\" --uss-file \\\\\\"/path/workflow.xml\\\\\\" --system-name \\\\\\"TESTM1\\\\\\" --owner \\\\\\"MYSYSID\\\\\\" --variables-input-file TESTID.DATA(PROPERTIES)\\\\n\\\\n - Create a workflow with name \\\\\\"testworkflow\\\\\\" using uss file\\\\n \\\\\\"/path/workflow.xml\\\\\\" containing workflow definition, on system \\\\\\"TESTM1\\\\\\" with\\\\n owner \\\\\\"MYSYSID\\\\\\" and with variables VAR1 and VAR2 with values DUMMYVAL1 and\\\\n DUMMYVAL2, and assign it to the owner:\\\\n\\\\n $ zowe zos-workflows create workflow-from-uss-file \\\\\\"testworkflow\\\\\\" --uss-file \\\\\\"/path/workflow.xml\\\\\\" --system-name \\\\\\"TESTM1\\\\\\"--variables VAR1=DUMMYVAL1,VAR2=DUMMYVAL2 --owner \\\\\\"MYSYSID\\\\\\" --assign-to-owner\\\\n\\\\n\\" + \\"data\\": \\"\\\\n COMMAND NAME\\\\n ------------\\\\n\\\\n workflow-from-uss-file | wfuf\\\\n\\\\n DESCRIPTION\\\\n -----------\\\\n\\\\n Create a workflow instance in z/OSMF using a USS file\\\\n\\\\n USAGE\\\\n -----\\\\n\\\\n zowe zos-workflows create workflow-from-uss-file [options]\\\\n\\\\n POSITIONAL ARGUMENTS\\\\n --------------------\\\\n\\\\n workflowName\\\\t\\\\t (string)\\\\n\\\\n Name of the workflow instance to create\\\\n\\\\n REQUIRED OPTIONS\\\\n ----------------\\\\n\\\\n --uss-file | --uf (string)\\\\n\\\\n Uss file that contains workflow definition.\\\\n\\\\n --system-name | --sn (string)\\\\n\\\\n z/OS system to execute the workflow.\\\\n\\\\n --owner | --ow (string)\\\\n\\\\n User ID of the workflow owner. This user can perform the workflow steps or\\\\n delegate the steps to other users.\\\\n\\\\n OPTIONS\\\\n -------\\\\n\\\\n --variables-input-file | --vif (string)\\\\n\\\\n Specifies an optional properties file that you can use to pre-specify values for\\\\n one or more of the variables that are defined in the workflow definition file.\\\\n\\\\n --variables | --vs (string)\\\\n\\\\n Includes a list of variables for the workflow. The variables that you specify\\\\n here take precedence over the variables that are specified in the workflow\\\\n variable input file. Make sure the value meets all regular expression\\\\n requirements set for the corresponding variable.\\\\n\\\\n --assign-to-owner | --ato (boolean)\\\\n\\\\n Indicates whether the workflow steps are assigned to the workflow owner.\\\\n\\\\n --access-type | --at (string)\\\\n\\\\n Specifies the access type for the workflow. Public, Restricted or Private.\\\\n\\\\n Allowed values: Public, Restricted, Private\\\\n\\\\n --delete-completed | --dc (boolean)\\\\n\\\\n Whether the successfully completed jobs to be deleted from the JES spool.\\\\n\\\\n --overwrite | --ov (boolean)\\\\n\\\\n Replaces an existing workflow with a new workflow.\\\\n\\\\n ZOSMF CONNECTION OPTIONS\\\\n ------------------------\\\\n\\\\n --host | -H (string)\\\\n\\\\n The z/OSMF server host name.\\\\n\\\\n --port | -P (number)\\\\n\\\\n The z/OSMF server port.\\\\n\\\\n Default value: 443\\\\n\\\\n --user | -u (string)\\\\n\\\\n Mainframe (z/OSMF) user name, which can be the same as your TSO login.\\\\n\\\\n --password | --pass | --pw (string)\\\\n\\\\n Mainframe (z/OSMF) password, which can be the same as your TSO password.\\\\n\\\\n --reject-unauthorized | --ru (boolean)\\\\n\\\\n Reject self-signed certificates.\\\\n\\\\n Default value: true\\\\n\\\\n --base-path | --bp (string)\\\\n\\\\n The base path for your API mediation layer instance. Specify this option to\\\\n prepend the base path to all z/OSMF resources when making REST requests. Do not\\\\n specify this option if you are not using an API mediation layer.\\\\n\\\\n --protocol (string)\\\\n\\\\n The protocol used (HTTP or HTTPS)\\\\n\\\\n Default value: https\\\\n Allowed values: http, https\\\\n\\\\n --cert-file (local file path)\\\\n\\\\n The file path to a certificate file to use for authentication\\\\n\\\\n --cert-key-file (local file path)\\\\n\\\\n The file path to a certificate key file to use for authentication\\\\n\\\\n PROFILE OPTIONS\\\\n ---------------\\\\n\\\\n --zosmf-profile | --zosmf-p (string)\\\\n\\\\n The name of a (zosmf) profile to load for this command execution.\\\\n\\\\n --base-profile | --base-p (string)\\\\n\\\\n The name of a (base) profile to load for this command execution.\\\\n\\\\n BASE CONNECTION OPTIONS\\\\n -----------------------\\\\n\\\\n --token-type | --tt (string)\\\\n\\\\n The type of token to get and use for the API. Omit this option to use the\\\\n default token type, which is provided by 'zowe auth login'.\\\\n\\\\n --token-value | --tv (string)\\\\n\\\\n The value of the token to pass to the API.\\\\n\\\\n RESPONSE FORMAT OPTIONS\\\\n -----------------------\\\\n\\\\n --response-format-filter | --rff (array)\\\\n\\\\n Filter (include) fields in the response. Accepts an array of field/property\\\\n names to include in the output response. You can filter JSON objects properties\\\\n OR table columns/fields. In addition, you can use this option in conjunction\\\\n with '--response-format-type' to reduce the output of a command to a single\\\\n field/property or a list of a single field/property.\\\\n\\\\n --response-format-type | --rft (string)\\\\n\\\\n The command response output format type. Must be one of the following:\\\\n\\\\n table: Formats output data as a table. Use this option when the output data is\\\\n an array of homogeneous JSON objects. Each property of the object will become a\\\\n column in the table.\\\\n\\\\n list: Formats output data as a list of strings. Can be used on any data type\\\\n (JSON objects/arrays) are stringified and a new line is added after each entry\\\\n in an array.\\\\n\\\\n object: Formats output data as a list of prettified objects (or single object).\\\\n Can be used in place of \\\\\\"table\\\\\\" to change from tabular output to a list of\\\\n prettified objects.\\\\n\\\\n string: Formats output data as a string. JSON objects/arrays are stringified.\\\\n\\\\n Allowed values: table, list, object, string\\\\n\\\\n --response-format-header | --rfh (boolean)\\\\n\\\\n If \\\\\\"--response-format-type table\\\\\\" is specified, include the column headers in\\\\n the output.\\\\n\\\\n GLOBAL OPTIONS\\\\n --------------\\\\n\\\\n --show-inputs-only (boolean)\\\\n\\\\n Show command inputs and do not run the command\\\\n\\\\n --response-format-json | --rfj (boolean)\\\\n\\\\n Produce JSON formatted data from a command\\\\n\\\\n --help | -h (boolean)\\\\n\\\\n Display help text\\\\n\\\\n --help-web | --hw (boolean)\\\\n\\\\n Display HTML help in browser\\\\n\\\\n EXAMPLES\\\\n --------\\\\n\\\\n - Create a workflow with name \\\\\\"testworkflow\\\\\\" using uss file\\\\n \\\\\\"/path/workflow.xml\\\\\\" containing workflow definition, on system \\\\\\"TESTM1\\\\\\" with\\\\n owner \\\\\\"OTHERID\\\\\\" and delete workflow with the same name if it already exists in\\\\n z/OSMF:\\\\n\\\\n $ zowe zos-workflows create workflow-from-uss-file \\\\\\"testworkflow\\\\\\" --uss-file \\\\\\"/path/workflow.xml\\\\\\" --system-name \\\\\\"TESTM1\\\\\\" --owner \\\\\\"OTHERID\\\\\\" --overwrite\\\\n\\\\n - Create a workflow with name \\\\\\"testworkflow\\\\\\" using uss file\\\\n \\\\\\"/path/workflow.xml\\\\\\" containing workflow definition, on system \\\\\\"TESTM1\\\\\\" with\\\\n owner \\\\\\"MYSYSID\\\\\\" and delete successfully completed jobs:\\\\n\\\\n $ zowe zos-workflows create workflow-from-uss-file \\\\\\"testworkflow\\\\\\" --uss-file \\\\\\"/path/workflow.xml\\\\\\" --system-name \\\\\\"TESTM1\\\\\\" --owner \\\\\\"MYSYSID\\\\\\" --delete-completed\\\\n\\\\n - Create a workflow with name \\\\\\"testworkflow\\\\\\" using uss file\\\\n \\\\\\"/path/workflow.xml\\\\\\" containing workflow definition, on system \\\\\\"TESTM1\\\\\\" with\\\\n owner \\\\\\"MYSYSID\\\\\\" and with variable values in the member PROPERTIES of data set\\\\n TESTID.DATA:\\\\n\\\\n $ zowe zos-workflows create workflow-from-uss-file \\\\\\"testworkflow\\\\\\" --uss-file \\\\\\"/path/workflow.xml\\\\\\" --system-name \\\\\\"TESTM1\\\\\\" --owner \\\\\\"MYSYSID\\\\\\" --variables-input-file TESTID.DATA(PROPERTIES)\\\\n\\\\n - Create a workflow with name \\\\\\"testworkflow\\\\\\" using uss file\\\\n \\\\\\"/path/workflow.xml\\\\\\" containing workflow definition, on system \\\\\\"TESTM1\\\\\\" with\\\\n owner \\\\\\"MYSYSID\\\\\\" and with variables VAR1 and VAR2 with values DUMMYVAL1 and\\\\n DUMMYVAL2, and assign it to the owner:\\\\n\\\\n $ zowe zos-workflows create workflow-from-uss-file \\\\\\"testworkflow\\\\\\" --uss-file \\\\\\"/path/workflow.xml\\\\\\" --system-name \\\\\\"TESTM1\\\\\\"--variables VAR1=DUMMYVAL1,VAR2=DUMMYVAL2 --owner \\\\\\"MYSYSID\\\\\\" --assign-to-owner\\\\n\\\\n\\" }" `; diff --git a/packages/cli/__tests__/workflows/__unit__/create/dataset/__snapshots__/Dataset.definition.unit.test.ts.snap b/packages/cli/__tests__/workflows/__unit__/create/dataset/__snapshots__/Dataset.definition.unit.test.ts.snap index 5ae7d931d5..193d760b9b 100644 --- a/packages/cli/__tests__/workflows/__unit__/create/dataset/__snapshots__/Dataset.definition.unit.test.ts.snap +++ b/packages/cli/__tests__/workflows/__unit__/create/dataset/__snapshots__/Dataset.definition.unit.test.ts.snap @@ -8,11 +8,11 @@ Object { "description": "Create a z/OSMF workflow on a z/OS system using a Data set", "examples": Array [ Object { - "description": "Create a workflow with name \\"testworkflow\\" using the data set \\"TESTID.WKFLOW\\" that contains the workflow definition xml on the system \\"TESTM1\\" with owner \\"OTHERID\\" and delete workflow with the same name if it already exist in z/OSMF", + "description": "Create a workflow with name \\"testworkflow\\" using the data set \\"TESTID.WKFLOW\\" that contains the workflow definition xml on the system \\"TESTM1\\" with owner \\"OTHERID\\" and delete workflow with the same name if it already exists in z/OSMF", "options": "\\"testworkflow\\" --data-set \\"TESTID.WKFLOW\\" --system-name \\"TESTM1\\" --owner \\"OTHERID\\" --overwrite", }, Object { - "description": "Create a workflow with name \\"testworkflow\\" using data set \\"TESTID.WKFLOW\\" containing workflow definition xml, on system \\"TESTM1\\" with owner \\"MYSYSID\\" and delete succesfully completed jobs", + "description": "Create a workflow with name \\"testworkflow\\" using data set \\"TESTID.WKFLOW\\" containing workflow definition xml, on system \\"TESTM1\\" with owner \\"MYSYSID\\" and delete successfully completed jobs", "options": "\\"testworkflow\\" --data-set \\"TESTID.WKFLOW\\" --system-name \\"TESTM1\\" --owner \\"MYSYSID\\" --delete-completed", }, Object { diff --git a/packages/cli/__tests__/workflows/__unit__/create/localfile/__snapshots__/LocalFile.definition.unit.test.ts.snap b/packages/cli/__tests__/workflows/__unit__/create/localfile/__snapshots__/LocalFile.definition.unit.test.ts.snap index 626c6c1388..2b4fe16344 100644 --- a/packages/cli/__tests__/workflows/__unit__/create/localfile/__snapshots__/LocalFile.definition.unit.test.ts.snap +++ b/packages/cli/__tests__/workflows/__unit__/create/localfile/__snapshots__/LocalFile.definition.unit.test.ts.snap @@ -8,7 +8,7 @@ Object { "description": "Create a z/OSMF workflow on a z/OS system using a Local file", "examples": Array [ Object { - "description": "Create a workflow with name \\"testworkflow\\" using the local file \\"TESTID_WKFLOW.xml\\" that contains the workflow definition xml on the system \\"TESTM1\\" with owner \\"OTHERID\\" and delete workflow with the same name if it already exist in z/OSMF", + "description": "Create a workflow with name \\"testworkflow\\" using the local file \\"TESTID_WKFLOW.xml\\" that contains the workflow definition xml on the system \\"TESTM1\\" with owner \\"OTHERID\\" and delete workflow with the same name if it already exists in z/OSMF", "options": "\\"testworkflow\\" --local-file \\"TESTID_WKFLOW.xml\\" --system-name \\"TESTM1\\" --owner \\"OTHERID\\" --overwrite", }, ], diff --git a/packages/cli/__tests__/workflows/__unit__/create/ussfile/__snapshots__/UssFile.definition.unit.test.ts.snap b/packages/cli/__tests__/workflows/__unit__/create/ussfile/__snapshots__/UssFile.definition.unit.test.ts.snap index fd373251be..0778ee62ce 100644 --- a/packages/cli/__tests__/workflows/__unit__/create/ussfile/__snapshots__/UssFile.definition.unit.test.ts.snap +++ b/packages/cli/__tests__/workflows/__unit__/create/ussfile/__snapshots__/UssFile.definition.unit.test.ts.snap @@ -8,7 +8,7 @@ Object { "description": "Create a workflow instance in z/OSMF using a USS file", "examples": Array [ Object { - "description": "Create a workflow with name \\"testworkflow\\" using uss file \\"/path/workflow.xml\\" containing workflow definition, on system \\"TESTM1\\" with owner \\"OTHERID\\" and delete workflow with the same name if it already exist in z/OSMF", + "description": "Create a workflow with name \\"testworkflow\\" using uss file \\"/path/workflow.xml\\" containing workflow definition, on system \\"TESTM1\\" with owner \\"OTHERID\\" and delete workflow with the same name if it already exists in z/OSMF", "options": "\\"testworkflow\\" --uss-file \\"/path/workflow.xml\\" --system-name \\"TESTM1\\" --owner \\"OTHERID\\" --overwrite", }, Object { diff --git a/packages/cli/src/workflows/create/dataset/Dataset.definition.ts b/packages/cli/src/workflows/create/dataset/Dataset.definition.ts index d3667da6e9..65c51b1d1a 100644 --- a/packages/cli/src/workflows/create/dataset/Dataset.definition.ts +++ b/packages/cli/src/workflows/create/dataset/Dataset.definition.ts @@ -52,12 +52,12 @@ export const DataSet: ICommandDefinition = { examples: [ { description: "Create a workflow with name \"testworkflow\" using the data set \"TESTID.WKFLOW\" that contains the workflow " + - "definition xml on the system \"TESTM1\" with owner \"OTHERID\" and delete workflow with the same name if it already exist in z/OSMF", + "definition xml on the system \"TESTM1\" with owner \"OTHERID\" and delete workflow with the same name if it already exists in z/OSMF", options: "\"testworkflow\" --data-set \"TESTID.WKFLOW\" --system-name \"TESTM1\" --owner \"OTHERID\" --overwrite" }, { description: "Create a workflow with name \"testworkflow\" using data set \"TESTID.WKFLOW\" containing workflow definition xml, " + - "on system \"TESTM1\" with owner \"MYSYSID\" and delete succesfully completed jobs", + "on system \"TESTM1\" with owner \"MYSYSID\" and delete successfully completed jobs", options: "\"testworkflow\" --data-set \"TESTID.WKFLOW\" --system-name \"TESTM1\" --owner \"MYSYSID\" --delete-completed" }, { diff --git a/packages/cli/src/workflows/create/localfile/LocalFile.definition.ts b/packages/cli/src/workflows/create/localfile/LocalFile.definition.ts index 71815c6e82..365da73e09 100644 --- a/packages/cli/src/workflows/create/localfile/LocalFile.definition.ts +++ b/packages/cli/src/workflows/create/localfile/LocalFile.definition.ts @@ -54,7 +54,7 @@ export const LocalFile: ICommandDefinition = { examples: [ { description: "Create a workflow with name \"testworkflow\" using the local file \"TESTID_WKFLOW.xml\" that contains the workflow " + - "definition xml on the system \"TESTM1\" with owner \"OTHERID\" and delete workflow with the same name if it already exist in z/OSMF", + "definition xml on the system \"TESTM1\" with owner \"OTHERID\" and delete workflow with the same name if it already exists in z/OSMF", options: "\"testworkflow\" --local-file \"TESTID_WKFLOW.xml\" --system-name \"TESTM1\" --owner \"OTHERID\" --overwrite" } ] diff --git a/packages/cli/src/workflows/create/ussfile/UssFile.definition.ts b/packages/cli/src/workflows/create/ussfile/UssFile.definition.ts index f3b60e9cd0..36fab40237 100644 --- a/packages/cli/src/workflows/create/ussfile/UssFile.definition.ts +++ b/packages/cli/src/workflows/create/ussfile/UssFile.definition.ts @@ -52,7 +52,7 @@ export const UssFile: ICommandDefinition = { examples: [ { description: "Create a workflow with name \"testworkflow\" using uss file \"/path/workflow.xml\" containing workflow definition, " + - "on system \"TESTM1\" with owner \"OTHERID\" and delete workflow with the same name if it already exist in z/OSMF", + "on system \"TESTM1\" with owner \"OTHERID\" and delete workflow with the same name if it already exists in z/OSMF", options: "\"testworkflow\" --uss-file \"/path/workflow.xml\" --system-name \"TESTM1\" --owner \"OTHERID\" --overwrite" }, { From 9bdcf27d234f23b6adebc2167ce5fa5984d8d4bf Mon Sep 17 00:00:00 2001 From: KevinLoesch1 Date: Wed, 3 Jan 2024 16:06:55 -0500 Subject: [PATCH 051/138] Remove win32 checks Signed-off-by: KevinLoesch1 --- .../compare/ds/Dataset.handler.unit.test.ts | 63 +++++++++---------- .../src/zosfiles/compare/CompareBaseHelper.ts | 4 +- 2 files changed, 32 insertions(+), 35 deletions(-) diff --git a/packages/cli/__tests__/zosfiles/__unit__/compare/ds/Dataset.handler.unit.test.ts b/packages/cli/__tests__/zosfiles/__unit__/compare/ds/Dataset.handler.unit.test.ts index 6baac9018d..74d90159a8 100644 --- a/packages/cli/__tests__/zosfiles/__unit__/compare/ds/Dataset.handler.unit.test.ts +++ b/packages/cli/__tests__/zosfiles/__unit__/compare/ds/Dataset.handler.unit.test.ts @@ -178,40 +178,37 @@ describe("Compare data set handler", () => { expect(getDiffStringSpy).toHaveBeenCalledWith("compared", "compared", options); }); - (process.platform === "win32" ? it : it.skip)( - "should compare two data sets containing carriage returns in terminal with --seqnum specified(Windows Specific)", async() => { - { - const processArgCopy: any = { - ...processArguments, - arguments:{ - ...processArguments.arguments, - seqnum: false, - } - }; - - //overwrite ds(strings 1 & 2) to include seqnums to chop off in LocalFileDatasetHandler - getDataSetSpy.mockImplementation(jest.fn(async (session) => { - fakeSession = session; - return Buffer.from("compared12345678\r\n"); - })); - - try { - // Invoke the handler with a full set of mocked arguments and response functions - await handler.process(processArgCopy); - } catch (e) { - error = e; - } - - expect(error).toBeUndefined(); - expect(getDataSetSpy).toHaveBeenCalledTimes(2); - expect(getDiffStringSpy).toHaveBeenCalledTimes(1); - expect(apiMessage).toEqual(""); - expect(logMessage).toEqual("compared string"); - expect(getDataSetSpy).toHaveBeenCalledWith(fakeSession as any, dataSetName1, { task: dsTask }); - expect(jsonObj).toMatchObject({commandResponse: "compared string", success: true}); - expect(getDiffStringSpy).toHaveBeenCalledWith("compared\n", "compared\n", options); + it("should compare two data sets containing carriage returns in terminal with --seqnum specified", async () => { + const processArgCopy: any = { + ...processArguments, + arguments:{ + ...processArguments.arguments, + seqnum: false, } - }); + }; + + //overwrite ds(strings 1 & 2) to include seqnums to chop off in LocalFileDatasetHandler + getDataSetSpy.mockImplementation(jest.fn(async (session) => { + fakeSession = session; + return Buffer.from("compared12345678\r\n"); + })); + + try { + // Invoke the handler with a full set of mocked arguments and response functions + await handler.process(processArgCopy); + } catch (e) { + error = e; + } + + expect(error).toBeUndefined(); + expect(getDataSetSpy).toHaveBeenCalledTimes(2); + expect(getDiffStringSpy).toHaveBeenCalledTimes(1); + expect(apiMessage).toEqual(""); + expect(logMessage).toEqual("compared string"); + expect(getDataSetSpy).toHaveBeenCalledWith(fakeSession as any, dataSetName1, { task: dsTask }); + expect(jsonObj).toMatchObject({commandResponse: "compared string", success: true}); + expect(getDiffStringSpy).toHaveBeenCalledWith("compared\n", "compared\n", options); + }); it("should compare two data sets in browser", async () => { openDiffInbrowserSpy.mockImplementation(jest.fn()); diff --git a/packages/cli/src/zosfiles/compare/CompareBaseHelper.ts b/packages/cli/src/zosfiles/compare/CompareBaseHelper.ts index 93ba262ecb..be2ef09872 100644 --- a/packages/cli/src/zosfiles/compare/CompareBaseHelper.ts +++ b/packages/cli/src/zosfiles/compare/CompareBaseHelper.ts @@ -165,8 +165,8 @@ export class CompareBaseHelper { let contentString = content.toString(); if(this.seqnum === false) { let seqnumlen = 8; - /* If Windows, account for the carriage return */ - if(process.platform === "win32" && content.toString().endsWith("\r\n")){ + /* If Windows format file, account for the carriage return */ + if(content.toString().endsWith("\r\n")){ seqnumlen++; } contentString = content.toString().split("\n").map((line) => line.slice(0, -seqnumlen)).join("\n"); From d2ba38cd01b76c93512726dec54f6940fb47d9fe Mon Sep 17 00:00:00 2001 From: Timothy Johnson Date: Wed, 3 Jan 2024 16:29:59 -0500 Subject: [PATCH 052/138] Update test snapshots Signed-off-by: Timothy Johnson --- ...cli.workflows.create.workflowDs.integration.test.ts.snap | 6 +++--- ...kflows.create.workflowLocalFile.integration.test.ts.snap | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/packages/cli/__tests__/workflows/__integration__/create/dataset/__snapshots__/cli.workflows.create.workflowDs.integration.test.ts.snap b/packages/cli/__tests__/workflows/__integration__/create/dataset/__snapshots__/cli.workflows.create.workflowDs.integration.test.ts.snap index 64c609dd66..e3440ad886 100644 --- a/packages/cli/__tests__/workflows/__integration__/create/dataset/__snapshots__/cli.workflows.create.workflowDs.integration.test.ts.snap +++ b/packages/cli/__tests__/workflows/__integration__/create/dataset/__snapshots__/cli.workflows.create.workflowDs.integration.test.ts.snap @@ -206,7 +206,7 @@ exports[`Create workflow with data set integration test should display create wo - Create a workflow with name \\"testworkflow\\" using the data set \\"TESTID.WKFLOW\\" that contains the workflow definition xml on the system \\"TESTM1\\" with owner \\"OTHERID\\" and delete workflow with the same name if it - already exist in z/OSMF: + already exists in z/OSMF: $ zowe zos-workflows create workflow-from-data-set \\"testworkflow\\" --data-set \\"TESTID.WKFLOW\\" --system-name \\"TESTM1\\" --owner \\"OTHERID\\" --overwrite @@ -235,8 +235,8 @@ exports[`Create workflow with data set integration test should display create wo \\"success\\": true, \\"exitCode\\": 0, \\"message\\": \\"The help was constructed for command: workflow-from-data-set.\\", - \\"stdout\\": \\"\\\\n COMMAND NAME\\\\n ------------\\\\n\\\\n workflow-from-data-set | wfds\\\\n\\\\n DESCRIPTION\\\\n -----------\\\\n\\\\n Create a z/OSMF workflow on a z/OS system using a Data set\\\\n\\\\n USAGE\\\\n -----\\\\n\\\\n zowe zos-workflows create workflow-from-data-set [options]\\\\n\\\\n POSITIONAL ARGUMENTS\\\\n --------------------\\\\n\\\\n workflowName\\\\t\\\\t (string)\\\\n\\\\n Name of the workflow\\\\n\\\\n REQUIRED OPTIONS\\\\n ----------------\\\\n\\\\n --data-set | --ds (string)\\\\n\\\\n Data set that contains a workflow definition.\\\\n\\\\n --system-name | --sn (string)\\\\n\\\\n z/OS system to execute the workflow.\\\\n\\\\n --owner | --ow (string)\\\\n\\\\n User ID of the workflow owner. This user can perform the workflow steps or\\\\n delegate the steps to other users.\\\\n\\\\n OPTIONS\\\\n -------\\\\n\\\\n --variables-input-file | --vif (string)\\\\n\\\\n Specifies an optional properties file that you can use to pre-specify values for\\\\n one or more of the variables that are defined in the workflow definition file.\\\\n\\\\n --variables | --vs (string)\\\\n\\\\n Includes a list of variables for the workflow. The variables that you specify\\\\n here take precedence over the variables that are specified in the workflow\\\\n variable input file. Make sure the value meets all regular expression\\\\n requirements set for the corresponding variable.\\\\n\\\\n --assign-to-owner | --ato (boolean)\\\\n\\\\n Indicates whether the workflow steps are assigned to the workflow owner.\\\\n\\\\n --access-type | --at (string)\\\\n\\\\n Specifies the access type for the workflow. Public, Restricted or Private.\\\\n\\\\n Allowed values: Public, Restricted, Private\\\\n\\\\n --delete-completed | --dc (boolean)\\\\n\\\\n Whether the successfully completed jobs to be deleted from the JES spool.\\\\n\\\\n --overwrite | --ov (boolean)\\\\n\\\\n Replaces an existing workflow with a new workflow.\\\\n\\\\n ZOSMF CONNECTION OPTIONS\\\\n ------------------------\\\\n\\\\n --host | -H (string)\\\\n\\\\n The z/OSMF server host name.\\\\n\\\\n --port | -P (number)\\\\n\\\\n The z/OSMF server port.\\\\n\\\\n Default value: 443\\\\n\\\\n --user | -u (string)\\\\n\\\\n Mainframe (z/OSMF) user name, which can be the same as your TSO login.\\\\n\\\\n --password | --pass | --pw (string)\\\\n\\\\n Mainframe (z/OSMF) password, which can be the same as your TSO password.\\\\n\\\\n --reject-unauthorized | --ru (boolean)\\\\n\\\\n Reject self-signed certificates.\\\\n\\\\n Default value: true\\\\n\\\\n --base-path | --bp (string)\\\\n\\\\n The base path for your API mediation layer instance. Specify this option to\\\\n prepend the base path to all z/OSMF resources when making REST requests. Do not\\\\n specify this option if you are not using an API mediation layer.\\\\n\\\\n --protocol (string)\\\\n\\\\n The protocol used (HTTP or HTTPS)\\\\n\\\\n Default value: https\\\\n Allowed values: http, https\\\\n\\\\n --cert-file (local file path)\\\\n\\\\n The file path to a certificate file to use for authentication\\\\n\\\\n --cert-key-file (local file path)\\\\n\\\\n The file path to a certificate key file to use for authentication\\\\n\\\\n PROFILE OPTIONS\\\\n ---------------\\\\n\\\\n --zosmf-profile | --zosmf-p (string)\\\\n\\\\n The name of a (zosmf) profile to load for this command execution.\\\\n\\\\n --base-profile | --base-p (string)\\\\n\\\\n The name of a (base) profile to load for this command execution.\\\\n\\\\n BASE CONNECTION OPTIONS\\\\n -----------------------\\\\n\\\\n --token-type | --tt (string)\\\\n\\\\n The type of token to get and use for the API. Omit this option to use the\\\\n default token type, which is provided by 'zowe auth login'.\\\\n\\\\n --token-value | --tv (string)\\\\n\\\\n The value of the token to pass to the API.\\\\n\\\\n RESPONSE FORMAT OPTIONS\\\\n -----------------------\\\\n\\\\n --response-format-filter | --rff (array)\\\\n\\\\n Filter (include) fields in the response. Accepts an array of field/property\\\\n names to include in the output response. You can filter JSON objects properties\\\\n OR table columns/fields. In addition, you can use this option in conjunction\\\\n with '--response-format-type' to reduce the output of a command to a single\\\\n field/property or a list of a single field/property.\\\\n\\\\n --response-format-type | --rft (string)\\\\n\\\\n The command response output format type. Must be one of the following:\\\\n\\\\n table: Formats output data as a table. Use this option when the output data is\\\\n an array of homogeneous JSON objects. Each property of the object will become a\\\\n column in the table.\\\\n\\\\n list: Formats output data as a list of strings. Can be used on any data type\\\\n (JSON objects/arrays) are stringified and a new line is added after each entry\\\\n in an array.\\\\n\\\\n object: Formats output data as a list of prettified objects (or single object).\\\\n Can be used in place of \\\\\\"table\\\\\\" to change from tabular output to a list of\\\\n prettified objects.\\\\n\\\\n string: Formats output data as a string. JSON objects/arrays are stringified.\\\\n\\\\n Allowed values: table, list, object, string\\\\n\\\\n --response-format-header | --rfh (boolean)\\\\n\\\\n If \\\\\\"--response-format-type table\\\\\\" is specified, include the column headers in\\\\n the output.\\\\n\\\\n GLOBAL OPTIONS\\\\n --------------\\\\n\\\\n --show-inputs-only (boolean)\\\\n\\\\n Show command inputs and do not run the command\\\\n\\\\n --response-format-json | --rfj (boolean)\\\\n\\\\n Produce JSON formatted data from a command\\\\n\\\\n --help | -h (boolean)\\\\n\\\\n Display help text\\\\n\\\\n --help-web | --hw (boolean)\\\\n\\\\n Display HTML help in browser\\\\n\\\\n EXAMPLES\\\\n --------\\\\n\\\\n - Create a workflow with name \\\\\\"testworkflow\\\\\\" using the data\\\\n set \\\\\\"TESTID.WKFLOW\\\\\\" that contains the workflow definition xml on the system\\\\n \\\\\\"TESTM1\\\\\\" with owner \\\\\\"OTHERID\\\\\\" and delete workflow with the same name if it\\\\n already exist in z/OSMF:\\\\n\\\\n $ zowe zos-workflows create workflow-from-data-set \\\\\\"testworkflow\\\\\\" --data-set \\\\\\"TESTID.WKFLOW\\\\\\" --system-name \\\\\\"TESTM1\\\\\\" --owner \\\\\\"OTHERID\\\\\\" --overwrite\\\\n\\\\n - Create a workflow with name \\\\\\"testworkflow\\\\\\" using data set\\\\n \\\\\\"TESTID.WKFLOW\\\\\\" containing workflow definition xml, on system \\\\\\"TESTM1\\\\\\" with\\\\n owner \\\\\\"MYSYSID\\\\\\" and delete successfully completed jobs:\\\\n\\\\n $ zowe zos-workflows create workflow-from-data-set \\\\\\"testworkflow\\\\\\" --data-set \\\\\\"TESTID.WKFLOW\\\\\\" --system-name \\\\\\"TESTM1\\\\\\" --owner \\\\\\"MYSYSID\\\\\\" --delete-completed\\\\n\\\\n - Create a workflow with name \\\\\\"testworkflow\\\\\\" using data set\\\\n \\\\\\"TESTID.WKFLOW\\\\\\" containing workflow definition xml, on system \\\\\\"TESTM1\\\\\\" with\\\\n owner \\\\\\"MYSYSID\\\\\\" and with variable values in the member PROPERTIES of data set\\\\n TESTID.DATA:\\\\n\\\\n $ zowe zos-workflows create workflow-from-data-set \\\\\\"testworkflow\\\\\\" --data-set \\\\\\"TESTID.WKFLOW\\\\\\" --system-name \\\\\\"TESTM1\\\\\\" --owner \\\\\\"MYSYSID\\\\\\" --variables-input-file TESTID.DATA(PROPERTIES)\\\\n\\\\n - Create a workflow with name \\\\\\"testworkflow\\\\\\" using the data\\\\n set \\\\\\"TESTID.WKFLOW\\\\\\" that contains a workflow definition xml, on a system\\\\n \\\\\\"TESTM1\\\\\\" with owner \\\\\\"MYSYSID\\\\\\" and with the variable name DUMMYVAR and the value\\\\n DUMMYVAL. Assign it to the owner:\\\\n\\\\n $ zowe zos-workflows create workflow-from-data-set \\\\\\"testworkflow\\\\\\" --data-set \\\\\\"TESTID.WKFLOW\\\\\\" --system-name \\\\\\"TESTM1\\\\\\" --owner \\\\\\"MYSYSID\\\\\\" --variables DUMMYVAR=DUMMYVAL --assign-to-owner\\\\n\\\\n\\", + \\"stdout\\": \\"\\\\n COMMAND NAME\\\\n ------------\\\\n\\\\n workflow-from-data-set | wfds\\\\n\\\\n DESCRIPTION\\\\n -----------\\\\n\\\\n Create a z/OSMF workflow on a z/OS system using a Data set\\\\n\\\\n USAGE\\\\n -----\\\\n\\\\n zowe zos-workflows create workflow-from-data-set [options]\\\\n\\\\n POSITIONAL ARGUMENTS\\\\n --------------------\\\\n\\\\n workflowName\\\\t\\\\t (string)\\\\n\\\\n Name of the workflow\\\\n\\\\n REQUIRED OPTIONS\\\\n ----------------\\\\n\\\\n --data-set | --ds (string)\\\\n\\\\n Data set that contains a workflow definition.\\\\n\\\\n --system-name | --sn (string)\\\\n\\\\n z/OS system to execute the workflow.\\\\n\\\\n --owner | --ow (string)\\\\n\\\\n User ID of the workflow owner. This user can perform the workflow steps or\\\\n delegate the steps to other users.\\\\n\\\\n OPTIONS\\\\n -------\\\\n\\\\n --variables-input-file | --vif (string)\\\\n\\\\n Specifies an optional properties file that you can use to pre-specify values for\\\\n one or more of the variables that are defined in the workflow definition file.\\\\n\\\\n --variables | --vs (string)\\\\n\\\\n Includes a list of variables for the workflow. The variables that you specify\\\\n here take precedence over the variables that are specified in the workflow\\\\n variable input file. Make sure the value meets all regular expression\\\\n requirements set for the corresponding variable.\\\\n\\\\n --assign-to-owner | --ato (boolean)\\\\n\\\\n Indicates whether the workflow steps are assigned to the workflow owner.\\\\n\\\\n --access-type | --at (string)\\\\n\\\\n Specifies the access type for the workflow. Public, Restricted or Private.\\\\n\\\\n Allowed values: Public, Restricted, Private\\\\n\\\\n --delete-completed | --dc (boolean)\\\\n\\\\n Whether the successfully completed jobs to be deleted from the JES spool.\\\\n\\\\n --overwrite | --ov (boolean)\\\\n\\\\n Replaces an existing workflow with a new workflow.\\\\n\\\\n ZOSMF CONNECTION OPTIONS\\\\n ------------------------\\\\n\\\\n --host | -H (string)\\\\n\\\\n The z/OSMF server host name.\\\\n\\\\n --port | -P (number)\\\\n\\\\n The z/OSMF server port.\\\\n\\\\n Default value: 443\\\\n\\\\n --user | -u (string)\\\\n\\\\n Mainframe (z/OSMF) user name, which can be the same as your TSO login.\\\\n\\\\n --password | --pass | --pw (string)\\\\n\\\\n Mainframe (z/OSMF) password, which can be the same as your TSO password.\\\\n\\\\n --reject-unauthorized | --ru (boolean)\\\\n\\\\n Reject self-signed certificates.\\\\n\\\\n Default value: true\\\\n\\\\n --base-path | --bp (string)\\\\n\\\\n The base path for your API mediation layer instance. Specify this option to\\\\n prepend the base path to all z/OSMF resources when making REST requests. Do not\\\\n specify this option if you are not using an API mediation layer.\\\\n\\\\n --protocol (string)\\\\n\\\\n The protocol used (HTTP or HTTPS)\\\\n\\\\n Default value: https\\\\n Allowed values: http, https\\\\n\\\\n --cert-file (local file path)\\\\n\\\\n The file path to a certificate file to use for authentication\\\\n\\\\n --cert-key-file (local file path)\\\\n\\\\n The file path to a certificate key file to use for authentication\\\\n\\\\n PROFILE OPTIONS\\\\n ---------------\\\\n\\\\n --zosmf-profile | --zosmf-p (string)\\\\n\\\\n The name of a (zosmf) profile to load for this command execution.\\\\n\\\\n --base-profile | --base-p (string)\\\\n\\\\n The name of a (base) profile to load for this command execution.\\\\n\\\\n BASE CONNECTION OPTIONS\\\\n -----------------------\\\\n\\\\n --token-type | --tt (string)\\\\n\\\\n The type of token to get and use for the API. Omit this option to use the\\\\n default token type, which is provided by 'zowe auth login'.\\\\n\\\\n --token-value | --tv (string)\\\\n\\\\n The value of the token to pass to the API.\\\\n\\\\n RESPONSE FORMAT OPTIONS\\\\n -----------------------\\\\n\\\\n --response-format-filter | --rff (array)\\\\n\\\\n Filter (include) fields in the response. Accepts an array of field/property\\\\n names to include in the output response. You can filter JSON objects properties\\\\n OR table columns/fields. In addition, you can use this option in conjunction\\\\n with '--response-format-type' to reduce the output of a command to a single\\\\n field/property or a list of a single field/property.\\\\n\\\\n --response-format-type | --rft (string)\\\\n\\\\n The command response output format type. Must be one of the following:\\\\n\\\\n table: Formats output data as a table. Use this option when the output data is\\\\n an array of homogeneous JSON objects. Each property of the object will become a\\\\n column in the table.\\\\n\\\\n list: Formats output data as a list of strings. Can be used on any data type\\\\n (JSON objects/arrays) are stringified and a new line is added after each entry\\\\n in an array.\\\\n\\\\n object: Formats output data as a list of prettified objects (or single object).\\\\n Can be used in place of \\\\\\"table\\\\\\" to change from tabular output to a list of\\\\n prettified objects.\\\\n\\\\n string: Formats output data as a string. JSON objects/arrays are stringified.\\\\n\\\\n Allowed values: table, list, object, string\\\\n\\\\n --response-format-header | --rfh (boolean)\\\\n\\\\n If \\\\\\"--response-format-type table\\\\\\" is specified, include the column headers in\\\\n the output.\\\\n\\\\n GLOBAL OPTIONS\\\\n --------------\\\\n\\\\n --show-inputs-only (boolean)\\\\n\\\\n Show command inputs and do not run the command\\\\n\\\\n --response-format-json | --rfj (boolean)\\\\n\\\\n Produce JSON formatted data from a command\\\\n\\\\n --help | -h (boolean)\\\\n\\\\n Display help text\\\\n\\\\n --help-web | --hw (boolean)\\\\n\\\\n Display HTML help in browser\\\\n\\\\n EXAMPLES\\\\n --------\\\\n\\\\n - Create a workflow with name \\\\\\"testworkflow\\\\\\" using the data\\\\n set \\\\\\"TESTID.WKFLOW\\\\\\" that contains the workflow definition xml on the system\\\\n \\\\\\"TESTM1\\\\\\" with owner \\\\\\"OTHERID\\\\\\" and delete workflow with the same name if it\\\\n already exists in z/OSMF:\\\\n\\\\n $ zowe zos-workflows create workflow-from-data-set \\\\\\"testworkflow\\\\\\" --data-set \\\\\\"TESTID.WKFLOW\\\\\\" --system-name \\\\\\"TESTM1\\\\\\" --owner \\\\\\"OTHERID\\\\\\" --overwrite\\\\n\\\\n - Create a workflow with name \\\\\\"testworkflow\\\\\\" using data set\\\\n \\\\\\"TESTID.WKFLOW\\\\\\" containing workflow definition xml, on system \\\\\\"TESTM1\\\\\\" with\\\\n owner \\\\\\"MYSYSID\\\\\\" and delete successfully completed jobs:\\\\n\\\\n $ zowe zos-workflows create workflow-from-data-set \\\\\\"testworkflow\\\\\\" --data-set \\\\\\"TESTID.WKFLOW\\\\\\" --system-name \\\\\\"TESTM1\\\\\\" --owner \\\\\\"MYSYSID\\\\\\" --delete-completed\\\\n\\\\n - Create a workflow with name \\\\\\"testworkflow\\\\\\" using data set\\\\n \\\\\\"TESTID.WKFLOW\\\\\\" containing workflow definition xml, on system \\\\\\"TESTM1\\\\\\" with\\\\n owner \\\\\\"MYSYSID\\\\\\" and with variable values in the member PROPERTIES of data set\\\\n TESTID.DATA:\\\\n\\\\n $ zowe zos-workflows create workflow-from-data-set \\\\\\"testworkflow\\\\\\" --data-set \\\\\\"TESTID.WKFLOW\\\\\\" --system-name \\\\\\"TESTM1\\\\\\" --owner \\\\\\"MYSYSID\\\\\\" --variables-input-file TESTID.DATA(PROPERTIES)\\\\n\\\\n - Create a workflow with name \\\\\\"testworkflow\\\\\\" using the data\\\\n set \\\\\\"TESTID.WKFLOW\\\\\\" that contains a workflow definition xml, on a system\\\\n \\\\\\"TESTM1\\\\\\" with owner \\\\\\"MYSYSID\\\\\\" and with the variable name DUMMYVAR and the value\\\\n DUMMYVAL. Assign it to the owner:\\\\n\\\\n $ zowe zos-workflows create workflow-from-data-set \\\\\\"testworkflow\\\\\\" --data-set \\\\\\"TESTID.WKFLOW\\\\\\" --system-name \\\\\\"TESTM1\\\\\\" --owner \\\\\\"MYSYSID\\\\\\" --variables DUMMYVAR=DUMMYVAL --assign-to-owner\\\\n\\\\n\\", \\"stderr\\": \\"\\", - \\"data\\": \\"\\\\n COMMAND NAME\\\\n ------------\\\\n\\\\n workflow-from-data-set | wfds\\\\n\\\\n DESCRIPTION\\\\n -----------\\\\n\\\\n Create a z/OSMF workflow on a z/OS system using a Data set\\\\n\\\\n USAGE\\\\n -----\\\\n\\\\n zowe zos-workflows create workflow-from-data-set [options]\\\\n\\\\n POSITIONAL ARGUMENTS\\\\n --------------------\\\\n\\\\n workflowName\\\\t\\\\t (string)\\\\n\\\\n Name of the workflow\\\\n\\\\n REQUIRED OPTIONS\\\\n ----------------\\\\n\\\\n --data-set | --ds (string)\\\\n\\\\n Data set that contains a workflow definition.\\\\n\\\\n --system-name | --sn (string)\\\\n\\\\n z/OS system to execute the workflow.\\\\n\\\\n --owner | --ow (string)\\\\n\\\\n User ID of the workflow owner. This user can perform the workflow steps or\\\\n delegate the steps to other users.\\\\n\\\\n OPTIONS\\\\n -------\\\\n\\\\n --variables-input-file | --vif (string)\\\\n\\\\n Specifies an optional properties file that you can use to pre-specify values for\\\\n one or more of the variables that are defined in the workflow definition file.\\\\n\\\\n --variables | --vs (string)\\\\n\\\\n Includes a list of variables for the workflow. The variables that you specify\\\\n here take precedence over the variables that are specified in the workflow\\\\n variable input file. Make sure the value meets all regular expression\\\\n requirements set for the corresponding variable.\\\\n\\\\n --assign-to-owner | --ato (boolean)\\\\n\\\\n Indicates whether the workflow steps are assigned to the workflow owner.\\\\n\\\\n --access-type | --at (string)\\\\n\\\\n Specifies the access type for the workflow. Public, Restricted or Private.\\\\n\\\\n Allowed values: Public, Restricted, Private\\\\n\\\\n --delete-completed | --dc (boolean)\\\\n\\\\n Whether the successfully completed jobs to be deleted from the JES spool.\\\\n\\\\n --overwrite | --ov (boolean)\\\\n\\\\n Replaces an existing workflow with a new workflow.\\\\n\\\\n ZOSMF CONNECTION OPTIONS\\\\n ------------------------\\\\n\\\\n --host | -H (string)\\\\n\\\\n The z/OSMF server host name.\\\\n\\\\n --port | -P (number)\\\\n\\\\n The z/OSMF server port.\\\\n\\\\n Default value: 443\\\\n\\\\n --user | -u (string)\\\\n\\\\n Mainframe (z/OSMF) user name, which can be the same as your TSO login.\\\\n\\\\n --password | --pass | --pw (string)\\\\n\\\\n Mainframe (z/OSMF) password, which can be the same as your TSO password.\\\\n\\\\n --reject-unauthorized | --ru (boolean)\\\\n\\\\n Reject self-signed certificates.\\\\n\\\\n Default value: true\\\\n\\\\n --base-path | --bp (string)\\\\n\\\\n The base path for your API mediation layer instance. Specify this option to\\\\n prepend the base path to all z/OSMF resources when making REST requests. Do not\\\\n specify this option if you are not using an API mediation layer.\\\\n\\\\n --protocol (string)\\\\n\\\\n The protocol used (HTTP or HTTPS)\\\\n\\\\n Default value: https\\\\n Allowed values: http, https\\\\n\\\\n --cert-file (local file path)\\\\n\\\\n The file path to a certificate file to use for authentication\\\\n\\\\n --cert-key-file (local file path)\\\\n\\\\n The file path to a certificate key file to use for authentication\\\\n\\\\n PROFILE OPTIONS\\\\n ---------------\\\\n\\\\n --zosmf-profile | --zosmf-p (string)\\\\n\\\\n The name of a (zosmf) profile to load for this command execution.\\\\n\\\\n --base-profile | --base-p (string)\\\\n\\\\n The name of a (base) profile to load for this command execution.\\\\n\\\\n BASE CONNECTION OPTIONS\\\\n -----------------------\\\\n\\\\n --token-type | --tt (string)\\\\n\\\\n The type of token to get and use for the API. Omit this option to use the\\\\n default token type, which is provided by 'zowe auth login'.\\\\n\\\\n --token-value | --tv (string)\\\\n\\\\n The value of the token to pass to the API.\\\\n\\\\n RESPONSE FORMAT OPTIONS\\\\n -----------------------\\\\n\\\\n --response-format-filter | --rff (array)\\\\n\\\\n Filter (include) fields in the response. Accepts an array of field/property\\\\n names to include in the output response. You can filter JSON objects properties\\\\n OR table columns/fields. In addition, you can use this option in conjunction\\\\n with '--response-format-type' to reduce the output of a command to a single\\\\n field/property or a list of a single field/property.\\\\n\\\\n --response-format-type | --rft (string)\\\\n\\\\n The command response output format type. Must be one of the following:\\\\n\\\\n table: Formats output data as a table. Use this option when the output data is\\\\n an array of homogeneous JSON objects. Each property of the object will become a\\\\n column in the table.\\\\n\\\\n list: Formats output data as a list of strings. Can be used on any data type\\\\n (JSON objects/arrays) are stringified and a new line is added after each entry\\\\n in an array.\\\\n\\\\n object: Formats output data as a list of prettified objects (or single object).\\\\n Can be used in place of \\\\\\"table\\\\\\" to change from tabular output to a list of\\\\n prettified objects.\\\\n\\\\n string: Formats output data as a string. JSON objects/arrays are stringified.\\\\n\\\\n Allowed values: table, list, object, string\\\\n\\\\n --response-format-header | --rfh (boolean)\\\\n\\\\n If \\\\\\"--response-format-type table\\\\\\" is specified, include the column headers in\\\\n the output.\\\\n\\\\n GLOBAL OPTIONS\\\\n --------------\\\\n\\\\n --show-inputs-only (boolean)\\\\n\\\\n Show command inputs and do not run the command\\\\n\\\\n --response-format-json | --rfj (boolean)\\\\n\\\\n Produce JSON formatted data from a command\\\\n\\\\n --help | -h (boolean)\\\\n\\\\n Display help text\\\\n\\\\n --help-web | --hw (boolean)\\\\n\\\\n Display HTML help in browser\\\\n\\\\n EXAMPLES\\\\n --------\\\\n\\\\n - Create a workflow with name \\\\\\"testworkflow\\\\\\" using the data\\\\n set \\\\\\"TESTID.WKFLOW\\\\\\" that contains the workflow definition xml on the system\\\\n \\\\\\"TESTM1\\\\\\" with owner \\\\\\"OTHERID\\\\\\" and delete workflow with the same name if it\\\\n already exist in z/OSMF:\\\\n\\\\n $ zowe zos-workflows create workflow-from-data-set \\\\\\"testworkflow\\\\\\" --data-set \\\\\\"TESTID.WKFLOW\\\\\\" --system-name \\\\\\"TESTM1\\\\\\" --owner \\\\\\"OTHERID\\\\\\" --overwrite\\\\n\\\\n - Create a workflow with name \\\\\\"testworkflow\\\\\\" using data set\\\\n \\\\\\"TESTID.WKFLOW\\\\\\" containing workflow definition xml, on system \\\\\\"TESTM1\\\\\\" with\\\\n owner \\\\\\"MYSYSID\\\\\\" and delete successfully completed jobs:\\\\n\\\\n $ zowe zos-workflows create workflow-from-data-set \\\\\\"testworkflow\\\\\\" --data-set \\\\\\"TESTID.WKFLOW\\\\\\" --system-name \\\\\\"TESTM1\\\\\\" --owner \\\\\\"MYSYSID\\\\\\" --delete-completed\\\\n\\\\n - Create a workflow with name \\\\\\"testworkflow\\\\\\" using data set\\\\n \\\\\\"TESTID.WKFLOW\\\\\\" containing workflow definition xml, on system \\\\\\"TESTM1\\\\\\" with\\\\n owner \\\\\\"MYSYSID\\\\\\" and with variable values in the member PROPERTIES of data set\\\\n TESTID.DATA:\\\\n\\\\n $ zowe zos-workflows create workflow-from-data-set \\\\\\"testworkflow\\\\\\" --data-set \\\\\\"TESTID.WKFLOW\\\\\\" --system-name \\\\\\"TESTM1\\\\\\" --owner \\\\\\"MYSYSID\\\\\\" --variables-input-file TESTID.DATA(PROPERTIES)\\\\n\\\\n - Create a workflow with name \\\\\\"testworkflow\\\\\\" using the data\\\\n set \\\\\\"TESTID.WKFLOW\\\\\\" that contains a workflow definition xml, on a system\\\\n \\\\\\"TESTM1\\\\\\" with owner \\\\\\"MYSYSID\\\\\\" and with the variable name DUMMYVAR and the value\\\\n DUMMYVAL. Assign it to the owner:\\\\n\\\\n $ zowe zos-workflows create workflow-from-data-set \\\\\\"testworkflow\\\\\\" --data-set \\\\\\"TESTID.WKFLOW\\\\\\" --system-name \\\\\\"TESTM1\\\\\\" --owner \\\\\\"MYSYSID\\\\\\" --variables DUMMYVAR=DUMMYVAL --assign-to-owner\\\\n\\\\n\\" + \\"data\\": \\"\\\\n COMMAND NAME\\\\n ------------\\\\n\\\\n workflow-from-data-set | wfds\\\\n\\\\n DESCRIPTION\\\\n -----------\\\\n\\\\n Create a z/OSMF workflow on a z/OS system using a Data set\\\\n\\\\n USAGE\\\\n -----\\\\n\\\\n zowe zos-workflows create workflow-from-data-set [options]\\\\n\\\\n POSITIONAL ARGUMENTS\\\\n --------------------\\\\n\\\\n workflowName\\\\t\\\\t (string)\\\\n\\\\n Name of the workflow\\\\n\\\\n REQUIRED OPTIONS\\\\n ----------------\\\\n\\\\n --data-set | --ds (string)\\\\n\\\\n Data set that contains a workflow definition.\\\\n\\\\n --system-name | --sn (string)\\\\n\\\\n z/OS system to execute the workflow.\\\\n\\\\n --owner | --ow (string)\\\\n\\\\n User ID of the workflow owner. This user can perform the workflow steps or\\\\n delegate the steps to other users.\\\\n\\\\n OPTIONS\\\\n -------\\\\n\\\\n --variables-input-file | --vif (string)\\\\n\\\\n Specifies an optional properties file that you can use to pre-specify values for\\\\n one or more of the variables that are defined in the workflow definition file.\\\\n\\\\n --variables | --vs (string)\\\\n\\\\n Includes a list of variables for the workflow. The variables that you specify\\\\n here take precedence over the variables that are specified in the workflow\\\\n variable input file. Make sure the value meets all regular expression\\\\n requirements set for the corresponding variable.\\\\n\\\\n --assign-to-owner | --ato (boolean)\\\\n\\\\n Indicates whether the workflow steps are assigned to the workflow owner.\\\\n\\\\n --access-type | --at (string)\\\\n\\\\n Specifies the access type for the workflow. Public, Restricted or Private.\\\\n\\\\n Allowed values: Public, Restricted, Private\\\\n\\\\n --delete-completed | --dc (boolean)\\\\n\\\\n Whether the successfully completed jobs to be deleted from the JES spool.\\\\n\\\\n --overwrite | --ov (boolean)\\\\n\\\\n Replaces an existing workflow with a new workflow.\\\\n\\\\n ZOSMF CONNECTION OPTIONS\\\\n ------------------------\\\\n\\\\n --host | -H (string)\\\\n\\\\n The z/OSMF server host name.\\\\n\\\\n --port | -P (number)\\\\n\\\\n The z/OSMF server port.\\\\n\\\\n Default value: 443\\\\n\\\\n --user | -u (string)\\\\n\\\\n Mainframe (z/OSMF) user name, which can be the same as your TSO login.\\\\n\\\\n --password | --pass | --pw (string)\\\\n\\\\n Mainframe (z/OSMF) password, which can be the same as your TSO password.\\\\n\\\\n --reject-unauthorized | --ru (boolean)\\\\n\\\\n Reject self-signed certificates.\\\\n\\\\n Default value: true\\\\n\\\\n --base-path | --bp (string)\\\\n\\\\n The base path for your API mediation layer instance. Specify this option to\\\\n prepend the base path to all z/OSMF resources when making REST requests. Do not\\\\n specify this option if you are not using an API mediation layer.\\\\n\\\\n --protocol (string)\\\\n\\\\n The protocol used (HTTP or HTTPS)\\\\n\\\\n Default value: https\\\\n Allowed values: http, https\\\\n\\\\n --cert-file (local file path)\\\\n\\\\n The file path to a certificate file to use for authentication\\\\n\\\\n --cert-key-file (local file path)\\\\n\\\\n The file path to a certificate key file to use for authentication\\\\n\\\\n PROFILE OPTIONS\\\\n ---------------\\\\n\\\\n --zosmf-profile | --zosmf-p (string)\\\\n\\\\n The name of a (zosmf) profile to load for this command execution.\\\\n\\\\n --base-profile | --base-p (string)\\\\n\\\\n The name of a (base) profile to load for this command execution.\\\\n\\\\n BASE CONNECTION OPTIONS\\\\n -----------------------\\\\n\\\\n --token-type | --tt (string)\\\\n\\\\n The type of token to get and use for the API. Omit this option to use the\\\\n default token type, which is provided by 'zowe auth login'.\\\\n\\\\n --token-value | --tv (string)\\\\n\\\\n The value of the token to pass to the API.\\\\n\\\\n RESPONSE FORMAT OPTIONS\\\\n -----------------------\\\\n\\\\n --response-format-filter | --rff (array)\\\\n\\\\n Filter (include) fields in the response. Accepts an array of field/property\\\\n names to include in the output response. You can filter JSON objects properties\\\\n OR table columns/fields. In addition, you can use this option in conjunction\\\\n with '--response-format-type' to reduce the output of a command to a single\\\\n field/property or a list of a single field/property.\\\\n\\\\n --response-format-type | --rft (string)\\\\n\\\\n The command response output format type. Must be one of the following:\\\\n\\\\n table: Formats output data as a table. Use this option when the output data is\\\\n an array of homogeneous JSON objects. Each property of the object will become a\\\\n column in the table.\\\\n\\\\n list: Formats output data as a list of strings. Can be used on any data type\\\\n (JSON objects/arrays) are stringified and a new line is added after each entry\\\\n in an array.\\\\n\\\\n object: Formats output data as a list of prettified objects (or single object).\\\\n Can be used in place of \\\\\\"table\\\\\\" to change from tabular output to a list of\\\\n prettified objects.\\\\n\\\\n string: Formats output data as a string. JSON objects/arrays are stringified.\\\\n\\\\n Allowed values: table, list, object, string\\\\n\\\\n --response-format-header | --rfh (boolean)\\\\n\\\\n If \\\\\\"--response-format-type table\\\\\\" is specified, include the column headers in\\\\n the output.\\\\n\\\\n GLOBAL OPTIONS\\\\n --------------\\\\n\\\\n --show-inputs-only (boolean)\\\\n\\\\n Show command inputs and do not run the command\\\\n\\\\n --response-format-json | --rfj (boolean)\\\\n\\\\n Produce JSON formatted data from a command\\\\n\\\\n --help | -h (boolean)\\\\n\\\\n Display help text\\\\n\\\\n --help-web | --hw (boolean)\\\\n\\\\n Display HTML help in browser\\\\n\\\\n EXAMPLES\\\\n --------\\\\n\\\\n - Create a workflow with name \\\\\\"testworkflow\\\\\\" using the data\\\\n set \\\\\\"TESTID.WKFLOW\\\\\\" that contains the workflow definition xml on the system\\\\n \\\\\\"TESTM1\\\\\\" with owner \\\\\\"OTHERID\\\\\\" and delete workflow with the same name if it\\\\n already exists in z/OSMF:\\\\n\\\\n $ zowe zos-workflows create workflow-from-data-set \\\\\\"testworkflow\\\\\\" --data-set \\\\\\"TESTID.WKFLOW\\\\\\" --system-name \\\\\\"TESTM1\\\\\\" --owner \\\\\\"OTHERID\\\\\\" --overwrite\\\\n\\\\n - Create a workflow with name \\\\\\"testworkflow\\\\\\" using data set\\\\n \\\\\\"TESTID.WKFLOW\\\\\\" containing workflow definition xml, on system \\\\\\"TESTM1\\\\\\" with\\\\n owner \\\\\\"MYSYSID\\\\\\" and delete successfully completed jobs:\\\\n\\\\n $ zowe zos-workflows create workflow-from-data-set \\\\\\"testworkflow\\\\\\" --data-set \\\\\\"TESTID.WKFLOW\\\\\\" --system-name \\\\\\"TESTM1\\\\\\" --owner \\\\\\"MYSYSID\\\\\\" --delete-completed\\\\n\\\\n - Create a workflow with name \\\\\\"testworkflow\\\\\\" using data set\\\\n \\\\\\"TESTID.WKFLOW\\\\\\" containing workflow definition xml, on system \\\\\\"TESTM1\\\\\\" with\\\\n owner \\\\\\"MYSYSID\\\\\\" and with variable values in the member PROPERTIES of data set\\\\n TESTID.DATA:\\\\n\\\\n $ zowe zos-workflows create workflow-from-data-set \\\\\\"testworkflow\\\\\\" --data-set \\\\\\"TESTID.WKFLOW\\\\\\" --system-name \\\\\\"TESTM1\\\\\\" --owner \\\\\\"MYSYSID\\\\\\" --variables-input-file TESTID.DATA(PROPERTIES)\\\\n\\\\n - Create a workflow with name \\\\\\"testworkflow\\\\\\" using the data\\\\n set \\\\\\"TESTID.WKFLOW\\\\\\" that contains a workflow definition xml, on a system\\\\n \\\\\\"TESTM1\\\\\\" with owner \\\\\\"MYSYSID\\\\\\" and with the variable name DUMMYVAR and the value\\\\n DUMMYVAL. Assign it to the owner:\\\\n\\\\n $ zowe zos-workflows create workflow-from-data-set \\\\\\"testworkflow\\\\\\" --data-set \\\\\\"TESTID.WKFLOW\\\\\\" --system-name \\\\\\"TESTM1\\\\\\" --owner \\\\\\"MYSYSID\\\\\\" --variables DUMMYVAR=DUMMYVAL --assign-to-owner\\\\n\\\\n\\" }" `; diff --git a/packages/cli/__tests__/workflows/__integration__/create/localfile/__snapshots__/cli.workflows.create.workflowLocalFile.integration.test.ts.snap b/packages/cli/__tests__/workflows/__integration__/create/localfile/__snapshots__/cli.workflows.create.workflowLocalFile.integration.test.ts.snap index fc93e84a0b..d811525410 100644 --- a/packages/cli/__tests__/workflows/__integration__/create/localfile/__snapshots__/cli.workflows.create.workflowLocalFile.integration.test.ts.snap +++ b/packages/cli/__tests__/workflows/__integration__/create/localfile/__snapshots__/cli.workflows.create.workflowLocalFile.integration.test.ts.snap @@ -218,7 +218,7 @@ exports[`Create workflow with local file integration test should display create - Create a workflow with name \\"testworkflow\\" using the local file \\"TESTID_WKFLOW.xml\\" that contains the workflow definition xml on the system \\"TESTM1\\" with owner \\"OTHERID\\" and delete workflow with the same name if it - already exist in z/OSMF: + already exists in z/OSMF: $ zowe zos-workflows create workflow-from-local-file \\"testworkflow\\" --local-file \\"TESTID_WKFLOW.xml\\" --system-name \\"TESTM1\\" --owner \\"OTHERID\\" --overwrite @@ -227,8 +227,8 @@ exports[`Create workflow with local file integration test should display create \\"success\\": true, \\"exitCode\\": 0, \\"message\\": \\"The help was constructed for command: workflow-from-local-file.\\", - \\"stdout\\": \\"\\\\n COMMAND NAME\\\\n ------------\\\\n\\\\n workflow-from-local-file | wflf\\\\n\\\\n DESCRIPTION\\\\n -----------\\\\n\\\\n Create a z/OSMF workflow on a z/OS system using a Local file\\\\n\\\\n USAGE\\\\n -----\\\\n\\\\n zowe zos-workflows create workflow-from-local-file [options]\\\\n\\\\n POSITIONAL ARGUMENTS\\\\n --------------------\\\\n\\\\n workflowName\\\\t\\\\t (string)\\\\n\\\\n Name of the workflow\\\\n\\\\n REQUIRED OPTIONS\\\\n ----------------\\\\n\\\\n --local-file | --lf (string)\\\\n\\\\n Local file that contains workflow definition.\\\\n\\\\n --system-name | --sn (string)\\\\n\\\\n z/OS system to execute the workflow.\\\\n\\\\n --owner | --ow (string)\\\\n\\\\n User ID of the workflow owner. This user can perform the workflow steps or\\\\n delegate the steps to other users.\\\\n\\\\n OPTIONS\\\\n -------\\\\n\\\\n --variables-input-file | --vif (string)\\\\n\\\\n Specifies an optional properties file that you can use to pre-specify values for\\\\n one or more of the variables that are defined in the workflow definition file.\\\\n\\\\n --variables | --vs (string)\\\\n\\\\n Includes a list of variables for the workflow. The variables that you specify\\\\n here take precedence over the variables that are specified in the workflow\\\\n variable input file. Make sure the value meets all regular expression\\\\n requirements set for the corresponding variable.\\\\n\\\\n --assign-to-owner | --ato (boolean)\\\\n\\\\n Indicates whether the workflow steps are assigned to the workflow owner.\\\\n\\\\n --access-type | --at (string)\\\\n\\\\n Specifies the access type for the workflow. Public, Restricted or Private.\\\\n\\\\n Allowed values: Public, Restricted, Private\\\\n\\\\n --delete-completed | --dc (boolean)\\\\n\\\\n Whether the successfully completed jobs to be deleted from the JES spool.\\\\n\\\\n --overwrite | --ov (boolean)\\\\n\\\\n Replaces an existing workflow with a new workflow.\\\\n\\\\n --remote-directory | --rd (string)\\\\n\\\\n The remote uss directory where the files are to be uploaded. The directory has\\\\n to exist\\\\n\\\\n --keep-files | --kf (boolean)\\\\n\\\\n Avoid deletion the uploaded files in /tmp or another specified directory after\\\\n successful execution.\\\\n\\\\n Default value: false\\\\n\\\\n ZOSMF CONNECTION OPTIONS\\\\n ------------------------\\\\n\\\\n --host | -H (string)\\\\n\\\\n The z/OSMF server host name.\\\\n\\\\n --port | -P (number)\\\\n\\\\n The z/OSMF server port.\\\\n\\\\n Default value: 443\\\\n\\\\n --user | -u (string)\\\\n\\\\n Mainframe (z/OSMF) user name, which can be the same as your TSO login.\\\\n\\\\n --password | --pass | --pw (string)\\\\n\\\\n Mainframe (z/OSMF) password, which can be the same as your TSO password.\\\\n\\\\n --reject-unauthorized | --ru (boolean)\\\\n\\\\n Reject self-signed certificates.\\\\n\\\\n Default value: true\\\\n\\\\n --base-path | --bp (string)\\\\n\\\\n The base path for your API mediation layer instance. Specify this option to\\\\n prepend the base path to all z/OSMF resources when making REST requests. Do not\\\\n specify this option if you are not using an API mediation layer.\\\\n\\\\n --protocol (string)\\\\n\\\\n The protocol used (HTTP or HTTPS)\\\\n\\\\n Default value: https\\\\n Allowed values: http, https\\\\n\\\\n --cert-file (local file path)\\\\n\\\\n The file path to a certificate file to use for authentication\\\\n\\\\n --cert-key-file (local file path)\\\\n\\\\n The file path to a certificate key file to use for authentication\\\\n\\\\n PROFILE OPTIONS\\\\n ---------------\\\\n\\\\n --zosmf-profile | --zosmf-p (string)\\\\n\\\\n The name of a (zosmf) profile to load for this command execution.\\\\n\\\\n --base-profile | --base-p (string)\\\\n\\\\n The name of a (base) profile to load for this command execution.\\\\n\\\\n BASE CONNECTION OPTIONS\\\\n -----------------------\\\\n\\\\n --token-type | --tt (string)\\\\n\\\\n The type of token to get and use for the API. Omit this option to use the\\\\n default token type, which is provided by 'zowe auth login'.\\\\n\\\\n --token-value | --tv (string)\\\\n\\\\n The value of the token to pass to the API.\\\\n\\\\n RESPONSE FORMAT OPTIONS\\\\n -----------------------\\\\n\\\\n --response-format-filter | --rff (array)\\\\n\\\\n Filter (include) fields in the response. Accepts an array of field/property\\\\n names to include in the output response. You can filter JSON objects properties\\\\n OR table columns/fields. In addition, you can use this option in conjunction\\\\n with '--response-format-type' to reduce the output of a command to a single\\\\n field/property or a list of a single field/property.\\\\n\\\\n --response-format-type | --rft (string)\\\\n\\\\n The command response output format type. Must be one of the following:\\\\n\\\\n table: Formats output data as a table. Use this option when the output data is\\\\n an array of homogeneous JSON objects. Each property of the object will become a\\\\n column in the table.\\\\n\\\\n list: Formats output data as a list of strings. Can be used on any data type\\\\n (JSON objects/arrays) are stringified and a new line is added after each entry\\\\n in an array.\\\\n\\\\n object: Formats output data as a list of prettified objects (or single object).\\\\n Can be used in place of \\\\\\"table\\\\\\" to change from tabular output to a list of\\\\n prettified objects.\\\\n\\\\n string: Formats output data as a string. JSON objects/arrays are stringified.\\\\n\\\\n Allowed values: table, list, object, string\\\\n\\\\n --response-format-header | --rfh (boolean)\\\\n\\\\n If \\\\\\"--response-format-type table\\\\\\" is specified, include the column headers in\\\\n the output.\\\\n\\\\n GLOBAL OPTIONS\\\\n --------------\\\\n\\\\n --show-inputs-only (boolean)\\\\n\\\\n Show command inputs and do not run the command\\\\n\\\\n --response-format-json | --rfj (boolean)\\\\n\\\\n Produce JSON formatted data from a command\\\\n\\\\n --help | -h (boolean)\\\\n\\\\n Display help text\\\\n\\\\n --help-web | --hw (boolean)\\\\n\\\\n Display HTML help in browser\\\\n\\\\n EXAMPLES\\\\n --------\\\\n\\\\n - Create a workflow with name \\\\\\"testworkflow\\\\\\" using the local\\\\n file \\\\\\"TESTID_WKFLOW.xml\\\\\\" that contains the workflow definition xml on the system\\\\n \\\\\\"TESTM1\\\\\\" with owner \\\\\\"OTHERID\\\\\\" and delete workflow with the same name if it\\\\n already exist in z/OSMF:\\\\n\\\\n $ zowe zos-workflows create workflow-from-local-file \\\\\\"testworkflow\\\\\\" --local-file \\\\\\"TESTID_WKFLOW.xml\\\\\\" --system-name \\\\\\"TESTM1\\\\\\" --owner \\\\\\"OTHERID\\\\\\" --overwrite\\\\n\\\\n\\", + \\"stdout\\": \\"\\\\n COMMAND NAME\\\\n ------------\\\\n\\\\n workflow-from-local-file | wflf\\\\n\\\\n DESCRIPTION\\\\n -----------\\\\n\\\\n Create a z/OSMF workflow on a z/OS system using a Local file\\\\n\\\\n USAGE\\\\n -----\\\\n\\\\n zowe zos-workflows create workflow-from-local-file [options]\\\\n\\\\n POSITIONAL ARGUMENTS\\\\n --------------------\\\\n\\\\n workflowName\\\\t\\\\t (string)\\\\n\\\\n Name of the workflow\\\\n\\\\n REQUIRED OPTIONS\\\\n ----------------\\\\n\\\\n --local-file | --lf (string)\\\\n\\\\n Local file that contains workflow definition.\\\\n\\\\n --system-name | --sn (string)\\\\n\\\\n z/OS system to execute the workflow.\\\\n\\\\n --owner | --ow (string)\\\\n\\\\n User ID of the workflow owner. This user can perform the workflow steps or\\\\n delegate the steps to other users.\\\\n\\\\n OPTIONS\\\\n -------\\\\n\\\\n --variables-input-file | --vif (string)\\\\n\\\\n Specifies an optional properties file that you can use to pre-specify values for\\\\n one or more of the variables that are defined in the workflow definition file.\\\\n\\\\n --variables | --vs (string)\\\\n\\\\n Includes a list of variables for the workflow. The variables that you specify\\\\n here take precedence over the variables that are specified in the workflow\\\\n variable input file. Make sure the value meets all regular expression\\\\n requirements set for the corresponding variable.\\\\n\\\\n --assign-to-owner | --ato (boolean)\\\\n\\\\n Indicates whether the workflow steps are assigned to the workflow owner.\\\\n\\\\n --access-type | --at (string)\\\\n\\\\n Specifies the access type for the workflow. Public, Restricted or Private.\\\\n\\\\n Allowed values: Public, Restricted, Private\\\\n\\\\n --delete-completed | --dc (boolean)\\\\n\\\\n Whether the successfully completed jobs to be deleted from the JES spool.\\\\n\\\\n --overwrite | --ov (boolean)\\\\n\\\\n Replaces an existing workflow with a new workflow.\\\\n\\\\n --remote-directory | --rd (string)\\\\n\\\\n The remote uss directory where the files are to be uploaded. The directory has\\\\n to exist\\\\n\\\\n --keep-files | --kf (boolean)\\\\n\\\\n Avoid deletion the uploaded files in /tmp or another specified directory after\\\\n successful execution.\\\\n\\\\n Default value: false\\\\n\\\\n ZOSMF CONNECTION OPTIONS\\\\n ------------------------\\\\n\\\\n --host | -H (string)\\\\n\\\\n The z/OSMF server host name.\\\\n\\\\n --port | -P (number)\\\\n\\\\n The z/OSMF server port.\\\\n\\\\n Default value: 443\\\\n\\\\n --user | -u (string)\\\\n\\\\n Mainframe (z/OSMF) user name, which can be the same as your TSO login.\\\\n\\\\n --password | --pass | --pw (string)\\\\n\\\\n Mainframe (z/OSMF) password, which can be the same as your TSO password.\\\\n\\\\n --reject-unauthorized | --ru (boolean)\\\\n\\\\n Reject self-signed certificates.\\\\n\\\\n Default value: true\\\\n\\\\n --base-path | --bp (string)\\\\n\\\\n The base path for your API mediation layer instance. Specify this option to\\\\n prepend the base path to all z/OSMF resources when making REST requests. Do not\\\\n specify this option if you are not using an API mediation layer.\\\\n\\\\n --protocol (string)\\\\n\\\\n The protocol used (HTTP or HTTPS)\\\\n\\\\n Default value: https\\\\n Allowed values: http, https\\\\n\\\\n --cert-file (local file path)\\\\n\\\\n The file path to a certificate file to use for authentication\\\\n\\\\n --cert-key-file (local file path)\\\\n\\\\n The file path to a certificate key file to use for authentication\\\\n\\\\n PROFILE OPTIONS\\\\n ---------------\\\\n\\\\n --zosmf-profile | --zosmf-p (string)\\\\n\\\\n The name of a (zosmf) profile to load for this command execution.\\\\n\\\\n --base-profile | --base-p (string)\\\\n\\\\n The name of a (base) profile to load for this command execution.\\\\n\\\\n BASE CONNECTION OPTIONS\\\\n -----------------------\\\\n\\\\n --token-type | --tt (string)\\\\n\\\\n The type of token to get and use for the API. Omit this option to use the\\\\n default token type, which is provided by 'zowe auth login'.\\\\n\\\\n --token-value | --tv (string)\\\\n\\\\n The value of the token to pass to the API.\\\\n\\\\n RESPONSE FORMAT OPTIONS\\\\n -----------------------\\\\n\\\\n --response-format-filter | --rff (array)\\\\n\\\\n Filter (include) fields in the response. Accepts an array of field/property\\\\n names to include in the output response. You can filter JSON objects properties\\\\n OR table columns/fields. In addition, you can use this option in conjunction\\\\n with '--response-format-type' to reduce the output of a command to a single\\\\n field/property or a list of a single field/property.\\\\n\\\\n --response-format-type | --rft (string)\\\\n\\\\n The command response output format type. Must be one of the following:\\\\n\\\\n table: Formats output data as a table. Use this option when the output data is\\\\n an array of homogeneous JSON objects. Each property of the object will become a\\\\n column in the table.\\\\n\\\\n list: Formats output data as a list of strings. Can be used on any data type\\\\n (JSON objects/arrays) are stringified and a new line is added after each entry\\\\n in an array.\\\\n\\\\n object: Formats output data as a list of prettified objects (or single object).\\\\n Can be used in place of \\\\\\"table\\\\\\" to change from tabular output to a list of\\\\n prettified objects.\\\\n\\\\n string: Formats output data as a string. JSON objects/arrays are stringified.\\\\n\\\\n Allowed values: table, list, object, string\\\\n\\\\n --response-format-header | --rfh (boolean)\\\\n\\\\n If \\\\\\"--response-format-type table\\\\\\" is specified, include the column headers in\\\\n the output.\\\\n\\\\n GLOBAL OPTIONS\\\\n --------------\\\\n\\\\n --show-inputs-only (boolean)\\\\n\\\\n Show command inputs and do not run the command\\\\n\\\\n --response-format-json | --rfj (boolean)\\\\n\\\\n Produce JSON formatted data from a command\\\\n\\\\n --help | -h (boolean)\\\\n\\\\n Display help text\\\\n\\\\n --help-web | --hw (boolean)\\\\n\\\\n Display HTML help in browser\\\\n\\\\n EXAMPLES\\\\n --------\\\\n\\\\n - Create a workflow with name \\\\\\"testworkflow\\\\\\" using the local\\\\n file \\\\\\"TESTID_WKFLOW.xml\\\\\\" that contains the workflow definition xml on the system\\\\n \\\\\\"TESTM1\\\\\\" with owner \\\\\\"OTHERID\\\\\\" and delete workflow with the same name if it\\\\n already exists in z/OSMF:\\\\n\\\\n $ zowe zos-workflows create workflow-from-local-file \\\\\\"testworkflow\\\\\\" --local-file \\\\\\"TESTID_WKFLOW.xml\\\\\\" --system-name \\\\\\"TESTM1\\\\\\" --owner \\\\\\"OTHERID\\\\\\" --overwrite\\\\n\\\\n\\", \\"stderr\\": \\"\\", - \\"data\\": \\"\\\\n COMMAND NAME\\\\n ------------\\\\n\\\\n workflow-from-local-file | wflf\\\\n\\\\n DESCRIPTION\\\\n -----------\\\\n\\\\n Create a z/OSMF workflow on a z/OS system using a Local file\\\\n\\\\n USAGE\\\\n -----\\\\n\\\\n zowe zos-workflows create workflow-from-local-file [options]\\\\n\\\\n POSITIONAL ARGUMENTS\\\\n --------------------\\\\n\\\\n workflowName\\\\t\\\\t (string)\\\\n\\\\n Name of the workflow\\\\n\\\\n REQUIRED OPTIONS\\\\n ----------------\\\\n\\\\n --local-file | --lf (string)\\\\n\\\\n Local file that contains workflow definition.\\\\n\\\\n --system-name | --sn (string)\\\\n\\\\n z/OS system to execute the workflow.\\\\n\\\\n --owner | --ow (string)\\\\n\\\\n User ID of the workflow owner. This user can perform the workflow steps or\\\\n delegate the steps to other users.\\\\n\\\\n OPTIONS\\\\n -------\\\\n\\\\n --variables-input-file | --vif (string)\\\\n\\\\n Specifies an optional properties file that you can use to pre-specify values for\\\\n one or more of the variables that are defined in the workflow definition file.\\\\n\\\\n --variables | --vs (string)\\\\n\\\\n Includes a list of variables for the workflow. The variables that you specify\\\\n here take precedence over the variables that are specified in the workflow\\\\n variable input file. Make sure the value meets all regular expression\\\\n requirements set for the corresponding variable.\\\\n\\\\n --assign-to-owner | --ato (boolean)\\\\n\\\\n Indicates whether the workflow steps are assigned to the workflow owner.\\\\n\\\\n --access-type | --at (string)\\\\n\\\\n Specifies the access type for the workflow. Public, Restricted or Private.\\\\n\\\\n Allowed values: Public, Restricted, Private\\\\n\\\\n --delete-completed | --dc (boolean)\\\\n\\\\n Whether the successfully completed jobs to be deleted from the JES spool.\\\\n\\\\n --overwrite | --ov (boolean)\\\\n\\\\n Replaces an existing workflow with a new workflow.\\\\n\\\\n --remote-directory | --rd (string)\\\\n\\\\n The remote uss directory where the files are to be uploaded. The directory has\\\\n to exist\\\\n\\\\n --keep-files | --kf (boolean)\\\\n\\\\n Avoid deletion the uploaded files in /tmp or another specified directory after\\\\n successful execution.\\\\n\\\\n Default value: false\\\\n\\\\n ZOSMF CONNECTION OPTIONS\\\\n ------------------------\\\\n\\\\n --host | -H (string)\\\\n\\\\n The z/OSMF server host name.\\\\n\\\\n --port | -P (number)\\\\n\\\\n The z/OSMF server port.\\\\n\\\\n Default value: 443\\\\n\\\\n --user | -u (string)\\\\n\\\\n Mainframe (z/OSMF) user name, which can be the same as your TSO login.\\\\n\\\\n --password | --pass | --pw (string)\\\\n\\\\n Mainframe (z/OSMF) password, which can be the same as your TSO password.\\\\n\\\\n --reject-unauthorized | --ru (boolean)\\\\n\\\\n Reject self-signed certificates.\\\\n\\\\n Default value: true\\\\n\\\\n --base-path | --bp (string)\\\\n\\\\n The base path for your API mediation layer instance. Specify this option to\\\\n prepend the base path to all z/OSMF resources when making REST requests. Do not\\\\n specify this option if you are not using an API mediation layer.\\\\n\\\\n --protocol (string)\\\\n\\\\n The protocol used (HTTP or HTTPS)\\\\n\\\\n Default value: https\\\\n Allowed values: http, https\\\\n\\\\n --cert-file (local file path)\\\\n\\\\n The file path to a certificate file to use for authentication\\\\n\\\\n --cert-key-file (local file path)\\\\n\\\\n The file path to a certificate key file to use for authentication\\\\n\\\\n PROFILE OPTIONS\\\\n ---------------\\\\n\\\\n --zosmf-profile | --zosmf-p (string)\\\\n\\\\n The name of a (zosmf) profile to load for this command execution.\\\\n\\\\n --base-profile | --base-p (string)\\\\n\\\\n The name of a (base) profile to load for this command execution.\\\\n\\\\n BASE CONNECTION OPTIONS\\\\n -----------------------\\\\n\\\\n --token-type | --tt (string)\\\\n\\\\n The type of token to get and use for the API. Omit this option to use the\\\\n default token type, which is provided by 'zowe auth login'.\\\\n\\\\n --token-value | --tv (string)\\\\n\\\\n The value of the token to pass to the API.\\\\n\\\\n RESPONSE FORMAT OPTIONS\\\\n -----------------------\\\\n\\\\n --response-format-filter | --rff (array)\\\\n\\\\n Filter (include) fields in the response. Accepts an array of field/property\\\\n names to include in the output response. You can filter JSON objects properties\\\\n OR table columns/fields. In addition, you can use this option in conjunction\\\\n with '--response-format-type' to reduce the output of a command to a single\\\\n field/property or a list of a single field/property.\\\\n\\\\n --response-format-type | --rft (string)\\\\n\\\\n The command response output format type. Must be one of the following:\\\\n\\\\n table: Formats output data as a table. Use this option when the output data is\\\\n an array of homogeneous JSON objects. Each property of the object will become a\\\\n column in the table.\\\\n\\\\n list: Formats output data as a list of strings. Can be used on any data type\\\\n (JSON objects/arrays) are stringified and a new line is added after each entry\\\\n in an array.\\\\n\\\\n object: Formats output data as a list of prettified objects (or single object).\\\\n Can be used in place of \\\\\\"table\\\\\\" to change from tabular output to a list of\\\\n prettified objects.\\\\n\\\\n string: Formats output data as a string. JSON objects/arrays are stringified.\\\\n\\\\n Allowed values: table, list, object, string\\\\n\\\\n --response-format-header | --rfh (boolean)\\\\n\\\\n If \\\\\\"--response-format-type table\\\\\\" is specified, include the column headers in\\\\n the output.\\\\n\\\\n GLOBAL OPTIONS\\\\n --------------\\\\n\\\\n --show-inputs-only (boolean)\\\\n\\\\n Show command inputs and do not run the command\\\\n\\\\n --response-format-json | --rfj (boolean)\\\\n\\\\n Produce JSON formatted data from a command\\\\n\\\\n --help | -h (boolean)\\\\n\\\\n Display help text\\\\n\\\\n --help-web | --hw (boolean)\\\\n\\\\n Display HTML help in browser\\\\n\\\\n EXAMPLES\\\\n --------\\\\n\\\\n - Create a workflow with name \\\\\\"testworkflow\\\\\\" using the local\\\\n file \\\\\\"TESTID_WKFLOW.xml\\\\\\" that contains the workflow definition xml on the system\\\\n \\\\\\"TESTM1\\\\\\" with owner \\\\\\"OTHERID\\\\\\" and delete workflow with the same name if it\\\\n already exist in z/OSMF:\\\\n\\\\n $ zowe zos-workflows create workflow-from-local-file \\\\\\"testworkflow\\\\\\" --local-file \\\\\\"TESTID_WKFLOW.xml\\\\\\" --system-name \\\\\\"TESTM1\\\\\\" --owner \\\\\\"OTHERID\\\\\\" --overwrite\\\\n\\\\n\\" + \\"data\\": \\"\\\\n COMMAND NAME\\\\n ------------\\\\n\\\\n workflow-from-local-file | wflf\\\\n\\\\n DESCRIPTION\\\\n -----------\\\\n\\\\n Create a z/OSMF workflow on a z/OS system using a Local file\\\\n\\\\n USAGE\\\\n -----\\\\n\\\\n zowe zos-workflows create workflow-from-local-file [options]\\\\n\\\\n POSITIONAL ARGUMENTS\\\\n --------------------\\\\n\\\\n workflowName\\\\t\\\\t (string)\\\\n\\\\n Name of the workflow\\\\n\\\\n REQUIRED OPTIONS\\\\n ----------------\\\\n\\\\n --local-file | --lf (string)\\\\n\\\\n Local file that contains workflow definition.\\\\n\\\\n --system-name | --sn (string)\\\\n\\\\n z/OS system to execute the workflow.\\\\n\\\\n --owner | --ow (string)\\\\n\\\\n User ID of the workflow owner. This user can perform the workflow steps or\\\\n delegate the steps to other users.\\\\n\\\\n OPTIONS\\\\n -------\\\\n\\\\n --variables-input-file | --vif (string)\\\\n\\\\n Specifies an optional properties file that you can use to pre-specify values for\\\\n one or more of the variables that are defined in the workflow definition file.\\\\n\\\\n --variables | --vs (string)\\\\n\\\\n Includes a list of variables for the workflow. The variables that you specify\\\\n here take precedence over the variables that are specified in the workflow\\\\n variable input file. Make sure the value meets all regular expression\\\\n requirements set for the corresponding variable.\\\\n\\\\n --assign-to-owner | --ato (boolean)\\\\n\\\\n Indicates whether the workflow steps are assigned to the workflow owner.\\\\n\\\\n --access-type | --at (string)\\\\n\\\\n Specifies the access type for the workflow. Public, Restricted or Private.\\\\n\\\\n Allowed values: Public, Restricted, Private\\\\n\\\\n --delete-completed | --dc (boolean)\\\\n\\\\n Whether the successfully completed jobs to be deleted from the JES spool.\\\\n\\\\n --overwrite | --ov (boolean)\\\\n\\\\n Replaces an existing workflow with a new workflow.\\\\n\\\\n --remote-directory | --rd (string)\\\\n\\\\n The remote uss directory where the files are to be uploaded. The directory has\\\\n to exist\\\\n\\\\n --keep-files | --kf (boolean)\\\\n\\\\n Avoid deletion the uploaded files in /tmp or another specified directory after\\\\n successful execution.\\\\n\\\\n Default value: false\\\\n\\\\n ZOSMF CONNECTION OPTIONS\\\\n ------------------------\\\\n\\\\n --host | -H (string)\\\\n\\\\n The z/OSMF server host name.\\\\n\\\\n --port | -P (number)\\\\n\\\\n The z/OSMF server port.\\\\n\\\\n Default value: 443\\\\n\\\\n --user | -u (string)\\\\n\\\\n Mainframe (z/OSMF) user name, which can be the same as your TSO login.\\\\n\\\\n --password | --pass | --pw (string)\\\\n\\\\n Mainframe (z/OSMF) password, which can be the same as your TSO password.\\\\n\\\\n --reject-unauthorized | --ru (boolean)\\\\n\\\\n Reject self-signed certificates.\\\\n\\\\n Default value: true\\\\n\\\\n --base-path | --bp (string)\\\\n\\\\n The base path for your API mediation layer instance. Specify this option to\\\\n prepend the base path to all z/OSMF resources when making REST requests. Do not\\\\n specify this option if you are not using an API mediation layer.\\\\n\\\\n --protocol (string)\\\\n\\\\n The protocol used (HTTP or HTTPS)\\\\n\\\\n Default value: https\\\\n Allowed values: http, https\\\\n\\\\n --cert-file (local file path)\\\\n\\\\n The file path to a certificate file to use for authentication\\\\n\\\\n --cert-key-file (local file path)\\\\n\\\\n The file path to a certificate key file to use for authentication\\\\n\\\\n PROFILE OPTIONS\\\\n ---------------\\\\n\\\\n --zosmf-profile | --zosmf-p (string)\\\\n\\\\n The name of a (zosmf) profile to load for this command execution.\\\\n\\\\n --base-profile | --base-p (string)\\\\n\\\\n The name of a (base) profile to load for this command execution.\\\\n\\\\n BASE CONNECTION OPTIONS\\\\n -----------------------\\\\n\\\\n --token-type | --tt (string)\\\\n\\\\n The type of token to get and use for the API. Omit this option to use the\\\\n default token type, which is provided by 'zowe auth login'.\\\\n\\\\n --token-value | --tv (string)\\\\n\\\\n The value of the token to pass to the API.\\\\n\\\\n RESPONSE FORMAT OPTIONS\\\\n -----------------------\\\\n\\\\n --response-format-filter | --rff (array)\\\\n\\\\n Filter (include) fields in the response. Accepts an array of field/property\\\\n names to include in the output response. You can filter JSON objects properties\\\\n OR table columns/fields. In addition, you can use this option in conjunction\\\\n with '--response-format-type' to reduce the output of a command to a single\\\\n field/property or a list of a single field/property.\\\\n\\\\n --response-format-type | --rft (string)\\\\n\\\\n The command response output format type. Must be one of the following:\\\\n\\\\n table: Formats output data as a table. Use this option when the output data is\\\\n an array of homogeneous JSON objects. Each property of the object will become a\\\\n column in the table.\\\\n\\\\n list: Formats output data as a list of strings. Can be used on any data type\\\\n (JSON objects/arrays) are stringified and a new line is added after each entry\\\\n in an array.\\\\n\\\\n object: Formats output data as a list of prettified objects (or single object).\\\\n Can be used in place of \\\\\\"table\\\\\\" to change from tabular output to a list of\\\\n prettified objects.\\\\n\\\\n string: Formats output data as a string. JSON objects/arrays are stringified.\\\\n\\\\n Allowed values: table, list, object, string\\\\n\\\\n --response-format-header | --rfh (boolean)\\\\n\\\\n If \\\\\\"--response-format-type table\\\\\\" is specified, include the column headers in\\\\n the output.\\\\n\\\\n GLOBAL OPTIONS\\\\n --------------\\\\n\\\\n --show-inputs-only (boolean)\\\\n\\\\n Show command inputs and do not run the command\\\\n\\\\n --response-format-json | --rfj (boolean)\\\\n\\\\n Produce JSON formatted data from a command\\\\n\\\\n --help | -h (boolean)\\\\n\\\\n Display help text\\\\n\\\\n --help-web | --hw (boolean)\\\\n\\\\n Display HTML help in browser\\\\n\\\\n EXAMPLES\\\\n --------\\\\n\\\\n - Create a workflow with name \\\\\\"testworkflow\\\\\\" using the local\\\\n file \\\\\\"TESTID_WKFLOW.xml\\\\\\" that contains the workflow definition xml on the system\\\\n \\\\\\"TESTM1\\\\\\" with owner \\\\\\"OTHERID\\\\\\" and delete workflow with the same name if it\\\\n already exists in z/OSMF:\\\\n\\\\n $ zowe zos-workflows create workflow-from-local-file \\\\\\"testworkflow\\\\\\" --local-file \\\\\\"TESTID_WKFLOW.xml\\\\\\" --system-name \\\\\\"TESTM1\\\\\\" --owner \\\\\\"OTHERID\\\\\\" --overwrite\\\\n\\\\n\\" }" `; From a7c767564e097b1d917a9576fe7a99e96274d604 Mon Sep 17 00:00:00 2001 From: "Andrew W. Harn" Date: Thu, 4 Jan 2024 15:04:00 -0500 Subject: [PATCH 053/138] Attempt fixes for system tests Signed-off-by: Andrew W. Harn --- .../__system__/api/Create.system.test.ts | 38 ++++++------ .../__system__/SubmitJobs.system.test.ts | 60 +++++++++---------- 2 files changed, 49 insertions(+), 49 deletions(-) diff --git a/packages/workflows/__tests__/__system__/api/Create.system.test.ts b/packages/workflows/__tests__/__system__/api/Create.system.test.ts index e697a8248a..e74594b76b 100644 --- a/packages/workflows/__tests__/__system__/api/Create.system.test.ts +++ b/packages/workflows/__tests__/__system__/api/Create.system.test.ts @@ -236,7 +236,7 @@ describe("Create workflow", () => { it("Throws an error with wrong format of workflow definition file. Wrong member name.", async () => { const error = await produceError(REAL_SESSION, wfName, "DS.NAME(0)", system, owner); expect(error.errorCode).toEqual(notFound); - expect(error.message).toContain(messageId); + expect(error.details.msg).toContain(messageId); }); }); describe("IZUWF0103E", () => { @@ -245,52 +245,52 @@ describe("Create workflow", () => { it("Throws an error with wrong format of workflow definition file.", async () => { const error = await produceError(REAL_SESSION, wfName, "wrongPath", system, owner); expect(error.errorCode).toEqual(status400); - expect(error.message).toContain(messageId); + expect(error.details.msg).toContain(messageId); }); it("Throws an error with wrong format of workflow definition file. Name that ends with a period.", async () => { const error = await produceError(REAL_SESSION, wfName, "DS.NAME.", system, owner); expect(error.errorCode).toEqual(status400); - expect(error.message).toContain(messageId); + expect(error.details.msg).toContain(messageId); }); it("Throws an error with wrong format of workflow definition file. Path not from root.", async () => { const error = await produceError(REAL_SESSION, wfName, "home/file", system, owner); expect(error.errorCode).toEqual(status400); - expect(error.message).toContain(messageId); + expect(error.details.msg).toContain(messageId); }); it("Throws an error with wrong format of workflow definition file. Qualifier is longer than 8 characters.", async () => { const error = await produceError(REAL_SESSION, wfName, "DS.NAME.LONGFIELD", system, owner); expect(error.errorCode).toEqual(status400); - expect(error.message).toContain(messageId); + expect(error.details.msg).toContain(messageId); }); it("Throws an error with wrong format of workflow definition file. More than 44 characters for DSNAME alone.", async () => { const error = await produceError(REAL_SESSION, wfName, "DS.NAME.STUFF.STUFF.STUFF.STUFF.STUFF.STUFF.STUFF.STUFF", system, owner); expect(error.errorCode).toEqual(status400); - expect(error.message).toContain(messageId); + expect(error.details.msg).toContain(messageId); }); it("Throws an error with wrong format of workflow definition file. Name containing two successive periods.", async () => { const error = await produceError(REAL_SESSION, wfName, "DS..NAME", system, owner); expect(error.errorCode).toEqual(status400); - expect(error.message).toContain(messageId); + expect(error.details.msg).toContain(messageId); }); it("Throws an error with wrong format of definition file. Name contains a qualifier that starts with numeric character.", async () => { const error = await produceError(REAL_SESSION, wfName, "DS.123.NAME", system, owner); expect(error.errorCode).toEqual(status400); - expect(error.message).toContain(messageId); + expect(error.details.msg).toContain(messageId); }); it("Throws an error with wrong format of workflow definition file. Member name is too long.", async () => { const error = await produceError(REAL_SESSION, wfName, "DS.NAME(MEMBER123)", system, owner); expect(error.errorCode).toEqual(status400); - expect(error.message).toContain(messageId); + expect(error.details.msg).toContain(messageId); }); it("Throws an error with wrong format of workflow definition file. Member doesn't end with `)`.", async () => { const error = await produceError(REAL_SESSION, wfName, "DS.NAME(MEMBER", system, owner); expect(error.errorCode).toEqual(status400); - expect(error.message).toContain(messageId); + expect(error.details.msg).toContain(messageId); }); it("Throws an error with wrong format of workflow definition file. Name contains non-allowed character.", async () => { const error = await produceError(REAL_SESSION, wfName, "DS.NAME%", system, owner); expect(error.errorCode).toEqual(status400); - expect(error.message).toContain(messageId); + expect(error.details.msg).toContain(messageId); }); }); describe("IZUWF0105E", () => { @@ -299,12 +299,12 @@ describe("Create workflow", () => { it("Throws an error with wrong format of variable input file. Name does not exist.", async () => { const error = await produceError(REAL_SESSION, wfName, definitionFile, system, owner, "DS.NAME.WRONG"); expect(error.errorCode).toEqual(status400); - expect(error.message).toContain(messageId); + expect(error.details.msg).toContain(messageId); }); it("Throws an error with wrong format of variable input file. Wrong member name.", async () => { const error = await produceError(REAL_SESSION, wfName, definitionFile, system, owner, "DS.NAME(0)"); expect(error.errorCode).toEqual(status400); - expect(error.message).toContain(messageId); + expect(error.details.msg).toContain(messageId); }); }); describe("IZUWF0107E", () => { @@ -313,33 +313,33 @@ describe("Create workflow", () => { it("Throws an error with wrong format of variable input file. Name that ends with a period.", async () => { const error = await produceError(REAL_SESSION, wfName, definitionFile, system, owner, "DS.NAME."); expect(error.errorCode).toEqual(status400); - expect(error.message).toContain(messageId); + expect(error.details.msg).toContain(messageId); }); it("Throws an error with wrong format of variable input file. More than 44 characters for DSNAME alone.", async () => { const error = await produceError(REAL_SESSION, wfName, definitionFile, system, owner, "DS.NAME.STUFF.STUFF.STUFF.STUFF.STUFF.STUFF.STUFF.STUFF"); expect(error.errorCode).toEqual(status400); - expect(error.message).toContain(messageId); + expect(error.details.msg).toContain(messageId); }); it("Throws an error with wrong format of variable input file. Name containing two successive periods.", async () => { const error = await produceError(REAL_SESSION, wfName, definitionFile, system, owner, "DS..NAME"); expect(error.errorCode).toEqual(status400); - expect(error.message).toContain(messageId); + expect(error.details.msg).toContain(messageId); }); it("Name that contains a qualifier that starts with non-alphabetic or non-special character.", async () => { const error = await produceError(REAL_SESSION, wfName, definitionFile, system, owner, "DS.123.NAME"); expect(error.errorCode).toEqual(status400); - expect(error.message).toContain(messageId); + expect(error.details.msg).toContain(messageId); }); it("Throws an error with wrong format of variable input file. Qualifier is longer than 8 characters.", async () => { const error = await produceError(REAL_SESSION, wfName, definitionFile, system, owner, "DS.NAME.LONGFIELD"); expect(error.errorCode).toEqual(status400); - expect(error.message).toContain(messageId); + expect(error.details.msg).toContain(messageId); }); it("Throws an error with wrong format of variable input file. Path not from root.", async () => { const error = await produceError(REAL_SESSION, wfName, definitionFile, system, owner, "home/file"); expect(error.errorCode).toEqual(status400); - expect(error.message).toContain(messageId); + expect(error.details.msg).toContain(messageId); }); }); }); diff --git a/packages/zosjobs/__tests__/__system__/SubmitJobs.system.test.ts b/packages/zosjobs/__tests__/__system__/SubmitJobs.system.test.ts index 415705ee9a..3a9d729f26 100644 --- a/packages/zosjobs/__tests__/__system__/SubmitJobs.system.test.ts +++ b/packages/zosjobs/__tests__/__system__/SubmitJobs.system.test.ts @@ -241,7 +241,7 @@ describe("Submit Jobs - System Tests", () => { it("should surface an error from z/OSMF when calling submitJclCommon with an invalid JCL", async () => { - let err: Error | ImperativeError; + let err: ImperativeError; try { await SubmitJobs.submitJclCommon(REAL_SESSION, { jcl: badJCL @@ -251,13 +251,13 @@ describe("Submit Jobs - System Tests", () => { } expect(err).toBeDefined(); expect(err instanceof ImperativeError).toEqual(true); - expect(err.message).toContain("does not start with a slash"); + expect(err.details.msg).toContain("does not start with a slash"); }); it("should surface an error from z/OSMF when calling submitJcl with an invalid JCL", async () => { - let err: Error | ImperativeError; + let err: ImperativeError; try { await SubmitJobs.submitJcl(REAL_SESSION, badJCL @@ -267,13 +267,13 @@ describe("Submit Jobs - System Tests", () => { } expect(err).toBeDefined(); expect(err instanceof ImperativeError).toEqual(true); - expect(err.message).toContain("does not start with a slash"); + expect(err.details.msg).toContain("does not start with a slash"); }); it("should surface an error from z/OSMF when calling submitJcl with an invalid JCL with internal reader settings", async () => { - let err: Error | ImperativeError; + let err: ImperativeError; let jcl = badJCL + "\nLONGDD DD *\n"; const twoHundredChars = 200; jcl += Array(twoHundredChars).join("A"); // add a long line to test internal reader @@ -288,13 +288,13 @@ describe("Submit Jobs - System Tests", () => { } expect(err).toBeDefined(); expect(err instanceof ImperativeError).toEqual(true); - expect(err.message).toContain("does not start with a slash"); + expect(err.details.msg).toContain("does not start with a slash"); }); it("should surface an error from z/OSMF when calling submitJclNotifyCommon with invalid JCL (with internal reader settings)", async () => { - let err: Error | ImperativeError; + let err: ImperativeError; let jcl = badJCL + "\nLONGDD DD *\n"; const twoHundredChars = 200; jcl += Array(twoHundredChars).join("A"); // add a long line to test internal reader @@ -312,11 +312,11 @@ describe("Submit Jobs - System Tests", () => { } expect(err).toBeDefined(); expect(err instanceof ImperativeError).toEqual(true); - expect(err.message).toContain("does not start with a slash"); + expect(err.details.msg).toContain("does not start with a slash"); }, LONG_TIMEOUT); it("should surface an error from z/OSMF when calling submitJobCommon with a non existent data set", async () => { - let err: Error | ImperativeError; + let err: ImperativeError; try { await SubmitJobs.submitJobCommon(REAL_SESSION, { jobDataSet: badDataSet @@ -326,11 +326,11 @@ describe("Submit Jobs - System Tests", () => { } expect(err).toBeDefined(); expect(err instanceof ImperativeError).toEqual(true); - expect(err.message).toContain(badDataSet); + expect(err.details.msg).toContain(badDataSet); }); it("should surface an error from z/OSMF when calling submitJobCommon with a non existent uss file", async () => { - let err: Error | ImperativeError; + let err: ImperativeError; try { await SubmitJobs.submitJobCommon(REAL_SESSION, { jobUSSFile: badUSSFile @@ -340,11 +340,11 @@ describe("Submit Jobs - System Tests", () => { } expect(err).toBeDefined(); expect(err instanceof ImperativeError).toEqual(true); - expect(err.message).toContain(badUSSFile); + expect(err.details.msg).toContain(badUSSFile); }); it("should surface an error from z/OSMF when calling submitJobNotifyCommon with a non existent data set", async () => { - let err: Error | ImperativeError; + let err: ImperativeError; try { await SubmitJobs.submitJobNotifyCommon(REAL_SESSION, { jobDataSet: badDataSet @@ -354,11 +354,11 @@ describe("Submit Jobs - System Tests", () => { } expect(err).toBeDefined(); expect(err instanceof ImperativeError).toEqual(true); - expect(err.message).toContain(badDataSet); + expect(err.details.msg).toContain(badDataSet); }, LONG_TIMEOUT); it("should surface an error from z/OSMF when calling submitJobNotifyCommon with a non existent uss file", async () => { - let err: Error | ImperativeError; + let err: ImperativeError; try { await SubmitJobs.submitJobNotifyCommon(REAL_SESSION, { jobUSSFile: badUSSFile @@ -368,11 +368,11 @@ describe("Submit Jobs - System Tests", () => { } expect(err).toBeDefined(); expect(err instanceof ImperativeError).toEqual(true); - expect(err.message).toContain(badUSSFile); + expect(err.details.msg).toContain(badUSSFile); }, LONG_TIMEOUT); it("should surface an error from z/OSMF when calling submitJclNotify with invalid JCL", async () => { - let err: Error | ImperativeError; + let err: ImperativeError; let jcl = badJCL + "\nLONGDD DD *\n"; const twoHundredChars = 200; jcl += Array(twoHundredChars).join("A"); // add a long line to test internal reader @@ -385,11 +385,11 @@ describe("Submit Jobs - System Tests", () => { } expect(err).toBeDefined(); expect(err instanceof ImperativeError).toEqual(true); - expect(err.message).toContain("does not start with a slash"); + expect(err.details.msg).toContain("does not start with a slash"); }, LONG_TIMEOUT); it("should surface an error from z/OSMF when calling submitJobNotify with a non existent data set", async () => { - let err: Error | ImperativeError; + let err: ImperativeError; try { await SubmitJobs.submitJobNotify(REAL_SESSION, badDataSet @@ -399,11 +399,11 @@ describe("Submit Jobs - System Tests", () => { } expect(err).toBeDefined(); expect(err instanceof ImperativeError).toEqual(true); - expect(err.message).toContain(badDataSet); + expect(err.details.msg).toContain(badDataSet); }, LONG_TIMEOUT); it("should surface an error from z/OSMF when calling submitUSSJobNotify with a non existent uss file", async () => { - let err: Error | ImperativeError; + let err: ImperativeError; try { await SubmitJobs.submitUSSJobNotify(REAL_SESSION, badUSSFile @@ -413,11 +413,11 @@ describe("Submit Jobs - System Tests", () => { } expect(err).toBeDefined(); expect(err instanceof ImperativeError).toEqual(true); - expect(err.message).toContain(badUSSFile); + expect(err.details.msg).toContain(badUSSFile); }, LONG_TIMEOUT); it("should surface an error from z/OSMF when calling submitJob with a non existent data set", async () => { - let err: Error | ImperativeError; + let err: ImperativeError; try { await SubmitJobs.submitJob(REAL_SESSION, badDataSet @@ -427,11 +427,11 @@ describe("Submit Jobs - System Tests", () => { } expect(err).toBeDefined(); expect(err instanceof ImperativeError).toEqual(true); - expect(err.message).toContain(badDataSet); + expect(err.details.msg).toContain(badDataSet); }); it("should surface an error from z/OSMF when calling submitUSSJob with a non existent USS file", async () => { - let err: Error | ImperativeError; + let err: ImperativeError; try { await SubmitJobs.submitUSSJob(REAL_SESSION, badUSSFile @@ -441,11 +441,11 @@ describe("Submit Jobs - System Tests", () => { } expect(err).toBeDefined(); expect(err instanceof ImperativeError).toEqual(true); - expect(err.message).toContain(badUSSFile); + expect(err.details.msg).toContain(badUSSFile); }); it("should throw an error if the JCL string is null", async () => { - let err: Error | ImperativeError; + let err: ImperativeError; try { await SubmitJobs.submitJclString(REAL_SESSION, null, {jclSource: "stdoin"}); } catch (e) { @@ -453,11 +453,11 @@ describe("Submit Jobs - System Tests", () => { } expect(err).toBeDefined(); expect(err instanceof ImperativeError).toEqual(true); - expect(err.message.toString()).toContain(ZosJobsMessages.missingJcl.message); + expect(err.details.msg).toContain(ZosJobsMessages.missingJcl.message); }); it("should throw an error if the JCL is an empty string", async () => { - let err: Error | ImperativeError; + let err: ImperativeError; try { await SubmitJobs.submitJclString(REAL_SESSION, "", {jclSource: "stdoin"}); } catch (e) { @@ -465,7 +465,7 @@ describe("Submit Jobs - System Tests", () => { } expect(err).toBeDefined(); expect(err instanceof ImperativeError).toEqual(true); - expect(err.message).toContain(ZosJobsMessages.missingJcl.message); + expect(err.details.msg).toContain(ZosJobsMessages.missingJcl.message); }); }); }); From f4bc5df81377753c9c43cf9fe514314912393582 Mon Sep 17 00:00:00 2001 From: Timothy Johnson Date: Thu, 4 Jan 2024 15:36:54 -0500 Subject: [PATCH 054/138] Assign author to PR if they have write access Signed-off-by: Timothy Johnson --- .github/workflows/update-project.yml | 28 +++++++++++++++++++++++----- 1 file changed, 23 insertions(+), 5 deletions(-) diff --git a/.github/workflows/update-project.yml b/.github/workflows/update-project.yml index 7387d48ea2..321be008d0 100644 --- a/.github/workflows/update-project.yml +++ b/.github/workflows/update-project.yml @@ -5,21 +5,39 @@ on: types: - opened +env: + PROJECT_NUMBER: "21" + jobs: update-project: - name: Add PR to project + name: PR opened runs-on: ubuntu-latest steps: - - uses: actions/add-to-project@v0.5.0 + - name: Add PR to project + uses: actions/add-to-project@v0.5.0 id: add-to-project with: - project-url: https://github.com/orgs/zowe/projects/21 + project-url: https://github.com/orgs/zowe/projects/${{ env.PROJECT_NUMBER }} github-token: ${{ secrets.ZOWE_ROBOT_TOKEN }} - - uses: titoportas/update-project-fields@v0.1.0 + - name: Move to In Progress + uses: titoportas/update-project-fields@v0.1.0 with: - project-url: https://github.com/orgs/zowe/projects/21 + project-url: https://github.com/orgs/zowe/projects/${{ env.PROJECT_NUMBER }} github-token: ${{ secrets.ZOWE_ROBOT_TOKEN }} item-id: ${{ steps.add-to-project.outputs.itemId }} field-keys: Status field-values: In Progress + + - name: Check author permissions + id: check-author-permissions + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + run: | + response=$(curl -fs -H "Authorization: Token $GITHUB_TOKEN" \ + https://api.github.com/repos/${{ github.repository }}/collaborators/${{ github.event.pull_request.user.login }}/permission) + echo "hasWrite=$(echo $response | jq -r '.user.permissions.push')" >> "$GITHUB_OUTPUT" + + - name: Assign author to PR + if: ${{ steps.check-author-permissions.outputs.hasWrite == 'true' }} + run: gh pr edit ${{ github.event.pull_request.number }} --add-assignee ${{ github.event.pull_request.user.login }} From 45c6d03dce3a5f0d1dba2a38ec01812f459ebf9a Mon Sep 17 00:00:00 2001 From: "Andrew W. Harn" Date: Thu, 4 Jan 2024 16:12:48 -0500 Subject: [PATCH 055/138] Change expect Signed-off-by: Andrew W. Harn --- .../__system__/api/Create.system.test.ts | 38 +++++++++---------- .../__system__/SubmitJobs.system.test.ts | 30 +++++++-------- 2 files changed, 34 insertions(+), 34 deletions(-) diff --git a/packages/workflows/__tests__/__system__/api/Create.system.test.ts b/packages/workflows/__tests__/__system__/api/Create.system.test.ts index e74594b76b..8d8a2333e1 100644 --- a/packages/workflows/__tests__/__system__/api/Create.system.test.ts +++ b/packages/workflows/__tests__/__system__/api/Create.system.test.ts @@ -236,7 +236,7 @@ describe("Create workflow", () => { it("Throws an error with wrong format of workflow definition file. Wrong member name.", async () => { const error = await produceError(REAL_SESSION, wfName, "DS.NAME(0)", system, owner); expect(error.errorCode).toEqual(notFound); - expect(error.details.msg).toContain(messageId); + expect(error.causeErrors.message).toContain(messageId); }); }); describe("IZUWF0103E", () => { @@ -245,52 +245,52 @@ describe("Create workflow", () => { it("Throws an error with wrong format of workflow definition file.", async () => { const error = await produceError(REAL_SESSION, wfName, "wrongPath", system, owner); expect(error.errorCode).toEqual(status400); - expect(error.details.msg).toContain(messageId); + expect(error.causeErrors.message).toContain(messageId); }); it("Throws an error with wrong format of workflow definition file. Name that ends with a period.", async () => { const error = await produceError(REAL_SESSION, wfName, "DS.NAME.", system, owner); expect(error.errorCode).toEqual(status400); - expect(error.details.msg).toContain(messageId); + expect(error.causeErrors.message).toContain(messageId); }); it("Throws an error with wrong format of workflow definition file. Path not from root.", async () => { const error = await produceError(REAL_SESSION, wfName, "home/file", system, owner); expect(error.errorCode).toEqual(status400); - expect(error.details.msg).toContain(messageId); + expect(error.causeErrors.message).toContain(messageId); }); it("Throws an error with wrong format of workflow definition file. Qualifier is longer than 8 characters.", async () => { const error = await produceError(REAL_SESSION, wfName, "DS.NAME.LONGFIELD", system, owner); expect(error.errorCode).toEqual(status400); - expect(error.details.msg).toContain(messageId); + expect(error.causeErrors.message).toContain(messageId); }); it("Throws an error with wrong format of workflow definition file. More than 44 characters for DSNAME alone.", async () => { const error = await produceError(REAL_SESSION, wfName, "DS.NAME.STUFF.STUFF.STUFF.STUFF.STUFF.STUFF.STUFF.STUFF", system, owner); expect(error.errorCode).toEqual(status400); - expect(error.details.msg).toContain(messageId); + expect(error.causeErrors.message).toContain(messageId); }); it("Throws an error with wrong format of workflow definition file. Name containing two successive periods.", async () => { const error = await produceError(REAL_SESSION, wfName, "DS..NAME", system, owner); expect(error.errorCode).toEqual(status400); - expect(error.details.msg).toContain(messageId); + expect(error.causeErrors.message).toContain(messageId); }); it("Throws an error with wrong format of definition file. Name contains a qualifier that starts with numeric character.", async () => { const error = await produceError(REAL_SESSION, wfName, "DS.123.NAME", system, owner); expect(error.errorCode).toEqual(status400); - expect(error.details.msg).toContain(messageId); + expect(error.causeErrors.message).toContain(messageId); }); it("Throws an error with wrong format of workflow definition file. Member name is too long.", async () => { const error = await produceError(REAL_SESSION, wfName, "DS.NAME(MEMBER123)", system, owner); expect(error.errorCode).toEqual(status400); - expect(error.details.msg).toContain(messageId); + expect(error.causeErrors.message).toContain(messageId); }); it("Throws an error with wrong format of workflow definition file. Member doesn't end with `)`.", async () => { const error = await produceError(REAL_SESSION, wfName, "DS.NAME(MEMBER", system, owner); expect(error.errorCode).toEqual(status400); - expect(error.details.msg).toContain(messageId); + expect(error.causeErrors.message).toContain(messageId); }); it("Throws an error with wrong format of workflow definition file. Name contains non-allowed character.", async () => { const error = await produceError(REAL_SESSION, wfName, "DS.NAME%", system, owner); expect(error.errorCode).toEqual(status400); - expect(error.details.msg).toContain(messageId); + expect(error.causeErrors.message).toContain(messageId); }); }); describe("IZUWF0105E", () => { @@ -299,12 +299,12 @@ describe("Create workflow", () => { it("Throws an error with wrong format of variable input file. Name does not exist.", async () => { const error = await produceError(REAL_SESSION, wfName, definitionFile, system, owner, "DS.NAME.WRONG"); expect(error.errorCode).toEqual(status400); - expect(error.details.msg).toContain(messageId); + expect(error.causeErrors.message).toContain(messageId); }); it("Throws an error with wrong format of variable input file. Wrong member name.", async () => { const error = await produceError(REAL_SESSION, wfName, definitionFile, system, owner, "DS.NAME(0)"); expect(error.errorCode).toEqual(status400); - expect(error.details.msg).toContain(messageId); + expect(error.causeErrors.message).toContain(messageId); }); }); describe("IZUWF0107E", () => { @@ -313,33 +313,33 @@ describe("Create workflow", () => { it("Throws an error with wrong format of variable input file. Name that ends with a period.", async () => { const error = await produceError(REAL_SESSION, wfName, definitionFile, system, owner, "DS.NAME."); expect(error.errorCode).toEqual(status400); - expect(error.details.msg).toContain(messageId); + expect(error.causeErrors.message).toContain(messageId); }); it("Throws an error with wrong format of variable input file. More than 44 characters for DSNAME alone.", async () => { const error = await produceError(REAL_SESSION, wfName, definitionFile, system, owner, "DS.NAME.STUFF.STUFF.STUFF.STUFF.STUFF.STUFF.STUFF.STUFF"); expect(error.errorCode).toEqual(status400); - expect(error.details.msg).toContain(messageId); + expect(error.causeErrors.message).toContain(messageId); }); it("Throws an error with wrong format of variable input file. Name containing two successive periods.", async () => { const error = await produceError(REAL_SESSION, wfName, definitionFile, system, owner, "DS..NAME"); expect(error.errorCode).toEqual(status400); - expect(error.details.msg).toContain(messageId); + expect(error.causeErrors.message).toContain(messageId); }); it("Name that contains a qualifier that starts with non-alphabetic or non-special character.", async () => { const error = await produceError(REAL_SESSION, wfName, definitionFile, system, owner, "DS.123.NAME"); expect(error.errorCode).toEqual(status400); - expect(error.details.msg).toContain(messageId); + expect(error.causeErrors.message).toContain(messageId); }); it("Throws an error with wrong format of variable input file. Qualifier is longer than 8 characters.", async () => { const error = await produceError(REAL_SESSION, wfName, definitionFile, system, owner, "DS.NAME.LONGFIELD"); expect(error.errorCode).toEqual(status400); - expect(error.details.msg).toContain(messageId); + expect(error.causeErrors.message).toContain(messageId); }); it("Throws an error with wrong format of variable input file. Path not from root.", async () => { const error = await produceError(REAL_SESSION, wfName, definitionFile, system, owner, "home/file"); expect(error.errorCode).toEqual(status400); - expect(error.details.msg).toContain(messageId); + expect(error.causeErrors.message).toContain(messageId); }); }); }); diff --git a/packages/zosjobs/__tests__/__system__/SubmitJobs.system.test.ts b/packages/zosjobs/__tests__/__system__/SubmitJobs.system.test.ts index 3a9d729f26..f2e83ffd5a 100644 --- a/packages/zosjobs/__tests__/__system__/SubmitJobs.system.test.ts +++ b/packages/zosjobs/__tests__/__system__/SubmitJobs.system.test.ts @@ -251,7 +251,7 @@ describe("Submit Jobs - System Tests", () => { } expect(err).toBeDefined(); expect(err instanceof ImperativeError).toEqual(true); - expect(err.details.msg).toContain("does not start with a slash"); + expect(err.causeErrors.message).toContain("does not start with a slash"); }); @@ -267,7 +267,7 @@ describe("Submit Jobs - System Tests", () => { } expect(err).toBeDefined(); expect(err instanceof ImperativeError).toEqual(true); - expect(err.details.msg).toContain("does not start with a slash"); + expect(err.causeErrors.message).toContain("does not start with a slash"); }); @@ -288,7 +288,7 @@ describe("Submit Jobs - System Tests", () => { } expect(err).toBeDefined(); expect(err instanceof ImperativeError).toEqual(true); - expect(err.details.msg).toContain("does not start with a slash"); + expect(err.causeErrors.message).toContain("does not start with a slash"); }); @@ -312,7 +312,7 @@ describe("Submit Jobs - System Tests", () => { } expect(err).toBeDefined(); expect(err instanceof ImperativeError).toEqual(true); - expect(err.details.msg).toContain("does not start with a slash"); + expect(err.causeErrors.message).toContain("does not start with a slash"); }, LONG_TIMEOUT); it("should surface an error from z/OSMF when calling submitJobCommon with a non existent data set", async () => { @@ -326,7 +326,7 @@ describe("Submit Jobs - System Tests", () => { } expect(err).toBeDefined(); expect(err instanceof ImperativeError).toEqual(true); - expect(err.details.msg).toContain(badDataSet); + expect(err.causeErrors.message).toContain(badDataSet); }); it("should surface an error from z/OSMF when calling submitJobCommon with a non existent uss file", async () => { @@ -340,7 +340,7 @@ describe("Submit Jobs - System Tests", () => { } expect(err).toBeDefined(); expect(err instanceof ImperativeError).toEqual(true); - expect(err.details.msg).toContain(badUSSFile); + expect(err.causeErrors.message).toContain(badUSSFile); }); it("should surface an error from z/OSMF when calling submitJobNotifyCommon with a non existent data set", async () => { @@ -354,7 +354,7 @@ describe("Submit Jobs - System Tests", () => { } expect(err).toBeDefined(); expect(err instanceof ImperativeError).toEqual(true); - expect(err.details.msg).toContain(badDataSet); + expect(err.causeErrors.message).toContain(badDataSet); }, LONG_TIMEOUT); it("should surface an error from z/OSMF when calling submitJobNotifyCommon with a non existent uss file", async () => { @@ -368,7 +368,7 @@ describe("Submit Jobs - System Tests", () => { } expect(err).toBeDefined(); expect(err instanceof ImperativeError).toEqual(true); - expect(err.details.msg).toContain(badUSSFile); + expect(err.causeErrors.message).toContain(badUSSFile); }, LONG_TIMEOUT); it("should surface an error from z/OSMF when calling submitJclNotify with invalid JCL", async () => { @@ -385,7 +385,7 @@ describe("Submit Jobs - System Tests", () => { } expect(err).toBeDefined(); expect(err instanceof ImperativeError).toEqual(true); - expect(err.details.msg).toContain("does not start with a slash"); + expect(err.causeErrors.message).toContain("does not start with a slash"); }, LONG_TIMEOUT); it("should surface an error from z/OSMF when calling submitJobNotify with a non existent data set", async () => { @@ -399,7 +399,7 @@ describe("Submit Jobs - System Tests", () => { } expect(err).toBeDefined(); expect(err instanceof ImperativeError).toEqual(true); - expect(err.details.msg).toContain(badDataSet); + expect(err.causeErrors.message).toContain(badDataSet); }, LONG_TIMEOUT); it("should surface an error from z/OSMF when calling submitUSSJobNotify with a non existent uss file", async () => { @@ -413,7 +413,7 @@ describe("Submit Jobs - System Tests", () => { } expect(err).toBeDefined(); expect(err instanceof ImperativeError).toEqual(true); - expect(err.details.msg).toContain(badUSSFile); + expect(err.causeErrors.message).toContain(badUSSFile); }, LONG_TIMEOUT); it("should surface an error from z/OSMF when calling submitJob with a non existent data set", async () => { @@ -427,7 +427,7 @@ describe("Submit Jobs - System Tests", () => { } expect(err).toBeDefined(); expect(err instanceof ImperativeError).toEqual(true); - expect(err.details.msg).toContain(badDataSet); + expect(err.causeErrors.message).toContain(badDataSet); }); it("should surface an error from z/OSMF when calling submitUSSJob with a non existent USS file", async () => { @@ -441,7 +441,7 @@ describe("Submit Jobs - System Tests", () => { } expect(err).toBeDefined(); expect(err instanceof ImperativeError).toEqual(true); - expect(err.details.msg).toContain(badUSSFile); + expect(err.causeErrors.message).toContain(badUSSFile); }); it("should throw an error if the JCL string is null", async () => { @@ -453,7 +453,7 @@ describe("Submit Jobs - System Tests", () => { } expect(err).toBeDefined(); expect(err instanceof ImperativeError).toEqual(true); - expect(err.details.msg).toContain(ZosJobsMessages.missingJcl.message); + expect(err.causeErrors.message).toContain(ZosJobsMessages.missingJcl.message); }); it("should throw an error if the JCL is an empty string", async () => { @@ -465,7 +465,7 @@ describe("Submit Jobs - System Tests", () => { } expect(err).toBeDefined(); expect(err instanceof ImperativeError).toEqual(true); - expect(err.details.msg).toContain(ZosJobsMessages.missingJcl.message); + expect(err.causeErrors.message).toContain(ZosJobsMessages.missingJcl.message); }); }); }); From 392c4d6e5a9a511f359f679bd0361de57e6b992c Mon Sep 17 00:00:00 2001 From: zFernand0 <37381190+zFernand0@users.noreply.github.com> Date: Thu, 4 Jan 2024 21:14:11 +0000 Subject: [PATCH 056/138] doc(cert): Document limitation on cert files Signed-off-by: zFernand0 <37381190+zFernand0@users.noreply.github.com> --- packages/core/src/constants/Core.constants.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/core/src/constants/Core.constants.ts b/packages/core/src/constants/Core.constants.ts index e48ea39ecb..75cf6b6278 100644 --- a/packages/core/src/constants/Core.constants.ts +++ b/packages/core/src/constants/Core.constants.ts @@ -102,7 +102,7 @@ export class ProfileConstants { */ public static readonly BASE_OPTION_CERT_FILE: ICommandOptionDefinition = { name: "cert-file", - description: "The file path to a certificate file to use for authentication", + description: "The file path to a certificate file to use for authentication.\n\nNote: The CLI does not support certificate files that require a password. For more information, search Troubleshooting PEM Certificates in Zowe Docs.", type: "existingLocalFile", group: ProfileConstants.BASE_CONNECTION_OPTION_GROUP }; @@ -112,7 +112,7 @@ export class ProfileConstants { */ public static readonly BASE_OPTION_CERT_KEY_FILE: ICommandOptionDefinition = { name: "cert-key-file", - description: "The file path to a certificate key file to use for authentication", + description: "The file path to a certificate key file to use for authentication.\n\nNote: The CLI does not support certificate files that require a password. For more information, search Troubleshooting PEM Certificates in Zowe Docs.", type: "existingLocalFile", group: ProfileConstants.BASE_CONNECTION_OPTION_GROUP }; From f6112128148fe0297aaf11aa545802096acf5101 Mon Sep 17 00:00:00 2001 From: zFernand0 <37381190+zFernand0@users.noreply.github.com> Date: Thu, 4 Jan 2024 21:19:55 +0000 Subject: [PATCH 057/138] update changelog Signed-off-by: zFernand0 <37381190+zFernand0@users.noreply.github.com> --- packages/cli/CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/packages/cli/CHANGELOG.md b/packages/cli/CHANGELOG.md index 7ec80fb818..4b2778a571 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: Add information about password-protected certificate file support. + ## `7.20.1` - BugFix: Add missing npm-shrinkwrap From aaba49267a92e0b4829033db1e5bf0f14f80316e Mon Sep 17 00:00:00 2001 From: "Andrew W. Harn" Date: Fri, 5 Jan 2024 09:12:23 -0500 Subject: [PATCH 058/138] Try parsing the JSON Signed-off-by: Andrew W. Harn --- .../__system__/api/Create.system.test.ts | 38 +++++++++---------- .../__system__/SubmitJobs.system.test.ts | 30 +++++++-------- 2 files changed, 34 insertions(+), 34 deletions(-) diff --git a/packages/workflows/__tests__/__system__/api/Create.system.test.ts b/packages/workflows/__tests__/__system__/api/Create.system.test.ts index 8d8a2333e1..41f06a62ed 100644 --- a/packages/workflows/__tests__/__system__/api/Create.system.test.ts +++ b/packages/workflows/__tests__/__system__/api/Create.system.test.ts @@ -236,7 +236,7 @@ describe("Create workflow", () => { it("Throws an error with wrong format of workflow definition file. Wrong member name.", async () => { const error = await produceError(REAL_SESSION, wfName, "DS.NAME(0)", system, owner); expect(error.errorCode).toEqual(notFound); - expect(error.causeErrors.message).toContain(messageId); + expect(JSON.parse(error.causeErrors).message).toContain(messageId); }); }); describe("IZUWF0103E", () => { @@ -245,52 +245,52 @@ describe("Create workflow", () => { it("Throws an error with wrong format of workflow definition file.", async () => { const error = await produceError(REAL_SESSION, wfName, "wrongPath", system, owner); expect(error.errorCode).toEqual(status400); - expect(error.causeErrors.message).toContain(messageId); + expect(JSON.parse(error.causeErrors).message).toContain(messageId); }); it("Throws an error with wrong format of workflow definition file. Name that ends with a period.", async () => { const error = await produceError(REAL_SESSION, wfName, "DS.NAME.", system, owner); expect(error.errorCode).toEqual(status400); - expect(error.causeErrors.message).toContain(messageId); + expect(JSON.parse(error.causeErrors).message).toContain(messageId); }); it("Throws an error with wrong format of workflow definition file. Path not from root.", async () => { const error = await produceError(REAL_SESSION, wfName, "home/file", system, owner); expect(error.errorCode).toEqual(status400); - expect(error.causeErrors.message).toContain(messageId); + expect(JSON.parse(error.causeErrors).message).toContain(messageId); }); it("Throws an error with wrong format of workflow definition file. Qualifier is longer than 8 characters.", async () => { const error = await produceError(REAL_SESSION, wfName, "DS.NAME.LONGFIELD", system, owner); expect(error.errorCode).toEqual(status400); - expect(error.causeErrors.message).toContain(messageId); + expect(JSON.parse(error.causeErrors).message).toContain(messageId); }); it("Throws an error with wrong format of workflow definition file. More than 44 characters for DSNAME alone.", async () => { const error = await produceError(REAL_SESSION, wfName, "DS.NAME.STUFF.STUFF.STUFF.STUFF.STUFF.STUFF.STUFF.STUFF", system, owner); expect(error.errorCode).toEqual(status400); - expect(error.causeErrors.message).toContain(messageId); + expect(JSON.parse(error.causeErrors).message).toContain(messageId); }); it("Throws an error with wrong format of workflow definition file. Name containing two successive periods.", async () => { const error = await produceError(REAL_SESSION, wfName, "DS..NAME", system, owner); expect(error.errorCode).toEqual(status400); - expect(error.causeErrors.message).toContain(messageId); + expect(JSON.parse(error.causeErrors).message).toContain(messageId); }); it("Throws an error with wrong format of definition file. Name contains a qualifier that starts with numeric character.", async () => { const error = await produceError(REAL_SESSION, wfName, "DS.123.NAME", system, owner); expect(error.errorCode).toEqual(status400); - expect(error.causeErrors.message).toContain(messageId); + expect(JSON.parse(error.causeErrors).message).toContain(messageId); }); it("Throws an error with wrong format of workflow definition file. Member name is too long.", async () => { const error = await produceError(REAL_SESSION, wfName, "DS.NAME(MEMBER123)", system, owner); expect(error.errorCode).toEqual(status400); - expect(error.causeErrors.message).toContain(messageId); + expect(JSON.parse(error.causeErrors).message).toContain(messageId); }); it("Throws an error with wrong format of workflow definition file. Member doesn't end with `)`.", async () => { const error = await produceError(REAL_SESSION, wfName, "DS.NAME(MEMBER", system, owner); expect(error.errorCode).toEqual(status400); - expect(error.causeErrors.message).toContain(messageId); + expect(JSON.parse(error.causeErrors).message).toContain(messageId); }); it("Throws an error with wrong format of workflow definition file. Name contains non-allowed character.", async () => { const error = await produceError(REAL_SESSION, wfName, "DS.NAME%", system, owner); expect(error.errorCode).toEqual(status400); - expect(error.causeErrors.message).toContain(messageId); + expect(JSON.parse(error.causeErrors).message).toContain(messageId); }); }); describe("IZUWF0105E", () => { @@ -299,12 +299,12 @@ describe("Create workflow", () => { it("Throws an error with wrong format of variable input file. Name does not exist.", async () => { const error = await produceError(REAL_SESSION, wfName, definitionFile, system, owner, "DS.NAME.WRONG"); expect(error.errorCode).toEqual(status400); - expect(error.causeErrors.message).toContain(messageId); + expect(JSON.parse(error.causeErrors).message).toContain(messageId); }); it("Throws an error with wrong format of variable input file. Wrong member name.", async () => { const error = await produceError(REAL_SESSION, wfName, definitionFile, system, owner, "DS.NAME(0)"); expect(error.errorCode).toEqual(status400); - expect(error.causeErrors.message).toContain(messageId); + expect(JSON.parse(error.causeErrors).message).toContain(messageId); }); }); describe("IZUWF0107E", () => { @@ -313,33 +313,33 @@ describe("Create workflow", () => { it("Throws an error with wrong format of variable input file. Name that ends with a period.", async () => { const error = await produceError(REAL_SESSION, wfName, definitionFile, system, owner, "DS.NAME."); expect(error.errorCode).toEqual(status400); - expect(error.causeErrors.message).toContain(messageId); + expect(JSON.parse(error.causeErrors).message).toContain(messageId); }); it("Throws an error with wrong format of variable input file. More than 44 characters for DSNAME alone.", async () => { const error = await produceError(REAL_SESSION, wfName, definitionFile, system, owner, "DS.NAME.STUFF.STUFF.STUFF.STUFF.STUFF.STUFF.STUFF.STUFF"); expect(error.errorCode).toEqual(status400); - expect(error.causeErrors.message).toContain(messageId); + expect(JSON.parse(error.causeErrors).message).toContain(messageId); }); it("Throws an error with wrong format of variable input file. Name containing two successive periods.", async () => { const error = await produceError(REAL_SESSION, wfName, definitionFile, system, owner, "DS..NAME"); expect(error.errorCode).toEqual(status400); - expect(error.causeErrors.message).toContain(messageId); + expect(JSON.parse(error.causeErrors).message).toContain(messageId); }); it("Name that contains a qualifier that starts with non-alphabetic or non-special character.", async () => { const error = await produceError(REAL_SESSION, wfName, definitionFile, system, owner, "DS.123.NAME"); expect(error.errorCode).toEqual(status400); - expect(error.causeErrors.message).toContain(messageId); + expect(JSON.parse(error.causeErrors).message).toContain(messageId); }); it("Throws an error with wrong format of variable input file. Qualifier is longer than 8 characters.", async () => { const error = await produceError(REAL_SESSION, wfName, definitionFile, system, owner, "DS.NAME.LONGFIELD"); expect(error.errorCode).toEqual(status400); - expect(error.causeErrors.message).toContain(messageId); + expect(JSON.parse(error.causeErrors).message).toContain(messageId); }); it("Throws an error with wrong format of variable input file. Path not from root.", async () => { const error = await produceError(REAL_SESSION, wfName, definitionFile, system, owner, "home/file"); expect(error.errorCode).toEqual(status400); - expect(error.causeErrors.message).toContain(messageId); + expect(JSON.parse(error.causeErrors).message).toContain(messageId); }); }); }); diff --git a/packages/zosjobs/__tests__/__system__/SubmitJobs.system.test.ts b/packages/zosjobs/__tests__/__system__/SubmitJobs.system.test.ts index f2e83ffd5a..d142e33c84 100644 --- a/packages/zosjobs/__tests__/__system__/SubmitJobs.system.test.ts +++ b/packages/zosjobs/__tests__/__system__/SubmitJobs.system.test.ts @@ -251,7 +251,7 @@ describe("Submit Jobs - System Tests", () => { } expect(err).toBeDefined(); expect(err instanceof ImperativeError).toEqual(true); - expect(err.causeErrors.message).toContain("does not start with a slash"); + expect(JSON.parse(err.causeErrors).message).toContain("does not start with a slash"); }); @@ -267,7 +267,7 @@ describe("Submit Jobs - System Tests", () => { } expect(err).toBeDefined(); expect(err instanceof ImperativeError).toEqual(true); - expect(err.causeErrors.message).toContain("does not start with a slash"); + expect(JSON.parse(err.causeErrors).message).toContain("does not start with a slash"); }); @@ -288,7 +288,7 @@ describe("Submit Jobs - System Tests", () => { } expect(err).toBeDefined(); expect(err instanceof ImperativeError).toEqual(true); - expect(err.causeErrors.message).toContain("does not start with a slash"); + expect(JSON.parse(err.causeErrors).message).toContain("does not start with a slash"); }); @@ -312,7 +312,7 @@ describe("Submit Jobs - System Tests", () => { } expect(err).toBeDefined(); expect(err instanceof ImperativeError).toEqual(true); - expect(err.causeErrors.message).toContain("does not start with a slash"); + expect(JSON.parse(err.causeErrors).message).toContain("does not start with a slash"); }, LONG_TIMEOUT); it("should surface an error from z/OSMF when calling submitJobCommon with a non existent data set", async () => { @@ -326,7 +326,7 @@ describe("Submit Jobs - System Tests", () => { } expect(err).toBeDefined(); expect(err instanceof ImperativeError).toEqual(true); - expect(err.causeErrors.message).toContain(badDataSet); + expect(JSON.parse(err.causeErrors).message).toContain(badDataSet); }); it("should surface an error from z/OSMF when calling submitJobCommon with a non existent uss file", async () => { @@ -340,7 +340,7 @@ describe("Submit Jobs - System Tests", () => { } expect(err).toBeDefined(); expect(err instanceof ImperativeError).toEqual(true); - expect(err.causeErrors.message).toContain(badUSSFile); + expect(JSON.parse(err.causeErrors).message).toContain(badUSSFile); }); it("should surface an error from z/OSMF when calling submitJobNotifyCommon with a non existent data set", async () => { @@ -354,7 +354,7 @@ describe("Submit Jobs - System Tests", () => { } expect(err).toBeDefined(); expect(err instanceof ImperativeError).toEqual(true); - expect(err.causeErrors.message).toContain(badDataSet); + expect(JSON.parse(err.causeErrors).message).toContain(badDataSet); }, LONG_TIMEOUT); it("should surface an error from z/OSMF when calling submitJobNotifyCommon with a non existent uss file", async () => { @@ -368,7 +368,7 @@ describe("Submit Jobs - System Tests", () => { } expect(err).toBeDefined(); expect(err instanceof ImperativeError).toEqual(true); - expect(err.causeErrors.message).toContain(badUSSFile); + expect(JSON.parse(err.causeErrors).message).toContain(badUSSFile); }, LONG_TIMEOUT); it("should surface an error from z/OSMF when calling submitJclNotify with invalid JCL", async () => { @@ -385,7 +385,7 @@ describe("Submit Jobs - System Tests", () => { } expect(err).toBeDefined(); expect(err instanceof ImperativeError).toEqual(true); - expect(err.causeErrors.message).toContain("does not start with a slash"); + expect(JSON.parse(err.causeErrors).message).toContain("does not start with a slash"); }, LONG_TIMEOUT); it("should surface an error from z/OSMF when calling submitJobNotify with a non existent data set", async () => { @@ -399,7 +399,7 @@ describe("Submit Jobs - System Tests", () => { } expect(err).toBeDefined(); expect(err instanceof ImperativeError).toEqual(true); - expect(err.causeErrors.message).toContain(badDataSet); + expect(JSON.parse(err.causeErrors).message).toContain(badDataSet); }, LONG_TIMEOUT); it("should surface an error from z/OSMF when calling submitUSSJobNotify with a non existent uss file", async () => { @@ -413,7 +413,7 @@ describe("Submit Jobs - System Tests", () => { } expect(err).toBeDefined(); expect(err instanceof ImperativeError).toEqual(true); - expect(err.causeErrors.message).toContain(badUSSFile); + expect(JSON.parse(err.causeErrors).message).toContain(badUSSFile); }, LONG_TIMEOUT); it("should surface an error from z/OSMF when calling submitJob with a non existent data set", async () => { @@ -427,7 +427,7 @@ describe("Submit Jobs - System Tests", () => { } expect(err).toBeDefined(); expect(err instanceof ImperativeError).toEqual(true); - expect(err.causeErrors.message).toContain(badDataSet); + expect(JSON.parse(err.causeErrors).message).toContain(badDataSet); }); it("should surface an error from z/OSMF when calling submitUSSJob with a non existent USS file", async () => { @@ -441,7 +441,7 @@ describe("Submit Jobs - System Tests", () => { } expect(err).toBeDefined(); expect(err instanceof ImperativeError).toEqual(true); - expect(err.causeErrors.message).toContain(badUSSFile); + expect(JSON.parse(err.causeErrors).message).toContain(badUSSFile); }); it("should throw an error if the JCL string is null", async () => { @@ -453,7 +453,7 @@ describe("Submit Jobs - System Tests", () => { } expect(err).toBeDefined(); expect(err instanceof ImperativeError).toEqual(true); - expect(err.causeErrors.message).toContain(ZosJobsMessages.missingJcl.message); + expect(JSON.parse(err.causeErrors).message).toContain(ZosJobsMessages.missingJcl.message); }); it("should throw an error if the JCL is an empty string", async () => { @@ -465,7 +465,7 @@ describe("Submit Jobs - System Tests", () => { } expect(err).toBeDefined(); expect(err instanceof ImperativeError).toEqual(true); - expect(err.causeErrors.message).toContain(ZosJobsMessages.missingJcl.message); + expect(JSON.parse(err.causeErrors).message).toContain(ZosJobsMessages.missingJcl.message); }); }); }); From 1d8690a36e31fee007545e19fb1addd03931af1f Mon Sep 17 00:00:00 2001 From: "Andrew W. Harn" Date: Fri, 5 Jan 2024 10:32:37 -0500 Subject: [PATCH 059/138] Additional test fixes Signed-off-by: Andrew W. Harn --- .../__system__/api/Create.system.test.ts | 38 +++++------ .../__system__/MonitorJobs.system.test.ts | 63 ++++++++++--------- 2 files changed, 54 insertions(+), 47 deletions(-) diff --git a/packages/workflows/__tests__/__system__/api/Create.system.test.ts b/packages/workflows/__tests__/__system__/api/Create.system.test.ts index 41f06a62ed..69e3d3c143 100644 --- a/packages/workflows/__tests__/__system__/api/Create.system.test.ts +++ b/packages/workflows/__tests__/__system__/api/Create.system.test.ts @@ -236,7 +236,7 @@ describe("Create workflow", () => { it("Throws an error with wrong format of workflow definition file. Wrong member name.", async () => { const error = await produceError(REAL_SESSION, wfName, "DS.NAME(0)", system, owner); expect(error.errorCode).toEqual(notFound); - expect(JSON.parse(error.causeErrors).message).toContain(messageId); + expect(error.causeErrors).toContain(messageId); }); }); describe("IZUWF0103E", () => { @@ -245,52 +245,52 @@ describe("Create workflow", () => { it("Throws an error with wrong format of workflow definition file.", async () => { const error = await produceError(REAL_SESSION, wfName, "wrongPath", system, owner); expect(error.errorCode).toEqual(status400); - expect(JSON.parse(error.causeErrors).message).toContain(messageId); + expect(error.causeErrors).toContain(messageId); }); it("Throws an error with wrong format of workflow definition file. Name that ends with a period.", async () => { const error = await produceError(REAL_SESSION, wfName, "DS.NAME.", system, owner); expect(error.errorCode).toEqual(status400); - expect(JSON.parse(error.causeErrors).message).toContain(messageId); + expect(error.causeErrors).toContain(messageId); }); it("Throws an error with wrong format of workflow definition file. Path not from root.", async () => { const error = await produceError(REAL_SESSION, wfName, "home/file", system, owner); expect(error.errorCode).toEqual(status400); - expect(JSON.parse(error.causeErrors).message).toContain(messageId); + expect(error.causeErrors).toContain(messageId); }); it("Throws an error with wrong format of workflow definition file. Qualifier is longer than 8 characters.", async () => { const error = await produceError(REAL_SESSION, wfName, "DS.NAME.LONGFIELD", system, owner); expect(error.errorCode).toEqual(status400); - expect(JSON.parse(error.causeErrors).message).toContain(messageId); + expect(error.causeErrors).toContain(messageId); }); it("Throws an error with wrong format of workflow definition file. More than 44 characters for DSNAME alone.", async () => { const error = await produceError(REAL_SESSION, wfName, "DS.NAME.STUFF.STUFF.STUFF.STUFF.STUFF.STUFF.STUFF.STUFF", system, owner); expect(error.errorCode).toEqual(status400); - expect(JSON.parse(error.causeErrors).message).toContain(messageId); + expect(error.causeErrors).toContain(messageId); }); it("Throws an error with wrong format of workflow definition file. Name containing two successive periods.", async () => { const error = await produceError(REAL_SESSION, wfName, "DS..NAME", system, owner); expect(error.errorCode).toEqual(status400); - expect(JSON.parse(error.causeErrors).message).toContain(messageId); + expect(error.causeErrors).toContain(messageId); }); it("Throws an error with wrong format of definition file. Name contains a qualifier that starts with numeric character.", async () => { const error = await produceError(REAL_SESSION, wfName, "DS.123.NAME", system, owner); expect(error.errorCode).toEqual(status400); - expect(JSON.parse(error.causeErrors).message).toContain(messageId); + expect(error.causeErrors).toContain(messageId); }); it("Throws an error with wrong format of workflow definition file. Member name is too long.", async () => { const error = await produceError(REAL_SESSION, wfName, "DS.NAME(MEMBER123)", system, owner); expect(error.errorCode).toEqual(status400); - expect(JSON.parse(error.causeErrors).message).toContain(messageId); + expect(error.causeErrors).toContain(messageId); }); it("Throws an error with wrong format of workflow definition file. Member doesn't end with `)`.", async () => { const error = await produceError(REAL_SESSION, wfName, "DS.NAME(MEMBER", system, owner); expect(error.errorCode).toEqual(status400); - expect(JSON.parse(error.causeErrors).message).toContain(messageId); + expect(error.causeErrors).toContain(messageId); }); it("Throws an error with wrong format of workflow definition file. Name contains non-allowed character.", async () => { const error = await produceError(REAL_SESSION, wfName, "DS.NAME%", system, owner); expect(error.errorCode).toEqual(status400); - expect(JSON.parse(error.causeErrors).message).toContain(messageId); + expect(error.causeErrors).toContain(messageId); }); }); describe("IZUWF0105E", () => { @@ -299,12 +299,12 @@ describe("Create workflow", () => { it("Throws an error with wrong format of variable input file. Name does not exist.", async () => { const error = await produceError(REAL_SESSION, wfName, definitionFile, system, owner, "DS.NAME.WRONG"); expect(error.errorCode).toEqual(status400); - expect(JSON.parse(error.causeErrors).message).toContain(messageId); + expect(error.causeErrors).toContain(messageId); }); it("Throws an error with wrong format of variable input file. Wrong member name.", async () => { const error = await produceError(REAL_SESSION, wfName, definitionFile, system, owner, "DS.NAME(0)"); expect(error.errorCode).toEqual(status400); - expect(JSON.parse(error.causeErrors).message).toContain(messageId); + expect(error.causeErrors).toContain(messageId); }); }); describe("IZUWF0107E", () => { @@ -313,33 +313,33 @@ describe("Create workflow", () => { it("Throws an error with wrong format of variable input file. Name that ends with a period.", async () => { const error = await produceError(REAL_SESSION, wfName, definitionFile, system, owner, "DS.NAME."); expect(error.errorCode).toEqual(status400); - expect(JSON.parse(error.causeErrors).message).toContain(messageId); + expect(error.causeErrors).toContain(messageId); }); it("Throws an error with wrong format of variable input file. More than 44 characters for DSNAME alone.", async () => { const error = await produceError(REAL_SESSION, wfName, definitionFile, system, owner, "DS.NAME.STUFF.STUFF.STUFF.STUFF.STUFF.STUFF.STUFF.STUFF"); expect(error.errorCode).toEqual(status400); - expect(JSON.parse(error.causeErrors).message).toContain(messageId); + expect(error.causeErrors).toContain(messageId); }); it("Throws an error with wrong format of variable input file. Name containing two successive periods.", async () => { const error = await produceError(REAL_SESSION, wfName, definitionFile, system, owner, "DS..NAME"); expect(error.errorCode).toEqual(status400); - expect(JSON.parse(error.causeErrors).message).toContain(messageId); + expect(error.causeErrors).toContain(messageId); }); it("Name that contains a qualifier that starts with non-alphabetic or non-special character.", async () => { const error = await produceError(REAL_SESSION, wfName, definitionFile, system, owner, "DS.123.NAME"); expect(error.errorCode).toEqual(status400); - expect(JSON.parse(error.causeErrors).message).toContain(messageId); + expect(error.causeErrors).toContain(messageId); }); it("Throws an error with wrong format of variable input file. Qualifier is longer than 8 characters.", async () => { const error = await produceError(REAL_SESSION, wfName, definitionFile, system, owner, "DS.NAME.LONGFIELD"); expect(error.errorCode).toEqual(status400); - expect(JSON.parse(error.causeErrors).message).toContain(messageId); + expect(error.causeErrors).toContain(messageId); }); it("Throws an error with wrong format of variable input file. Path not from root.", async () => { const error = await produceError(REAL_SESSION, wfName, definitionFile, system, owner, "home/file"); expect(error.errorCode).toEqual(status400); - expect(JSON.parse(error.causeErrors).message).toContain(messageId); + expect(error.causeErrors).toContain(messageId); }); }); }); diff --git a/packages/zosjobs/__tests__/__system__/MonitorJobs.system.test.ts b/packages/zosjobs/__tests__/__system__/MonitorJobs.system.test.ts index e84c1eb85c..c0e5a49f65 100644 --- a/packages/zosjobs/__tests__/__system__/MonitorJobs.system.test.ts +++ b/packages/zosjobs/__tests__/__system__/MonitorJobs.system.test.ts @@ -113,12 +113,13 @@ describe("System Tests - Monitor Jobs", () => { // const regex: RegExp = new RegExp(fs.readFileSync(TEST_REGEX_DIR + "/not_found_job.regex").toString(), "g"); // expect(regex.test(error.message)).toBe(true); const trimmedErrorMessage = trimMessage(error.message); + const jsonCauseErrors = JSON.parse(error.causeErrors); expect(trimmedErrorMessage).toContain("Error obtaining status for jobname \"JOB1\" jobid \"JOB123\""); - expect(trimmedErrorMessage).toContain("category: 6"); - expect(trimmedErrorMessage).toContain("reason: 10"); - expect(trimmedErrorMessage).toContain("rc: 4"); + expect(jsonCauseErrors.category).toEqual(6); + expect(jsonCauseErrors.reason).toEqual(10); + expect(jsonCauseErrors.rc).toEqual(4); expect(trimmedErrorMessage).toContain("status 400"); - expect(trimmedErrorMessage).toContain("No job found for reference"); + expect(jsonCauseErrors.message).toContain("No job found for reference"); }); }); @@ -197,12 +198,13 @@ describe("System Tests - Monitor Jobs", () => { // const regex: RegExp = new RegExp(fs.readFileSync(TEST_REGEX_DIR + "/not_found_job.regex").toString(), "g"); // expect(regex.test(error.message)).toBe(true); const trimmedErrorMessage = trimMessage(error.message); + const jsonCauseErrors = JSON.parse(error.causeErrors); expect(trimmedErrorMessage).toContain("Error obtaining status for jobname \"JOB1\" jobid \"JOB123\""); - expect(trimmedErrorMessage).toContain("category: 6"); - expect(trimmedErrorMessage).toContain("reason: 10"); - expect(trimmedErrorMessage).toContain("rc: 4"); + expect(jsonCauseErrors.category).toEqual(6); + expect(jsonCauseErrors.reason).toEqual(10); + expect(jsonCauseErrors.rc).toEqual(4); expect(trimmedErrorMessage).toContain("status 400"); - expect(trimmedErrorMessage).toContain("No job found for reference"); + expect(jsonCauseErrors.message).toContain("No job found for reference"); }); }); @@ -280,12 +282,13 @@ describe("System Tests - Monitor Jobs", () => { // const regex: RegExp = new RegExp(fs.readFileSync(TEST_REGEX_DIR + "/invalid_jobname.regex").toString(), "g"); // expect(regex.test(error.message)).toBe(true); const trimmedErrorMessage = trimMessage(error.message); + const jsonCauseErrors = JSON.parse(error.causeErrors); expect(trimmedErrorMessage).toContain("Error obtaining status for jobname \"(((((\" jobid \"JOB123\""); - expect(trimmedErrorMessage).toContain("category: 6"); - expect(trimmedErrorMessage).toContain("reason: 7"); - expect(trimmedErrorMessage).toContain("rc: 4"); + expect(jsonCauseErrors.category).toEqual(6); + expect(jsonCauseErrors.reason).toEqual(7); + expect(jsonCauseErrors.rc).toEqual(4); expect(trimmedErrorMessage).toContain("status 400"); - expect(trimmedErrorMessage).toContain("No match for method GET and pathInfo"); + expect(jsonCauseErrors.message).toContain("No match for method GET and pathInfo"); }); it("should detect and surface an error message if an invalid jobid is specified", async () => { @@ -300,12 +303,13 @@ describe("System Tests - Monitor Jobs", () => { // const regex: RegExp = new RegExp(fs.readFileSync(TEST_REGEX_DIR + "/invalid_jobid.regex").toString(), "g"); // expect(regex.test(error.message)).toBe(true); const trimmedErrorMessage = trimMessage(error.message); + const jsonCauseErrors = JSON.parse(error.causeErrors); expect(trimmedErrorMessage).toContain("Error obtaining status for jobname \"JOB1\" jobid \"(\""); - expect(trimmedErrorMessage).toContain("category: 6"); - expect(trimmedErrorMessage).toContain("reason: 7"); - expect(trimmedErrorMessage).toContain("rc: 4"); + expect(jsonCauseErrors.category).toEqual(6); + expect(jsonCauseErrors.reason).toEqual(7); + expect(jsonCauseErrors.rc).toEqual(4); expect(trimmedErrorMessage).toContain("status 400"); - expect(trimmedErrorMessage).toContain("No match for method GET and pathInfo"); + expect(jsonCauseErrors.message).toContain("No match for method GET and pathInfo"); }); it("should detect and surface an error if the job requested is not found", async () => { @@ -320,12 +324,13 @@ describe("System Tests - Monitor Jobs", () => { // const regex: RegExp = new RegExp(fs.readFileSync(TEST_REGEX_DIR + "/not_found_job.regex").toString(), "g"); // expect(regex.test(error.message)).toBe(true); const trimmedErrorMessage = trimMessage(error.message); + const jsonCauseErrors = JSON.parse(error.causeErrors); expect(trimmedErrorMessage).toContain("Error obtaining status for jobname \"JOB1\" jobid \"JOB123\""); - expect(trimmedErrorMessage).toContain("category: 6"); - expect(trimmedErrorMessage).toContain("reason: 10"); - expect(trimmedErrorMessage).toContain("rc: 4"); + expect(jsonCauseErrors.category).toEqual(6); + expect(jsonCauseErrors.reason).toEqual(10); + expect(jsonCauseErrors.rc).toEqual(4); expect(trimmedErrorMessage).toContain("status 400"); - expect(trimmedErrorMessage).toContain("No job found for reference"); + expect(jsonCauseErrors.message).toContain("No job found for reference"); }); }); @@ -466,12 +471,13 @@ describe("System Tests - Monitor Jobs", () => { // const regex: RegExp = new RegExp(fs.readFileSync(TEST_REGEX_DIR + "/polling_job_deleted.regex").toString(), "g"); // expect(regex.test(error.message)).toBe(true); const trimmedErrorMessage = trimMessage(error.message); + const jsonCauseErrors = JSON.parse(error.causeErrors); expect(trimmedErrorMessage).toContain("Error obtaining status for jobname"); - expect(trimmedErrorMessage).toContain("category: 6"); - expect(trimmedErrorMessage).toContain("reason: 10"); - expect(trimmedErrorMessage).toContain("rc: 4"); + expect(jsonCauseErrors.category).toEqual(6); + expect(jsonCauseErrors.reason).toEqual(10); + expect(jsonCauseErrors.rc).toEqual(4); expect(trimmedErrorMessage).toContain("status 400"); - expect(trimmedErrorMessage).toContain("No job found for reference"); + expect(jsonCauseErrors.message).toContain("No job found for reference"); if (!doneCalled) { doneCalled = true; done(); @@ -962,12 +968,13 @@ describe("System Tests - Monitor Jobs - Encoded", () => { // const regex: RegExp = new RegExp(fs.readFileSync(TEST_REGEX_DIR + "/polling_job_deleted.regex").toString(), "g"); // expect(regex.test(error.message)).toBe(true); const trimmedErrorMessage = trimMessage(error.message); + const jsonCauseErrors = JSON.parse(error.causeErrors); expect(trimmedErrorMessage).toContain("Error obtaining status for jobname"); - expect(trimmedErrorMessage).toContain("category: 6"); - expect(trimmedErrorMessage).toContain("reason: 10"); - expect(trimmedErrorMessage).toContain("rc: 4"); + expect(jsonCauseErrors.category).toEqual(6); + expect(jsonCauseErrors.reason).toEqual(10); + expect(jsonCauseErrors.rc).toEqual(4); expect(trimmedErrorMessage).toContain("status 400"); - expect(trimmedErrorMessage).toContain("No job found for reference"); + expect(jsonCauseErrors.message).toContain("No job found for reference"); if (!doneCalled) { doneCalled = true; done(); From a058980b39a474ec95433fc0d6dbc3858615e238 Mon Sep 17 00:00:00 2001 From: Gene Johnston Date: Fri, 5 Jan 2024 12:01:18 -0500 Subject: [PATCH 060/138] Add changelog entry Signed-off-by: Gene Johnston --- packages/imperative/CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/packages/imperative/CHANGELOG.md b/packages/imperative/CHANGELOG.md index 037a4c816f..fc45ef2f68 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 + +- LTS Breaking: Remove deprecated V1 'profiles' command group. + ## `8.0.0-next.202311291643` - LTS Breaking: Removed check for `ZOWE_EDITOR` environment variable in `ProcessUtils.openInEditor` [#1867](https://github.com/zowe/zowe-cli/issues/1867) From d703e34f8e1b7e9553de7612575c6202022aedc0 Mon Sep 17 00:00:00 2001 From: Gene Johnston Date: Fri, 5 Jan 2024 12:02:29 -0500 Subject: [PATCH 061/138] Replace profile commands with pre-created team config Signed-off-by: Gene Johnston --- .../__resources__/zowe.config_template.json | 46 +++++++++++++++++++ .../__system__/__scripts__/create_team_cfg.sh | 19 ++++++++ .../__system__/__scripts__/exitOnFailure.sh | 12 +++++ .../cli.auth.login.apiml.system.test.ts | 35 +++++++++++--- 4 files changed, 106 insertions(+), 6 deletions(-) create mode 100644 packages/cli/__tests__/auth/__system__/__resources__/zowe.config_template.json create mode 100644 packages/cli/__tests__/auth/__system__/__scripts__/create_team_cfg.sh create mode 100644 packages/cli/__tests__/auth/__system__/__scripts__/exitOnFailure.sh diff --git a/packages/cli/__tests__/auth/__system__/__resources__/zowe.config_template.json b/packages/cli/__tests__/auth/__system__/__resources__/zowe.config_template.json new file mode 100644 index 0000000000..a0f8ca65d3 --- /dev/null +++ b/packages/cli/__tests__/auth/__system__/__resources__/zowe.config_template.json @@ -0,0 +1,46 @@ +{ + "$schema": "./zowe.schema.json", + "profiles": { + "zosmf": { + "type": "zosmf", + "properties": { + "port": 1443 + }, + "secure": [] + }, + "tso": { + "type": "tso", + "properties": { + "account": "", + "codePage": "1047", + "logonProcedure": "IZUFPROC" + }, + "secure": [] + }, + "ssh": { + "type": "ssh", + "properties": { + "port": 22 + }, + "secure": [] + }, + "base": { + "type": "base", + "properties": { + "host": "NoBaseHostVal", + "port": NoBasePortVal, + "rejectUnauthorized": NoBaseRejectUnauthVal, + "tokenType": "apimlAuthenticationToken" + }, + "secure": [ + "tokenValue" + ] + } + }, + "defaults": { + "zosmf": "zosmf", + "tso": "tso", + "ssh": "ssh", + "base": "base" + } +} \ No newline at end of file diff --git a/packages/cli/__tests__/auth/__system__/__scripts__/create_team_cfg.sh b/packages/cli/__tests__/auth/__system__/__scripts__/create_team_cfg.sh new file mode 100644 index 0000000000..3f54ca2685 --- /dev/null +++ b/packages/cli/__tests__/auth/__system__/__scripts__/create_team_cfg.sh @@ -0,0 +1,19 @@ +#!/bin/sh + +HOST=${1:?"First parm (HOST) is required."} +PORT=${2:?"Second parm (PORT) is required."} +REJECT=${3:?"Third parm (REJECT) is required."} + +# include exitOnFailure function +myScriptDir=`dirname $0` +. $myScriptDir/exitOnFailure.sh + +# copy our config file template +cp $myScriptDir/../__resources__/zowe.config_template.json . +exitOnFailure "Failed to copy config file." $? + +sed -e "s/NoBaseHostVal/$HOST/" \ + -e "s/NoBasePortVal/$PORT/" \ + -e "s/NoBaseRejectUnauthVal/$REJECT/" \ + < zowe.config_template.json > zowe.config.json +exitOnFailure "Failed to update config file." $? diff --git a/packages/cli/__tests__/auth/__system__/__scripts__/exitOnFailure.sh b/packages/cli/__tests__/auth/__system__/__scripts__/exitOnFailure.sh new file mode 100644 index 0000000000..5e7beb8643 --- /dev/null +++ b/packages/cli/__tests__/auth/__system__/__scripts__/exitOnFailure.sh @@ -0,0 +1,12 @@ +#!/bin/sh + +# function to exit if we encounter a bad return code +exitOnFailure () { + failureMsg=${1:?"First parm (failureMsg) is required."} + actualExitCode=${2:?"Second parm (actualExitCode) is required."} + goodExitCode=${3:-0} + if [ $actualExitCode != $goodExitCode ]; then + echo `basename $0`": $failureMsg" 1>&2 + exit $actualExitCode + fi +} diff --git a/packages/cli/__tests__/auth/__system__/cli.auth.login.apiml.system.test.ts b/packages/cli/__tests__/auth/__system__/cli.auth.login.apiml.system.test.ts index f33f3cccb9..14519a4824 100644 --- a/packages/cli/__tests__/auth/__system__/cli.auth.login.apiml.system.test.ts +++ b/packages/cli/__tests__/auth/__system__/cli.auth.login.apiml.system.test.ts @@ -14,6 +14,7 @@ import { TestEnvironment } from "../../../../../__tests__/__src__/environment/Te import { ITestPropertiesSchema } from "../../../../../__tests__/__src__/properties/ITestPropertiesSchema"; import { ITestBaseSchema } from "../../../../../__tests__/__src__/properties/ITestBaseSchema"; import { ITestCertPemSchema } from "../../../../../__tests__/__src__/properties/ITestCertPemSchema"; +import { keyring } from "@zowe/secrets-for-zowe-sdk"; describe("auth login/logout apiml with profile", () => { let TEST_ENVIRONMENT: ITestEnvironment; @@ -140,7 +141,10 @@ describe("auth login/logout apiml create profile", () => { await TestEnvironment.cleanUp(TEST_ENVIRONMENT_CREATE_PROF); }); - it("should successfully issue the login command and create a profile", () => { + /* Resurrect the following test after this Git issue is fixed: + https://github.com/zowe/zowe-cli/issues/2005 + */ + it.skip("TODO: After 2005 is fixed: should successfully issue the login command and create a team config", () => { const response = runCliScript(__dirname + "/__scripts__/auth_login_apiml_create.sh", TEST_ENVIRONMENT_CREATE_PROF, [ @@ -152,18 +156,37 @@ describe("auth login/logout apiml create profile", () => { "y" ]); expect(response.stderr.toString()).toBe(""); - expect(response.status).toBe(0); expect(response.stdout.toString()).toContain("Login successful."); expect(response.stdout.toString()).toContain("The authentication token is stored in the"); // ${name} base profile + expect(response.status).toBe(0); }); - it("should successfully issue the logout command with a created profile", () => { - const response = runCliScript(__dirname + "/__scripts__/auth_logout_apiml.sh", - TEST_ENVIRONMENT_CREATE_PROF); + it("should successfully issue the logout command with a created team config", async () => { + // create a team config + let response = runCliScript(__dirname + "/__scripts__/create_team_cfg.sh", + TEST_ENVIRONMENT_CREATE_PROF, + [ + base.host, + base.port, + base.rejectUnauthorized + ]); + expect(response.stderr.toString()).toBe(""); + + // login to create token in SCS + response = runCliScript(__dirname + "/__scripts__/auth_login_apiml.sh", TEST_ENVIRONMENT_CREATE_PROF, + [ + TEST_ENVIRONMENT_CREATE_PROF.systemTestProperties.base.user, + TEST_ENVIRONMENT_CREATE_PROF.systemTestProperties.base.password + ] + ); + expect(response.stderr.toString()).toBe(""); + expect(response.status).toBe(0); + + response = runCliScript(__dirname + "/__scripts__/auth_logout_apiml.sh", TEST_ENVIRONMENT_CREATE_PROF); expect(response.stderr.toString()).toBe(""); expect(response.status).toBe(0); expect(response.stdout.toString()).toContain("Logout successful. The authentication token has been revoked"); - expect(response.stdout.toString()).toContain("and removed from your 'default' base profile"); // V1 message + expect(response.stdout.toString()).toContain("Token was removed from your 'base' base profile"); // V1 message }); }); From 0314cc8c9ccff33fad37efd9f89c400fbf44509d Mon Sep 17 00:00:00 2001 From: "Andrew W. Harn" Date: Fri, 5 Jan 2024 12:10:14 -0500 Subject: [PATCH 062/138] Fix more system tests Signed-off-by: Andrew W. Harn --- .../methods/download/Download.system.test.ts | 4 +- .../__system__/GetJobs.system.test.ts | 80 +++++++++++-------- .../__system__/SubmitJobs.system.test.ts | 4 +- 3 files changed, 49 insertions(+), 39 deletions(-) diff --git a/packages/zosfiles/__tests__/__system__/methods/download/Download.system.test.ts b/packages/zosfiles/__tests__/__system__/methods/download/Download.system.test.ts index 7a5a9e51b7..7004b36fbe 100644 --- a/packages/zosfiles/__tests__/__system__/methods/download/Download.system.test.ts +++ b/packages/zosfiles/__tests__/__system__/methods/download/Download.system.test.ts @@ -963,7 +963,7 @@ describe("Download Data Set", () => { expect(response).toBeFalsy(); expect(error).toBeTruthy(); - expect(stripNewLines(error.message)).toContain("Data set not found."); + expect(JSON.parse(error.causeErrors).message).toContain("Data set not found."); }); }); @@ -1508,7 +1508,7 @@ describe("Download Data Set", () => { caughtError = error; } expect(caughtError).toBeDefined(); - expect(caughtError.message).toContain("Path name not found"); + expect(JSON.parse(caughtError.causeErrors).message).toContain("Path name not found"); }); }); }); diff --git a/packages/zosjobs/__tests__/__system__/GetJobs.system.test.ts b/packages/zosjobs/__tests__/__system__/GetJobs.system.test.ts index 8aecc7aa87..cffbaca476 100644 --- a/packages/zosjobs/__tests__/__system__/GetJobs.system.test.ts +++ b/packages/zosjobs/__tests__/__system__/GetJobs.system.test.ts @@ -263,11 +263,12 @@ describe("Get Jobs - System Tests", () => { expect(err).toBeDefined(); expect(err instanceof ImperativeError).toBe(true); const trimmedErrorMessage = trimMessage(err.message); - expect(trimmedErrorMessage).toContain("category: 6"); - expect(trimmedErrorMessage).toContain("reason: 4"); - expect(trimmedErrorMessage).toContain("rc: 4"); + const jsonCauseErrors = JSON.parse(err.causeErrors); + expect(jsonCauseErrors.category).toEqual(6); + expect(jsonCauseErrors.reason).toEqual(4); + expect(jsonCauseErrors.rc).toEqual(4); expect(trimmedErrorMessage).toContain("status 400"); - expect(trimmedErrorMessage).toContain("prefix query parameter"); + expect(jsonCauseErrors.message).toContain("prefix query parameter"); }); }); @@ -315,14 +316,14 @@ describe("Get Jobs - System Tests", () => { }, LONG_TIMEOUT); it("should throw an error if we specify a job ID that doesn't exist", async () => { - let err: Error | ImperativeError; + let err: ImperativeError; try { await GetJobs.getJob(REAL_SESSION, "J999999"); } catch (e) { err = e; } expect(err).toBeDefined(); - expect(err.message).toContain("not found"); + expect(JSON.parse(err.causeErrors).message).toContain("not found"); }); it("should return no jobs for a prefix that doesn't match anything", async () => { @@ -400,11 +401,12 @@ describe("Get Jobs - System Tests", () => { expect(err).toBeDefined(); expect(err instanceof ImperativeError).toBe(true); const trimmedErrorMessage = trimMessage(err.message); - expect(trimmedErrorMessage).toContain("category: 6"); - expect(trimmedErrorMessage).toContain("reason: 4"); - expect(trimmedErrorMessage).toContain("rc: 4"); + const jsonCauseErrors = JSON.parse(err.causeErrors); + expect(jsonCauseErrors.category).toEqual(6); + expect(jsonCauseErrors.reason).toEqual(4); + expect(jsonCauseErrors.rc).toEqual(4); expect(trimmedErrorMessage).toContain("status 400"); - expect(trimmedErrorMessage).toContain("owner query parameter"); + expect(jsonCauseErrors.message).toContain("owner query parameter"); }); }); @@ -491,9 +493,10 @@ describe("Get Status APIs", () => { expect(err).toBeDefined(); expect(err instanceof ImperativeError).toBe(true); const trimmedErrorMessage = trimMessage(err.message); - expect(trimmedErrorMessage).toContain("category: 6"); - expect(trimmedErrorMessage).toContain("reason: 7"); - expect(trimmedErrorMessage).toContain("rc: 4"); + const jsonCauseErrors = JSON.parse(err.causeErrors); + expect(jsonCauseErrors.category).toEqual(6); + expect(jsonCauseErrors.reason).toEqual(7); + expect(jsonCauseErrors.rc).toEqual(4); expect(trimmedErrorMessage).toContain("status 400"); }); @@ -507,9 +510,10 @@ describe("Get Status APIs", () => { expect(err).toBeDefined(); expect(err instanceof ImperativeError).toBe(true); const trimmedErrorMessage = trimMessage(err.message); - expect(trimmedErrorMessage).toContain("category: 6"); - expect(trimmedErrorMessage).toContain("reason: 7"); - expect(trimmedErrorMessage).toContain("rc: 4"); + const jsonCauseErrors = JSON.parse(err.causeErrors); + expect(jsonCauseErrors.category).toEqual(6); + expect(jsonCauseErrors.reason).toEqual(7); + expect(jsonCauseErrors.rc).toEqual(4); expect(trimmedErrorMessage).toContain("status 400"); }); }); @@ -609,9 +613,10 @@ describe("Get Status APIs", () => { expect(err).toBeDefined(); expect(err instanceof ImperativeError).toBe(true); const trimmedErrorMessage = trimMessage(err.message); - expect(trimmedErrorMessage).toContain("rc: 4"); - expect(trimmedErrorMessage).toContain("category: 6"); - expect(trimmedErrorMessage).toContain("reason: 7"); + const jsonCauseErrors = JSON.parse(err.causeErrors); + expect(jsonCauseErrors.category).toEqual(6); + expect(jsonCauseErrors.reason).toEqual(7); + expect(jsonCauseErrors.rc).toEqual(4); expect(trimmedErrorMessage).toContain("status 400"); expect(trimmedErrorMessage).toContain("JOB123"); }); @@ -626,9 +631,10 @@ describe("Get Status APIs", () => { expect(err).toBeDefined(); expect(err instanceof ImperativeError).toBe(true); const trimmedErrorMessage = trimMessage(err.message); - expect(trimmedErrorMessage).toContain("category: 6"); - expect(trimmedErrorMessage).toContain("reason: 7"); - expect(trimmedErrorMessage).toContain("rc: 4"); + const jsonCauseErrors = JSON.parse(err.causeErrors); + expect(jsonCauseErrors.category).toEqual(6); + expect(jsonCauseErrors.reason).toEqual(7); + expect(jsonCauseErrors.rc).toEqual(4); expect(trimmedErrorMessage).toContain("status 400"); }); }); @@ -748,9 +754,10 @@ describe("Get Status APIs", () => { expect(err).toBeDefined(); expect(err instanceof ImperativeError).toBe(true); const trimmedErrorMessage = trimMessage(err.message); - expect(trimmedErrorMessage).toContain("category: 6"); - expect(trimmedErrorMessage).toContain("reason: 7"); - expect(trimmedErrorMessage).toContain("rc: 4"); + const jsonCauseErrors = JSON.parse(err.causeErrors); + expect(jsonCauseErrors.category).toEqual(6); + expect(jsonCauseErrors.reason).toEqual(7); + expect(jsonCauseErrors.rc).toEqual(4); expect(trimmedErrorMessage).toContain("status 400"); }); @@ -764,9 +771,10 @@ describe("Get Status APIs", () => { expect(err).toBeDefined(); expect(err instanceof ImperativeError).toBe(true); const trimmedErrorMessage = trimMessage(err.message); - expect(trimmedErrorMessage).toContain("category: 6"); - expect(trimmedErrorMessage).toContain("reason: 7"); - expect(trimmedErrorMessage).toContain("rc: 4"); + const jsonCauseErrors = JSON.parse(err.causeErrors); + expect(jsonCauseErrors.category).toEqual(6); + expect(jsonCauseErrors.reason).toEqual(7); + expect(jsonCauseErrors.rc).toEqual(4); expect(trimmedErrorMessage).toContain("status 400"); }); }); @@ -861,10 +869,11 @@ describe("Get spool APIs", () => { expect(JSON.parse(error.causeErrors).reason).toMatchSnapshot(); expect(JSON.parse(error.causeErrors).category).toMatchSnapshot(); const trimmedErrorMessage = trimMessage(error.message); - expect(trimmedErrorMessage).toContain("category: 6"); - expect(trimmedErrorMessage).toContain("reason: 10"); - expect(trimmedErrorMessage).toContain("rc: 4"); - expect(trimmedErrorMessage).toContain("status 400"); + const jsonCauseErrors = JSON.parse(err.causeErrors); + expect(jsonCauseErrors.category).toEqual(6); + expect(jsonCauseErrors.reason).toEqual(10); + expect(jsonCauseErrors.rc).toEqual(4); + expect(trimmedErrorMessage).toContain("status 400"); }, LONG_TIMEOUT); }); @@ -944,8 +953,9 @@ describe("Get JCL APIs", () => { expect(JSON.parse(error.causeErrors).reason).toMatchSnapshot(); expect(JSON.parse(error.causeErrors).category).toMatchSnapshot(); const trimmedErrorMessage = trimMessage(error.message); + const jsonCauseErrors = JSON.parse(err.causeErrors); expect(trimmedErrorMessage).toContain("status 400"); - expect(trimmedErrorMessage).toContain(job.jobid); + expect(jsonCauseErrors.message).toContain(job.jobid); }); }); @@ -1156,14 +1166,14 @@ describe("Get Jobs - System Tests - Encoded", () => { }, LONG_TIMEOUT); it("should throw an error if we specify a job ID that doesn't exist", async () => { - let err: Error | ImperativeError; + let err: ImperativeError; try { await GetJobs.getJob(REAL_SESSION, "J999999"); } catch (e) { err = e; } expect(err).toBeDefined(); - expect(err.message).toContain("not found"); + expect(JSON.parse(err.causeErrors).message).toContain("not found"); }); it("should return no jobs for a prefix that doesn't match anything", async () => { diff --git a/packages/zosjobs/__tests__/__system__/SubmitJobs.system.test.ts b/packages/zosjobs/__tests__/__system__/SubmitJobs.system.test.ts index d142e33c84..bc03f439bd 100644 --- a/packages/zosjobs/__tests__/__system__/SubmitJobs.system.test.ts +++ b/packages/zosjobs/__tests__/__system__/SubmitJobs.system.test.ts @@ -453,7 +453,7 @@ describe("Submit Jobs - System Tests", () => { } expect(err).toBeDefined(); expect(err instanceof ImperativeError).toEqual(true); - expect(JSON.parse(err.causeErrors).message).toContain(ZosJobsMessages.missingJcl.message); + expect(err.message).toContain(ZosJobsMessages.missingJcl.message); }); it("should throw an error if the JCL is an empty string", async () => { @@ -465,7 +465,7 @@ describe("Submit Jobs - System Tests", () => { } expect(err).toBeDefined(); expect(err instanceof ImperativeError).toEqual(true); - expect(JSON.parse(err.causeErrors).message).toContain(ZosJobsMessages.missingJcl.message); + expect(err.message).toContain(ZosJobsMessages.missingJcl.message); }); }); }); From b4f3f04f052ed47e5d897d6ee6e8e483c060cc7d Mon Sep 17 00:00:00 2001 From: "Andrew W. Harn" Date: Fri, 5 Jan 2024 12:19:15 -0500 Subject: [PATCH 063/138] Fix indent Signed-off-by: Andrew W. Harn --- .../zosjobs/__tests__/__system__/GetJobs.system.test.ts | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/packages/zosjobs/__tests__/__system__/GetJobs.system.test.ts b/packages/zosjobs/__tests__/__system__/GetJobs.system.test.ts index cffbaca476..7067c006c0 100644 --- a/packages/zosjobs/__tests__/__system__/GetJobs.system.test.ts +++ b/packages/zosjobs/__tests__/__system__/GetJobs.system.test.ts @@ -870,10 +870,10 @@ describe("Get spool APIs", () => { expect(JSON.parse(error.causeErrors).category).toMatchSnapshot(); const trimmedErrorMessage = trimMessage(error.message); const jsonCauseErrors = JSON.parse(err.causeErrors); - expect(jsonCauseErrors.category).toEqual(6); - expect(jsonCauseErrors.reason).toEqual(10); - expect(jsonCauseErrors.rc).toEqual(4); - expect(trimmedErrorMessage).toContain("status 400"); + expect(jsonCauseErrors.category).toEqual(6); + expect(jsonCauseErrors.reason).toEqual(10); + expect(jsonCauseErrors.rc).toEqual(4); + expect(trimmedErrorMessage).toContain("status 400"); }, LONG_TIMEOUT); }); From 48d43b98301ccc74fe71b864e79080bc7f626f12 Mon Sep 17 00:00:00 2001 From: "Andrew W. Harn" Date: Fri, 5 Jan 2024 12:27:35 -0500 Subject: [PATCH 064/138] Fix copy paste errors Signed-off-by: Andrew W. Harn --- packages/zosjobs/__tests__/__system__/GetJobs.system.test.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/zosjobs/__tests__/__system__/GetJobs.system.test.ts b/packages/zosjobs/__tests__/__system__/GetJobs.system.test.ts index 7067c006c0..e273d48cdd 100644 --- a/packages/zosjobs/__tests__/__system__/GetJobs.system.test.ts +++ b/packages/zosjobs/__tests__/__system__/GetJobs.system.test.ts @@ -869,7 +869,7 @@ describe("Get spool APIs", () => { expect(JSON.parse(error.causeErrors).reason).toMatchSnapshot(); expect(JSON.parse(error.causeErrors).category).toMatchSnapshot(); const trimmedErrorMessage = trimMessage(error.message); - const jsonCauseErrors = JSON.parse(err.causeErrors); + const jsonCauseErrors = JSON.parse(error.causeErrors); expect(jsonCauseErrors.category).toEqual(6); expect(jsonCauseErrors.reason).toEqual(10); expect(jsonCauseErrors.rc).toEqual(4); @@ -953,7 +953,7 @@ describe("Get JCL APIs", () => { expect(JSON.parse(error.causeErrors).reason).toMatchSnapshot(); expect(JSON.parse(error.causeErrors).category).toMatchSnapshot(); const trimmedErrorMessage = trimMessage(error.message); - const jsonCauseErrors = JSON.parse(err.causeErrors); + const jsonCauseErrors = JSON.parse(error.causeErrors); expect(trimmedErrorMessage).toContain("status 400"); expect(jsonCauseErrors.message).toContain(job.jobid); }); From d5363b8085107c05e8011333a648cdf4cf512306 Mon Sep 17 00:00:00 2001 From: zFernand0 <37381190+zFernand0@users.noreply.github.com> Date: Fri, 5 Jan 2024 19:20:33 +0000 Subject: [PATCH 065/138] keep the note only for cert-file Signed-off-by: zFernand0 <37381190+zFernand0@users.noreply.github.com> --- .../cli.auth.apiml.integration.test.ts.snap | 9 ++++++--- .../cli.zos-uss.issue.ssh.integration.test.ts.snap | 9 ++++++--- packages/core/src/constants/Core.constants.ts | 6 ++++-- 3 files changed, 16 insertions(+), 8 deletions(-) diff --git a/packages/cli/__tests__/auth/__integration__/__snapshots__/cli.auth.apiml.integration.test.ts.snap b/packages/cli/__tests__/auth/__integration__/__snapshots__/cli.auth.apiml.integration.test.ts.snap index adec432955..14dc8baae8 100644 --- a/packages/cli/__tests__/auth/__integration__/__snapshots__/cli.auth.apiml.integration.test.ts.snap +++ b/packages/cli/__tests__/auth/__integration__/__snapshots__/cli.auth.apiml.integration.test.ts.snap @@ -61,7 +61,10 @@ exports[`auth login/logout apiml help should display the login help 1`] = ` --cert-file (local file path) - The file path to a certificate file to use for authentication + The file path to a certificate file to use for authentication. + + Note: The CLI does not support certificate files that require a password. For + more information, search Troubleshooting PEM Certificates in Zowe Docs. --cert-key-file (local file path) @@ -110,9 +113,9 @@ exports[`auth login/logout apiml help should display the login help 1`] = ` \\"success\\": true, \\"exitCode\\": 0, \\"message\\": \\"The help was constructed for command: apiml.\\", - \\"stdout\\": \\"\\\\n COMMAND NAME\\\\n ------------\\\\n\\\\n apiml\\\\n\\\\n DESCRIPTION\\\\n -----------\\\\n\\\\n Log in to Zowe API Mediation Layer authentication service and obtain or update a\\\\n token.\\\\n\\\\n The token provides authentication to services that support the API ML SSO\\\\n (Single Sign-On) capability. When you log in, the token is stored in your\\\\n default base profile until it expires. Base profiles store connection\\\\n information shared by multiple services (e.g., z/OSMF), and are used if you do\\\\n not supply connection information in a service profile. To take advantage of the\\\\n API ML SSO capability, you should omit username and password in service profiles\\\\n so that the token in the base profile is used.\\\\n\\\\n USAGE\\\\n -----\\\\n\\\\n zowe auth login apiml [options]\\\\n\\\\n OPTIONS\\\\n -------\\\\n\\\\n --show-token | --st (boolean)\\\\n\\\\n Show the token when login is successful. If specified, does not save the token\\\\n to a profile.\\\\n\\\\n BASE CONNECTION OPTIONS\\\\n -----------------------\\\\n\\\\n --host | -H (string)\\\\n\\\\n Host name of service on the mainframe.\\\\n\\\\n --port | -P (number)\\\\n\\\\n Port number of service on the mainframe.\\\\n\\\\n --user | -u (string)\\\\n\\\\n User name to authenticate to service on the mainframe.\\\\n\\\\n --password | --pass | --pw (string)\\\\n\\\\n Password to authenticate to service on the mainframe.\\\\n\\\\n --reject-unauthorized | --ru (boolean)\\\\n\\\\n Reject self-signed certificates.\\\\n\\\\n Default value: true\\\\n\\\\n --cert-file (local file path)\\\\n\\\\n The file path to a certificate file to use for authentication\\\\n\\\\n --cert-key-file (local file path)\\\\n\\\\n The file path to a certificate key file to use for authentication\\\\n\\\\n PROFILE OPTIONS\\\\n ---------------\\\\n\\\\n --base-profile | --base-p (string)\\\\n\\\\n The name of a (base) profile to load for this command execution.\\\\n\\\\n GLOBAL OPTIONS\\\\n --------------\\\\n\\\\n --show-inputs-only (boolean)\\\\n\\\\n Show command inputs and do not run the command\\\\n\\\\n --response-format-json | --rfj (boolean)\\\\n\\\\n Produce JSON formatted data from a command\\\\n\\\\n --help | -h (boolean)\\\\n\\\\n Display help text\\\\n\\\\n --help-web | --hw (boolean)\\\\n\\\\n Display HTML help in browser\\\\n\\\\n EXAMPLES\\\\n --------\\\\n\\\\n - Log in to an API ML instance to obtain or update the token\\\\n stored in your base profile:\\\\n\\\\n $ zowe auth login apiml\\\\n\\\\n - Log in to an API ML instance to obtain a token without\\\\n storing it in a profile:\\\\n\\\\n $ zowe auth login apiml --show-token\\\\n\\\\n\\", + \\"stdout\\": \\"\\\\n COMMAND NAME\\\\n ------------\\\\n\\\\n apiml\\\\n\\\\n DESCRIPTION\\\\n -----------\\\\n\\\\n Log in to Zowe API Mediation Layer authentication service and obtain or update a\\\\n token.\\\\n\\\\n The token provides authentication to services that support the API ML SSO\\\\n (Single Sign-On) capability. When you log in, the token is stored in your\\\\n default base profile until it expires. Base profiles store connection\\\\n information shared by multiple services (e.g., z/OSMF), and are used if you do\\\\n not supply connection information in a service profile. To take advantage of the\\\\n API ML SSO capability, you should omit username and password in service profiles\\\\n so that the token in the base profile is used.\\\\n\\\\n USAGE\\\\n -----\\\\n\\\\n zowe auth login apiml [options]\\\\n\\\\n OPTIONS\\\\n -------\\\\n\\\\n --show-token | --st (boolean)\\\\n\\\\n Show the token when login is successful. If specified, does not save the token\\\\n to a profile.\\\\n\\\\n BASE CONNECTION OPTIONS\\\\n -----------------------\\\\n\\\\n --host | -H (string)\\\\n\\\\n Host name of service on the mainframe.\\\\n\\\\n --port | -P (number)\\\\n\\\\n Port number of service on the mainframe.\\\\n\\\\n --user | -u (string)\\\\n\\\\n User name to authenticate to service on the mainframe.\\\\n\\\\n --password | --pass | --pw (string)\\\\n\\\\n Password to authenticate to service on the mainframe.\\\\n\\\\n --reject-unauthorized | --ru (boolean)\\\\n\\\\n Reject self-signed certificates.\\\\n\\\\n Default value: true\\\\n\\\\n --cert-file (local file path)\\\\n\\\\n The file path to a certificate file to use for authentication.\\\\n\\\\n Note: The CLI does not support certificate files that require a password. For\\\\n more information, search Troubleshooting PEM Certificates in Zowe Docs.\\\\n\\\\n --cert-key-file (local file path)\\\\n\\\\n The file path to a certificate key file to use for authentication\\\\n\\\\n PROFILE OPTIONS\\\\n ---------------\\\\n\\\\n --base-profile | --base-p (string)\\\\n\\\\n The name of a (base) profile to load for this command execution.\\\\n\\\\n GLOBAL OPTIONS\\\\n --------------\\\\n\\\\n --show-inputs-only (boolean)\\\\n\\\\n Show command inputs and do not run the command\\\\n\\\\n --response-format-json | --rfj (boolean)\\\\n\\\\n Produce JSON formatted data from a command\\\\n\\\\n --help | -h (boolean)\\\\n\\\\n Display help text\\\\n\\\\n --help-web | --hw (boolean)\\\\n\\\\n Display HTML help in browser\\\\n\\\\n EXAMPLES\\\\n --------\\\\n\\\\n - Log in to an API ML instance to obtain or update the token\\\\n stored in your base profile:\\\\n\\\\n $ zowe auth login apiml\\\\n\\\\n - Log in to an API ML instance to obtain a token without\\\\n storing it in a profile:\\\\n\\\\n $ zowe auth login apiml --show-token\\\\n\\\\n\\", \\"stderr\\": \\"\\", - \\"data\\": \\"\\\\n COMMAND NAME\\\\n ------------\\\\n\\\\n apiml\\\\n\\\\n DESCRIPTION\\\\n -----------\\\\n\\\\n Log in to Zowe API Mediation Layer authentication service and obtain or update a\\\\n token.\\\\n\\\\n The token provides authentication to services that support the API ML SSO\\\\n (Single Sign-On) capability. When you log in, the token is stored in your\\\\n default base profile until it expires. Base profiles store connection\\\\n information shared by multiple services (e.g., z/OSMF), and are used if you do\\\\n not supply connection information in a service profile. To take advantage of the\\\\n API ML SSO capability, you should omit username and password in service profiles\\\\n so that the token in the base profile is used.\\\\n\\\\n USAGE\\\\n -----\\\\n\\\\n zowe auth login apiml [options]\\\\n\\\\n OPTIONS\\\\n -------\\\\n\\\\n --show-token | --st (boolean)\\\\n\\\\n Show the token when login is successful. If specified, does not save the token\\\\n to a profile.\\\\n\\\\n BASE CONNECTION OPTIONS\\\\n -----------------------\\\\n\\\\n --host | -H (string)\\\\n\\\\n Host name of service on the mainframe.\\\\n\\\\n --port | -P (number)\\\\n\\\\n Port number of service on the mainframe.\\\\n\\\\n --user | -u (string)\\\\n\\\\n User name to authenticate to service on the mainframe.\\\\n\\\\n --password | --pass | --pw (string)\\\\n\\\\n Password to authenticate to service on the mainframe.\\\\n\\\\n --reject-unauthorized | --ru (boolean)\\\\n\\\\n Reject self-signed certificates.\\\\n\\\\n Default value: true\\\\n\\\\n --cert-file (local file path)\\\\n\\\\n The file path to a certificate file to use for authentication\\\\n\\\\n --cert-key-file (local file path)\\\\n\\\\n The file path to a certificate key file to use for authentication\\\\n\\\\n PROFILE OPTIONS\\\\n ---------------\\\\n\\\\n --base-profile | --base-p (string)\\\\n\\\\n The name of a (base) profile to load for this command execution.\\\\n\\\\n GLOBAL OPTIONS\\\\n --------------\\\\n\\\\n --show-inputs-only (boolean)\\\\n\\\\n Show command inputs and do not run the command\\\\n\\\\n --response-format-json | --rfj (boolean)\\\\n\\\\n Produce JSON formatted data from a command\\\\n\\\\n --help | -h (boolean)\\\\n\\\\n Display help text\\\\n\\\\n --help-web | --hw (boolean)\\\\n\\\\n Display HTML help in browser\\\\n\\\\n EXAMPLES\\\\n --------\\\\n\\\\n - Log in to an API ML instance to obtain or update the token\\\\n stored in your base profile:\\\\n\\\\n $ zowe auth login apiml\\\\n\\\\n - Log in to an API ML instance to obtain a token without\\\\n storing it in a profile:\\\\n\\\\n $ zowe auth login apiml --show-token\\\\n\\\\n\\" + \\"data\\": \\"\\\\n COMMAND NAME\\\\n ------------\\\\n\\\\n apiml\\\\n\\\\n DESCRIPTION\\\\n -----------\\\\n\\\\n Log in to Zowe API Mediation Layer authentication service and obtain or update a\\\\n token.\\\\n\\\\n The token provides authentication to services that support the API ML SSO\\\\n (Single Sign-On) capability. When you log in, the token is stored in your\\\\n default base profile until it expires. Base profiles store connection\\\\n information shared by multiple services (e.g., z/OSMF), and are used if you do\\\\n not supply connection information in a service profile. To take advantage of the\\\\n API ML SSO capability, you should omit username and password in service profiles\\\\n so that the token in the base profile is used.\\\\n\\\\n USAGE\\\\n -----\\\\n\\\\n zowe auth login apiml [options]\\\\n\\\\n OPTIONS\\\\n -------\\\\n\\\\n --show-token | --st (boolean)\\\\n\\\\n Show the token when login is successful. If specified, does not save the token\\\\n to a profile.\\\\n\\\\n BASE CONNECTION OPTIONS\\\\n -----------------------\\\\n\\\\n --host | -H (string)\\\\n\\\\n Host name of service on the mainframe.\\\\n\\\\n --port | -P (number)\\\\n\\\\n Port number of service on the mainframe.\\\\n\\\\n --user | -u (string)\\\\n\\\\n User name to authenticate to service on the mainframe.\\\\n\\\\n --password | --pass | --pw (string)\\\\n\\\\n Password to authenticate to service on the mainframe.\\\\n\\\\n --reject-unauthorized | --ru (boolean)\\\\n\\\\n Reject self-signed certificates.\\\\n\\\\n Default value: true\\\\n\\\\n --cert-file (local file path)\\\\n\\\\n The file path to a certificate file to use for authentication.\\\\n\\\\n Note: The CLI does not support certificate files that require a password. For\\\\n more information, search Troubleshooting PEM Certificates in Zowe Docs.\\\\n\\\\n --cert-key-file (local file path)\\\\n\\\\n The file path to a certificate key file to use for authentication\\\\n\\\\n PROFILE OPTIONS\\\\n ---------------\\\\n\\\\n --base-profile | --base-p (string)\\\\n\\\\n The name of a (base) profile to load for this command execution.\\\\n\\\\n GLOBAL OPTIONS\\\\n --------------\\\\n\\\\n --show-inputs-only (boolean)\\\\n\\\\n Show command inputs and do not run the command\\\\n\\\\n --response-format-json | --rfj (boolean)\\\\n\\\\n Produce JSON formatted data from a command\\\\n\\\\n --help | -h (boolean)\\\\n\\\\n Display help text\\\\n\\\\n --help-web | --hw (boolean)\\\\n\\\\n Display HTML help in browser\\\\n\\\\n EXAMPLES\\\\n --------\\\\n\\\\n - Log in to an API ML instance to obtain or update the token\\\\n stored in your base profile:\\\\n\\\\n $ zowe auth login apiml\\\\n\\\\n - Log in to an API ML instance to obtain a token without\\\\n storing it in a profile:\\\\n\\\\n $ zowe auth login apiml --show-token\\\\n\\\\n\\" }" `; diff --git a/packages/cli/__tests__/zosuss/__integration__/issue/__snapshots__/cli.zos-uss.issue.ssh.integration.test.ts.snap b/packages/cli/__tests__/zosuss/__integration__/issue/__snapshots__/cli.zos-uss.issue.ssh.integration.test.ts.snap index 3637294f8e..f0467bfe31 100644 --- a/packages/cli/__tests__/zosuss/__integration__/issue/__snapshots__/cli.zos-uss.issue.ssh.integration.test.ts.snap +++ b/packages/cli/__tests__/zosuss/__integration__/issue/__snapshots__/cli.zos-uss.issue.ssh.integration.test.ts.snap @@ -100,7 +100,10 @@ exports[`zos-uss issue ssh command should display the help 1`] = ` --cert-file (local file path) - The file path to a certificate file to use for authentication + The file path to a certificate file to use for authentication. + + Note: The CLI does not support certificate files that require a password. For + more information, search Troubleshooting PEM Certificates in Zowe Docs. --cert-key-file (local file path) @@ -136,9 +139,9 @@ exports[`zos-uss issue ssh command should display the help 1`] = ` \\"success\\": true, \\"exitCode\\": 0, \\"message\\": \\"The help was constructed for command: command.\\", - \\"stdout\\": \\"\\\\n COMMAND NAME\\\\n ------------\\\\n\\\\n command | cmd | ssh\\\\n\\\\n DESCRIPTION\\\\n -----------\\\\n\\\\n Issue a z/OS USS command\\\\n\\\\n Note: The common CLI 'Base Connection Options' of token-type and token-value are\\\\n not applicable to the ssh command, since the ssh service is not accessible\\\\n through APIML.\\\\n\\\\n USAGE\\\\n -----\\\\n\\\\n zowe zos-ssh issue command [options]\\\\n\\\\n POSITIONAL ARGUMENTS\\\\n --------------------\\\\n\\\\n command\\\\t\\\\t (string)\\\\n\\\\n z/OS USS command to issue\\\\n\\\\n OPTIONS\\\\n -------\\\\n\\\\n --cwd (string)\\\\n\\\\n Working directory in which to execute the command\\\\n\\\\n Z/OS SSH CONNECTION OPTIONS\\\\n ---------------------------\\\\n\\\\n --host | -H (string)\\\\n\\\\n The z/OS SSH server host name.\\\\n\\\\n --port | -P (number)\\\\n\\\\n The z/OS SSH server port.\\\\n\\\\n Default value: 22\\\\n\\\\n --user | -u (string)\\\\n\\\\n Mainframe user name, which can be the same as your TSO login.\\\\n\\\\n --password | --pass | --pw (string)\\\\n\\\\n Mainframe password, which can be the same as your TSO password.\\\\n\\\\n --privateKey | --key | --pk (string)\\\\n\\\\n Path to a file containing your private key, that must match a public key stored\\\\n in the server for authentication\\\\n\\\\n --keyPassphrase | --passphrase | --kp (string)\\\\n\\\\n Private key passphrase, which unlocks the private key.\\\\n\\\\n --handshakeTimeout | --timeout | --to (number)\\\\n\\\\n How long in milliseconds to wait for the SSH handshake to complete.\\\\n\\\\n PROFILE OPTIONS\\\\n ---------------\\\\n\\\\n --ssh-profile | --ssh-p (string)\\\\n\\\\n The name of a (ssh) profile to load for this command execution.\\\\n\\\\n --base-profile | --base-p (string)\\\\n\\\\n The name of a (base) profile to load for this command execution.\\\\n\\\\n BASE CONNECTION OPTIONS\\\\n -----------------------\\\\n\\\\n --reject-unauthorized | --ru (boolean)\\\\n\\\\n Reject self-signed certificates.\\\\n\\\\n Default value: true\\\\n\\\\n --token-type | --tt (string)\\\\n\\\\n The type of token to get and use for the API. Omit this option to use the\\\\n default token type, which is provided by 'zowe auth login'.\\\\n\\\\n --token-value | --tv (string)\\\\n\\\\n The value of the token to pass to the API.\\\\n\\\\n --cert-file (local file path)\\\\n\\\\n The file path to a certificate file to use for authentication\\\\n\\\\n --cert-key-file (local file path)\\\\n\\\\n The file path to a certificate key file to use for authentication\\\\n\\\\n GLOBAL OPTIONS\\\\n --------------\\\\n\\\\n --show-inputs-only (boolean)\\\\n\\\\n Show command inputs and do not run the command\\\\n\\\\n --response-format-json | --rfj (boolean)\\\\n\\\\n Produce JSON formatted data from a command\\\\n\\\\n --help | -h (boolean)\\\\n\\\\n Display help text\\\\n\\\\n --help-web | --hw (boolean)\\\\n\\\\n Display HTML help in browser\\\\n\\\\n EXAMPLES\\\\n --------\\\\n\\\\n - Issue a simple command, giving the working directory:\\\\n\\\\n $ zowe zos-ssh issue command \\\\\\"npm install express\\\\\\" --cwd /u/cicprov/mnt/CICPY01I/bundles/myapp \\\\n\\\\n\\", + \\"stdout\\": \\"\\\\n COMMAND NAME\\\\n ------------\\\\n\\\\n command | cmd | ssh\\\\n\\\\n DESCRIPTION\\\\n -----------\\\\n\\\\n Issue a z/OS USS command\\\\n\\\\n Note: The common CLI 'Base Connection Options' of token-type and token-value are\\\\n not applicable to the ssh command, since the ssh service is not accessible\\\\n through APIML.\\\\n\\\\n USAGE\\\\n -----\\\\n\\\\n zowe zos-ssh issue command [options]\\\\n\\\\n POSITIONAL ARGUMENTS\\\\n --------------------\\\\n\\\\n command\\\\t\\\\t (string)\\\\n\\\\n z/OS USS command to issue\\\\n\\\\n OPTIONS\\\\n -------\\\\n\\\\n --cwd (string)\\\\n\\\\n Working directory in which to execute the command\\\\n\\\\n Z/OS SSH CONNECTION OPTIONS\\\\n ---------------------------\\\\n\\\\n --host | -H (string)\\\\n\\\\n The z/OS SSH server host name.\\\\n\\\\n --port | -P (number)\\\\n\\\\n The z/OS SSH server port.\\\\n\\\\n Default value: 22\\\\n\\\\n --user | -u (string)\\\\n\\\\n Mainframe user name, which can be the same as your TSO login.\\\\n\\\\n --password | --pass | --pw (string)\\\\n\\\\n Mainframe password, which can be the same as your TSO password.\\\\n\\\\n --privateKey | --key | --pk (string)\\\\n\\\\n Path to a file containing your private key, that must match a public key stored\\\\n in the server for authentication\\\\n\\\\n --keyPassphrase | --passphrase | --kp (string)\\\\n\\\\n Private key passphrase, which unlocks the private key.\\\\n\\\\n --handshakeTimeout | --timeout | --to (number)\\\\n\\\\n How long in milliseconds to wait for the SSH handshake to complete.\\\\n\\\\n PROFILE OPTIONS\\\\n ---------------\\\\n\\\\n --ssh-profile | --ssh-p (string)\\\\n\\\\n The name of a (ssh) profile to load for this command execution.\\\\n\\\\n --base-profile | --base-p (string)\\\\n\\\\n The name of a (base) profile to load for this command execution.\\\\n\\\\n BASE CONNECTION OPTIONS\\\\n -----------------------\\\\n\\\\n --reject-unauthorized | --ru (boolean)\\\\n\\\\n Reject self-signed certificates.\\\\n\\\\n Default value: true\\\\n\\\\n --token-type | --tt (string)\\\\n\\\\n The type of token to get and use for the API. Omit this option to use the\\\\n default token type, which is provided by 'zowe auth login'.\\\\n\\\\n --token-value | --tv (string)\\\\n\\\\n The value of the token to pass to the API.\\\\n\\\\n --cert-file (local file path)\\\\n\\\\n The file path to a certificate file to use for authentication.\\\\n\\\\n Note: The CLI does not support certificate files that require a password. For\\\\n more information, search Troubleshooting PEM Certificates in Zowe Docs.\\\\n\\\\n --cert-key-file (local file path)\\\\n\\\\n The file path to a certificate key file to use for authentication\\\\n\\\\n GLOBAL OPTIONS\\\\n --------------\\\\n\\\\n --show-inputs-only (boolean)\\\\n\\\\n Show command inputs and do not run the command\\\\n\\\\n --response-format-json | --rfj (boolean)\\\\n\\\\n Produce JSON formatted data from a command\\\\n\\\\n --help | -h (boolean)\\\\n\\\\n Display help text\\\\n\\\\n --help-web | --hw (boolean)\\\\n\\\\n Display HTML help in browser\\\\n\\\\n EXAMPLES\\\\n --------\\\\n\\\\n - Issue a simple command, giving the working directory:\\\\n\\\\n $ zowe zos-ssh issue command \\\\\\"npm install express\\\\\\" --cwd /u/cicprov/mnt/CICPY01I/bundles/myapp \\\\n\\\\n\\", \\"stderr\\": \\"\\", - \\"data\\": \\"\\\\n COMMAND NAME\\\\n ------------\\\\n\\\\n command | cmd | ssh\\\\n\\\\n DESCRIPTION\\\\n -----------\\\\n\\\\n Issue a z/OS USS command\\\\n\\\\n Note: The common CLI 'Base Connection Options' of token-type and token-value are\\\\n not applicable to the ssh command, since the ssh service is not accessible\\\\n through APIML.\\\\n\\\\n USAGE\\\\n -----\\\\n\\\\n zowe zos-ssh issue command [options]\\\\n\\\\n POSITIONAL ARGUMENTS\\\\n --------------------\\\\n\\\\n command\\\\t\\\\t (string)\\\\n\\\\n z/OS USS command to issue\\\\n\\\\n OPTIONS\\\\n -------\\\\n\\\\n --cwd (string)\\\\n\\\\n Working directory in which to execute the command\\\\n\\\\n Z/OS SSH CONNECTION OPTIONS\\\\n ---------------------------\\\\n\\\\n --host | -H (string)\\\\n\\\\n The z/OS SSH server host name.\\\\n\\\\n --port | -P (number)\\\\n\\\\n The z/OS SSH server port.\\\\n\\\\n Default value: 22\\\\n\\\\n --user | -u (string)\\\\n\\\\n Mainframe user name, which can be the same as your TSO login.\\\\n\\\\n --password | --pass | --pw (string)\\\\n\\\\n Mainframe password, which can be the same as your TSO password.\\\\n\\\\n --privateKey | --key | --pk (string)\\\\n\\\\n Path to a file containing your private key, that must match a public key stored\\\\n in the server for authentication\\\\n\\\\n --keyPassphrase | --passphrase | --kp (string)\\\\n\\\\n Private key passphrase, which unlocks the private key.\\\\n\\\\n --handshakeTimeout | --timeout | --to (number)\\\\n\\\\n How long in milliseconds to wait for the SSH handshake to complete.\\\\n\\\\n PROFILE OPTIONS\\\\n ---------------\\\\n\\\\n --ssh-profile | --ssh-p (string)\\\\n\\\\n The name of a (ssh) profile to load for this command execution.\\\\n\\\\n --base-profile | --base-p (string)\\\\n\\\\n The name of a (base) profile to load for this command execution.\\\\n\\\\n BASE CONNECTION OPTIONS\\\\n -----------------------\\\\n\\\\n --reject-unauthorized | --ru (boolean)\\\\n\\\\n Reject self-signed certificates.\\\\n\\\\n Default value: true\\\\n\\\\n --token-type | --tt (string)\\\\n\\\\n The type of token to get and use for the API. Omit this option to use the\\\\n default token type, which is provided by 'zowe auth login'.\\\\n\\\\n --token-value | --tv (string)\\\\n\\\\n The value of the token to pass to the API.\\\\n\\\\n --cert-file (local file path)\\\\n\\\\n The file path to a certificate file to use for authentication\\\\n\\\\n --cert-key-file (local file path)\\\\n\\\\n The file path to a certificate key file to use for authentication\\\\n\\\\n GLOBAL OPTIONS\\\\n --------------\\\\n\\\\n --show-inputs-only (boolean)\\\\n\\\\n Show command inputs and do not run the command\\\\n\\\\n --response-format-json | --rfj (boolean)\\\\n\\\\n Produce JSON formatted data from a command\\\\n\\\\n --help | -h (boolean)\\\\n\\\\n Display help text\\\\n\\\\n --help-web | --hw (boolean)\\\\n\\\\n Display HTML help in browser\\\\n\\\\n EXAMPLES\\\\n --------\\\\n\\\\n - Issue a simple command, giving the working directory:\\\\n\\\\n $ zowe zos-ssh issue command \\\\\\"npm install express\\\\\\" --cwd /u/cicprov/mnt/CICPY01I/bundles/myapp \\\\n\\\\n\\" + \\"data\\": \\"\\\\n COMMAND NAME\\\\n ------------\\\\n\\\\n command | cmd | ssh\\\\n\\\\n DESCRIPTION\\\\n -----------\\\\n\\\\n Issue a z/OS USS command\\\\n\\\\n Note: The common CLI 'Base Connection Options' of token-type and token-value are\\\\n not applicable to the ssh command, since the ssh service is not accessible\\\\n through APIML.\\\\n\\\\n USAGE\\\\n -----\\\\n\\\\n zowe zos-ssh issue command [options]\\\\n\\\\n POSITIONAL ARGUMENTS\\\\n --------------------\\\\n\\\\n command\\\\t\\\\t (string)\\\\n\\\\n z/OS USS command to issue\\\\n\\\\n OPTIONS\\\\n -------\\\\n\\\\n --cwd (string)\\\\n\\\\n Working directory in which to execute the command\\\\n\\\\n Z/OS SSH CONNECTION OPTIONS\\\\n ---------------------------\\\\n\\\\n --host | -H (string)\\\\n\\\\n The z/OS SSH server host name.\\\\n\\\\n --port | -P (number)\\\\n\\\\n The z/OS SSH server port.\\\\n\\\\n Default value: 22\\\\n\\\\n --user | -u (string)\\\\n\\\\n Mainframe user name, which can be the same as your TSO login.\\\\n\\\\n --password | --pass | --pw (string)\\\\n\\\\n Mainframe password, which can be the same as your TSO password.\\\\n\\\\n --privateKey | --key | --pk (string)\\\\n\\\\n Path to a file containing your private key, that must match a public key stored\\\\n in the server for authentication\\\\n\\\\n --keyPassphrase | --passphrase | --kp (string)\\\\n\\\\n Private key passphrase, which unlocks the private key.\\\\n\\\\n --handshakeTimeout | --timeout | --to (number)\\\\n\\\\n How long in milliseconds to wait for the SSH handshake to complete.\\\\n\\\\n PROFILE OPTIONS\\\\n ---------------\\\\n\\\\n --ssh-profile | --ssh-p (string)\\\\n\\\\n The name of a (ssh) profile to load for this command execution.\\\\n\\\\n --base-profile | --base-p (string)\\\\n\\\\n The name of a (base) profile to load for this command execution.\\\\n\\\\n BASE CONNECTION OPTIONS\\\\n -----------------------\\\\n\\\\n --reject-unauthorized | --ru (boolean)\\\\n\\\\n Reject self-signed certificates.\\\\n\\\\n Default value: true\\\\n\\\\n --token-type | --tt (string)\\\\n\\\\n The type of token to get and use for the API. Omit this option to use the\\\\n default token type, which is provided by 'zowe auth login'.\\\\n\\\\n --token-value | --tv (string)\\\\n\\\\n The value of the token to pass to the API.\\\\n\\\\n --cert-file (local file path)\\\\n\\\\n The file path to a certificate file to use for authentication.\\\\n\\\\n Note: The CLI does not support certificate files that require a password. For\\\\n more information, search Troubleshooting PEM Certificates in Zowe Docs.\\\\n\\\\n --cert-key-file (local file path)\\\\n\\\\n The file path to a certificate key file to use for authentication\\\\n\\\\n GLOBAL OPTIONS\\\\n --------------\\\\n\\\\n --show-inputs-only (boolean)\\\\n\\\\n Show command inputs and do not run the command\\\\n\\\\n --response-format-json | --rfj (boolean)\\\\n\\\\n Produce JSON formatted data from a command\\\\n\\\\n --help | -h (boolean)\\\\n\\\\n Display help text\\\\n\\\\n --help-web | --hw (boolean)\\\\n\\\\n Display HTML help in browser\\\\n\\\\n EXAMPLES\\\\n --------\\\\n\\\\n - Issue a simple command, giving the working directory:\\\\n\\\\n $ zowe zos-ssh issue command \\\\\\"npm install express\\\\\\" --cwd /u/cicprov/mnt/CICPY01I/bundles/myapp \\\\n\\\\n\\" }" `; diff --git a/packages/core/src/constants/Core.constants.ts b/packages/core/src/constants/Core.constants.ts index 75cf6b6278..17b427dcdf 100644 --- a/packages/core/src/constants/Core.constants.ts +++ b/packages/core/src/constants/Core.constants.ts @@ -102,7 +102,9 @@ export class ProfileConstants { */ public static readonly BASE_OPTION_CERT_FILE: ICommandOptionDefinition = { name: "cert-file", - description: "The file path to a certificate file to use for authentication.\n\nNote: The CLI does not support certificate files that require a password. For more information, search Troubleshooting PEM Certificates in Zowe Docs.", + description: "The file path to a certificate file to use for authentication.\n\nNote: " + + "The CLI does not support certificate files that require a password. " + + "For more information, search Troubleshooting PEM Certificates in Zowe Docs.", type: "existingLocalFile", group: ProfileConstants.BASE_CONNECTION_OPTION_GROUP }; @@ -112,7 +114,7 @@ export class ProfileConstants { */ public static readonly BASE_OPTION_CERT_KEY_FILE: ICommandOptionDefinition = { name: "cert-key-file", - description: "The file path to a certificate key file to use for authentication.\n\nNote: The CLI does not support certificate files that require a password. For more information, search Troubleshooting PEM Certificates in Zowe Docs.", + description: "The file path to a certificate key file to use for authentication", type: "existingLocalFile", group: ProfileConstants.BASE_CONNECTION_OPTION_GROUP }; From 5e5ec8756491b7e60e16c5df2a8aa4e42c936dfa Mon Sep 17 00:00:00 2001 From: Timothy Johnson Date: Fri, 5 Jan 2024 14:39:45 -0500 Subject: [PATCH 066/138] Rewrite update-project workflow to use shared action Signed-off-by: Timothy Johnson --- .github/workflows/update-project.yml | 42 ++++++---------------------- 1 file changed, 8 insertions(+), 34 deletions(-) diff --git a/.github/workflows/update-project.yml b/.github/workflows/update-project.yml index 321be008d0..604710b9cc 100644 --- a/.github/workflows/update-project.yml +++ b/.github/workflows/update-project.yml @@ -1,43 +1,17 @@ name: Update GitHub project on: - pull_request: - types: - - opened - -env: - PROJECT_NUMBER: "21" + pull_request_target: + types: [opened, reopened] jobs: update-project: - name: PR opened + name: Add PR to project runs-on: ubuntu-latest steps: - - name: Add PR to project - uses: actions/add-to-project@v0.5.0 - id: add-to-project - with: - project-url: https://github.com/orgs/zowe/projects/${{ env.PROJECT_NUMBER }} - github-token: ${{ secrets.ZOWE_ROBOT_TOKEN }} - - - name: Move to In Progress - uses: titoportas/update-project-fields@v0.1.0 + - uses: zowe-actions/shared-actions/project-move-item@actions/project-move-item with: - project-url: https://github.com/orgs/zowe/projects/${{ env.PROJECT_NUMBER }} - github-token: ${{ secrets.ZOWE_ROBOT_TOKEN }} - item-id: ${{ steps.add-to-project.outputs.itemId }} - field-keys: Status - field-values: In Progress - - - name: Check author permissions - id: check-author-permissions - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - run: | - response=$(curl -fs -H "Authorization: Token $GITHUB_TOKEN" \ - https://api.github.com/repos/${{ github.repository }}/collaborators/${{ github.event.pull_request.user.login }}/permission) - echo "hasWrite=$(echo $response | jq -r '.user.permissions.push')" >> "$GITHUB_OUTPUT" - - - name: Assign author to PR - if: ${{ steps.check-author-permissions.outputs.hasWrite == 'true' }} - run: gh pr edit ${{ github.event.pull_request.number }} --add-assignee ${{ github.event.pull_request.user.login }} + assign-author: true + item-status: In Progress + project-number: 21 + project-token: ${{ secrets.ZOWE_ROBOT_TOKEN }} From 511e97768560f15c752ccf66fa8c62b4ef587413 Mon Sep 17 00:00:00 2001 From: KevinLoesch1 Date: Fri, 5 Jan 2024 14:43:55 -0500 Subject: [PATCH 067/138] Fix for 'allocate like' not setting correct blocksize Signed-off-by: KevinLoesch1 --- .../src/constants/ZosFiles.messages.ts | 8 +++++ .../zosfiles/src/methods/create/Create.ts | 30 +++++++++++++++++++ 2 files changed, 38 insertions(+) diff --git a/packages/zosfiles/src/constants/ZosFiles.messages.ts b/packages/zosfiles/src/constants/ZosFiles.messages.ts index 728850e609..0aae6fb6ab 100644 --- a/packages/zosfiles/src/constants/ZosFiles.messages.ts +++ b/packages/zosfiles/src/constants/ZosFiles.messages.ts @@ -688,6 +688,14 @@ export const ZosFilesMessages: { [key: string]: IMessageDefinition } = { message: "Data set copied aborted. Copying to a PDS without a member name is not supported when using the 'dsclp' option." }, + /** + * Message indicating that the data set allocation was aborted + * @type {IMessageDefinition} + */ + datasetAllocateLikeNotFound: { + message: "Data set allocation aborted. The \"allocate like\" data set was not found." + }, + /** * Message indicating that the following members failed to properly download * @type {IMessageDefinition} diff --git a/packages/zosfiles/src/methods/create/Create.ts b/packages/zosfiles/src/methods/create/Create.ts index 4e3bf03aa5..c93b96509d 100644 --- a/packages/zosfiles/src/methods/create/Create.ts +++ b/packages/zosfiles/src/methods/create/Create.ts @@ -22,6 +22,8 @@ import { ICreateVsamOptions } from "./doc/ICreateVsamOptions"; import { ICreateZfsOptions } from "./doc/ICreateZfsOptions"; import * as path from "path"; import { IZosFilesOptions } from "../../doc/IZosFilesOptions"; +import { List } from "../list"; +import { IZosmfListResponse } from "../list/doc/IZosmfListResponse"; // Do not use import in anticipation of some internationalization work to be done later. // const strings = (require("../../../../../packages/cli/zosfiles/src/-strings-/en").default as typeof i18nTypings); @@ -150,8 +152,36 @@ export class Create { if (options && options.responseTimeout != null) { headers.push({[ZosmfHeaders.X_IBM_RESPONSE_TIMEOUT]: options.responseTimeout.toString()}); } + const tempOptions = JSON.parse(JSON.stringify({ like: likeDataSetName, ...(options || {}) })); Create.dataSetValidateOptions(tempOptions); + + /* + * This is a fix for issue https://github.com/zowe/vscode-extension-for-zowe/issues/2610. + * + * If no block size is passed, then retrieve the attributes of the "Like" dataset and + * set the block size, as the zosmf Rest API does not set the block size properly in + * some instances. + * + */ + if (tempOptions.blksize === null || tempOptions.blksize === undefined) { + let likeDataSetObj: IZosmfListResponse; + const likeDataSetList = await List.dataSet(session, likeDataSetName, { + attributes: true, maxLength: 1, + start: likeDataSetName, + recall: "wait" + }); + + const dsnameIndex = likeDataSetList.apiResponse.returnedRows === 0 ? -1 : + likeDataSetList.apiResponse.items.findIndex((ds: any) => ds.dsname.toUpperCase() === likeDataSetName.toUpperCase()); + if (dsnameIndex !== -1) { + likeDataSetObj = likeDataSetList.apiResponse.items[dsnameIndex]; + tempOptions.blksize = parseInt(likeDataSetObj.blksz); + } + else { + throw new ImperativeError({ msg: ZosFilesMessages.datasetAllocateLikeNotFound.message }); + } + } await ZosmfRestClient.postExpectString(session, endpoint, headers, JSON.stringify(tempOptions)); return { success: true, From 148843646c3b79ac46e7c4f7b44e4228eee1b5a5 Mon Sep 17 00:00:00 2001 From: zFernand0 <37381190+zFernand0@users.noreply.github.com> Date: Fri, 5 Jan 2024 19:46:44 +0000 Subject: [PATCH 068/138] fix changelog Signed-off-by: zFernand0 <37381190+zFernand0@users.noreply.github.com> --- packages/cli/CHANGELOG.md | 1 - packages/core/CHANGELOG.md | 4 ++++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/packages/cli/CHANGELOG.md b/packages/cli/CHANGELOG.md index b4079bf2a2..53b5b495c8 100644 --- a/packages/cli/CHANGELOG.md +++ b/packages/cli/CHANGELOG.md @@ -4,7 +4,6 @@ All notable changes to the Zowe CLI package will be documented in this file. ## Recent Changes -- BugFix: Add information about password-protected certificate file support. [#2006](https://github.com/zowe/zowe-cli/issues/2006) - BugFix: Correct extra character being displayed at the end of lines when issuing `zowe files compare` on Windows. [#1992](https://github.com/zowe/zowe-cli/issues/1992) - BugFix: Correct the online help description for `zowe files compare uss`. [#1754](https://github.com/zowe/zowe-cli/issues/1754) - BugFix: Fixed typo in command help for `zowe zos-workflows create` commands. diff --git a/packages/core/CHANGELOG.md b/packages/core/CHANGELOG.md index 2bc37372fd..461a028ee5 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: Add information about password-protected certificate file support. [#2006](https://github.com/zowe/zowe-cli/issues/2006) + ## `7.18.0` - Enhancement: Added support for dynamic APIML tokens. [#1734](https://github.com/zowe/zowe-cli/pull/1734) From 56d866874b11968f778ed7414ea24c3afca1c201 Mon Sep 17 00:00:00 2001 From: KevinLoesch1 Date: Fri, 5 Jan 2024 14:51:17 -0500 Subject: [PATCH 069/138] Update Files SDK changelog Signed-off-by: KevinLoesch1 --- packages/zosfiles/CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/packages/zosfiles/CHANGELOG.md b/packages/zosfiles/CHANGELOG.md index 820b85bec7..60da8cf9ae 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: Corrects the behavior of `Create.dataSetLike` so that the new data set is always defined with the correct block size [#2610](https://github.com/zowe/vscode-extension-for-zowe/issues/2610) + ## `7.20.0` - Enhancement: Adds `ZosFilesUtils.getDataSetFromName` to create an IDataSet from a dataset name [#1696](https://github.com/zowe/zowe-cli/issues/1696) From c4e00c129f3311d51d26698d001ac460c1c7bf88 Mon Sep 17 00:00:00 2001 From: "Andrew W. Harn" Date: Fri, 5 Jan 2024 15:02:59 -0500 Subject: [PATCH 070/138] Update tests again Signed-off-by: Andrew W. Harn --- .../ftds/cli.files.upload.ftds.system.test.ts | 2 +- .../src/workflows/archive/Archive.handler.ts | 5 ++- .../workflows/create/Create.common.handler.ts | 37 +++++++++---------- .../workflows/delete/Delete.common.handler.ts | 5 ++- .../ActiveWorkflowDetails.handler.ts | 5 ++- .../ActiveWorkflows.handler.ts | 7 +++- .../ArchivedWorkflows.handler.ts | 7 +++- .../RetrieveWorkflowDefinition.handler.ts | 7 +++- .../workflowFull/WorkflowFull.handler.ts | 5 ++- .../workflowStep/WorkflowStep.handler.ts | 10 ++++- .../__system__/Archive.system.test.ts | 4 +- .../__system__/CancelJobs.system.test.ts | 12 +++--- .../__system__/DeleteJobs.system.test.ts | 12 +++--- .../__system__/DownloadJobs.system.test.ts | 27 ++++++++------ .../__system__/GetJobs.system.test.ts | 6 +-- 15 files changed, 89 insertions(+), 62 deletions(-) diff --git a/packages/cli/__tests__/zosfiles/__system__/upload/ftds/cli.files.upload.ftds.system.test.ts b/packages/cli/__tests__/zosfiles/__system__/upload/ftds/cli.files.upload.ftds.system.test.ts index 72f3092dab..61b73755a1 100644 --- a/packages/cli/__tests__/zosfiles/__system__/upload/ftds/cli.files.upload.ftds.system.test.ts +++ b/packages/cli/__tests__/zosfiles/__system__/upload/ftds/cli.files.upload.ftds.system.test.ts @@ -330,7 +330,7 @@ describe("Upload file to data set", () => { localFileName, "MF.DOES.NOT.EXIST" ]); - expect(response.stderr.toString()).toContain("Data set not found"); + expect(response.stderr.toString()).toContain("NOT IN CATALOG OR CATALOG CAN NOT BE ACCESSED"); }); }); }); diff --git a/packages/cli/src/workflows/archive/Archive.handler.ts b/packages/cli/src/workflows/archive/Archive.handler.ts index bf9c8049ad..664dcc5598 100644 --- a/packages/cli/src/workflows/archive/Archive.handler.ts +++ b/packages/cli/src/workflows/archive/Archive.handler.ts @@ -52,7 +52,10 @@ export default class ArchiveHandler extends ZosmfBaseHandler { try{ resp = await ArchiveWorkflow.archiveWorkflowByKey(this.mSession, this.arguments.workflowKey, undefined); } catch (err){ - error = "Archive workflow: " + err; + error = new ImperativeError({ + msg: "Archive workflow: " + err, + causeErrors: err + }); throw error; } params.response.data.setObj(resp); diff --git a/packages/cli/src/workflows/create/Create.common.handler.ts b/packages/cli/src/workflows/create/Create.common.handler.ts index 9939bf3d98..591259bc9f 100644 --- a/packages/cli/src/workflows/create/Create.common.handler.ts +++ b/packages/cli/src/workflows/create/Create.common.handler.ts @@ -64,11 +64,11 @@ export default class CreateCommonHandler extends ZosmfBaseHandler { wfKey ); } catch (err) { - error = - "Deleting z/OSMF workflow with workflow name " + - this.arguments.workflowName + - " failed. More details: \n" + - err; + error = new ImperativeError({ + msg: "Deleting z/OSMF workflow with workflow name " + this.arguments.workflowName + " failed.", + causeErrors: err + }); + throw error; } } } @@ -88,11 +88,10 @@ export default class CreateCommonHandler extends ZosmfBaseHandler { this.arguments.deleteCompleted ); } catch (err) { - error = - "Creating zOS/MF workflow with data set: " + - this.arguments.dataSet + - " failed. More details: \n" + - err; + error = new ImperativeError({ + msg: "Creating z/OSMF workflow with data set: " + this.arguments.dataSet + " failed.", + causeErrors: err + }); throw error; } params.response.data.setObj(resp); @@ -120,11 +119,10 @@ export default class CreateCommonHandler extends ZosmfBaseHandler { this.arguments.deleteCompleted ); } catch (err) { - error = - "Creating z/OSMF workflow with uss file: " + - this.arguments.ussFile + - " failed. More details: \n" + - err; + error = new ImperativeError({ + msg: "Creating z/OSMF workflow with uss file: " + this.arguments.ussFile + " failed.", + causeErrors: err + }); throw error; } params.response.data.setObj(resp); @@ -154,11 +152,10 @@ export default class CreateCommonHandler extends ZosmfBaseHandler { this.arguments.remoteDirectory ); } catch (err) { - error = - "Creating z/OSMF workflow with local file: " + - this.arguments.localFile + - " failed. More details: \n" + - err; + error = new ImperativeError({ + msg: "Creating z/OSMF workflow with local file: " + this.arguments.localFile + " failed.", + causeErrors: err + }); throw error; } params.response.data.setObj(resp); diff --git a/packages/cli/src/workflows/delete/Delete.common.handler.ts b/packages/cli/src/workflows/delete/Delete.common.handler.ts index bcd1ba8b5e..e1912339e1 100644 --- a/packages/cli/src/workflows/delete/Delete.common.handler.ts +++ b/packages/cli/src/workflows/delete/Delete.common.handler.ts @@ -49,7 +49,10 @@ export default class DeleteCommonHandler extends ZosmfBaseHandler { try{ await DeleteWorkflow.deleteWorkflow(this.mSession, this.arguments.workflowKey); } catch (err){ - error = "Delete workflow: " + err; + error = new ImperativeError({ + msg: "Delete workflow: " + err, + causeErrors: err + }); throw error; } params.response.data.setObj("Deleted."); diff --git a/packages/cli/src/workflows/list/activeWorkflowDetails/ActiveWorkflowDetails.handler.ts b/packages/cli/src/workflows/list/activeWorkflowDetails/ActiveWorkflowDetails.handler.ts index 4364ca9b6e..0a6bb9af1c 100644 --- a/packages/cli/src/workflows/list/activeWorkflowDetails/ActiveWorkflowDetails.handler.ts +++ b/packages/cli/src/workflows/list/activeWorkflowDetails/ActiveWorkflowDetails.handler.ts @@ -65,7 +65,10 @@ export default class ActiveWorkflowDetails extends ZosmfBaseHandler { stepSummaries = response.steps; } } catch(err){ - error = "List workflow details error: " + err; + error = new ImperativeError({ + msg: "List workflow details error: " + err, + causeErrors: err + }); throw error; } params.response.data.setObj(response); diff --git a/packages/cli/src/workflows/list/activeWorkflows/ActiveWorkflows.handler.ts b/packages/cli/src/workflows/list/activeWorkflows/ActiveWorkflows.handler.ts index 49e1113f3b..eb08b42048 100644 --- a/packages/cli/src/workflows/list/activeWorkflows/ActiveWorkflows.handler.ts +++ b/packages/cli/src/workflows/list/activeWorkflows/ActiveWorkflows.handler.ts @@ -9,7 +9,7 @@ * */ -import { IHandlerParameters, TextUtils } from "@zowe/imperative"; +import { IHandlerParameters, ImperativeError, TextUtils } from "@zowe/imperative"; import { IWorkflowsInfo, ListWorkflows, IActiveWorkflows } from "@zowe/zos-workflows-for-zowe-sdk"; import { ZosmfBaseHandler } from "@zowe/zosmf-for-zowe-sdk"; @@ -47,7 +47,10 @@ export default class ListActiveWorkflowsHandler extends ZosmfBaseHandler { statusName: this.arguments.statusName }); } catch (err) { - error = "List workflow(s) " + err; + error = new ImperativeError({ + msg: "List workflow(s) " + err, + causeErrors: err + }); throw error; } diff --git a/packages/cli/src/workflows/list/archivedWorkflows/ArchivedWorkflows.handler.ts b/packages/cli/src/workflows/list/archivedWorkflows/ArchivedWorkflows.handler.ts index 55b1e752cf..59713fdb2d 100644 --- a/packages/cli/src/workflows/list/archivedWorkflows/ArchivedWorkflows.handler.ts +++ b/packages/cli/src/workflows/list/archivedWorkflows/ArchivedWorkflows.handler.ts @@ -9,7 +9,7 @@ * */ -import { IHandlerParameters, TextUtils } from "@zowe/imperative"; +import { IHandlerParameters, ImperativeError, TextUtils } from "@zowe/imperative"; import { ListArchivedWorkflows, IWorkflowsInfo, IArchivedWorkflows } from "@zowe/zos-workflows-for-zowe-sdk"; import { ZosmfBaseHandler } from "@zowe/zosmf-for-zowe-sdk"; @@ -40,7 +40,10 @@ export default class ListArchivedWorkflowsHandler extends ZosmfBaseHandler { response = await ListArchivedWorkflows.listArchivedWorkflows( this.mSession); } catch (err) { - error = "List workflow(s) " + err; + error = new ImperativeError({ + msg: "List workflow(s) " + err, + causeErrors: err + }); throw error; } commandParameters.response.data.setObj(response); diff --git a/packages/cli/src/workflows/list/retrieveWorkflowDefinition/RetrieveWorkflowDefinition.handler.ts b/packages/cli/src/workflows/list/retrieveWorkflowDefinition/RetrieveWorkflowDefinition.handler.ts index 7bac0f9f26..3344191ce8 100644 --- a/packages/cli/src/workflows/list/retrieveWorkflowDefinition/RetrieveWorkflowDefinition.handler.ts +++ b/packages/cli/src/workflows/list/retrieveWorkflowDefinition/RetrieveWorkflowDefinition.handler.ts @@ -9,7 +9,7 @@ * */ -import { IHandlerParameters } from "@zowe/imperative"; +import { IHandlerParameters, ImperativeError } from "@zowe/imperative"; import { DefinitionWorkflow, IWorkflowDefinition } from "@zowe/zos-workflows-for-zowe-sdk"; import { ZosmfBaseHandler } from "@zowe/zosmf-for-zowe-sdk"; @@ -41,7 +41,10 @@ export default class ListActiveWorkflowsHandler extends ZosmfBaseHandler { this.mSession, undefined, this.arguments.definitionFilePath, this.arguments.listSteps, this.arguments.listVariables); } catch (err) { - error = "List workflow(s) " + err; + error = new ImperativeError({ + msg: "List workflow(s) " + err, + causeErrors: err + }); throw error; } diff --git a/packages/cli/src/workflows/start/workflowFull/WorkflowFull.handler.ts b/packages/cli/src/workflows/start/workflowFull/WorkflowFull.handler.ts index 85aa5eff50..7b4ea1ceff 100644 --- a/packages/cli/src/workflows/start/workflowFull/WorkflowFull.handler.ts +++ b/packages/cli/src/workflows/start/workflowFull/WorkflowFull.handler.ts @@ -52,7 +52,10 @@ export default class WorkflowFullHandler extends ZosmfBaseHandler { try{ await StartWorkflow.startWorkflow(this.mSession, workflowKey, this.arguments.resolveConflict); } catch (err) { - error = "Start workflow: " + err; + error = new ImperativeError({ + msg: "Start workflow: " + err, + causeErrors: err + }); throw error; } diff --git a/packages/cli/src/workflows/start/workflowStep/WorkflowStep.handler.ts b/packages/cli/src/workflows/start/workflowStep/WorkflowStep.handler.ts index 6757fb6f4a..2c32df1a81 100644 --- a/packages/cli/src/workflows/start/workflowStep/WorkflowStep.handler.ts +++ b/packages/cli/src/workflows/start/workflowStep/WorkflowStep.handler.ts @@ -50,7 +50,10 @@ export default class WorkflowStepHandler extends ZosmfBaseHandler { await StartWorkflow.startWorkflow(this.mSession, this.arguments.workflowKey, this.arguments.resolveConflict, this.arguments.stepName, this.arguments.performFollowingSteps); } catch (err){ - error = "Start workflow: " + err; + error = new ImperativeError({ + msg: "Start workflow: " + err, + causeErrors: err + }); throw error; } params.response.data.setObj("Started."); @@ -68,7 +71,10 @@ export default class WorkflowStepHandler extends ZosmfBaseHandler { await StartWorkflow.startWorkflow(this.mSession, getWfKey, this.arguments.resolveConflict, this.arguments.stepName, this.arguments.performFollowingSteps); } catch (err){ - error = "Start workflow: " + err; + error = new ImperativeError({ + msg: "Start workflow Error: " + err, + causeErrors: err + }); throw error; } params.response.data.setObj("Started."); diff --git a/packages/workflows/__tests__/__system__/Archive.system.test.ts b/packages/workflows/__tests__/__system__/Archive.system.test.ts index fe55f5d343..a77f162a4d 100644 --- a/packages/workflows/__tests__/__system__/Archive.system.test.ts +++ b/packages/workflows/__tests__/__system__/Archive.system.test.ts @@ -172,7 +172,7 @@ describe("Errors caused by the user interaction", () => { } catch (error) { Imperative.console.info(JSON.stringify(error)); expect(error.mDetails.errorCode).toEqual(404); - expect(error.message).toContain("IZUWF5001W"); + expect(JSON.parse(error.causeErrors).message).toContain("IZUWF5001W"); // https://www.ibm.com/docs/en/zos/2.5.0?topic=izuwf9999-izuwf5001w } }); @@ -191,7 +191,7 @@ describe("Errors caused by the user interaction", () => { } catch (error) { Imperative.console.info(error); expect(error.mDetails.errorCode).toBe(409); - expect(error.message).toContain("IZUWF0158E"); + expect(JSON.parse(error.causeErrors).message).toContain("IZUWF0158E"); // https://www.ibm.com/docs/en/zos/2.5.0?topic=izuwf9999-izuwf0158e } await removeWorkflows(); diff --git a/packages/zosjobs/__tests__/__system__/CancelJobs.system.test.ts b/packages/zosjobs/__tests__/__system__/CancelJobs.system.test.ts index 06822f259d..3e01202a34 100644 --- a/packages/zosjobs/__tests__/__system__/CancelJobs.system.test.ts +++ b/packages/zosjobs/__tests__/__system__/CancelJobs.system.test.ts @@ -120,7 +120,7 @@ describe("CancelJobs System tests", () => { describe("Negative tests", () => { it("should surface errors from z/OSMF when trying to cancel a non existent job with cancelJob", async () => { - let err: ImperativeError | RestClientError | Error; + let err: ImperativeError; try { await CancelJobs.cancelJob(REAL_SESSION, "FAKEJOB", "JOB00001"); } catch (e) { @@ -128,11 +128,11 @@ describe("CancelJobs System tests", () => { } expect(err).toBeDefined(); expect(err instanceof ImperativeError).toEqual(true); - expect(err.message).toContain("FAKEJOB"); + expect(JSON.parse(err.causeErrors).message).toContain("FAKEJOB"); }); it("should surface errors from z/OSMF when trying to cancel a non-existent job using cancelJobForJob", async () => { - let err: Error | ImperativeError; + let err: ImperativeError; const badJob: IJob = { "jobid": "JOB00001", "jobname": "FAKEJOB", @@ -155,11 +155,11 @@ describe("CancelJobs System tests", () => { } expect(err).toBeDefined(); expect(err instanceof ImperativeError).toEqual(true); - expect(err.message).toContain("FAKEJOB"); + expect(JSON.parse(err.causeErrors).message).toContain("FAKEJOB"); }); it("should surface errors from z/OSMF when trying to cancel a non-existent job using cancelJobCommon", async () => { - let err: Error | ImperativeError; + let err: ImperativeError; try { await CancelJobs.cancelJobCommon(REAL_SESSION, {jobname: "FAKEJOB", jobid: "JOB00001"}); } catch (e) { @@ -167,7 +167,7 @@ describe("CancelJobs System tests", () => { } expect(err).toBeDefined(); expect(err instanceof ImperativeError).toEqual(true); - expect(err.message).toContain("FAKEJOB"); + expect(JSON.parse(err.causeErrors).message).toContain("FAKEJOB"); }); }); }); diff --git a/packages/zosjobs/__tests__/__system__/DeleteJobs.system.test.ts b/packages/zosjobs/__tests__/__system__/DeleteJobs.system.test.ts index a12dc6957c..bad52fe8d6 100644 --- a/packages/zosjobs/__tests__/__system__/DeleteJobs.system.test.ts +++ b/packages/zosjobs/__tests__/__system__/DeleteJobs.system.test.ts @@ -80,7 +80,7 @@ describe("DeleteJobs System tests", () => { describe("Negative tests", () => { it("should surface errors from z/OSMF when trying to delete a non existent job with deleteJob", async () => { - let err: Error | ImperativeError; + let err: ImperativeError; try { await DeleteJobs.deleteJob(REAL_SESSION, "FAKEJOB", "JOB00001"); } catch (e) { @@ -88,11 +88,11 @@ describe("DeleteJobs System tests", () => { } expect(err).toBeDefined(); expect(err instanceof ImperativeError).toEqual(true); - expect(err.message).toContain("FAKEJOB"); + expect(JSON.parse(err.causeErrors).message).toContain("FAKEJOB"); }); it("should surface errors from z/OSMF when trying to delete a non-existent job using deleteJobForJob", async () => { - let err: Error | ImperativeError; + let err: ImperativeError; const badJob: IJob = { "jobid": "JOB00001", "jobname": "FAKEJOB", @@ -115,11 +115,11 @@ describe("DeleteJobs System tests", () => { } expect(err).toBeDefined(); expect(err instanceof ImperativeError).toEqual(true); - expect(err.message).toContain("FAKEJOB"); + expect(JSON.parse(err.causeErrors).message).toContain("FAKEJOB"); }); it("should surface errors from z/OSMF when trying to delete a non-existent job using deleteJobCommon", async () => { - let err: Error | ImperativeError; + let err: ImperativeError; try { await DeleteJobs.deleteJobCommon(REAL_SESSION, {jobname: "FAKEJOB", jobid: "JOB00001"}); } catch (e) { @@ -127,7 +127,7 @@ describe("DeleteJobs System tests", () => { } expect(err).toBeDefined(); expect(err instanceof ImperativeError).toEqual(true); - expect(err.message).toContain("FAKEJOB"); + expect(JSON.parse(err.causeErrors).message).toContain("FAKEJOB"); }); }); }); diff --git a/packages/zosjobs/__tests__/__system__/DownloadJobs.system.test.ts b/packages/zosjobs/__tests__/__system__/DownloadJobs.system.test.ts index a1dc9bfe70..16b740c780 100644 --- a/packages/zosjobs/__tests__/__system__/DownloadJobs.system.test.ts +++ b/packages/zosjobs/__tests__/__system__/DownloadJobs.system.test.ts @@ -203,7 +203,7 @@ describe("Download Jobs - System tests", () => { it("should encounter an error if a non existent spool file is passed to downloadSpoolContentCommon", async () => { - let err: Error | ImperativeError; + let err: ImperativeError; try { await DownloadJobs.downloadSpoolContentCommon(REAL_SESSION, { jobFile: badJobFile, @@ -214,14 +214,15 @@ describe("Download Jobs - System tests", () => { } expect(err).toBeDefined(); expect(err instanceof ImperativeError).toEqual(true); - expect(err.message).toContain(jobname); - expect(err.message).toContain(jobid); - expect(err.message).toContain("does not contain"); + const jsonCauseErrors = JSON.parse(err.causeErrors); + expect(jsonCauseErrors.message).toContain(jobname); + expect(jsonCauseErrors.message).toContain(jobid); + expect(jsonCauseErrors.message).toContain("does not contain"); }); it("should encounter an error if a non existent jobname/jobid is passed to downloadAllSpoolContentCommon", async () => { - let err: Error | ImperativeError; + let err: ImperativeError; try { await DownloadJobs.downloadAllSpoolContentCommon(REAL_SESSION, { jobname: "FAKEJOB", @@ -233,14 +234,15 @@ describe("Download Jobs - System tests", () => { } expect(err).toBeDefined(); expect(err instanceof ImperativeError).toEqual(true); - expect(err.message).toContain("FAKEJOB"); - expect(err.message).toContain("JOBABCD"); - expect(err.message).toContain("Failed to lookup"); + const jsonCauseErrors = JSON.parse(err.causeErrors); + expect(jsonCauseErrors.message).toContain("FAKEJOB"); + expect(jsonCauseErrors.message).toContain("JOBABCD"); + expect(jsonCauseErrors.message).toContain("Failed to lookup"); }); it("should encounter an error if a non existent spool file is passed to downloadSpoolContent", async () => { - let err: Error | ImperativeError; + let err: ImperativeError; try { await DownloadJobs.downloadSpoolContent(REAL_SESSION, badJobFile); } catch (e) { @@ -248,9 +250,10 @@ describe("Download Jobs - System tests", () => { } expect(err).toBeDefined(); expect(err instanceof ImperativeError).toEqual(true); - expect(err.message).toContain(jobname); - expect(err.message).toContain(jobid); - expect(err.message).toContain("does not contain"); + const jsonCauseErrors = JSON.parse(err.causeErrors); + expect(jsonCauseErrors.message).toContain(jobname); + expect(jsonCauseErrors.message).toContain(jobid); + expect(jsonCauseErrors.message).toContain("does not contain"); }); }); diff --git a/packages/zosjobs/__tests__/__system__/GetJobs.system.test.ts b/packages/zosjobs/__tests__/__system__/GetJobs.system.test.ts index e273d48cdd..aa8f6d58fb 100644 --- a/packages/zosjobs/__tests__/__system__/GetJobs.system.test.ts +++ b/packages/zosjobs/__tests__/__system__/GetJobs.system.test.ts @@ -323,7 +323,7 @@ describe("Get Jobs - System Tests", () => { err = e; } expect(err).toBeDefined(); - expect(JSON.parse(err.causeErrors).message).toContain("not found"); + expect(err.causeErrors).toContain("Zero jobs"); }); it("should return no jobs for a prefix that doesn't match anything", async () => { @@ -618,7 +618,7 @@ describe("Get Status APIs", () => { expect(jsonCauseErrors.reason).toEqual(7); expect(jsonCauseErrors.rc).toEqual(4); expect(trimmedErrorMessage).toContain("status 400"); - expect(trimmedErrorMessage).toContain("JOB123"); + expect(jsonCauseErrors.message).toContain("JOB123"); }); it("should detect and surface an error for an invalid jobid", async () => { @@ -1173,7 +1173,7 @@ describe("Get Jobs - System Tests - Encoded", () => { err = e; } expect(err).toBeDefined(); - expect(JSON.parse(err.causeErrors).message).toContain("not found"); + expect(err.causeErrors).toContain("Zero jobs"); }); it("should return no jobs for a prefix that doesn't match anything", async () => { From 915516645510a0bd2071b0324014e5191f4312df Mon Sep 17 00:00:00 2001 From: KevinLoesch1 Date: Fri, 5 Jan 2024 15:30:46 -0500 Subject: [PATCH 071/138] Update files messages snapshot Signed-off-by: KevinLoesch1 --- .../utils/__snapshots__/ZosFilesUtils.unit.test.ts.snap | 3 +++ 1 file changed, 3 insertions(+) diff --git a/packages/zosfiles/__tests__/__unit__/utils/__snapshots__/ZosFilesUtils.unit.test.ts.snap b/packages/zosfiles/__tests__/__unit__/utils/__snapshots__/ZosFilesUtils.unit.test.ts.snap index 169c04a6a8..3dcce8f4cf 100644 --- a/packages/zosfiles/__tests__/__unit__/utils/__snapshots__/ZosFilesUtils.unit.test.ts.snap +++ b/packages/zosfiles/__tests__/__unit__/utils/__snapshots__/ZosFilesUtils.unit.test.ts.snap @@ -81,6 +81,9 @@ Object { "dataSetsMatchedPattern": Object { "message": "%d data set(s) were found matching pattern.", }, + "datasetAllocateLikeNotFound": Object { + "message": "Data set allocation aborted. The \\"allocate like\\" data set was not found.", + }, "datasetCopiedAborted": Object { "message": "Data set copied aborted. The existing target data set was not overwritten.", }, From a8326b0b49a217c8769ccff21ec2ddcae373812a Mon Sep 17 00:00:00 2001 From: Gene Johnston Date: Fri, 5 Jan 2024 16:16:36 -0500 Subject: [PATCH 072/138] Fix lint errors. Signed-off-by: Gene Johnston --- .../auth/__system__/cli.auth.login.apiml.system.test.ts | 2 +- packages/zosjobs/__tests__/__system__/CancelJobs.system.test.ts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/cli/__tests__/auth/__system__/cli.auth.login.apiml.system.test.ts b/packages/cli/__tests__/auth/__system__/cli.auth.login.apiml.system.test.ts index 14519a4824..b441073c21 100644 --- a/packages/cli/__tests__/auth/__system__/cli.auth.login.apiml.system.test.ts +++ b/packages/cli/__tests__/auth/__system__/cli.auth.login.apiml.system.test.ts @@ -14,7 +14,6 @@ import { TestEnvironment } from "../../../../../__tests__/__src__/environment/Te import { ITestPropertiesSchema } from "../../../../../__tests__/__src__/properties/ITestPropertiesSchema"; import { ITestBaseSchema } from "../../../../../__tests__/__src__/properties/ITestBaseSchema"; import { ITestCertPemSchema } from "../../../../../__tests__/__src__/properties/ITestCertPemSchema"; -import { keyring } from "@zowe/secrets-for-zowe-sdk"; describe("auth login/logout apiml with profile", () => { let TEST_ENVIRONMENT: ITestEnvironment; @@ -144,6 +143,7 @@ describe("auth login/logout apiml create profile", () => { /* Resurrect the following test after this Git issue is fixed: https://github.com/zowe/zowe-cli/issues/2005 */ + // eslint-disable-next-line jest/no-disabled-tests it.skip("TODO: After 2005 is fixed: should successfully issue the login command and create a team config", () => { const response = runCliScript(__dirname + "/__scripts__/auth_login_apiml_create.sh", TEST_ENVIRONMENT_CREATE_PROF, diff --git a/packages/zosjobs/__tests__/__system__/CancelJobs.system.test.ts b/packages/zosjobs/__tests__/__system__/CancelJobs.system.test.ts index 3e01202a34..6833784057 100644 --- a/packages/zosjobs/__tests__/__system__/CancelJobs.system.test.ts +++ b/packages/zosjobs/__tests__/__system__/CancelJobs.system.test.ts @@ -9,7 +9,7 @@ * */ -import { ImperativeError, Session, RestClientError } from "@zowe/imperative"; +import { ImperativeError, Session } from "@zowe/imperative"; import { CancelJobs, SubmitJobs, IJob } from "../../src"; import { ITestEnvironment } from "@zowe/cli-test-utils"; import { TestEnvironment } from "../../../../__tests__/__src__/environment/TestEnvironment"; From 8e3b83a6da2ee393d656a0ddc5912d0b80d78a3c Mon Sep 17 00:00:00 2001 From: Timothy Johnson Date: Fri, 5 Jan 2024 17:48:05 -0500 Subject: [PATCH 073/138] Run project-move-item action when issues are labeled Signed-off-by: Timothy Johnson --- .github/workflows/update-project.yml | 42 +++++++++++++++++++++++++--- 1 file changed, 38 insertions(+), 4 deletions(-) diff --git a/.github/workflows/update-project.yml b/.github/workflows/update-project.yml index 604710b9cc..cac1e4a486 100644 --- a/.github/workflows/update-project.yml +++ b/.github/workflows/update-project.yml @@ -1,17 +1,51 @@ -name: Update GitHub project +name: Update GitHub Project on: + issues: + types: [labeled] pull_request_target: types: [opened, reopened] +env: + PROJECT_NUMBER: 21 + jobs: update-project: - name: Add PR to project + name: Move project item runs-on: ubuntu-latest steps: - - uses: zowe-actions/shared-actions/project-move-item@actions/project-move-item + - uses: zowe-actions/shared-actions/project-move-item@main + if: ${{ github.event.pull_request }} with: assign-author: true item-status: In Progress - project-number: 21 + project-number: ${{ env.PROJECT_NUMBER }} + project-token: ${{ secrets.ZOWE_ROBOT_TOKEN }} + + - uses: zowe-actions/shared-actions/project-move-item@main + if: ${{ github.event.issue && github.event.label.name == 'priority-high' }} + with: + item-status: High Priority + project-number: ${{ env.PROJECT_NUMBER }} + project-token: ${{ secrets.ZOWE_ROBOT_TOKEN }} + + - uses: zowe-actions/shared-actions/project-move-item@main + if: ${{ github.event.issue && github.event.label.name == 'priority-medium' }} + with: + item-status: Medium Priority + project-number: ${{ env.PROJECT_NUMBER }} + project-token: ${{ secrets.ZOWE_ROBOT_TOKEN }} + + - uses: zowe-actions/shared-actions/project-move-item@main + if: ${{ github.event.issue && github.event.label.name == 'priority-low' }} + with: + item-status: Low Priority + project-number: ${{ env.PROJECT_NUMBER }} + project-token: ${{ secrets.ZOWE_ROBOT_TOKEN }} + + - uses: zowe-actions/shared-actions/project-move-item@main + if: ${{ github.event.issue && github.event.label.name == 'Epic' }} + with: + item-status: Epics + project-number: ${{ env.PROJECT_NUMBER }} project-token: ${{ secrets.ZOWE_ROBOT_TOKEN }} From 92214da7150c9d87fa489095baadf2dc5314075f Mon Sep 17 00:00:00 2001 From: "Andrew W. Harn" Date: Mon, 8 Jan 2024 09:29:06 -0500 Subject: [PATCH 074/138] Retain as much of the original error as possible Signed-off-by: Andrew W. Harn --- .../src/workflows/archive/Archive.handler.ts | 3 ++- .../workflows/create/Create.common.handler.ts | 20 +++++++++++-------- .../workflows/delete/Delete.common.handler.ts | 3 ++- .../ActiveWorkflowDetails.handler.ts | 3 ++- .../ActiveWorkflows.handler.ts | 3 ++- .../ArchivedWorkflows.handler.ts | 3 ++- .../RetrieveWorkflowDefinition.handler.ts | 3 ++- .../workflowFull/WorkflowFull.handler.ts | 3 ++- .../workflowStep/WorkflowStep.handler.ts | 6 ++++-- .../__system__/CancelJobs.system.test.ts | 2 +- 10 files changed, 31 insertions(+), 18 deletions(-) diff --git a/packages/cli/src/workflows/archive/Archive.handler.ts b/packages/cli/src/workflows/archive/Archive.handler.ts index 664dcc5598..30fdf5d75b 100644 --- a/packages/cli/src/workflows/archive/Archive.handler.ts +++ b/packages/cli/src/workflows/archive/Archive.handler.ts @@ -54,7 +54,8 @@ export default class ArchiveHandler extends ZosmfBaseHandler { } catch (err){ error = new ImperativeError({ msg: "Archive workflow: " + err, - causeErrors: err + causeErrors: err.causeErrors, + additionalDetails: err.additionalDetails }); throw error; } diff --git a/packages/cli/src/workflows/create/Create.common.handler.ts b/packages/cli/src/workflows/create/Create.common.handler.ts index 591259bc9f..81452d6a90 100644 --- a/packages/cli/src/workflows/create/Create.common.handler.ts +++ b/packages/cli/src/workflows/create/Create.common.handler.ts @@ -65,8 +65,9 @@ export default class CreateCommonHandler extends ZosmfBaseHandler { ); } catch (err) { error = new ImperativeError({ - msg: "Deleting z/OSMF workflow with workflow name " + this.arguments.workflowName + " failed.", - causeErrors: err + msg: "Deleting z/OSMF workflow with workflow name " + this.arguments.workflowName + " failed.\n" + err.msg, + causeErrors: err.causeErrors, + additionalDetails: err.additionalDetails }); throw error; } @@ -89,8 +90,9 @@ export default class CreateCommonHandler extends ZosmfBaseHandler { ); } catch (err) { error = new ImperativeError({ - msg: "Creating z/OSMF workflow with data set: " + this.arguments.dataSet + " failed.", - causeErrors: err + msg: "Creating z/OSMF workflow with data set: " + this.arguments.dataSet + " failed.\n" + err.msg, + causeErrors: err.causeErrors, + additionalDetails: err.additionalDetails }); throw error; } @@ -120,8 +122,9 @@ export default class CreateCommonHandler extends ZosmfBaseHandler { ); } catch (err) { error = new ImperativeError({ - msg: "Creating z/OSMF workflow with uss file: " + this.arguments.ussFile + " failed.", - causeErrors: err + msg: "Creating z/OSMF workflow with uss file: " + this.arguments.ussFile + " failed.\n" + err.msg, + causeErrors: err.causeErrors, + additionalDetails: err.additionalDetails }); throw error; } @@ -153,8 +156,9 @@ export default class CreateCommonHandler extends ZosmfBaseHandler { ); } catch (err) { error = new ImperativeError({ - msg: "Creating z/OSMF workflow with local file: " + this.arguments.localFile + " failed.", - causeErrors: err + msg: "Creating z/OSMF workflow with local file: " + this.arguments.localFile + " failed.\n" + err.msg, + causeErrors: err.causeErrors, + additionalDetails: err.additionalDetails }); throw error; } diff --git a/packages/cli/src/workflows/delete/Delete.common.handler.ts b/packages/cli/src/workflows/delete/Delete.common.handler.ts index e1912339e1..1e6e29d131 100644 --- a/packages/cli/src/workflows/delete/Delete.common.handler.ts +++ b/packages/cli/src/workflows/delete/Delete.common.handler.ts @@ -51,7 +51,8 @@ export default class DeleteCommonHandler extends ZosmfBaseHandler { } catch (err){ error = new ImperativeError({ msg: "Delete workflow: " + err, - causeErrors: err + causeErrors: err.causeErrors, + additionalDetails: err.additionalDetails }); throw error; } diff --git a/packages/cli/src/workflows/list/activeWorkflowDetails/ActiveWorkflowDetails.handler.ts b/packages/cli/src/workflows/list/activeWorkflowDetails/ActiveWorkflowDetails.handler.ts index 0a6bb9af1c..9cbc425a25 100644 --- a/packages/cli/src/workflows/list/activeWorkflowDetails/ActiveWorkflowDetails.handler.ts +++ b/packages/cli/src/workflows/list/activeWorkflowDetails/ActiveWorkflowDetails.handler.ts @@ -67,7 +67,8 @@ export default class ActiveWorkflowDetails extends ZosmfBaseHandler { } catch(err){ error = new ImperativeError({ msg: "List workflow details error: " + err, - causeErrors: err + causeErrors: err.causeErrors, + additionalDetails: err.additionalDetails }); throw error; } diff --git a/packages/cli/src/workflows/list/activeWorkflows/ActiveWorkflows.handler.ts b/packages/cli/src/workflows/list/activeWorkflows/ActiveWorkflows.handler.ts index eb08b42048..37140be7c1 100644 --- a/packages/cli/src/workflows/list/activeWorkflows/ActiveWorkflows.handler.ts +++ b/packages/cli/src/workflows/list/activeWorkflows/ActiveWorkflows.handler.ts @@ -49,7 +49,8 @@ export default class ListActiveWorkflowsHandler extends ZosmfBaseHandler { } catch (err) { error = new ImperativeError({ msg: "List workflow(s) " + err, - causeErrors: err + causeErrors: err.causeErrors, + additionalDetails: err.additionalDetails }); throw error; } diff --git a/packages/cli/src/workflows/list/archivedWorkflows/ArchivedWorkflows.handler.ts b/packages/cli/src/workflows/list/archivedWorkflows/ArchivedWorkflows.handler.ts index 59713fdb2d..e411ff9374 100644 --- a/packages/cli/src/workflows/list/archivedWorkflows/ArchivedWorkflows.handler.ts +++ b/packages/cli/src/workflows/list/archivedWorkflows/ArchivedWorkflows.handler.ts @@ -42,7 +42,8 @@ export default class ListArchivedWorkflowsHandler extends ZosmfBaseHandler { } catch (err) { error = new ImperativeError({ msg: "List workflow(s) " + err, - causeErrors: err + causeErrors: err.causeErrors, + additionalDetails: err.additionalDetails }); throw error; } diff --git a/packages/cli/src/workflows/list/retrieveWorkflowDefinition/RetrieveWorkflowDefinition.handler.ts b/packages/cli/src/workflows/list/retrieveWorkflowDefinition/RetrieveWorkflowDefinition.handler.ts index 3344191ce8..5fbdf12448 100644 --- a/packages/cli/src/workflows/list/retrieveWorkflowDefinition/RetrieveWorkflowDefinition.handler.ts +++ b/packages/cli/src/workflows/list/retrieveWorkflowDefinition/RetrieveWorkflowDefinition.handler.ts @@ -43,7 +43,8 @@ export default class ListActiveWorkflowsHandler extends ZosmfBaseHandler { } catch (err) { error = new ImperativeError({ msg: "List workflow(s) " + err, - causeErrors: err + causeErrors: err.causeErrors, + additionalDetails: err.additionalDetails }); throw error; } diff --git a/packages/cli/src/workflows/start/workflowFull/WorkflowFull.handler.ts b/packages/cli/src/workflows/start/workflowFull/WorkflowFull.handler.ts index 7b4ea1ceff..7e58d468d9 100644 --- a/packages/cli/src/workflows/start/workflowFull/WorkflowFull.handler.ts +++ b/packages/cli/src/workflows/start/workflowFull/WorkflowFull.handler.ts @@ -54,7 +54,8 @@ export default class WorkflowFullHandler extends ZosmfBaseHandler { } catch (err) { error = new ImperativeError({ msg: "Start workflow: " + err, - causeErrors: err + causeErrors: err.causeErrors, + additionalDetails: err.additionalDetails }); throw error; } diff --git a/packages/cli/src/workflows/start/workflowStep/WorkflowStep.handler.ts b/packages/cli/src/workflows/start/workflowStep/WorkflowStep.handler.ts index 2c32df1a81..25ba4b7711 100644 --- a/packages/cli/src/workflows/start/workflowStep/WorkflowStep.handler.ts +++ b/packages/cli/src/workflows/start/workflowStep/WorkflowStep.handler.ts @@ -52,7 +52,8 @@ export default class WorkflowStepHandler extends ZosmfBaseHandler { } catch (err){ error = new ImperativeError({ msg: "Start workflow: " + err, - causeErrors: err + causeErrors: err.causeErrors, + additionalDetails: err.additionalDetails }); throw error; } @@ -73,7 +74,8 @@ export default class WorkflowStepHandler extends ZosmfBaseHandler { } catch (err){ error = new ImperativeError({ msg: "Start workflow Error: " + err, - causeErrors: err + causeErrors: err.causeErrors, + additionalDetails: err.additionalDetails }); throw error; } diff --git a/packages/zosjobs/__tests__/__system__/CancelJobs.system.test.ts b/packages/zosjobs/__tests__/__system__/CancelJobs.system.test.ts index 3e01202a34..6833784057 100644 --- a/packages/zosjobs/__tests__/__system__/CancelJobs.system.test.ts +++ b/packages/zosjobs/__tests__/__system__/CancelJobs.system.test.ts @@ -9,7 +9,7 @@ * */ -import { ImperativeError, Session, RestClientError } from "@zowe/imperative"; +import { ImperativeError, Session } from "@zowe/imperative"; import { CancelJobs, SubmitJobs, IJob } from "../../src"; import { ITestEnvironment } from "@zowe/cli-test-utils"; import { TestEnvironment } from "../../../../__tests__/__src__/environment/TestEnvironment"; From 787ba15ea9fe221b2ab426c18c0eae87c0d3b79c Mon Sep 17 00:00:00 2001 From: "Andrew W. Harn" Date: Mon, 8 Jan 2024 09:41:14 -0500 Subject: [PATCH 075/138] Fix status checks Signed-off-by: Andrew W. Harn --- .../__system__/methods/CheckStatus.system.test.ts | 11 ++++++++--- .../methods/ListDefinedSystems.system.test.ts | 10 ++++++++-- 2 files changed, 16 insertions(+), 5 deletions(-) diff --git a/packages/zosmf/__tests__/__system__/methods/CheckStatus.system.test.ts b/packages/zosmf/__tests__/__system__/methods/CheckStatus.system.test.ts index b71b712552..620f0b5483 100644 --- a/packages/zosmf/__tests__/__system__/methods/CheckStatus.system.test.ts +++ b/packages/zosmf/__tests__/__system__/methods/CheckStatus.system.test.ts @@ -92,7 +92,10 @@ describe("Check Status Api", () => { expect(error).toBeTruthy(); expect(response).toBeFalsy(); - expect(error.message).toMatch(/(Error: getaddrinfo).*(badHost)/); + const jsonCauseErrors = JSON.parse(error.causeErrors); + expect(jsonCauseErrors.code).toEqual("ENOTFOUND"); + expect(jsonCauseErrors.syscall).toEqual("getaddrinfo"); + expect(jsonCauseErrors.hostname).toEqual(badHostName); }); it("should return with proper message for invalid port", async () => { @@ -118,8 +121,10 @@ describe("Check Status Api", () => { expect(error).toBeTruthy(); expect(response).toBeFalsy(); - expect(error.message).toContain(`Error: connect ECONNREFUSED`); - expect(error.message).toContain(badPort.toString()); + const jsonCauseErrors = JSON.parse(error.causeErrors); + expect(jsonCauseErrors.code).toMatch(/(ECONNREFUSED|ECONNRESET)/); + expect(jsonCauseErrors.syscall).toEqual("connect"); + expect(jsonCauseErrors.port).toEqual(badPort); }); }); }); diff --git a/packages/zosmf/__tests__/__system__/methods/ListDefinedSystems.system.test.ts b/packages/zosmf/__tests__/__system__/methods/ListDefinedSystems.system.test.ts index dde42a55f4..2e1cc835b3 100644 --- a/packages/zosmf/__tests__/__system__/methods/ListDefinedSystems.system.test.ts +++ b/packages/zosmf/__tests__/__system__/methods/ListDefinedSystems.system.test.ts @@ -92,7 +92,10 @@ describe("List Defined Systems Api", () => { expect(error).toBeTruthy(); expect(response).toBeFalsy(); - expect(error.message).toMatch(/(Error: getaddrinfo).*(badHost)/); + const jsonCauseErrors = JSON.parse(error.causeErrors); + expect(jsonCauseErrors.code).toEqual("ENOTFOUND"); + expect(jsonCauseErrors.syscall).toEqual("getaddrinfo"); + expect(jsonCauseErrors.hostname).toEqual(badHostName); }); it("should return with proper message for invalid port", async () => { @@ -118,7 +121,10 @@ describe("List Defined Systems Api", () => { expect(error).toBeTruthy(); expect(response).toBeFalsy(); - expect(error.message).toMatch(/Error: (connect|read) (ECONNREFUSED|ECONNRESET)/); + const jsonCauseErrors = JSON.parse(error.causeErrors); + expect(jsonCauseErrors.code).toMatch(/(ECONNREFUSED|ECONNRESET)/); + expect(jsonCauseErrors.syscall).toEqual("connect"); + expect(jsonCauseErrors.port).toEqual(badPort); }); }); }); From d9f1b32d0fe085a3473a1997c7733bc46ec63a4c Mon Sep 17 00:00:00 2001 From: Timothy Johnson Date: Mon, 8 Jan 2024 10:20:51 -0500 Subject: [PATCH 076/138] Update release config to stop publishing v2 as next Signed-off-by: Timothy Johnson --- release.config.js | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/release.config.js b/release.config.js index 62b663c460..5fe2162016 100644 --- a/release.config.js +++ b/release.config.js @@ -19,7 +19,7 @@ module.exports = { "displayNames": { "cli": "Zowe CLI", "core": "Core SDK", - "imperative": "imperative", + "imperative": "Imperative", "zosconsole": "z/OS Console SDK", "zosfiles": "z/OS Files SDK", "zosjobs": "z/OS Jobs SDK", @@ -35,8 +35,7 @@ module.exports = { }], ["@octorelease/lerna", { aliasTags: { - // Note: Remove "next" tag here when the "next" branch is uncommented above - "latest": ["zowe-v2-lts", "next"] + "latest": ["zowe-v2-lts"] }, pruneShrinkwrap: ["@zowe/cli"], smokeTest: true, From efdffceee35ede43d8ef5f1007cdf80ad779d9dd Mon Sep 17 00:00:00 2001 From: "Andrew W. Harn" Date: Mon, 8 Jan 2024 10:44:10 -0500 Subject: [PATCH 077/138] Update pacote Signed-off-by: Andrew W. Harn --- npm-shrinkwrap.json | 6291 ++++++++++++------------------ packages/imperative/package.json | 2 +- 2 files changed, 2492 insertions(+), 3801 deletions(-) diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json index 628de1a3e3..a3a36ad0e4 100644 --- a/npm-shrinkwrap.json +++ b/npm-shrinkwrap.json @@ -701,6 +701,7 @@ }, "node_modules/@gar/promisify": { "version": "1.1.3", + "dev": true, "license": "MIT" }, "node_modules/@humanwhocodes/config-array": { @@ -741,6 +742,95 @@ "node": ">=6.9.0" } }, + "node_modules/@isaacs/cliui": { + "version": "8.0.2", + "resolved": "https://registry.npmjs.org/@isaacs/cliui/-/cliui-8.0.2.tgz", + "integrity": "sha512-O8jcjabXaleOG9DQ0+ARXWZBTfnP4WNAqzuiJK7ll44AmxGKv/J2M4TPjxjY3znBCfvBXFzucm1twdyFybFqEA==", + "dependencies": { + "string-width": "^5.1.2", + "string-width-cjs": "npm:string-width@^4.2.0", + "strip-ansi": "^7.0.1", + "strip-ansi-cjs": "npm:strip-ansi@^6.0.1", + "wrap-ansi": "^8.1.0", + "wrap-ansi-cjs": "npm:wrap-ansi@^7.0.0" + }, + "engines": { + "node": ">=12" + } + }, + "node_modules/@isaacs/cliui/node_modules/ansi-regex": { + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.0.1.tgz", + "integrity": "sha512-n5M855fKb2SsfMIiFFoVrABHJC8QtHwVx+mHWP3QcEqBHYienj5dHSgjbxtC0WEZXYt4wcD6zrQElDPhFuZgfA==", + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/chalk/ansi-regex?sponsor=1" + } + }, + "node_modules/@isaacs/cliui/node_modules/ansi-styles": { + "version": "6.2.1", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-6.2.1.tgz", + "integrity": "sha512-bN798gFfQX+viw3R7yrGWRqnrN2oRkEkUjjl4JNn4E8GxxbjtG3FbrEIIY3l8/hrwUwIeCZvi4QuOTP4MErVug==", + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/chalk/ansi-styles?sponsor=1" + } + }, + "node_modules/@isaacs/cliui/node_modules/emoji-regex": { + "version": "9.2.2", + "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-9.2.2.tgz", + "integrity": "sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg==" + }, + "node_modules/@isaacs/cliui/node_modules/string-width": { + "version": "5.1.2", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-5.1.2.tgz", + "integrity": "sha512-HnLOCR3vjcY8beoNLtcjZ5/nxn2afmME6lhrDrebokqMap+XbeW8n9TXpPDOqdGK5qcI3oT0GKTW6wC7EMiVqA==", + "dependencies": { + "eastasianwidth": "^0.2.0", + "emoji-regex": "^9.2.2", + "strip-ansi": "^7.0.1" + }, + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/@isaacs/cliui/node_modules/strip-ansi": { + "version": "7.1.0", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.1.0.tgz", + "integrity": "sha512-iq6eVVI64nQQTRYq2KtEg2d2uU7LElhTJwsH4YzIHZshxlgZms/wIc4VoDQTlG/IvVIrBKG06CrZnp0qv7hkcQ==", + "dependencies": { + "ansi-regex": "^6.0.1" + }, + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/chalk/strip-ansi?sponsor=1" + } + }, + "node_modules/@isaacs/cliui/node_modules/wrap-ansi": { + "version": "8.1.0", + "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-8.1.0.tgz", + "integrity": "sha512-si7QWI6zUMq56bESFvagtmzMdGOtoxfR+Sez11Mobfc7tm+VkUckk9bW2UeffTGVUbOksxmSw0AA2gs8g71NCQ==", + "dependencies": { + "ansi-styles": "^6.1.0", + "string-width": "^5.0.1", + "strip-ansi": "^7.0.1" + }, + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/chalk/wrap-ansi?sponsor=1" + } + }, "node_modules/@isaacs/string-locale-compare": { "version": "1.1.0", "dev": true, @@ -1457,17 +1547,6 @@ "node": "^14.15.0 || ^16.10.0 || >=18.0.0" } }, - "node_modules/@jest/reporters/node_modules/lru-cache": { - "version": "6.0.0", - "dev": true, - "license": "ISC", - "dependencies": { - "yallist": "^4.0.0" - }, - "engines": { - "node": ">=10" - } - }, "node_modules/@jest/reporters/node_modules/semver": { "version": "7.5.4", "dev": true, @@ -1509,11 +1588,6 @@ "node": ">=10.12.0" } }, - "node_modules/@jest/reporters/node_modules/yallist": { - "version": "4.0.0", - "dev": true, - "license": "ISC" - }, "node_modules/@jest/source-map": { "version": "29.6.3", "dev": true, @@ -1759,19 +1833,6 @@ "semver": "^7.0.0" } }, - "node_modules/@lerna/add/node_modules/chownr": { - "version": "2.0.0", - "dev": true, - "license": "ISC", - "engines": { - "node": ">=10" - } - }, - "node_modules/@lerna/add/node_modules/err-code": { - "version": "2.0.3", - "dev": true, - "license": "MIT" - }, "node_modules/@lerna/add/node_modules/hosted-git-info": { "version": "5.1.0", "dev": true, @@ -1886,38 +1947,6 @@ "node": "^12.13.0 || ^14.15.0 || >=16.0.0" } }, - "node_modules/@lerna/add/node_modules/promise-retry": { - "version": "2.0.1", - "dev": true, - "license": "MIT", - "dependencies": { - "err-code": "^2.0.2", - "retry": "^0.12.0" - }, - "engines": { - "node": ">=10" - } - }, - "node_modules/@lerna/add/node_modules/read-package-json-fast": { - "version": "2.0.3", - "dev": true, - "license": "ISC", - "dependencies": { - "json-parse-even-better-errors": "^2.3.0", - "npm-normalize-package-bin": "^1.0.1" - }, - "engines": { - "node": ">=10" - } - }, - "node_modules/@lerna/add/node_modules/retry": { - "version": "0.12.0", - "dev": true, - "license": "MIT", - "engines": { - "node": ">= 4" - } - }, "node_modules/@lerna/add/node_modules/rimraf": { "version": "3.0.2", "dev": true, @@ -1975,63 +2004,6 @@ "node": "^14.15.0 || >=16.0.0" } }, - "node_modules/@lerna/bootstrap/node_modules/are-we-there-yet": { - "version": "3.0.1", - "dev": true, - "license": "ISC", - "dependencies": { - "delegates": "^1.0.0", - "readable-stream": "^3.6.0" - }, - "engines": { - "node": "^12.13.0 || ^14.15.0 || >=16.0.0" - } - }, - "node_modules/@lerna/bootstrap/node_modules/gauge": { - "version": "4.0.4", - "dev": true, - "license": "ISC", - "dependencies": { - "aproba": "^1.0.3 || ^2.0.0", - "color-support": "^1.1.3", - "console-control-strings": "^1.1.0", - "has-unicode": "^2.0.1", - "signal-exit": "^3.0.7", - "string-width": "^4.2.3", - "strip-ansi": "^6.0.1", - "wide-align": "^1.1.5" - }, - "engines": { - "node": "^12.13.0 || ^14.15.0 || >=16.0.0" - } - }, - "node_modules/@lerna/bootstrap/node_modules/npmlog": { - "version": "6.0.2", - "dev": true, - "license": "ISC", - "dependencies": { - "are-we-there-yet": "^3.0.0", - "console-control-strings": "^1.1.0", - "gauge": "^4.0.3", - "set-blocking": "^2.0.0" - }, - "engines": { - "node": "^12.13.0 || ^14.15.0 || >=16.0.0" - } - }, - "node_modules/@lerna/bootstrap/node_modules/readable-stream": { - "version": "3.6.0", - "dev": true, - "license": "MIT", - "dependencies": { - "inherits": "^2.0.3", - "string_decoder": "^1.1.1", - "util-deprecate": "^1.0.1" - }, - "engines": { - "node": ">= 6" - } - }, "node_modules/@lerna/changed": { "version": "5.6.2", "dev": true, @@ -2104,18 +2076,6 @@ "node": "^14.15.0 || >=16.0.0" } }, - "node_modules/@lerna/cli/node_modules/are-we-there-yet": { - "version": "3.0.1", - "dev": true, - "license": "ISC", - "dependencies": { - "delegates": "^1.0.0", - "readable-stream": "^3.6.0" - }, - "engines": { - "node": "^12.13.0 || ^14.15.0 || >=16.0.0" - } - }, "node_modules/@lerna/cli/node_modules/cliui": { "version": "7.0.4", "dev": true, @@ -2126,51 +2086,6 @@ "wrap-ansi": "^7.0.0" } }, - "node_modules/@lerna/cli/node_modules/gauge": { - "version": "4.0.4", - "dev": true, - "license": "ISC", - "dependencies": { - "aproba": "^1.0.3 || ^2.0.0", - "color-support": "^1.1.3", - "console-control-strings": "^1.1.0", - "has-unicode": "^2.0.1", - "signal-exit": "^3.0.7", - "string-width": "^4.2.3", - "strip-ansi": "^6.0.1", - "wide-align": "^1.1.5" - }, - "engines": { - "node": "^12.13.0 || ^14.15.0 || >=16.0.0" - } - }, - "node_modules/@lerna/cli/node_modules/npmlog": { - "version": "6.0.2", - "dev": true, - "license": "ISC", - "dependencies": { - "are-we-there-yet": "^3.0.0", - "console-control-strings": "^1.1.0", - "gauge": "^4.0.3", - "set-blocking": "^2.0.0" - }, - "engines": { - "node": "^12.13.0 || ^14.15.0 || >=16.0.0" - } - }, - "node_modules/@lerna/cli/node_modules/readable-stream": { - "version": "3.6.0", - "dev": true, - "license": "MIT", - "dependencies": { - "inherits": "^2.0.3", - "string_decoder": "^1.1.1", - "util-deprecate": "^1.0.1" - }, - "engines": { - "node": ">= 6" - } - }, "node_modules/@lerna/cli/node_modules/y18n": { "version": "5.0.8", "dev": true, @@ -2209,139 +2124,25 @@ "node": "^14.15.0 || >=16.0.0" } }, - "node_modules/@lerna/collect-uncommitted/node_modules/are-we-there-yet": { - "version": "3.0.1", + "node_modules/@lerna/collect-updates": { + "version": "5.6.2", "dev": true, - "license": "ISC", + "license": "MIT", "dependencies": { - "delegates": "^1.0.0", - "readable-stream": "^3.6.0" + "@lerna/child-process": "5.6.2", + "@lerna/describe-ref": "5.6.2", + "minimatch": "^3.0.4", + "npmlog": "^6.0.2", + "slash": "^3.0.0" }, "engines": { - "node": "^12.13.0 || ^14.15.0 || >=16.0.0" + "node": "^14.15.0 || >=16.0.0" } }, - "node_modules/@lerna/collect-uncommitted/node_modules/gauge": { - "version": "4.0.4", + "node_modules/@lerna/command": { + "version": "5.6.2", "dev": true, - "license": "ISC", - "dependencies": { - "aproba": "^1.0.3 || ^2.0.0", - "color-support": "^1.1.3", - "console-control-strings": "^1.1.0", - "has-unicode": "^2.0.1", - "signal-exit": "^3.0.7", - "string-width": "^4.2.3", - "strip-ansi": "^6.0.1", - "wide-align": "^1.1.5" - }, - "engines": { - "node": "^12.13.0 || ^14.15.0 || >=16.0.0" - } - }, - "node_modules/@lerna/collect-uncommitted/node_modules/npmlog": { - "version": "6.0.2", - "dev": true, - "license": "ISC", - "dependencies": { - "are-we-there-yet": "^3.0.0", - "console-control-strings": "^1.1.0", - "gauge": "^4.0.3", - "set-blocking": "^2.0.0" - }, - "engines": { - "node": "^12.13.0 || ^14.15.0 || >=16.0.0" - } - }, - "node_modules/@lerna/collect-uncommitted/node_modules/readable-stream": { - "version": "3.6.0", - "dev": true, - "license": "MIT", - "dependencies": { - "inherits": "^2.0.3", - "string_decoder": "^1.1.1", - "util-deprecate": "^1.0.1" - }, - "engines": { - "node": ">= 6" - } - }, - "node_modules/@lerna/collect-updates": { - "version": "5.6.2", - "dev": true, - "license": "MIT", - "dependencies": { - "@lerna/child-process": "5.6.2", - "@lerna/describe-ref": "5.6.2", - "minimatch": "^3.0.4", - "npmlog": "^6.0.2", - "slash": "^3.0.0" - }, - "engines": { - "node": "^14.15.0 || >=16.0.0" - } - }, - "node_modules/@lerna/collect-updates/node_modules/are-we-there-yet": { - "version": "3.0.1", - "dev": true, - "license": "ISC", - "dependencies": { - "delegates": "^1.0.0", - "readable-stream": "^3.6.0" - }, - "engines": { - "node": "^12.13.0 || ^14.15.0 || >=16.0.0" - } - }, - "node_modules/@lerna/collect-updates/node_modules/gauge": { - "version": "4.0.4", - "dev": true, - "license": "ISC", - "dependencies": { - "aproba": "^1.0.3 || ^2.0.0", - "color-support": "^1.1.3", - "console-control-strings": "^1.1.0", - "has-unicode": "^2.0.1", - "signal-exit": "^3.0.7", - "string-width": "^4.2.3", - "strip-ansi": "^6.0.1", - "wide-align": "^1.1.5" - }, - "engines": { - "node": "^12.13.0 || ^14.15.0 || >=16.0.0" - } - }, - "node_modules/@lerna/collect-updates/node_modules/npmlog": { - "version": "6.0.2", - "dev": true, - "license": "ISC", - "dependencies": { - "are-we-there-yet": "^3.0.0", - "console-control-strings": "^1.1.0", - "gauge": "^4.0.3", - "set-blocking": "^2.0.0" - }, - "engines": { - "node": "^12.13.0 || ^14.15.0 || >=16.0.0" - } - }, - "node_modules/@lerna/collect-updates/node_modules/readable-stream": { - "version": "3.6.0", - "dev": true, - "license": "MIT", - "dependencies": { - "inherits": "^2.0.3", - "string_decoder": "^1.1.1", - "util-deprecate": "^1.0.1" - }, - "engines": { - "node": ">= 6" - } - }, - "node_modules/@lerna/command": { - "version": "5.6.2", - "dev": true, - "license": "MIT", + "license": "MIT", "dependencies": { "@lerna/child-process": "5.6.2", "@lerna/package-graph": "5.6.2", @@ -2358,63 +2159,6 @@ "node": "^14.15.0 || >=16.0.0" } }, - "node_modules/@lerna/command/node_modules/are-we-there-yet": { - "version": "3.0.1", - "dev": true, - "license": "ISC", - "dependencies": { - "delegates": "^1.0.0", - "readable-stream": "^3.6.0" - }, - "engines": { - "node": "^12.13.0 || ^14.15.0 || >=16.0.0" - } - }, - "node_modules/@lerna/command/node_modules/gauge": { - "version": "4.0.4", - "dev": true, - "license": "ISC", - "dependencies": { - "aproba": "^1.0.3 || ^2.0.0", - "color-support": "^1.1.3", - "console-control-strings": "^1.1.0", - "has-unicode": "^2.0.1", - "signal-exit": "^3.0.7", - "string-width": "^4.2.3", - "strip-ansi": "^6.0.1", - "wide-align": "^1.1.5" - }, - "engines": { - "node": "^12.13.0 || ^14.15.0 || >=16.0.0" - } - }, - "node_modules/@lerna/command/node_modules/npmlog": { - "version": "6.0.2", - "dev": true, - "license": "ISC", - "dependencies": { - "are-we-there-yet": "^3.0.0", - "console-control-strings": "^1.1.0", - "gauge": "^4.0.3", - "set-blocking": "^2.0.0" - }, - "engines": { - "node": "^12.13.0 || ^14.15.0 || >=16.0.0" - } - }, - "node_modules/@lerna/command/node_modules/readable-stream": { - "version": "3.6.0", - "dev": true, - "license": "MIT", - "dependencies": { - "inherits": "^2.0.3", - "string_decoder": "^1.1.1", - "util-deprecate": "^1.0.1" - }, - "engines": { - "node": ">= 6" - } - }, "node_modules/@lerna/conventional-commits": { "version": "5.6.2", "dev": true, @@ -2435,18 +2179,6 @@ "node": "^14.15.0 || >=16.0.0" } }, - "node_modules/@lerna/conventional-commits/node_modules/are-we-there-yet": { - "version": "3.0.1", - "dev": true, - "license": "ISC", - "dependencies": { - "delegates": "^1.0.0", - "readable-stream": "^3.6.0" - }, - "engines": { - "node": "^12.13.0 || ^14.15.0 || >=16.0.0" - } - }, "node_modules/@lerna/conventional-commits/node_modules/fs-extra": { "version": "9.1.0", "dev": true, @@ -2461,24 +2193,6 @@ "node": ">=10" } }, - "node_modules/@lerna/conventional-commits/node_modules/gauge": { - "version": "4.0.4", - "dev": true, - "license": "ISC", - "dependencies": { - "aproba": "^1.0.3 || ^2.0.0", - "color-support": "^1.1.3", - "console-control-strings": "^1.1.0", - "has-unicode": "^2.0.1", - "signal-exit": "^3.0.7", - "string-width": "^4.2.3", - "strip-ansi": "^6.0.1", - "wide-align": "^1.1.5" - }, - "engines": { - "node": "^12.13.0 || ^14.15.0 || >=16.0.0" - } - }, "node_modules/@lerna/conventional-commits/node_modules/jsonfile": { "version": "6.1.0", "dev": true, @@ -2490,33 +2204,6 @@ "graceful-fs": "^4.1.6" } }, - "node_modules/@lerna/conventional-commits/node_modules/npmlog": { - "version": "6.0.2", - "dev": true, - "license": "ISC", - "dependencies": { - "are-we-there-yet": "^3.0.0", - "console-control-strings": "^1.1.0", - "gauge": "^4.0.3", - "set-blocking": "^2.0.0" - }, - "engines": { - "node": "^12.13.0 || ^14.15.0 || >=16.0.0" - } - }, - "node_modules/@lerna/conventional-commits/node_modules/readable-stream": { - "version": "3.6.0", - "dev": true, - "license": "MIT", - "dependencies": { - "inherits": "^2.0.3", - "string_decoder": "^1.1.1", - "util-deprecate": "^1.0.1" - }, - "engines": { - "node": ">= 6" - } - }, "node_modules/@lerna/create": { "version": "5.6.2", "dev": true, @@ -2556,18 +2243,6 @@ "node": "^14.15.0 || >=16.0.0" } }, - "node_modules/@lerna/create-symlink/node_modules/are-we-there-yet": { - "version": "3.0.1", - "dev": true, - "license": "ISC", - "dependencies": { - "delegates": "^1.0.0", - "readable-stream": "^3.6.0" - }, - "engines": { - "node": "^12.13.0 || ^14.15.0 || >=16.0.0" - } - }, "node_modules/@lerna/create-symlink/node_modules/fs-extra": { "version": "9.1.0", "dev": true, @@ -2582,24 +2257,6 @@ "node": ">=10" } }, - "node_modules/@lerna/create-symlink/node_modules/gauge": { - "version": "4.0.4", - "dev": true, - "license": "ISC", - "dependencies": { - "aproba": "^1.0.3 || ^2.0.0", - "color-support": "^1.1.3", - "console-control-strings": "^1.1.0", - "has-unicode": "^2.0.1", - "signal-exit": "^3.0.7", - "string-width": "^4.2.3", - "strip-ansi": "^6.0.1", - "wide-align": "^1.1.5" - }, - "engines": { - "node": "^12.13.0 || ^14.15.0 || >=16.0.0" - } - }, "node_modules/@lerna/create-symlink/node_modules/jsonfile": { "version": "6.1.0", "dev": true, @@ -2611,33 +2268,6 @@ "graceful-fs": "^4.1.6" } }, - "node_modules/@lerna/create-symlink/node_modules/npmlog": { - "version": "6.0.2", - "dev": true, - "license": "ISC", - "dependencies": { - "are-we-there-yet": "^3.0.0", - "console-control-strings": "^1.1.0", - "gauge": "^4.0.3", - "set-blocking": "^2.0.0" - }, - "engines": { - "node": "^12.13.0 || ^14.15.0 || >=16.0.0" - } - }, - "node_modules/@lerna/create-symlink/node_modules/readable-stream": { - "version": "3.6.0", - "dev": true, - "license": "MIT", - "dependencies": { - "inherits": "^2.0.3", - "string_decoder": "^1.1.1", - "util-deprecate": "^1.0.1" - }, - "engines": { - "node": ">= 6" - } - }, "node_modules/@lerna/create/node_modules/@npmcli/git": { "version": "3.0.2", "dev": true, @@ -2676,19 +2306,6 @@ "semver": "^7.0.0" } }, - "node_modules/@lerna/create/node_modules/chownr": { - "version": "2.0.0", - "dev": true, - "license": "ISC", - "engines": { - "node": ">=10" - } - }, - "node_modules/@lerna/create/node_modules/err-code": { - "version": "2.0.3", - "dev": true, - "license": "MIT" - }, "node_modules/@lerna/create/node_modules/fs-extra": { "version": "9.1.0", "dev": true, @@ -2828,38 +2445,6 @@ "node": "^12.13.0 || ^14.15.0 || >=16.0.0" } }, - "node_modules/@lerna/create/node_modules/promise-retry": { - "version": "2.0.1", - "dev": true, - "license": "MIT", - "dependencies": { - "err-code": "^2.0.2", - "retry": "^0.12.0" - }, - "engines": { - "node": ">=10" - } - }, - "node_modules/@lerna/create/node_modules/read-package-json-fast": { - "version": "2.0.3", - "dev": true, - "license": "ISC", - "dependencies": { - "json-parse-even-better-errors": "^2.3.0", - "npm-normalize-package-bin": "^1.0.1" - }, - "engines": { - "node": ">=10" - } - }, - "node_modules/@lerna/create/node_modules/retry": { - "version": "0.12.0", - "dev": true, - "license": "MIT", - "engines": { - "node": ">= 4" - } - }, "node_modules/@lerna/create/node_modules/rimraf": { "version": "3.0.2", "dev": true, @@ -2897,632 +2482,615 @@ "node": "^14.15.0 || >=16.0.0" } }, - "node_modules/@lerna/describe-ref/node_modules/are-we-there-yet": { - "version": "3.0.1", + "node_modules/@lerna/diff": { + "version": "5.6.2", "dev": true, - "license": "ISC", + "license": "MIT", "dependencies": { - "delegates": "^1.0.0", - "readable-stream": "^3.6.0" + "@lerna/child-process": "5.6.2", + "@lerna/command": "5.6.2", + "@lerna/validation-error": "5.6.2", + "npmlog": "^6.0.2" }, "engines": { - "node": "^12.13.0 || ^14.15.0 || >=16.0.0" + "node": "^14.15.0 || >=16.0.0" } }, - "node_modules/@lerna/describe-ref/node_modules/gauge": { - "version": "4.0.4", + "node_modules/@lerna/exec": { + "version": "5.6.2", "dev": true, - "license": "ISC", + "license": "MIT", "dependencies": { - "aproba": "^1.0.3 || ^2.0.0", - "color-support": "^1.1.3", - "console-control-strings": "^1.1.0", - "has-unicode": "^2.0.1", - "signal-exit": "^3.0.7", - "string-width": "^4.2.3", - "strip-ansi": "^6.0.1", - "wide-align": "^1.1.5" + "@lerna/child-process": "5.6.2", + "@lerna/command": "5.6.2", + "@lerna/filter-options": "5.6.2", + "@lerna/profiler": "5.6.2", + "@lerna/run-topologically": "5.6.2", + "@lerna/validation-error": "5.6.2", + "p-map": "^4.0.0" }, "engines": { - "node": "^12.13.0 || ^14.15.0 || >=16.0.0" + "node": "^14.15.0 || >=16.0.0" } }, - "node_modules/@lerna/describe-ref/node_modules/npmlog": { - "version": "6.0.2", + "node_modules/@lerna/filter-options": { + "version": "5.6.2", "dev": true, - "license": "ISC", + "license": "MIT", "dependencies": { - "are-we-there-yet": "^3.0.0", - "console-control-strings": "^1.1.0", - "gauge": "^4.0.3", - "set-blocking": "^2.0.0" + "@lerna/collect-updates": "5.6.2", + "@lerna/filter-packages": "5.6.2", + "dedent": "^0.7.0", + "npmlog": "^6.0.2" }, "engines": { - "node": "^12.13.0 || ^14.15.0 || >=16.0.0" + "node": "^14.15.0 || >=16.0.0" } }, - "node_modules/@lerna/describe-ref/node_modules/readable-stream": { - "version": "3.6.0", + "node_modules/@lerna/filter-packages": { + "version": "5.6.2", "dev": true, "license": "MIT", "dependencies": { - "inherits": "^2.0.3", - "string_decoder": "^1.1.1", - "util-deprecate": "^1.0.1" + "@lerna/validation-error": "5.6.2", + "multimatch": "^5.0.0", + "npmlog": "^6.0.2" }, "engines": { - "node": ">= 6" + "node": "^14.15.0 || >=16.0.0" } }, - "node_modules/@lerna/diff": { + "node_modules/@lerna/get-npm-exec-opts": { "version": "5.6.2", "dev": true, "license": "MIT", "dependencies": { - "@lerna/child-process": "5.6.2", - "@lerna/command": "5.6.2", - "@lerna/validation-error": "5.6.2", "npmlog": "^6.0.2" }, "engines": { "node": "^14.15.0 || >=16.0.0" } }, - "node_modules/@lerna/diff/node_modules/are-we-there-yet": { - "version": "3.0.1", + "node_modules/@lerna/get-packed": { + "version": "5.6.2", "dev": true, - "license": "ISC", + "license": "MIT", "dependencies": { - "delegates": "^1.0.0", - "readable-stream": "^3.6.0" + "fs-extra": "^9.1.0", + "ssri": "^9.0.1", + "tar": "^6.1.0" }, "engines": { - "node": "^12.13.0 || ^14.15.0 || >=16.0.0" + "node": "^14.15.0 || >=16.0.0" } }, - "node_modules/@lerna/diff/node_modules/gauge": { - "version": "4.0.4", + "node_modules/@lerna/get-packed/node_modules/fs-extra": { + "version": "9.1.0", "dev": true, - "license": "ISC", + "license": "MIT", "dependencies": { - "aproba": "^1.0.3 || ^2.0.0", - "color-support": "^1.1.3", - "console-control-strings": "^1.1.0", - "has-unicode": "^2.0.1", - "signal-exit": "^3.0.7", - "string-width": "^4.2.3", - "strip-ansi": "^6.0.1", - "wide-align": "^1.1.5" + "at-least-node": "^1.0.0", + "graceful-fs": "^4.2.0", + "jsonfile": "^6.0.1", + "universalify": "^2.0.0" }, "engines": { - "node": "^12.13.0 || ^14.15.0 || >=16.0.0" + "node": ">=10" } }, - "node_modules/@lerna/diff/node_modules/npmlog": { - "version": "6.0.2", + "node_modules/@lerna/get-packed/node_modules/jsonfile": { + "version": "6.1.0", "dev": true, - "license": "ISC", + "license": "MIT", "dependencies": { - "are-we-there-yet": "^3.0.0", - "console-control-strings": "^1.1.0", - "gauge": "^4.0.3", - "set-blocking": "^2.0.0" + "universalify": "^2.0.0" }, - "engines": { - "node": "^12.13.0 || ^14.15.0 || >=16.0.0" + "optionalDependencies": { + "graceful-fs": "^4.1.6" } }, - "node_modules/@lerna/diff/node_modules/readable-stream": { - "version": "3.6.0", + "node_modules/@lerna/github-client": { + "version": "5.6.2", "dev": true, "license": "MIT", "dependencies": { - "inherits": "^2.0.3", - "string_decoder": "^1.1.1", - "util-deprecate": "^1.0.1" + "@lerna/child-process": "5.6.2", + "@octokit/plugin-enterprise-rest": "^6.0.1", + "@octokit/rest": "^19.0.3", + "git-url-parse": "^13.1.0", + "npmlog": "^6.0.2" }, "engines": { - "node": ">= 6" + "node": "^14.15.0 || >=16.0.0" } }, - "node_modules/@lerna/exec": { + "node_modules/@lerna/gitlab-client": { "version": "5.6.2", "dev": true, "license": "MIT", "dependencies": { - "@lerna/child-process": "5.6.2", - "@lerna/command": "5.6.2", - "@lerna/filter-options": "5.6.2", - "@lerna/profiler": "5.6.2", - "@lerna/run-topologically": "5.6.2", - "@lerna/validation-error": "5.6.2", - "p-map": "^4.0.0" + "node-fetch": "^2.6.1", + "npmlog": "^6.0.2" }, "engines": { "node": "^14.15.0 || >=16.0.0" } }, - "node_modules/@lerna/filter-options": { + "node_modules/@lerna/global-options": { "version": "5.6.2", "dev": true, "license": "MIT", - "dependencies": { - "@lerna/collect-updates": "5.6.2", - "@lerna/filter-packages": "5.6.2", - "dedent": "^0.7.0", - "npmlog": "^6.0.2" - }, "engines": { "node": "^14.15.0 || >=16.0.0" } }, - "node_modules/@lerna/filter-options/node_modules/are-we-there-yet": { - "version": "3.0.1", + "node_modules/@lerna/has-npm-version": { + "version": "5.6.2", "dev": true, - "license": "ISC", + "license": "MIT", "dependencies": { - "delegates": "^1.0.0", - "readable-stream": "^3.6.0" + "@lerna/child-process": "5.6.2", + "semver": "^7.3.4" }, "engines": { - "node": "^12.13.0 || ^14.15.0 || >=16.0.0" + "node": "^14.15.0 || >=16.0.0" } }, - "node_modules/@lerna/filter-options/node_modules/gauge": { - "version": "4.0.4", + "node_modules/@lerna/import": { + "version": "5.6.2", "dev": true, - "license": "ISC", + "license": "MIT", "dependencies": { - "aproba": "^1.0.3 || ^2.0.0", - "color-support": "^1.1.3", - "console-control-strings": "^1.1.0", - "has-unicode": "^2.0.1", - "signal-exit": "^3.0.7", - "string-width": "^4.2.3", - "strip-ansi": "^6.0.1", - "wide-align": "^1.1.5" + "@lerna/child-process": "5.6.2", + "@lerna/command": "5.6.2", + "@lerna/prompt": "5.6.2", + "@lerna/pulse-till-done": "5.6.2", + "@lerna/validation-error": "5.6.2", + "dedent": "^0.7.0", + "fs-extra": "^9.1.0", + "p-map-series": "^2.1.0" }, "engines": { - "node": "^12.13.0 || ^14.15.0 || >=16.0.0" + "node": "^14.15.0 || >=16.0.0" } }, - "node_modules/@lerna/filter-options/node_modules/npmlog": { - "version": "6.0.2", + "node_modules/@lerna/import/node_modules/fs-extra": { + "version": "9.1.0", "dev": true, - "license": "ISC", + "license": "MIT", "dependencies": { - "are-we-there-yet": "^3.0.0", - "console-control-strings": "^1.1.0", - "gauge": "^4.0.3", - "set-blocking": "^2.0.0" + "at-least-node": "^1.0.0", + "graceful-fs": "^4.2.0", + "jsonfile": "^6.0.1", + "universalify": "^2.0.0" }, "engines": { - "node": "^12.13.0 || ^14.15.0 || >=16.0.0" + "node": ">=10" } }, - "node_modules/@lerna/filter-options/node_modules/readable-stream": { - "version": "3.6.0", + "node_modules/@lerna/import/node_modules/jsonfile": { + "version": "6.1.0", "dev": true, "license": "MIT", "dependencies": { - "inherits": "^2.0.3", - "string_decoder": "^1.1.1", - "util-deprecate": "^1.0.1" + "universalify": "^2.0.0" }, - "engines": { - "node": ">= 6" + "optionalDependencies": { + "graceful-fs": "^4.1.6" } }, - "node_modules/@lerna/filter-packages": { + "node_modules/@lerna/info": { "version": "5.6.2", "dev": true, "license": "MIT", "dependencies": { - "@lerna/validation-error": "5.6.2", - "multimatch": "^5.0.0", - "npmlog": "^6.0.2" + "@lerna/command": "5.6.2", + "@lerna/output": "5.6.2", + "envinfo": "^7.7.4" }, "engines": { "node": "^14.15.0 || >=16.0.0" } }, - "node_modules/@lerna/filter-packages/node_modules/are-we-there-yet": { - "version": "3.0.1", + "node_modules/@lerna/init": { + "version": "5.6.2", "dev": true, - "license": "ISC", + "license": "MIT", "dependencies": { - "delegates": "^1.0.0", - "readable-stream": "^3.6.0" + "@lerna/child-process": "5.6.2", + "@lerna/command": "5.6.2", + "@lerna/project": "5.6.2", + "fs-extra": "^9.1.0", + "p-map": "^4.0.0", + "write-json-file": "^4.3.0" }, "engines": { - "node": "^12.13.0 || ^14.15.0 || >=16.0.0" + "node": "^14.15.0 || >=16.0.0" } }, - "node_modules/@lerna/filter-packages/node_modules/gauge": { - "version": "4.0.4", + "node_modules/@lerna/init/node_modules/fs-extra": { + "version": "9.1.0", "dev": true, - "license": "ISC", + "license": "MIT", "dependencies": { - "aproba": "^1.0.3 || ^2.0.0", - "color-support": "^1.1.3", - "console-control-strings": "^1.1.0", - "has-unicode": "^2.0.1", - "signal-exit": "^3.0.7", - "string-width": "^4.2.3", - "strip-ansi": "^6.0.1", - "wide-align": "^1.1.5" + "at-least-node": "^1.0.0", + "graceful-fs": "^4.2.0", + "jsonfile": "^6.0.1", + "universalify": "^2.0.0" }, "engines": { - "node": "^12.13.0 || ^14.15.0 || >=16.0.0" + "node": ">=10" } }, - "node_modules/@lerna/filter-packages/node_modules/npmlog": { - "version": "6.0.2", + "node_modules/@lerna/init/node_modules/jsonfile": { + "version": "6.1.0", "dev": true, - "license": "ISC", + "license": "MIT", "dependencies": { - "are-we-there-yet": "^3.0.0", - "console-control-strings": "^1.1.0", - "gauge": "^4.0.3", - "set-blocking": "^2.0.0" + "universalify": "^2.0.0" }, - "engines": { - "node": "^12.13.0 || ^14.15.0 || >=16.0.0" + "optionalDependencies": { + "graceful-fs": "^4.1.6" } }, - "node_modules/@lerna/filter-packages/node_modules/readable-stream": { - "version": "3.6.0", + "node_modules/@lerna/link": { + "version": "5.6.2", "dev": true, "license": "MIT", "dependencies": { - "inherits": "^2.0.3", - "string_decoder": "^1.1.1", - "util-deprecate": "^1.0.1" + "@lerna/command": "5.6.2", + "@lerna/package-graph": "5.6.2", + "@lerna/symlink-dependencies": "5.6.2", + "@lerna/validation-error": "5.6.2", + "p-map": "^4.0.0", + "slash": "^3.0.0" }, "engines": { - "node": ">= 6" + "node": "^14.15.0 || >=16.0.0" } }, - "node_modules/@lerna/get-npm-exec-opts": { + "node_modules/@lerna/list": { "version": "5.6.2", "dev": true, "license": "MIT", "dependencies": { - "npmlog": "^6.0.2" + "@lerna/command": "5.6.2", + "@lerna/filter-options": "5.6.2", + "@lerna/listable": "5.6.2", + "@lerna/output": "5.6.2" }, "engines": { "node": "^14.15.0 || >=16.0.0" } }, - "node_modules/@lerna/get-npm-exec-opts/node_modules/are-we-there-yet": { - "version": "3.0.1", + "node_modules/@lerna/listable": { + "version": "5.6.2", "dev": true, - "license": "ISC", + "license": "MIT", "dependencies": { - "delegates": "^1.0.0", - "readable-stream": "^3.6.0" + "@lerna/query-graph": "5.6.2", + "chalk": "^4.1.0", + "columnify": "^1.6.0" }, "engines": { - "node": "^12.13.0 || ^14.15.0 || >=16.0.0" + "node": "^14.15.0 || >=16.0.0" } }, - "node_modules/@lerna/get-npm-exec-opts/node_modules/gauge": { - "version": "4.0.4", + "node_modules/@lerna/log-packed": { + "version": "5.6.2", "dev": true, - "license": "ISC", + "license": "MIT", "dependencies": { - "aproba": "^1.0.3 || ^2.0.0", - "color-support": "^1.1.3", - "console-control-strings": "^1.1.0", + "byte-size": "^7.0.0", + "columnify": "^1.6.0", "has-unicode": "^2.0.1", - "signal-exit": "^3.0.7", - "string-width": "^4.2.3", - "strip-ansi": "^6.0.1", - "wide-align": "^1.1.5" + "npmlog": "^6.0.2" }, "engines": { - "node": "^12.13.0 || ^14.15.0 || >=16.0.0" + "node": "^14.15.0 || >=16.0.0" } }, - "node_modules/@lerna/get-npm-exec-opts/node_modules/npmlog": { - "version": "6.0.2", + "node_modules/@lerna/npm-conf": { + "version": "5.6.2", "dev": true, - "license": "ISC", + "license": "MIT", "dependencies": { - "are-we-there-yet": "^3.0.0", - "console-control-strings": "^1.1.0", - "gauge": "^4.0.3", - "set-blocking": "^2.0.0" + "config-chain": "^1.1.12", + "pify": "^5.0.0" }, "engines": { - "node": "^12.13.0 || ^14.15.0 || >=16.0.0" + "node": "^14.15.0 || >=16.0.0" } }, - "node_modules/@lerna/get-npm-exec-opts/node_modules/readable-stream": { - "version": "3.6.0", + "node_modules/@lerna/npm-dist-tag": { + "version": "5.6.2", "dev": true, "license": "MIT", "dependencies": { - "inherits": "^2.0.3", - "string_decoder": "^1.1.1", - "util-deprecate": "^1.0.1" + "@lerna/otplease": "5.6.2", + "npm-package-arg": "8.1.1", + "npm-registry-fetch": "^13.3.0", + "npmlog": "^6.0.2" }, "engines": { - "node": ">= 6" + "node": "^14.15.0 || >=16.0.0" } }, - "node_modules/@lerna/get-packed": { - "version": "5.6.2", + "node_modules/@lerna/npm-dist-tag/node_modules/builtins": { + "version": "5.0.1", "dev": true, "license": "MIT", "dependencies": { - "fs-extra": "^9.1.0", - "ssri": "^9.0.1", - "tar": "^6.1.0" - }, - "engines": { - "node": "^14.15.0 || >=16.0.0" + "semver": "^7.0.0" } }, - "node_modules/@lerna/get-packed/node_modules/fs-extra": { - "version": "9.1.0", + "node_modules/@lerna/npm-dist-tag/node_modules/hosted-git-info": { + "version": "5.1.0", "dev": true, - "license": "MIT", + "license": "ISC", "dependencies": { - "at-least-node": "^1.0.0", - "graceful-fs": "^4.2.0", - "jsonfile": "^6.0.1", - "universalify": "^2.0.0" + "lru-cache": "^7.5.1" }, "engines": { - "node": ">=10" + "node": "^12.13.0 || ^14.15.0 || >=16.0.0" } }, - "node_modules/@lerna/get-packed/node_modules/jsonfile": { - "version": "6.1.0", + "node_modules/@lerna/npm-dist-tag/node_modules/lru-cache": { + "version": "7.14.0", "dev": true, - "license": "MIT", - "dependencies": { - "universalify": "^2.0.0" - }, - "optionalDependencies": { - "graceful-fs": "^4.1.6" + "license": "ISC", + "engines": { + "node": ">=12" } }, - "node_modules/@lerna/github-client": { - "version": "5.6.2", + "node_modules/@lerna/npm-dist-tag/node_modules/minipass-fetch": { + "version": "2.1.2", "dev": true, "license": "MIT", "dependencies": { - "@lerna/child-process": "5.6.2", - "@octokit/plugin-enterprise-rest": "^6.0.1", - "@octokit/rest": "^19.0.3", - "git-url-parse": "^13.1.0", - "npmlog": "^6.0.2" + "minipass": "^3.1.6", + "minipass-sized": "^1.0.3", + "minizlib": "^2.1.2" }, "engines": { - "node": "^14.15.0 || >=16.0.0" + "node": "^12.13.0 || ^14.15.0 || >=16.0.0" + }, + "optionalDependencies": { + "encoding": "^0.1.13" } }, - "node_modules/@lerna/github-client/node_modules/are-we-there-yet": { - "version": "3.0.1", + "node_modules/@lerna/npm-dist-tag/node_modules/npm-registry-fetch": { + "version": "13.3.1", "dev": true, "license": "ISC", "dependencies": { - "delegates": "^1.0.0", - "readable-stream": "^3.6.0" + "make-fetch-happen": "^10.0.6", + "minipass": "^3.1.6", + "minipass-fetch": "^2.0.3", + "minipass-json-stream": "^1.0.1", + "minizlib": "^2.1.2", + "npm-package-arg": "^9.0.1", + "proc-log": "^2.0.0" }, "engines": { "node": "^12.13.0 || ^14.15.0 || >=16.0.0" } }, - "node_modules/@lerna/github-client/node_modules/gauge": { - "version": "4.0.4", + "node_modules/@lerna/npm-dist-tag/node_modules/npm-registry-fetch/node_modules/npm-package-arg": { + "version": "9.1.2", "dev": true, "license": "ISC", "dependencies": { - "aproba": "^1.0.3 || ^2.0.0", - "color-support": "^1.1.3", - "console-control-strings": "^1.1.0", - "has-unicode": "^2.0.1", - "signal-exit": "^3.0.7", - "string-width": "^4.2.3", - "strip-ansi": "^6.0.1", - "wide-align": "^1.1.5" + "hosted-git-info": "^5.0.0", + "proc-log": "^2.0.1", + "semver": "^7.3.5", + "validate-npm-package-name": "^4.0.0" }, "engines": { "node": "^12.13.0 || ^14.15.0 || >=16.0.0" } }, - "node_modules/@lerna/github-client/node_modules/npmlog": { - "version": "6.0.2", + "node_modules/@lerna/npm-dist-tag/node_modules/validate-npm-package-name": { + "version": "4.0.0", "dev": true, "license": "ISC", "dependencies": { - "are-we-there-yet": "^3.0.0", - "console-control-strings": "^1.1.0", - "gauge": "^4.0.3", - "set-blocking": "^2.0.0" + "builtins": "^5.0.0" }, "engines": { "node": "^12.13.0 || ^14.15.0 || >=16.0.0" } }, - "node_modules/@lerna/github-client/node_modules/readable-stream": { - "version": "3.6.0", + "node_modules/@lerna/npm-install": { + "version": "5.6.2", "dev": true, "license": "MIT", "dependencies": { - "inherits": "^2.0.3", - "string_decoder": "^1.1.1", - "util-deprecate": "^1.0.1" + "@lerna/child-process": "5.6.2", + "@lerna/get-npm-exec-opts": "5.6.2", + "fs-extra": "^9.1.0", + "npm-package-arg": "8.1.1", + "npmlog": "^6.0.2", + "signal-exit": "^3.0.3", + "write-pkg": "^4.0.0" }, "engines": { - "node": ">= 6" + "node": "^14.15.0 || >=16.0.0" } }, - "node_modules/@lerna/gitlab-client": { - "version": "5.6.2", + "node_modules/@lerna/npm-install/node_modules/fs-extra": { + "version": "9.1.0", "dev": true, "license": "MIT", "dependencies": { - "node-fetch": "^2.6.1", - "npmlog": "^6.0.2" + "at-least-node": "^1.0.0", + "graceful-fs": "^4.2.0", + "jsonfile": "^6.0.1", + "universalify": "^2.0.0" }, "engines": { - "node": "^14.15.0 || >=16.0.0" + "node": ">=10" } }, - "node_modules/@lerna/gitlab-client/node_modules/are-we-there-yet": { - "version": "3.0.1", + "node_modules/@lerna/npm-install/node_modules/jsonfile": { + "version": "6.1.0", "dev": true, - "license": "ISC", + "license": "MIT", "dependencies": { - "delegates": "^1.0.0", - "readable-stream": "^3.6.0" + "universalify": "^2.0.0" }, - "engines": { - "node": "^12.13.0 || ^14.15.0 || >=16.0.0" + "optionalDependencies": { + "graceful-fs": "^4.1.6" } }, - "node_modules/@lerna/gitlab-client/node_modules/gauge": { - "version": "4.0.4", + "node_modules/@lerna/npm-publish": { + "version": "5.6.2", "dev": true, - "license": "ISC", + "license": "MIT", "dependencies": { - "aproba": "^1.0.3 || ^2.0.0", - "color-support": "^1.1.3", - "console-control-strings": "^1.1.0", - "has-unicode": "^2.0.1", - "signal-exit": "^3.0.7", - "string-width": "^4.2.3", - "strip-ansi": "^6.0.1", - "wide-align": "^1.1.5" + "@lerna/otplease": "5.6.2", + "@lerna/run-lifecycle": "5.6.2", + "fs-extra": "^9.1.0", + "libnpmpublish": "^6.0.4", + "npm-package-arg": "8.1.1", + "npmlog": "^6.0.2", + "pify": "^5.0.0", + "read-package-json": "^5.0.1" }, "engines": { - "node": "^12.13.0 || ^14.15.0 || >=16.0.0" + "node": "^14.15.0 || >=16.0.0" } }, - "node_modules/@lerna/gitlab-client/node_modules/npmlog": { - "version": "6.0.2", + "node_modules/@lerna/npm-publish/node_modules/fs-extra": { + "version": "9.1.0", "dev": true, - "license": "ISC", + "license": "MIT", "dependencies": { - "are-we-there-yet": "^3.0.0", - "console-control-strings": "^1.1.0", - "gauge": "^4.0.3", - "set-blocking": "^2.0.0" + "at-least-node": "^1.0.0", + "graceful-fs": "^4.2.0", + "jsonfile": "^6.0.1", + "universalify": "^2.0.0" }, "engines": { - "node": "^12.13.0 || ^14.15.0 || >=16.0.0" + "node": ">=10" } }, - "node_modules/@lerna/gitlab-client/node_modules/readable-stream": { - "version": "3.6.0", + "node_modules/@lerna/npm-publish/node_modules/jsonfile": { + "version": "6.1.0", "dev": true, "license": "MIT", "dependencies": { - "inherits": "^2.0.3", - "string_decoder": "^1.1.1", - "util-deprecate": "^1.0.1" + "universalify": "^2.0.0" + }, + "optionalDependencies": { + "graceful-fs": "^4.1.6" + } + }, + "node_modules/@lerna/npm-run-script": { + "version": "5.6.2", + "dev": true, + "license": "MIT", + "dependencies": { + "@lerna/child-process": "5.6.2", + "@lerna/get-npm-exec-opts": "5.6.2", + "npmlog": "^6.0.2" }, "engines": { - "node": ">= 6" + "node": "^14.15.0 || >=16.0.0" } }, - "node_modules/@lerna/global-options": { + "node_modules/@lerna/otplease": { "version": "5.6.2", "dev": true, "license": "MIT", + "dependencies": { + "@lerna/prompt": "5.6.2" + }, "engines": { "node": "^14.15.0 || >=16.0.0" } }, - "node_modules/@lerna/has-npm-version": { + "node_modules/@lerna/output": { "version": "5.6.2", "dev": true, "license": "MIT", "dependencies": { - "@lerna/child-process": "5.6.2", - "semver": "^7.3.4" + "npmlog": "^6.0.2" }, "engines": { "node": "^14.15.0 || >=16.0.0" } }, - "node_modules/@lerna/import": { + "node_modules/@lerna/pack-directory": { "version": "5.6.2", "dev": true, "license": "MIT", "dependencies": { - "@lerna/child-process": "5.6.2", - "@lerna/command": "5.6.2", - "@lerna/prompt": "5.6.2", - "@lerna/pulse-till-done": "5.6.2", - "@lerna/validation-error": "5.6.2", - "dedent": "^0.7.0", - "fs-extra": "^9.1.0", - "p-map-series": "^2.1.0" + "@lerna/get-packed": "5.6.2", + "@lerna/package": "5.6.2", + "@lerna/run-lifecycle": "5.6.2", + "@lerna/temp-write": "5.6.2", + "npm-packlist": "^5.1.1", + "npmlog": "^6.0.2", + "tar": "^6.1.0" }, "engines": { "node": "^14.15.0 || >=16.0.0" } }, - "node_modules/@lerna/import/node_modules/fs-extra": { - "version": "9.1.0", + "node_modules/@lerna/package": { + "version": "5.6.2", "dev": true, "license": "MIT", "dependencies": { - "at-least-node": "^1.0.0", - "graceful-fs": "^4.2.0", - "jsonfile": "^6.0.1", - "universalify": "^2.0.0" + "load-json-file": "^6.2.0", + "npm-package-arg": "8.1.1", + "write-pkg": "^4.0.0" }, "engines": { - "node": ">=10" + "node": "^14.15.0 || >=16.0.0" } }, - "node_modules/@lerna/import/node_modules/jsonfile": { - "version": "6.1.0", + "node_modules/@lerna/package-graph": { + "version": "5.6.2", "dev": true, "license": "MIT", "dependencies": { - "universalify": "^2.0.0" + "@lerna/prerelease-id-from-version": "5.6.2", + "@lerna/validation-error": "5.6.2", + "npm-package-arg": "8.1.1", + "npmlog": "^6.0.2", + "semver": "^7.3.4" }, - "optionalDependencies": { - "graceful-fs": "^4.1.6" + "engines": { + "node": "^14.15.0 || >=16.0.0" } }, - "node_modules/@lerna/info": { + "node_modules/@lerna/prerelease-id-from-version": { "version": "5.6.2", "dev": true, "license": "MIT", "dependencies": { - "@lerna/command": "5.6.2", - "@lerna/output": "5.6.2", - "envinfo": "^7.7.4" + "semver": "^7.3.4" }, "engines": { "node": "^14.15.0 || >=16.0.0" } }, - "node_modules/@lerna/init": { + "node_modules/@lerna/profiler": { "version": "5.6.2", "dev": true, "license": "MIT", "dependencies": { - "@lerna/child-process": "5.6.2", - "@lerna/command": "5.6.2", - "@lerna/project": "5.6.2", "fs-extra": "^9.1.0", - "p-map": "^4.0.0", - "write-json-file": "^4.3.0" + "npmlog": "^6.0.2", + "upath": "^2.0.1" }, "engines": { "node": "^14.15.0 || >=16.0.0" } }, - "node_modules/@lerna/init/node_modules/fs-extra": { + "node_modules/@lerna/profiler/node_modules/fs-extra": { "version": "9.1.0", "dev": true, "license": "MIT", @@ -3536,7 +3104,7 @@ "node": ">=10" } }, - "node_modules/@lerna/init/node_modules/jsonfile": { + "node_modules/@lerna/profiler/node_modules/jsonfile": { "version": "6.1.0", "dev": true, "license": "MIT", @@ -3547,196 +3115,171 @@ "graceful-fs": "^4.1.6" } }, - "node_modules/@lerna/link": { + "node_modules/@lerna/profiler/node_modules/upath": { + "version": "2.0.1", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=4", + "yarn": "*" + } + }, + "node_modules/@lerna/project": { "version": "5.6.2", "dev": true, "license": "MIT", "dependencies": { - "@lerna/command": "5.6.2", - "@lerna/package-graph": "5.6.2", - "@lerna/symlink-dependencies": "5.6.2", + "@lerna/package": "5.6.2", "@lerna/validation-error": "5.6.2", + "cosmiconfig": "^7.0.0", + "dedent": "^0.7.0", + "dot-prop": "^6.0.1", + "glob-parent": "^5.1.1", + "globby": "^11.0.2", + "js-yaml": "^4.1.0", + "load-json-file": "^6.2.0", + "npmlog": "^6.0.2", "p-map": "^4.0.0", - "slash": "^3.0.0" + "resolve-from": "^5.0.0", + "write-json-file": "^4.3.0" }, "engines": { "node": "^14.15.0 || >=16.0.0" } }, - "node_modules/@lerna/list": { - "version": "5.6.2", + "node_modules/@lerna/project/node_modules/resolve-from": { + "version": "5.0.0", "dev": true, "license": "MIT", - "dependencies": { - "@lerna/command": "5.6.2", - "@lerna/filter-options": "5.6.2", - "@lerna/listable": "5.6.2", - "@lerna/output": "5.6.2" - }, "engines": { - "node": "^14.15.0 || >=16.0.0" + "node": ">=8" } }, - "node_modules/@lerna/listable": { + "node_modules/@lerna/prompt": { "version": "5.6.2", "dev": true, "license": "MIT", "dependencies": { - "@lerna/query-graph": "5.6.2", - "chalk": "^4.1.0", - "columnify": "^1.6.0" + "inquirer": "^8.2.4", + "npmlog": "^6.0.2" }, "engines": { "node": "^14.15.0 || >=16.0.0" } }, - "node_modules/@lerna/log-packed": { + "node_modules/@lerna/publish": { "version": "5.6.2", "dev": true, "license": "MIT", "dependencies": { - "byte-size": "^7.0.0", - "columnify": "^1.6.0", - "has-unicode": "^2.0.1", - "npmlog": "^6.0.2" + "@lerna/check-working-tree": "5.6.2", + "@lerna/child-process": "5.6.2", + "@lerna/collect-updates": "5.6.2", + "@lerna/command": "5.6.2", + "@lerna/describe-ref": "5.6.2", + "@lerna/log-packed": "5.6.2", + "@lerna/npm-conf": "5.6.2", + "@lerna/npm-dist-tag": "5.6.2", + "@lerna/npm-publish": "5.6.2", + "@lerna/otplease": "5.6.2", + "@lerna/output": "5.6.2", + "@lerna/pack-directory": "5.6.2", + "@lerna/prerelease-id-from-version": "5.6.2", + "@lerna/prompt": "5.6.2", + "@lerna/pulse-till-done": "5.6.2", + "@lerna/run-lifecycle": "5.6.2", + "@lerna/run-topologically": "5.6.2", + "@lerna/validation-error": "5.6.2", + "@lerna/version": "5.6.2", + "fs-extra": "^9.1.0", + "libnpmaccess": "^6.0.3", + "npm-package-arg": "8.1.1", + "npm-registry-fetch": "^13.3.0", + "npmlog": "^6.0.2", + "p-map": "^4.0.0", + "p-pipe": "^3.1.0", + "pacote": "^13.6.1", + "semver": "^7.3.4" }, "engines": { "node": "^14.15.0 || >=16.0.0" } }, - "node_modules/@lerna/log-packed/node_modules/are-we-there-yet": { - "version": "3.0.1", + "node_modules/@lerna/publish/node_modules/@npmcli/git": { + "version": "3.0.2", "dev": true, "license": "ISC", "dependencies": { - "delegates": "^1.0.0", - "readable-stream": "^3.6.0" + "@npmcli/promise-spawn": "^3.0.0", + "lru-cache": "^7.4.4", + "mkdirp": "^1.0.4", + "npm-pick-manifest": "^7.0.0", + "proc-log": "^2.0.0", + "promise-inflight": "^1.0.1", + "promise-retry": "^2.0.1", + "semver": "^7.3.5", + "which": "^2.0.2" }, "engines": { "node": "^12.13.0 || ^14.15.0 || >=16.0.0" } }, - "node_modules/@lerna/log-packed/node_modules/gauge": { - "version": "4.0.4", + "node_modules/@lerna/publish/node_modules/@npmcli/promise-spawn": { + "version": "3.0.0", "dev": true, "license": "ISC", "dependencies": { - "aproba": "^1.0.3 || ^2.0.0", - "color-support": "^1.1.3", - "console-control-strings": "^1.1.0", - "has-unicode": "^2.0.1", - "signal-exit": "^3.0.7", - "string-width": "^4.2.3", - "strip-ansi": "^6.0.1", - "wide-align": "^1.1.5" + "infer-owner": "^1.0.4" }, "engines": { "node": "^12.13.0 || ^14.15.0 || >=16.0.0" } }, - "node_modules/@lerna/log-packed/node_modules/npmlog": { - "version": "6.0.2", + "node_modules/@lerna/publish/node_modules/builtins": { + "version": "5.0.1", "dev": true, - "license": "ISC", + "license": "MIT", "dependencies": { - "are-we-there-yet": "^3.0.0", - "console-control-strings": "^1.1.0", - "gauge": "^4.0.3", - "set-blocking": "^2.0.0" - }, - "engines": { - "node": "^12.13.0 || ^14.15.0 || >=16.0.0" + "semver": "^7.0.0" } }, - "node_modules/@lerna/log-packed/node_modules/readable-stream": { - "version": "3.6.0", + "node_modules/@lerna/publish/node_modules/fs-extra": { + "version": "9.1.0", "dev": true, "license": "MIT", "dependencies": { - "inherits": "^2.0.3", - "string_decoder": "^1.1.1", - "util-deprecate": "^1.0.1" + "at-least-node": "^1.0.0", + "graceful-fs": "^4.2.0", + "jsonfile": "^6.0.1", + "universalify": "^2.0.0" }, "engines": { - "node": ">= 6" + "node": ">=10" } }, - "node_modules/@lerna/npm-conf": { - "version": "5.6.2", - "dev": true, - "license": "MIT", - "dependencies": { - "config-chain": "^1.1.12", - "pify": "^5.0.0" - }, - "engines": { - "node": "^14.15.0 || >=16.0.0" - } - }, - "node_modules/@lerna/npm-dist-tag": { - "version": "5.6.2", - "dev": true, - "license": "MIT", - "dependencies": { - "@lerna/otplease": "5.6.2", - "npm-package-arg": "8.1.1", - "npm-registry-fetch": "^13.3.0", - "npmlog": "^6.0.2" - }, - "engines": { - "node": "^14.15.0 || >=16.0.0" - } - }, - "node_modules/@lerna/npm-dist-tag/node_modules/are-we-there-yet": { - "version": "3.0.1", + "node_modules/@lerna/publish/node_modules/hosted-git-info": { + "version": "5.1.0", "dev": true, "license": "ISC", "dependencies": { - "delegates": "^1.0.0", - "readable-stream": "^3.6.0" + "lru-cache": "^7.5.1" }, "engines": { "node": "^12.13.0 || ^14.15.0 || >=16.0.0" } }, - "node_modules/@lerna/npm-dist-tag/node_modules/builtins": { - "version": "5.0.1", + "node_modules/@lerna/publish/node_modules/jsonfile": { + "version": "6.1.0", "dev": true, "license": "MIT", "dependencies": { - "semver": "^7.0.0" - } - }, - "node_modules/@lerna/npm-dist-tag/node_modules/gauge": { - "version": "4.0.4", - "dev": true, - "license": "ISC", - "dependencies": { - "aproba": "^1.0.3 || ^2.0.0", - "color-support": "^1.1.3", - "console-control-strings": "^1.1.0", - "has-unicode": "^2.0.1", - "signal-exit": "^3.0.7", - "string-width": "^4.2.3", - "strip-ansi": "^6.0.1", - "wide-align": "^1.1.5" - }, - "engines": { - "node": "^12.13.0 || ^14.15.0 || >=16.0.0" - } - }, - "node_modules/@lerna/npm-dist-tag/node_modules/hosted-git-info": { - "version": "5.1.0", - "dev": true, - "license": "ISC", - "dependencies": { - "lru-cache": "^7.5.1" + "universalify": "^2.0.0" }, - "engines": { - "node": "^12.13.0 || ^14.15.0 || >=16.0.0" + "optionalDependencies": { + "graceful-fs": "^4.1.6" } }, - "node_modules/@lerna/npm-dist-tag/node_modules/lru-cache": { + "node_modules/@lerna/publish/node_modules/lru-cache": { "version": "7.14.0", "dev": true, "license": "ISC", @@ -3744,7 +3287,7 @@ "node": ">=12" } }, - "node_modules/@lerna/npm-dist-tag/node_modules/minipass-fetch": { + "node_modules/@lerna/publish/node_modules/minipass-fetch": { "version": "2.1.2", "dev": true, "license": "MIT", @@ -3760,7 +3303,7 @@ "encoding": "^0.1.13" } }, - "node_modules/@lerna/npm-dist-tag/node_modules/npm-registry-fetch": { + "node_modules/@lerna/publish/node_modules/npm-registry-fetch": { "version": "13.3.1", "dev": true, "license": "ISC", @@ -3777,7 +3320,7 @@ "node": "^12.13.0 || ^14.15.0 || >=16.0.0" } }, - "node_modules/@lerna/npm-dist-tag/node_modules/npm-registry-fetch/node_modules/npm-package-arg": { + "node_modules/@lerna/publish/node_modules/npm-registry-fetch/node_modules/npm-package-arg": { "version": "9.1.2", "dev": true, "license": "ISC", @@ -3791,34 +3334,69 @@ "node": "^12.13.0 || ^14.15.0 || >=16.0.0" } }, - "node_modules/@lerna/npm-dist-tag/node_modules/npmlog": { - "version": "6.0.2", + "node_modules/@lerna/publish/node_modules/pacote": { + "version": "13.6.2", "dev": true, "license": "ISC", "dependencies": { - "are-we-there-yet": "^3.0.0", - "console-control-strings": "^1.1.0", - "gauge": "^4.0.3", - "set-blocking": "^2.0.0" + "@npmcli/git": "^3.0.0", + "@npmcli/installed-package-contents": "^1.0.7", + "@npmcli/promise-spawn": "^3.0.0", + "@npmcli/run-script": "^4.1.0", + "cacache": "^16.0.0", + "chownr": "^2.0.0", + "fs-minipass": "^2.1.0", + "infer-owner": "^1.0.4", + "minipass": "^3.1.6", + "mkdirp": "^1.0.4", + "npm-package-arg": "^9.0.0", + "npm-packlist": "^5.1.0", + "npm-pick-manifest": "^7.0.0", + "npm-registry-fetch": "^13.0.1", + "proc-log": "^2.0.0", + "promise-retry": "^2.0.1", + "read-package-json": "^5.0.0", + "read-package-json-fast": "^2.0.3", + "rimraf": "^3.0.2", + "ssri": "^9.0.0", + "tar": "^6.1.11" + }, + "bin": { + "pacote": "lib/bin.js" }, "engines": { "node": "^12.13.0 || ^14.15.0 || >=16.0.0" } }, - "node_modules/@lerna/npm-dist-tag/node_modules/readable-stream": { - "version": "3.6.0", + "node_modules/@lerna/publish/node_modules/pacote/node_modules/npm-package-arg": { + "version": "9.1.2", "dev": true, - "license": "MIT", + "license": "ISC", "dependencies": { - "inherits": "^2.0.3", - "string_decoder": "^1.1.1", - "util-deprecate": "^1.0.1" + "hosted-git-info": "^5.0.0", + "proc-log": "^2.0.1", + "semver": "^7.3.5", + "validate-npm-package-name": "^4.0.0" }, "engines": { - "node": ">= 6" + "node": "^12.13.0 || ^14.15.0 || >=16.0.0" } }, - "node_modules/@lerna/npm-dist-tag/node_modules/validate-npm-package-name": { + "node_modules/@lerna/publish/node_modules/rimraf": { + "version": "3.0.2", + "dev": true, + "license": "ISC", + "dependencies": { + "glob": "^7.1.3" + }, + "bin": { + "rimraf": "bin.js" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + } + }, + "node_modules/@lerna/publish/node_modules/validate-npm-package-name": { "version": "4.0.0", "dev": true, "license": "ISC", @@ -3829,36 +3407,42 @@ "node": "^12.13.0 || ^14.15.0 || >=16.0.0" } }, - "node_modules/@lerna/npm-install": { + "node_modules/@lerna/pulse-till-done": { "version": "5.6.2", "dev": true, "license": "MIT", "dependencies": { - "@lerna/child-process": "5.6.2", - "@lerna/get-npm-exec-opts": "5.6.2", - "fs-extra": "^9.1.0", - "npm-package-arg": "8.1.1", - "npmlog": "^6.0.2", - "signal-exit": "^3.0.3", - "write-pkg": "^4.0.0" + "npmlog": "^6.0.2" }, "engines": { "node": "^14.15.0 || >=16.0.0" } }, - "node_modules/@lerna/npm-install/node_modules/are-we-there-yet": { - "version": "3.0.1", + "node_modules/@lerna/query-graph": { + "version": "5.6.2", "dev": true, - "license": "ISC", + "license": "MIT", "dependencies": { - "delegates": "^1.0.0", - "readable-stream": "^3.6.0" + "@lerna/package-graph": "5.6.2" }, "engines": { - "node": "^12.13.0 || ^14.15.0 || >=16.0.0" + "node": "^14.15.0 || >=16.0.0" } }, - "node_modules/@lerna/npm-install/node_modules/fs-extra": { + "node_modules/@lerna/resolve-symlink": { + "version": "5.6.2", + "dev": true, + "license": "MIT", + "dependencies": { + "fs-extra": "^9.1.0", + "npmlog": "^6.0.2", + "read-cmd-shim": "^3.0.0" + }, + "engines": { + "node": "^14.15.0 || >=16.0.0" + } + }, + "node_modules/@lerna/resolve-symlink/node_modules/fs-extra": { "version": "9.1.0", "dev": true, "license": "MIT", @@ -3872,93 +3456,92 @@ "node": ">=10" } }, - "node_modules/@lerna/npm-install/node_modules/gauge": { - "version": "4.0.4", + "node_modules/@lerna/resolve-symlink/node_modules/jsonfile": { + "version": "6.1.0", "dev": true, - "license": "ISC", + "license": "MIT", "dependencies": { - "aproba": "^1.0.3 || ^2.0.0", - "color-support": "^1.1.3", - "console-control-strings": "^1.1.0", - "has-unicode": "^2.0.1", - "signal-exit": "^3.0.7", - "string-width": "^4.2.3", - "strip-ansi": "^6.0.1", - "wide-align": "^1.1.5" + "universalify": "^2.0.0" }, - "engines": { - "node": "^12.13.0 || ^14.15.0 || >=16.0.0" + "optionalDependencies": { + "graceful-fs": "^4.1.6" } }, - "node_modules/@lerna/npm-install/node_modules/jsonfile": { - "version": "6.1.0", + "node_modules/@lerna/rimraf-dir": { + "version": "5.6.2", "dev": true, "license": "MIT", "dependencies": { - "universalify": "^2.0.0" + "@lerna/child-process": "5.6.2", + "npmlog": "^6.0.2", + "path-exists": "^4.0.0", + "rimraf": "^3.0.2" }, - "optionalDependencies": { - "graceful-fs": "^4.1.6" + "engines": { + "node": "^14.15.0 || >=16.0.0" } }, - "node_modules/@lerna/npm-install/node_modules/npmlog": { - "version": "6.0.2", + "node_modules/@lerna/rimraf-dir/node_modules/rimraf": { + "version": "3.0.2", "dev": true, "license": "ISC", "dependencies": { - "are-we-there-yet": "^3.0.0", - "console-control-strings": "^1.1.0", - "gauge": "^4.0.3", - "set-blocking": "^2.0.0" + "glob": "^7.1.3" }, - "engines": { - "node": "^12.13.0 || ^14.15.0 || >=16.0.0" + "bin": { + "rimraf": "bin.js" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" } }, - "node_modules/@lerna/npm-install/node_modules/readable-stream": { - "version": "3.6.0", + "node_modules/@lerna/run": { + "version": "5.6.2", "dev": true, "license": "MIT", "dependencies": { - "inherits": "^2.0.3", - "string_decoder": "^1.1.1", - "util-deprecate": "^1.0.1" + "@lerna/command": "5.6.2", + "@lerna/filter-options": "5.6.2", + "@lerna/npm-run-script": "5.6.2", + "@lerna/output": "5.6.2", + "@lerna/profiler": "5.6.2", + "@lerna/run-topologically": "5.6.2", + "@lerna/timer": "5.6.2", + "@lerna/validation-error": "5.6.2", + "fs-extra": "^9.1.0", + "p-map": "^4.0.0" }, "engines": { - "node": ">= 6" + "node": "^14.15.0 || >=16.0.0" } }, - "node_modules/@lerna/npm-publish": { + "node_modules/@lerna/run-lifecycle": { "version": "5.6.2", "dev": true, "license": "MIT", "dependencies": { - "@lerna/otplease": "5.6.2", - "@lerna/run-lifecycle": "5.6.2", - "fs-extra": "^9.1.0", - "libnpmpublish": "^6.0.4", - "npm-package-arg": "8.1.1", + "@lerna/npm-conf": "5.6.2", + "@npmcli/run-script": "^4.1.7", "npmlog": "^6.0.2", - "pify": "^5.0.0", - "read-package-json": "^5.0.1" + "p-queue": "^6.6.2" }, "engines": { "node": "^14.15.0 || >=16.0.0" } }, - "node_modules/@lerna/npm-publish/node_modules/are-we-there-yet": { - "version": "3.0.1", + "node_modules/@lerna/run-topologically": { + "version": "5.6.2", "dev": true, - "license": "ISC", + "license": "MIT", "dependencies": { - "delegates": "^1.0.0", - "readable-stream": "^3.6.0" + "@lerna/query-graph": "5.6.2", + "p-queue": "^6.6.2" }, "engines": { - "node": "^12.13.0 || ^14.15.0 || >=16.0.0" + "node": "^14.15.0 || >=16.0.0" } }, - "node_modules/@lerna/npm-publish/node_modules/fs-extra": { + "node_modules/@lerna/run/node_modules/fs-extra": { "version": "9.1.0", "dev": true, "license": "MIT", @@ -3972,25 +3555,7 @@ "node": ">=10" } }, - "node_modules/@lerna/npm-publish/node_modules/gauge": { - "version": "4.0.4", - "dev": true, - "license": "ISC", - "dependencies": { - "aproba": "^1.0.3 || ^2.0.0", - "color-support": "^1.1.3", - "console-control-strings": "^1.1.0", - "has-unicode": "^2.0.1", - "signal-exit": "^3.0.7", - "string-width": "^4.2.3", - "strip-ansi": "^6.0.1", - "wide-align": "^1.1.5" - }, - "engines": { - "node": "^12.13.0 || ^14.15.0 || >=16.0.0" - } - }, - "node_modules/@lerna/npm-publish/node_modules/jsonfile": { + "node_modules/@lerna/run/node_modules/jsonfile": { "version": "6.1.0", "dev": true, "license": "MIT", @@ -4001,115 +3566,107 @@ "graceful-fs": "^4.1.6" } }, - "node_modules/@lerna/npm-publish/node_modules/npmlog": { - "version": "6.0.2", + "node_modules/@lerna/symlink-binary": { + "version": "5.6.2", "dev": true, - "license": "ISC", + "license": "MIT", "dependencies": { - "are-we-there-yet": "^3.0.0", - "console-control-strings": "^1.1.0", - "gauge": "^4.0.3", - "set-blocking": "^2.0.0" + "@lerna/create-symlink": "5.6.2", + "@lerna/package": "5.6.2", + "fs-extra": "^9.1.0", + "p-map": "^4.0.0" }, "engines": { - "node": "^12.13.0 || ^14.15.0 || >=16.0.0" + "node": "^14.15.0 || >=16.0.0" } }, - "node_modules/@lerna/npm-publish/node_modules/readable-stream": { - "version": "3.6.0", + "node_modules/@lerna/symlink-binary/node_modules/fs-extra": { + "version": "9.1.0", "dev": true, "license": "MIT", "dependencies": { - "inherits": "^2.0.3", - "string_decoder": "^1.1.1", - "util-deprecate": "^1.0.1" + "at-least-node": "^1.0.0", + "graceful-fs": "^4.2.0", + "jsonfile": "^6.0.1", + "universalify": "^2.0.0" }, "engines": { - "node": ">= 6" + "node": ">=10" } }, - "node_modules/@lerna/npm-run-script": { - "version": "5.6.2", + "node_modules/@lerna/symlink-binary/node_modules/jsonfile": { + "version": "6.1.0", "dev": true, "license": "MIT", "dependencies": { - "@lerna/child-process": "5.6.2", - "@lerna/get-npm-exec-opts": "5.6.2", - "npmlog": "^6.0.2" + "universalify": "^2.0.0" }, - "engines": { - "node": "^14.15.0 || >=16.0.0" + "optionalDependencies": { + "graceful-fs": "^4.1.6" } }, - "node_modules/@lerna/npm-run-script/node_modules/are-we-there-yet": { - "version": "3.0.1", + "node_modules/@lerna/symlink-dependencies": { + "version": "5.6.2", "dev": true, - "license": "ISC", + "license": "MIT", "dependencies": { - "delegates": "^1.0.0", - "readable-stream": "^3.6.0" + "@lerna/create-symlink": "5.6.2", + "@lerna/resolve-symlink": "5.6.2", + "@lerna/symlink-binary": "5.6.2", + "fs-extra": "^9.1.0", + "p-map": "^4.0.0", + "p-map-series": "^2.1.0" }, "engines": { - "node": "^12.13.0 || ^14.15.0 || >=16.0.0" + "node": "^14.15.0 || >=16.0.0" } }, - "node_modules/@lerna/npm-run-script/node_modules/gauge": { - "version": "4.0.4", + "node_modules/@lerna/symlink-dependencies/node_modules/fs-extra": { + "version": "9.1.0", "dev": true, - "license": "ISC", + "license": "MIT", "dependencies": { - "aproba": "^1.0.3 || ^2.0.0", - "color-support": "^1.1.3", - "console-control-strings": "^1.1.0", - "has-unicode": "^2.0.1", - "signal-exit": "^3.0.7", - "string-width": "^4.2.3", - "strip-ansi": "^6.0.1", - "wide-align": "^1.1.5" + "at-least-node": "^1.0.0", + "graceful-fs": "^4.2.0", + "jsonfile": "^6.0.1", + "universalify": "^2.0.0" }, "engines": { - "node": "^12.13.0 || ^14.15.0 || >=16.0.0" + "node": ">=10" } }, - "node_modules/@lerna/npm-run-script/node_modules/npmlog": { - "version": "6.0.2", + "node_modules/@lerna/symlink-dependencies/node_modules/jsonfile": { + "version": "6.1.0", "dev": true, - "license": "ISC", + "license": "MIT", "dependencies": { - "are-we-there-yet": "^3.0.0", - "console-control-strings": "^1.1.0", - "gauge": "^4.0.3", - "set-blocking": "^2.0.0" + "universalify": "^2.0.0" }, - "engines": { - "node": "^12.13.0 || ^14.15.0 || >=16.0.0" + "optionalDependencies": { + "graceful-fs": "^4.1.6" } }, - "node_modules/@lerna/npm-run-script/node_modules/readable-stream": { - "version": "3.6.0", + "node_modules/@lerna/temp-write": { + "version": "5.6.2", "dev": true, "license": "MIT", "dependencies": { - "inherits": "^2.0.3", - "string_decoder": "^1.1.1", - "util-deprecate": "^1.0.1" - }, - "engines": { - "node": ">= 6" + "graceful-fs": "^4.1.15", + "is-stream": "^2.0.0", + "make-dir": "^3.0.0", + "temp-dir": "^1.0.0", + "uuid": "^8.3.2" } }, - "node_modules/@lerna/otplease": { + "node_modules/@lerna/timer": { "version": "5.6.2", "dev": true, "license": "MIT", - "dependencies": { - "@lerna/prompt": "5.6.2" - }, "engines": { "node": "^14.15.0 || >=16.0.0" } }, - "node_modules/@lerna/output": { + "node_modules/@lerna/validation-error": { "version": "5.6.2", "dev": true, "license": "MIT", @@ -4120,1596 +3677,168 @@ "node": "^14.15.0 || >=16.0.0" } }, - "node_modules/@lerna/output/node_modules/are-we-there-yet": { - "version": "3.0.1", + "node_modules/@lerna/version": { + "version": "5.6.2", "dev": true, - "license": "ISC", + "license": "MIT", "dependencies": { - "delegates": "^1.0.0", - "readable-stream": "^3.6.0" + "@lerna/check-working-tree": "5.6.2", + "@lerna/child-process": "5.6.2", + "@lerna/collect-updates": "5.6.2", + "@lerna/command": "5.6.2", + "@lerna/conventional-commits": "5.6.2", + "@lerna/github-client": "5.6.2", + "@lerna/gitlab-client": "5.6.2", + "@lerna/output": "5.6.2", + "@lerna/prerelease-id-from-version": "5.6.2", + "@lerna/prompt": "5.6.2", + "@lerna/run-lifecycle": "5.6.2", + "@lerna/run-topologically": "5.6.2", + "@lerna/temp-write": "5.6.2", + "@lerna/validation-error": "5.6.2", + "@nrwl/devkit": ">=14.8.1 < 16", + "chalk": "^4.1.0", + "dedent": "^0.7.0", + "load-json-file": "^6.2.0", + "minimatch": "^3.0.4", + "npmlog": "^6.0.2", + "p-map": "^4.0.0", + "p-pipe": "^3.1.0", + "p-reduce": "^2.1.0", + "p-waterfall": "^2.1.1", + "semver": "^7.3.4", + "slash": "^3.0.0", + "write-json-file": "^4.3.0" }, "engines": { - "node": "^12.13.0 || ^14.15.0 || >=16.0.0" + "node": "^14.15.0 || >=16.0.0" } }, - "node_modules/@lerna/output/node_modules/gauge": { - "version": "4.0.4", + "node_modules/@lerna/write-log-file": { + "version": "5.6.2", "dev": true, - "license": "ISC", + "license": "MIT", "dependencies": { - "aproba": "^1.0.3 || ^2.0.0", - "color-support": "^1.1.3", - "console-control-strings": "^1.1.0", - "has-unicode": "^2.0.1", - "signal-exit": "^3.0.7", - "string-width": "^4.2.3", - "strip-ansi": "^6.0.1", - "wide-align": "^1.1.5" + "npmlog": "^6.0.2", + "write-file-atomic": "^4.0.1" }, "engines": { - "node": "^12.13.0 || ^14.15.0 || >=16.0.0" + "node": "^14.15.0 || >=16.0.0" } }, - "node_modules/@lerna/output/node_modules/npmlog": { - "version": "6.0.2", + "node_modules/@napi-rs/cli": { + "version": "2.16.2", "dev": true, - "license": "ISC", - "dependencies": { - "are-we-there-yet": "^3.0.0", - "console-control-strings": "^1.1.0", - "gauge": "^4.0.3", - "set-blocking": "^2.0.0" + "license": "MIT", + "bin": { + "napi": "scripts/index.js" }, "engines": { - "node": "^12.13.0 || ^14.15.0 || >=16.0.0" + "node": ">= 10" + }, + "funding": { + "type": "github", + "url": "https://github.com/sponsors/Brooooooklyn" } }, - "node_modules/@lerna/output/node_modules/readable-stream": { - "version": "3.6.0", - "dev": true, + "node_modules/@nodelib/fs.scandir": { + "version": "2.1.5", "license": "MIT", "dependencies": { - "inherits": "^2.0.3", - "string_decoder": "^1.1.1", - "util-deprecate": "^1.0.1" + "@nodelib/fs.stat": "2.0.5", + "run-parallel": "^1.1.9" }, "engines": { - "node": ">= 6" + "node": ">= 8" } }, - "node_modules/@lerna/pack-directory": { - "version": "5.6.2", - "dev": true, + "node_modules/@nodelib/fs.stat": { + "version": "2.0.5", + "license": "MIT", + "engines": { + "node": ">= 8" + } + }, + "node_modules/@nodelib/fs.walk": { + "version": "1.2.8", "license": "MIT", "dependencies": { - "@lerna/get-packed": "5.6.2", - "@lerna/package": "5.6.2", - "@lerna/run-lifecycle": "5.6.2", - "@lerna/temp-write": "5.6.2", - "npm-packlist": "^5.1.1", - "npmlog": "^6.0.2", - "tar": "^6.1.0" + "@nodelib/fs.scandir": "2.1.5", + "fastq": "^1.6.0" }, "engines": { - "node": "^14.15.0 || >=16.0.0" + "node": ">= 8" } }, - "node_modules/@lerna/pack-directory/node_modules/are-we-there-yet": { - "version": "3.0.1", - "dev": true, - "license": "ISC", + "node_modules/@npmcli/agent": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/@npmcli/agent/-/agent-2.2.0.tgz", + "integrity": "sha512-2yThA1Es98orMkpSLVqlDZAMPK3jHJhifP2gnNUdk1754uZ8yI5c+ulCoVG+WlntQA6MzhrURMXjSd9Z7dJ2/Q==", "dependencies": { - "delegates": "^1.0.0", - "readable-stream": "^3.6.0" + "agent-base": "^7.1.0", + "http-proxy-agent": "^7.0.0", + "https-proxy-agent": "^7.0.1", + "lru-cache": "^10.0.1", + "socks-proxy-agent": "^8.0.1" }, "engines": { - "node": "^12.13.0 || ^14.15.0 || >=16.0.0" + "node": "^16.14.0 || >=18.0.0" } }, - "node_modules/@lerna/pack-directory/node_modules/gauge": { - "version": "4.0.4", - "dev": true, - "license": "ISC", + "node_modules/@npmcli/agent/node_modules/agent-base": { + "version": "7.1.0", + "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-7.1.0.tgz", + "integrity": "sha512-o/zjMZRhJxny7OyEF+Op8X+efiELC7k7yOjMzgfzVqOzXqkBkWI79YoTdOtsuWd5BWhAGAuOY/Xa6xpiaWXiNg==", "dependencies": { - "aproba": "^1.0.3 || ^2.0.0", - "color-support": "^1.1.3", - "console-control-strings": "^1.1.0", - "has-unicode": "^2.0.1", - "signal-exit": "^3.0.7", - "string-width": "^4.2.3", - "strip-ansi": "^6.0.1", - "wide-align": "^1.1.5" + "debug": "^4.3.4" }, "engines": { - "node": "^12.13.0 || ^14.15.0 || >=16.0.0" + "node": ">= 14" } }, - "node_modules/@lerna/pack-directory/node_modules/npmlog": { - "version": "6.0.2", - "dev": true, - "license": "ISC", - "dependencies": { - "are-we-there-yet": "^3.0.0", - "console-control-strings": "^1.1.0", - "gauge": "^4.0.3", - "set-blocking": "^2.0.0" - }, - "engines": { - "node": "^12.13.0 || ^14.15.0 || >=16.0.0" - } - }, - "node_modules/@lerna/pack-directory/node_modules/readable-stream": { - "version": "3.6.0", - "dev": true, - "license": "MIT", - "dependencies": { - "inherits": "^2.0.3", - "string_decoder": "^1.1.1", - "util-deprecate": "^1.0.1" - }, - "engines": { - "node": ">= 6" - } - }, - "node_modules/@lerna/package": { - "version": "5.6.2", - "dev": true, - "license": "MIT", - "dependencies": { - "load-json-file": "^6.2.0", - "npm-package-arg": "8.1.1", - "write-pkg": "^4.0.0" - }, - "engines": { - "node": "^14.15.0 || >=16.0.0" - } - }, - "node_modules/@lerna/package-graph": { - "version": "5.6.2", - "dev": true, - "license": "MIT", - "dependencies": { - "@lerna/prerelease-id-from-version": "5.6.2", - "@lerna/validation-error": "5.6.2", - "npm-package-arg": "8.1.1", - "npmlog": "^6.0.2", - "semver": "^7.3.4" - }, - "engines": { - "node": "^14.15.0 || >=16.0.0" - } - }, - "node_modules/@lerna/package-graph/node_modules/are-we-there-yet": { - "version": "3.0.1", - "dev": true, - "license": "ISC", - "dependencies": { - "delegates": "^1.0.0", - "readable-stream": "^3.6.0" - }, - "engines": { - "node": "^12.13.0 || ^14.15.0 || >=16.0.0" - } - }, - "node_modules/@lerna/package-graph/node_modules/gauge": { - "version": "4.0.4", - "dev": true, - "license": "ISC", - "dependencies": { - "aproba": "^1.0.3 || ^2.0.0", - "color-support": "^1.1.3", - "console-control-strings": "^1.1.0", - "has-unicode": "^2.0.1", - "signal-exit": "^3.0.7", - "string-width": "^4.2.3", - "strip-ansi": "^6.0.1", - "wide-align": "^1.1.5" - }, - "engines": { - "node": "^12.13.0 || ^14.15.0 || >=16.0.0" - } - }, - "node_modules/@lerna/package-graph/node_modules/npmlog": { - "version": "6.0.2", - "dev": true, - "license": "ISC", - "dependencies": { - "are-we-there-yet": "^3.0.0", - "console-control-strings": "^1.1.0", - "gauge": "^4.0.3", - "set-blocking": "^2.0.0" - }, - "engines": { - "node": "^12.13.0 || ^14.15.0 || >=16.0.0" - } - }, - "node_modules/@lerna/package-graph/node_modules/readable-stream": { - "version": "3.6.0", - "dev": true, - "license": "MIT", - "dependencies": { - "inherits": "^2.0.3", - "string_decoder": "^1.1.1", - "util-deprecate": "^1.0.1" - }, - "engines": { - "node": ">= 6" - } - }, - "node_modules/@lerna/prerelease-id-from-version": { - "version": "5.6.2", - "dev": true, - "license": "MIT", - "dependencies": { - "semver": "^7.3.4" - }, - "engines": { - "node": "^14.15.0 || >=16.0.0" - } - }, - "node_modules/@lerna/profiler": { - "version": "5.6.2", - "dev": true, - "license": "MIT", - "dependencies": { - "fs-extra": "^9.1.0", - "npmlog": "^6.0.2", - "upath": "^2.0.1" - }, - "engines": { - "node": "^14.15.0 || >=16.0.0" - } - }, - "node_modules/@lerna/profiler/node_modules/are-we-there-yet": { - "version": "3.0.1", - "dev": true, - "license": "ISC", - "dependencies": { - "delegates": "^1.0.0", - "readable-stream": "^3.6.0" - }, - "engines": { - "node": "^12.13.0 || ^14.15.0 || >=16.0.0" - } - }, - "node_modules/@lerna/profiler/node_modules/fs-extra": { - "version": "9.1.0", - "dev": true, - "license": "MIT", - "dependencies": { - "at-least-node": "^1.0.0", - "graceful-fs": "^4.2.0", - "jsonfile": "^6.0.1", - "universalify": "^2.0.0" - }, - "engines": { - "node": ">=10" - } - }, - "node_modules/@lerna/profiler/node_modules/gauge": { - "version": "4.0.4", - "dev": true, - "license": "ISC", - "dependencies": { - "aproba": "^1.0.3 || ^2.0.0", - "color-support": "^1.1.3", - "console-control-strings": "^1.1.0", - "has-unicode": "^2.0.1", - "signal-exit": "^3.0.7", - "string-width": "^4.2.3", - "strip-ansi": "^6.0.1", - "wide-align": "^1.1.5" - }, - "engines": { - "node": "^12.13.0 || ^14.15.0 || >=16.0.0" - } - }, - "node_modules/@lerna/profiler/node_modules/jsonfile": { - "version": "6.1.0", - "dev": true, - "license": "MIT", - "dependencies": { - "universalify": "^2.0.0" - }, - "optionalDependencies": { - "graceful-fs": "^4.1.6" - } - }, - "node_modules/@lerna/profiler/node_modules/npmlog": { - "version": "6.0.2", - "dev": true, - "license": "ISC", - "dependencies": { - "are-we-there-yet": "^3.0.0", - "console-control-strings": "^1.1.0", - "gauge": "^4.0.3", - "set-blocking": "^2.0.0" - }, - "engines": { - "node": "^12.13.0 || ^14.15.0 || >=16.0.0" - } - }, - "node_modules/@lerna/profiler/node_modules/readable-stream": { - "version": "3.6.0", - "dev": true, - "license": "MIT", - "dependencies": { - "inherits": "^2.0.3", - "string_decoder": "^1.1.1", - "util-deprecate": "^1.0.1" - }, - "engines": { - "node": ">= 6" - } - }, - "node_modules/@lerna/profiler/node_modules/upath": { - "version": "2.0.1", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=4", - "yarn": "*" - } - }, - "node_modules/@lerna/project": { - "version": "5.6.2", - "dev": true, - "license": "MIT", - "dependencies": { - "@lerna/package": "5.6.2", - "@lerna/validation-error": "5.6.2", - "cosmiconfig": "^7.0.0", - "dedent": "^0.7.0", - "dot-prop": "^6.0.1", - "glob-parent": "^5.1.1", - "globby": "^11.0.2", - "js-yaml": "^4.1.0", - "load-json-file": "^6.2.0", - "npmlog": "^6.0.2", - "p-map": "^4.0.0", - "resolve-from": "^5.0.0", - "write-json-file": "^4.3.0" - }, - "engines": { - "node": "^14.15.0 || >=16.0.0" - } - }, - "node_modules/@lerna/project/node_modules/are-we-there-yet": { - "version": "3.0.1", - "dev": true, - "license": "ISC", - "dependencies": { - "delegates": "^1.0.0", - "readable-stream": "^3.6.0" - }, - "engines": { - "node": "^12.13.0 || ^14.15.0 || >=16.0.0" - } - }, - "node_modules/@lerna/project/node_modules/gauge": { - "version": "4.0.4", - "dev": true, - "license": "ISC", - "dependencies": { - "aproba": "^1.0.3 || ^2.0.0", - "color-support": "^1.1.3", - "console-control-strings": "^1.1.0", - "has-unicode": "^2.0.1", - "signal-exit": "^3.0.7", - "string-width": "^4.2.3", - "strip-ansi": "^6.0.1", - "wide-align": "^1.1.5" - }, - "engines": { - "node": "^12.13.0 || ^14.15.0 || >=16.0.0" - } - }, - "node_modules/@lerna/project/node_modules/npmlog": { - "version": "6.0.2", - "dev": true, - "license": "ISC", - "dependencies": { - "are-we-there-yet": "^3.0.0", - "console-control-strings": "^1.1.0", - "gauge": "^4.0.3", - "set-blocking": "^2.0.0" - }, - "engines": { - "node": "^12.13.0 || ^14.15.0 || >=16.0.0" - } - }, - "node_modules/@lerna/project/node_modules/readable-stream": { - "version": "3.6.0", - "dev": true, - "license": "MIT", - "dependencies": { - "inherits": "^2.0.3", - "string_decoder": "^1.1.1", - "util-deprecate": "^1.0.1" - }, - "engines": { - "node": ">= 6" - } - }, - "node_modules/@lerna/project/node_modules/resolve-from": { - "version": "5.0.0", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=8" - } - }, - "node_modules/@lerna/prompt": { - "version": "5.6.2", - "dev": true, - "license": "MIT", - "dependencies": { - "inquirer": "^8.2.4", - "npmlog": "^6.0.2" - }, - "engines": { - "node": "^14.15.0 || >=16.0.0" - } - }, - "node_modules/@lerna/prompt/node_modules/are-we-there-yet": { - "version": "3.0.1", - "dev": true, - "license": "ISC", - "dependencies": { - "delegates": "^1.0.0", - "readable-stream": "^3.6.0" - }, - "engines": { - "node": "^12.13.0 || ^14.15.0 || >=16.0.0" - } - }, - "node_modules/@lerna/prompt/node_modules/gauge": { - "version": "4.0.4", - "dev": true, - "license": "ISC", - "dependencies": { - "aproba": "^1.0.3 || ^2.0.0", - "color-support": "^1.1.3", - "console-control-strings": "^1.1.0", - "has-unicode": "^2.0.1", - "signal-exit": "^3.0.7", - "string-width": "^4.2.3", - "strip-ansi": "^6.0.1", - "wide-align": "^1.1.5" - }, - "engines": { - "node": "^12.13.0 || ^14.15.0 || >=16.0.0" - } - }, - "node_modules/@lerna/prompt/node_modules/npmlog": { - "version": "6.0.2", - "dev": true, - "license": "ISC", - "dependencies": { - "are-we-there-yet": "^3.0.0", - "console-control-strings": "^1.1.0", - "gauge": "^4.0.3", - "set-blocking": "^2.0.0" - }, - "engines": { - "node": "^12.13.0 || ^14.15.0 || >=16.0.0" - } - }, - "node_modules/@lerna/prompt/node_modules/readable-stream": { - "version": "3.6.0", - "dev": true, - "license": "MIT", - "dependencies": { - "inherits": "^2.0.3", - "string_decoder": "^1.1.1", - "util-deprecate": "^1.0.1" - }, - "engines": { - "node": ">= 6" - } - }, - "node_modules/@lerna/publish": { - "version": "5.6.2", - "dev": true, - "license": "MIT", - "dependencies": { - "@lerna/check-working-tree": "5.6.2", - "@lerna/child-process": "5.6.2", - "@lerna/collect-updates": "5.6.2", - "@lerna/command": "5.6.2", - "@lerna/describe-ref": "5.6.2", - "@lerna/log-packed": "5.6.2", - "@lerna/npm-conf": "5.6.2", - "@lerna/npm-dist-tag": "5.6.2", - "@lerna/npm-publish": "5.6.2", - "@lerna/otplease": "5.6.2", - "@lerna/output": "5.6.2", - "@lerna/pack-directory": "5.6.2", - "@lerna/prerelease-id-from-version": "5.6.2", - "@lerna/prompt": "5.6.2", - "@lerna/pulse-till-done": "5.6.2", - "@lerna/run-lifecycle": "5.6.2", - "@lerna/run-topologically": "5.6.2", - "@lerna/validation-error": "5.6.2", - "@lerna/version": "5.6.2", - "fs-extra": "^9.1.0", - "libnpmaccess": "^6.0.3", - "npm-package-arg": "8.1.1", - "npm-registry-fetch": "^13.3.0", - "npmlog": "^6.0.2", - "p-map": "^4.0.0", - "p-pipe": "^3.1.0", - "pacote": "^13.6.1", - "semver": "^7.3.4" - }, - "engines": { - "node": "^14.15.0 || >=16.0.0" - } - }, - "node_modules/@lerna/publish/node_modules/@npmcli/git": { - "version": "3.0.2", - "dev": true, - "license": "ISC", - "dependencies": { - "@npmcli/promise-spawn": "^3.0.0", - "lru-cache": "^7.4.4", - "mkdirp": "^1.0.4", - "npm-pick-manifest": "^7.0.0", - "proc-log": "^2.0.0", - "promise-inflight": "^1.0.1", - "promise-retry": "^2.0.1", - "semver": "^7.3.5", - "which": "^2.0.2" - }, - "engines": { - "node": "^12.13.0 || ^14.15.0 || >=16.0.0" - } - }, - "node_modules/@lerna/publish/node_modules/@npmcli/promise-spawn": { - "version": "3.0.0", - "dev": true, - "license": "ISC", - "dependencies": { - "infer-owner": "^1.0.4" - }, - "engines": { - "node": "^12.13.0 || ^14.15.0 || >=16.0.0" - } - }, - "node_modules/@lerna/publish/node_modules/are-we-there-yet": { - "version": "3.0.1", - "dev": true, - "license": "ISC", - "dependencies": { - "delegates": "^1.0.0", - "readable-stream": "^3.6.0" - }, - "engines": { - "node": "^12.13.0 || ^14.15.0 || >=16.0.0" - } - }, - "node_modules/@lerna/publish/node_modules/builtins": { - "version": "5.0.1", - "dev": true, - "license": "MIT", - "dependencies": { - "semver": "^7.0.0" - } - }, - "node_modules/@lerna/publish/node_modules/chownr": { - "version": "2.0.0", - "dev": true, - "license": "ISC", - "engines": { - "node": ">=10" - } - }, - "node_modules/@lerna/publish/node_modules/err-code": { - "version": "2.0.3", - "dev": true, - "license": "MIT" - }, - "node_modules/@lerna/publish/node_modules/fs-extra": { - "version": "9.1.0", - "dev": true, - "license": "MIT", - "dependencies": { - "at-least-node": "^1.0.0", - "graceful-fs": "^4.2.0", - "jsonfile": "^6.0.1", - "universalify": "^2.0.0" - }, - "engines": { - "node": ">=10" - } - }, - "node_modules/@lerna/publish/node_modules/gauge": { - "version": "4.0.4", - "dev": true, - "license": "ISC", - "dependencies": { - "aproba": "^1.0.3 || ^2.0.0", - "color-support": "^1.1.3", - "console-control-strings": "^1.1.0", - "has-unicode": "^2.0.1", - "signal-exit": "^3.0.7", - "string-width": "^4.2.3", - "strip-ansi": "^6.0.1", - "wide-align": "^1.1.5" - }, - "engines": { - "node": "^12.13.0 || ^14.15.0 || >=16.0.0" - } - }, - "node_modules/@lerna/publish/node_modules/hosted-git-info": { - "version": "5.1.0", - "dev": true, - "license": "ISC", - "dependencies": { - "lru-cache": "^7.5.1" - }, - "engines": { - "node": "^12.13.0 || ^14.15.0 || >=16.0.0" - } - }, - "node_modules/@lerna/publish/node_modules/jsonfile": { - "version": "6.1.0", - "dev": true, - "license": "MIT", - "dependencies": { - "universalify": "^2.0.0" - }, - "optionalDependencies": { - "graceful-fs": "^4.1.6" - } - }, - "node_modules/@lerna/publish/node_modules/lru-cache": { - "version": "7.14.0", - "dev": true, - "license": "ISC", - "engines": { - "node": ">=12" - } - }, - "node_modules/@lerna/publish/node_modules/minipass-fetch": { - "version": "2.1.2", - "dev": true, - "license": "MIT", - "dependencies": { - "minipass": "^3.1.6", - "minipass-sized": "^1.0.3", - "minizlib": "^2.1.2" - }, - "engines": { - "node": "^12.13.0 || ^14.15.0 || >=16.0.0" - }, - "optionalDependencies": { - "encoding": "^0.1.13" - } - }, - "node_modules/@lerna/publish/node_modules/npm-registry-fetch": { - "version": "13.3.1", - "dev": true, - "license": "ISC", - "dependencies": { - "make-fetch-happen": "^10.0.6", - "minipass": "^3.1.6", - "minipass-fetch": "^2.0.3", - "minipass-json-stream": "^1.0.1", - "minizlib": "^2.1.2", - "npm-package-arg": "^9.0.1", - "proc-log": "^2.0.0" - }, - "engines": { - "node": "^12.13.0 || ^14.15.0 || >=16.0.0" - } - }, - "node_modules/@lerna/publish/node_modules/npm-registry-fetch/node_modules/npm-package-arg": { - "version": "9.1.2", - "dev": true, - "license": "ISC", - "dependencies": { - "hosted-git-info": "^5.0.0", - "proc-log": "^2.0.1", - "semver": "^7.3.5", - "validate-npm-package-name": "^4.0.0" - }, - "engines": { - "node": "^12.13.0 || ^14.15.0 || >=16.0.0" - } - }, - "node_modules/@lerna/publish/node_modules/npmlog": { - "version": "6.0.2", - "dev": true, - "license": "ISC", - "dependencies": { - "are-we-there-yet": "^3.0.0", - "console-control-strings": "^1.1.0", - "gauge": "^4.0.3", - "set-blocking": "^2.0.0" - }, - "engines": { - "node": "^12.13.0 || ^14.15.0 || >=16.0.0" - } - }, - "node_modules/@lerna/publish/node_modules/pacote": { - "version": "13.6.2", - "dev": true, - "license": "ISC", - "dependencies": { - "@npmcli/git": "^3.0.0", - "@npmcli/installed-package-contents": "^1.0.7", - "@npmcli/promise-spawn": "^3.0.0", - "@npmcli/run-script": "^4.1.0", - "cacache": "^16.0.0", - "chownr": "^2.0.0", - "fs-minipass": "^2.1.0", - "infer-owner": "^1.0.4", - "minipass": "^3.1.6", - "mkdirp": "^1.0.4", - "npm-package-arg": "^9.0.0", - "npm-packlist": "^5.1.0", - "npm-pick-manifest": "^7.0.0", - "npm-registry-fetch": "^13.0.1", - "proc-log": "^2.0.0", - "promise-retry": "^2.0.1", - "read-package-json": "^5.0.0", - "read-package-json-fast": "^2.0.3", - "rimraf": "^3.0.2", - "ssri": "^9.0.0", - "tar": "^6.1.11" - }, - "bin": { - "pacote": "lib/bin.js" - }, - "engines": { - "node": "^12.13.0 || ^14.15.0 || >=16.0.0" - } - }, - "node_modules/@lerna/publish/node_modules/pacote/node_modules/npm-package-arg": { - "version": "9.1.2", - "dev": true, - "license": "ISC", - "dependencies": { - "hosted-git-info": "^5.0.0", - "proc-log": "^2.0.1", - "semver": "^7.3.5", - "validate-npm-package-name": "^4.0.0" - }, - "engines": { - "node": "^12.13.0 || ^14.15.0 || >=16.0.0" - } - }, - "node_modules/@lerna/publish/node_modules/promise-retry": { - "version": "2.0.1", - "dev": true, - "license": "MIT", - "dependencies": { - "err-code": "^2.0.2", - "retry": "^0.12.0" - }, - "engines": { - "node": ">=10" - } - }, - "node_modules/@lerna/publish/node_modules/read-package-json-fast": { - "version": "2.0.3", - "dev": true, - "license": "ISC", - "dependencies": { - "json-parse-even-better-errors": "^2.3.0", - "npm-normalize-package-bin": "^1.0.1" - }, - "engines": { - "node": ">=10" - } - }, - "node_modules/@lerna/publish/node_modules/readable-stream": { - "version": "3.6.0", - "dev": true, - "license": "MIT", - "dependencies": { - "inherits": "^2.0.3", - "string_decoder": "^1.1.1", - "util-deprecate": "^1.0.1" - }, - "engines": { - "node": ">= 6" - } - }, - "node_modules/@lerna/publish/node_modules/retry": { - "version": "0.12.0", - "dev": true, - "license": "MIT", - "engines": { - "node": ">= 4" - } - }, - "node_modules/@lerna/publish/node_modules/rimraf": { - "version": "3.0.2", - "dev": true, - "license": "ISC", - "dependencies": { - "glob": "^7.1.3" - }, - "bin": { - "rimraf": "bin.js" - }, - "funding": { - "url": "https://github.com/sponsors/isaacs" - } - }, - "node_modules/@lerna/publish/node_modules/validate-npm-package-name": { - "version": "4.0.0", - "dev": true, - "license": "ISC", - "dependencies": { - "builtins": "^5.0.0" - }, - "engines": { - "node": "^12.13.0 || ^14.15.0 || >=16.0.0" - } - }, - "node_modules/@lerna/pulse-till-done": { - "version": "5.6.2", - "dev": true, - "license": "MIT", - "dependencies": { - "npmlog": "^6.0.2" - }, - "engines": { - "node": "^14.15.0 || >=16.0.0" - } - }, - "node_modules/@lerna/pulse-till-done/node_modules/are-we-there-yet": { - "version": "3.0.1", - "dev": true, - "license": "ISC", - "dependencies": { - "delegates": "^1.0.0", - "readable-stream": "^3.6.0" - }, - "engines": { - "node": "^12.13.0 || ^14.15.0 || >=16.0.0" - } - }, - "node_modules/@lerna/pulse-till-done/node_modules/gauge": { - "version": "4.0.4", - "dev": true, - "license": "ISC", - "dependencies": { - "aproba": "^1.0.3 || ^2.0.0", - "color-support": "^1.1.3", - "console-control-strings": "^1.1.0", - "has-unicode": "^2.0.1", - "signal-exit": "^3.0.7", - "string-width": "^4.2.3", - "strip-ansi": "^6.0.1", - "wide-align": "^1.1.5" - }, - "engines": { - "node": "^12.13.0 || ^14.15.0 || >=16.0.0" - } - }, - "node_modules/@lerna/pulse-till-done/node_modules/npmlog": { - "version": "6.0.2", - "dev": true, - "license": "ISC", - "dependencies": { - "are-we-there-yet": "^3.0.0", - "console-control-strings": "^1.1.0", - "gauge": "^4.0.3", - "set-blocking": "^2.0.0" - }, - "engines": { - "node": "^12.13.0 || ^14.15.0 || >=16.0.0" - } - }, - "node_modules/@lerna/pulse-till-done/node_modules/readable-stream": { - "version": "3.6.0", - "dev": true, - "license": "MIT", - "dependencies": { - "inherits": "^2.0.3", - "string_decoder": "^1.1.1", - "util-deprecate": "^1.0.1" - }, - "engines": { - "node": ">= 6" - } - }, - "node_modules/@lerna/query-graph": { - "version": "5.6.2", - "dev": true, - "license": "MIT", - "dependencies": { - "@lerna/package-graph": "5.6.2" - }, - "engines": { - "node": "^14.15.0 || >=16.0.0" - } - }, - "node_modules/@lerna/resolve-symlink": { - "version": "5.6.2", - "dev": true, - "license": "MIT", - "dependencies": { - "fs-extra": "^9.1.0", - "npmlog": "^6.0.2", - "read-cmd-shim": "^3.0.0" - }, - "engines": { - "node": "^14.15.0 || >=16.0.0" - } - }, - "node_modules/@lerna/resolve-symlink/node_modules/are-we-there-yet": { - "version": "3.0.1", - "dev": true, - "license": "ISC", - "dependencies": { - "delegates": "^1.0.0", - "readable-stream": "^3.6.0" - }, - "engines": { - "node": "^12.13.0 || ^14.15.0 || >=16.0.0" - } - }, - "node_modules/@lerna/resolve-symlink/node_modules/fs-extra": { - "version": "9.1.0", - "dev": true, - "license": "MIT", - "dependencies": { - "at-least-node": "^1.0.0", - "graceful-fs": "^4.2.0", - "jsonfile": "^6.0.1", - "universalify": "^2.0.0" - }, - "engines": { - "node": ">=10" - } - }, - "node_modules/@lerna/resolve-symlink/node_modules/gauge": { - "version": "4.0.4", - "dev": true, - "license": "ISC", - "dependencies": { - "aproba": "^1.0.3 || ^2.0.0", - "color-support": "^1.1.3", - "console-control-strings": "^1.1.0", - "has-unicode": "^2.0.1", - "signal-exit": "^3.0.7", - "string-width": "^4.2.3", - "strip-ansi": "^6.0.1", - "wide-align": "^1.1.5" - }, - "engines": { - "node": "^12.13.0 || ^14.15.0 || >=16.0.0" - } - }, - "node_modules/@lerna/resolve-symlink/node_modules/jsonfile": { - "version": "6.1.0", - "dev": true, - "license": "MIT", - "dependencies": { - "universalify": "^2.0.0" - }, - "optionalDependencies": { - "graceful-fs": "^4.1.6" - } - }, - "node_modules/@lerna/resolve-symlink/node_modules/npmlog": { - "version": "6.0.2", - "dev": true, - "license": "ISC", - "dependencies": { - "are-we-there-yet": "^3.0.0", - "console-control-strings": "^1.1.0", - "gauge": "^4.0.3", - "set-blocking": "^2.0.0" - }, - "engines": { - "node": "^12.13.0 || ^14.15.0 || >=16.0.0" - } - }, - "node_modules/@lerna/resolve-symlink/node_modules/readable-stream": { - "version": "3.6.0", - "dev": true, - "license": "MIT", - "dependencies": { - "inherits": "^2.0.3", - "string_decoder": "^1.1.1", - "util-deprecate": "^1.0.1" - }, - "engines": { - "node": ">= 6" - } - }, - "node_modules/@lerna/rimraf-dir": { - "version": "5.6.2", - "dev": true, - "license": "MIT", - "dependencies": { - "@lerna/child-process": "5.6.2", - "npmlog": "^6.0.2", - "path-exists": "^4.0.0", - "rimraf": "^3.0.2" - }, - "engines": { - "node": "^14.15.0 || >=16.0.0" - } - }, - "node_modules/@lerna/rimraf-dir/node_modules/are-we-there-yet": { - "version": "3.0.1", - "dev": true, - "license": "ISC", - "dependencies": { - "delegates": "^1.0.0", - "readable-stream": "^3.6.0" - }, - "engines": { - "node": "^12.13.0 || ^14.15.0 || >=16.0.0" - } - }, - "node_modules/@lerna/rimraf-dir/node_modules/gauge": { - "version": "4.0.4", - "dev": true, - "license": "ISC", - "dependencies": { - "aproba": "^1.0.3 || ^2.0.0", - "color-support": "^1.1.3", - "console-control-strings": "^1.1.0", - "has-unicode": "^2.0.1", - "signal-exit": "^3.0.7", - "string-width": "^4.2.3", - "strip-ansi": "^6.0.1", - "wide-align": "^1.1.5" - }, - "engines": { - "node": "^12.13.0 || ^14.15.0 || >=16.0.0" - } - }, - "node_modules/@lerna/rimraf-dir/node_modules/npmlog": { - "version": "6.0.2", - "dev": true, - "license": "ISC", - "dependencies": { - "are-we-there-yet": "^3.0.0", - "console-control-strings": "^1.1.0", - "gauge": "^4.0.3", - "set-blocking": "^2.0.0" - }, - "engines": { - "node": "^12.13.0 || ^14.15.0 || >=16.0.0" - } - }, - "node_modules/@lerna/rimraf-dir/node_modules/readable-stream": { - "version": "3.6.0", - "dev": true, - "license": "MIT", - "dependencies": { - "inherits": "^2.0.3", - "string_decoder": "^1.1.1", - "util-deprecate": "^1.0.1" - }, - "engines": { - "node": ">= 6" - } - }, - "node_modules/@lerna/rimraf-dir/node_modules/rimraf": { - "version": "3.0.2", - "dev": true, - "license": "ISC", - "dependencies": { - "glob": "^7.1.3" - }, - "bin": { - "rimraf": "bin.js" - }, - "funding": { - "url": "https://github.com/sponsors/isaacs" - } - }, - "node_modules/@lerna/run": { - "version": "5.6.2", - "dev": true, - "license": "MIT", - "dependencies": { - "@lerna/command": "5.6.2", - "@lerna/filter-options": "5.6.2", - "@lerna/npm-run-script": "5.6.2", - "@lerna/output": "5.6.2", - "@lerna/profiler": "5.6.2", - "@lerna/run-topologically": "5.6.2", - "@lerna/timer": "5.6.2", - "@lerna/validation-error": "5.6.2", - "fs-extra": "^9.1.0", - "p-map": "^4.0.0" - }, - "engines": { - "node": "^14.15.0 || >=16.0.0" - } - }, - "node_modules/@lerna/run-lifecycle": { - "version": "5.6.2", - "dev": true, - "license": "MIT", - "dependencies": { - "@lerna/npm-conf": "5.6.2", - "@npmcli/run-script": "^4.1.7", - "npmlog": "^6.0.2", - "p-queue": "^6.6.2" - }, - "engines": { - "node": "^14.15.0 || >=16.0.0" - } - }, - "node_modules/@lerna/run-lifecycle/node_modules/are-we-there-yet": { - "version": "3.0.1", - "dev": true, - "license": "ISC", - "dependencies": { - "delegates": "^1.0.0", - "readable-stream": "^3.6.0" - }, - "engines": { - "node": "^12.13.0 || ^14.15.0 || >=16.0.0" - } - }, - "node_modules/@lerna/run-lifecycle/node_modules/gauge": { - "version": "4.0.4", - "dev": true, - "license": "ISC", - "dependencies": { - "aproba": "^1.0.3 || ^2.0.0", - "color-support": "^1.1.3", - "console-control-strings": "^1.1.0", - "has-unicode": "^2.0.1", - "signal-exit": "^3.0.7", - "string-width": "^4.2.3", - "strip-ansi": "^6.0.1", - "wide-align": "^1.1.5" - }, - "engines": { - "node": "^12.13.0 || ^14.15.0 || >=16.0.0" - } - }, - "node_modules/@lerna/run-lifecycle/node_modules/npmlog": { - "version": "6.0.2", - "dev": true, - "license": "ISC", - "dependencies": { - "are-we-there-yet": "^3.0.0", - "console-control-strings": "^1.1.0", - "gauge": "^4.0.3", - "set-blocking": "^2.0.0" - }, - "engines": { - "node": "^12.13.0 || ^14.15.0 || >=16.0.0" - } - }, - "node_modules/@lerna/run-lifecycle/node_modules/readable-stream": { - "version": "3.6.0", - "dev": true, - "license": "MIT", - "dependencies": { - "inherits": "^2.0.3", - "string_decoder": "^1.1.1", - "util-deprecate": "^1.0.1" - }, - "engines": { - "node": ">= 6" - } - }, - "node_modules/@lerna/run-topologically": { - "version": "5.6.2", - "dev": true, - "license": "MIT", - "dependencies": { - "@lerna/query-graph": "5.6.2", - "p-queue": "^6.6.2" - }, - "engines": { - "node": "^14.15.0 || >=16.0.0" - } - }, - "node_modules/@lerna/run/node_modules/fs-extra": { - "version": "9.1.0", - "dev": true, - "license": "MIT", - "dependencies": { - "at-least-node": "^1.0.0", - "graceful-fs": "^4.2.0", - "jsonfile": "^6.0.1", - "universalify": "^2.0.0" - }, - "engines": { - "node": ">=10" - } - }, - "node_modules/@lerna/run/node_modules/jsonfile": { - "version": "6.1.0", - "dev": true, - "license": "MIT", - "dependencies": { - "universalify": "^2.0.0" - }, - "optionalDependencies": { - "graceful-fs": "^4.1.6" - } - }, - "node_modules/@lerna/symlink-binary": { - "version": "5.6.2", - "dev": true, - "license": "MIT", - "dependencies": { - "@lerna/create-symlink": "5.6.2", - "@lerna/package": "5.6.2", - "fs-extra": "^9.1.0", - "p-map": "^4.0.0" - }, - "engines": { - "node": "^14.15.0 || >=16.0.0" - } - }, - "node_modules/@lerna/symlink-binary/node_modules/fs-extra": { - "version": "9.1.0", - "dev": true, - "license": "MIT", - "dependencies": { - "at-least-node": "^1.0.0", - "graceful-fs": "^4.2.0", - "jsonfile": "^6.0.1", - "universalify": "^2.0.0" - }, - "engines": { - "node": ">=10" - } - }, - "node_modules/@lerna/symlink-binary/node_modules/jsonfile": { - "version": "6.1.0", - "dev": true, - "license": "MIT", - "dependencies": { - "universalify": "^2.0.0" - }, - "optionalDependencies": { - "graceful-fs": "^4.1.6" - } - }, - "node_modules/@lerna/symlink-dependencies": { - "version": "5.6.2", - "dev": true, - "license": "MIT", - "dependencies": { - "@lerna/create-symlink": "5.6.2", - "@lerna/resolve-symlink": "5.6.2", - "@lerna/symlink-binary": "5.6.2", - "fs-extra": "^9.1.0", - "p-map": "^4.0.0", - "p-map-series": "^2.1.0" - }, - "engines": { - "node": "^14.15.0 || >=16.0.0" - } - }, - "node_modules/@lerna/symlink-dependencies/node_modules/fs-extra": { - "version": "9.1.0", - "dev": true, - "license": "MIT", - "dependencies": { - "at-least-node": "^1.0.0", - "graceful-fs": "^4.2.0", - "jsonfile": "^6.0.1", - "universalify": "^2.0.0" - }, - "engines": { - "node": ">=10" - } - }, - "node_modules/@lerna/symlink-dependencies/node_modules/jsonfile": { - "version": "6.1.0", - "dev": true, - "license": "MIT", - "dependencies": { - "universalify": "^2.0.0" - }, - "optionalDependencies": { - "graceful-fs": "^4.1.6" - } - }, - "node_modules/@lerna/temp-write": { - "version": "5.6.2", - "dev": true, - "license": "MIT", - "dependencies": { - "graceful-fs": "^4.1.15", - "is-stream": "^2.0.0", - "make-dir": "^3.0.0", - "temp-dir": "^1.0.0", - "uuid": "^8.3.2" - } - }, - "node_modules/@lerna/timer": { - "version": "5.6.2", - "dev": true, - "license": "MIT", - "engines": { - "node": "^14.15.0 || >=16.0.0" - } - }, - "node_modules/@lerna/validation-error": { - "version": "5.6.2", - "dev": true, - "license": "MIT", - "dependencies": { - "npmlog": "^6.0.2" - }, - "engines": { - "node": "^14.15.0 || >=16.0.0" - } - }, - "node_modules/@lerna/validation-error/node_modules/are-we-there-yet": { - "version": "3.0.1", - "dev": true, - "license": "ISC", - "dependencies": { - "delegates": "^1.0.0", - "readable-stream": "^3.6.0" - }, - "engines": { - "node": "^12.13.0 || ^14.15.0 || >=16.0.0" - } - }, - "node_modules/@lerna/validation-error/node_modules/gauge": { - "version": "4.0.4", - "dev": true, - "license": "ISC", - "dependencies": { - "aproba": "^1.0.3 || ^2.0.0", - "color-support": "^1.1.3", - "console-control-strings": "^1.1.0", - "has-unicode": "^2.0.1", - "signal-exit": "^3.0.7", - "string-width": "^4.2.3", - "strip-ansi": "^6.0.1", - "wide-align": "^1.1.5" - }, - "engines": { - "node": "^12.13.0 || ^14.15.0 || >=16.0.0" - } - }, - "node_modules/@lerna/validation-error/node_modules/npmlog": { - "version": "6.0.2", - "dev": true, - "license": "ISC", - "dependencies": { - "are-we-there-yet": "^3.0.0", - "console-control-strings": "^1.1.0", - "gauge": "^4.0.3", - "set-blocking": "^2.0.0" - }, - "engines": { - "node": "^12.13.0 || ^14.15.0 || >=16.0.0" - } - }, - "node_modules/@lerna/validation-error/node_modules/readable-stream": { - "version": "3.6.0", - "dev": true, - "license": "MIT", - "dependencies": { - "inherits": "^2.0.3", - "string_decoder": "^1.1.1", - "util-deprecate": "^1.0.1" - }, - "engines": { - "node": ">= 6" - } - }, - "node_modules/@lerna/version": { - "version": "5.6.2", - "dev": true, - "license": "MIT", - "dependencies": { - "@lerna/check-working-tree": "5.6.2", - "@lerna/child-process": "5.6.2", - "@lerna/collect-updates": "5.6.2", - "@lerna/command": "5.6.2", - "@lerna/conventional-commits": "5.6.2", - "@lerna/github-client": "5.6.2", - "@lerna/gitlab-client": "5.6.2", - "@lerna/output": "5.6.2", - "@lerna/prerelease-id-from-version": "5.6.2", - "@lerna/prompt": "5.6.2", - "@lerna/run-lifecycle": "5.6.2", - "@lerna/run-topologically": "5.6.2", - "@lerna/temp-write": "5.6.2", - "@lerna/validation-error": "5.6.2", - "@nrwl/devkit": ">=14.8.1 < 16", - "chalk": "^4.1.0", - "dedent": "^0.7.0", - "load-json-file": "^6.2.0", - "minimatch": "^3.0.4", - "npmlog": "^6.0.2", - "p-map": "^4.0.0", - "p-pipe": "^3.1.0", - "p-reduce": "^2.1.0", - "p-waterfall": "^2.1.1", - "semver": "^7.3.4", - "slash": "^3.0.0", - "write-json-file": "^4.3.0" - }, - "engines": { - "node": "^14.15.0 || >=16.0.0" - } - }, - "node_modules/@lerna/version/node_modules/are-we-there-yet": { - "version": "3.0.1", - "dev": true, - "license": "ISC", - "dependencies": { - "delegates": "^1.0.0", - "readable-stream": "^3.6.0" - }, - "engines": { - "node": "^12.13.0 || ^14.15.0 || >=16.0.0" - } - }, - "node_modules/@lerna/version/node_modules/gauge": { - "version": "4.0.4", - "dev": true, - "license": "ISC", - "dependencies": { - "aproba": "^1.0.3 || ^2.0.0", - "color-support": "^1.1.3", - "console-control-strings": "^1.1.0", - "has-unicode": "^2.0.1", - "signal-exit": "^3.0.7", - "string-width": "^4.2.3", - "strip-ansi": "^6.0.1", - "wide-align": "^1.1.5" - }, - "engines": { - "node": "^12.13.0 || ^14.15.0 || >=16.0.0" - } - }, - "node_modules/@lerna/version/node_modules/npmlog": { - "version": "6.0.2", - "dev": true, - "license": "ISC", - "dependencies": { - "are-we-there-yet": "^3.0.0", - "console-control-strings": "^1.1.0", - "gauge": "^4.0.3", - "set-blocking": "^2.0.0" - }, - "engines": { - "node": "^12.13.0 || ^14.15.0 || >=16.0.0" - } - }, - "node_modules/@lerna/version/node_modules/readable-stream": { - "version": "3.6.0", - "dev": true, - "license": "MIT", - "dependencies": { - "inherits": "^2.0.3", - "string_decoder": "^1.1.1", - "util-deprecate": "^1.0.1" - }, - "engines": { - "node": ">= 6" - } - }, - "node_modules/@lerna/write-log-file": { - "version": "5.6.2", - "dev": true, - "license": "MIT", - "dependencies": { - "npmlog": "^6.0.2", - "write-file-atomic": "^4.0.1" - }, - "engines": { - "node": "^14.15.0 || >=16.0.0" - } - }, - "node_modules/@lerna/write-log-file/node_modules/are-we-there-yet": { - "version": "3.0.1", - "dev": true, - "license": "ISC", - "dependencies": { - "delegates": "^1.0.0", - "readable-stream": "^3.6.0" - }, - "engines": { - "node": "^12.13.0 || ^14.15.0 || >=16.0.0" - } - }, - "node_modules/@lerna/write-log-file/node_modules/gauge": { - "version": "4.0.4", - "dev": true, - "license": "ISC", - "dependencies": { - "aproba": "^1.0.3 || ^2.0.0", - "color-support": "^1.1.3", - "console-control-strings": "^1.1.0", - "has-unicode": "^2.0.1", - "signal-exit": "^3.0.7", - "string-width": "^4.2.3", - "strip-ansi": "^6.0.1", - "wide-align": "^1.1.5" - }, - "engines": { - "node": "^12.13.0 || ^14.15.0 || >=16.0.0" - } - }, - "node_modules/@lerna/write-log-file/node_modules/npmlog": { - "version": "6.0.2", - "dev": true, - "license": "ISC", - "dependencies": { - "are-we-there-yet": "^3.0.0", - "console-control-strings": "^1.1.0", - "gauge": "^4.0.3", - "set-blocking": "^2.0.0" - }, - "engines": { - "node": "^12.13.0 || ^14.15.0 || >=16.0.0" - } - }, - "node_modules/@lerna/write-log-file/node_modules/readable-stream": { - "version": "3.6.0", - "dev": true, - "license": "MIT", + "node_modules/@npmcli/agent/node_modules/http-proxy-agent": { + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-7.0.0.tgz", + "integrity": "sha512-+ZT+iBxVUQ1asugqnD6oWoRiS25AkjNfG085dKJGtGxkdwLQrMKU5wJr2bOOFAXzKcTuqq+7fZlTMgG3SRfIYQ==", "dependencies": { - "inherits": "^2.0.3", - "string_decoder": "^1.1.1", - "util-deprecate": "^1.0.1" - }, - "engines": { - "node": ">= 6" - } - }, - "node_modules/@napi-rs/cli": { - "version": "2.16.2", - "dev": true, - "license": "MIT", - "bin": { - "napi": "scripts/index.js" + "agent-base": "^7.1.0", + "debug": "^4.3.4" }, "engines": { - "node": ">= 10" - }, - "funding": { - "type": "github", - "url": "https://github.com/sponsors/Brooooooklyn" + "node": ">= 14" } }, - "node_modules/@nodelib/fs.scandir": { - "version": "2.1.5", - "license": "MIT", + "node_modules/@npmcli/agent/node_modules/https-proxy-agent": { + "version": "7.0.2", + "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-7.0.2.tgz", + "integrity": "sha512-NmLNjm6ucYwtcUmL7JQC1ZQ57LmHP4lT15FQ8D61nak1rO6DH+fz5qNK2Ap5UN4ZapYICE3/0KodcLYSPsPbaA==", "dependencies": { - "@nodelib/fs.stat": "2.0.5", - "run-parallel": "^1.1.9" + "agent-base": "^7.0.2", + "debug": "4" }, "engines": { - "node": ">= 8" + "node": ">= 14" } }, - "node_modules/@nodelib/fs.stat": { - "version": "2.0.5", - "license": "MIT", + "node_modules/@npmcli/agent/node_modules/lru-cache": { + "version": "10.1.0", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-10.1.0.tgz", + "integrity": "sha512-/1clY/ui8CzjKFyjdvwPWJUYKiFVXG2I2cY0ssG7h4+hwk+XOIX7ZSG9Q7TW8TW3Kp3BUSqgFWBLgL4PJ+Blag==", "engines": { - "node": ">= 8" + "node": "14 || >=16.14" } }, - "node_modules/@nodelib/fs.walk": { - "version": "1.2.8", - "license": "MIT", + "node_modules/@npmcli/agent/node_modules/socks-proxy-agent": { + "version": "8.0.2", + "resolved": "https://registry.npmjs.org/socks-proxy-agent/-/socks-proxy-agent-8.0.2.tgz", + "integrity": "sha512-8zuqoLv1aP/66PHF5TqwJ7Czm3Yv32urJQHrVyhD7mmA6d61Zv8cIXQYPTWwmg6qlupnPvs/QKDmfa4P/qct2g==", "dependencies": { - "@nodelib/fs.scandir": "2.1.5", - "fastq": "^1.6.0" + "agent-base": "^7.0.2", + "debug": "^4.3.4", + "socks": "^2.7.1" }, "engines": { - "node": ">= 8" + "node": ">= 14" } }, "node_modules/@npmcli/arborist": { @@ -5790,24 +3919,12 @@ "node": "^12.13.0 || ^14.15.0 || >=16.0.0" } }, - "node_modules/@npmcli/arborist/node_modules/@npmcli/promise-spawn": { - "version": "3.0.0", - "dev": true, - "license": "ISC", - "dependencies": { - "infer-owner": "^1.0.4" - }, - "engines": { - "node": "^12.13.0 || ^14.15.0 || >=16.0.0" - } - }, - "node_modules/@npmcli/arborist/node_modules/are-we-there-yet": { - "version": "3.0.1", + "node_modules/@npmcli/arborist/node_modules/@npmcli/promise-spawn": { + "version": "3.0.0", "dev": true, "license": "ISC", "dependencies": { - "delegates": "^1.0.0", - "readable-stream": "^3.6.0" + "infer-owner": "^1.0.4" }, "engines": { "node": "^12.13.0 || ^14.15.0 || >=16.0.0" @@ -5821,37 +3938,6 @@ "semver": "^7.0.0" } }, - "node_modules/@npmcli/arborist/node_modules/chownr": { - "version": "2.0.0", - "dev": true, - "license": "ISC", - "engines": { - "node": ">=10" - } - }, - "node_modules/@npmcli/arborist/node_modules/err-code": { - "version": "2.0.3", - "dev": true, - "license": "MIT" - }, - "node_modules/@npmcli/arborist/node_modules/gauge": { - "version": "4.0.4", - "dev": true, - "license": "ISC", - "dependencies": { - "aproba": "^1.0.3 || ^2.0.0", - "color-support": "^1.1.3", - "console-control-strings": "^1.1.0", - "has-unicode": "^2.0.1", - "signal-exit": "^3.0.7", - "string-width": "^4.2.3", - "strip-ansi": "^6.0.1", - "wide-align": "^1.1.5" - }, - "engines": { - "node": "^12.13.0 || ^14.15.0 || >=16.0.0" - } - }, "node_modules/@npmcli/arborist/node_modules/hosted-git-info": { "version": "5.1.0", "dev": true, @@ -5943,20 +4029,6 @@ "node": "^12.13.0 || ^14.15.0 || >=16.0.0" } }, - "node_modules/@npmcli/arborist/node_modules/npmlog": { - "version": "6.0.2", - "dev": true, - "license": "ISC", - "dependencies": { - "are-we-there-yet": "^3.0.0", - "console-control-strings": "^1.1.0", - "gauge": "^4.0.3", - "set-blocking": "^2.0.0" - }, - "engines": { - "node": "^12.13.0 || ^14.15.0 || >=16.0.0" - } - }, "node_modules/@npmcli/arborist/node_modules/pacote": { "version": "13.6.2", "dev": true, @@ -5991,51 +4063,6 @@ "node": "^12.13.0 || ^14.15.0 || >=16.0.0" } }, - "node_modules/@npmcli/arborist/node_modules/promise-retry": { - "version": "2.0.1", - "dev": true, - "license": "MIT", - "dependencies": { - "err-code": "^2.0.2", - "retry": "^0.12.0" - }, - "engines": { - "node": ">=10" - } - }, - "node_modules/@npmcli/arborist/node_modules/read-package-json-fast": { - "version": "2.0.3", - "dev": true, - "license": "ISC", - "dependencies": { - "json-parse-even-better-errors": "^2.3.0", - "npm-normalize-package-bin": "^1.0.1" - }, - "engines": { - "node": ">=10" - } - }, - "node_modules/@npmcli/arborist/node_modules/readable-stream": { - "version": "3.6.0", - "dev": true, - "license": "MIT", - "dependencies": { - "inherits": "^2.0.3", - "string_decoder": "^1.1.1", - "util-deprecate": "^1.0.1" - }, - "engines": { - "node": ">= 6" - } - }, - "node_modules/@npmcli/arborist/node_modules/retry": { - "version": "0.12.0", - "dev": true, - "license": "MIT", - "engines": { - "node": ">= 4" - } - }, "node_modules/@npmcli/arborist/node_modules/rimraf": { "version": "3.0.2", "dev": true, @@ -6061,12 +4088,9 @@ "node": "^12.13.0 || ^14.15.0 || >=16.0.0" } }, - "node_modules/@npmcli/ci-detect": { - "version": "1.4.0", - "license": "ISC" - }, "node_modules/@npmcli/fs": { "version": "1.1.0", + "dev": true, "license": "ISC", "dependencies": { "@gar/promisify": "^1.0.1", @@ -6077,89 +4101,130 @@ } }, "node_modules/@npmcli/git": { - "version": "2.1.0", - "license": "ISC", + "version": "5.0.4", + "resolved": "https://registry.npmjs.org/@npmcli/git/-/git-5.0.4.tgz", + "integrity": "sha512-nr6/WezNzuYUppzXRaYu/W4aT5rLxdXqEFupbh6e/ovlYFQ8hpu1UUPV3Ir/YTl+74iXl2ZOMlGzudh9ZPUchQ==", "dependencies": { - "@npmcli/promise-spawn": "^1.3.2", - "lru-cache": "^6.0.0", - "mkdirp": "^1.0.4", - "npm-pick-manifest": "^6.1.1", + "@npmcli/promise-spawn": "^7.0.0", + "lru-cache": "^10.0.1", + "npm-pick-manifest": "^9.0.0", + "proc-log": "^3.0.0", "promise-inflight": "^1.0.1", "promise-retry": "^2.0.1", "semver": "^7.3.5", - "which": "^2.0.2" + "which": "^4.0.0" + }, + "engines": { + "node": "^16.14.0 || >=18.0.0" } }, - "node_modules/@npmcli/git/node_modules/err-code": { - "version": "2.0.3", - "license": "MIT" + "node_modules/@npmcli/git/node_modules/builtins": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/builtins/-/builtins-5.0.1.tgz", + "integrity": "sha512-qwVpFEHNfhYJIzNRBvd2C1kyo6jz3ZSMPyyuR47OPdiKWlbYnZNyDWuyR175qDnAJLiCo5fBBqPb3RiXgWlkOQ==", + "dependencies": { + "semver": "^7.0.0" + } }, "node_modules/@npmcli/git/node_modules/hosted-git-info": { - "version": "4.1.0", - "license": "ISC", + "version": "7.0.1", + "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-7.0.1.tgz", + "integrity": "sha512-+K84LB1DYwMHoHSgaOY/Jfhw3ucPmSET5v98Ke/HdNSw4a0UktWzyW1mjhjpuxxTqOOsfWT/7iVshHmVZ4IpOA==", "dependencies": { - "lru-cache": "^6.0.0" + "lru-cache": "^10.0.1" }, "engines": { - "node": ">=10" + "node": "^16.14.0 || >=18.0.0" + } + }, + "node_modules/@npmcli/git/node_modules/isexe": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/isexe/-/isexe-3.1.1.tgz", + "integrity": "sha512-LpB/54B+/2J5hqQ7imZHfdU31OlgQqx7ZicVlkm9kzg9/w8GKLEcFfJl/t7DCEDueOyBAD6zCCwTO6Fzs0NoEQ==", + "engines": { + "node": ">=16" } }, "node_modules/@npmcli/git/node_modules/lru-cache": { - "version": "6.0.0", - "license": "ISC", - "dependencies": { - "yallist": "^4.0.0" - }, + "version": "10.1.0", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-10.1.0.tgz", + "integrity": "sha512-/1clY/ui8CzjKFyjdvwPWJUYKiFVXG2I2cY0ssG7h4+hwk+XOIX7ZSG9Q7TW8TW3Kp3BUSqgFWBLgL4PJ+Blag==", "engines": { - "node": ">=10" + "node": "14 || >=16.14" + } + }, + "node_modules/@npmcli/git/node_modules/npm-normalize-package-bin": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/npm-normalize-package-bin/-/npm-normalize-package-bin-3.0.1.tgz", + "integrity": "sha512-dMxCf+zZ+3zeQZXKxmyuCKlIDPGuv8EF940xbkC4kQVDTtqoh6rJFO+JTKSA6/Rwi0getWmtuy4Itup0AMcaDQ==", + "engines": { + "node": "^14.17.0 || ^16.13.0 || >=18.0.0" } }, "node_modules/@npmcli/git/node_modules/npm-package-arg": { - "version": "8.1.5", - "license": "ISC", + "version": "11.0.1", + "resolved": "https://registry.npmjs.org/npm-package-arg/-/npm-package-arg-11.0.1.tgz", + "integrity": "sha512-M7s1BD4NxdAvBKUPqqRW957Xwcl/4Zvo8Aj+ANrzvIPzGJZElrH7Z//rSaec2ORcND6FHHLnZeY8qgTpXDMFQQ==", "dependencies": { - "hosted-git-info": "^4.0.1", - "semver": "^7.3.4", - "validate-npm-package-name": "^3.0.0" + "hosted-git-info": "^7.0.0", + "proc-log": "^3.0.0", + "semver": "^7.3.5", + "validate-npm-package-name": "^5.0.0" }, "engines": { - "node": ">=10" + "node": "^16.14.0 || >=18.0.0" } }, "node_modules/@npmcli/git/node_modules/npm-pick-manifest": { - "version": "6.1.1", - "license": "ISC", + "version": "9.0.0", + "resolved": "https://registry.npmjs.org/npm-pick-manifest/-/npm-pick-manifest-9.0.0.tgz", + "integrity": "sha512-VfvRSs/b6n9ol4Qb+bDwNGUXutpy76x6MARw/XssevE0TnctIKcmklJZM5Z7nqs5z5aW+0S63pgCNbpkUNNXBg==", "dependencies": { - "npm-install-checks": "^4.0.0", - "npm-normalize-package-bin": "^1.0.1", - "npm-package-arg": "^8.1.2", - "semver": "^7.3.4" + "npm-install-checks": "^6.0.0", + "npm-normalize-package-bin": "^3.0.0", + "npm-package-arg": "^11.0.0", + "semver": "^7.3.5" + }, + "engines": { + "node": "^16.14.0 || >=18.0.0" } }, - "node_modules/@npmcli/git/node_modules/promise-retry": { - "version": "2.0.1", - "license": "MIT", - "dependencies": { - "err-code": "^2.0.2", - "retry": "^0.12.0" - }, + "node_modules/@npmcli/git/node_modules/proc-log": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/proc-log/-/proc-log-3.0.0.tgz", + "integrity": "sha512-++Vn7NS4Xf9NacaU9Xq3URUuqZETPsf8L4j5/ckhaRYsfPeRyzGw+iDjFhV/Jr3uNmTvvddEJFWh5R1gRgUH8A==", "engines": { - "node": ">=10" + "node": "^14.17.0 || ^16.13.0 || >=18.0.0" } }, - "node_modules/@npmcli/git/node_modules/retry": { - "version": "0.12.0", - "license": "MIT", + "node_modules/@npmcli/git/node_modules/validate-npm-package-name": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/validate-npm-package-name/-/validate-npm-package-name-5.0.0.tgz", + "integrity": "sha512-YuKoXDAhBYxY7SfOKxHBDoSyENFeW5VvIIQp2TGQuit8gpK6MnWaQelBKxso72DoxTZfZdcP3W90LqpSkgPzLQ==", + "dependencies": { + "builtins": "^5.0.0" + }, "engines": { - "node": ">= 4" + "node": "^14.17.0 || ^16.13.0 || >=18.0.0" } }, - "node_modules/@npmcli/git/node_modules/yallist": { + "node_modules/@npmcli/git/node_modules/which": { "version": "4.0.0", - "license": "ISC" + "resolved": "https://registry.npmjs.org/which/-/which-4.0.0.tgz", + "integrity": "sha512-GlaYyEb07DPxYCKhKzplCWBJtvxZcZMrL+4UkrTSJHHPyZU4mYYTv3qaOe77H7EODLSSopAUFAc6W8U4yqvscg==", + "dependencies": { + "isexe": "^3.1.1" + }, + "bin": { + "node-which": "bin/which.js" + }, + "engines": { + "node": "^16.13.0 || >=18.0.0" + } }, "node_modules/@npmcli/installed-package-contents": { "version": "1.0.7", + "dev": true, "license": "ISC", "dependencies": { "npm-bundled": "^1.1.1", @@ -6223,18 +4288,6 @@ "node": ">=10" } }, - "node_modules/@npmcli/map-workspaces/node_modules/read-package-json-fast": { - "version": "2.0.3", - "dev": true, - "license": "ISC", - "dependencies": { - "json-parse-even-better-errors": "^2.3.0", - "npm-normalize-package-bin": "^1.0.1" - }, - "engines": { - "node": ">=10" - } - }, "node_modules/@npmcli/metavuln-calculator": { "version": "3.1.1", "dev": true, @@ -6287,19 +4340,6 @@ "semver": "^7.0.0" } }, - "node_modules/@npmcli/metavuln-calculator/node_modules/chownr": { - "version": "2.0.0", - "dev": true, - "license": "ISC", - "engines": { - "node": ">=10" - } - }, - "node_modules/@npmcli/metavuln-calculator/node_modules/err-code": { - "version": "2.0.3", - "dev": true, - "license": "MIT" - }, "node_modules/@npmcli/metavuln-calculator/node_modules/hosted-git-info": { "version": "5.1.0", "dev": true, @@ -6390,86 +4430,19 @@ "read-package-json": "^5.0.0", "read-package-json-fast": "^2.0.3", "rimraf": "^3.0.2", - "ssri": "^9.0.0", - "tar": "^6.1.11" - }, - "bin": { - "pacote": "lib/bin.js" - }, - "engines": { - "node": "^12.13.0 || ^14.15.0 || >=16.0.0" - } - }, - "node_modules/@npmcli/metavuln-calculator/node_modules/promise-retry": { - "version": "2.0.1", - "dev": true, - "license": "MIT", - "dependencies": { - "err-code": "^2.0.2", - "retry": "^0.12.0" - }, - "engines": { - "node": ">=10" - } - }, - "node_modules/@npmcli/metavuln-calculator/node_modules/read-package-json-fast": { - "version": "2.0.3", - "dev": true, - "license": "ISC", - "dependencies": { - "json-parse-even-better-errors": "^2.3.0", - "npm-normalize-package-bin": "^1.0.1" - }, - "engines": { - "node": ">=10" - } - }, - "node_modules/@npmcli/metavuln-calculator/node_modules/retry": { - "version": "0.12.0", - "dev": true, - "license": "MIT", - "engines": { - "node": ">= 4" - } - }, - "node_modules/@npmcli/metavuln-calculator/node_modules/rimraf": { - "version": "3.0.2", - "dev": true, - "license": "ISC", - "dependencies": { - "glob": "^7.1.3" - }, - "bin": { - "rimraf": "bin.js" - }, - "funding": { - "url": "https://github.com/sponsors/isaacs" - } - }, - "node_modules/@npmcli/metavuln-calculator/node_modules/validate-npm-package-name": { - "version": "4.0.0", - "dev": true, - "license": "ISC", - "dependencies": { - "builtins": "^5.0.0" - }, - "engines": { - "node": "^12.13.0 || ^14.15.0 || >=16.0.0" - } - }, - "node_modules/@npmcli/move-file": { - "version": "1.1.2", - "license": "MIT", - "dependencies": { - "mkdirp": "^1.0.4", - "rimraf": "^3.0.2" + "ssri": "^9.0.0", + "tar": "^6.1.11" + }, + "bin": { + "pacote": "lib/bin.js" }, "engines": { - "node": ">=10" + "node": "^12.13.0 || ^14.15.0 || >=16.0.0" } }, - "node_modules/@npmcli/move-file/node_modules/rimraf": { + "node_modules/@npmcli/metavuln-calculator/node_modules/rimraf": { "version": "3.0.2", + "dev": true, "license": "ISC", "dependencies": { "glob": "^7.1.3" @@ -6481,6 +4454,17 @@ "url": "https://github.com/sponsors/isaacs" } }, + "node_modules/@npmcli/metavuln-calculator/node_modules/validate-npm-package-name": { + "version": "4.0.0", + "dev": true, + "license": "ISC", + "dependencies": { + "builtins": "^5.0.0" + }, + "engines": { + "node": "^12.13.0 || ^14.15.0 || >=16.0.0" + } + }, "node_modules/@npmcli/name-from-folder": { "version": "1.0.1", "dev": true, @@ -6506,10 +4490,36 @@ } }, "node_modules/@npmcli/promise-spawn": { - "version": "1.3.2", - "license": "ISC", + "version": "7.0.1", + "resolved": "https://registry.npmjs.org/@npmcli/promise-spawn/-/promise-spawn-7.0.1.tgz", + "integrity": "sha512-P4KkF9jX3y+7yFUxgcUdDtLy+t4OlDGuEBLNs57AZsfSfg+uV6MLndqGpnl4831ggaEdXwR50XFoZP4VFtHolg==", "dependencies": { - "infer-owner": "^1.0.4" + "which": "^4.0.0" + }, + "engines": { + "node": "^16.14.0 || >=18.0.0" + } + }, + "node_modules/@npmcli/promise-spawn/node_modules/isexe": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/isexe/-/isexe-3.1.1.tgz", + "integrity": "sha512-LpB/54B+/2J5hqQ7imZHfdU31OlgQqx7ZicVlkm9kzg9/w8GKLEcFfJl/t7DCEDueOyBAD6zCCwTO6Fzs0NoEQ==", + "engines": { + "node": ">=16" + } + }, + "node_modules/@npmcli/promise-spawn/node_modules/which": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/which/-/which-4.0.0.tgz", + "integrity": "sha512-GlaYyEb07DPxYCKhKzplCWBJtvxZcZMrL+4UkrTSJHHPyZU4mYYTv3qaOe77H7EODLSSopAUFAc6W8U4yqvscg==", + "dependencies": { + "isexe": "^3.1.1" + }, + "bin": { + "node-which": "bin/which.js" + }, + "engines": { + "node": "^16.13.0 || >=18.0.0" } }, "node_modules/@npmcli/run-script": { @@ -6538,18 +4548,6 @@ "node": "^12.13.0 || ^14.15.0 || >=16.0.0" } }, - "node_modules/@npmcli/run-script/node_modules/read-package-json-fast": { - "version": "2.0.3", - "dev": true, - "license": "ISC", - "dependencies": { - "json-parse-even-better-errors": "^2.3.0", - "npm-normalize-package-bin": "^1.0.1" - }, - "engines": { - "node": ">=10" - } - }, "node_modules/@nrwl/cli": { "version": "15.9.4", "dev": true, @@ -6573,17 +4571,6 @@ "nx": ">= 14 <= 16" } }, - "node_modules/@nrwl/devkit/node_modules/lru-cache": { - "version": "6.0.0", - "dev": true, - "license": "ISC", - "dependencies": { - "yallist": "^4.0.0" - }, - "engines": { - "node": ">=10" - } - }, "node_modules/@nrwl/devkit/node_modules/semver": { "version": "7.3.4", "dev": true, @@ -6603,11 +4590,6 @@ "dev": true, "license": "0BSD" }, - "node_modules/@nrwl/devkit/node_modules/yallist": { - "version": "4.0.0", - "dev": true, - "license": "ISC" - }, "node_modules/@nrwl/nx-linux-arm64-gnu": { "version": "15.9.4", "cpu": [ @@ -6716,120 +4698,357 @@ "dev": true, "license": "MIT", "dependencies": { - "@octokit/types": "^8.0.0" + "@octokit/types": "^8.0.0" + }, + "engines": { + "node": ">= 14" + }, + "peerDependencies": { + "@octokit/core": ">=4" + } + }, + "node_modules/@octokit/plugin-request-log": { + "version": "1.0.4", + "dev": true, + "license": "MIT", + "peerDependencies": { + "@octokit/core": ">=3" + } + }, + "node_modules/@octokit/plugin-rest-endpoint-methods": { + "version": "6.7.0", + "dev": true, + "license": "MIT", + "dependencies": { + "@octokit/types": "^8.0.0", + "deprecation": "^2.3.1" + }, + "engines": { + "node": ">= 14" + }, + "peerDependencies": { + "@octokit/core": ">=3" + } + }, + "node_modules/@octokit/request": { + "version": "6.2.2", + "dev": true, + "license": "MIT", + "dependencies": { + "@octokit/endpoint": "^7.0.0", + "@octokit/request-error": "^3.0.0", + "@octokit/types": "^8.0.0", + "is-plain-object": "^5.0.0", + "node-fetch": "^2.6.7", + "universal-user-agent": "^6.0.0" + }, + "engines": { + "node": ">= 14" + } + }, + "node_modules/@octokit/request-error": { + "version": "3.0.2", + "dev": true, + "license": "MIT", + "dependencies": { + "@octokit/types": "^8.0.0", + "deprecation": "^2.0.0", + "once": "^1.4.0" + }, + "engines": { + "node": ">= 14" + } + }, + "node_modules/@octokit/rest": { + "version": "19.0.5", + "dev": true, + "license": "MIT", + "dependencies": { + "@octokit/core": "^4.1.0", + "@octokit/plugin-paginate-rest": "^5.0.0", + "@octokit/plugin-request-log": "^1.0.4", + "@octokit/plugin-rest-endpoint-methods": "^6.7.0" + }, + "engines": { + "node": ">= 14" + } + }, + "node_modules/@octokit/types": { + "version": "8.0.0", + "dev": true, + "license": "MIT", + "dependencies": { + "@octokit/openapi-types": "^14.0.0" + } + }, + "node_modules/@parcel/watcher": { + "version": "2.0.4", + "dev": true, + "hasInstallScript": true, + "license": "MIT", + "dependencies": { + "node-addon-api": "^3.2.1", + "node-gyp-build": "^4.3.0" + }, + "engines": { + "node": ">= 10.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/parcel" + } + }, + "node_modules/@parcel/watcher/node_modules/node-addon-api": { + "version": "3.2.1", + "dev": true, + "license": "MIT" + }, + "node_modules/@phenomnomnominal/tsquery": { + "version": "4.1.1", + "dev": true, + "license": "MIT", + "dependencies": { + "esquery": "^1.0.1" + }, + "peerDependencies": { + "typescript": "^3 || ^4" + } + }, + "node_modules/@pkgjs/parseargs": { + "version": "0.11.0", + "resolved": "https://registry.npmjs.org/@pkgjs/parseargs/-/parseargs-0.11.0.tgz", + "integrity": "sha512-+1VkjdD0QBLPodGrJUeqarH8VAIvQODIbwh9XpP5Syisf7YoQgsJKPNFoqqLQlu+VQ/tVSshMR6loPMn8U+dPg==", + "optional": true, + "engines": { + "node": ">=14" + } + }, + "node_modules/@sigstore/bundle": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/@sigstore/bundle/-/bundle-2.1.0.tgz", + "integrity": "sha512-89uOo6yh/oxaU8AeOUnVrTdVMcGk9Q1hJa7Hkvalc6G3Z3CupWk4Xe9djSgJm9fMkH69s0P0cVHUoKSOemLdng==", + "dependencies": { + "@sigstore/protobuf-specs": "^0.2.1" + }, + "engines": { + "node": "^16.14.0 || >=18.0.0" + } + }, + "node_modules/@sigstore/protobuf-specs": { + "version": "0.2.1", + "resolved": "https://registry.npmjs.org/@sigstore/protobuf-specs/-/protobuf-specs-0.2.1.tgz", + "integrity": "sha512-XTWVxnWJu+c1oCshMLwnKvz8ZQJJDVOlciMfgpJBQbThVjKTCG8dwyhgLngBD2KN0ap9F/gOV8rFDEx8uh7R2A==", + "engines": { + "node": "^14.17.0 || ^16.13.0 || >=18.0.0" + } + }, + "node_modules/@sigstore/sign": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/@sigstore/sign/-/sign-2.2.0.tgz", + "integrity": "sha512-AAbmnEHDQv6CSfrWA5wXslGtzLPtAtHZleKOgxdQYvx/s76Fk6T6ZVt7w2IGV9j1UrFeBocTTQxaXG2oRrDhYA==", + "dependencies": { + "@sigstore/bundle": "^2.1.0", + "@sigstore/protobuf-specs": "^0.2.1", + "make-fetch-happen": "^13.0.0" + }, + "engines": { + "node": "^16.14.0 || >=18.0.0" + } + }, + "node_modules/@sigstore/sign/node_modules/@npmcli/fs": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/@npmcli/fs/-/fs-3.1.0.tgz", + "integrity": "sha512-7kZUAaLscfgbwBQRbvdMYaZOWyMEcPTH/tJjnyAWJ/dvvs9Ef+CERx/qJb9GExJpl1qipaDGn7KqHnFGGixd0w==", + "dependencies": { + "semver": "^7.3.5" + }, + "engines": { + "node": "^14.17.0 || ^16.13.0 || >=18.0.0" + } + }, + "node_modules/@sigstore/sign/node_modules/brace-expansion": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz", + "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==", + "dependencies": { + "balanced-match": "^1.0.0" + } + }, + "node_modules/@sigstore/sign/node_modules/cacache": { + "version": "18.0.2", + "resolved": "https://registry.npmjs.org/cacache/-/cacache-18.0.2.tgz", + "integrity": "sha512-r3NU8h/P+4lVUHfeRw1dtgQYar3DZMm4/cm2bZgOvrFC/su7budSOeqh52VJIC4U4iG1WWwV6vRW0znqBvxNuw==", + "dependencies": { + "@npmcli/fs": "^3.1.0", + "fs-minipass": "^3.0.0", + "glob": "^10.2.2", + "lru-cache": "^10.0.1", + "minipass": "^7.0.3", + "minipass-collect": "^2.0.1", + "minipass-flush": "^1.0.5", + "minipass-pipeline": "^1.2.4", + "p-map": "^4.0.0", + "ssri": "^10.0.0", + "tar": "^6.1.11", + "unique-filename": "^3.0.0" + }, + "engines": { + "node": "^16.14.0 || >=18.0.0" + } + }, + "node_modules/@sigstore/sign/node_modules/fs-minipass": { + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/fs-minipass/-/fs-minipass-3.0.3.tgz", + "integrity": "sha512-XUBA9XClHbnJWSfBzjkm6RvPsyg3sryZt06BEQoXcF7EK/xpGaQYJgQKDJSUH5SGZ76Y7pFx1QBnXz09rU5Fbw==", + "dependencies": { + "minipass": "^7.0.3" + }, + "engines": { + "node": "^14.17.0 || ^16.13.0 || >=18.0.0" + } + }, + "node_modules/@sigstore/sign/node_modules/glob": { + "version": "10.3.10", + "resolved": "https://registry.npmjs.org/glob/-/glob-10.3.10.tgz", + "integrity": "sha512-fa46+tv1Ak0UPK1TOy/pZrIybNNt4HCv7SDzwyfiOZkvZLEbjsZkJBPtDHVshZjbecAoAGSC20MjLDG/qr679g==", + "dependencies": { + "foreground-child": "^3.1.0", + "jackspeak": "^2.3.5", + "minimatch": "^9.0.1", + "minipass": "^5.0.0 || ^6.0.2 || ^7.0.0", + "path-scurry": "^1.10.1" + }, + "bin": { + "glob": "dist/esm/bin.mjs" + }, + "engines": { + "node": ">=16 || 14 >=14.17" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + } + }, + "node_modules/@sigstore/sign/node_modules/lru-cache": { + "version": "10.1.0", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-10.1.0.tgz", + "integrity": "sha512-/1clY/ui8CzjKFyjdvwPWJUYKiFVXG2I2cY0ssG7h4+hwk+XOIX7ZSG9Q7TW8TW3Kp3BUSqgFWBLgL4PJ+Blag==", + "engines": { + "node": "14 || >=16.14" + } + }, + "node_modules/@sigstore/sign/node_modules/make-fetch-happen": { + "version": "13.0.0", + "resolved": "https://registry.npmjs.org/make-fetch-happen/-/make-fetch-happen-13.0.0.tgz", + "integrity": "sha512-7ThobcL8brtGo9CavByQrQi+23aIfgYU++wg4B87AIS8Rb2ZBt/MEaDqzA00Xwv/jUjAjYkLHjVolYuTLKda2A==", + "dependencies": { + "@npmcli/agent": "^2.0.0", + "cacache": "^18.0.0", + "http-cache-semantics": "^4.1.1", + "is-lambda": "^1.0.1", + "minipass": "^7.0.2", + "minipass-fetch": "^3.0.0", + "minipass-flush": "^1.0.5", + "minipass-pipeline": "^1.2.4", + "negotiator": "^0.6.3", + "promise-retry": "^2.0.1", + "ssri": "^10.0.0" + }, + "engines": { + "node": "^16.14.0 || >=18.0.0" + } + }, + "node_modules/@sigstore/sign/node_modules/minimatch": { + "version": "9.0.3", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.3.tgz", + "integrity": "sha512-RHiac9mvaRw0x3AYRgDC1CxAP7HTcNrrECeA8YYJeWnpo+2Q5CegtZjaotWTWxDG3UeGA1coE05iH1mPjT/2mg==", + "dependencies": { + "brace-expansion": "^2.0.1" }, "engines": { - "node": ">= 14" + "node": ">=16 || 14 >=14.17" }, - "peerDependencies": { - "@octokit/core": ">=4" + "funding": { + "url": "https://github.com/sponsors/isaacs" } }, - "node_modules/@octokit/plugin-request-log": { - "version": "1.0.4", - "dev": true, - "license": "MIT", - "peerDependencies": { - "@octokit/core": ">=3" + "node_modules/@sigstore/sign/node_modules/minipass": { + "version": "7.0.4", + "resolved": "https://registry.npmjs.org/minipass/-/minipass-7.0.4.tgz", + "integrity": "sha512-jYofLM5Dam9279rdkWzqHozUo4ybjdZmCsDHePy5V/PbBcVMiSZR97gmAy45aqi8CK1lG2ECd356FU86avfwUQ==", + "engines": { + "node": ">=16 || 14 >=14.17" } }, - "node_modules/@octokit/plugin-rest-endpoint-methods": { - "version": "6.7.0", - "dev": true, - "license": "MIT", + "node_modules/@sigstore/sign/node_modules/minipass-collect": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/minipass-collect/-/minipass-collect-2.0.1.tgz", + "integrity": "sha512-D7V8PO9oaz7PWGLbCACuI1qEOsq7UKfLotx/C0Aet43fCUB/wfQ7DYeq2oR/svFJGYDHPr38SHATeaj/ZoKHKw==", "dependencies": { - "@octokit/types": "^8.0.0", - "deprecation": "^2.3.1" + "minipass": "^7.0.3" }, "engines": { - "node": ">= 14" - }, - "peerDependencies": { - "@octokit/core": ">=3" + "node": ">=16 || 14 >=14.17" } }, - "node_modules/@octokit/request": { - "version": "6.2.2", - "dev": true, - "license": "MIT", + "node_modules/@sigstore/sign/node_modules/minipass-fetch": { + "version": "3.0.4", + "resolved": "https://registry.npmjs.org/minipass-fetch/-/minipass-fetch-3.0.4.tgz", + "integrity": "sha512-jHAqnA728uUpIaFm7NWsCnqKT6UqZz7GcI/bDpPATuwYyKwJwW0remxSCxUlKiEty+eopHGa3oc8WxgQ1FFJqg==", "dependencies": { - "@octokit/endpoint": "^7.0.0", - "@octokit/request-error": "^3.0.0", - "@octokit/types": "^8.0.0", - "is-plain-object": "^5.0.0", - "node-fetch": "^2.6.7", - "universal-user-agent": "^6.0.0" + "minipass": "^7.0.3", + "minipass-sized": "^1.0.3", + "minizlib": "^2.1.2" }, "engines": { - "node": ">= 14" + "node": "^14.17.0 || ^16.13.0 || >=18.0.0" + }, + "optionalDependencies": { + "encoding": "^0.1.13" } }, - "node_modules/@octokit/request-error": { - "version": "3.0.2", - "dev": true, - "license": "MIT", + "node_modules/@sigstore/sign/node_modules/ssri": { + "version": "10.0.5", + "resolved": "https://registry.npmjs.org/ssri/-/ssri-10.0.5.tgz", + "integrity": "sha512-bSf16tAFkGeRlUNDjXu8FzaMQt6g2HZJrun7mtMbIPOddxt3GLMSz5VWUWcqTJUPfLEaDIepGxv+bYQW49596A==", "dependencies": { - "@octokit/types": "^8.0.0", - "deprecation": "^2.0.0", - "once": "^1.4.0" + "minipass": "^7.0.3" }, "engines": { - "node": ">= 14" + "node": "^14.17.0 || ^16.13.0 || >=18.0.0" } }, - "node_modules/@octokit/rest": { - "version": "19.0.5", - "dev": true, - "license": "MIT", + "node_modules/@sigstore/sign/node_modules/unique-filename": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/unique-filename/-/unique-filename-3.0.0.tgz", + "integrity": "sha512-afXhuC55wkAmZ0P18QsVE6kp8JaxrEokN2HGIoIVv2ijHQd419H0+6EigAFcIzXeMIkcIkNBpB3L/DXB3cTS/g==", "dependencies": { - "@octokit/core": "^4.1.0", - "@octokit/plugin-paginate-rest": "^5.0.0", - "@octokit/plugin-request-log": "^1.0.4", - "@octokit/plugin-rest-endpoint-methods": "^6.7.0" + "unique-slug": "^4.0.0" }, "engines": { - "node": ">= 14" - } - }, - "node_modules/@octokit/types": { - "version": "8.0.0", - "dev": true, - "license": "MIT", - "dependencies": { - "@octokit/openapi-types": "^14.0.0" + "node": "^14.17.0 || ^16.13.0 || >=18.0.0" } }, - "node_modules/@parcel/watcher": { - "version": "2.0.4", - "dev": true, - "hasInstallScript": true, - "license": "MIT", + "node_modules/@sigstore/sign/node_modules/unique-slug": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/unique-slug/-/unique-slug-4.0.0.tgz", + "integrity": "sha512-WrcA6AyEfqDX5bWige/4NQfPZMtASNVxdmWR76WESYQVAACSgWcR6e9i0mofqqBxYFtL4oAxPIptY73/0YE1DQ==", "dependencies": { - "node-addon-api": "^3.2.1", - "node-gyp-build": "^4.3.0" + "imurmurhash": "^0.1.4" }, "engines": { - "node": ">= 10.0.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/parcel" + "node": "^14.17.0 || ^16.13.0 || >=18.0.0" } }, - "node_modules/@parcel/watcher/node_modules/node-addon-api": { - "version": "3.2.1", - "dev": true, - "license": "MIT" - }, - "node_modules/@phenomnomnominal/tsquery": { - "version": "4.1.1", - "dev": true, - "license": "MIT", + "node_modules/@sigstore/tuf": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/@sigstore/tuf/-/tuf-2.2.0.tgz", + "integrity": "sha512-KKATZ5orWfqd9ZG6MN8PtCIx4eevWSuGRKQvofnWXRpyMyUEpmrzg5M5BrCpjM+NfZ0RbNGOh5tCz/P2uoRqOA==", "dependencies": { - "esquery": "^1.0.1" + "@sigstore/protobuf-specs": "^0.2.1", + "tuf-js": "^2.1.0" }, - "peerDependencies": { - "typescript": "^3 || ^4" + "engines": { + "node": "^16.14.0 || >=18.0.0" } }, "node_modules/@sinonjs/commons": { @@ -6850,6 +5069,7 @@ }, "node_modules/@tootallnate/once": { "version": "1.1.2", + "dev": true, "license": "MIT", "engines": { "node": ">= 6" @@ -6883,6 +5103,48 @@ "optional": true, "peer": true }, + "node_modules/@tufjs/canonical-json": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/@tufjs/canonical-json/-/canonical-json-2.0.0.tgz", + "integrity": "sha512-yVtV8zsdo8qFHe+/3kw81dSLyF7D576A5cCFCi4X7B39tWT7SekaEFUnvnWJHz+9qO7qJTah1JbrDjWKqFtdWA==", + "engines": { + "node": "^16.14.0 || >=18.0.0" + } + }, + "node_modules/@tufjs/models": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/@tufjs/models/-/models-2.0.0.tgz", + "integrity": "sha512-c8nj8BaOExmZKO2DXhDfegyhSGcG9E/mPN3U13L+/PsoWm1uaGiHHjxqSHQiasDBQwDA3aHuw9+9spYAP1qvvg==", + "dependencies": { + "@tufjs/canonical-json": "2.0.0", + "minimatch": "^9.0.3" + }, + "engines": { + "node": "^16.14.0 || >=18.0.0" + } + }, + "node_modules/@tufjs/models/node_modules/brace-expansion": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz", + "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==", + "dependencies": { + "balanced-match": "^1.0.0" + } + }, + "node_modules/@tufjs/models/node_modules/minimatch": { + "version": "9.0.3", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.3.tgz", + "integrity": "sha512-RHiac9mvaRw0x3AYRgDC1CxAP7HTcNrrECeA8YYJeWnpo+2Q5CegtZjaotWTWxDG3UeGA1coE05iH1mPjT/2mg==", + "dependencies": { + "brace-expansion": "^2.0.1" + }, + "engines": { + "node": ">=16 || 14 >=14.17" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + } + }, "node_modules/@types/babel__core": { "version": "7.1.19", "dev": true, @@ -7835,6 +6097,7 @@ }, "node_modules/agent-base": { "version": "6.0.2", + "dev": true, "license": "MIT", "dependencies": { "debug": "4" @@ -7845,6 +6108,7 @@ }, "node_modules/agentkeepalive": { "version": "4.2.1", + "dev": true, "license": "MIT", "dependencies": { "debug": "^4.1.0", @@ -8047,6 +6311,33 @@ ], "license": "MIT" }, + "node_modules/are-we-there-yet": { + "version": "3.0.1", + "resolved": "https://zowe.jfrog.io/zowe/api/npm/npm-release/are-we-there-yet/-/are-we-there-yet-3.0.1.tgz", + "integrity": "sha512-QZW4EDmGwlYur0Yyf/b2uGucHQMa8aFUP7eu9ddR73vvhFyt4V0Vl3QHPcTNJ8l6qYOBdxgXdnBXQrHilfRQBg==", + "dev": true, + "dependencies": { + "delegates": "^1.0.0", + "readable-stream": "^3.6.0" + }, + "engines": { + "node": "^12.13.0 || ^14.15.0 || >=16.0.0" + } + }, + "node_modules/are-we-there-yet/node_modules/readable-stream": { + "version": "3.6.2", + "resolved": "https://zowe.jfrog.io/zowe/api/npm/npm-release/readable-stream/-/readable-stream-3.6.2.tgz", + "integrity": "sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA==", + "dev": true, + "dependencies": { + "inherits": "^2.0.3", + "string_decoder": "^1.1.1", + "util-deprecate": "^1.0.1" + }, + "engines": { + "node": ">= 6" + } + }, "node_modules/arg": { "version": "4.1.3", "dev": true, @@ -9067,6 +7358,7 @@ }, "node_modules/builtins": { "version": "1.0.3", + "dev": true, "license": "MIT" }, "node_modules/byte-size": { @@ -9145,14 +7437,6 @@ "balanced-match": "^1.0.0" } }, - "node_modules/cacache/node_modules/chownr": { - "version": "2.0.0", - "dev": true, - "license": "ISC", - "engines": { - "node": ">=10" - } - }, "node_modules/cacache/node_modules/glob": { "version": "8.0.3", "dev": true, @@ -9407,8 +7691,12 @@ } }, "node_modules/chownr": { - "version": "1.1.4", - "license": "ISC" + "version": "2.0.0", + "resolved": "https://zowe.jfrog.io/zowe/api/npm/npm-release/chownr/-/chownr-2.0.0.tgz", + "integrity": "sha512-bIomtDF5KGpdogkLd9VspvFzk9KfpyyGlS8YFVZl7TGPBHL5snIOnxeshwVgPteQ9b4Eydl+pVbIyE1DcvCWgQ==", + "engines": { + "node": ">=10" + } }, "node_modules/chunkd": { "version": "2.0.1", @@ -10128,17 +8416,6 @@ "node": ">=10" } }, - "node_modules/conventional-changelog-core/node_modules/lru-cache": { - "version": "6.0.0", - "dev": true, - "license": "ISC", - "dependencies": { - "yallist": "^4.0.0" - }, - "engines": { - "node": ">=10" - } - }, "node_modules/conventional-changelog-core/node_modules/normalize-package-data": { "version": "3.0.3", "dev": true, @@ -10174,11 +8451,6 @@ "readable-stream": "3" } }, - "node_modules/conventional-changelog-core/node_modules/yallist": { - "version": "4.0.0", - "dev": true, - "license": "ISC" - }, "node_modules/conventional-changelog-preset-loader": { "version": "2.3.4", "dev": true, @@ -11042,11 +9314,13 @@ }, "node_modules/delegates": { "version": "1.0.0", - "dev": true, - "license": "MIT" + "resolved": "https://zowe.jfrog.io/zowe/api/npm/npm-release/delegates/-/delegates-1.0.0.tgz", + "integrity": "sha512-bd2L678uiWATM6m5Z1VzNCErI3jiGzt6HGY8OVICs40JQq/HALfbyNJmp0UDakEY4pMMaN0Ly5om/B1VI/+xfQ==", + "dev": true }, "node_modules/depd": { "version": "1.1.2", + "dev": true, "license": "MIT", "engines": { "node": ">= 0.6" @@ -11431,7 +9705,6 @@ }, "node_modules/eastasianwidth": { "version": "0.2.0", - "dev": true, "license": "MIT" }, "node_modules/ejs": { @@ -11550,7 +9823,6 @@ }, "node_modules/env-paths": { "version": "2.2.1", - "dev": true, "license": "MIT", "engines": { "node": ">=6" @@ -11568,8 +9840,9 @@ } }, "node_modules/err-code": { - "version": "1.1.2", - "license": "MIT" + "version": "2.0.3", + "resolved": "https://zowe.jfrog.io/zowe/api/npm/npm-release/err-code/-/err-code-2.0.3.tgz", + "integrity": "sha512-2bmlRpNKBxT/CRmPOlyISQpNj+qSeYvcym/uT0Jx2bMOlKLtSy1ZmLuVxSEKKyor/N5yhvp/ZiG1oE3DEYMSFA==" }, "node_modules/error-ex": { "version": "1.3.2", @@ -11971,6 +10244,11 @@ "node": "^14.15.0 || ^16.10.0 || >=18.0.0" } }, + "node_modules/exponential-backoff": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/exponential-backoff/-/exponential-backoff-3.1.1.tgz", + "integrity": "sha512-dX7e/LHVJ6W3DE1MHWi9S1EYzDESENfLrYohG2G++ovZrYOkm4Knwa0mc1cn84xJOR4KEU0WSchhLbd0UklbHw==" + }, "node_modules/external-editor": { "version": "3.1.0", "dev": true, @@ -12269,6 +10547,32 @@ } } }, + "node_modules/foreground-child": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/foreground-child/-/foreground-child-3.1.1.tgz", + "integrity": "sha512-TMKDUnIte6bfb5nWv7V/caI169OHgvwjb7V4WkeUvbQQdjr5rWKqHFiKWb/fcOwB+CzBT+qbWjvj+DVwRskpIg==", + "dependencies": { + "cross-spawn": "^7.0.0", + "signal-exit": "^4.0.1" + }, + "engines": { + "node": ">=14" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + } + }, + "node_modules/foreground-child/node_modules/signal-exit": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-4.1.0.tgz", + "integrity": "sha512-bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw==", + "engines": { + "node": ">=14" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + } + }, "node_modules/form-data": { "version": "4.0.0", "dev": true, @@ -12335,12 +10639,30 @@ }, "node_modules/function-bind": { "version": "1.1.2", - "dev": true, "license": "MIT", "funding": { "url": "https://github.com/sponsors/ljharb" } }, + "node_modules/gauge": { + "version": "4.0.4", + "resolved": "https://zowe.jfrog.io/zowe/api/npm/npm-release/gauge/-/gauge-4.0.4.tgz", + "integrity": "sha512-f9m+BEN5jkg6a0fZjleidjN51VE1X+mPFQ2DJ0uv1V39oCLCbsGe6yjbBnp7eK7z/+GAon99a3nHuqbuuthyPg==", + "dev": true, + "dependencies": { + "aproba": "^1.0.3 || ^2.0.0", + "color-support": "^1.1.3", + "console-control-strings": "^1.1.0", + "has-unicode": "^2.0.1", + "signal-exit": "^3.0.7", + "string-width": "^4.2.3", + "strip-ansi": "^6.0.1", + "wide-align": "^1.1.5" + }, + "engines": { + "node": "^12.13.0 || ^14.15.0 || >=16.0.0" + } + }, "node_modules/gensync": { "version": "1.0.0-beta.2", "dev": true, @@ -12427,17 +10749,6 @@ "node": ">=10" } }, - "node_modules/get-pkg-repo/node_modules/lru-cache": { - "version": "6.0.0", - "dev": true, - "license": "ISC", - "dependencies": { - "yallist": "^4.0.0" - }, - "engines": { - "node": ">=10" - } - }, "node_modules/get-pkg-repo/node_modules/y18n": { "version": "5.0.8", "dev": true, @@ -12446,11 +10757,6 @@ "node": ">=10" } }, - "node_modules/get-pkg-repo/node_modules/yallist": { - "version": "4.0.0", - "dev": true, - "license": "ISC" - }, "node_modules/get-pkg-repo/node_modules/yargs": { "version": "16.2.0", "dev": true, @@ -12770,7 +11076,6 @@ }, "node_modules/has": { "version": "1.0.3", - "dev": true, "license": "MIT", "dependencies": { "function-bind": "^1.1.1" @@ -12868,6 +11173,7 @@ }, "node_modules/https-proxy-agent": { "version": "5.0.1", + "dev": true, "license": "MIT", "dependencies": { "agent-base": "6", @@ -12887,6 +11193,7 @@ }, "node_modules/humanize-ms": { "version": "1.2.1", + "dev": true, "license": "MIT", "dependencies": { "ms": "^2.0.0" @@ -12950,10 +11257,36 @@ } }, "node_modules/ignore-walk": { - "version": "3.0.4", - "license": "ISC", + "version": "6.0.4", + "resolved": "https://registry.npmjs.org/ignore-walk/-/ignore-walk-6.0.4.tgz", + "integrity": "sha512-t7sv42WkwFkyKbivUCglsQW5YWMskWtbEf4MNKX5u/CCWHKSPzN4FtBQGsQZgCLbxOzpVlcbWVK5KB3auIOjSw==", "dependencies": { - "minimatch": "^3.0.4" + "minimatch": "^9.0.0" + }, + "engines": { + "node": "^14.17.0 || ^16.13.0 || >=18.0.0" + } + }, + "node_modules/ignore-walk/node_modules/brace-expansion": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz", + "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==", + "dependencies": { + "balanced-match": "^1.0.0" + } + }, + "node_modules/ignore-walk/node_modules/minimatch": { + "version": "9.0.3", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.3.tgz", + "integrity": "sha512-RHiac9mvaRw0x3AYRgDC1CxAP7HTcNrrECeA8YYJeWnpo+2Q5CegtZjaotWTWxDG3UeGA1coE05iH1mPjT/2mg==", + "dependencies": { + "brace-expansion": "^2.0.1" + }, + "engines": { + "node": ">=16 || 14 >=14.17" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" } }, "node_modules/import-fresh": { @@ -13018,6 +11351,7 @@ }, "node_modules/infer-owner": { "version": "1.0.4", + "dev": true, "license": "ISC" }, "node_modules/inflight": { @@ -13177,7 +11511,6 @@ }, "node_modules/is-core-module": { "version": "2.11.0", - "dev": true, "license": "MIT", "dependencies": { "has": "^1.0.3" @@ -13470,6 +11803,23 @@ "node": ">=8" } }, + "node_modules/jackspeak": { + "version": "2.3.6", + "resolved": "https://registry.npmjs.org/jackspeak/-/jackspeak-2.3.6.tgz", + "integrity": "sha512-N3yCS/NegsOBokc8GAdM8UcmfsKiSS8cipheD/nivzr700H+nsMOxJjQnvwOcRYVuFkdH0wGUvW2WbXGmrZGbQ==", + "dependencies": { + "@isaacs/cliui": "^8.0.2" + }, + "engines": { + "node": ">=14" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + }, + "optionalDependencies": { + "@pkgjs/parseargs": "^0.11.0" + } + }, "node_modules/jake": { "version": "10.8.5", "dev": true, @@ -15101,17 +13451,6 @@ "node": "^14.15.0 || ^16.10.0 || >=18.0.0" } }, - "node_modules/jest-snapshot/node_modules/lru-cache": { - "version": "6.0.0", - "dev": true, - "license": "ISC", - "dependencies": { - "yallist": "^4.0.0" - }, - "engines": { - "node": ">=10" - } - }, "node_modules/jest-snapshot/node_modules/pretty-format": { "version": "29.7.0", "dev": true, @@ -15158,11 +13497,6 @@ "url": "https://github.com/chalk/supports-color?sponsor=1" } }, - "node_modules/jest-snapshot/node_modules/yallist": { - "version": "4.0.0", - "dev": true, - "license": "ISC" - }, "node_modules/jest-sonar-reporter": { "version": "2.0.0", "dev": true, @@ -15753,6 +14087,7 @@ }, "node_modules/json-parse-even-better-errors": { "version": "2.3.1", + "dev": true, "license": "MIT" }, "node_modules/json-schema-traverse": { @@ -15892,63 +14227,6 @@ "node": "^14.15.0 || >=16.0.0" } }, - "node_modules/lerna/node_modules/are-we-there-yet": { - "version": "3.0.1", - "dev": true, - "license": "ISC", - "dependencies": { - "delegates": "^1.0.0", - "readable-stream": "^3.6.0" - }, - "engines": { - "node": "^12.13.0 || ^14.15.0 || >=16.0.0" - } - }, - "node_modules/lerna/node_modules/gauge": { - "version": "4.0.4", - "dev": true, - "license": "ISC", - "dependencies": { - "aproba": "^1.0.3 || ^2.0.0", - "color-support": "^1.1.3", - "console-control-strings": "^1.1.0", - "has-unicode": "^2.0.1", - "signal-exit": "^3.0.7", - "string-width": "^4.2.3", - "strip-ansi": "^6.0.1", - "wide-align": "^1.1.5" - }, - "engines": { - "node": "^12.13.0 || ^14.15.0 || >=16.0.0" - } - }, - "node_modules/lerna/node_modules/npmlog": { - "version": "6.0.2", - "dev": true, - "license": "ISC", - "dependencies": { - "are-we-there-yet": "^3.0.0", - "console-control-strings": "^1.1.0", - "gauge": "^4.0.3", - "set-blocking": "^2.0.0" - }, - "engines": { - "node": "^12.13.0 || ^14.15.0 || >=16.0.0" - } - }, - "node_modules/lerna/node_modules/readable-stream": { - "version": "3.6.0", - "dev": true, - "license": "MIT", - "dependencies": { - "inherits": "^2.0.3", - "string_decoder": "^1.1.1", - "util-deprecate": "^1.0.1" - }, - "engines": { - "node": ">= 6" - } - }, "node_modules/leven": { "version": "3.1.0", "dev": true, @@ -16289,10 +14567,14 @@ } }, "node_modules/lru-cache": { - "version": "5.1.1", - "license": "ISC", + "version": "6.0.0", + "resolved": "https://zowe.jfrog.io/zowe/api/npm/npm-release/lru-cache/-/lru-cache-6.0.0.tgz", + "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==", "dependencies": { - "yallist": "^3.0.2" + "yallist": "^4.0.0" + }, + "engines": { + "node": ">=10" } }, "node_modules/lunr": { @@ -16412,11 +14694,6 @@ "node": "^12.13.0 || ^14.15.0 || >=16.0.0" } }, - "node_modules/make-fetch-happen/node_modules/err-code": { - "version": "2.0.3", - "dev": true, - "license": "MIT" - }, "node_modules/make-fetch-happen/node_modules/lru-cache": { "version": "7.14.0", "dev": true, @@ -16441,26 +14718,6 @@ "encoding": "^0.1.13" } }, - "node_modules/make-fetch-happen/node_modules/promise-retry": { - "version": "2.0.1", - "dev": true, - "license": "MIT", - "dependencies": { - "err-code": "^2.0.2", - "retry": "^0.12.0" - }, - "engines": { - "node": ">=10" - } - }, - "node_modules/make-fetch-happen/node_modules/retry": { - "version": "0.12.0", - "dev": true, - "license": "MIT", - "engines": { - "node": ">= 4" - } - }, "node_modules/makeerror": { "version": "1.0.12", "dev": true, @@ -16644,17 +14901,6 @@ "node": ">=8" } }, - "node_modules/meow/node_modules/lru-cache": { - "version": "6.0.0", - "dev": true, - "license": "ISC", - "dependencies": { - "yallist": "^4.0.0" - }, - "engines": { - "node": ">=10" - } - }, "node_modules/meow/node_modules/normalize-package-data": { "version": "3.0.3", "dev": true, @@ -16775,11 +15021,6 @@ "url": "https://github.com/sponsors/sindresorhus" } }, - "node_modules/meow/node_modules/yallist": { - "version": "4.0.0", - "dev": true, - "license": "ISC" - }, "node_modules/merge-stream": { "version": "2.0.0", "dev": true, @@ -16896,6 +15137,7 @@ }, "node_modules/minipass-collect": { "version": "1.0.2", + "dev": true, "license": "ISC", "dependencies": { "minipass": "^3.0.0" @@ -16906,6 +15148,7 @@ }, "node_modules/minipass-fetch": { "version": "1.4.1", + "dev": true, "license": "MIT", "dependencies": { "minipass": "^3.1.0", @@ -16957,10 +15200,6 @@ "node": ">=8" } }, - "node_modules/minipass/node_modules/yallist": { - "version": "4.0.0", - "license": "ISC" - }, "node_modules/minizlib": { "version": "2.1.2", "license": "MIT", @@ -16972,10 +15211,6 @@ "node": ">= 8" } }, - "node_modules/minizlib/node_modules/yallist": { - "version": "4.0.0", - "license": "ISC" - }, "node_modules/mkdirp": { "version": "1.0.4", "license": "MIT", @@ -16999,14 +15234,6 @@ "node": ">=10" } }, - "node_modules/mkdirp-infer-owner/node_modules/chownr": { - "version": "2.0.0", - "dev": true, - "license": "ISC", - "engines": { - "node": ">=10" - } - }, "node_modules/modify-values": { "version": "1.0.1", "dev": true, @@ -17127,7 +15354,6 @@ }, "node_modules/negotiator": { "version": "0.6.3", - "dev": true, "license": "MIT", "engines": { "node": ">= 0.6" @@ -17219,36 +15445,6 @@ "node-gyp-build-test": "build-test.js" } }, - "node_modules/node-gyp/node_modules/are-we-there-yet": { - "version": "3.0.1", - "dev": true, - "license": "ISC", - "dependencies": { - "delegates": "^1.0.0", - "readable-stream": "^3.6.0" - }, - "engines": { - "node": "^12.13.0 || ^14.15.0 || >=16.0.0" - } - }, - "node_modules/node-gyp/node_modules/gauge": { - "version": "4.0.4", - "dev": true, - "license": "ISC", - "dependencies": { - "aproba": "^1.0.3 || ^2.0.0", - "color-support": "^1.1.3", - "console-control-strings": "^1.1.0", - "has-unicode": "^2.0.1", - "signal-exit": "^3.0.7", - "string-width": "^4.2.3", - "strip-ansi": "^6.0.1", - "wide-align": "^1.1.5" - }, - "engines": { - "node": "^12.13.0 || ^14.15.0 || >=16.0.0" - } - }, "node_modules/node-gyp/node_modules/nopt": { "version": "6.0.0", "dev": true, @@ -17263,33 +15459,6 @@ "node": "^12.13.0 || ^14.15.0 || >=16.0.0" } }, - "node_modules/node-gyp/node_modules/npmlog": { - "version": "6.0.2", - "dev": true, - "license": "ISC", - "dependencies": { - "are-we-there-yet": "^3.0.0", - "console-control-strings": "^1.1.0", - "gauge": "^4.0.3", - "set-blocking": "^2.0.0" - }, - "engines": { - "node": "^12.13.0 || ^14.15.0 || >=16.0.0" - } - }, - "node_modules/node-gyp/node_modules/readable-stream": { - "version": "3.6.0", - "dev": true, - "license": "MIT", - "dependencies": { - "inherits": "^2.0.3", - "string_decoder": "^1.1.1", - "util-deprecate": "^1.0.1" - }, - "engines": { - "node": ">= 6" - } - }, "node_modules/node-gyp/node_modules/rimraf": { "version": "3.0.2", "dev": true, @@ -17373,19 +15542,21 @@ }, "node_modules/npm-bundled": { "version": "1.1.2", + "dev": true, "license": "ISC", "dependencies": { "npm-normalize-package-bin": "^1.0.1" } }, "node_modules/npm-install-checks": { - "version": "4.0.0", - "license": "BSD-2-Clause", + "version": "6.3.0", + "resolved": "https://registry.npmjs.org/npm-install-checks/-/npm-install-checks-6.3.0.tgz", + "integrity": "sha512-W29RiK/xtpCGqn6f3ixfRYGk+zRyr+Ew9F2E20BfXxT5/euLdA/Nm7fO7OeTGuAmTs30cpgInyJ0cYe708YTZw==", "dependencies": { "semver": "^7.1.1" }, "engines": { - "node": ">=10" + "node": "^14.17.0 || ^16.13.0 || >=18.0.0" } }, "node_modules/npm-lockfile": { @@ -17512,18 +15683,6 @@ "node": "^12.13.0 || ^14.15.0 || >=16.0.0" } }, - "node_modules/npm-lockfile/node_modules/are-we-there-yet": { - "version": "3.0.1", - "dev": true, - "license": "ISC", - "dependencies": { - "delegates": "^1.0.0", - "readable-stream": "^3.6.0" - }, - "engines": { - "node": "^12.13.0 || ^14.15.0 || >=16.0.0" - } - }, "node_modules/npm-lockfile/node_modules/builtins": { "version": "5.0.1", "dev": true, @@ -17532,14 +15691,6 @@ "semver": "^7.0.0" } }, - "node_modules/npm-lockfile/node_modules/chownr": { - "version": "2.0.0", - "dev": true, - "license": "ISC", - "engines": { - "node": ">=10" - } - }, "node_modules/npm-lockfile/node_modules/cliui": { "version": "8.0.1", "dev": true, @@ -17553,29 +15704,6 @@ "node": ">=12" } }, - "node_modules/npm-lockfile/node_modules/err-code": { - "version": "2.0.3", - "dev": true, - "license": "MIT" - }, - "node_modules/npm-lockfile/node_modules/gauge": { - "version": "4.0.4", - "dev": true, - "license": "ISC", - "dependencies": { - "aproba": "^1.0.3 || ^2.0.0", - "color-support": "^1.1.3", - "console-control-strings": "^1.1.0", - "has-unicode": "^2.0.1", - "signal-exit": "^3.0.7", - "string-width": "^4.2.3", - "strip-ansi": "^6.0.1", - "wide-align": "^1.1.5" - }, - "engines": { - "node": "^12.13.0 || ^14.15.0 || >=16.0.0" - } - }, "node_modules/npm-lockfile/node_modules/hosted-git-info": { "version": "5.1.0", "dev": true, @@ -17778,31 +15906,17 @@ "node_modules/npm-lockfile/node_modules/npm-registry-fetch/node_modules/minipass-fetch": { "version": "2.1.2", "dev": true, - "license": "MIT", - "dependencies": { - "minipass": "^3.1.6", - "minipass-sized": "^1.0.3", - "minizlib": "^2.1.2" - }, - "engines": { - "node": "^12.13.0 || ^14.15.0 || >=16.0.0" - }, - "optionalDependencies": { - "encoding": "^0.1.13" - } - }, - "node_modules/npm-lockfile/node_modules/npmlog": { - "version": "6.0.2", - "dev": true, - "license": "ISC", + "license": "MIT", "dependencies": { - "are-we-there-yet": "^3.0.0", - "console-control-strings": "^1.1.0", - "gauge": "^4.0.3", - "set-blocking": "^2.0.0" + "minipass": "^3.1.6", + "minipass-sized": "^1.0.3", + "minizlib": "^2.1.2" }, "engines": { "node": "^12.13.0 || ^14.15.0 || >=16.0.0" + }, + "optionalDependencies": { + "encoding": "^0.1.13" } }, "node_modules/npm-lockfile/node_modules/pacote": { @@ -17891,51 +16005,6 @@ "node": "^12.13.0 || ^14.15.0 || >=16.0.0" } }, - "node_modules/npm-lockfile/node_modules/promise-retry": { - "version": "2.0.1", - "dev": true, - "license": "MIT", - "dependencies": { - "err-code": "^2.0.2", - "retry": "^0.12.0" - }, - "engines": { - "node": ">=10" - } - }, - "node_modules/npm-lockfile/node_modules/read-package-json-fast": { - "version": "2.0.3", - "dev": true, - "license": "ISC", - "dependencies": { - "json-parse-even-better-errors": "^2.3.0", - "npm-normalize-package-bin": "^1.0.1" - }, - "engines": { - "node": ">=10" - } - }, - "node_modules/npm-lockfile/node_modules/readable-stream": { - "version": "3.6.0", - "dev": true, - "license": "MIT", - "dependencies": { - "inherits": "^2.0.3", - "string_decoder": "^1.1.1", - "util-deprecate": "^1.0.1" - }, - "engines": { - "node": ">= 6" - } - }, - "node_modules/npm-lockfile/node_modules/retry": { - "version": "0.12.0", - "dev": true, - "license": "MIT", - "engines": { - "node": ">= 4" - } - }, "node_modules/npm-lockfile/node_modules/rimraf": { "version": "3.0.2", "dev": true, @@ -17982,11 +16051,6 @@ "node": ">=10" } }, - "node_modules/npm-lockfile/node_modules/yallist": { - "version": "4.0.0", - "dev": true, - "license": "ISC" - }, "node_modules/npm-lockfile/node_modules/yargs": { "version": "17.6.0", "dev": true, @@ -18014,10 +16078,12 @@ }, "node_modules/npm-normalize-package-bin": { "version": "1.0.1", + "dev": true, "license": "ISC" }, "node_modules/npm-package-arg": { "version": "8.1.1", + "dev": true, "license": "ISC", "dependencies": { "hosted-git-info": "^3.0.6", @@ -18030,6 +16096,7 @@ }, "node_modules/npm-package-arg/node_modules/hosted-git-info": { "version": "3.0.8", + "dev": true, "license": "ISC", "dependencies": { "lru-cache": "^6.0.0" @@ -18038,20 +16105,6 @@ "node": ">=10" } }, - "node_modules/npm-package-arg/node_modules/lru-cache": { - "version": "6.0.0", - "license": "ISC", - "dependencies": { - "yallist": "^4.0.0" - }, - "engines": { - "node": ">=10" - } - }, - "node_modules/npm-package-arg/node_modules/yallist": { - "version": "4.0.0", - "license": "ISC" - }, "node_modules/npm-packlist": { "version": "5.1.3", "dev": true, @@ -18222,162 +16275,257 @@ } }, "node_modules/npm-registry-fetch": { - "version": "8.1.5", - "license": "ISC", + "version": "16.1.0", + "resolved": "https://registry.npmjs.org/npm-registry-fetch/-/npm-registry-fetch-16.1.0.tgz", + "integrity": "sha512-PQCELXKt8Azvxnt5Y85GseQDJJlglTFM9L9U9gkv2y4e9s0k3GVDdOx3YoB6gm2Do0hlkzC39iCGXby+Wve1Bw==", "dependencies": { - "@npmcli/ci-detect": "^1.0.0", - "lru-cache": "^6.0.0", - "make-fetch-happen": "^8.0.9", - "minipass": "^3.1.3", - "minipass-fetch": "^1.3.0", + "make-fetch-happen": "^13.0.0", + "minipass": "^7.0.2", + "minipass-fetch": "^3.0.0", "minipass-json-stream": "^1.0.1", - "minizlib": "^2.0.0", - "npm-package-arg": "^8.0.0" + "minizlib": "^2.1.2", + "npm-package-arg": "^11.0.0", + "proc-log": "^3.0.0" }, "engines": { - "node": ">=10" + "node": "^16.14.0 || >=18.0.0" } }, - "node_modules/npm-registry-fetch/node_modules/cacache": { - "version": "15.3.0", - "license": "ISC", + "node_modules/npm-registry-fetch/node_modules/@npmcli/fs": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/@npmcli/fs/-/fs-3.1.0.tgz", + "integrity": "sha512-7kZUAaLscfgbwBQRbvdMYaZOWyMEcPTH/tJjnyAWJ/dvvs9Ef+CERx/qJb9GExJpl1qipaDGn7KqHnFGGixd0w==", "dependencies": { - "@npmcli/fs": "^1.0.0", - "@npmcli/move-file": "^1.0.1", - "chownr": "^2.0.0", - "fs-minipass": "^2.0.0", - "glob": "^7.1.4", - "infer-owner": "^1.0.4", - "lru-cache": "^6.0.0", - "minipass": "^3.1.1", - "minipass-collect": "^1.0.2", + "semver": "^7.3.5" + }, + "engines": { + "node": "^14.17.0 || ^16.13.0 || >=18.0.0" + } + }, + "node_modules/npm-registry-fetch/node_modules/brace-expansion": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz", + "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==", + "dependencies": { + "balanced-match": "^1.0.0" + } + }, + "node_modules/npm-registry-fetch/node_modules/builtins": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/builtins/-/builtins-5.0.1.tgz", + "integrity": "sha512-qwVpFEHNfhYJIzNRBvd2C1kyo6jz3ZSMPyyuR47OPdiKWlbYnZNyDWuyR175qDnAJLiCo5fBBqPb3RiXgWlkOQ==", + "dependencies": { + "semver": "^7.0.0" + } + }, + "node_modules/npm-registry-fetch/node_modules/cacache": { + "version": "18.0.2", + "resolved": "https://registry.npmjs.org/cacache/-/cacache-18.0.2.tgz", + "integrity": "sha512-r3NU8h/P+4lVUHfeRw1dtgQYar3DZMm4/cm2bZgOvrFC/su7budSOeqh52VJIC4U4iG1WWwV6vRW0znqBvxNuw==", + "dependencies": { + "@npmcli/fs": "^3.1.0", + "fs-minipass": "^3.0.0", + "glob": "^10.2.2", + "lru-cache": "^10.0.1", + "minipass": "^7.0.3", + "minipass-collect": "^2.0.1", "minipass-flush": "^1.0.5", - "minipass-pipeline": "^1.2.2", - "mkdirp": "^1.0.3", + "minipass-pipeline": "^1.2.4", "p-map": "^4.0.0", - "promise-inflight": "^1.0.1", - "rimraf": "^3.0.2", - "ssri": "^8.0.1", - "tar": "^6.0.2", - "unique-filename": "^1.1.1" + "ssri": "^10.0.0", + "tar": "^6.1.11", + "unique-filename": "^3.0.0" }, "engines": { - "node": ">= 10" + "node": "^16.14.0 || >=18.0.0" } }, - "node_modules/npm-registry-fetch/node_modules/chownr": { - "version": "2.0.0", - "license": "ISC", + "node_modules/npm-registry-fetch/node_modules/fs-minipass": { + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/fs-minipass/-/fs-minipass-3.0.3.tgz", + "integrity": "sha512-XUBA9XClHbnJWSfBzjkm6RvPsyg3sryZt06BEQoXcF7EK/xpGaQYJgQKDJSUH5SGZ76Y7pFx1QBnXz09rU5Fbw==", + "dependencies": { + "minipass": "^7.0.3" + }, "engines": { - "node": ">=10" + "node": "^14.17.0 || ^16.13.0 || >=18.0.0" } }, - "node_modules/npm-registry-fetch/node_modules/err-code": { - "version": "2.0.3", - "license": "MIT" - }, - "node_modules/npm-registry-fetch/node_modules/http-proxy-agent": { - "version": "4.0.1", - "license": "MIT", + "node_modules/npm-registry-fetch/node_modules/glob": { + "version": "10.3.10", + "resolved": "https://registry.npmjs.org/glob/-/glob-10.3.10.tgz", + "integrity": "sha512-fa46+tv1Ak0UPK1TOy/pZrIybNNt4HCv7SDzwyfiOZkvZLEbjsZkJBPtDHVshZjbecAoAGSC20MjLDG/qr679g==", "dependencies": { - "@tootallnate/once": "1", - "agent-base": "6", - "debug": "4" + "foreground-child": "^3.1.0", + "jackspeak": "^2.3.5", + "minimatch": "^9.0.1", + "minipass": "^5.0.0 || ^6.0.2 || ^7.0.0", + "path-scurry": "^1.10.1" + }, + "bin": { + "glob": "dist/esm/bin.mjs" }, "engines": { - "node": ">= 6" + "node": ">=16 || 14 >=14.17" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" } }, - "node_modules/npm-registry-fetch/node_modules/lru-cache": { - "version": "6.0.0", - "license": "ISC", + "node_modules/npm-registry-fetch/node_modules/hosted-git-info": { + "version": "7.0.1", + "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-7.0.1.tgz", + "integrity": "sha512-+K84LB1DYwMHoHSgaOY/Jfhw3ucPmSET5v98Ke/HdNSw4a0UktWzyW1mjhjpuxxTqOOsfWT/7iVshHmVZ4IpOA==", "dependencies": { - "yallist": "^4.0.0" + "lru-cache": "^10.0.1" }, "engines": { - "node": ">=10" + "node": "^16.14.0 || >=18.0.0" + } + }, + "node_modules/npm-registry-fetch/node_modules/lru-cache": { + "version": "10.1.0", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-10.1.0.tgz", + "integrity": "sha512-/1clY/ui8CzjKFyjdvwPWJUYKiFVXG2I2cY0ssG7h4+hwk+XOIX7ZSG9Q7TW8TW3Kp3BUSqgFWBLgL4PJ+Blag==", + "engines": { + "node": "14 || >=16.14" } }, "node_modules/npm-registry-fetch/node_modules/make-fetch-happen": { - "version": "8.0.14", - "license": "ISC", + "version": "13.0.0", + "resolved": "https://registry.npmjs.org/make-fetch-happen/-/make-fetch-happen-13.0.0.tgz", + "integrity": "sha512-7ThobcL8brtGo9CavByQrQi+23aIfgYU++wg4B87AIS8Rb2ZBt/MEaDqzA00Xwv/jUjAjYkLHjVolYuTLKda2A==", "dependencies": { - "agentkeepalive": "^4.1.3", - "cacache": "^15.0.5", - "http-cache-semantics": "^4.1.0", - "http-proxy-agent": "^4.0.1", - "https-proxy-agent": "^5.0.0", + "@npmcli/agent": "^2.0.0", + "cacache": "^18.0.0", + "http-cache-semantics": "^4.1.1", "is-lambda": "^1.0.1", - "lru-cache": "^6.0.0", - "minipass": "^3.1.3", - "minipass-collect": "^1.0.2", - "minipass-fetch": "^1.3.2", + "minipass": "^7.0.2", + "minipass-fetch": "^3.0.0", "minipass-flush": "^1.0.5", "minipass-pipeline": "^1.2.4", + "negotiator": "^0.6.3", "promise-retry": "^2.0.1", - "socks-proxy-agent": "^5.0.0", - "ssri": "^8.0.0" + "ssri": "^10.0.0" }, "engines": { - "node": ">= 10" + "node": "^16.14.0 || >=18.0.0" } }, - "node_modules/npm-registry-fetch/node_modules/promise-retry": { - "version": "2.0.1", - "license": "MIT", + "node_modules/npm-registry-fetch/node_modules/minimatch": { + "version": "9.0.3", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.3.tgz", + "integrity": "sha512-RHiac9mvaRw0x3AYRgDC1CxAP7HTcNrrECeA8YYJeWnpo+2Q5CegtZjaotWTWxDG3UeGA1coE05iH1mPjT/2mg==", "dependencies": { - "err-code": "^2.0.2", - "retry": "^0.12.0" + "brace-expansion": "^2.0.1" }, "engines": { - "node": ">=10" + "node": ">=16 || 14 >=14.17" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" } }, - "node_modules/npm-registry-fetch/node_modules/retry": { - "version": "0.12.0", - "license": "MIT", + "node_modules/npm-registry-fetch/node_modules/minipass": { + "version": "7.0.4", + "resolved": "https://registry.npmjs.org/minipass/-/minipass-7.0.4.tgz", + "integrity": "sha512-jYofLM5Dam9279rdkWzqHozUo4ybjdZmCsDHePy5V/PbBcVMiSZR97gmAy45aqi8CK1lG2ECd356FU86avfwUQ==", "engines": { - "node": ">= 4" + "node": ">=16 || 14 >=14.17" } }, - "node_modules/npm-registry-fetch/node_modules/rimraf": { - "version": "3.0.2", - "license": "ISC", + "node_modules/npm-registry-fetch/node_modules/minipass-collect": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/minipass-collect/-/minipass-collect-2.0.1.tgz", + "integrity": "sha512-D7V8PO9oaz7PWGLbCACuI1qEOsq7UKfLotx/C0Aet43fCUB/wfQ7DYeq2oR/svFJGYDHPr38SHATeaj/ZoKHKw==", "dependencies": { - "glob": "^7.1.3" + "minipass": "^7.0.3" }, - "bin": { - "rimraf": "bin.js" + "engines": { + "node": ">=16 || 14 >=14.17" + } + }, + "node_modules/npm-registry-fetch/node_modules/minipass-fetch": { + "version": "3.0.4", + "resolved": "https://registry.npmjs.org/minipass-fetch/-/minipass-fetch-3.0.4.tgz", + "integrity": "sha512-jHAqnA728uUpIaFm7NWsCnqKT6UqZz7GcI/bDpPATuwYyKwJwW0remxSCxUlKiEty+eopHGa3oc8WxgQ1FFJqg==", + "dependencies": { + "minipass": "^7.0.3", + "minipass-sized": "^1.0.3", + "minizlib": "^2.1.2" }, - "funding": { - "url": "https://github.com/sponsors/isaacs" + "engines": { + "node": "^14.17.0 || ^16.13.0 || >=18.0.0" + }, + "optionalDependencies": { + "encoding": "^0.1.13" } }, - "node_modules/npm-registry-fetch/node_modules/socks-proxy-agent": { - "version": "5.0.1", - "license": "MIT", + "node_modules/npm-registry-fetch/node_modules/npm-package-arg": { + "version": "11.0.1", + "resolved": "https://registry.npmjs.org/npm-package-arg/-/npm-package-arg-11.0.1.tgz", + "integrity": "sha512-M7s1BD4NxdAvBKUPqqRW957Xwcl/4Zvo8Aj+ANrzvIPzGJZElrH7Z//rSaec2ORcND6FHHLnZeY8qgTpXDMFQQ==", "dependencies": { - "agent-base": "^6.0.2", - "debug": "4", - "socks": "^2.3.3" + "hosted-git-info": "^7.0.0", + "proc-log": "^3.0.0", + "semver": "^7.3.5", + "validate-npm-package-name": "^5.0.0" }, "engines": { - "node": ">= 6" + "node": "^16.14.0 || >=18.0.0" + } + }, + "node_modules/npm-registry-fetch/node_modules/proc-log": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/proc-log/-/proc-log-3.0.0.tgz", + "integrity": "sha512-++Vn7NS4Xf9NacaU9Xq3URUuqZETPsf8L4j5/ckhaRYsfPeRyzGw+iDjFhV/Jr3uNmTvvddEJFWh5R1gRgUH8A==", + "engines": { + "node": "^14.17.0 || ^16.13.0 || >=18.0.0" } }, "node_modules/npm-registry-fetch/node_modules/ssri": { - "version": "8.0.1", - "license": "ISC", + "version": "10.0.5", + "resolved": "https://registry.npmjs.org/ssri/-/ssri-10.0.5.tgz", + "integrity": "sha512-bSf16tAFkGeRlUNDjXu8FzaMQt6g2HZJrun7mtMbIPOddxt3GLMSz5VWUWcqTJUPfLEaDIepGxv+bYQW49596A==", "dependencies": { - "minipass": "^3.1.1" + "minipass": "^7.0.3" }, "engines": { - "node": ">= 8" + "node": "^14.17.0 || ^16.13.0 || >=18.0.0" } }, - "node_modules/npm-registry-fetch/node_modules/yallist": { + "node_modules/npm-registry-fetch/node_modules/unique-filename": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/unique-filename/-/unique-filename-3.0.0.tgz", + "integrity": "sha512-afXhuC55wkAmZ0P18QsVE6kp8JaxrEokN2HGIoIVv2ijHQd419H0+6EigAFcIzXeMIkcIkNBpB3L/DXB3cTS/g==", + "dependencies": { + "unique-slug": "^4.0.0" + }, + "engines": { + "node": "^14.17.0 || ^16.13.0 || >=18.0.0" + } + }, + "node_modules/npm-registry-fetch/node_modules/unique-slug": { "version": "4.0.0", - "license": "ISC" + "resolved": "https://registry.npmjs.org/unique-slug/-/unique-slug-4.0.0.tgz", + "integrity": "sha512-WrcA6AyEfqDX5bWige/4NQfPZMtASNVxdmWR76WESYQVAACSgWcR6e9i0mofqqBxYFtL4oAxPIptY73/0YE1DQ==", + "dependencies": { + "imurmurhash": "^0.1.4" + }, + "engines": { + "node": "^14.17.0 || ^16.13.0 || >=18.0.0" + } + }, + "node_modules/npm-registry-fetch/node_modules/validate-npm-package-name": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/validate-npm-package-name/-/validate-npm-package-name-5.0.0.tgz", + "integrity": "sha512-YuKoXDAhBYxY7SfOKxHBDoSyENFeW5VvIIQp2TGQuit8gpK6MnWaQelBKxso72DoxTZfZdcP3W90LqpSkgPzLQ==", + "dependencies": { + "builtins": "^5.0.0" + }, + "engines": { + "node": "^14.17.0 || ^16.13.0 || >=18.0.0" + } }, "node_modules/npm-run-path": { "version": "4.0.1", @@ -18390,6 +16538,21 @@ "node": ">=8" } }, + "node_modules/npmlog": { + "version": "6.0.2", + "resolved": "https://zowe.jfrog.io/zowe/api/npm/npm-release/npmlog/-/npmlog-6.0.2.tgz", + "integrity": "sha512-/vBvz5Jfr9dT/aFWd0FIRf+T/Q2WBsLENygUaFUqstqsycmZAP/t5BvFJTK0viFmSUxiUKTUplWy5vt+rvKIxg==", + "dev": true, + "dependencies": { + "are-we-there-yet": "^3.0.0", + "console-control-strings": "^1.1.0", + "gauge": "^4.0.3", + "set-blocking": "^2.0.0" + }, + "engines": { + "node": "^12.13.0 || ^14.15.0 || >=16.0.0" + } + }, "node_modules/nx": { "version": "15.9.4", "dev": true, @@ -18517,17 +16680,6 @@ "node": "^12.20.0 || ^14.13.1 || >=16.0.0" } }, - "node_modules/nx/node_modules/lru-cache": { - "version": "6.0.0", - "dev": true, - "license": "ISC", - "dependencies": { - "yallist": "^4.0.0" - }, - "engines": { - "node": ">=10" - } - }, "node_modules/nx/node_modules/minimatch": { "version": "3.0.5", "dev": true, @@ -18591,11 +16743,6 @@ "node": ">=10" } }, - "node_modules/nx/node_modules/yallist": { - "version": "4.0.0", - "dev": true, - "license": "ISC" - }, "node_modules/nx/node_modules/yargs": { "version": "17.7.2", "dev": true, @@ -18726,338 +16873,638 @@ "wcwidth": "^1.0.1" }, "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/os-tmpdir": { + "version": "1.0.2", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/p-defer": { + "version": "1.0.0", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=4" + } + }, + "node_modules/p-event": { + "version": "5.0.1", + "dev": true, + "license": "MIT", + "dependencies": { + "p-timeout": "^5.0.2" + }, + "engines": { + "node": "^12.20.0 || ^14.13.1 || >=16.0.0" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/p-event/node_modules/p-timeout": { + "version": "5.1.0", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/p-finally": { + "version": "1.0.0", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=4" + } + }, + "node_modules/p-limit": { + "version": "3.1.0", + "license": "MIT", + "dependencies": { + "yocto-queue": "^0.1.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/p-locate": { + "version": "5.0.0", + "license": "MIT", + "dependencies": { + "p-limit": "^3.0.2" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/p-map": { + "version": "4.0.0", + "license": "MIT", + "dependencies": { + "aggregate-error": "^3.0.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/p-map-series": { + "version": "2.1.0", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=8" + } + }, + "node_modules/p-pipe": { + "version": "3.1.0", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/p-queue": { + "version": "6.6.2", + "dev": true, + "license": "MIT", + "dependencies": { + "eventemitter3": "^4.0.4", + "p-timeout": "^3.2.0" + }, + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/p-reduce": { + "version": "2.1.0", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=8" + } + }, + "node_modules/p-timeout": { + "version": "3.2.0", + "dev": true, + "license": "MIT", + "dependencies": { + "p-finally": "^1.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/p-try": { + "version": "2.2.0", + "license": "MIT", + "engines": { + "node": ">=6" + } + }, + "node_modules/p-waterfall": { + "version": "2.1.1", + "dev": true, + "license": "MIT", + "dependencies": { + "p-reduce": "^2.0.0" + }, + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/pacote": { + "version": "17.0.5", + "resolved": "https://registry.npmjs.org/pacote/-/pacote-17.0.5.tgz", + "integrity": "sha512-TAE0m20zSDMnchPja9vtQjri19X3pZIyRpm2TJVeI+yU42leJBBDTRYhOcWFsPhaMxf+3iwQkFiKz16G9AEeeA==", + "dependencies": { + "@npmcli/git": "^5.0.0", + "@npmcli/installed-package-contents": "^2.0.1", + "@npmcli/promise-spawn": "^7.0.0", + "@npmcli/run-script": "^7.0.0", + "cacache": "^18.0.0", + "fs-minipass": "^3.0.0", + "minipass": "^7.0.2", + "npm-package-arg": "^11.0.0", + "npm-packlist": "^8.0.0", + "npm-pick-manifest": "^9.0.0", + "npm-registry-fetch": "^16.0.0", + "proc-log": "^3.0.0", + "promise-retry": "^2.0.1", + "read-package-json": "^7.0.0", + "read-package-json-fast": "^3.0.0", + "sigstore": "^2.0.0", + "ssri": "^10.0.0", + "tar": "^6.1.11" + }, + "bin": { + "pacote": "lib/bin.js" + }, + "engines": { + "node": "^16.14.0 || >=18.0.0" + } + }, + "node_modules/pacote/node_modules/@npmcli/fs": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/@npmcli/fs/-/fs-3.1.0.tgz", + "integrity": "sha512-7kZUAaLscfgbwBQRbvdMYaZOWyMEcPTH/tJjnyAWJ/dvvs9Ef+CERx/qJb9GExJpl1qipaDGn7KqHnFGGixd0w==", + "dependencies": { + "semver": "^7.3.5" + }, + "engines": { + "node": "^14.17.0 || ^16.13.0 || >=18.0.0" + } + }, + "node_modules/pacote/node_modules/@npmcli/installed-package-contents": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/@npmcli/installed-package-contents/-/installed-package-contents-2.0.2.tgz", + "integrity": "sha512-xACzLPhnfD51GKvTOOuNX2/V4G4mz9/1I2MfDoye9kBM3RYe5g2YbscsaGoTlaWqkxeiapBWyseULVKpSVHtKQ==", + "dependencies": { + "npm-bundled": "^3.0.0", + "npm-normalize-package-bin": "^3.0.0" + }, + "bin": { + "installed-package-contents": "lib/index.js" + }, + "engines": { + "node": "^14.17.0 || ^16.13.0 || >=18.0.0" + } + }, + "node_modules/pacote/node_modules/@npmcli/node-gyp": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/@npmcli/node-gyp/-/node-gyp-3.0.0.tgz", + "integrity": "sha512-gp8pRXC2oOxu0DUE1/M3bYtb1b3/DbJ5aM113+XJBgfXdussRAsX0YOrOhdd8WvnAR6auDBvJomGAkLKA5ydxA==", + "engines": { + "node": "^14.17.0 || ^16.13.0 || >=18.0.0" + } + }, + "node_modules/pacote/node_modules/@npmcli/run-script": { + "version": "7.0.3", + "resolved": "https://registry.npmjs.org/@npmcli/run-script/-/run-script-7.0.3.tgz", + "integrity": "sha512-ZMWGLHpzMq3rBGIwPyeaoaleaLMvrBrH8nugHxTi5ACkJZXTxXPtVuEH91ifgtss5hUwJQ2VDnzDBWPmz78rvg==", + "dependencies": { + "@npmcli/node-gyp": "^3.0.0", + "@npmcli/promise-spawn": "^7.0.0", + "node-gyp": "^10.0.0", + "read-package-json-fast": "^3.0.0", + "which": "^4.0.0" + }, + "engines": { + "node": "^16.14.0 || >=18.0.0" + } + }, + "node_modules/pacote/node_modules/abbrev": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-2.0.0.tgz", + "integrity": "sha512-6/mh1E2u2YgEsCHdY0Yx5oW+61gZU+1vXaoiHHrpKeuRNNgFvS+/jrwHiQhB5apAf5oB7UB7E19ol2R2LKH8hQ==", + "engines": { + "node": "^14.17.0 || ^16.13.0 || >=18.0.0" + } + }, + "node_modules/pacote/node_modules/brace-expansion": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz", + "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==", + "dependencies": { + "balanced-match": "^1.0.0" + } + }, + "node_modules/pacote/node_modules/builtins": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/builtins/-/builtins-5.0.1.tgz", + "integrity": "sha512-qwVpFEHNfhYJIzNRBvd2C1kyo6jz3ZSMPyyuR47OPdiKWlbYnZNyDWuyR175qDnAJLiCo5fBBqPb3RiXgWlkOQ==", + "dependencies": { + "semver": "^7.0.0" + } + }, + "node_modules/pacote/node_modules/cacache": { + "version": "18.0.2", + "resolved": "https://registry.npmjs.org/cacache/-/cacache-18.0.2.tgz", + "integrity": "sha512-r3NU8h/P+4lVUHfeRw1dtgQYar3DZMm4/cm2bZgOvrFC/su7budSOeqh52VJIC4U4iG1WWwV6vRW0znqBvxNuw==", + "dependencies": { + "@npmcli/fs": "^3.1.0", + "fs-minipass": "^3.0.0", + "glob": "^10.2.2", + "lru-cache": "^10.0.1", + "minipass": "^7.0.3", + "minipass-collect": "^2.0.1", + "minipass-flush": "^1.0.5", + "minipass-pipeline": "^1.2.4", + "p-map": "^4.0.0", + "ssri": "^10.0.0", + "tar": "^6.1.11", + "unique-filename": "^3.0.0" + }, + "engines": { + "node": "^16.14.0 || >=18.0.0" + } + }, + "node_modules/pacote/node_modules/fs-minipass": { + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/fs-minipass/-/fs-minipass-3.0.3.tgz", + "integrity": "sha512-XUBA9XClHbnJWSfBzjkm6RvPsyg3sryZt06BEQoXcF7EK/xpGaQYJgQKDJSUH5SGZ76Y7pFx1QBnXz09rU5Fbw==", + "dependencies": { + "minipass": "^7.0.3" + }, + "engines": { + "node": "^14.17.0 || ^16.13.0 || >=18.0.0" + } + }, + "node_modules/pacote/node_modules/glob": { + "version": "10.3.10", + "resolved": "https://registry.npmjs.org/glob/-/glob-10.3.10.tgz", + "integrity": "sha512-fa46+tv1Ak0UPK1TOy/pZrIybNNt4HCv7SDzwyfiOZkvZLEbjsZkJBPtDHVshZjbecAoAGSC20MjLDG/qr679g==", + "dependencies": { + "foreground-child": "^3.1.0", + "jackspeak": "^2.3.5", + "minimatch": "^9.0.1", + "minipass": "^5.0.0 || ^6.0.2 || ^7.0.0", + "path-scurry": "^1.10.1" + }, + "bin": { + "glob": "dist/esm/bin.mjs" + }, + "engines": { + "node": ">=16 || 14 >=14.17" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + } + }, + "node_modules/pacote/node_modules/hosted-git-info": { + "version": "7.0.1", + "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-7.0.1.tgz", + "integrity": "sha512-+K84LB1DYwMHoHSgaOY/Jfhw3ucPmSET5v98Ke/HdNSw4a0UktWzyW1mjhjpuxxTqOOsfWT/7iVshHmVZ4IpOA==", + "dependencies": { + "lru-cache": "^10.0.1" + }, + "engines": { + "node": "^16.14.0 || >=18.0.0" + } + }, + "node_modules/pacote/node_modules/isexe": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/isexe/-/isexe-3.1.1.tgz", + "integrity": "sha512-LpB/54B+/2J5hqQ7imZHfdU31OlgQqx7ZicVlkm9kzg9/w8GKLEcFfJl/t7DCEDueOyBAD6zCCwTO6Fzs0NoEQ==", + "engines": { + "node": ">=16" } }, - "node_modules/os-tmpdir": { - "version": "1.0.2", - "dev": true, - "license": "MIT", + "node_modules/pacote/node_modules/json-parse-even-better-errors": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/json-parse-even-better-errors/-/json-parse-even-better-errors-3.0.1.tgz", + "integrity": "sha512-aatBvbL26wVUCLmbWdCpeu9iF5wOyWpagiKkInA+kfws3sWdBrTnsvN2CKcyCYyUrc7rebNBlK6+kteg7ksecg==", "engines": { - "node": ">=0.10.0" + "node": "^14.17.0 || ^16.13.0 || >=18.0.0" } }, - "node_modules/p-defer": { - "version": "1.0.0", - "dev": true, - "license": "MIT", + "node_modules/pacote/node_modules/lru-cache": { + "version": "10.1.0", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-10.1.0.tgz", + "integrity": "sha512-/1clY/ui8CzjKFyjdvwPWJUYKiFVXG2I2cY0ssG7h4+hwk+XOIX7ZSG9Q7TW8TW3Kp3BUSqgFWBLgL4PJ+Blag==", "engines": { - "node": ">=4" + "node": "14 || >=16.14" } }, - "node_modules/p-event": { - "version": "5.0.1", - "dev": true, - "license": "MIT", + "node_modules/pacote/node_modules/make-fetch-happen": { + "version": "13.0.0", + "resolved": "https://registry.npmjs.org/make-fetch-happen/-/make-fetch-happen-13.0.0.tgz", + "integrity": "sha512-7ThobcL8brtGo9CavByQrQi+23aIfgYU++wg4B87AIS8Rb2ZBt/MEaDqzA00Xwv/jUjAjYkLHjVolYuTLKda2A==", "dependencies": { - "p-timeout": "^5.0.2" + "@npmcli/agent": "^2.0.0", + "cacache": "^18.0.0", + "http-cache-semantics": "^4.1.1", + "is-lambda": "^1.0.1", + "minipass": "^7.0.2", + "minipass-fetch": "^3.0.0", + "minipass-flush": "^1.0.5", + "minipass-pipeline": "^1.2.4", + "negotiator": "^0.6.3", + "promise-retry": "^2.0.1", + "ssri": "^10.0.0" }, "engines": { - "node": "^12.20.0 || ^14.13.1 || >=16.0.0" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" + "node": "^16.14.0 || >=18.0.0" } }, - "node_modules/p-event/node_modules/p-timeout": { - "version": "5.1.0", - "dev": true, - "license": "MIT", + "node_modules/pacote/node_modules/minimatch": { + "version": "9.0.3", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.3.tgz", + "integrity": "sha512-RHiac9mvaRw0x3AYRgDC1CxAP7HTcNrrECeA8YYJeWnpo+2Q5CegtZjaotWTWxDG3UeGA1coE05iH1mPjT/2mg==", + "dependencies": { + "brace-expansion": "^2.0.1" + }, "engines": { - "node": ">=12" + "node": ">=16 || 14 >=14.17" }, "funding": { - "url": "https://github.com/sponsors/sindresorhus" + "url": "https://github.com/sponsors/isaacs" } }, - "node_modules/p-finally": { - "version": "1.0.0", - "dev": true, - "license": "MIT", + "node_modules/pacote/node_modules/minipass": { + "version": "7.0.4", + "resolved": "https://registry.npmjs.org/minipass/-/minipass-7.0.4.tgz", + "integrity": "sha512-jYofLM5Dam9279rdkWzqHozUo4ybjdZmCsDHePy5V/PbBcVMiSZR97gmAy45aqi8CK1lG2ECd356FU86avfwUQ==", "engines": { - "node": ">=4" + "node": ">=16 || 14 >=14.17" } }, - "node_modules/p-limit": { - "version": "3.1.0", - "license": "MIT", + "node_modules/pacote/node_modules/minipass-collect": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/minipass-collect/-/minipass-collect-2.0.1.tgz", + "integrity": "sha512-D7V8PO9oaz7PWGLbCACuI1qEOsq7UKfLotx/C0Aet43fCUB/wfQ7DYeq2oR/svFJGYDHPr38SHATeaj/ZoKHKw==", "dependencies": { - "yocto-queue": "^0.1.0" + "minipass": "^7.0.3" }, "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" + "node": ">=16 || 14 >=14.17" } }, - "node_modules/p-locate": { - "version": "5.0.0", - "license": "MIT", + "node_modules/pacote/node_modules/minipass-fetch": { + "version": "3.0.4", + "resolved": "https://registry.npmjs.org/minipass-fetch/-/minipass-fetch-3.0.4.tgz", + "integrity": "sha512-jHAqnA728uUpIaFm7NWsCnqKT6UqZz7GcI/bDpPATuwYyKwJwW0remxSCxUlKiEty+eopHGa3oc8WxgQ1FFJqg==", "dependencies": { - "p-limit": "^3.0.2" + "minipass": "^7.0.3", + "minipass-sized": "^1.0.3", + "minizlib": "^2.1.2" }, "engines": { - "node": ">=10" + "node": "^14.17.0 || ^16.13.0 || >=18.0.0" }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" + "optionalDependencies": { + "encoding": "^0.1.13" } }, - "node_modules/p-map": { - "version": "4.0.0", - "license": "MIT", + "node_modules/pacote/node_modules/node-gyp": { + "version": "10.0.1", + "resolved": "https://registry.npmjs.org/node-gyp/-/node-gyp-10.0.1.tgz", + "integrity": "sha512-gg3/bHehQfZivQVfqIyy8wTdSymF9yTyP4CJifK73imyNMU8AIGQE2pUa7dNWfmMeG9cDVF2eehiRMv0LC1iAg==", "dependencies": { - "aggregate-error": "^3.0.0" + "env-paths": "^2.2.0", + "exponential-backoff": "^3.1.1", + "glob": "^10.3.10", + "graceful-fs": "^4.2.6", + "make-fetch-happen": "^13.0.0", + "nopt": "^7.0.0", + "proc-log": "^3.0.0", + "semver": "^7.3.5", + "tar": "^6.1.2", + "which": "^4.0.0" }, - "engines": { - "node": ">=10" + "bin": { + "node-gyp": "bin/node-gyp.js" }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/p-map-series": { - "version": "2.1.0", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=8" - } - }, - "node_modules/p-pipe": { - "version": "3.1.0", - "dev": true, - "license": "MIT", "engines": { - "node": ">=8" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" + "node": "^16.14.0 || >=18.0.0" } }, - "node_modules/p-queue": { - "version": "6.6.2", - "dev": true, - "license": "MIT", + "node_modules/pacote/node_modules/nopt": { + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/nopt/-/nopt-7.2.0.tgz", + "integrity": "sha512-CVDtwCdhYIvnAzFoJ6NJ6dX3oga9/HyciQDnG1vQDjSLMeKLJ4A93ZqYKDrgYSr1FBY5/hMYC+2VCi24pgpkGA==", "dependencies": { - "eventemitter3": "^4.0.4", - "p-timeout": "^3.2.0" + "abbrev": "^2.0.0" }, - "engines": { - "node": ">=8" + "bin": { + "nopt": "bin/nopt.js" }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" + "engines": { + "node": "^14.17.0 || ^16.13.0 || >=18.0.0" } }, - "node_modules/p-reduce": { - "version": "2.1.0", - "dev": true, - "license": "MIT", + "node_modules/pacote/node_modules/normalize-package-data": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-6.0.0.tgz", + "integrity": "sha512-UL7ELRVxYBHBgYEtZCXjxuD5vPxnmvMGq0jp/dGPKKrN7tfsBh2IY7TlJ15WWwdjRWD3RJbnsygUurTK3xkPkg==", + "dependencies": { + "hosted-git-info": "^7.0.0", + "is-core-module": "^2.8.1", + "semver": "^7.3.5", + "validate-npm-package-license": "^3.0.4" + }, "engines": { - "node": ">=8" + "node": "^16.14.0 || >=18.0.0" } }, - "node_modules/p-timeout": { - "version": "3.2.0", - "dev": true, - "license": "MIT", + "node_modules/pacote/node_modules/npm-bundled": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/npm-bundled/-/npm-bundled-3.0.0.tgz", + "integrity": "sha512-Vq0eyEQy+elFpzsKjMss9kxqb9tG3YHg4dsyWuUENuzvSUWe1TCnW/vV9FkhvBk/brEDoDiVd+M1Btosa6ImdQ==", "dependencies": { - "p-finally": "^1.0.0" + "npm-normalize-package-bin": "^3.0.0" }, "engines": { - "node": ">=8" + "node": "^14.17.0 || ^16.13.0 || >=18.0.0" } }, - "node_modules/p-try": { - "version": "2.2.0", - "license": "MIT", + "node_modules/pacote/node_modules/npm-normalize-package-bin": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/npm-normalize-package-bin/-/npm-normalize-package-bin-3.0.1.tgz", + "integrity": "sha512-dMxCf+zZ+3zeQZXKxmyuCKlIDPGuv8EF940xbkC4kQVDTtqoh6rJFO+JTKSA6/Rwi0getWmtuy4Itup0AMcaDQ==", "engines": { - "node": ">=6" + "node": "^14.17.0 || ^16.13.0 || >=18.0.0" } }, - "node_modules/p-waterfall": { - "version": "2.1.1", - "dev": true, - "license": "MIT", + "node_modules/pacote/node_modules/npm-package-arg": { + "version": "11.0.1", + "resolved": "https://registry.npmjs.org/npm-package-arg/-/npm-package-arg-11.0.1.tgz", + "integrity": "sha512-M7s1BD4NxdAvBKUPqqRW957Xwcl/4Zvo8Aj+ANrzvIPzGJZElrH7Z//rSaec2ORcND6FHHLnZeY8qgTpXDMFQQ==", "dependencies": { - "p-reduce": "^2.0.0" + "hosted-git-info": "^7.0.0", + "proc-log": "^3.0.0", + "semver": "^7.3.5", + "validate-npm-package-name": "^5.0.0" }, "engines": { - "node": ">=8" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" + "node": "^16.14.0 || >=18.0.0" } }, - "node_modules/pacote": { - "version": "11.1.4", - "license": "ISC", + "node_modules/pacote/node_modules/npm-packlist": { + "version": "8.0.1", + "resolved": "https://registry.npmjs.org/npm-packlist/-/npm-packlist-8.0.1.tgz", + "integrity": "sha512-MQpL27ZrsJQ2kiAuQPpZb5LtJwydNRnI15QWXsf3WHERu4rzjRj6Zju/My2fov7tLuu3Gle/uoIX/DDZ3u4O4Q==", "dependencies": { - "@npmcli/git": "^2.0.1", - "@npmcli/installed-package-contents": "^1.0.5", - "@npmcli/promise-spawn": "^1.1.0", - "cacache": "^15.0.0", - "chownr": "^1.1.4", - "fs-minipass": "^2.1.0", - "infer-owner": "^1.0.4", - "lru-cache": "^5.1.1", - "minipass": "^3.0.1", - "minipass-fetch": "^1.2.1", - "mkdirp": "^1.0.3", - "npm-package-arg": "^8.0.1", - "npm-packlist": "^2.1.0", - "npm-pick-manifest": "^6.0.0", - "npm-registry-fetch": "^8.0.0", - "promise-inflight": "^1.0.1", - "promise-retry": "^1.1.1", - "read-package-json-fast": "^1.1.3", - "rimraf": "^2.7.1", - "semver": "^7.1.3", - "ssri": "^8.0.0", - "tar": "^6.0.1", - "which": "^2.0.2" - }, - "bin": { - "pacote": "lib/bin.js" + "ignore-walk": "^6.0.4" }, "engines": { - "node": ">=10" + "node": "^14.17.0 || ^16.13.0 || >=18.0.0" } }, - "node_modules/pacote/node_modules/cacache": { - "version": "15.3.0", - "license": "ISC", + "node_modules/pacote/node_modules/npm-pick-manifest": { + "version": "9.0.0", + "resolved": "https://registry.npmjs.org/npm-pick-manifest/-/npm-pick-manifest-9.0.0.tgz", + "integrity": "sha512-VfvRSs/b6n9ol4Qb+bDwNGUXutpy76x6MARw/XssevE0TnctIKcmklJZM5Z7nqs5z5aW+0S63pgCNbpkUNNXBg==", "dependencies": { - "@npmcli/fs": "^1.0.0", - "@npmcli/move-file": "^1.0.1", - "chownr": "^2.0.0", - "fs-minipass": "^2.0.0", - "glob": "^7.1.4", - "infer-owner": "^1.0.4", - "lru-cache": "^6.0.0", - "minipass": "^3.1.1", - "minipass-collect": "^1.0.2", - "minipass-flush": "^1.0.5", - "minipass-pipeline": "^1.2.2", - "mkdirp": "^1.0.3", - "p-map": "^4.0.0", - "promise-inflight": "^1.0.1", - "rimraf": "^3.0.2", - "ssri": "^8.0.1", - "tar": "^6.0.2", - "unique-filename": "^1.1.1" + "npm-install-checks": "^6.0.0", + "npm-normalize-package-bin": "^3.0.0", + "npm-package-arg": "^11.0.0", + "semver": "^7.3.5" }, "engines": { - "node": ">= 10" + "node": "^16.14.0 || >=18.0.0" } }, - "node_modules/pacote/node_modules/cacache/node_modules/chownr": { - "version": "2.0.0", - "license": "ISC", + "node_modules/pacote/node_modules/proc-log": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/proc-log/-/proc-log-3.0.0.tgz", + "integrity": "sha512-++Vn7NS4Xf9NacaU9Xq3URUuqZETPsf8L4j5/ckhaRYsfPeRyzGw+iDjFhV/Jr3uNmTvvddEJFWh5R1gRgUH8A==", "engines": { - "node": ">=10" + "node": "^14.17.0 || ^16.13.0 || >=18.0.0" } }, - "node_modules/pacote/node_modules/cacache/node_modules/lru-cache": { - "version": "6.0.0", - "license": "ISC", + "node_modules/pacote/node_modules/read-package-json": { + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/read-package-json/-/read-package-json-7.0.0.tgz", + "integrity": "sha512-uL4Z10OKV4p6vbdvIXB+OzhInYtIozl/VxUBPgNkBuUi2DeRonnuspmaVAMcrkmfjKGNmRndyQAbE7/AmzGwFg==", "dependencies": { - "yallist": "^4.0.0" + "glob": "^10.2.2", + "json-parse-even-better-errors": "^3.0.0", + "normalize-package-data": "^6.0.0", + "npm-normalize-package-bin": "^3.0.0" }, "engines": { - "node": ">=10" + "node": "^16.14.0 || >=18.0.0" } }, - "node_modules/pacote/node_modules/cacache/node_modules/rimraf": { + "node_modules/pacote/node_modules/read-package-json-fast": { "version": "3.0.2", - "license": "ISC", + "resolved": "https://registry.npmjs.org/read-package-json-fast/-/read-package-json-fast-3.0.2.tgz", + "integrity": "sha512-0J+Msgym3vrLOUB3hzQCuZHII0xkNGCtz/HJH9xZshwv9DbDwkw1KaE3gx/e2J5rpEY5rtOy6cyhKOPrkP7FZw==", "dependencies": { - "glob": "^7.1.3" - }, - "bin": { - "rimraf": "bin.js" + "json-parse-even-better-errors": "^3.0.0", + "npm-normalize-package-bin": "^3.0.0" }, - "funding": { - "url": "https://github.com/sponsors/isaacs" + "engines": { + "node": "^14.17.0 || ^16.13.0 || >=18.0.0" } }, - "node_modules/pacote/node_modules/hosted-git-info": { - "version": "4.1.0", - "license": "ISC", + "node_modules/pacote/node_modules/ssri": { + "version": "10.0.5", + "resolved": "https://registry.npmjs.org/ssri/-/ssri-10.0.5.tgz", + "integrity": "sha512-bSf16tAFkGeRlUNDjXu8FzaMQt6g2HZJrun7mtMbIPOddxt3GLMSz5VWUWcqTJUPfLEaDIepGxv+bYQW49596A==", "dependencies": { - "lru-cache": "^6.0.0" + "minipass": "^7.0.3" }, "engines": { - "node": ">=10" + "node": "^14.17.0 || ^16.13.0 || >=18.0.0" } }, - "node_modules/pacote/node_modules/hosted-git-info/node_modules/lru-cache": { - "version": "6.0.0", - "license": "ISC", + "node_modules/pacote/node_modules/unique-filename": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/unique-filename/-/unique-filename-3.0.0.tgz", + "integrity": "sha512-afXhuC55wkAmZ0P18QsVE6kp8JaxrEokN2HGIoIVv2ijHQd419H0+6EigAFcIzXeMIkcIkNBpB3L/DXB3cTS/g==", "dependencies": { - "yallist": "^4.0.0" + "unique-slug": "^4.0.0" }, "engines": { - "node": ">=10" + "node": "^14.17.0 || ^16.13.0 || >=18.0.0" } }, - "node_modules/pacote/node_modules/npm-package-arg": { - "version": "8.1.5", - "license": "ISC", + "node_modules/pacote/node_modules/unique-slug": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/unique-slug/-/unique-slug-4.0.0.tgz", + "integrity": "sha512-WrcA6AyEfqDX5bWige/4NQfPZMtASNVxdmWR76WESYQVAACSgWcR6e9i0mofqqBxYFtL4oAxPIptY73/0YE1DQ==", "dependencies": { - "hosted-git-info": "^4.0.1", - "semver": "^7.3.4", - "validate-npm-package-name": "^3.0.0" + "imurmurhash": "^0.1.4" }, "engines": { - "node": ">=10" + "node": "^14.17.0 || ^16.13.0 || >=18.0.0" } }, - "node_modules/pacote/node_modules/npm-packlist": { - "version": "2.2.2", - "license": "ISC", + "node_modules/pacote/node_modules/validate-npm-package-name": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/validate-npm-package-name/-/validate-npm-package-name-5.0.0.tgz", + "integrity": "sha512-YuKoXDAhBYxY7SfOKxHBDoSyENFeW5VvIIQp2TGQuit8gpK6MnWaQelBKxso72DoxTZfZdcP3W90LqpSkgPzLQ==", "dependencies": { - "glob": "^7.1.6", - "ignore-walk": "^3.0.3", - "npm-bundled": "^1.1.1", - "npm-normalize-package-bin": "^1.0.1" - }, - "bin": { - "npm-packlist": "bin/index.js" + "builtins": "^5.0.0" }, "engines": { - "node": ">=10" - } - }, - "node_modules/pacote/node_modules/npm-pick-manifest": { - "version": "6.1.1", - "license": "ISC", - "dependencies": { - "npm-install-checks": "^4.0.0", - "npm-normalize-package-bin": "^1.0.1", - "npm-package-arg": "^8.1.2", - "semver": "^7.3.4" + "node": "^14.17.0 || ^16.13.0 || >=18.0.0" } }, - "node_modules/pacote/node_modules/ssri": { - "version": "8.0.1", - "license": "ISC", + "node_modules/pacote/node_modules/which": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/which/-/which-4.0.0.tgz", + "integrity": "sha512-GlaYyEb07DPxYCKhKzplCWBJtvxZcZMrL+4UkrTSJHHPyZU4mYYTv3qaOe77H7EODLSSopAUFAc6W8U4yqvscg==", "dependencies": { - "minipass": "^3.1.1" + "isexe": "^3.1.1" + }, + "bin": { + "node-which": "bin/which.js" }, "engines": { - "node": ">= 8" + "node": "^16.13.0 || >=18.0.0" } }, - "node_modules/pacote/node_modules/yallist": { - "version": "4.0.0", - "license": "ISC" - }, "node_modules/parent-module": { "version": "1.0.1", "dev": true, @@ -19170,6 +17617,37 @@ "dev": true, "license": "MIT" }, + "node_modules/path-scurry": { + "version": "1.10.1", + "resolved": "https://registry.npmjs.org/path-scurry/-/path-scurry-1.10.1.tgz", + "integrity": "sha512-MkhCqzzBEpPvxxQ71Md0b1Kk51W01lrYvlMzSUaIzNsODdd7mqhiimSZlr+VegAz5Z6Vzt9Xg2ttE//XBhH3EQ==", + "dependencies": { + "lru-cache": "^9.1.1 || ^10.0.0", + "minipass": "^5.0.0 || ^6.0.2 || ^7.0.0" + }, + "engines": { + "node": ">=16 || 14 >=14.17" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + } + }, + "node_modules/path-scurry/node_modules/lru-cache": { + "version": "10.1.0", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-10.1.0.tgz", + "integrity": "sha512-/1clY/ui8CzjKFyjdvwPWJUYKiFVXG2I2cY0ssG7h4+hwk+XOIX7ZSG9Q7TW8TW3Kp3BUSqgFWBLgL4PJ+Blag==", + "engines": { + "node": "14 || >=16.14" + } + }, + "node_modules/path-scurry/node_modules/minipass": { + "version": "7.0.4", + "resolved": "https://registry.npmjs.org/minipass/-/minipass-7.0.4.tgz", + "integrity": "sha512-jYofLM5Dam9279rdkWzqHozUo4ybjdZmCsDHePy5V/PbBcVMiSZR97gmAy45aqi8CK1lG2ECd356FU86avfwUQ==", + "engines": { + "node": ">=16 || 14 >=14.17" + } + }, "node_modules/path-to-regexp": { "version": "2.2.1", "dev": true, @@ -19613,14 +18091,15 @@ "license": "MIT" }, "node_modules/promise-retry": { - "version": "1.1.1", - "license": "MIT", + "version": "2.0.1", + "resolved": "https://zowe.jfrog.io/zowe/api/npm/npm-release/promise-retry/-/promise-retry-2.0.1.tgz", + "integrity": "sha512-y+WKFlBR8BGXnsNlIHFGPZmyDf3DFMoLhaflAnyZgV6rG6xu+JwesTo2Q9R6XwYmtmwAFCkAk3e35jEdoeh/3g==", "dependencies": { - "err-code": "^1.0.0", - "retry": "^0.10.0" + "err-code": "^2.0.2", + "retry": "^0.12.0" }, "engines": { - "node": ">=0.12" + "node": ">=10" } }, "node_modules/prompts": { @@ -19807,11 +18286,16 @@ } }, "node_modules/read-package-json-fast": { - "version": "1.2.2", - "license": "ISC", + "version": "2.0.3", + "resolved": "https://zowe.jfrog.io/zowe/api/npm/npm-release/read-package-json-fast/-/read-package-json-fast-2.0.3.tgz", + "integrity": "sha512-W/BKtbL+dUjTuRL2vziuYhp76s5HZ9qQhd/dKfWIZveD0O40453QNyZhC0e63lqZrAQ4jiOapVoeJ7JrszenQQ==", + "dev": true, "dependencies": { "json-parse-even-better-errors": "^2.3.0", "npm-normalize-package-bin": "^1.0.1" + }, + "engines": { + "node": ">=10" } }, "node_modules/read-package-json/node_modules/brace-expansion": { @@ -20284,10 +18768,11 @@ } }, "node_modules/retry": { - "version": "0.10.1", - "license": "MIT", + "version": "0.12.0", + "resolved": "https://zowe.jfrog.io/zowe/api/npm/npm-release/retry/-/retry-0.12.0.tgz", + "integrity": "sha512-9LkiTwjUh6rT555DtE9rTX+BKByPfrMzEAtnlEtdEwr3Nkffwiihqe2bWADg+OQRjt9gl6ICdmB/ZFDCGAtSow==", "engines": { - "node": "*" + "node": ">= 4" } }, "node_modules/reusify": { @@ -20304,6 +18789,7 @@ }, "node_modules/rimraf": { "version": "2.7.1", + "dev": true, "license": "ISC", "dependencies": { "glob": "^7.1.3" @@ -20400,20 +18886,6 @@ "node": ">=10" } }, - "node_modules/semver/node_modules/lru-cache": { - "version": "6.0.0", - "license": "ISC", - "dependencies": { - "yallist": "^4.0.0" - }, - "engines": { - "node": ">=10" - } - }, - "node_modules/semver/node_modules/yallist": { - "version": "4.0.0", - "license": "ISC" - }, "node_modules/serialize-error": { "version": "7.0.1", "dev": true, @@ -20650,6 +19122,20 @@ "dev": true, "license": "ISC" }, + "node_modules/sigstore": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/sigstore/-/sigstore-2.1.0.tgz", + "integrity": "sha512-kPIj+ZLkyI3QaM0qX8V/nSsweYND3W448pwkDgS6CQ74MfhEkIR8ToK5Iyx46KJYRjseVcD3Rp9zAmUAj6ZjPw==", + "dependencies": { + "@sigstore/bundle": "^2.1.0", + "@sigstore/protobuf-specs": "^0.2.1", + "@sigstore/sign": "^2.1.0", + "@sigstore/tuf": "^2.1.0" + }, + "engines": { + "node": "^16.14.0 || >=18.0.0" + } + }, "node_modules/sisteransi": { "version": "1.0.5", "dev": true, @@ -20787,7 +19273,6 @@ }, "node_modules/spdx-correct": { "version": "3.1.1", - "dev": true, "license": "Apache-2.0", "dependencies": { "spdx-expression-parse": "^3.0.0", @@ -20796,12 +19281,10 @@ }, "node_modules/spdx-exceptions": { "version": "2.3.0", - "dev": true, "license": "CC-BY-3.0" }, "node_modules/spdx-expression-parse": { "version": "3.0.1", - "dev": true, "license": "MIT", "dependencies": { "spdx-exceptions": "^2.1.0", @@ -20810,7 +19293,6 @@ }, "node_modules/spdx-license-ids": { "version": "3.0.11", - "dev": true, "license": "CC0-1.0" }, "node_modules/split": { @@ -20998,6 +19480,20 @@ "node": ">=8" } }, + "node_modules/string-width-cjs": { + "name": "string-width", + "version": "4.2.3", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz", + "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==", + "dependencies": { + "emoji-regex": "^8.0.0", + "is-fullwidth-code-point": "^3.0.0", + "strip-ansi": "^6.0.1" + }, + "engines": { + "node": ">=8" + } + }, "node_modules/stringify-object": { "version": "3.3.0", "dev": true, @@ -21021,6 +19517,26 @@ "node": ">=8" } }, + "node_modules/strip-ansi-cjs": { + "name": "strip-ansi", + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz", + "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==", + "dependencies": { + "ansi-regex": "^5.0.1" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/strip-ansi-cjs/node_modules/ansi-regex": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz", + "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==", + "engines": { + "node": ">=8" + } + }, "node_modules/strip-ansi/node_modules/ansi-regex": { "version": "5.0.1", "license": "MIT", @@ -21321,17 +19837,6 @@ "graceful-fs": "^4.1.6" } }, - "node_modules/syncpack/node_modules/lru-cache": { - "version": "6.0.0", - "dev": true, - "license": "ISC", - "dependencies": { - "yallist": "^4.0.0" - }, - "engines": { - "node": ">=10" - } - }, "node_modules/syncpack/node_modules/semver": { "version": "7.3.5", "dev": true, @@ -21346,11 +19851,6 @@ "node": ">=10" } }, - "node_modules/syncpack/node_modules/yallist": { - "version": "4.0.0", - "dev": true, - "license": "ISC" - }, "node_modules/tapable": { "version": "2.2.1", "dev": true, @@ -21402,13 +19902,6 @@ "node": ">= 6" } }, - "node_modules/tar/node_modules/chownr": { - "version": "2.0.0", - "license": "ISC", - "engines": { - "node": ">=10" - } - }, "node_modules/tar/node_modules/minipass": { "version": "5.0.0", "license": "ISC", @@ -21416,10 +19909,6 @@ "node": ">=8" } }, - "node_modules/tar/node_modules/yallist": { - "version": "4.0.0", - "license": "ISC" - }, "node_modules/temp": { "version": "0.4.0", "dev": true, @@ -21744,17 +20233,6 @@ "node": "^14.15.0 || ^16.10.0 || >=18.0.0" } }, - "node_modules/ts-jest/node_modules/lru-cache": { - "version": "6.0.0", - "dev": true, - "license": "ISC", - "dependencies": { - "yallist": "^4.0.0" - }, - "engines": { - "node": ">=10" - } - }, "node_modules/ts-jest/node_modules/semver": { "version": "7.5.4", "dev": true, @@ -21769,11 +20247,6 @@ "node": ">=10" } }, - "node_modules/ts-jest/node_modules/yallist": { - "version": "4.0.0", - "dev": true, - "license": "ISC" - }, "node_modules/ts-jest/node_modules/yargs-parser": { "version": "21.1.1", "dev": true, @@ -21883,6 +20356,203 @@ "typescript": ">=2.8.0 || >= 3.2.0-dev || >= 3.3.0-dev || >= 3.4.0-dev || >= 3.5.0-dev || >= 3.6.0-dev || >= 3.6.0-beta || >= 3.7.0-dev || >= 3.7.0-beta" } }, + "node_modules/tuf-js": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/tuf-js/-/tuf-js-2.1.0.tgz", + "integrity": "sha512-eD7YPPjVlMzdggrOeE8zwoegUaG/rt6Bt3jwoQPunRiNVzgcCE009UDFJKJjG+Gk9wFu6W/Vi+P5d/5QpdD9jA==", + "dependencies": { + "@tufjs/models": "2.0.0", + "debug": "^4.3.4", + "make-fetch-happen": "^13.0.0" + }, + "engines": { + "node": "^16.14.0 || >=18.0.0" + } + }, + "node_modules/tuf-js/node_modules/@npmcli/fs": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/@npmcli/fs/-/fs-3.1.0.tgz", + "integrity": "sha512-7kZUAaLscfgbwBQRbvdMYaZOWyMEcPTH/tJjnyAWJ/dvvs9Ef+CERx/qJb9GExJpl1qipaDGn7KqHnFGGixd0w==", + "dependencies": { + "semver": "^7.3.5" + }, + "engines": { + "node": "^14.17.0 || ^16.13.0 || >=18.0.0" + } + }, + "node_modules/tuf-js/node_modules/brace-expansion": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz", + "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==", + "dependencies": { + "balanced-match": "^1.0.0" + } + }, + "node_modules/tuf-js/node_modules/cacache": { + "version": "18.0.2", + "resolved": "https://registry.npmjs.org/cacache/-/cacache-18.0.2.tgz", + "integrity": "sha512-r3NU8h/P+4lVUHfeRw1dtgQYar3DZMm4/cm2bZgOvrFC/su7budSOeqh52VJIC4U4iG1WWwV6vRW0znqBvxNuw==", + "dependencies": { + "@npmcli/fs": "^3.1.0", + "fs-minipass": "^3.0.0", + "glob": "^10.2.2", + "lru-cache": "^10.0.1", + "minipass": "^7.0.3", + "minipass-collect": "^2.0.1", + "minipass-flush": "^1.0.5", + "minipass-pipeline": "^1.2.4", + "p-map": "^4.0.0", + "ssri": "^10.0.0", + "tar": "^6.1.11", + "unique-filename": "^3.0.0" + }, + "engines": { + "node": "^16.14.0 || >=18.0.0" + } + }, + "node_modules/tuf-js/node_modules/fs-minipass": { + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/fs-minipass/-/fs-minipass-3.0.3.tgz", + "integrity": "sha512-XUBA9XClHbnJWSfBzjkm6RvPsyg3sryZt06BEQoXcF7EK/xpGaQYJgQKDJSUH5SGZ76Y7pFx1QBnXz09rU5Fbw==", + "dependencies": { + "minipass": "^7.0.3" + }, + "engines": { + "node": "^14.17.0 || ^16.13.0 || >=18.0.0" + } + }, + "node_modules/tuf-js/node_modules/glob": { + "version": "10.3.10", + "resolved": "https://registry.npmjs.org/glob/-/glob-10.3.10.tgz", + "integrity": "sha512-fa46+tv1Ak0UPK1TOy/pZrIybNNt4HCv7SDzwyfiOZkvZLEbjsZkJBPtDHVshZjbecAoAGSC20MjLDG/qr679g==", + "dependencies": { + "foreground-child": "^3.1.0", + "jackspeak": "^2.3.5", + "minimatch": "^9.0.1", + "minipass": "^5.0.0 || ^6.0.2 || ^7.0.0", + "path-scurry": "^1.10.1" + }, + "bin": { + "glob": "dist/esm/bin.mjs" + }, + "engines": { + "node": ">=16 || 14 >=14.17" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + } + }, + "node_modules/tuf-js/node_modules/lru-cache": { + "version": "10.1.0", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-10.1.0.tgz", + "integrity": "sha512-/1clY/ui8CzjKFyjdvwPWJUYKiFVXG2I2cY0ssG7h4+hwk+XOIX7ZSG9Q7TW8TW3Kp3BUSqgFWBLgL4PJ+Blag==", + "engines": { + "node": "14 || >=16.14" + } + }, + "node_modules/tuf-js/node_modules/make-fetch-happen": { + "version": "13.0.0", + "resolved": "https://registry.npmjs.org/make-fetch-happen/-/make-fetch-happen-13.0.0.tgz", + "integrity": "sha512-7ThobcL8brtGo9CavByQrQi+23aIfgYU++wg4B87AIS8Rb2ZBt/MEaDqzA00Xwv/jUjAjYkLHjVolYuTLKda2A==", + "dependencies": { + "@npmcli/agent": "^2.0.0", + "cacache": "^18.0.0", + "http-cache-semantics": "^4.1.1", + "is-lambda": "^1.0.1", + "minipass": "^7.0.2", + "minipass-fetch": "^3.0.0", + "minipass-flush": "^1.0.5", + "minipass-pipeline": "^1.2.4", + "negotiator": "^0.6.3", + "promise-retry": "^2.0.1", + "ssri": "^10.0.0" + }, + "engines": { + "node": "^16.14.0 || >=18.0.0" + } + }, + "node_modules/tuf-js/node_modules/minimatch": { + "version": "9.0.3", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.3.tgz", + "integrity": "sha512-RHiac9mvaRw0x3AYRgDC1CxAP7HTcNrrECeA8YYJeWnpo+2Q5CegtZjaotWTWxDG3UeGA1coE05iH1mPjT/2mg==", + "dependencies": { + "brace-expansion": "^2.0.1" + }, + "engines": { + "node": ">=16 || 14 >=14.17" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + } + }, + "node_modules/tuf-js/node_modules/minipass": { + "version": "7.0.4", + "resolved": "https://registry.npmjs.org/minipass/-/minipass-7.0.4.tgz", + "integrity": "sha512-jYofLM5Dam9279rdkWzqHozUo4ybjdZmCsDHePy5V/PbBcVMiSZR97gmAy45aqi8CK1lG2ECd356FU86avfwUQ==", + "engines": { + "node": ">=16 || 14 >=14.17" + } + }, + "node_modules/tuf-js/node_modules/minipass-collect": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/minipass-collect/-/minipass-collect-2.0.1.tgz", + "integrity": "sha512-D7V8PO9oaz7PWGLbCACuI1qEOsq7UKfLotx/C0Aet43fCUB/wfQ7DYeq2oR/svFJGYDHPr38SHATeaj/ZoKHKw==", + "dependencies": { + "minipass": "^7.0.3" + }, + "engines": { + "node": ">=16 || 14 >=14.17" + } + }, + "node_modules/tuf-js/node_modules/minipass-fetch": { + "version": "3.0.4", + "resolved": "https://registry.npmjs.org/minipass-fetch/-/minipass-fetch-3.0.4.tgz", + "integrity": "sha512-jHAqnA728uUpIaFm7NWsCnqKT6UqZz7GcI/bDpPATuwYyKwJwW0remxSCxUlKiEty+eopHGa3oc8WxgQ1FFJqg==", + "dependencies": { + "minipass": "^7.0.3", + "minipass-sized": "^1.0.3", + "minizlib": "^2.1.2" + }, + "engines": { + "node": "^14.17.0 || ^16.13.0 || >=18.0.0" + }, + "optionalDependencies": { + "encoding": "^0.1.13" + } + }, + "node_modules/tuf-js/node_modules/ssri": { + "version": "10.0.5", + "resolved": "https://registry.npmjs.org/ssri/-/ssri-10.0.5.tgz", + "integrity": "sha512-bSf16tAFkGeRlUNDjXu8FzaMQt6g2HZJrun7mtMbIPOddxt3GLMSz5VWUWcqTJUPfLEaDIepGxv+bYQW49596A==", + "dependencies": { + "minipass": "^7.0.3" + }, + "engines": { + "node": "^14.17.0 || ^16.13.0 || >=18.0.0" + } + }, + "node_modules/tuf-js/node_modules/unique-filename": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/unique-filename/-/unique-filename-3.0.0.tgz", + "integrity": "sha512-afXhuC55wkAmZ0P18QsVE6kp8JaxrEokN2HGIoIVv2ijHQd419H0+6EigAFcIzXeMIkcIkNBpB3L/DXB3cTS/g==", + "dependencies": { + "unique-slug": "^4.0.0" + }, + "engines": { + "node": "^14.17.0 || ^16.13.0 || >=18.0.0" + } + }, + "node_modules/tuf-js/node_modules/unique-slug": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/unique-slug/-/unique-slug-4.0.0.tgz", + "integrity": "sha512-WrcA6AyEfqDX5bWige/4NQfPZMtASNVxdmWR76WESYQVAACSgWcR6e9i0mofqqBxYFtL4oAxPIptY73/0YE1DQ==", + "dependencies": { + "imurmurhash": "^0.1.4" + }, + "engines": { + "node": "^14.17.0 || ^16.13.0 || >=18.0.0" + } + }, "node_modules/tweetnacl": { "version": "0.14.5", "license": "Unlicense" @@ -22008,6 +20678,7 @@ }, "node_modules/unique-filename": { "version": "1.1.1", + "dev": true, "license": "ISC", "dependencies": { "unique-slug": "^2.0.0" @@ -22015,6 +20686,7 @@ }, "node_modules/unique-slug": { "version": "2.0.2", + "dev": true, "license": "ISC", "dependencies": { "imurmurhash": "^0.1.4" @@ -22101,7 +20773,6 @@ }, "node_modules/validate-npm-package-license": { "version": "3.0.4", - "dev": true, "license": "Apache-2.0", "dependencies": { "spdx-correct": "^3.0.0", @@ -22110,6 +20781,7 @@ }, "node_modules/validate-npm-package-name": { "version": "3.0.0", + "dev": true, "license": "ISC", "dependencies": { "builtins": "^1.0.3" @@ -22193,8 +20865,9 @@ }, "node_modules/wide-align": { "version": "1.1.5", + "resolved": "https://zowe.jfrog.io/zowe/api/npm/npm-release/wide-align/-/wide-align-1.1.5.tgz", + "integrity": "sha512-eDMORYaPNZ4sQIuuYPDHdQvf4gyCF9rEEV/yPxGfwPkRodwEgiMUUXTx/dex+Me0wxx53S+NgUHaP7y3MGlDmg==", "dev": true, - "license": "ISC", "dependencies": { "string-width": "^1.0.2 || 2 || 3 || 4" } @@ -22284,6 +20957,23 @@ "url": "https://github.com/chalk/wrap-ansi?sponsor=1" } }, + "node_modules/wrap-ansi-cjs": { + "name": "wrap-ansi", + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz", + "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==", + "dependencies": { + "ansi-styles": "^4.0.0", + "string-width": "^4.1.0", + "strip-ansi": "^6.0.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/chalk/wrap-ansi?sponsor=1" + } + }, "node_modules/wrappy": { "version": "1.0.2", "license": "ISC" @@ -22466,8 +21156,9 @@ "license": "ISC" }, "node_modules/yallist": { - "version": "3.1.1", - "license": "ISC" + "version": "4.0.0", + "resolved": "https://zowe.jfrog.io/zowe/api/npm/npm-release/yallist/-/yallist-4.0.0.tgz", + "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==" }, "node_modules/yaml": { "version": "1.10.2", @@ -22701,7 +21392,7 @@ "mustache": "^2.3.0", "npm-package-arg": "^9.1.0", "opener": "^1.5.2", - "pacote": "^11.1.4", + "pacote": "^17.0.5", "prettyjson": "^1.2.2", "progress": "^2.0.3", "read": "^1.0.7", diff --git a/packages/imperative/package.json b/packages/imperative/package.json index 5f9008469e..79623261fb 100644 --- a/packages/imperative/package.json +++ b/packages/imperative/package.json @@ -67,7 +67,7 @@ "mustache": "^2.3.0", "npm-package-arg": "^9.1.0", "opener": "^1.5.2", - "pacote": "^11.1.4", + "pacote": "^17.0.5", "prettyjson": "^1.2.2", "progress": "^2.0.3", "read": "^1.0.7", From 93fd878a8998c1006680fc6119655a1d4d92c983 Mon Sep 17 00:00:00 2001 From: "Andrew W. Harn" Date: Mon, 8 Jan 2024 10:58:44 -0500 Subject: [PATCH 078/138] Attempt more test fixes Signed-off-by: Andrew W. Harn --- .../cli/src/workflows/create/Create.common.handler.ts | 8 ++++---- .../workflows/__tests__/__system__/Archive.system.test.ts | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/packages/cli/src/workflows/create/Create.common.handler.ts b/packages/cli/src/workflows/create/Create.common.handler.ts index 81452d6a90..12564c3183 100644 --- a/packages/cli/src/workflows/create/Create.common.handler.ts +++ b/packages/cli/src/workflows/create/Create.common.handler.ts @@ -65,7 +65,7 @@ export default class CreateCommonHandler extends ZosmfBaseHandler { ); } catch (err) { error = new ImperativeError({ - msg: "Deleting z/OSMF workflow with workflow name " + this.arguments.workflowName + " failed.\n" + err.msg, + msg: "Deleting z/OSMF workflow with workflow name " + this.arguments.workflowName + " failed.\n" + err, causeErrors: err.causeErrors, additionalDetails: err.additionalDetails }); @@ -90,7 +90,7 @@ export default class CreateCommonHandler extends ZosmfBaseHandler { ); } catch (err) { error = new ImperativeError({ - msg: "Creating z/OSMF workflow with data set: " + this.arguments.dataSet + " failed.\n" + err.msg, + msg: "Creating z/OSMF workflow with data set: " + this.arguments.dataSet + " failed.\n" + err, causeErrors: err.causeErrors, additionalDetails: err.additionalDetails }); @@ -122,7 +122,7 @@ export default class CreateCommonHandler extends ZosmfBaseHandler { ); } catch (err) { error = new ImperativeError({ - msg: "Creating z/OSMF workflow with uss file: " + this.arguments.ussFile + " failed.\n" + err.msg, + msg: "Creating z/OSMF workflow with uss file: " + this.arguments.ussFile + " failed.\n" + err, causeErrors: err.causeErrors, additionalDetails: err.additionalDetails }); @@ -156,7 +156,7 @@ export default class CreateCommonHandler extends ZosmfBaseHandler { ); } catch (err) { error = new ImperativeError({ - msg: "Creating z/OSMF workflow with local file: " + this.arguments.localFile + " failed.\n" + err.msg, + msg: "Creating z/OSMF workflow with local file: " + this.arguments.localFile + " failed.\n" + err, causeErrors: err.causeErrors, additionalDetails: err.additionalDetails }); diff --git a/packages/workflows/__tests__/__system__/Archive.system.test.ts b/packages/workflows/__tests__/__system__/Archive.system.test.ts index a77f162a4d..9f36a9e00e 100644 --- a/packages/workflows/__tests__/__system__/Archive.system.test.ts +++ b/packages/workflows/__tests__/__system__/Archive.system.test.ts @@ -172,7 +172,7 @@ describe("Errors caused by the user interaction", () => { } catch (error) { Imperative.console.info(JSON.stringify(error)); expect(error.mDetails.errorCode).toEqual(404); - expect(JSON.parse(error.causeErrors).message).toContain("IZUWF5001W"); + expect(error.mDetails.message).toContain("IZUWF5001W"); // https://www.ibm.com/docs/en/zos/2.5.0?topic=izuwf9999-izuwf5001w } }); @@ -191,7 +191,7 @@ describe("Errors caused by the user interaction", () => { } catch (error) { Imperative.console.info(error); expect(error.mDetails.errorCode).toBe(409); - expect(JSON.parse(error.causeErrors).message).toContain("IZUWF0158E"); + expect(error.mDetails.message).toContain("IZUWF0158E"); // https://www.ibm.com/docs/en/zos/2.5.0?topic=izuwf9999-izuwf0158e } await removeWorkflows(); From 6d455b678a986ba8972ddd087b2103962a0b5821 Mon Sep 17 00:00:00 2001 From: Gene Johnston Date: Mon, 8 Jan 2024 12:35:06 -0500 Subject: [PATCH 079/138] Add causeErrors.message as another source of error message. Signed-off-by: Gene Johnston --- packages/core/src/rest/ZosmfRestClient.ts | 3 +++ 1 file changed, 3 insertions(+) diff --git a/packages/core/src/rest/ZosmfRestClient.ts b/packages/core/src/rest/ZosmfRestClient.ts index aa5d8ae2e5..845d72ac63 100644 --- a/packages/core/src/rest/ZosmfRestClient.ts +++ b/packages/core/src/rest/ZosmfRestClient.ts @@ -90,6 +90,9 @@ export class ZosmfRestClient extends RestClient { original.msg += "\n" + message.messageContent; } } + if (causeErrorsJson?.message?.length > 0) { + original.msg += "\n" + causeErrorsJson.message; + } // add further clarification on authentication errors if (this.response && this.response.statusCode === RestConstants.HTTP_STATUS_401) { From b179da5a5331c5ad16226939a21c1e7e55041302 Mon Sep 17 00:00:00 2001 From: "Andrew W. Harn" Date: Mon, 8 Jan 2024 14:00:43 -0500 Subject: [PATCH 080/138] Revert changes Signed-off-by: Andrew W. Harn --- .../__system__/api/Create.system.test.ts | 38 ++++++------ .../methods/download/Download.system.test.ts | 4 +- .../__system__/CancelJobs.system.test.ts | 14 ++--- .../__system__/DeleteJobs.system.test.ts | 12 ++-- .../__system__/DownloadJobs.system.test.ts | 27 ++++----- .../__system__/GetJobs.system.test.ts | 8 +-- .../__system__/MonitorJobs.system.test.ts | 14 ++--- .../__system__/SubmitJobs.system.test.ts | 58 +++++++++---------- 8 files changed, 86 insertions(+), 89 deletions(-) diff --git a/packages/workflows/__tests__/__system__/api/Create.system.test.ts b/packages/workflows/__tests__/__system__/api/Create.system.test.ts index 69e3d3c143..e697a8248a 100644 --- a/packages/workflows/__tests__/__system__/api/Create.system.test.ts +++ b/packages/workflows/__tests__/__system__/api/Create.system.test.ts @@ -236,7 +236,7 @@ describe("Create workflow", () => { it("Throws an error with wrong format of workflow definition file. Wrong member name.", async () => { const error = await produceError(REAL_SESSION, wfName, "DS.NAME(0)", system, owner); expect(error.errorCode).toEqual(notFound); - expect(error.causeErrors).toContain(messageId); + expect(error.message).toContain(messageId); }); }); describe("IZUWF0103E", () => { @@ -245,52 +245,52 @@ describe("Create workflow", () => { it("Throws an error with wrong format of workflow definition file.", async () => { const error = await produceError(REAL_SESSION, wfName, "wrongPath", system, owner); expect(error.errorCode).toEqual(status400); - expect(error.causeErrors).toContain(messageId); + expect(error.message).toContain(messageId); }); it("Throws an error with wrong format of workflow definition file. Name that ends with a period.", async () => { const error = await produceError(REAL_SESSION, wfName, "DS.NAME.", system, owner); expect(error.errorCode).toEqual(status400); - expect(error.causeErrors).toContain(messageId); + expect(error.message).toContain(messageId); }); it("Throws an error with wrong format of workflow definition file. Path not from root.", async () => { const error = await produceError(REAL_SESSION, wfName, "home/file", system, owner); expect(error.errorCode).toEqual(status400); - expect(error.causeErrors).toContain(messageId); + expect(error.message).toContain(messageId); }); it("Throws an error with wrong format of workflow definition file. Qualifier is longer than 8 characters.", async () => { const error = await produceError(REAL_SESSION, wfName, "DS.NAME.LONGFIELD", system, owner); expect(error.errorCode).toEqual(status400); - expect(error.causeErrors).toContain(messageId); + expect(error.message).toContain(messageId); }); it("Throws an error with wrong format of workflow definition file. More than 44 characters for DSNAME alone.", async () => { const error = await produceError(REAL_SESSION, wfName, "DS.NAME.STUFF.STUFF.STUFF.STUFF.STUFF.STUFF.STUFF.STUFF", system, owner); expect(error.errorCode).toEqual(status400); - expect(error.causeErrors).toContain(messageId); + expect(error.message).toContain(messageId); }); it("Throws an error with wrong format of workflow definition file. Name containing two successive periods.", async () => { const error = await produceError(REAL_SESSION, wfName, "DS..NAME", system, owner); expect(error.errorCode).toEqual(status400); - expect(error.causeErrors).toContain(messageId); + expect(error.message).toContain(messageId); }); it("Throws an error with wrong format of definition file. Name contains a qualifier that starts with numeric character.", async () => { const error = await produceError(REAL_SESSION, wfName, "DS.123.NAME", system, owner); expect(error.errorCode).toEqual(status400); - expect(error.causeErrors).toContain(messageId); + expect(error.message).toContain(messageId); }); it("Throws an error with wrong format of workflow definition file. Member name is too long.", async () => { const error = await produceError(REAL_SESSION, wfName, "DS.NAME(MEMBER123)", system, owner); expect(error.errorCode).toEqual(status400); - expect(error.causeErrors).toContain(messageId); + expect(error.message).toContain(messageId); }); it("Throws an error with wrong format of workflow definition file. Member doesn't end with `)`.", async () => { const error = await produceError(REAL_SESSION, wfName, "DS.NAME(MEMBER", system, owner); expect(error.errorCode).toEqual(status400); - expect(error.causeErrors).toContain(messageId); + expect(error.message).toContain(messageId); }); it("Throws an error with wrong format of workflow definition file. Name contains non-allowed character.", async () => { const error = await produceError(REAL_SESSION, wfName, "DS.NAME%", system, owner); expect(error.errorCode).toEqual(status400); - expect(error.causeErrors).toContain(messageId); + expect(error.message).toContain(messageId); }); }); describe("IZUWF0105E", () => { @@ -299,12 +299,12 @@ describe("Create workflow", () => { it("Throws an error with wrong format of variable input file. Name does not exist.", async () => { const error = await produceError(REAL_SESSION, wfName, definitionFile, system, owner, "DS.NAME.WRONG"); expect(error.errorCode).toEqual(status400); - expect(error.causeErrors).toContain(messageId); + expect(error.message).toContain(messageId); }); it("Throws an error with wrong format of variable input file. Wrong member name.", async () => { const error = await produceError(REAL_SESSION, wfName, definitionFile, system, owner, "DS.NAME(0)"); expect(error.errorCode).toEqual(status400); - expect(error.causeErrors).toContain(messageId); + expect(error.message).toContain(messageId); }); }); describe("IZUWF0107E", () => { @@ -313,33 +313,33 @@ describe("Create workflow", () => { it("Throws an error with wrong format of variable input file. Name that ends with a period.", async () => { const error = await produceError(REAL_SESSION, wfName, definitionFile, system, owner, "DS.NAME."); expect(error.errorCode).toEqual(status400); - expect(error.causeErrors).toContain(messageId); + expect(error.message).toContain(messageId); }); it("Throws an error with wrong format of variable input file. More than 44 characters for DSNAME alone.", async () => { const error = await produceError(REAL_SESSION, wfName, definitionFile, system, owner, "DS.NAME.STUFF.STUFF.STUFF.STUFF.STUFF.STUFF.STUFF.STUFF"); expect(error.errorCode).toEqual(status400); - expect(error.causeErrors).toContain(messageId); + expect(error.message).toContain(messageId); }); it("Throws an error with wrong format of variable input file. Name containing two successive periods.", async () => { const error = await produceError(REAL_SESSION, wfName, definitionFile, system, owner, "DS..NAME"); expect(error.errorCode).toEqual(status400); - expect(error.causeErrors).toContain(messageId); + expect(error.message).toContain(messageId); }); it("Name that contains a qualifier that starts with non-alphabetic or non-special character.", async () => { const error = await produceError(REAL_SESSION, wfName, definitionFile, system, owner, "DS.123.NAME"); expect(error.errorCode).toEqual(status400); - expect(error.causeErrors).toContain(messageId); + expect(error.message).toContain(messageId); }); it("Throws an error with wrong format of variable input file. Qualifier is longer than 8 characters.", async () => { const error = await produceError(REAL_SESSION, wfName, definitionFile, system, owner, "DS.NAME.LONGFIELD"); expect(error.errorCode).toEqual(status400); - expect(error.causeErrors).toContain(messageId); + expect(error.message).toContain(messageId); }); it("Throws an error with wrong format of variable input file. Path not from root.", async () => { const error = await produceError(REAL_SESSION, wfName, definitionFile, system, owner, "home/file"); expect(error.errorCode).toEqual(status400); - expect(error.causeErrors).toContain(messageId); + expect(error.message).toContain(messageId); }); }); }); diff --git a/packages/zosfiles/__tests__/__system__/methods/download/Download.system.test.ts b/packages/zosfiles/__tests__/__system__/methods/download/Download.system.test.ts index 7004b36fbe..31880e168e 100644 --- a/packages/zosfiles/__tests__/__system__/methods/download/Download.system.test.ts +++ b/packages/zosfiles/__tests__/__system__/methods/download/Download.system.test.ts @@ -963,7 +963,7 @@ describe("Download Data Set", () => { expect(response).toBeFalsy(); expect(error).toBeTruthy(); - expect(JSON.parse(error.causeErrors).message).toContain("Data set not found."); + expect(stripNewLines(error.message)).toContain("Data set not found."); }); }); @@ -1508,7 +1508,7 @@ describe("Download Data Set", () => { caughtError = error; } expect(caughtError).toBeDefined(); - expect(JSON.parse(caughtError.causeErrors).message).toContain("Path name not found"); + expect(stripNewLines(caughtError.message)).toContain("Path name not found"); }); }); }); diff --git a/packages/zosjobs/__tests__/__system__/CancelJobs.system.test.ts b/packages/zosjobs/__tests__/__system__/CancelJobs.system.test.ts index 6833784057..06822f259d 100644 --- a/packages/zosjobs/__tests__/__system__/CancelJobs.system.test.ts +++ b/packages/zosjobs/__tests__/__system__/CancelJobs.system.test.ts @@ -9,7 +9,7 @@ * */ -import { ImperativeError, Session } from "@zowe/imperative"; +import { ImperativeError, Session, RestClientError } from "@zowe/imperative"; import { CancelJobs, SubmitJobs, IJob } from "../../src"; import { ITestEnvironment } from "@zowe/cli-test-utils"; import { TestEnvironment } from "../../../../__tests__/__src__/environment/TestEnvironment"; @@ -120,7 +120,7 @@ describe("CancelJobs System tests", () => { describe("Negative tests", () => { it("should surface errors from z/OSMF when trying to cancel a non existent job with cancelJob", async () => { - let err: ImperativeError; + let err: ImperativeError | RestClientError | Error; try { await CancelJobs.cancelJob(REAL_SESSION, "FAKEJOB", "JOB00001"); } catch (e) { @@ -128,11 +128,11 @@ describe("CancelJobs System tests", () => { } expect(err).toBeDefined(); expect(err instanceof ImperativeError).toEqual(true); - expect(JSON.parse(err.causeErrors).message).toContain("FAKEJOB"); + expect(err.message).toContain("FAKEJOB"); }); it("should surface errors from z/OSMF when trying to cancel a non-existent job using cancelJobForJob", async () => { - let err: ImperativeError; + let err: Error | ImperativeError; const badJob: IJob = { "jobid": "JOB00001", "jobname": "FAKEJOB", @@ -155,11 +155,11 @@ describe("CancelJobs System tests", () => { } expect(err).toBeDefined(); expect(err instanceof ImperativeError).toEqual(true); - expect(JSON.parse(err.causeErrors).message).toContain("FAKEJOB"); + expect(err.message).toContain("FAKEJOB"); }); it("should surface errors from z/OSMF when trying to cancel a non-existent job using cancelJobCommon", async () => { - let err: ImperativeError; + let err: Error | ImperativeError; try { await CancelJobs.cancelJobCommon(REAL_SESSION, {jobname: "FAKEJOB", jobid: "JOB00001"}); } catch (e) { @@ -167,7 +167,7 @@ describe("CancelJobs System tests", () => { } expect(err).toBeDefined(); expect(err instanceof ImperativeError).toEqual(true); - expect(JSON.parse(err.causeErrors).message).toContain("FAKEJOB"); + expect(err.message).toContain("FAKEJOB"); }); }); }); diff --git a/packages/zosjobs/__tests__/__system__/DeleteJobs.system.test.ts b/packages/zosjobs/__tests__/__system__/DeleteJobs.system.test.ts index bad52fe8d6..a12dc6957c 100644 --- a/packages/zosjobs/__tests__/__system__/DeleteJobs.system.test.ts +++ b/packages/zosjobs/__tests__/__system__/DeleteJobs.system.test.ts @@ -80,7 +80,7 @@ describe("DeleteJobs System tests", () => { describe("Negative tests", () => { it("should surface errors from z/OSMF when trying to delete a non existent job with deleteJob", async () => { - let err: ImperativeError; + let err: Error | ImperativeError; try { await DeleteJobs.deleteJob(REAL_SESSION, "FAKEJOB", "JOB00001"); } catch (e) { @@ -88,11 +88,11 @@ describe("DeleteJobs System tests", () => { } expect(err).toBeDefined(); expect(err instanceof ImperativeError).toEqual(true); - expect(JSON.parse(err.causeErrors).message).toContain("FAKEJOB"); + expect(err.message).toContain("FAKEJOB"); }); it("should surface errors from z/OSMF when trying to delete a non-existent job using deleteJobForJob", async () => { - let err: ImperativeError; + let err: Error | ImperativeError; const badJob: IJob = { "jobid": "JOB00001", "jobname": "FAKEJOB", @@ -115,11 +115,11 @@ describe("DeleteJobs System tests", () => { } expect(err).toBeDefined(); expect(err instanceof ImperativeError).toEqual(true); - expect(JSON.parse(err.causeErrors).message).toContain("FAKEJOB"); + expect(err.message).toContain("FAKEJOB"); }); it("should surface errors from z/OSMF when trying to delete a non-existent job using deleteJobCommon", async () => { - let err: ImperativeError; + let err: Error | ImperativeError; try { await DeleteJobs.deleteJobCommon(REAL_SESSION, {jobname: "FAKEJOB", jobid: "JOB00001"}); } catch (e) { @@ -127,7 +127,7 @@ describe("DeleteJobs System tests", () => { } expect(err).toBeDefined(); expect(err instanceof ImperativeError).toEqual(true); - expect(JSON.parse(err.causeErrors).message).toContain("FAKEJOB"); + expect(err.message).toContain("FAKEJOB"); }); }); }); diff --git a/packages/zosjobs/__tests__/__system__/DownloadJobs.system.test.ts b/packages/zosjobs/__tests__/__system__/DownloadJobs.system.test.ts index 16b740c780..a1dc9bfe70 100644 --- a/packages/zosjobs/__tests__/__system__/DownloadJobs.system.test.ts +++ b/packages/zosjobs/__tests__/__system__/DownloadJobs.system.test.ts @@ -203,7 +203,7 @@ describe("Download Jobs - System tests", () => { it("should encounter an error if a non existent spool file is passed to downloadSpoolContentCommon", async () => { - let err: ImperativeError; + let err: Error | ImperativeError; try { await DownloadJobs.downloadSpoolContentCommon(REAL_SESSION, { jobFile: badJobFile, @@ -214,15 +214,14 @@ describe("Download Jobs - System tests", () => { } expect(err).toBeDefined(); expect(err instanceof ImperativeError).toEqual(true); - const jsonCauseErrors = JSON.parse(err.causeErrors); - expect(jsonCauseErrors.message).toContain(jobname); - expect(jsonCauseErrors.message).toContain(jobid); - expect(jsonCauseErrors.message).toContain("does not contain"); + expect(err.message).toContain(jobname); + expect(err.message).toContain(jobid); + expect(err.message).toContain("does not contain"); }); it("should encounter an error if a non existent jobname/jobid is passed to downloadAllSpoolContentCommon", async () => { - let err: ImperativeError; + let err: Error | ImperativeError; try { await DownloadJobs.downloadAllSpoolContentCommon(REAL_SESSION, { jobname: "FAKEJOB", @@ -234,15 +233,14 @@ describe("Download Jobs - System tests", () => { } expect(err).toBeDefined(); expect(err instanceof ImperativeError).toEqual(true); - const jsonCauseErrors = JSON.parse(err.causeErrors); - expect(jsonCauseErrors.message).toContain("FAKEJOB"); - expect(jsonCauseErrors.message).toContain("JOBABCD"); - expect(jsonCauseErrors.message).toContain("Failed to lookup"); + expect(err.message).toContain("FAKEJOB"); + expect(err.message).toContain("JOBABCD"); + expect(err.message).toContain("Failed to lookup"); }); it("should encounter an error if a non existent spool file is passed to downloadSpoolContent", async () => { - let err: ImperativeError; + let err: Error | ImperativeError; try { await DownloadJobs.downloadSpoolContent(REAL_SESSION, badJobFile); } catch (e) { @@ -250,10 +248,9 @@ describe("Download Jobs - System tests", () => { } expect(err).toBeDefined(); expect(err instanceof ImperativeError).toEqual(true); - const jsonCauseErrors = JSON.parse(err.causeErrors); - expect(jsonCauseErrors.message).toContain(jobname); - expect(jsonCauseErrors.message).toContain(jobid); - expect(jsonCauseErrors.message).toContain("does not contain"); + expect(err.message).toContain(jobname); + expect(err.message).toContain(jobid); + expect(err.message).toContain("does not contain"); }); }); diff --git a/packages/zosjobs/__tests__/__system__/GetJobs.system.test.ts b/packages/zosjobs/__tests__/__system__/GetJobs.system.test.ts index aa8f6d58fb..b0c0a15458 100644 --- a/packages/zosjobs/__tests__/__system__/GetJobs.system.test.ts +++ b/packages/zosjobs/__tests__/__system__/GetJobs.system.test.ts @@ -268,7 +268,7 @@ describe("Get Jobs - System Tests", () => { expect(jsonCauseErrors.reason).toEqual(4); expect(jsonCauseErrors.rc).toEqual(4); expect(trimmedErrorMessage).toContain("status 400"); - expect(jsonCauseErrors.message).toContain("prefix query parameter"); + expect(trimmedErrorMessage).toContain("prefix query parameter"); }); }); @@ -406,7 +406,7 @@ describe("Get Jobs - System Tests", () => { expect(jsonCauseErrors.reason).toEqual(4); expect(jsonCauseErrors.rc).toEqual(4); expect(trimmedErrorMessage).toContain("status 400"); - expect(jsonCauseErrors.message).toContain("owner query parameter"); + expect(trimmedErrorMessage).toContain("owner query parameter"); }); }); @@ -618,7 +618,7 @@ describe("Get Status APIs", () => { expect(jsonCauseErrors.reason).toEqual(7); expect(jsonCauseErrors.rc).toEqual(4); expect(trimmedErrorMessage).toContain("status 400"); - expect(jsonCauseErrors.message).toContain("JOB123"); + expect(trimmedErrorMessage).toContain("JOB123"); }); it("should detect and surface an error for an invalid jobid", async () => { @@ -955,7 +955,7 @@ describe("Get JCL APIs", () => { const trimmedErrorMessage = trimMessage(error.message); const jsonCauseErrors = JSON.parse(error.causeErrors); expect(trimmedErrorMessage).toContain("status 400"); - expect(jsonCauseErrors.message).toContain(job.jobid); + expect(trimmedErrorMessage).toContain(job.jobid); }); }); diff --git a/packages/zosjobs/__tests__/__system__/MonitorJobs.system.test.ts b/packages/zosjobs/__tests__/__system__/MonitorJobs.system.test.ts index c0e5a49f65..5d3b09ba45 100644 --- a/packages/zosjobs/__tests__/__system__/MonitorJobs.system.test.ts +++ b/packages/zosjobs/__tests__/__system__/MonitorJobs.system.test.ts @@ -119,7 +119,7 @@ describe("System Tests - Monitor Jobs", () => { expect(jsonCauseErrors.reason).toEqual(10); expect(jsonCauseErrors.rc).toEqual(4); expect(trimmedErrorMessage).toContain("status 400"); - expect(jsonCauseErrors.message).toContain("No job found for reference"); + expect(trimmedErrorMessage).toContain("No job found for reference"); }); }); @@ -204,7 +204,7 @@ describe("System Tests - Monitor Jobs", () => { expect(jsonCauseErrors.reason).toEqual(10); expect(jsonCauseErrors.rc).toEqual(4); expect(trimmedErrorMessage).toContain("status 400"); - expect(jsonCauseErrors.message).toContain("No job found for reference"); + expect(trimmedErrorMessage).toContain("No job found for reference"); }); }); @@ -288,7 +288,7 @@ describe("System Tests - Monitor Jobs", () => { expect(jsonCauseErrors.reason).toEqual(7); expect(jsonCauseErrors.rc).toEqual(4); expect(trimmedErrorMessage).toContain("status 400"); - expect(jsonCauseErrors.message).toContain("No match for method GET and pathInfo"); + expect(trimmedErrorMessage).toContain("No match for method GET and pathInfo"); }); it("should detect and surface an error message if an invalid jobid is specified", async () => { @@ -309,7 +309,7 @@ describe("System Tests - Monitor Jobs", () => { expect(jsonCauseErrors.reason).toEqual(7); expect(jsonCauseErrors.rc).toEqual(4); expect(trimmedErrorMessage).toContain("status 400"); - expect(jsonCauseErrors.message).toContain("No match for method GET and pathInfo"); + expect(trimmedErrorMessage).toContain("No match for method GET and pathInfo"); }); it("should detect and surface an error if the job requested is not found", async () => { @@ -330,7 +330,7 @@ describe("System Tests - Monitor Jobs", () => { expect(jsonCauseErrors.reason).toEqual(10); expect(jsonCauseErrors.rc).toEqual(4); expect(trimmedErrorMessage).toContain("status 400"); - expect(jsonCauseErrors.message).toContain("No job found for reference"); + expect(trimmedErrorMessage).toContain("No job found for reference"); }); }); @@ -477,7 +477,7 @@ describe("System Tests - Monitor Jobs", () => { expect(jsonCauseErrors.reason).toEqual(10); expect(jsonCauseErrors.rc).toEqual(4); expect(trimmedErrorMessage).toContain("status 400"); - expect(jsonCauseErrors.message).toContain("No job found for reference"); + expect(trimmedErrorMessage).toContain("No job found for reference"); if (!doneCalled) { doneCalled = true; done(); @@ -974,7 +974,7 @@ describe("System Tests - Monitor Jobs - Encoded", () => { expect(jsonCauseErrors.reason).toEqual(10); expect(jsonCauseErrors.rc).toEqual(4); expect(trimmedErrorMessage).toContain("status 400"); - expect(jsonCauseErrors.message).toContain("No job found for reference"); + expect(trimmedErrorMessage).toContain("No job found for reference"); if (!doneCalled) { doneCalled = true; done(); diff --git a/packages/zosjobs/__tests__/__system__/SubmitJobs.system.test.ts b/packages/zosjobs/__tests__/__system__/SubmitJobs.system.test.ts index bc03f439bd..415705ee9a 100644 --- a/packages/zosjobs/__tests__/__system__/SubmitJobs.system.test.ts +++ b/packages/zosjobs/__tests__/__system__/SubmitJobs.system.test.ts @@ -241,7 +241,7 @@ describe("Submit Jobs - System Tests", () => { it("should surface an error from z/OSMF when calling submitJclCommon with an invalid JCL", async () => { - let err: ImperativeError; + let err: Error | ImperativeError; try { await SubmitJobs.submitJclCommon(REAL_SESSION, { jcl: badJCL @@ -251,13 +251,13 @@ describe("Submit Jobs - System Tests", () => { } expect(err).toBeDefined(); expect(err instanceof ImperativeError).toEqual(true); - expect(JSON.parse(err.causeErrors).message).toContain("does not start with a slash"); + expect(err.message).toContain("does not start with a slash"); }); it("should surface an error from z/OSMF when calling submitJcl with an invalid JCL", async () => { - let err: ImperativeError; + let err: Error | ImperativeError; try { await SubmitJobs.submitJcl(REAL_SESSION, badJCL @@ -267,13 +267,13 @@ describe("Submit Jobs - System Tests", () => { } expect(err).toBeDefined(); expect(err instanceof ImperativeError).toEqual(true); - expect(JSON.parse(err.causeErrors).message).toContain("does not start with a slash"); + expect(err.message).toContain("does not start with a slash"); }); it("should surface an error from z/OSMF when calling submitJcl with an invalid JCL with internal reader settings", async () => { - let err: ImperativeError; + let err: Error | ImperativeError; let jcl = badJCL + "\nLONGDD DD *\n"; const twoHundredChars = 200; jcl += Array(twoHundredChars).join("A"); // add a long line to test internal reader @@ -288,13 +288,13 @@ describe("Submit Jobs - System Tests", () => { } expect(err).toBeDefined(); expect(err instanceof ImperativeError).toEqual(true); - expect(JSON.parse(err.causeErrors).message).toContain("does not start with a slash"); + expect(err.message).toContain("does not start with a slash"); }); it("should surface an error from z/OSMF when calling submitJclNotifyCommon with invalid JCL (with internal reader settings)", async () => { - let err: ImperativeError; + let err: Error | ImperativeError; let jcl = badJCL + "\nLONGDD DD *\n"; const twoHundredChars = 200; jcl += Array(twoHundredChars).join("A"); // add a long line to test internal reader @@ -312,11 +312,11 @@ describe("Submit Jobs - System Tests", () => { } expect(err).toBeDefined(); expect(err instanceof ImperativeError).toEqual(true); - expect(JSON.parse(err.causeErrors).message).toContain("does not start with a slash"); + expect(err.message).toContain("does not start with a slash"); }, LONG_TIMEOUT); it("should surface an error from z/OSMF when calling submitJobCommon with a non existent data set", async () => { - let err: ImperativeError; + let err: Error | ImperativeError; try { await SubmitJobs.submitJobCommon(REAL_SESSION, { jobDataSet: badDataSet @@ -326,11 +326,11 @@ describe("Submit Jobs - System Tests", () => { } expect(err).toBeDefined(); expect(err instanceof ImperativeError).toEqual(true); - expect(JSON.parse(err.causeErrors).message).toContain(badDataSet); + expect(err.message).toContain(badDataSet); }); it("should surface an error from z/OSMF when calling submitJobCommon with a non existent uss file", async () => { - let err: ImperativeError; + let err: Error | ImperativeError; try { await SubmitJobs.submitJobCommon(REAL_SESSION, { jobUSSFile: badUSSFile @@ -340,11 +340,11 @@ describe("Submit Jobs - System Tests", () => { } expect(err).toBeDefined(); expect(err instanceof ImperativeError).toEqual(true); - expect(JSON.parse(err.causeErrors).message).toContain(badUSSFile); + expect(err.message).toContain(badUSSFile); }); it("should surface an error from z/OSMF when calling submitJobNotifyCommon with a non existent data set", async () => { - let err: ImperativeError; + let err: Error | ImperativeError; try { await SubmitJobs.submitJobNotifyCommon(REAL_SESSION, { jobDataSet: badDataSet @@ -354,11 +354,11 @@ describe("Submit Jobs - System Tests", () => { } expect(err).toBeDefined(); expect(err instanceof ImperativeError).toEqual(true); - expect(JSON.parse(err.causeErrors).message).toContain(badDataSet); + expect(err.message).toContain(badDataSet); }, LONG_TIMEOUT); it("should surface an error from z/OSMF when calling submitJobNotifyCommon with a non existent uss file", async () => { - let err: ImperativeError; + let err: Error | ImperativeError; try { await SubmitJobs.submitJobNotifyCommon(REAL_SESSION, { jobUSSFile: badUSSFile @@ -368,11 +368,11 @@ describe("Submit Jobs - System Tests", () => { } expect(err).toBeDefined(); expect(err instanceof ImperativeError).toEqual(true); - expect(JSON.parse(err.causeErrors).message).toContain(badUSSFile); + expect(err.message).toContain(badUSSFile); }, LONG_TIMEOUT); it("should surface an error from z/OSMF when calling submitJclNotify with invalid JCL", async () => { - let err: ImperativeError; + let err: Error | ImperativeError; let jcl = badJCL + "\nLONGDD DD *\n"; const twoHundredChars = 200; jcl += Array(twoHundredChars).join("A"); // add a long line to test internal reader @@ -385,11 +385,11 @@ describe("Submit Jobs - System Tests", () => { } expect(err).toBeDefined(); expect(err instanceof ImperativeError).toEqual(true); - expect(JSON.parse(err.causeErrors).message).toContain("does not start with a slash"); + expect(err.message).toContain("does not start with a slash"); }, LONG_TIMEOUT); it("should surface an error from z/OSMF when calling submitJobNotify with a non existent data set", async () => { - let err: ImperativeError; + let err: Error | ImperativeError; try { await SubmitJobs.submitJobNotify(REAL_SESSION, badDataSet @@ -399,11 +399,11 @@ describe("Submit Jobs - System Tests", () => { } expect(err).toBeDefined(); expect(err instanceof ImperativeError).toEqual(true); - expect(JSON.parse(err.causeErrors).message).toContain(badDataSet); + expect(err.message).toContain(badDataSet); }, LONG_TIMEOUT); it("should surface an error from z/OSMF when calling submitUSSJobNotify with a non existent uss file", async () => { - let err: ImperativeError; + let err: Error | ImperativeError; try { await SubmitJobs.submitUSSJobNotify(REAL_SESSION, badUSSFile @@ -413,11 +413,11 @@ describe("Submit Jobs - System Tests", () => { } expect(err).toBeDefined(); expect(err instanceof ImperativeError).toEqual(true); - expect(JSON.parse(err.causeErrors).message).toContain(badUSSFile); + expect(err.message).toContain(badUSSFile); }, LONG_TIMEOUT); it("should surface an error from z/OSMF when calling submitJob with a non existent data set", async () => { - let err: ImperativeError; + let err: Error | ImperativeError; try { await SubmitJobs.submitJob(REAL_SESSION, badDataSet @@ -427,11 +427,11 @@ describe("Submit Jobs - System Tests", () => { } expect(err).toBeDefined(); expect(err instanceof ImperativeError).toEqual(true); - expect(JSON.parse(err.causeErrors).message).toContain(badDataSet); + expect(err.message).toContain(badDataSet); }); it("should surface an error from z/OSMF when calling submitUSSJob with a non existent USS file", async () => { - let err: ImperativeError; + let err: Error | ImperativeError; try { await SubmitJobs.submitUSSJob(REAL_SESSION, badUSSFile @@ -441,11 +441,11 @@ describe("Submit Jobs - System Tests", () => { } expect(err).toBeDefined(); expect(err instanceof ImperativeError).toEqual(true); - expect(JSON.parse(err.causeErrors).message).toContain(badUSSFile); + expect(err.message).toContain(badUSSFile); }); it("should throw an error if the JCL string is null", async () => { - let err: ImperativeError; + let err: Error | ImperativeError; try { await SubmitJobs.submitJclString(REAL_SESSION, null, {jclSource: "stdoin"}); } catch (e) { @@ -453,11 +453,11 @@ describe("Submit Jobs - System Tests", () => { } expect(err).toBeDefined(); expect(err instanceof ImperativeError).toEqual(true); - expect(err.message).toContain(ZosJobsMessages.missingJcl.message); + expect(err.message.toString()).toContain(ZosJobsMessages.missingJcl.message); }); it("should throw an error if the JCL is an empty string", async () => { - let err: ImperativeError; + let err: Error | ImperativeError; try { await SubmitJobs.submitJclString(REAL_SESSION, "", {jclSource: "stdoin"}); } catch (e) { From 3896115d249ee0f3194749b41929a280ac7a1808 Mon Sep 17 00:00:00 2001 From: "Andrew W. Harn" Date: Mon, 8 Jan 2024 14:00:53 -0500 Subject: [PATCH 081/138] Resolve extra parsing Signed-off-by: Andrew W. Harn --- .../__tests__/__system__/methods/CheckStatus.system.test.ts | 4 ++-- .../__system__/methods/ListDefinedSystems.system.test.ts | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/packages/zosmf/__tests__/__system__/methods/CheckStatus.system.test.ts b/packages/zosmf/__tests__/__system__/methods/CheckStatus.system.test.ts index 620f0b5483..0c99be92ea 100644 --- a/packages/zosmf/__tests__/__system__/methods/CheckStatus.system.test.ts +++ b/packages/zosmf/__tests__/__system__/methods/CheckStatus.system.test.ts @@ -92,7 +92,7 @@ describe("Check Status Api", () => { expect(error).toBeTruthy(); expect(response).toBeFalsy(); - const jsonCauseErrors = JSON.parse(error.causeErrors); + const jsonCauseErrors = error.causeErrors; expect(jsonCauseErrors.code).toEqual("ENOTFOUND"); expect(jsonCauseErrors.syscall).toEqual("getaddrinfo"); expect(jsonCauseErrors.hostname).toEqual(badHostName); @@ -121,7 +121,7 @@ describe("Check Status Api", () => { expect(error).toBeTruthy(); expect(response).toBeFalsy(); - const jsonCauseErrors = JSON.parse(error.causeErrors); + const jsonCauseErrors = error.causeErrors; expect(jsonCauseErrors.code).toMatch(/(ECONNREFUSED|ECONNRESET)/); expect(jsonCauseErrors.syscall).toEqual("connect"); expect(jsonCauseErrors.port).toEqual(badPort); diff --git a/packages/zosmf/__tests__/__system__/methods/ListDefinedSystems.system.test.ts b/packages/zosmf/__tests__/__system__/methods/ListDefinedSystems.system.test.ts index 2e1cc835b3..0e9186f89a 100644 --- a/packages/zosmf/__tests__/__system__/methods/ListDefinedSystems.system.test.ts +++ b/packages/zosmf/__tests__/__system__/methods/ListDefinedSystems.system.test.ts @@ -92,7 +92,7 @@ describe("List Defined Systems Api", () => { expect(error).toBeTruthy(); expect(response).toBeFalsy(); - const jsonCauseErrors = JSON.parse(error.causeErrors); + const jsonCauseErrors = error.causeErrors; expect(jsonCauseErrors.code).toEqual("ENOTFOUND"); expect(jsonCauseErrors.syscall).toEqual("getaddrinfo"); expect(jsonCauseErrors.hostname).toEqual(badHostName); @@ -121,7 +121,7 @@ describe("List Defined Systems Api", () => { expect(error).toBeTruthy(); expect(response).toBeFalsy(); - const jsonCauseErrors = JSON.parse(error.causeErrors); + const jsonCauseErrors = error.causeErrors; expect(jsonCauseErrors.code).toMatch(/(ECONNREFUSED|ECONNRESET)/); expect(jsonCauseErrors.syscall).toEqual("connect"); expect(jsonCauseErrors.port).toEqual(badPort); From ba51c26d128f4212d903e35115873328ffe4f5e0 Mon Sep 17 00:00:00 2001 From: "Andrew W. Harn" Date: Mon, 8 Jan 2024 14:10:09 -0500 Subject: [PATCH 082/138] Update snapshots and tests Signed-off-by: Andrew W. Harn --- .../cli.zos-jobs.modify.job.system.test.ts | 2 +- ...os-tso.ping.address-space.system.test.ts.snap | 2 +- .../cli.zos-tso.stop.system.test.ts.snap | 16 ++++++++++++---- .../methods/delete/DeleteZfs.system.test.ts | 3 ++- 4 files changed, 16 insertions(+), 7 deletions(-) diff --git a/packages/cli/__tests__/zosjobs/__system__/modify/cli.zos-jobs.modify.job.system.test.ts b/packages/cli/__tests__/zosjobs/__system__/modify/cli.zos-jobs.modify.job.system.test.ts index 4b06a4b5d0..6905d5fd60 100644 --- a/packages/cli/__tests__/zosjobs/__system__/modify/cli.zos-jobs.modify.job.system.test.ts +++ b/packages/cli/__tests__/zosjobs/__system__/modify/cli.zos-jobs.modify.job.system.test.ts @@ -42,7 +42,7 @@ describe("zos-jobs modify job command", () => { const response = runCliScript(__dirname + "/__scripts__/job/bogus_jobid.sh", TEST_ENVIRONMENT); // potential fix needed in imperative to count this type of error as status = 1 expect(response.status).toBe(0); - expect(response.stderr.toString()).toContain("Job not found"); + expect(response.stderr.toString()).toContain("Zero jobs were returned."); }); }); diff --git a/packages/cli/__tests__/zostso/__system__/ping/__snapshots__/cli.zos-tso.ping.address-space.system.test.ts.snap b/packages/cli/__tests__/zostso/__system__/ping/__snapshots__/cli.zos-tso.ping.address-space.system.test.ts.snap index 0ce860177a..24c7d70612 100644 --- a/packages/cli/__tests__/zostso/__system__/ping/__snapshots__/cli.zos-tso.ping.address-space.system.test.ts.snap +++ b/packages/cli/__tests__/zostso/__system__/ping/__snapshots__/cli.zos-tso.ping.address-space.system.test.ts.snap @@ -1,7 +1,7 @@ // Jest Snapshot v1, https://goo.gl/fbAQLP exports[`zos-tso ping address-space should throw an error if provided address space is inactive 1`] = ` -"Command Error: +"Unable to perform this operation due to the following problem. Expect Error: IZUG1126E: z/OSMF cannot correlate the request for key \\"BadKey\\" with an active z/OS application session. " `; diff --git a/packages/cli/__tests__/zostso/__system__/stop/__snapshots__/cli.zos-tso.stop.system.test.ts.snap b/packages/cli/__tests__/zostso/__system__/stop/__snapshots__/cli.zos-tso.stop.system.test.ts.snap index 21484fcd84..402dd2cbd5 100644 --- a/packages/cli/__tests__/zostso/__system__/stop/__snapshots__/cli.zos-tso.stop.system.test.ts.snap +++ b/packages/cli/__tests__/zostso/__system__/stop/__snapshots__/cli.zos-tso.stop.system.test.ts.snap @@ -1,13 +1,17 @@ // Jest Snapshot v1, https://goo.gl/fbAQLP exports[`zos-tso stop should fail with invalid option 1`] = ` -"Command Error: +"Unable to perform this operation due to the following problem. Unknown arguments: foo-bar, fooBar Command failed due to improper syntax Command entered: \\"zos-tso start as --foo-bar\\" Available commands are \\"address-space\\". Use \\"zowe zos-tso start --help\\" to view groups, commands, and options. -Error Details: + +Response From Service +Error: Unknown arguments: foo-bar, fooBar + +Diagnostic Information Unknown arguments: foo-bar, fooBar " `; @@ -18,7 +22,7 @@ exports[`zos-tso stop should fail with invalid option 2`] = ` `; exports[`zos-tso stop should fail with invalid parameter 1`] = ` -"Command Error: +"Unable to perform this operation due to the following problem. Unknown argument: foobar Command failed due to improper syntax Did you mean: zos-tso stop as? @@ -26,7 +30,11 @@ Did you mean: zos-tso stop as? Command entered: \\"zos-tso stop foobar\\" Available commands are \\"address-space\\". Use \\"zowe zos-tso stop --help\\" to view groups, commands, and options. -Error Details: + +Response from Service +Error: Unknown argument: foobar + +Diagnostic Information Unknown argument: foobar " `; diff --git a/packages/zosfiles/__tests__/__system__/methods/delete/DeleteZfs.system.test.ts b/packages/zosfiles/__tests__/__system__/methods/delete/DeleteZfs.system.test.ts index 9a0d5724fa..983827a193 100644 --- a/packages/zosfiles/__tests__/__system__/methods/delete/DeleteZfs.system.test.ts +++ b/packages/zosfiles/__tests__/__system__/methods/delete/DeleteZfs.system.test.ts @@ -129,7 +129,8 @@ describe("Delete a z/OS File System", () => { } expect(error).toBeDefined(); expect(response).toBeUndefined(); - expect(error.message).toContain("Error executing IDCAMS DELETE command. exit_code=8"); + expect(error.message).toContain(`ENTRY ${nonExistZfs.toUpperCase()} NOT FOUND`); + expect(error.message).toContain("FUNCTION COMPLETED, HIGHEST CONDITION CODE WAS 8"); }); }); From c4770b3a5d35c4c5b85dd651763f36a7f7d6939d Mon Sep 17 00:00:00 2001 From: Gene Johnston Date: Mon, 8 Jan 2024 14:32:48 -0500 Subject: [PATCH 083/138] Adjust test for new error format. Signed-off-by: Gene Johnston --- .../cli.zos-jobs.list.spool-files-by-jobid.system.test.ts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/cli/__tests__/zosjobs/__system__/list/cli.zos-jobs.list.spool-files-by-jobid.system.test.ts b/packages/cli/__tests__/zosjobs/__system__/list/cli.zos-jobs.list.spool-files-by-jobid.system.test.ts index cb45e1ca28..3a1e7449ef 100644 --- a/packages/cli/__tests__/zosjobs/__system__/list/cli.zos-jobs.list.spool-files-by-jobid.system.test.ts +++ b/packages/cli/__tests__/zosjobs/__system__/list/cli.zos-jobs.list.spool-files-by-jobid.system.test.ts @@ -70,11 +70,11 @@ describe("zos-jobs list spool-files-by-jobid command", () => { const response = runCliScript(__dirname + "/__scripts__/spool-files-by-jobid/invalid_jobid.sh", TEST_ENVIRONMENT); expect(response.stdout.toString()).toBe(""); const trimmed = trimMessage(response.stderr.toString()); - expect(trimmed).toContain("status 400"); - expect(trimmed).toContain("category: 6"); - expect(trimmed).toContain("reason: 4"); expect(trimmed).toContain("Value of jobid query parameter is not valid"); expect(trimmed).toContain("rc: 4"); + expect(trimmed).toContain("reason: 4"); + expect(trimmed).toContain("category: 6"); + expect(trimmed).toContain("Received HTTP(S) error 400 = Bad Request"); expect(trimmed).toContain("Resource: /zosmf/restjobs/jobs"); expect(trimmed).toContain("Request: GET"); expect(response.status).toBe(1); From a8db6ac276dccaf0d779d4d1c2a286c2f5f40b3b Mon Sep 17 00:00:00 2001 From: zowe-robot Date: Mon, 8 Jan 2024 19:43:44 +0000 Subject: [PATCH 084/138] Bump version to 7.21.2 [ci skip] Signed-off-by: zowe-robot --- .../__packages__/cli-test-utils/package.json | 4 +- lerna.json | 2 +- npm-shrinkwrap.json | 206 +++++++++--------- packages/cli/CHANGELOG.md | 2 +- packages/cli/package.json | 26 +-- packages/core/CHANGELOG.md | 2 +- packages/core/package.json | 6 +- packages/imperative/CHANGELOG.md | 2 +- packages/imperative/package.json | 2 +- packages/provisioning/package.json | 8 +- packages/workflows/package.json | 10 +- packages/zosconsole/package.json | 8 +- packages/zosfiles/package.json | 10 +- packages/zosjobs/package.json | 10 +- packages/zoslogs/package.json | 8 +- packages/zosmf/package.json | 8 +- packages/zostso/package.json | 10 +- packages/zosuss/package.json | 6 +- 18 files changed, 165 insertions(+), 165 deletions(-) diff --git a/__tests__/__packages__/cli-test-utils/package.json b/__tests__/__packages__/cli-test-utils/package.json index 125eee9cf0..725b308153 100644 --- a/__tests__/__packages__/cli-test-utils/package.json +++ b/__tests__/__packages__/cli-test-utils/package.json @@ -1,6 +1,6 @@ { "name": "@zowe/cli-test-utils", - "version": "7.21.0", + "version": "7.21.2", "description": "Test utilities package for Zowe CLI plug-ins", "author": "Zowe", "license": "EPL-2.0", @@ -43,7 +43,7 @@ "devDependencies": { "@types/js-yaml": "^4.0.0", "@types/uuid": "^8.3.0", - "@zowe/imperative": "5.20.0" + "@zowe/imperative": "5.20.1" }, "peerDependencies": { "@zowe/imperative": "^5.0.0" diff --git a/lerna.json b/lerna.json index a23ccb8265..1329695bde 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "7.21.1", + "version": "7.21.2", "command": { "publish": { "ignoreChanges": [ diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json index 8c2b660ee4..4a9702e190 100644 --- a/npm-shrinkwrap.json +++ b/npm-shrinkwrap.json @@ -51,7 +51,7 @@ }, "__tests__/__packages__/cli-test-utils": { "name": "@zowe/cli-test-utils", - "version": "7.21.0", + "version": "7.21.2", "license": "EPL-2.0", "dependencies": { "find-up": "^5.0.0", @@ -62,7 +62,7 @@ "devDependencies": { "@types/js-yaml": "^4.0.0", "@types/uuid": "^8.3.0", - "@zowe/imperative": "5.20.0" + "@zowe/imperative": "5.20.1" }, "peerDependencies": { "@zowe/imperative": "^5.0.0" @@ -24704,21 +24704,21 @@ }, "packages/cli": { "name": "@zowe/cli", - "version": "7.21.1", + "version": "7.21.2", "hasInstallScript": true, "license": "EPL-2.0", "dependencies": { - "@zowe/core-for-zowe-sdk": "7.21.0", - "@zowe/imperative": "5.20.0", - "@zowe/provisioning-for-zowe-sdk": "7.21.0", - "@zowe/zos-console-for-zowe-sdk": "7.21.0", - "@zowe/zos-files-for-zowe-sdk": "7.21.1", - "@zowe/zos-jobs-for-zowe-sdk": "7.21.1", - "@zowe/zos-logs-for-zowe-sdk": "7.21.0", - "@zowe/zos-tso-for-zowe-sdk": "7.21.0", - "@zowe/zos-uss-for-zowe-sdk": "7.21.1", - "@zowe/zos-workflows-for-zowe-sdk": "7.21.1", - "@zowe/zosmf-for-zowe-sdk": "7.21.0", + "@zowe/core-for-zowe-sdk": "7.21.2", + "@zowe/imperative": "5.20.1", + "@zowe/provisioning-for-zowe-sdk": "7.21.2", + "@zowe/zos-console-for-zowe-sdk": "7.21.2", + "@zowe/zos-files-for-zowe-sdk": "7.21.2", + "@zowe/zos-jobs-for-zowe-sdk": "7.21.2", + "@zowe/zos-logs-for-zowe-sdk": "7.21.2", + "@zowe/zos-tso-for-zowe-sdk": "7.21.2", + "@zowe/zos-uss-for-zowe-sdk": "7.21.2", + "@zowe/zos-workflows-for-zowe-sdk": "7.21.2", + "@zowe/zosmf-for-zowe-sdk": "7.21.2", "find-process": "1.4.7", "get-stream": "6.0.1", "lodash": "4.17.21", @@ -24733,7 +24733,7 @@ "@types/diff": "^5.0.2", "@types/lodash": "^4.14.175", "@types/tar": "^6.1.2", - "@zowe/cli-test-utils": "7.21.0", + "@zowe/cli-test-utils": "7.21.2", "comment-json": "^4.1.1", "strip-ansi": "^6.0.1", "which": "^2.0.2" @@ -24766,15 +24766,15 @@ }, "packages/core": { "name": "@zowe/core-for-zowe-sdk", - "version": "7.21.0", + "version": "7.21.2", "license": "EPL-2.0", "dependencies": { "comment-json": "4.1.1", "string-width": "4.2.3" }, "devDependencies": { - "@zowe/cli-test-utils": "7.21.0", - "@zowe/imperative": "5.20.0" + "@zowe/cli-test-utils": "7.21.2", + "@zowe/imperative": "5.20.1" }, "peerDependencies": { "@zowe/imperative": "^5.0.0" @@ -24782,7 +24782,7 @@ }, "packages/imperative": { "name": "@zowe/imperative", - "version": "5.20.0", + "version": "5.20.1", "license": "EPL-2.0", "dependencies": { "@types/yargs": "13.0.4", @@ -25130,16 +25130,16 @@ }, "packages/provisioning": { "name": "@zowe/provisioning-for-zowe-sdk", - "version": "7.21.0", + "version": "7.21.2", "license": "EPL-2.0", "dependencies": { "js-yaml": "4.1.0" }, "devDependencies": { "@types/js-yaml": "^4.0.5", - "@zowe/cli-test-utils": "7.21.0", - "@zowe/core-for-zowe-sdk": "7.21.0", - "@zowe/imperative": "5.20.0" + "@zowe/cli-test-utils": "7.21.2", + "@zowe/core-for-zowe-sdk": "7.21.2", + "@zowe/imperative": "5.20.1" }, "peerDependencies": { "@zowe/core-for-zowe-sdk": "^7.0.0", @@ -25161,15 +25161,15 @@ }, "packages/workflows": { "name": "@zowe/zos-workflows-for-zowe-sdk", - "version": "7.21.1", + "version": "7.21.2", "license": "EPL-2.0", "dependencies": { - "@zowe/zos-files-for-zowe-sdk": "7.21.1" + "@zowe/zos-files-for-zowe-sdk": "7.21.2" }, "devDependencies": { - "@zowe/cli-test-utils": "7.21.0", - "@zowe/core-for-zowe-sdk": "7.21.0", - "@zowe/imperative": "5.20.0" + "@zowe/cli-test-utils": "7.21.2", + "@zowe/core-for-zowe-sdk": "7.21.2", + "@zowe/imperative": "5.20.1" }, "peerDependencies": { "@zowe/core-for-zowe-sdk": "^7.0.0", @@ -25178,12 +25178,12 @@ }, "packages/zosconsole": { "name": "@zowe/zos-console-for-zowe-sdk", - "version": "7.21.0", + "version": "7.21.2", "license": "EPL-2.0", "devDependencies": { - "@zowe/cli-test-utils": "7.21.0", - "@zowe/core-for-zowe-sdk": "7.21.0", - "@zowe/imperative": "5.20.0" + "@zowe/cli-test-utils": "7.21.2", + "@zowe/core-for-zowe-sdk": "7.21.2", + "@zowe/imperative": "5.20.1" }, "peerDependencies": { "@zowe/core-for-zowe-sdk": "^7.0.0", @@ -25192,17 +25192,17 @@ }, "packages/zosfiles": { "name": "@zowe/zos-files-for-zowe-sdk", - "version": "7.21.1", + "version": "7.21.2", "license": "EPL-2.0", "dependencies": { "get-stream": "6.0.1", "minimatch": "5.0.1" }, "devDependencies": { - "@zowe/cli-test-utils": "7.21.0", - "@zowe/core-for-zowe-sdk": "7.21.0", - "@zowe/imperative": "5.20.0", - "@zowe/zos-uss-for-zowe-sdk": "7.21.1" + "@zowe/cli-test-utils": "7.21.2", + "@zowe/core-for-zowe-sdk": "7.21.2", + "@zowe/imperative": "5.20.1", + "@zowe/zos-uss-for-zowe-sdk": "7.21.2" }, "peerDependencies": { "@zowe/core-for-zowe-sdk": "^7.0.0", @@ -25230,15 +25230,15 @@ }, "packages/zosjobs": { "name": "@zowe/zos-jobs-for-zowe-sdk", - "version": "7.21.1", + "version": "7.21.2", "license": "EPL-2.0", "dependencies": { - "@zowe/zos-files-for-zowe-sdk": "7.21.1" + "@zowe/zos-files-for-zowe-sdk": "7.21.2" }, "devDependencies": { - "@zowe/cli-test-utils": "7.21.0", - "@zowe/core-for-zowe-sdk": "7.21.0", - "@zowe/imperative": "5.20.0" + "@zowe/cli-test-utils": "7.21.2", + "@zowe/core-for-zowe-sdk": "7.21.2", + "@zowe/imperative": "5.20.1" }, "peerDependencies": { "@zowe/core-for-zowe-sdk": "^7.0.0", @@ -25247,12 +25247,12 @@ }, "packages/zoslogs": { "name": "@zowe/zos-logs-for-zowe-sdk", - "version": "7.21.0", + "version": "7.21.2", "license": "EPL-2.0", "devDependencies": { - "@zowe/cli-test-utils": "7.21.0", - "@zowe/core-for-zowe-sdk": "7.21.0", - "@zowe/imperative": "5.20.0" + "@zowe/cli-test-utils": "7.21.2", + "@zowe/core-for-zowe-sdk": "7.21.2", + "@zowe/imperative": "5.20.1" }, "peerDependencies": { "@zowe/core-for-zowe-sdk": "^7.0.0", @@ -25261,12 +25261,12 @@ }, "packages/zosmf": { "name": "@zowe/zosmf-for-zowe-sdk", - "version": "7.21.0", + "version": "7.21.2", "license": "EPL-2.0", "devDependencies": { - "@zowe/cli-test-utils": "7.21.0", - "@zowe/core-for-zowe-sdk": "7.21.0", - "@zowe/imperative": "5.20.0" + "@zowe/cli-test-utils": "7.21.2", + "@zowe/core-for-zowe-sdk": "7.21.2", + "@zowe/imperative": "5.20.1" }, "peerDependencies": { "@zowe/core-for-zowe-sdk": "^7.0.0", @@ -25275,15 +25275,15 @@ }, "packages/zostso": { "name": "@zowe/zos-tso-for-zowe-sdk", - "version": "7.21.0", + "version": "7.21.2", "license": "EPL-2.0", "dependencies": { - "@zowe/zosmf-for-zowe-sdk": "7.21.0" + "@zowe/zosmf-for-zowe-sdk": "7.21.2" }, "devDependencies": { - "@zowe/cli-test-utils": "7.21.0", - "@zowe/core-for-zowe-sdk": "7.21.0", - "@zowe/imperative": "5.20.0" + "@zowe/cli-test-utils": "7.21.2", + "@zowe/core-for-zowe-sdk": "7.21.2", + "@zowe/imperative": "5.20.1" }, "peerDependencies": { "@zowe/core-for-zowe-sdk": "^7.0.0", @@ -25292,15 +25292,15 @@ }, "packages/zosuss": { "name": "@zowe/zos-uss-for-zowe-sdk", - "version": "7.21.1", + "version": "7.21.2", "license": "EPL-2.0", "dependencies": { "ssh2": "1.15.0" }, "devDependencies": { "@types/ssh2": "^1.11.0", - "@zowe/cli-test-utils": "7.21.0", - "@zowe/imperative": "5.20.0" + "@zowe/cli-test-utils": "7.21.2", + "@zowe/imperative": "5.20.1" }, "peerDependencies": { "@zowe/imperative": "^5.2.0" @@ -31974,19 +31974,19 @@ "@types/diff": "^5.0.2", "@types/lodash": "^4.14.175", "@types/tar": "^6.1.2", - "@zowe/cli-test-utils": "7.21.0", - "@zowe/core-for-zowe-sdk": "7.21.0", - "@zowe/imperative": "5.20.0", - "@zowe/provisioning-for-zowe-sdk": "7.21.0", + "@zowe/cli-test-utils": "7.21.2", + "@zowe/core-for-zowe-sdk": "7.21.2", + "@zowe/imperative": "5.20.1", + "@zowe/provisioning-for-zowe-sdk": "7.21.2", "@zowe/secrets-for-zowe-sdk": "7.18.6", - "@zowe/zos-console-for-zowe-sdk": "7.21.0", - "@zowe/zos-files-for-zowe-sdk": "7.21.1", - "@zowe/zos-jobs-for-zowe-sdk": "7.21.1", - "@zowe/zos-logs-for-zowe-sdk": "7.21.0", - "@zowe/zos-tso-for-zowe-sdk": "7.21.0", - "@zowe/zos-uss-for-zowe-sdk": "7.21.1", - "@zowe/zos-workflows-for-zowe-sdk": "7.21.1", - "@zowe/zosmf-for-zowe-sdk": "7.21.0", + "@zowe/zos-console-for-zowe-sdk": "7.21.2", + "@zowe/zos-files-for-zowe-sdk": "7.21.2", + "@zowe/zos-jobs-for-zowe-sdk": "7.21.2", + "@zowe/zos-logs-for-zowe-sdk": "7.21.2", + "@zowe/zos-tso-for-zowe-sdk": "7.21.2", + "@zowe/zos-uss-for-zowe-sdk": "7.21.2", + "@zowe/zos-workflows-for-zowe-sdk": "7.21.2", + "@zowe/zosmf-for-zowe-sdk": "7.21.2", "comment-json": "^4.1.1", "find-process": "1.4.7", "get-stream": "6.0.1", @@ -32020,7 +32020,7 @@ "requires": { "@types/js-yaml": "^4.0.0", "@types/uuid": "^8.3.0", - "@zowe/imperative": "5.20.0", + "@zowe/imperative": "5.20.1", "find-up": "^5.0.0", "js-yaml": "^4.0.0", "rimraf": "^3.0.2", @@ -32040,8 +32040,8 @@ "@zowe/core-for-zowe-sdk": { "version": "file:packages/core", "requires": { - "@zowe/cli-test-utils": "7.21.0", - "@zowe/imperative": "5.20.0", + "@zowe/cli-test-utils": "7.21.2", + "@zowe/imperative": "5.20.1", "comment-json": "4.1.1", "string-width": "4.2.3" } @@ -32300,9 +32300,9 @@ "version": "file:packages/provisioning", "requires": { "@types/js-yaml": "^4.0.5", - "@zowe/cli-test-utils": "7.21.0", - "@zowe/core-for-zowe-sdk": "7.21.0", - "@zowe/imperative": "5.20.0", + "@zowe/cli-test-utils": "7.21.2", + "@zowe/core-for-zowe-sdk": "7.21.2", + "@zowe/imperative": "5.20.1", "js-yaml": "4.1.0" } }, @@ -32316,18 +32316,18 @@ "@zowe/zos-console-for-zowe-sdk": { "version": "file:packages/zosconsole", "requires": { - "@zowe/cli-test-utils": "7.21.0", - "@zowe/core-for-zowe-sdk": "7.21.0", - "@zowe/imperative": "5.20.0" + "@zowe/cli-test-utils": "7.21.2", + "@zowe/core-for-zowe-sdk": "7.21.2", + "@zowe/imperative": "5.20.1" } }, "@zowe/zos-files-for-zowe-sdk": { "version": "file:packages/zosfiles", "requires": { - "@zowe/cli-test-utils": "7.21.0", - "@zowe/core-for-zowe-sdk": "7.21.0", - "@zowe/imperative": "5.20.0", - "@zowe/zos-uss-for-zowe-sdk": "7.21.1", + "@zowe/cli-test-utils": "7.21.2", + "@zowe/core-for-zowe-sdk": "7.21.2", + "@zowe/imperative": "5.20.1", + "@zowe/zos-uss-for-zowe-sdk": "7.21.2", "get-stream": "6.0.1", "minimatch": "5.0.1" }, @@ -32353,53 +32353,53 @@ "@zowe/zos-jobs-for-zowe-sdk": { "version": "file:packages/zosjobs", "requires": { - "@zowe/cli-test-utils": "7.21.0", - "@zowe/core-for-zowe-sdk": "7.21.0", - "@zowe/imperative": "5.20.0", - "@zowe/zos-files-for-zowe-sdk": "7.21.1" + "@zowe/cli-test-utils": "7.21.2", + "@zowe/core-for-zowe-sdk": "7.21.2", + "@zowe/imperative": "5.20.1", + "@zowe/zos-files-for-zowe-sdk": "7.21.2" } }, "@zowe/zos-logs-for-zowe-sdk": { "version": "file:packages/zoslogs", "requires": { - "@zowe/cli-test-utils": "7.21.0", - "@zowe/core-for-zowe-sdk": "7.21.0", - "@zowe/imperative": "5.20.0" + "@zowe/cli-test-utils": "7.21.2", + "@zowe/core-for-zowe-sdk": "7.21.2", + "@zowe/imperative": "5.20.1" } }, "@zowe/zos-tso-for-zowe-sdk": { "version": "file:packages/zostso", "requires": { - "@zowe/cli-test-utils": "7.21.0", - "@zowe/core-for-zowe-sdk": "7.21.0", - "@zowe/imperative": "5.20.0", - "@zowe/zosmf-for-zowe-sdk": "7.21.0" + "@zowe/cli-test-utils": "7.21.2", + "@zowe/core-for-zowe-sdk": "7.21.2", + "@zowe/imperative": "5.20.1", + "@zowe/zosmf-for-zowe-sdk": "7.21.2" } }, "@zowe/zos-uss-for-zowe-sdk": { "version": "file:packages/zosuss", "requires": { "@types/ssh2": "^1.11.0", - "@zowe/cli-test-utils": "7.21.0", - "@zowe/imperative": "5.20.0", + "@zowe/cli-test-utils": "7.21.2", + "@zowe/imperative": "5.20.1", "ssh2": "1.15.0" } }, "@zowe/zos-workflows-for-zowe-sdk": { "version": "file:packages/workflows", "requires": { - "@zowe/cli-test-utils": "7.21.0", - "@zowe/core-for-zowe-sdk": "7.21.0", - "@zowe/imperative": "5.20.0", - "@zowe/zos-files-for-zowe-sdk": "7.21.1" + "@zowe/cli-test-utils": "7.21.2", + "@zowe/core-for-zowe-sdk": "7.21.2", + "@zowe/imperative": "5.20.1", + "@zowe/zos-files-for-zowe-sdk": "7.21.2" } }, "@zowe/zosmf-for-zowe-sdk": { "version": "file:packages/zosmf", "requires": { - "@zowe/cli-test-utils": "7.21.0", - "@zowe/core-for-zowe-sdk": "7.21.0", - "@zowe/imperative": "5.20.0" + "@zowe/cli-test-utils": "7.21.2", + "@zowe/core-for-zowe-sdk": "7.21.2", + "@zowe/imperative": "5.20.1" } }, "abbrev": { diff --git a/packages/cli/CHANGELOG.md b/packages/cli/CHANGELOG.md index 53b5b495c8..7a618b90e6 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.21.2` - BugFix: Correct extra character being displayed at the end of lines when issuing `zowe files compare` on Windows. [#1992](https://github.com/zowe/zowe-cli/issues/1992) - BugFix: Correct the online help description for `zowe files compare uss`. [#1754](https://github.com/zowe/zowe-cli/issues/1754) diff --git a/packages/cli/package.json b/packages/cli/package.json index cebd0ec9cb..7390be0cda 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -1,6 +1,6 @@ { "name": "@zowe/cli", - "version": "7.21.1", + "version": "7.21.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.21.0", - "@zowe/imperative": "5.20.0", - "@zowe/provisioning-for-zowe-sdk": "7.21.0", - "@zowe/zos-console-for-zowe-sdk": "7.21.0", - "@zowe/zos-files-for-zowe-sdk": "7.21.1", - "@zowe/zos-jobs-for-zowe-sdk": "7.21.1", - "@zowe/zos-logs-for-zowe-sdk": "7.21.0", - "@zowe/zos-tso-for-zowe-sdk": "7.21.0", - "@zowe/zos-uss-for-zowe-sdk": "7.21.1", - "@zowe/zos-workflows-for-zowe-sdk": "7.21.1", - "@zowe/zosmf-for-zowe-sdk": "7.21.0", + "@zowe/core-for-zowe-sdk": "7.21.2", + "@zowe/imperative": "5.20.1", + "@zowe/provisioning-for-zowe-sdk": "7.21.2", + "@zowe/zos-console-for-zowe-sdk": "7.21.2", + "@zowe/zos-files-for-zowe-sdk": "7.21.2", + "@zowe/zos-jobs-for-zowe-sdk": "7.21.2", + "@zowe/zos-logs-for-zowe-sdk": "7.21.2", + "@zowe/zos-tso-for-zowe-sdk": "7.21.2", + "@zowe/zos-uss-for-zowe-sdk": "7.21.2", + "@zowe/zos-workflows-for-zowe-sdk": "7.21.2", + "@zowe/zosmf-for-zowe-sdk": "7.21.2", "find-process": "1.4.7", "get-stream": "6.0.1", "lodash": "4.17.21", @@ -79,7 +79,7 @@ "@types/diff": "^5.0.2", "@types/lodash": "^4.14.175", "@types/tar": "^6.1.2", - "@zowe/cli-test-utils": "7.21.0", + "@zowe/cli-test-utils": "7.21.2", "comment-json": "^4.1.1", "strip-ansi": "^6.0.1", "which": "^2.0.2" diff --git a/packages/core/CHANGELOG.md b/packages/core/CHANGELOG.md index 461a028ee5..8f4c211926 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.21.2` - BugFix: Add information about password-protected certificate file support. [#2006](https://github.com/zowe/zowe-cli/issues/2006) diff --git a/packages/core/package.json b/packages/core/package.json index 3da81ed38b..93c6fc1f8a 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -1,6 +1,6 @@ { "name": "@zowe/core-for-zowe-sdk", - "version": "7.21.0", + "version": "7.21.2", "description": "Core libraries shared by Zowe SDK packages", "author": "Zowe", "license": "EPL-2.0", @@ -49,8 +49,8 @@ "string-width": "4.2.3" }, "devDependencies": { - "@zowe/cli-test-utils": "7.21.0", - "@zowe/imperative": "5.20.0" + "@zowe/cli-test-utils": "7.21.2", + "@zowe/imperative": "5.20.1" }, "peerDependencies": { "@zowe/imperative": "^5.0.0" diff --git a/packages/imperative/CHANGELOG.md b/packages/imperative/CHANGELOG.md index 82399ff0cb..1ba99ff4b8 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.20.1` - BugFix: Fixed error message shown for null option definition to include details about which command caused the error. [#2002](https://github.com/zowe/zowe-cli/issues/2002) diff --git a/packages/imperative/package.json b/packages/imperative/package.json index b3578720c2..a7150629f8 100644 --- a/packages/imperative/package.json +++ b/packages/imperative/package.json @@ -1,6 +1,6 @@ { "name": "@zowe/imperative", - "version": "5.20.0", + "version": "5.20.1", "description": "framework for building configurable CLIs", "author": "Zowe", "license": "EPL-2.0", diff --git a/packages/provisioning/package.json b/packages/provisioning/package.json index 3610259572..89ee3bc009 100644 --- a/packages/provisioning/package.json +++ b/packages/provisioning/package.json @@ -1,6 +1,6 @@ { "name": "@zowe/provisioning-for-zowe-sdk", - "version": "7.21.0", + "version": "7.21.2", "description": "Zowe SDK to interact with the z/OS provisioning APIs", "author": "Zowe", "license": "EPL-2.0", @@ -49,9 +49,9 @@ }, "devDependencies": { "@types/js-yaml": "^4.0.5", - "@zowe/cli-test-utils": "7.21.0", - "@zowe/core-for-zowe-sdk": "7.21.0", - "@zowe/imperative": "5.20.0" + "@zowe/cli-test-utils": "7.21.2", + "@zowe/core-for-zowe-sdk": "7.21.2", + "@zowe/imperative": "5.20.1" }, "peerDependencies": { "@zowe/core-for-zowe-sdk": "^7.0.0", diff --git a/packages/workflows/package.json b/packages/workflows/package.json index de9adca877..58ef2fa39d 100644 --- a/packages/workflows/package.json +++ b/packages/workflows/package.json @@ -1,6 +1,6 @@ { "name": "@zowe/zos-workflows-for-zowe-sdk", - "version": "7.21.1", + "version": "7.21.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.21.1" + "@zowe/zos-files-for-zowe-sdk": "7.21.2" }, "devDependencies": { - "@zowe/cli-test-utils": "7.21.0", - "@zowe/core-for-zowe-sdk": "7.21.0", - "@zowe/imperative": "5.20.0" + "@zowe/cli-test-utils": "7.21.2", + "@zowe/core-for-zowe-sdk": "7.21.2", + "@zowe/imperative": "5.20.1" }, "peerDependencies": { "@zowe/core-for-zowe-sdk": "^7.0.0", diff --git a/packages/zosconsole/package.json b/packages/zosconsole/package.json index 5aafbe127f..92bb137af8 100644 --- a/packages/zosconsole/package.json +++ b/packages/zosconsole/package.json @@ -1,6 +1,6 @@ { "name": "@zowe/zos-console-for-zowe-sdk", - "version": "7.21.0", + "version": "7.21.2", "description": "Zowe SDK to interact with the z/OS console", "author": "Zowe", "license": "EPL-2.0", @@ -45,9 +45,9 @@ "prepack": "node ../../scripts/prepareLicenses.js" }, "devDependencies": { - "@zowe/cli-test-utils": "7.21.0", - "@zowe/core-for-zowe-sdk": "7.21.0", - "@zowe/imperative": "5.20.0" + "@zowe/cli-test-utils": "7.21.2", + "@zowe/core-for-zowe-sdk": "7.21.2", + "@zowe/imperative": "5.20.1" }, "peerDependencies": { "@zowe/core-for-zowe-sdk": "^7.0.0", diff --git a/packages/zosfiles/package.json b/packages/zosfiles/package.json index 3bdf0a92d4..7874e7ab6e 100644 --- a/packages/zosfiles/package.json +++ b/packages/zosfiles/package.json @@ -1,6 +1,6 @@ { "name": "@zowe/zos-files-for-zowe-sdk", - "version": "7.21.1", + "version": "7.21.2", "description": "Zowe SDK to interact with files and data sets on z/OS", "author": "Zowe", "license": "EPL-2.0", @@ -50,10 +50,10 @@ "minimatch": "5.0.1" }, "devDependencies": { - "@zowe/cli-test-utils": "7.21.0", - "@zowe/core-for-zowe-sdk": "7.21.0", - "@zowe/imperative": "5.20.0", - "@zowe/zos-uss-for-zowe-sdk": "7.21.1" + "@zowe/cli-test-utils": "7.21.2", + "@zowe/core-for-zowe-sdk": "7.21.2", + "@zowe/imperative": "5.20.1", + "@zowe/zos-uss-for-zowe-sdk": "7.21.2" }, "peerDependencies": { "@zowe/core-for-zowe-sdk": "^7.0.0", diff --git a/packages/zosjobs/package.json b/packages/zosjobs/package.json index ecb05fd2ad..f9553e161f 100644 --- a/packages/zosjobs/package.json +++ b/packages/zosjobs/package.json @@ -1,6 +1,6 @@ { "name": "@zowe/zos-jobs-for-zowe-sdk", - "version": "7.21.1", + "version": "7.21.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.21.1" + "@zowe/zos-files-for-zowe-sdk": "7.21.2" }, "devDependencies": { - "@zowe/cli-test-utils": "7.21.0", - "@zowe/core-for-zowe-sdk": "7.21.0", - "@zowe/imperative": "5.20.0" + "@zowe/cli-test-utils": "7.21.2", + "@zowe/core-for-zowe-sdk": "7.21.2", + "@zowe/imperative": "5.20.1" }, "peerDependencies": { "@zowe/core-for-zowe-sdk": "^7.0.0", diff --git a/packages/zoslogs/package.json b/packages/zoslogs/package.json index f7011e43c2..6ac08e20b8 100644 --- a/packages/zoslogs/package.json +++ b/packages/zoslogs/package.json @@ -1,6 +1,6 @@ { "name": "@zowe/zos-logs-for-zowe-sdk", - "version": "7.21.0", + "version": "7.21.2", "description": "Zowe SDK to interact with the z/OS logs", "author": "Zowe", "license": "EPL-2.0", @@ -45,9 +45,9 @@ "prepack": "node ../../scripts/prepareLicenses.js" }, "devDependencies": { - "@zowe/cli-test-utils": "7.21.0", - "@zowe/core-for-zowe-sdk": "7.21.0", - "@zowe/imperative": "5.20.0" + "@zowe/cli-test-utils": "7.21.2", + "@zowe/core-for-zowe-sdk": "7.21.2", + "@zowe/imperative": "5.20.1" }, "peerDependencies": { "@zowe/core-for-zowe-sdk": "^7.0.0", diff --git a/packages/zosmf/package.json b/packages/zosmf/package.json index b9d614b5fd..77d268bcb4 100644 --- a/packages/zosmf/package.json +++ b/packages/zosmf/package.json @@ -1,6 +1,6 @@ { "name": "@zowe/zosmf-for-zowe-sdk", - "version": "7.21.0", + "version": "7.21.2", "description": "Zowe SDK to interact with the z/OS Management Facility", "author": "Zowe", "license": "EPL-2.0", @@ -44,9 +44,9 @@ "prepack": "node ../../scripts/prepareLicenses.js" }, "devDependencies": { - "@zowe/cli-test-utils": "7.21.0", - "@zowe/core-for-zowe-sdk": "7.21.0", - "@zowe/imperative": "5.20.0" + "@zowe/cli-test-utils": "7.21.2", + "@zowe/core-for-zowe-sdk": "7.21.2", + "@zowe/imperative": "5.20.1" }, "peerDependencies": { "@zowe/core-for-zowe-sdk": "^7.0.0", diff --git a/packages/zostso/package.json b/packages/zostso/package.json index 0c3fe4842b..85b0cd41e1 100644 --- a/packages/zostso/package.json +++ b/packages/zostso/package.json @@ -1,6 +1,6 @@ { "name": "@zowe/zos-tso-for-zowe-sdk", - "version": "7.21.0", + "version": "7.21.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.21.0" + "@zowe/zosmf-for-zowe-sdk": "7.21.2" }, "devDependencies": { - "@zowe/cli-test-utils": "7.21.0", - "@zowe/core-for-zowe-sdk": "7.21.0", - "@zowe/imperative": "5.20.0" + "@zowe/cli-test-utils": "7.21.2", + "@zowe/core-for-zowe-sdk": "7.21.2", + "@zowe/imperative": "5.20.1" }, "peerDependencies": { "@zowe/core-for-zowe-sdk": "^7.0.0", diff --git a/packages/zosuss/package.json b/packages/zosuss/package.json index fff4c9f297..57e9fd79bd 100644 --- a/packages/zosuss/package.json +++ b/packages/zosuss/package.json @@ -1,6 +1,6 @@ { "name": "@zowe/zos-uss-for-zowe-sdk", - "version": "7.21.1", + "version": "7.21.2", "description": "Zowe SDK to interact with USS on z/OS", "author": "Zowe", "license": "EPL-2.0", @@ -49,8 +49,8 @@ }, "devDependencies": { "@types/ssh2": "^1.11.0", - "@zowe/cli-test-utils": "7.21.0", - "@zowe/imperative": "5.20.0" + "@zowe/cli-test-utils": "7.21.2", + "@zowe/imperative": "5.20.1" }, "peerDependencies": { "@zowe/imperative": "^5.2.0" From aee0d8b6ce96ff824e774d68b0a2a10297b7137c Mon Sep 17 00:00:00 2001 From: Timothy Johnson Date: Mon, 8 Jan 2024 15:20:12 -0500 Subject: [PATCH 085/138] Move project item when PR draft state changes Signed-off-by: Timothy Johnson --- .github/workflows/update-project.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/update-project.yml b/.github/workflows/update-project.yml index cac1e4a486..c6da6c4055 100644 --- a/.github/workflows/update-project.yml +++ b/.github/workflows/update-project.yml @@ -4,7 +4,7 @@ on: issues: types: [labeled] pull_request_target: - types: [opened, reopened] + types: [opened, reopened, converted_to_draft, ready_for_review] env: PROJECT_NUMBER: 21 @@ -18,7 +18,7 @@ jobs: if: ${{ github.event.pull_request }} with: assign-author: true - item-status: In Progress + item-status: ${{ github.event.action == 'ready_for_review' && 'Review/QA' || 'In Progress' }} project-number: ${{ env.PROJECT_NUMBER }} project-token: ${{ secrets.ZOWE_ROBOT_TOKEN }} From 139aa62bafc6e200461e53c89612e5c88504cbc4 Mon Sep 17 00:00:00 2001 From: KevinLoesch1 Date: Mon, 8 Jan 2024 15:30:15 -0500 Subject: [PATCH 086/138] Fix failing unit tests Signed-off-by: KevinLoesch1 --- .../methods/create/Create.unit.test.ts | 60 +++++++++++++++---- 1 file changed, 50 insertions(+), 10 deletions(-) diff --git a/packages/zosfiles/__tests__/__unit__/methods/create/Create.unit.test.ts b/packages/zosfiles/__tests__/__unit__/methods/create/Create.unit.test.ts index af4c4281e5..731bdc5004 100644 --- a/packages/zosfiles/__tests__/__unit__/methods/create/Create.unit.test.ts +++ b/packages/zosfiles/__tests__/__unit__/methods/create/Create.unit.test.ts @@ -10,7 +10,7 @@ */ import { ImperativeError, TextUtils } from "@zowe/imperative"; -import { Create, CreateDataSetTypeEnum, ZosFilesConstants, CreateDefaults, Invoke, ICreateVsamOptions } from "../../../../src"; +import { Create, CreateDataSetTypeEnum, ZosFilesConstants, CreateDefaults, Invoke, ICreateVsamOptions, List } from "../../../../src"; import { ZosmfHeaders, ZosmfRestClient } from "@zowe/core-for-zowe-sdk"; import { ZosFilesMessages } from "../../../../src/constants/ZosFiles.messages"; import { IZosFilesOptions } from "../../../../src/doc/IZosFilesOptions"; @@ -19,17 +19,29 @@ describe("Create data set", () => { const dummySession: any = {}; const dataSetName = "testing"; const dsOptions: any = {alcunit: "CYL"}; + const likePsDataSetName = "TEST.PS.DATA.SET"; const endpoint = ZosFilesConstants.RESOURCE + ZosFilesConstants.RES_DS_FILES + "/" + dataSetName; let mySpy: any; + let listDatasetSpy: any; + + const dataSetPS = { + dsname: likePsDataSetName, + dsorg: "PS", + spacu: "TRK", + blksz: "800" + }; beforeEach(() => { mySpy = jest.spyOn(ZosmfRestClient, "postExpectString").mockResolvedValue(""); + listDatasetSpy = jest.spyOn(List, "dataSet"); }); afterEach(() => { - mySpy.mockReset(); + mySpy.mockClear(); mySpy.mockRestore(); + listDatasetSpy.mockClear(); + listDatasetSpy.mockResolvedValue({} as any); }); describe("Success scenarios", () => { @@ -179,28 +191,48 @@ describe("Create data set", () => { }); it("should be able to allocate like from a sequential data set", async () => { - const response = await Create.dataSetLike(dummySession, dataSetName, "testing2"); + listDatasetSpy.mockImplementation(async (): Promise => { + return { + apiResponse: { + returnedRows: 1, + items: [dataSetPS] + } + }; + }); + const response = await Create.dataSetLike(dummySession, dataSetName, likePsDataSetName); expect(response.success).toBe(true); expect(response.commandResponse).toContain("created successfully"); + expect(listDatasetSpy).toHaveBeenCalledTimes(1); expect(mySpy).toHaveBeenCalledWith( dummySession, endpoint, [ZosmfHeaders.ACCEPT_ENCODING], JSON.stringify({ ...{ - like: "testing2" + like: likePsDataSetName, + blksize: 800 } }) ); }); it("should be able to create a dataSetLike with responseTimeout", async () => { - dsOptions.dsntype = "PDS"; + dsOptions.alcunit = undefined; + dsOptions.dsntype = undefined; + dsOptions.recfm = undefined; dsOptions.responseTimeout = 5; - await Create.dataSet(dummySession, CreateDataSetTypeEnum.DATA_SET_SEQUENTIAL, dataSetName, dsOptions); - const response2 = await Create.dataSetLike(dummySession, dataSetName, "testing2", dsOptions); + listDatasetSpy.mockImplementation(async (): Promise => { + return { + apiResponse: { + returnedRows: 1, + items: [dataSetPS] + } + }; + }); + + const response2 = await Create.dataSetLike(dummySession, dataSetName, likePsDataSetName, dsOptions); expect(response2.success).toBe(true); expect(response2.commandResponse).toContain("created successfully"); @@ -209,10 +241,10 @@ describe("Create data set", () => { endpoint, [ZosmfHeaders.ACCEPT_ENCODING, { [ZosmfHeaders.X_IBM_RESPONSE_TIMEOUT]: "5" }], JSON.stringify({ - ...CreateDefaults.DATA_SET.SEQUENTIAL, - ...dsOptions, ...{ - secondary: 1 + like: likePsDataSetName, + responseTimeout: 5, + blksize: 800 } }) ); @@ -410,6 +442,8 @@ describe("Create data set", () => { }); it("should be able to create a classic data set", async () => { + dsOptions.alcunit = "CYL"; + dsOptions.recfm = "FB"; const response = await Create.dataSet(dummySession, CreateDataSetTypeEnum.DATA_SET_CLASSIC, dataSetName, dsOptions); expect(response.success).toBe(true); @@ -522,6 +556,8 @@ describe("Create data set", () => { }); it("should be able to create a C data set", async () => { + dsOptions.alcunit = "CYL"; + dsOptions.recfm = "VB"; const response = await Create.dataSet(dummySession, CreateDataSetTypeEnum.DATA_SET_C, dataSetName, dsOptions); expect(response.success).toBe(true); @@ -633,6 +669,8 @@ describe("Create data set", () => { }); it("should be able to create a binary data set", async () => { + dsOptions.alcunit = "CYL"; + dsOptions.recfm = "U"; const response = await Create.dataSet(dummySession, CreateDataSetTypeEnum.DATA_SET_BINARY, dataSetName, dsOptions); expect(response.success).toBe(true); @@ -934,6 +972,8 @@ describe("Create data set", () => { let error; try { + dsOptions.alcunit = "CYL"; + dsOptions.recfm = "FB"; await Create.dataSet(dummySession, CreateDataSetTypeEnum.DATA_SET_PARTITIONED, dataSetName, dsOptions); } catch (err) { error = err.message; From abbd83f9b5e531fce6e59876c62c734d44d987e9 Mon Sep 17 00:00:00 2001 From: "Andrew W. Harn" Date: Mon, 8 Jan 2024 15:50:04 -0500 Subject: [PATCH 087/138] Additional changes Signed-off-by: Andrew W. Harn --- jest.config.js | 3 +- ...s.list.spool-files-by-jobid.system.test.ts | 2 +- ...tso.stop.address-space.system.test.ts.snap | 4 +- .../cli.zos-tso.stop.system.test.ts.snap | 2 +- .../delete/Delete.archived.common.handler.ts | 8 +++- .../__scripts__/copy_profiles.sh | 0 .../cmd/install/install.handler.unit.test.ts | 6 +-- .../__system__/Archive.system.test.ts | 4 +- .../__system__/Cancel.system.test.ts | 2 +- .../__system__/api/Create.system.test.ts | 38 +++++++++---------- .../methods/ListDefinedSystems.system.test.ts | 2 +- 11 files changed, 38 insertions(+), 33 deletions(-) mode change 100644 => 100755 packages/core/__tests__/utils/__integration__/__scripts__/copy_profiles.sh diff --git a/jest.config.js b/jest.config.js index a68db0a2a0..609eccaf7c 100644 --- a/jest.config.js +++ b/jest.config.js @@ -23,7 +23,8 @@ const sharedConfig = { "testRegex": "__tests__.*\\.(spec|test)\\.ts$", "moduleFileExtensions": [ "ts", - "js" + "js", + "json" ], "testEnvironment": "node", "testPathIgnorePatterns": [ diff --git a/packages/cli/__tests__/zosjobs/__system__/list/cli.zos-jobs.list.spool-files-by-jobid.system.test.ts b/packages/cli/__tests__/zosjobs/__system__/list/cli.zos-jobs.list.spool-files-by-jobid.system.test.ts index cb45e1ca28..49bbaaf36f 100644 --- a/packages/cli/__tests__/zosjobs/__system__/list/cli.zos-jobs.list.spool-files-by-jobid.system.test.ts +++ b/packages/cli/__tests__/zosjobs/__system__/list/cli.zos-jobs.list.spool-files-by-jobid.system.test.ts @@ -70,7 +70,7 @@ describe("zos-jobs list spool-files-by-jobid command", () => { const response = runCliScript(__dirname + "/__scripts__/spool-files-by-jobid/invalid_jobid.sh", TEST_ENVIRONMENT); expect(response.stdout.toString()).toBe(""); const trimmed = trimMessage(response.stderr.toString()); - expect(trimmed).toContain("status 400"); + expect(trimmed).toContain("HTTP(S) error 400 = Bad Request"); expect(trimmed).toContain("category: 6"); expect(trimmed).toContain("reason: 4"); expect(trimmed).toContain("Value of jobid query parameter is not valid"); diff --git a/packages/cli/__tests__/zostso/__system__/stop/__snapshots__/cli.zos-tso.stop.address-space.system.test.ts.snap b/packages/cli/__tests__/zostso/__system__/stop/__snapshots__/cli.zos-tso.stop.address-space.system.test.ts.snap index 48674f0023..e119838be2 100644 --- a/packages/cli/__tests__/zostso/__system__/stop/__snapshots__/cli.zos-tso.stop.address-space.system.test.ts.snap +++ b/packages/cli/__tests__/zostso/__system__/stop/__snapshots__/cli.zos-tso.stop.address-space.system.test.ts.snap @@ -1,13 +1,13 @@ // Jest Snapshot v1, https://goo.gl/fbAQLP exports[`zos-tso start address-space should throw an error if provided address space is inactive 1`] = ` -"Command Error: +"Unable to perform this operation due to the following problem. Expect Error: IZUG1126E: z/OSMF cannot correlate the request for key \\"ZOSMFAD-55-aaakaaac\\" with an active z/OS application session. " `; exports[`zos-tso start address-space should throw an error if servlet key parameter is not provided 1`] = ` -"Command Error: +"Unable to perform this operation due to the following problem. Expect Error: IZUG1126E: z/OSMF cannot correlate the request for key \\"ZOSMFAD-55-aaakaaac\\" with an active z/OS application session. " `; diff --git a/packages/cli/__tests__/zostso/__system__/stop/__snapshots__/cli.zos-tso.stop.system.test.ts.snap b/packages/cli/__tests__/zostso/__system__/stop/__snapshots__/cli.zos-tso.stop.system.test.ts.snap index 402dd2cbd5..aab1477817 100644 --- a/packages/cli/__tests__/zostso/__system__/stop/__snapshots__/cli.zos-tso.stop.system.test.ts.snap +++ b/packages/cli/__tests__/zostso/__system__/stop/__snapshots__/cli.zos-tso.stop.system.test.ts.snap @@ -31,7 +31,7 @@ Command entered: \\"zos-tso stop foobar\\" Available commands are \\"address-space\\". Use \\"zowe zos-tso stop --help\\" to view groups, commands, and options. -Response from Service +Response From Service Error: Unknown argument: foobar Diagnostic Information diff --git a/packages/cli/src/workflows/delete/Delete.archived.common.handler.ts b/packages/cli/src/workflows/delete/Delete.archived.common.handler.ts index 6ef69e1908..98588f851a 100644 --- a/packages/cli/src/workflows/delete/Delete.archived.common.handler.ts +++ b/packages/cli/src/workflows/delete/Delete.archived.common.handler.ts @@ -39,7 +39,7 @@ export default class DeleteArchivedCommonHandler extends ZosmfBaseHandler { * @memberof DeleteArchivedCommonHandler */ public async processCmd(params: IHandlerParameters): Promise { - let error: string; + let error: ImperativeError; let listWorkflows: IArchivedWorkflows; this.arguments = params.arguments; @@ -58,7 +58,11 @@ export default class DeleteArchivedCommonHandler extends ZosmfBaseHandler { this.arguments.workflowKey ); } catch (err) { - error = "Delete workflow: " + err; + error = new ImperativeError({ + msg: "Delete workflow: " + err, + causeErrors: err.causeErrors, + additionalDetails: err.additionalDetails + }); throw error; } params.response.data.setObj("Deleted."); diff --git a/packages/core/__tests__/utils/__integration__/__scripts__/copy_profiles.sh b/packages/core/__tests__/utils/__integration__/__scripts__/copy_profiles.sh old mode 100644 new mode 100755 diff --git a/packages/imperative/src/imperative/__tests__/plugins/cmd/install/install.handler.unit.test.ts b/packages/imperative/src/imperative/__tests__/plugins/cmd/install/install.handler.unit.test.ts index a5971d7653..5f684e74bb 100644 --- a/packages/imperative/src/imperative/__tests__/plugins/cmd/install/install.handler.unit.test.ts +++ b/packages/imperative/src/imperative/__tests__/plugins/cmd/install/install.handler.unit.test.ts @@ -12,6 +12,9 @@ /* eslint-disable jest/expect-expect */ import Mock = jest.Mock; +let expectedVal: unknown; +let returnedVal: unknown; + jest.mock("cross-spawn"); jest.mock("jsonfile"); jest.mock("../../../../src/plugins/utilities/npm-interface/install"); @@ -51,9 +54,6 @@ import { TextUtils } from "../../../../../utilities"; import { getRegistry, npmLogin } from "../../../../src/plugins/utilities/NpmFunctions"; import * as spawn from "cross-spawn"; -let expectedVal: unknown; -let returnedVal: unknown; - describe("Plugin Management Facility install handler", () => { // Objects created so types are correct. diff --git a/packages/workflows/__tests__/__system__/Archive.system.test.ts b/packages/workflows/__tests__/__system__/Archive.system.test.ts index 9f36a9e00e..f930010fce 100644 --- a/packages/workflows/__tests__/__system__/Archive.system.test.ts +++ b/packages/workflows/__tests__/__system__/Archive.system.test.ts @@ -172,7 +172,7 @@ describe("Errors caused by the user interaction", () => { } catch (error) { Imperative.console.info(JSON.stringify(error)); expect(error.mDetails.errorCode).toEqual(404); - expect(error.mDetails.message).toContain("IZUWF5001W"); + expect(error.causeErrors).toContain("IZUWF5001W"); // https://www.ibm.com/docs/en/zos/2.5.0?topic=izuwf9999-izuwf5001w } }); @@ -191,7 +191,7 @@ describe("Errors caused by the user interaction", () => { } catch (error) { Imperative.console.info(error); expect(error.mDetails.errorCode).toBe(409); - expect(error.mDetails.message).toContain("IZUWF0158E"); + expect(error.causeErrors).toContain("IZUWF0158E"); // https://www.ibm.com/docs/en/zos/2.5.0?topic=izuwf9999-izuwf0158e } await removeWorkflows(); diff --git a/packages/workflows/__tests__/__system__/Cancel.system.test.ts b/packages/workflows/__tests__/__system__/Cancel.system.test.ts index 18b6c8e5ca..698e5c1531 100644 --- a/packages/workflows/__tests__/__system__/Cancel.system.test.ts +++ b/packages/workflows/__tests__/__system__/Cancel.system.test.ts @@ -40,7 +40,7 @@ function expectZosmfResponseSucceeded(response: string, error: ImperativeError) function expectZosmfResponseFailed(response: string, error: ImperativeError, msg: string) { expect(response).not.toBeDefined(); expect(error).toBeDefined(); - expect(error.details.msg).toContain(msg); + expect(error.causeErrors).toContain(msg); } describe("Cancel workflow", () => { diff --git a/packages/workflows/__tests__/__system__/api/Create.system.test.ts b/packages/workflows/__tests__/__system__/api/Create.system.test.ts index e697a8248a..69e3d3c143 100644 --- a/packages/workflows/__tests__/__system__/api/Create.system.test.ts +++ b/packages/workflows/__tests__/__system__/api/Create.system.test.ts @@ -236,7 +236,7 @@ describe("Create workflow", () => { it("Throws an error with wrong format of workflow definition file. Wrong member name.", async () => { const error = await produceError(REAL_SESSION, wfName, "DS.NAME(0)", system, owner); expect(error.errorCode).toEqual(notFound); - expect(error.message).toContain(messageId); + expect(error.causeErrors).toContain(messageId); }); }); describe("IZUWF0103E", () => { @@ -245,52 +245,52 @@ describe("Create workflow", () => { it("Throws an error with wrong format of workflow definition file.", async () => { const error = await produceError(REAL_SESSION, wfName, "wrongPath", system, owner); expect(error.errorCode).toEqual(status400); - expect(error.message).toContain(messageId); + expect(error.causeErrors).toContain(messageId); }); it("Throws an error with wrong format of workflow definition file. Name that ends with a period.", async () => { const error = await produceError(REAL_SESSION, wfName, "DS.NAME.", system, owner); expect(error.errorCode).toEqual(status400); - expect(error.message).toContain(messageId); + expect(error.causeErrors).toContain(messageId); }); it("Throws an error with wrong format of workflow definition file. Path not from root.", async () => { const error = await produceError(REAL_SESSION, wfName, "home/file", system, owner); expect(error.errorCode).toEqual(status400); - expect(error.message).toContain(messageId); + expect(error.causeErrors).toContain(messageId); }); it("Throws an error with wrong format of workflow definition file. Qualifier is longer than 8 characters.", async () => { const error = await produceError(REAL_SESSION, wfName, "DS.NAME.LONGFIELD", system, owner); expect(error.errorCode).toEqual(status400); - expect(error.message).toContain(messageId); + expect(error.causeErrors).toContain(messageId); }); it("Throws an error with wrong format of workflow definition file. More than 44 characters for DSNAME alone.", async () => { const error = await produceError(REAL_SESSION, wfName, "DS.NAME.STUFF.STUFF.STUFF.STUFF.STUFF.STUFF.STUFF.STUFF", system, owner); expect(error.errorCode).toEqual(status400); - expect(error.message).toContain(messageId); + expect(error.causeErrors).toContain(messageId); }); it("Throws an error with wrong format of workflow definition file. Name containing two successive periods.", async () => { const error = await produceError(REAL_SESSION, wfName, "DS..NAME", system, owner); expect(error.errorCode).toEqual(status400); - expect(error.message).toContain(messageId); + expect(error.causeErrors).toContain(messageId); }); it("Throws an error with wrong format of definition file. Name contains a qualifier that starts with numeric character.", async () => { const error = await produceError(REAL_SESSION, wfName, "DS.123.NAME", system, owner); expect(error.errorCode).toEqual(status400); - expect(error.message).toContain(messageId); + expect(error.causeErrors).toContain(messageId); }); it("Throws an error with wrong format of workflow definition file. Member name is too long.", async () => { const error = await produceError(REAL_SESSION, wfName, "DS.NAME(MEMBER123)", system, owner); expect(error.errorCode).toEqual(status400); - expect(error.message).toContain(messageId); + expect(error.causeErrors).toContain(messageId); }); it("Throws an error with wrong format of workflow definition file. Member doesn't end with `)`.", async () => { const error = await produceError(REAL_SESSION, wfName, "DS.NAME(MEMBER", system, owner); expect(error.errorCode).toEqual(status400); - expect(error.message).toContain(messageId); + expect(error.causeErrors).toContain(messageId); }); it("Throws an error with wrong format of workflow definition file. Name contains non-allowed character.", async () => { const error = await produceError(REAL_SESSION, wfName, "DS.NAME%", system, owner); expect(error.errorCode).toEqual(status400); - expect(error.message).toContain(messageId); + expect(error.causeErrors).toContain(messageId); }); }); describe("IZUWF0105E", () => { @@ -299,12 +299,12 @@ describe("Create workflow", () => { it("Throws an error with wrong format of variable input file. Name does not exist.", async () => { const error = await produceError(REAL_SESSION, wfName, definitionFile, system, owner, "DS.NAME.WRONG"); expect(error.errorCode).toEqual(status400); - expect(error.message).toContain(messageId); + expect(error.causeErrors).toContain(messageId); }); it("Throws an error with wrong format of variable input file. Wrong member name.", async () => { const error = await produceError(REAL_SESSION, wfName, definitionFile, system, owner, "DS.NAME(0)"); expect(error.errorCode).toEqual(status400); - expect(error.message).toContain(messageId); + expect(error.causeErrors).toContain(messageId); }); }); describe("IZUWF0107E", () => { @@ -313,33 +313,33 @@ describe("Create workflow", () => { it("Throws an error with wrong format of variable input file. Name that ends with a period.", async () => { const error = await produceError(REAL_SESSION, wfName, definitionFile, system, owner, "DS.NAME."); expect(error.errorCode).toEqual(status400); - expect(error.message).toContain(messageId); + expect(error.causeErrors).toContain(messageId); }); it("Throws an error with wrong format of variable input file. More than 44 characters for DSNAME alone.", async () => { const error = await produceError(REAL_SESSION, wfName, definitionFile, system, owner, "DS.NAME.STUFF.STUFF.STUFF.STUFF.STUFF.STUFF.STUFF.STUFF"); expect(error.errorCode).toEqual(status400); - expect(error.message).toContain(messageId); + expect(error.causeErrors).toContain(messageId); }); it("Throws an error with wrong format of variable input file. Name containing two successive periods.", async () => { const error = await produceError(REAL_SESSION, wfName, definitionFile, system, owner, "DS..NAME"); expect(error.errorCode).toEqual(status400); - expect(error.message).toContain(messageId); + expect(error.causeErrors).toContain(messageId); }); it("Name that contains a qualifier that starts with non-alphabetic or non-special character.", async () => { const error = await produceError(REAL_SESSION, wfName, definitionFile, system, owner, "DS.123.NAME"); expect(error.errorCode).toEqual(status400); - expect(error.message).toContain(messageId); + expect(error.causeErrors).toContain(messageId); }); it("Throws an error with wrong format of variable input file. Qualifier is longer than 8 characters.", async () => { const error = await produceError(REAL_SESSION, wfName, definitionFile, system, owner, "DS.NAME.LONGFIELD"); expect(error.errorCode).toEqual(status400); - expect(error.message).toContain(messageId); + expect(error.causeErrors).toContain(messageId); }); it("Throws an error with wrong format of variable input file. Path not from root.", async () => { const error = await produceError(REAL_SESSION, wfName, definitionFile, system, owner, "home/file"); expect(error.errorCode).toEqual(status400); - expect(error.message).toContain(messageId); + expect(error.causeErrors).toContain(messageId); }); }); }); diff --git a/packages/zosmf/__tests__/__system__/methods/ListDefinedSystems.system.test.ts b/packages/zosmf/__tests__/__system__/methods/ListDefinedSystems.system.test.ts index 0e9186f89a..e84bd2dd57 100644 --- a/packages/zosmf/__tests__/__system__/methods/ListDefinedSystems.system.test.ts +++ b/packages/zosmf/__tests__/__system__/methods/ListDefinedSystems.system.test.ts @@ -123,7 +123,7 @@ describe("List Defined Systems Api", () => { expect(response).toBeFalsy(); const jsonCauseErrors = error.causeErrors; expect(jsonCauseErrors.code).toMatch(/(ECONNREFUSED|ECONNRESET)/); - expect(jsonCauseErrors.syscall).toEqual("connect"); + expect(jsonCauseErrors.syscall).toMatch(/(connect|read)/); expect(jsonCauseErrors.port).toEqual(badPort); }); }); From 57594f1fdbca72b2bdd7a7336d4258328fc2a040 Mon Sep 17 00:00:00 2001 From: Gene Johnston Date: Mon, 8 Jan 2024 16:07:26 -0500 Subject: [PATCH 088/138] Replace snapshots with tests for actual errors Signed-off-by: Gene Johnston --- ...i.zos-tso.stop.address-space.system.test.ts.snap | 13 ------------- .../cli.zos-tso.stop.address-space.system.test.ts | 10 ++++++---- 2 files changed, 6 insertions(+), 17 deletions(-) delete mode 100644 packages/cli/__tests__/zostso/__system__/stop/__snapshots__/cli.zos-tso.stop.address-space.system.test.ts.snap diff --git a/packages/cli/__tests__/zostso/__system__/stop/__snapshots__/cli.zos-tso.stop.address-space.system.test.ts.snap b/packages/cli/__tests__/zostso/__system__/stop/__snapshots__/cli.zos-tso.stop.address-space.system.test.ts.snap deleted file mode 100644 index 48674f0023..0000000000 --- a/packages/cli/__tests__/zostso/__system__/stop/__snapshots__/cli.zos-tso.stop.address-space.system.test.ts.snap +++ /dev/null @@ -1,13 +0,0 @@ -// Jest Snapshot v1, https://goo.gl/fbAQLP - -exports[`zos-tso start address-space should throw an error if provided address space is inactive 1`] = ` -"Command Error: -Expect Error: IZUG1126E: z/OSMF cannot correlate the request for key \\"ZOSMFAD-55-aaakaaac\\" with an active z/OS application session. -" -`; - -exports[`zos-tso start address-space should throw an error if servlet key parameter is not provided 1`] = ` -"Command Error: -Expect Error: IZUG1126E: z/OSMF cannot correlate the request for key \\"ZOSMFAD-55-aaakaaac\\" with an active z/OS application session. -" -`; diff --git a/packages/cli/__tests__/zostso/__system__/stop/cli.zos-tso.stop.address-space.system.test.ts b/packages/cli/__tests__/zostso/__system__/stop/cli.zos-tso.stop.address-space.system.test.ts index 0a70be9700..f3b3167211 100644 --- a/packages/cli/__tests__/zostso/__system__/stop/cli.zos-tso.stop.address-space.system.test.ts +++ b/packages/cli/__tests__/zostso/__system__/stop/cli.zos-tso.stop.address-space.system.test.ts @@ -32,16 +32,18 @@ describe("zos-tso start address-space", () => { it("should throw an error if servlet key parameter is not provided", async () => { const response = runCliScript(__dirname + "/__scripts__/address-space/as_error_stop.sh", TEST_ENVIRONMENT); - expect(response.status).toBe(1); expect(response.stdout.toString()).toBe(""); - expect(response.stderr.toString()).toMatchSnapshot(); + expect(response.stderr.toString()).toContain('IZUG1126E: z/OSMF cannot correlate the request for ' + + 'key "ZOSMFAD-55-aaakaaac" with an active z/OS application session'); + expect(response.status).toBe(1); }); it("should throw an error if provided address space is inactive", async () => { const response = runCliScript(__dirname + "/__scripts__/address-space/as_error_stop.sh", TEST_ENVIRONMENT); - expect(response.status).toBe(1); expect(response.stdout.toString()).toBe(""); - expect(response.stderr.toString()).toMatchSnapshot(); + expect(response.stderr.toString()).toContain('IZUG1126E: z/OSMF cannot correlate the request for ' + + 'key "ZOSMFAD-55-aaakaaac" with an active z/OS application session'); + expect(response.status).toBe(1); }); it("should successfully issue the command", async () => { From cbe1e3633db2e696b098d4d67b7753cb0b80f6e5 Mon Sep 17 00:00:00 2001 From: "Andrew W. Harn" Date: Mon, 8 Jan 2024 16:48:03 -0500 Subject: [PATCH 089/138] Fix the remaining tests Signed-off-by: Andrew W. Harn --- .../__tests__/__system__/Cancel.system.test.ts | 10 ++++++++-- .../methods/ListDefinedSystems.system.test.ts | 1 - 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/packages/workflows/__tests__/__system__/Cancel.system.test.ts b/packages/workflows/__tests__/__system__/Cancel.system.test.ts index 698e5c1531..678e72b757 100644 --- a/packages/workflows/__tests__/__system__/Cancel.system.test.ts +++ b/packages/workflows/__tests__/__system__/Cancel.system.test.ts @@ -37,7 +37,13 @@ function expectZosmfResponseSucceeded(response: string, error: ImperativeError) expect(response).toBeDefined(); } -function expectZosmfResponseFailed(response: string, error: ImperativeError, msg: string) { +function expectZosmfResponseFailed(response: string, error: ImperativeError, msg:string) { + expect(response).not.toBeDefined(); + expect(error).toBeDefined(); + expect(error.details.msg).toContain(msg); +} + +function expectZosmfResponseFailedCause(response: string, error: ImperativeError, msg: string) { expect(response).not.toBeDefined(); expect(error).toBeDefined(); expect(error.causeErrors).toContain(msg); @@ -161,7 +167,7 @@ describe("Cancel workflow", () => { error = thrownError; Imperative.console.info(`Error ${error}`); } - expectZosmfResponseFailed(response, error, WrongWorkflowKey.message); + expectZosmfResponseFailedCause(response, error, WrongWorkflowKey.message); // parse from message the workflow key const actual: string = JSON.stringify(error); const expected: RegExp = /The workflow key .+ was not found/gm; diff --git a/packages/zosmf/__tests__/__system__/methods/ListDefinedSystems.system.test.ts b/packages/zosmf/__tests__/__system__/methods/ListDefinedSystems.system.test.ts index e84bd2dd57..84ed601948 100644 --- a/packages/zosmf/__tests__/__system__/methods/ListDefinedSystems.system.test.ts +++ b/packages/zosmf/__tests__/__system__/methods/ListDefinedSystems.system.test.ts @@ -124,7 +124,6 @@ describe("List Defined Systems Api", () => { const jsonCauseErrors = error.causeErrors; expect(jsonCauseErrors.code).toMatch(/(ECONNREFUSED|ECONNRESET)/); expect(jsonCauseErrors.syscall).toMatch(/(connect|read)/); - expect(jsonCauseErrors.port).toEqual(badPort); }); }); }); From 42694e27e2d732dade3a336bb99e3e2fd6173da2 Mon Sep 17 00:00:00 2001 From: Timothy Johnson Date: Tue, 9 Jan 2024 09:36:07 -0500 Subject: [PATCH 090/138] Update workflow to simplify steps Signed-off-by: Timothy Johnson --- .github/workflows/update-project.yml | 34 +++++++--------------------- 1 file changed, 8 insertions(+), 26 deletions(-) diff --git a/.github/workflows/update-project.yml b/.github/workflows/update-project.yml index c6da6c4055..6694587767 100644 --- a/.github/workflows/update-project.yml +++ b/.github/workflows/update-project.yml @@ -8,6 +8,9 @@ on: env: PROJECT_NUMBER: 21 + ISSUE_STATUSES: '{"priority-high": "High Priority", "priority-medium": "Medium Priority", "priority-low": "Low Priority", "Epic": "Epics"}' + PR_STATUS_DRAFT: 'In Progress' + PR_STATUS_READY: 'Review/QA' jobs: update-project: @@ -15,37 +18,16 @@ jobs: runs-on: ubuntu-latest steps: - uses: zowe-actions/shared-actions/project-move-item@main - if: ${{ github.event.pull_request }} - with: - assign-author: true - item-status: ${{ github.event.action == 'ready_for_review' && 'Review/QA' || 'In Progress' }} - project-number: ${{ env.PROJECT_NUMBER }} - project-token: ${{ secrets.ZOWE_ROBOT_TOKEN }} - - - uses: zowe-actions/shared-actions/project-move-item@main - if: ${{ github.event.issue && github.event.label.name == 'priority-high' }} + if: ${{ github.event.issue && fromJSON(env.ISSUE_STATUSES)[github.event.label.name] }} with: - item-status: High Priority + item-status: ${{ fromJSON(env.ISSUE_STATUSES)[github.event.label.name] }} project-number: ${{ env.PROJECT_NUMBER }} project-token: ${{ secrets.ZOWE_ROBOT_TOKEN }} - uses: zowe-actions/shared-actions/project-move-item@main - if: ${{ github.event.issue && github.event.label.name == 'priority-medium' }} - with: - item-status: Medium Priority - project-number: ${{ env.PROJECT_NUMBER }} - project-token: ${{ secrets.ZOWE_ROBOT_TOKEN }} - - - uses: zowe-actions/shared-actions/project-move-item@main - if: ${{ github.event.issue && github.event.label.name == 'priority-low' }} - with: - item-status: Low Priority - project-number: ${{ env.PROJECT_NUMBER }} - project-token: ${{ secrets.ZOWE_ROBOT_TOKEN }} - - - uses: zowe-actions/shared-actions/project-move-item@main - if: ${{ github.event.issue && github.event.label.name == 'Epic' }} + if: ${{ github.event.pull_request }} with: - item-status: Epics + assign-author: true + item-status: ${{ github.event.action == 'ready_for_review' && env.PR_STATUS_READY || env.PR_STATUS_DRAFT }} project-number: ${{ env.PROJECT_NUMBER }} project-token: ${{ secrets.ZOWE_ROBOT_TOKEN }} From 189da64b972bfccb480b3a7a9c5cd35fa7c17fce Mon Sep 17 00:00:00 2001 From: zowe-robot Date: Tue, 9 Jan 2024 16:57:38 +0000 Subject: [PATCH 091/138] Bump version to 7.21.3 [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/package.json | 4 ++-- 7 files changed, 25 insertions(+), 25 deletions(-) diff --git a/lerna.json b/lerna.json index 1329695bde..b58f0a3b56 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "7.21.2", + "version": "7.21.3", "command": { "publish": { "ignoreChanges": [ diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json index 4a9702e190..67a09ef694 100644 --- a/npm-shrinkwrap.json +++ b/npm-shrinkwrap.json @@ -24704,7 +24704,7 @@ }, "packages/cli": { "name": "@zowe/cli", - "version": "7.21.2", + "version": "7.21.3", "hasInstallScript": true, "license": "EPL-2.0", "dependencies": { @@ -24712,12 +24712,12 @@ "@zowe/imperative": "5.20.1", "@zowe/provisioning-for-zowe-sdk": "7.21.2", "@zowe/zos-console-for-zowe-sdk": "7.21.2", - "@zowe/zos-files-for-zowe-sdk": "7.21.2", - "@zowe/zos-jobs-for-zowe-sdk": "7.21.2", + "@zowe/zos-files-for-zowe-sdk": "7.21.3", + "@zowe/zos-jobs-for-zowe-sdk": "7.21.3", "@zowe/zos-logs-for-zowe-sdk": "7.21.2", "@zowe/zos-tso-for-zowe-sdk": "7.21.2", "@zowe/zos-uss-for-zowe-sdk": "7.21.2", - "@zowe/zos-workflows-for-zowe-sdk": "7.21.2", + "@zowe/zos-workflows-for-zowe-sdk": "7.21.3", "@zowe/zosmf-for-zowe-sdk": "7.21.2", "find-process": "1.4.7", "get-stream": "6.0.1", @@ -25161,10 +25161,10 @@ }, "packages/workflows": { "name": "@zowe/zos-workflows-for-zowe-sdk", - "version": "7.21.2", + "version": "7.21.3", "license": "EPL-2.0", "dependencies": { - "@zowe/zos-files-for-zowe-sdk": "7.21.2" + "@zowe/zos-files-for-zowe-sdk": "7.21.3" }, "devDependencies": { "@zowe/cli-test-utils": "7.21.2", @@ -25192,7 +25192,7 @@ }, "packages/zosfiles": { "name": "@zowe/zos-files-for-zowe-sdk", - "version": "7.21.2", + "version": "7.21.3", "license": "EPL-2.0", "dependencies": { "get-stream": "6.0.1", @@ -25230,10 +25230,10 @@ }, "packages/zosjobs": { "name": "@zowe/zos-jobs-for-zowe-sdk", - "version": "7.21.2", + "version": "7.21.3", "license": "EPL-2.0", "dependencies": { - "@zowe/zos-files-for-zowe-sdk": "7.21.2" + "@zowe/zos-files-for-zowe-sdk": "7.21.3" }, "devDependencies": { "@zowe/cli-test-utils": "7.21.2", @@ -31980,12 +31980,12 @@ "@zowe/provisioning-for-zowe-sdk": "7.21.2", "@zowe/secrets-for-zowe-sdk": "7.18.6", "@zowe/zos-console-for-zowe-sdk": "7.21.2", - "@zowe/zos-files-for-zowe-sdk": "7.21.2", - "@zowe/zos-jobs-for-zowe-sdk": "7.21.2", + "@zowe/zos-files-for-zowe-sdk": "7.21.3", + "@zowe/zos-jobs-for-zowe-sdk": "7.21.3", "@zowe/zos-logs-for-zowe-sdk": "7.21.2", "@zowe/zos-tso-for-zowe-sdk": "7.21.2", "@zowe/zos-uss-for-zowe-sdk": "7.21.2", - "@zowe/zos-workflows-for-zowe-sdk": "7.21.2", + "@zowe/zos-workflows-for-zowe-sdk": "7.21.3", "@zowe/zosmf-for-zowe-sdk": "7.21.2", "comment-json": "^4.1.1", "find-process": "1.4.7", @@ -32356,7 +32356,7 @@ "@zowe/cli-test-utils": "7.21.2", "@zowe/core-for-zowe-sdk": "7.21.2", "@zowe/imperative": "5.20.1", - "@zowe/zos-files-for-zowe-sdk": "7.21.2" + "@zowe/zos-files-for-zowe-sdk": "7.21.3" } }, "@zowe/zos-logs-for-zowe-sdk": { @@ -32391,7 +32391,7 @@ "@zowe/cli-test-utils": "7.21.2", "@zowe/core-for-zowe-sdk": "7.21.2", "@zowe/imperative": "5.20.1", - "@zowe/zos-files-for-zowe-sdk": "7.21.2" + "@zowe/zos-files-for-zowe-sdk": "7.21.3" } }, "@zowe/zosmf-for-zowe-sdk": { diff --git a/packages/cli/package.json b/packages/cli/package.json index 7390be0cda..5fae719b4e 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -1,6 +1,6 @@ { "name": "@zowe/cli", - "version": "7.21.2", + "version": "7.21.3", "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.20.1", "@zowe/provisioning-for-zowe-sdk": "7.21.2", "@zowe/zos-console-for-zowe-sdk": "7.21.2", - "@zowe/zos-files-for-zowe-sdk": "7.21.2", - "@zowe/zos-jobs-for-zowe-sdk": "7.21.2", + "@zowe/zos-files-for-zowe-sdk": "7.21.3", + "@zowe/zos-jobs-for-zowe-sdk": "7.21.3", "@zowe/zos-logs-for-zowe-sdk": "7.21.2", "@zowe/zos-tso-for-zowe-sdk": "7.21.2", "@zowe/zos-uss-for-zowe-sdk": "7.21.2", - "@zowe/zos-workflows-for-zowe-sdk": "7.21.2", + "@zowe/zos-workflows-for-zowe-sdk": "7.21.3", "@zowe/zosmf-for-zowe-sdk": "7.21.2", "find-process": "1.4.7", "get-stream": "6.0.1", diff --git a/packages/workflows/package.json b/packages/workflows/package.json index 58ef2fa39d..1c6e30868d 100644 --- a/packages/workflows/package.json +++ b/packages/workflows/package.json @@ -1,6 +1,6 @@ { "name": "@zowe/zos-workflows-for-zowe-sdk", - "version": "7.21.2", + "version": "7.21.3", "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.21.2" + "@zowe/zos-files-for-zowe-sdk": "7.21.3" }, "devDependencies": { "@zowe/cli-test-utils": "7.21.2", diff --git a/packages/zosfiles/CHANGELOG.md b/packages/zosfiles/CHANGELOG.md index 60da8cf9ae..02d2624d79 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.21.3` - BugFix: Corrects the behavior of `Create.dataSetLike` so that the new data set is always defined with the correct block size [#2610](https://github.com/zowe/vscode-extension-for-zowe/issues/2610) diff --git a/packages/zosfiles/package.json b/packages/zosfiles/package.json index 7874e7ab6e..65aa43e8fb 100644 --- a/packages/zosfiles/package.json +++ b/packages/zosfiles/package.json @@ -1,6 +1,6 @@ { "name": "@zowe/zos-files-for-zowe-sdk", - "version": "7.21.2", + "version": "7.21.3", "description": "Zowe SDK to interact with files and data sets on z/OS", "author": "Zowe", "license": "EPL-2.0", diff --git a/packages/zosjobs/package.json b/packages/zosjobs/package.json index f9553e161f..d5b752a4ea 100644 --- a/packages/zosjobs/package.json +++ b/packages/zosjobs/package.json @@ -1,6 +1,6 @@ { "name": "@zowe/zos-jobs-for-zowe-sdk", - "version": "7.21.2", + "version": "7.21.3", "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.21.2" + "@zowe/zos-files-for-zowe-sdk": "7.21.3" }, "devDependencies": { "@zowe/cli-test-utils": "7.21.2", From 00eacec206d07d708f6beb962f9ef220df3ea133 Mon Sep 17 00:00:00 2001 From: Gene Johnston Date: Tue, 9 Jan 2024 13:26:25 -0500 Subject: [PATCH 092/138] Add changelog entries Signed-off-by: Gene Johnston --- packages/cli/CHANGELOG.md | 4 ++++ packages/core/CHANGELOG.md | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/packages/cli/CHANGELOG.md b/packages/cli/CHANGELOG.md index 6d56d7a88f..4667174042 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: Properly construct workflow error messages to display properly with V3 error formatting. + ## `8.0.0-next.202401081937` - BugFix: Fixed typo in command help for `zowe zos-workflows create` commands. diff --git a/packages/core/CHANGELOG.md b/packages/core/CHANGELOG.md index 2cc17d3df0..e88eb9dc23 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: Include text from a REST response's causeErrors.message property in error messages. + ## `8.0.0-next.202311282012` - LTS Breaking: Unpinned dependency versions to allow for patch/minor version updates for dependencies [#1968](https://github.com/zowe/zowe-cli/issues/1968) From 6908828c90b42b1c90646d30b7dda6b5d7fb2c34 Mon Sep 17 00:00:00 2001 From: Gene Johnston Date: Tue, 9 Jan 2024 14:50:22 -0500 Subject: [PATCH 093/138] System test debug hacks for create_team_cfg.sh Signed-off-by: Gene Johnston --- package.json | 3 ++- .../auth/__system__/__scripts__/create_team_cfg.sh | 6 +++--- .../auth/__system__/cli.auth.login.apiml.system.test.ts | 9 ++++++++- 3 files changed, 13 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index 65d168c487..bfa4659b4b 100644 --- a/package.json +++ b/package.json @@ -27,7 +27,8 @@ "pretest:integration": "node scripts/sampleCliTool.js install", "test:integration": "env-cmd -f __tests__/__resources__/env/integration.env --no-override jest \".*__tests__.*\\**\\.integration\\.(spec|test)\\.ts$\" --coverage false", "posttest:integration": "node scripts/sampleCliTool.js uninstall", - "test:system": "env-cmd -f __tests__/__resources__/env/system.env --no-override jest \".*__tests__.*\\**\\.system\\.(spec|test)\\.ts$\" --coverage false", + "test:zzzsystem": "env-cmd -f __tests__/__resources__/env/system.env --no-override jest \".*__tests__.*\\**\\.system\\.(spec|test)\\.ts$\" --coverage false", + "test:system": "env-cmd -f __tests__/__resources__/env/system.env --no-override jest --testRegex packages/cli/__tests__/auth/__system__/cli.auth.login.apiml.system.test.ts --coverage false", "test:unit": "env-cmd -f __tests__/__resources__/env/unit.env --no-override jest \".*__tests__.*\\**\\.unit\\.(spec|test)\\.ts$\" --coverage", "watch": "lerna run --parallel watch", "watch:exe": "cd zowex && cargo install cargo-watch && cargo watch -x build -x clippy -x test", diff --git a/packages/cli/__tests__/auth/__system__/__scripts__/create_team_cfg.sh b/packages/cli/__tests__/auth/__system__/__scripts__/create_team_cfg.sh index 3f54ca2685..5d5d1966b5 100644 --- a/packages/cli/__tests__/auth/__system__/__scripts__/create_team_cfg.sh +++ b/packages/cli/__tests__/auth/__system__/__scripts__/create_team_cfg.sh @@ -3,13 +3,13 @@ HOST=${1:?"First parm (HOST) is required."} PORT=${2:?"Second parm (PORT) is required."} REJECT=${3:?"Third parm (REJECT) is required."} +scriptsDir=${4:?"Fourth parm (scriptsDir) is required."} # include exitOnFailure function -myScriptDir=`dirname $0` -. $myScriptDir/exitOnFailure.sh +. $scriptsDir/exitOnFailure.sh # copy our config file template -cp $myScriptDir/../__resources__/zowe.config_template.json . +cp $scriptsDir/../__resources__/zowe.config_template.json . exitOnFailure "Failed to copy config file." $? sed -e "s/NoBaseHostVal/$HOST/" \ diff --git a/packages/cli/__tests__/auth/__system__/cli.auth.login.apiml.system.test.ts b/packages/cli/__tests__/auth/__system__/cli.auth.login.apiml.system.test.ts index b441073c21..b257289133 100644 --- a/packages/cli/__tests__/auth/__system__/cli.auth.login.apiml.system.test.ts +++ b/packages/cli/__tests__/auth/__system__/cli.auth.login.apiml.system.test.ts @@ -162,13 +162,20 @@ describe("auth login/logout apiml create profile", () => { }); it("should successfully issue the logout command with a created team config", async () => { + // Form a posix-style path to scripts directory + let scriptsPosixPath = __dirname + "/__scripts__"; + scriptsPosixPath = scriptsPosixPath.replaceAll("\\", "/"); + scriptsPosixPath = scriptsPosixPath.replace(/^(.):(.*)/i, "/$1$2"); + console.log("zzz: scriptsPosixPath = " + scriptsPosixPath); + // create a team config let response = runCliScript(__dirname + "/__scripts__/create_team_cfg.sh", TEST_ENVIRONMENT_CREATE_PROF, [ base.host, base.port, - base.rejectUnauthorized + base.rejectUnauthorized, + scriptsPosixPath ]); expect(response.stderr.toString()).toBe(""); From 1ddd317d9e0c8924bf99fbf5829f66c60d4f2cd2 Mon Sep 17 00:00:00 2001 From: Gene Johnston Date: Tue, 9 Jan 2024 15:07:04 -0500 Subject: [PATCH 094/138] Disable lint error on debug hack Signed-off-by: Gene Johnston --- .../auth/__system__/cli.auth.login.apiml.system.test.ts | 2 ++ 1 file changed, 2 insertions(+) diff --git a/packages/cli/__tests__/auth/__system__/cli.auth.login.apiml.system.test.ts b/packages/cli/__tests__/auth/__system__/cli.auth.login.apiml.system.test.ts index b257289133..a880a8907e 100644 --- a/packages/cli/__tests__/auth/__system__/cli.auth.login.apiml.system.test.ts +++ b/packages/cli/__tests__/auth/__system__/cli.auth.login.apiml.system.test.ts @@ -166,6 +166,8 @@ describe("auth login/logout apiml create profile", () => { let scriptsPosixPath = __dirname + "/__scripts__"; scriptsPosixPath = scriptsPosixPath.replaceAll("\\", "/"); scriptsPosixPath = scriptsPosixPath.replace(/^(.):(.*)/i, "/$1$2"); + + // eslint-disable-next-line no-console console.log("zzz: scriptsPosixPath = " + scriptsPosixPath); // create a team config From eaaa49fc767341f90c9370a46ae7029f49717bbe Mon Sep 17 00:00:00 2001 From: Gene Johnston Date: Tue, 9 Jan 2024 15:37:54 -0500 Subject: [PATCH 095/138] Add quotes around Jenkins spacey directory path Signed-off-by: Gene Johnston --- .../auth/__system__/__scripts__/create_team_cfg.sh | 6 +++--- .../__system__/cli.auth.login.apiml.system.test.ts | 11 +---------- 2 files changed, 4 insertions(+), 13 deletions(-) diff --git a/packages/cli/__tests__/auth/__system__/__scripts__/create_team_cfg.sh b/packages/cli/__tests__/auth/__system__/__scripts__/create_team_cfg.sh index 5d5d1966b5..77f65213fa 100644 --- a/packages/cli/__tests__/auth/__system__/__scripts__/create_team_cfg.sh +++ b/packages/cli/__tests__/auth/__system__/__scripts__/create_team_cfg.sh @@ -3,13 +3,13 @@ HOST=${1:?"First parm (HOST) is required."} PORT=${2:?"Second parm (PORT) is required."} REJECT=${3:?"Third parm (REJECT) is required."} -scriptsDir=${4:?"Fourth parm (scriptsDir) is required."} # include exitOnFailure function -. $scriptsDir/exitOnFailure.sh +myScriptDir=`dirname $0` +. "$myScriptDir/exitOnFailure.sh" # copy our config file template -cp $scriptsDir/../__resources__/zowe.config_template.json . +cp "$myScriptDir/../__resources__/zowe.config_template.json" . exitOnFailure "Failed to copy config file." $? sed -e "s/NoBaseHostVal/$HOST/" \ diff --git a/packages/cli/__tests__/auth/__system__/cli.auth.login.apiml.system.test.ts b/packages/cli/__tests__/auth/__system__/cli.auth.login.apiml.system.test.ts index a880a8907e..b441073c21 100644 --- a/packages/cli/__tests__/auth/__system__/cli.auth.login.apiml.system.test.ts +++ b/packages/cli/__tests__/auth/__system__/cli.auth.login.apiml.system.test.ts @@ -162,22 +162,13 @@ describe("auth login/logout apiml create profile", () => { }); it("should successfully issue the logout command with a created team config", async () => { - // Form a posix-style path to scripts directory - let scriptsPosixPath = __dirname + "/__scripts__"; - scriptsPosixPath = scriptsPosixPath.replaceAll("\\", "/"); - scriptsPosixPath = scriptsPosixPath.replace(/^(.):(.*)/i, "/$1$2"); - - // eslint-disable-next-line no-console - console.log("zzz: scriptsPosixPath = " + scriptsPosixPath); - // create a team config let response = runCliScript(__dirname + "/__scripts__/create_team_cfg.sh", TEST_ENVIRONMENT_CREATE_PROF, [ base.host, base.port, - base.rejectUnauthorized, - scriptsPosixPath + base.rejectUnauthorized ]); expect(response.stderr.toString()).toBe(""); From c85d5a7a9db4c380c64a1f03aeb2125ec2cbb066 Mon Sep 17 00:00:00 2001 From: Gene Johnston Date: Tue, 9 Jan 2024 16:53:57 -0500 Subject: [PATCH 096/138] Avoid using `dirname` with a spacey path Signed-off-by: Gene Johnston --- .../auth/__system__/__scripts__/create_team_cfg.sh | 6 +++--- .../__system__/cli.auth.login.apiml.system.test.ts | 11 +++++++++-- 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/packages/cli/__tests__/auth/__system__/__scripts__/create_team_cfg.sh b/packages/cli/__tests__/auth/__system__/__scripts__/create_team_cfg.sh index 77f65213fa..ee42a8e441 100644 --- a/packages/cli/__tests__/auth/__system__/__scripts__/create_team_cfg.sh +++ b/packages/cli/__tests__/auth/__system__/__scripts__/create_team_cfg.sh @@ -3,13 +3,13 @@ HOST=${1:?"First parm (HOST) is required."} PORT=${2:?"Second parm (PORT) is required."} REJECT=${3:?"Third parm (REJECT) is required."} +scriptsDir=${4:?"Fourth parm (scriptsDir) is required."} # include exitOnFailure function -myScriptDir=`dirname $0` -. "$myScriptDir/exitOnFailure.sh" +. "$scriptsDir/exitOnFailure.sh" # copy our config file template -cp "$myScriptDir/../__resources__/zowe.config_template.json" . +cp "$scriptsDir/../__resources__/zowe.config_template.json" . exitOnFailure "Failed to copy config file." $? sed -e "s/NoBaseHostVal/$HOST/" \ diff --git a/packages/cli/__tests__/auth/__system__/cli.auth.login.apiml.system.test.ts b/packages/cli/__tests__/auth/__system__/cli.auth.login.apiml.system.test.ts index b441073c21..0c52a29e20 100644 --- a/packages/cli/__tests__/auth/__system__/cli.auth.login.apiml.system.test.ts +++ b/packages/cli/__tests__/auth/__system__/cli.auth.login.apiml.system.test.ts @@ -162,15 +162,22 @@ describe("auth login/logout apiml create profile", () => { }); it("should successfully issue the logout command with a created team config", async () => { + // Form a posix-style path to scripts directory + let scriptsPosixPath = __dirname + "/__scripts__"; + scriptsPosixPath = scriptsPosixPath.replaceAll("\\", "/"); + scriptsPosixPath = scriptsPosixPath.replace(/^(.):(.*)/, "/$1$2"); + // create a team config let response = runCliScript(__dirname + "/__scripts__/create_team_cfg.sh", TEST_ENVIRONMENT_CREATE_PROF, [ base.host, base.port, - base.rejectUnauthorized + base.rejectUnauthorized, + scriptsPosixPath ]); expect(response.stderr.toString()).toBe(""); + expect(response.status).toBe(0); // login to create token in SCS response = runCliScript(__dirname + "/__scripts__/auth_login_apiml.sh", TEST_ENVIRONMENT_CREATE_PROF, @@ -184,9 +191,9 @@ describe("auth login/logout apiml create profile", () => { response = runCliScript(__dirname + "/__scripts__/auth_logout_apiml.sh", TEST_ENVIRONMENT_CREATE_PROF); expect(response.stderr.toString()).toBe(""); - expect(response.status).toBe(0); expect(response.stdout.toString()).toContain("Logout successful. The authentication token has been revoked"); expect(response.stdout.toString()).toContain("Token was removed from your 'base' base profile"); // V1 message + expect(response.status).toBe(0); }); }); From 3146ab4751678162911e4af9893ac65e7b27ca1b Mon Sep 17 00:00:00 2001 From: Gene Johnston Date: Tue, 9 Jan 2024 17:04:36 -0500 Subject: [PATCH 097/138] Remove system test debug hacks Signed-off-by: Gene Johnston --- package.json | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/package.json b/package.json index bfa4659b4b..65d168c487 100644 --- a/package.json +++ b/package.json @@ -27,8 +27,7 @@ "pretest:integration": "node scripts/sampleCliTool.js install", "test:integration": "env-cmd -f __tests__/__resources__/env/integration.env --no-override jest \".*__tests__.*\\**\\.integration\\.(spec|test)\\.ts$\" --coverage false", "posttest:integration": "node scripts/sampleCliTool.js uninstall", - "test:zzzsystem": "env-cmd -f __tests__/__resources__/env/system.env --no-override jest \".*__tests__.*\\**\\.system\\.(spec|test)\\.ts$\" --coverage false", - "test:system": "env-cmd -f __tests__/__resources__/env/system.env --no-override jest --testRegex packages/cli/__tests__/auth/__system__/cli.auth.login.apiml.system.test.ts --coverage false", + "test:system": "env-cmd -f __tests__/__resources__/env/system.env --no-override jest \".*__tests__.*\\**\\.system\\.(spec|test)\\.ts$\" --coverage false", "test:unit": "env-cmd -f __tests__/__resources__/env/unit.env --no-override jest \".*__tests__.*\\**\\.unit\\.(spec|test)\\.ts$\" --coverage", "watch": "lerna run --parallel watch", "watch:exe": "cd zowex && cargo install cargo-watch && cargo watch -x build -x clippy -x test", From d2ebce6b91d537aeafa4eb5b213b9063dff39770 Mon Sep 17 00:00:00 2001 From: zFernand0 <37381190+zFernand0@users.noreply.github.com> Date: Wed, 10 Jan 2024 15:27:07 +0000 Subject: [PATCH 098/138] ensure that the property is found Signed-off-by: zFernand0 <37381190+zFernand0@users.noreply.github.com> --- packages/imperative/src/config/src/ProfileInfo.ts | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/packages/imperative/src/config/src/ProfileInfo.ts b/packages/imperative/src/config/src/ProfileInfo.ts index 161a9aaf89..e8453cb95d 100644 --- a/packages/imperative/src/config/src/ProfileInfo.ts +++ b/packages/imperative/src/config/src/ProfileInfo.ts @@ -203,9 +203,11 @@ export class ProfileInfo { const mergedArgs = this.mergeArgsForProfile(desiredProfile, { getSecureVals: false }); if (options.forceUpdate && this.usingTeamConfig) { const knownProperty = mergedArgs.knownArgs.find((v => v.argName === options.property)); - const profPath = this.getTeamConfig().api.profiles.getProfilePathFromName(options.profileName); - if (!knownProperty?.argLoc.jsonLoc.startsWith(profPath)) { - knownProperty.argLoc.jsonLoc = `${profPath}.properties.${options.property}`; + if (knownProperty != null) { + const profPath = this.getTeamConfig().api.profiles.getProfilePathFromName(options.profileName); + if (!knownProperty.argLoc.jsonLoc.startsWith(profPath)) { + knownProperty.argLoc.jsonLoc = `${profPath}.properties.${options.property}`; + } } } if (!(await this.updateKnownProperty({ ...options, mergedArgs, osLocInfo: this.getOsLocInfo(desiredProfile)?.[0] }))) { From 924a0a83674537218d0bf741ce37e47004d27785 Mon Sep 17 00:00:00 2001 From: zFernand0 <37381190+zFernand0@users.noreply.github.com> Date: Wed, 10 Jan 2024 16:00:50 +0000 Subject: [PATCH 099/138] update tests Signed-off-by: zFernand0 <37381190+zFernand0@users.noreply.github.com> --- .../ProfileInfo.TeamConfig.unit.test.ts | 25 +++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/packages/imperative/src/config/__tests__/ProfileInfo.TeamConfig.unit.test.ts b/packages/imperative/src/config/__tests__/ProfileInfo.TeamConfig.unit.test.ts index c003154afb..bf6f0f43a7 100644 --- a/packages/imperative/src/config/__tests__/ProfileInfo.TeamConfig.unit.test.ts +++ b/packages/imperative/src/config/__tests__/ProfileInfo.TeamConfig.unit.test.ts @@ -1040,6 +1040,31 @@ describe("TeamConfig ProfileInfo tests", () => { expect(updateKnownPropertySpy).toHaveBeenCalledWith({ ...profileOptions, mergedArgs, osLocInfo }); }); + it("should succeed forceUpdating a property even if the property doesn't exist", async () => { + const profInfo = createNewProfInfo(teamProjDir); + await profInfo.readProfilesFromDisk(); + const storeSpy = jest.spyOn(ConfigAutoStore, "_storeSessCfgProps").mockImplementation(jest.fn()); + const profileOptions: IProfInfoUpdatePropOpts = { + profileName: "LPAR4", + profileType: "dummy", + property: "DOES_NOT_EXIST", + value: true, + forceUpdate: true + }; + let caughtError; + try { + await profInfo.updateProperty(profileOptions); + } catch (error) { + caughtError = error; + } + expect(caughtError).toBeUndefined(); + expect(storeSpy).toHaveBeenCalledWith({ + config: profInfo.getTeamConfig(), profileName: "LPAR4", profileType: "dummy", + defaultBaseProfileName: "base_glob", + propsToStore: [ "DOES_NOT_EXIST" ], sessCfg: { "DOES_NOT_EXIST": true }, setSecure : undefined, + }); + }); + it("should attempt to store session config properties without adding profile types to the loadedConfig", async () => { const profInfo = createNewProfInfo(teamProjDir); await profInfo.readProfilesFromDisk(); From 8d908f4132e770ab3d49b3eaf3a8c137e0ff4494 Mon Sep 17 00:00:00 2001 From: zFernand0 <37381190+zFernand0@users.noreply.github.com> Date: Wed, 10 Jan 2024 17:59:01 +0000 Subject: [PATCH 100/138] update changelog Signed-off-by: zFernand0 <37381190+zFernand0@users.noreply.github.com> --- packages/imperative/CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/packages/imperative/CHANGELOG.md b/packages/imperative/CHANGELOG.md index 1ba99ff4b8..4ebbe9ddde 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: Fixed issue when a property is not found in `ProfileInfo.updateProperty({forceUpdate: true})`. [zowe-explorer#2493](https://github.com/zowe/vscode-extension-for-zowe/issues/2493) + ## `5.20.1` - BugFix: Fixed error message shown for null option definition to include details about which command caused the error. [#2002](https://github.com/zowe/zowe-cli/issues/2002) From e57fa089a10b44b66b5083a32642ed423123c3ce Mon Sep 17 00:00:00 2001 From: Gene Johnston Date: Wed, 10 Jan 2024 13:13:00 -0500 Subject: [PATCH 101/138] Remove unused variables. Signed-off-by: Gene Johnston --- .../cmd/__integration__/CliProfileManager.integration.test.ts | 2 +- packages/zosjobs/__tests__/__system__/GetJobs.system.test.ts | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/packages/imperative/__tests__/src/packages/cmd/__integration__/CliProfileManager.integration.test.ts b/packages/imperative/__tests__/src/packages/cmd/__integration__/CliProfileManager.integration.test.ts index 714c31d072..d616cec979 100644 --- a/packages/imperative/__tests__/src/packages/cmd/__integration__/CliProfileManager.integration.test.ts +++ b/packages/imperative/__tests__/src/packages/cmd/__integration__/CliProfileManager.integration.test.ts @@ -84,7 +84,7 @@ describe("Cli Profile Manager", () => { let caughtError; try { - const manager = new CliProfileManager({ + new CliProfileManager({ profileRootDirectory: profileDir, type: profileTypeOne, logger: testLogger, diff --git a/packages/zosjobs/__tests__/__system__/GetJobs.system.test.ts b/packages/zosjobs/__tests__/__system__/GetJobs.system.test.ts index b0c0a15458..1992f73296 100644 --- a/packages/zosjobs/__tests__/__system__/GetJobs.system.test.ts +++ b/packages/zosjobs/__tests__/__system__/GetJobs.system.test.ts @@ -953,7 +953,6 @@ describe("Get JCL APIs", () => { expect(JSON.parse(error.causeErrors).reason).toMatchSnapshot(); expect(JSON.parse(error.causeErrors).category).toMatchSnapshot(); const trimmedErrorMessage = trimMessage(error.message); - const jsonCauseErrors = JSON.parse(error.causeErrors); expect(trimmedErrorMessage).toContain("status 400"); expect(trimmedErrorMessage).toContain(job.jobid); }); From 0c7797a3052e89080a0903488bfcc5556cc59e00 Mon Sep 17 00:00:00 2001 From: zowe-robot Date: Wed, 10 Jan 2024 20:13:20 +0000 Subject: [PATCH 102/138] Bump version to 7.21.4 [ci skip] Signed-off-by: zowe-robot --- .../__packages__/cli-test-utils/package.json | 4 +- lerna.json | 2 +- npm-shrinkwrap.json | 206 +++++++++--------- packages/cli/package.json | 26 +-- packages/core/package.json | 6 +- packages/imperative/CHANGELOG.md | 2 +- packages/imperative/package.json | 2 +- packages/provisioning/package.json | 8 +- packages/workflows/package.json | 10 +- packages/zosconsole/package.json | 8 +- packages/zosfiles/package.json | 10 +- packages/zosjobs/package.json | 10 +- packages/zoslogs/package.json | 8 +- packages/zosmf/package.json | 8 +- packages/zostso/package.json | 10 +- packages/zosuss/package.json | 6 +- 16 files changed, 163 insertions(+), 163 deletions(-) diff --git a/__tests__/__packages__/cli-test-utils/package.json b/__tests__/__packages__/cli-test-utils/package.json index 725b308153..091c935a8e 100644 --- a/__tests__/__packages__/cli-test-utils/package.json +++ b/__tests__/__packages__/cli-test-utils/package.json @@ -1,6 +1,6 @@ { "name": "@zowe/cli-test-utils", - "version": "7.21.2", + "version": "7.21.4", "description": "Test utilities package for Zowe CLI plug-ins", "author": "Zowe", "license": "EPL-2.0", @@ -43,7 +43,7 @@ "devDependencies": { "@types/js-yaml": "^4.0.0", "@types/uuid": "^8.3.0", - "@zowe/imperative": "5.20.1" + "@zowe/imperative": "5.20.2" }, "peerDependencies": { "@zowe/imperative": "^5.0.0" diff --git a/lerna.json b/lerna.json index b58f0a3b56..4ce9e9768c 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "7.21.3", + "version": "7.21.4", "command": { "publish": { "ignoreChanges": [ diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json index 67a09ef694..c666b3872b 100644 --- a/npm-shrinkwrap.json +++ b/npm-shrinkwrap.json @@ -51,7 +51,7 @@ }, "__tests__/__packages__/cli-test-utils": { "name": "@zowe/cli-test-utils", - "version": "7.21.2", + "version": "7.21.4", "license": "EPL-2.0", "dependencies": { "find-up": "^5.0.0", @@ -62,7 +62,7 @@ "devDependencies": { "@types/js-yaml": "^4.0.0", "@types/uuid": "^8.3.0", - "@zowe/imperative": "5.20.1" + "@zowe/imperative": "5.20.2" }, "peerDependencies": { "@zowe/imperative": "^5.0.0" @@ -24704,21 +24704,21 @@ }, "packages/cli": { "name": "@zowe/cli", - "version": "7.21.3", + "version": "7.21.4", "hasInstallScript": true, "license": "EPL-2.0", "dependencies": { - "@zowe/core-for-zowe-sdk": "7.21.2", - "@zowe/imperative": "5.20.1", - "@zowe/provisioning-for-zowe-sdk": "7.21.2", - "@zowe/zos-console-for-zowe-sdk": "7.21.2", - "@zowe/zos-files-for-zowe-sdk": "7.21.3", - "@zowe/zos-jobs-for-zowe-sdk": "7.21.3", - "@zowe/zos-logs-for-zowe-sdk": "7.21.2", - "@zowe/zos-tso-for-zowe-sdk": "7.21.2", - "@zowe/zos-uss-for-zowe-sdk": "7.21.2", - "@zowe/zos-workflows-for-zowe-sdk": "7.21.3", - "@zowe/zosmf-for-zowe-sdk": "7.21.2", + "@zowe/core-for-zowe-sdk": "7.21.4", + "@zowe/imperative": "5.20.2", + "@zowe/provisioning-for-zowe-sdk": "7.21.4", + "@zowe/zos-console-for-zowe-sdk": "7.21.4", + "@zowe/zos-files-for-zowe-sdk": "7.21.4", + "@zowe/zos-jobs-for-zowe-sdk": "7.21.4", + "@zowe/zos-logs-for-zowe-sdk": "7.21.4", + "@zowe/zos-tso-for-zowe-sdk": "7.21.4", + "@zowe/zos-uss-for-zowe-sdk": "7.21.4", + "@zowe/zos-workflows-for-zowe-sdk": "7.21.4", + "@zowe/zosmf-for-zowe-sdk": "7.21.4", "find-process": "1.4.7", "get-stream": "6.0.1", "lodash": "4.17.21", @@ -24733,7 +24733,7 @@ "@types/diff": "^5.0.2", "@types/lodash": "^4.14.175", "@types/tar": "^6.1.2", - "@zowe/cli-test-utils": "7.21.2", + "@zowe/cli-test-utils": "7.21.4", "comment-json": "^4.1.1", "strip-ansi": "^6.0.1", "which": "^2.0.2" @@ -24766,15 +24766,15 @@ }, "packages/core": { "name": "@zowe/core-for-zowe-sdk", - "version": "7.21.2", + "version": "7.21.4", "license": "EPL-2.0", "dependencies": { "comment-json": "4.1.1", "string-width": "4.2.3" }, "devDependencies": { - "@zowe/cli-test-utils": "7.21.2", - "@zowe/imperative": "5.20.1" + "@zowe/cli-test-utils": "7.21.4", + "@zowe/imperative": "5.20.2" }, "peerDependencies": { "@zowe/imperative": "^5.0.0" @@ -24782,7 +24782,7 @@ }, "packages/imperative": { "name": "@zowe/imperative", - "version": "5.20.1", + "version": "5.20.2", "license": "EPL-2.0", "dependencies": { "@types/yargs": "13.0.4", @@ -25130,16 +25130,16 @@ }, "packages/provisioning": { "name": "@zowe/provisioning-for-zowe-sdk", - "version": "7.21.2", + "version": "7.21.4", "license": "EPL-2.0", "dependencies": { "js-yaml": "4.1.0" }, "devDependencies": { "@types/js-yaml": "^4.0.5", - "@zowe/cli-test-utils": "7.21.2", - "@zowe/core-for-zowe-sdk": "7.21.2", - "@zowe/imperative": "5.20.1" + "@zowe/cli-test-utils": "7.21.4", + "@zowe/core-for-zowe-sdk": "7.21.4", + "@zowe/imperative": "5.20.2" }, "peerDependencies": { "@zowe/core-for-zowe-sdk": "^7.0.0", @@ -25161,15 +25161,15 @@ }, "packages/workflows": { "name": "@zowe/zos-workflows-for-zowe-sdk", - "version": "7.21.3", + "version": "7.21.4", "license": "EPL-2.0", "dependencies": { - "@zowe/zos-files-for-zowe-sdk": "7.21.3" + "@zowe/zos-files-for-zowe-sdk": "7.21.4" }, "devDependencies": { - "@zowe/cli-test-utils": "7.21.2", - "@zowe/core-for-zowe-sdk": "7.21.2", - "@zowe/imperative": "5.20.1" + "@zowe/cli-test-utils": "7.21.4", + "@zowe/core-for-zowe-sdk": "7.21.4", + "@zowe/imperative": "5.20.2" }, "peerDependencies": { "@zowe/core-for-zowe-sdk": "^7.0.0", @@ -25178,12 +25178,12 @@ }, "packages/zosconsole": { "name": "@zowe/zos-console-for-zowe-sdk", - "version": "7.21.2", + "version": "7.21.4", "license": "EPL-2.0", "devDependencies": { - "@zowe/cli-test-utils": "7.21.2", - "@zowe/core-for-zowe-sdk": "7.21.2", - "@zowe/imperative": "5.20.1" + "@zowe/cli-test-utils": "7.21.4", + "@zowe/core-for-zowe-sdk": "7.21.4", + "@zowe/imperative": "5.20.2" }, "peerDependencies": { "@zowe/core-for-zowe-sdk": "^7.0.0", @@ -25192,17 +25192,17 @@ }, "packages/zosfiles": { "name": "@zowe/zos-files-for-zowe-sdk", - "version": "7.21.3", + "version": "7.21.4", "license": "EPL-2.0", "dependencies": { "get-stream": "6.0.1", "minimatch": "5.0.1" }, "devDependencies": { - "@zowe/cli-test-utils": "7.21.2", - "@zowe/core-for-zowe-sdk": "7.21.2", - "@zowe/imperative": "5.20.1", - "@zowe/zos-uss-for-zowe-sdk": "7.21.2" + "@zowe/cli-test-utils": "7.21.4", + "@zowe/core-for-zowe-sdk": "7.21.4", + "@zowe/imperative": "5.20.2", + "@zowe/zos-uss-for-zowe-sdk": "7.21.4" }, "peerDependencies": { "@zowe/core-for-zowe-sdk": "^7.0.0", @@ -25230,15 +25230,15 @@ }, "packages/zosjobs": { "name": "@zowe/zos-jobs-for-zowe-sdk", - "version": "7.21.3", + "version": "7.21.4", "license": "EPL-2.0", "dependencies": { - "@zowe/zos-files-for-zowe-sdk": "7.21.3" + "@zowe/zos-files-for-zowe-sdk": "7.21.4" }, "devDependencies": { - "@zowe/cli-test-utils": "7.21.2", - "@zowe/core-for-zowe-sdk": "7.21.2", - "@zowe/imperative": "5.20.1" + "@zowe/cli-test-utils": "7.21.4", + "@zowe/core-for-zowe-sdk": "7.21.4", + "@zowe/imperative": "5.20.2" }, "peerDependencies": { "@zowe/core-for-zowe-sdk": "^7.0.0", @@ -25247,12 +25247,12 @@ }, "packages/zoslogs": { "name": "@zowe/zos-logs-for-zowe-sdk", - "version": "7.21.2", + "version": "7.21.4", "license": "EPL-2.0", "devDependencies": { - "@zowe/cli-test-utils": "7.21.2", - "@zowe/core-for-zowe-sdk": "7.21.2", - "@zowe/imperative": "5.20.1" + "@zowe/cli-test-utils": "7.21.4", + "@zowe/core-for-zowe-sdk": "7.21.4", + "@zowe/imperative": "5.20.2" }, "peerDependencies": { "@zowe/core-for-zowe-sdk": "^7.0.0", @@ -25261,12 +25261,12 @@ }, "packages/zosmf": { "name": "@zowe/zosmf-for-zowe-sdk", - "version": "7.21.2", + "version": "7.21.4", "license": "EPL-2.0", "devDependencies": { - "@zowe/cli-test-utils": "7.21.2", - "@zowe/core-for-zowe-sdk": "7.21.2", - "@zowe/imperative": "5.20.1" + "@zowe/cli-test-utils": "7.21.4", + "@zowe/core-for-zowe-sdk": "7.21.4", + "@zowe/imperative": "5.20.2" }, "peerDependencies": { "@zowe/core-for-zowe-sdk": "^7.0.0", @@ -25275,15 +25275,15 @@ }, "packages/zostso": { "name": "@zowe/zos-tso-for-zowe-sdk", - "version": "7.21.2", + "version": "7.21.4", "license": "EPL-2.0", "dependencies": { - "@zowe/zosmf-for-zowe-sdk": "7.21.2" + "@zowe/zosmf-for-zowe-sdk": "7.21.4" }, "devDependencies": { - "@zowe/cli-test-utils": "7.21.2", - "@zowe/core-for-zowe-sdk": "7.21.2", - "@zowe/imperative": "5.20.1" + "@zowe/cli-test-utils": "7.21.4", + "@zowe/core-for-zowe-sdk": "7.21.4", + "@zowe/imperative": "5.20.2" }, "peerDependencies": { "@zowe/core-for-zowe-sdk": "^7.0.0", @@ -25292,15 +25292,15 @@ }, "packages/zosuss": { "name": "@zowe/zos-uss-for-zowe-sdk", - "version": "7.21.2", + "version": "7.21.4", "license": "EPL-2.0", "dependencies": { "ssh2": "1.15.0" }, "devDependencies": { "@types/ssh2": "^1.11.0", - "@zowe/cli-test-utils": "7.21.2", - "@zowe/imperative": "5.20.1" + "@zowe/cli-test-utils": "7.21.4", + "@zowe/imperative": "5.20.2" }, "peerDependencies": { "@zowe/imperative": "^5.2.0" @@ -31974,19 +31974,19 @@ "@types/diff": "^5.0.2", "@types/lodash": "^4.14.175", "@types/tar": "^6.1.2", - "@zowe/cli-test-utils": "7.21.2", - "@zowe/core-for-zowe-sdk": "7.21.2", - "@zowe/imperative": "5.20.1", - "@zowe/provisioning-for-zowe-sdk": "7.21.2", + "@zowe/cli-test-utils": "7.21.4", + "@zowe/core-for-zowe-sdk": "7.21.4", + "@zowe/imperative": "5.20.2", + "@zowe/provisioning-for-zowe-sdk": "7.21.4", "@zowe/secrets-for-zowe-sdk": "7.18.6", - "@zowe/zos-console-for-zowe-sdk": "7.21.2", - "@zowe/zos-files-for-zowe-sdk": "7.21.3", - "@zowe/zos-jobs-for-zowe-sdk": "7.21.3", - "@zowe/zos-logs-for-zowe-sdk": "7.21.2", - "@zowe/zos-tso-for-zowe-sdk": "7.21.2", - "@zowe/zos-uss-for-zowe-sdk": "7.21.2", - "@zowe/zos-workflows-for-zowe-sdk": "7.21.3", - "@zowe/zosmf-for-zowe-sdk": "7.21.2", + "@zowe/zos-console-for-zowe-sdk": "7.21.4", + "@zowe/zos-files-for-zowe-sdk": "7.21.4", + "@zowe/zos-jobs-for-zowe-sdk": "7.21.4", + "@zowe/zos-logs-for-zowe-sdk": "7.21.4", + "@zowe/zos-tso-for-zowe-sdk": "7.21.4", + "@zowe/zos-uss-for-zowe-sdk": "7.21.4", + "@zowe/zos-workflows-for-zowe-sdk": "7.21.4", + "@zowe/zosmf-for-zowe-sdk": "7.21.4", "comment-json": "^4.1.1", "find-process": "1.4.7", "get-stream": "6.0.1", @@ -32020,7 +32020,7 @@ "requires": { "@types/js-yaml": "^4.0.0", "@types/uuid": "^8.3.0", - "@zowe/imperative": "5.20.1", + "@zowe/imperative": "5.20.2", "find-up": "^5.0.0", "js-yaml": "^4.0.0", "rimraf": "^3.0.2", @@ -32040,8 +32040,8 @@ "@zowe/core-for-zowe-sdk": { "version": "file:packages/core", "requires": { - "@zowe/cli-test-utils": "7.21.2", - "@zowe/imperative": "5.20.1", + "@zowe/cli-test-utils": "7.21.4", + "@zowe/imperative": "5.20.2", "comment-json": "4.1.1", "string-width": "4.2.3" } @@ -32300,9 +32300,9 @@ "version": "file:packages/provisioning", "requires": { "@types/js-yaml": "^4.0.5", - "@zowe/cli-test-utils": "7.21.2", - "@zowe/core-for-zowe-sdk": "7.21.2", - "@zowe/imperative": "5.20.1", + "@zowe/cli-test-utils": "7.21.4", + "@zowe/core-for-zowe-sdk": "7.21.4", + "@zowe/imperative": "5.20.2", "js-yaml": "4.1.0" } }, @@ -32316,18 +32316,18 @@ "@zowe/zos-console-for-zowe-sdk": { "version": "file:packages/zosconsole", "requires": { - "@zowe/cli-test-utils": "7.21.2", - "@zowe/core-for-zowe-sdk": "7.21.2", - "@zowe/imperative": "5.20.1" + "@zowe/cli-test-utils": "7.21.4", + "@zowe/core-for-zowe-sdk": "7.21.4", + "@zowe/imperative": "5.20.2" } }, "@zowe/zos-files-for-zowe-sdk": { "version": "file:packages/zosfiles", "requires": { - "@zowe/cli-test-utils": "7.21.2", - "@zowe/core-for-zowe-sdk": "7.21.2", - "@zowe/imperative": "5.20.1", - "@zowe/zos-uss-for-zowe-sdk": "7.21.2", + "@zowe/cli-test-utils": "7.21.4", + "@zowe/core-for-zowe-sdk": "7.21.4", + "@zowe/imperative": "5.20.2", + "@zowe/zos-uss-for-zowe-sdk": "7.21.4", "get-stream": "6.0.1", "minimatch": "5.0.1" }, @@ -32353,53 +32353,53 @@ "@zowe/zos-jobs-for-zowe-sdk": { "version": "file:packages/zosjobs", "requires": { - "@zowe/cli-test-utils": "7.21.2", - "@zowe/core-for-zowe-sdk": "7.21.2", - "@zowe/imperative": "5.20.1", - "@zowe/zos-files-for-zowe-sdk": "7.21.3" + "@zowe/cli-test-utils": "7.21.4", + "@zowe/core-for-zowe-sdk": "7.21.4", + "@zowe/imperative": "5.20.2", + "@zowe/zos-files-for-zowe-sdk": "7.21.4" } }, "@zowe/zos-logs-for-zowe-sdk": { "version": "file:packages/zoslogs", "requires": { - "@zowe/cli-test-utils": "7.21.2", - "@zowe/core-for-zowe-sdk": "7.21.2", - "@zowe/imperative": "5.20.1" + "@zowe/cli-test-utils": "7.21.4", + "@zowe/core-for-zowe-sdk": "7.21.4", + "@zowe/imperative": "5.20.2" } }, "@zowe/zos-tso-for-zowe-sdk": { "version": "file:packages/zostso", "requires": { - "@zowe/cli-test-utils": "7.21.2", - "@zowe/core-for-zowe-sdk": "7.21.2", - "@zowe/imperative": "5.20.1", - "@zowe/zosmf-for-zowe-sdk": "7.21.2" + "@zowe/cli-test-utils": "7.21.4", + "@zowe/core-for-zowe-sdk": "7.21.4", + "@zowe/imperative": "5.20.2", + "@zowe/zosmf-for-zowe-sdk": "7.21.4" } }, "@zowe/zos-uss-for-zowe-sdk": { "version": "file:packages/zosuss", "requires": { "@types/ssh2": "^1.11.0", - "@zowe/cli-test-utils": "7.21.2", - "@zowe/imperative": "5.20.1", + "@zowe/cli-test-utils": "7.21.4", + "@zowe/imperative": "5.20.2", "ssh2": "1.15.0" } }, "@zowe/zos-workflows-for-zowe-sdk": { "version": "file:packages/workflows", "requires": { - "@zowe/cli-test-utils": "7.21.2", - "@zowe/core-for-zowe-sdk": "7.21.2", - "@zowe/imperative": "5.20.1", - "@zowe/zos-files-for-zowe-sdk": "7.21.3" + "@zowe/cli-test-utils": "7.21.4", + "@zowe/core-for-zowe-sdk": "7.21.4", + "@zowe/imperative": "5.20.2", + "@zowe/zos-files-for-zowe-sdk": "7.21.4" } }, "@zowe/zosmf-for-zowe-sdk": { "version": "file:packages/zosmf", "requires": { - "@zowe/cli-test-utils": "7.21.2", - "@zowe/core-for-zowe-sdk": "7.21.2", - "@zowe/imperative": "5.20.1" + "@zowe/cli-test-utils": "7.21.4", + "@zowe/core-for-zowe-sdk": "7.21.4", + "@zowe/imperative": "5.20.2" } }, "abbrev": { diff --git a/packages/cli/package.json b/packages/cli/package.json index 5fae719b4e..f7543d8699 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -1,6 +1,6 @@ { "name": "@zowe/cli", - "version": "7.21.3", + "version": "7.21.4", "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.21.2", - "@zowe/imperative": "5.20.1", - "@zowe/provisioning-for-zowe-sdk": "7.21.2", - "@zowe/zos-console-for-zowe-sdk": "7.21.2", - "@zowe/zos-files-for-zowe-sdk": "7.21.3", - "@zowe/zos-jobs-for-zowe-sdk": "7.21.3", - "@zowe/zos-logs-for-zowe-sdk": "7.21.2", - "@zowe/zos-tso-for-zowe-sdk": "7.21.2", - "@zowe/zos-uss-for-zowe-sdk": "7.21.2", - "@zowe/zos-workflows-for-zowe-sdk": "7.21.3", - "@zowe/zosmf-for-zowe-sdk": "7.21.2", + "@zowe/core-for-zowe-sdk": "7.21.4", + "@zowe/imperative": "5.20.2", + "@zowe/provisioning-for-zowe-sdk": "7.21.4", + "@zowe/zos-console-for-zowe-sdk": "7.21.4", + "@zowe/zos-files-for-zowe-sdk": "7.21.4", + "@zowe/zos-jobs-for-zowe-sdk": "7.21.4", + "@zowe/zos-logs-for-zowe-sdk": "7.21.4", + "@zowe/zos-tso-for-zowe-sdk": "7.21.4", + "@zowe/zos-uss-for-zowe-sdk": "7.21.4", + "@zowe/zos-workflows-for-zowe-sdk": "7.21.4", + "@zowe/zosmf-for-zowe-sdk": "7.21.4", "find-process": "1.4.7", "get-stream": "6.0.1", "lodash": "4.17.21", @@ -79,7 +79,7 @@ "@types/diff": "^5.0.2", "@types/lodash": "^4.14.175", "@types/tar": "^6.1.2", - "@zowe/cli-test-utils": "7.21.2", + "@zowe/cli-test-utils": "7.21.4", "comment-json": "^4.1.1", "strip-ansi": "^6.0.1", "which": "^2.0.2" diff --git a/packages/core/package.json b/packages/core/package.json index 93c6fc1f8a..192f5bedda 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -1,6 +1,6 @@ { "name": "@zowe/core-for-zowe-sdk", - "version": "7.21.2", + "version": "7.21.4", "description": "Core libraries shared by Zowe SDK packages", "author": "Zowe", "license": "EPL-2.0", @@ -49,8 +49,8 @@ "string-width": "4.2.3" }, "devDependencies": { - "@zowe/cli-test-utils": "7.21.2", - "@zowe/imperative": "5.20.1" + "@zowe/cli-test-utils": "7.21.4", + "@zowe/imperative": "5.20.2" }, "peerDependencies": { "@zowe/imperative": "^5.0.0" diff --git a/packages/imperative/CHANGELOG.md b/packages/imperative/CHANGELOG.md index 4ebbe9ddde..91a1e5dae5 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.20.2` - BugFix: Fixed issue when a property is not found in `ProfileInfo.updateProperty({forceUpdate: true})`. [zowe-explorer#2493](https://github.com/zowe/vscode-extension-for-zowe/issues/2493) diff --git a/packages/imperative/package.json b/packages/imperative/package.json index a7150629f8..28f5c6c201 100644 --- a/packages/imperative/package.json +++ b/packages/imperative/package.json @@ -1,6 +1,6 @@ { "name": "@zowe/imperative", - "version": "5.20.1", + "version": "5.20.2", "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 89ee3bc009..72b696c146 100644 --- a/packages/provisioning/package.json +++ b/packages/provisioning/package.json @@ -1,6 +1,6 @@ { "name": "@zowe/provisioning-for-zowe-sdk", - "version": "7.21.2", + "version": "7.21.4", "description": "Zowe SDK to interact with the z/OS provisioning APIs", "author": "Zowe", "license": "EPL-2.0", @@ -49,9 +49,9 @@ }, "devDependencies": { "@types/js-yaml": "^4.0.5", - "@zowe/cli-test-utils": "7.21.2", - "@zowe/core-for-zowe-sdk": "7.21.2", - "@zowe/imperative": "5.20.1" + "@zowe/cli-test-utils": "7.21.4", + "@zowe/core-for-zowe-sdk": "7.21.4", + "@zowe/imperative": "5.20.2" }, "peerDependencies": { "@zowe/core-for-zowe-sdk": "^7.0.0", diff --git a/packages/workflows/package.json b/packages/workflows/package.json index 1c6e30868d..8946ad003d 100644 --- a/packages/workflows/package.json +++ b/packages/workflows/package.json @@ -1,6 +1,6 @@ { "name": "@zowe/zos-workflows-for-zowe-sdk", - "version": "7.21.3", + "version": "7.21.4", "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.21.3" + "@zowe/zos-files-for-zowe-sdk": "7.21.4" }, "devDependencies": { - "@zowe/cli-test-utils": "7.21.2", - "@zowe/core-for-zowe-sdk": "7.21.2", - "@zowe/imperative": "5.20.1" + "@zowe/cli-test-utils": "7.21.4", + "@zowe/core-for-zowe-sdk": "7.21.4", + "@zowe/imperative": "5.20.2" }, "peerDependencies": { "@zowe/core-for-zowe-sdk": "^7.0.0", diff --git a/packages/zosconsole/package.json b/packages/zosconsole/package.json index 92bb137af8..8a395d4075 100644 --- a/packages/zosconsole/package.json +++ b/packages/zosconsole/package.json @@ -1,6 +1,6 @@ { "name": "@zowe/zos-console-for-zowe-sdk", - "version": "7.21.2", + "version": "7.21.4", "description": "Zowe SDK to interact with the z/OS console", "author": "Zowe", "license": "EPL-2.0", @@ -45,9 +45,9 @@ "prepack": "node ../../scripts/prepareLicenses.js" }, "devDependencies": { - "@zowe/cli-test-utils": "7.21.2", - "@zowe/core-for-zowe-sdk": "7.21.2", - "@zowe/imperative": "5.20.1" + "@zowe/cli-test-utils": "7.21.4", + "@zowe/core-for-zowe-sdk": "7.21.4", + "@zowe/imperative": "5.20.2" }, "peerDependencies": { "@zowe/core-for-zowe-sdk": "^7.0.0", diff --git a/packages/zosfiles/package.json b/packages/zosfiles/package.json index 65aa43e8fb..fa46e797dc 100644 --- a/packages/zosfiles/package.json +++ b/packages/zosfiles/package.json @@ -1,6 +1,6 @@ { "name": "@zowe/zos-files-for-zowe-sdk", - "version": "7.21.3", + "version": "7.21.4", "description": "Zowe SDK to interact with files and data sets on z/OS", "author": "Zowe", "license": "EPL-2.0", @@ -50,10 +50,10 @@ "minimatch": "5.0.1" }, "devDependencies": { - "@zowe/cli-test-utils": "7.21.2", - "@zowe/core-for-zowe-sdk": "7.21.2", - "@zowe/imperative": "5.20.1", - "@zowe/zos-uss-for-zowe-sdk": "7.21.2" + "@zowe/cli-test-utils": "7.21.4", + "@zowe/core-for-zowe-sdk": "7.21.4", + "@zowe/imperative": "5.20.2", + "@zowe/zos-uss-for-zowe-sdk": "7.21.4" }, "peerDependencies": { "@zowe/core-for-zowe-sdk": "^7.0.0", diff --git a/packages/zosjobs/package.json b/packages/zosjobs/package.json index d5b752a4ea..fa2c406e33 100644 --- a/packages/zosjobs/package.json +++ b/packages/zosjobs/package.json @@ -1,6 +1,6 @@ { "name": "@zowe/zos-jobs-for-zowe-sdk", - "version": "7.21.3", + "version": "7.21.4", "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.21.3" + "@zowe/zos-files-for-zowe-sdk": "7.21.4" }, "devDependencies": { - "@zowe/cli-test-utils": "7.21.2", - "@zowe/core-for-zowe-sdk": "7.21.2", - "@zowe/imperative": "5.20.1" + "@zowe/cli-test-utils": "7.21.4", + "@zowe/core-for-zowe-sdk": "7.21.4", + "@zowe/imperative": "5.20.2" }, "peerDependencies": { "@zowe/core-for-zowe-sdk": "^7.0.0", diff --git a/packages/zoslogs/package.json b/packages/zoslogs/package.json index 6ac08e20b8..0bd2c4db38 100644 --- a/packages/zoslogs/package.json +++ b/packages/zoslogs/package.json @@ -1,6 +1,6 @@ { "name": "@zowe/zos-logs-for-zowe-sdk", - "version": "7.21.2", + "version": "7.21.4", "description": "Zowe SDK to interact with the z/OS logs", "author": "Zowe", "license": "EPL-2.0", @@ -45,9 +45,9 @@ "prepack": "node ../../scripts/prepareLicenses.js" }, "devDependencies": { - "@zowe/cli-test-utils": "7.21.2", - "@zowe/core-for-zowe-sdk": "7.21.2", - "@zowe/imperative": "5.20.1" + "@zowe/cli-test-utils": "7.21.4", + "@zowe/core-for-zowe-sdk": "7.21.4", + "@zowe/imperative": "5.20.2" }, "peerDependencies": { "@zowe/core-for-zowe-sdk": "^7.0.0", diff --git a/packages/zosmf/package.json b/packages/zosmf/package.json index 77d268bcb4..17ec7faa2b 100644 --- a/packages/zosmf/package.json +++ b/packages/zosmf/package.json @@ -1,6 +1,6 @@ { "name": "@zowe/zosmf-for-zowe-sdk", - "version": "7.21.2", + "version": "7.21.4", "description": "Zowe SDK to interact with the z/OS Management Facility", "author": "Zowe", "license": "EPL-2.0", @@ -44,9 +44,9 @@ "prepack": "node ../../scripts/prepareLicenses.js" }, "devDependencies": { - "@zowe/cli-test-utils": "7.21.2", - "@zowe/core-for-zowe-sdk": "7.21.2", - "@zowe/imperative": "5.20.1" + "@zowe/cli-test-utils": "7.21.4", + "@zowe/core-for-zowe-sdk": "7.21.4", + "@zowe/imperative": "5.20.2" }, "peerDependencies": { "@zowe/core-for-zowe-sdk": "^7.0.0", diff --git a/packages/zostso/package.json b/packages/zostso/package.json index 85b0cd41e1..5d14e8d5a9 100644 --- a/packages/zostso/package.json +++ b/packages/zostso/package.json @@ -1,6 +1,6 @@ { "name": "@zowe/zos-tso-for-zowe-sdk", - "version": "7.21.2", + "version": "7.21.4", "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.21.2" + "@zowe/zosmf-for-zowe-sdk": "7.21.4" }, "devDependencies": { - "@zowe/cli-test-utils": "7.21.2", - "@zowe/core-for-zowe-sdk": "7.21.2", - "@zowe/imperative": "5.20.1" + "@zowe/cli-test-utils": "7.21.4", + "@zowe/core-for-zowe-sdk": "7.21.4", + "@zowe/imperative": "5.20.2" }, "peerDependencies": { "@zowe/core-for-zowe-sdk": "^7.0.0", diff --git a/packages/zosuss/package.json b/packages/zosuss/package.json index 57e9fd79bd..fa9fc1153c 100644 --- a/packages/zosuss/package.json +++ b/packages/zosuss/package.json @@ -1,6 +1,6 @@ { "name": "@zowe/zos-uss-for-zowe-sdk", - "version": "7.21.2", + "version": "7.21.4", "description": "Zowe SDK to interact with USS on z/OS", "author": "Zowe", "license": "EPL-2.0", @@ -49,8 +49,8 @@ }, "devDependencies": { "@types/ssh2": "^1.11.0", - "@zowe/cli-test-utils": "7.21.2", - "@zowe/imperative": "5.20.1" + "@zowe/cli-test-utils": "7.21.4", + "@zowe/imperative": "5.20.2" }, "peerDependencies": { "@zowe/imperative": "^5.2.0" From 3c424a2a2603296ded46166cdb84200f1619f287 Mon Sep 17 00:00:00 2001 From: "Andrew W. Harn" Date: Wed, 10 Jan 2024 17:28:02 -0500 Subject: [PATCH 103/138] Check if terminal supports color (ANSI) before using progress bar Signed-off-by: Andrew W. Harn --- .../cmd/__tests__/response/CommandResponse.unit.test.ts | 8 ++++++++ .../imperative/src/cmd/src/response/CommandResponse.ts | 2 +- packages/imperative/src/utilities/src/TextUtils.ts | 3 ++- 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/packages/imperative/src/cmd/__tests__/response/CommandResponse.unit.test.ts b/packages/imperative/src/cmd/__tests__/response/CommandResponse.unit.test.ts index 02f0af5fd0..78af4e3eca 100644 --- a/packages/imperative/src/cmd/__tests__/response/CommandResponse.unit.test.ts +++ b/packages/imperative/src/cmd/__tests__/response/CommandResponse.unit.test.ts @@ -114,10 +114,14 @@ describe("Command Response", () => { } require("rimraf").sync(testFile); }); + afterEach(() => { + delete process.env.FORCE_COLOR; + }); it("If we create a progress bar, an interval should be set to update the bar. " + "If we finish the bar, the interval should be stopped and no longer stored" + "in the command response. ", (done) => { // eslint-disable-line jest/no-done-callback + process.env.FORCE_COLOR = "1"; const response = new CommandResponse({ silent: false, responseFormat: "default" }); const status: ITaskWithStatus = { statusMessage: "Making a bar", @@ -147,6 +151,7 @@ describe("Command Response", () => { }); it("should allow the progress bar to write directly to a socket stream", (done) => { // eslint-disable-line jest/no-done-callback + process.env.FORCE_COLOR = "1"; const response = new CommandResponse({ silent: false, responseFormat: "default", stream }); const status: ITaskWithStatus = { statusMessage: "Making a bar", @@ -180,6 +185,7 @@ describe("Command Response", () => { it("If we create a progress bar, then set the bar to be complete, " + "the progress bar should automatically end ", (done) => { // eslint-disable-line jest/no-done-callback + process.env.FORCE_COLOR = "1"; const response = new CommandResponse({ silent: false, responseFormat: "default" }); const status: ITaskWithStatus = { statusMessage: "Making a bar", @@ -215,6 +221,7 @@ describe("Command Response", () => { it("If our response object is in silent mode, which is caused for example by " + "the user specifying that they want a JSON response, a progress bar should" + " not be created", () => { + process.env.FORCE_COLOR = "1"; const response = new CommandResponse({ silent: true, responseFormat: "json" }); const status: ITaskWithStatus = { statusMessage: "No bar should be made", @@ -233,6 +240,7 @@ describe("Command Response", () => { it("should not duplicate output when calling endBar", () => { + process.env.FORCE_COLOR = "1"; let stdoutMsg: string = ""; let stderrMsg: string = ""; const response = new CommandResponse({responseFormat: "default"}); diff --git a/packages/imperative/src/cmd/src/response/CommandResponse.ts b/packages/imperative/src/cmd/src/response/CommandResponse.ts index 7351f925fb..80b87ab728 100644 --- a/packages/imperative/src/cmd/src/response/CommandResponse.ts +++ b/packages/imperative/src/cmd/src/response/CommandResponse.ts @@ -724,7 +724,7 @@ export class CommandResponse implements ICommandResponseApi { `Please call progress.endBar() before starting a new one.` }); } - if (!outer.silent && outer.mResponseFormat !== "json") { + if (!outer.silent && outer.mResponseFormat !== "json" && TextUtils.chalk.level > 0) { // Persist the task specifications and determine the stream to use for the progress bar this.mProgressBarStdoutStartIndex = outer.mStdout.length; diff --git a/packages/imperative/src/utilities/src/TextUtils.ts b/packages/imperative/src/utilities/src/TextUtils.ts index 858074015c..63bcb973e1 100644 --- a/packages/imperative/src/utilities/src/TextUtils.ts +++ b/packages/imperative/src/utilities/src/TextUtils.ts @@ -300,7 +300,8 @@ export class TextUtils { const mChalk = require("chalk"); // chalk is supposed to handle this, but I think it only does so the first time it is loaded // so we need to check ourselves in case we've changed the environmental variables - mChalk.enabled = process.env.FORCE_COLOR !== "0" && process.env.MARKDOWN_GEN == null; + if (process.env.FORCE_COLOR in ["1", "2", "3", "true"]) { mChalk.enabled = true; } + if (process.env.MARKDOWN_GEN != null || process.env.FORCE_COLOR == "0") { mChalk.enabled = false; } if (!mChalk.enabled) { mChalk.level = 0; } else if (process.env.FORCE_COLOR != null) { const parsedInt = parseInt(process.env.FORCE_COLOR); From 66929ba51b90a104e438eed590011074316d4bb2 Mon Sep 17 00:00:00 2001 From: Timothy Johnson Date: Thu, 11 Jan 2024 14:01:41 -0500 Subject: [PATCH 104/138] Fix secure property names being returned for wrong profile Signed-off-by: Timothy Johnson --- packages/imperative/CHANGELOG.md | 4 + .../src/cmd/src/CommandProcessor.ts | 4 +- .../__tests__/Config.secure.unit.test.ts | 18 ++- .../config/__tests__/ConfigUtils.unit.test.ts | 2 +- .../ProfileInfo.TeamConfig.unit.test.ts | 5 + .../__resources__/project.config.json | 15 +++ .../__snapshots__/Config.unit.test.ts.snap | 30 +++++ packages/imperative/src/config/index.ts | 2 +- packages/imperative/src/config/src/Config.ts | 4 +- .../src/config/src/ConfigAutoStore.ts | 2 +- .../imperative/src/config/src/ConfigUtils.ts | 109 ++++++++++-------- .../imperative/src/config/src/ProfileInfo.ts | 5 +- .../src/config/src/api/ConfigSecure.ts | 12 +- .../src/auth/handlers/BaseAuthHandler.ts | 7 +- .../src/config/cmd/init/init.handler.ts | 6 +- .../src/config/cmd/secure/secure.handler.ts | 6 +- .../src/config/cmd/set/set.handler.ts | 6 +- .../src/session/ConnectionPropsForSessCfg.ts | 2 +- 18 files changed, 162 insertions(+), 77 deletions(-) diff --git a/packages/imperative/CHANGELOG.md b/packages/imperative/CHANGELOG.md index 91a1e5dae5..c6fc35b1ee 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: Fixed issue where secure property names could be returned for the wrong profile. [zowe-explorer#2633](https://github.com/zowe/vscode-extension-for-zowe/issues/2633) + ## `5.20.2` - BugFix: Fixed issue when a property is not found in `ProfileInfo.updateProperty({forceUpdate: true})`. [zowe-explorer#2493](https://github.com/zowe/vscode-extension-for-zowe/issues/2493) diff --git a/packages/imperative/src/cmd/src/CommandProcessor.ts b/packages/imperative/src/cmd/src/CommandProcessor.ts index 65e64ba3ab..c2b2e4ab9f 100644 --- a/packages/imperative/src/cmd/src/CommandProcessor.ts +++ b/packages/imperative/src/cmd/src/CommandProcessor.ts @@ -43,7 +43,7 @@ import { CliUtils } from "../../utilities/src/CliUtils"; import { WebHelpManager } from "./help/WebHelpManager"; import { ICommandProfile } from "./doc/profiles/definition/ICommandProfile"; import { Config } from "../../config/src/Config"; -import { getActiveProfileName } from "../../config/src/ConfigUtils"; +import { ConfigUtils } from "../../config/src/ConfigUtils"; import { ConfigConstants } from "../../config/src/ConfigConstants"; import { IDaemonContext } from "../../imperative/src/doc/IDaemonContext"; import { IHandlerResponseApi } from "../.."; @@ -820,7 +820,7 @@ export class CommandProcessor { const combinedProfiles = [ ...showInputsOnly.requiredProfiles ?? [], ...showInputsOnly.optionalProfiles ?? [] ]; combinedProfiles.forEach((profile) => { - const name = getActiveProfileName(profile, commandParameters.arguments); // get profile name + const name = ConfigUtils.getActiveProfileName(profile, commandParameters.arguments); // get profile name const props = this.mConfig.api.secure.securePropsForProfile(name); // get secure props configSecureProps.push(...props); // add to list }); diff --git a/packages/imperative/src/config/__tests__/Config.secure.unit.test.ts b/packages/imperative/src/config/__tests__/Config.secure.unit.test.ts index 44500f6737..b189683cf7 100644 --- a/packages/imperative/src/config/__tests__/Config.secure.unit.test.ts +++ b/packages/imperative/src/config/__tests__/Config.secure.unit.test.ts @@ -161,7 +161,10 @@ describe("Config secure tests", () => { .mockReturnValueOnce(false); // Global layer jest.spyOn(fs, "readFileSync"); const config = await Config.load(MY_APP); - expect(config.api.secure.secureFields()).toEqual(["profiles.fruit.properties.secret"]); + expect(config.api.secure.secureFields()).toEqual([ + "profiles.fruit.properties.secret", + "profiles.fruit.profiles.grape.properties.secret2" + ]); }); it("should list all secure fields for a profile", async () => { @@ -176,6 +179,19 @@ describe("Config secure tests", () => { expect(config.api.secure.securePropsForProfile("fruit.apple")).toEqual(["secret"]); }); + it("should not list secure fields for a profile with partial name match", async () => { + jest.spyOn(Config, "search").mockReturnValue(projectConfigPath); + jest.spyOn(fs, "existsSync") + .mockReturnValueOnce(false) // Project user layer + .mockReturnValueOnce(true) // Project layer + .mockReturnValueOnce(false) // User layer + .mockReturnValueOnce(false); // Global layer + jest.spyOn(fs, "readFileSync"); + const config = await Config.load(MY_APP); + expect(config.api.secure.securePropsForProfile("fruit.grape")).toEqual(["secret", "secret2"]); + expect(config.api.secure.securePropsForProfile("fruit.grapefruit")).toEqual(["secret"]); + }); + describe("secureInfoForProp", () => { const configProperties: IConfig = { profiles: { diff --git a/packages/imperative/src/config/__tests__/ConfigUtils.unit.test.ts b/packages/imperative/src/config/__tests__/ConfigUtils.unit.test.ts index c909303d13..7a7abae614 100644 --- a/packages/imperative/src/config/__tests__/ConfigUtils.unit.test.ts +++ b/packages/imperative/src/config/__tests__/ConfigUtils.unit.test.ts @@ -9,7 +9,7 @@ * */ -import * as ConfigUtils from "../../config/src/ConfigUtils"; +import { ConfigUtils } from "../../config/src/ConfigUtils"; import { CredentialManagerFactory } from "../../security"; import { ImperativeConfig } from "../../utilities"; diff --git a/packages/imperative/src/config/__tests__/ProfileInfo.TeamConfig.unit.test.ts b/packages/imperative/src/config/__tests__/ProfileInfo.TeamConfig.unit.test.ts index bf6f0f43a7..44a4374eb0 100644 --- a/packages/imperative/src/config/__tests__/ProfileInfo.TeamConfig.unit.test.ts +++ b/packages/imperative/src/config/__tests__/ProfileInfo.TeamConfig.unit.test.ts @@ -26,6 +26,7 @@ import { ConfigAutoStore } from "../src/ConfigAutoStore"; import { ImperativeConfig } from "../../utilities/src/ImperativeConfig"; import { ImperativeError } from "../../error"; import { IProfInfoUpdatePropOpts } from "../src/doc/IProfInfoUpdatePropOpts"; +import { ConfigUtils } from "../src/ConfigUtils"; const testAppNm = "ProfInfoApp"; const testEnvPrefix = testAppNm.toUpperCase(); @@ -1021,6 +1022,7 @@ describe("TeamConfig ProfileInfo tests", () => { }; jest.spyOn(profInfo as any, "mergeArgsForProfile").mockReturnValue(mergedArgs); const updateKnownPropertySpy = jest.spyOn(profInfo as any, "updateKnownProperty").mockResolvedValue(true); + const jsonPathMatchesSpy = jest.spyOn(ConfigUtils, "jsonPathMatches"); const profileOptions: IProfInfoUpdatePropOpts = { profileName: "LPAR4", profileType: "dummy", @@ -1038,6 +1040,7 @@ describe("TeamConfig ProfileInfo tests", () => { expect(mergedArgs.knownArgs[0].argLoc.jsonLoc).toEqual("profiles.LPAR4.properties.rejectUnauthorized"); const osLocInfo = { global: false, user: false, name: "LPAR4", path: path.join(teamProjDir, `${testAppNm}.config.json`) }; expect(updateKnownPropertySpy).toHaveBeenCalledWith({ ...profileOptions, mergedArgs, osLocInfo }); + expect(jsonPathMatchesSpy).toHaveBeenCalledTimes(1); // Verify that profile names are matched correctly }); it("should succeed forceUpdating a property even if the property doesn't exist", async () => { @@ -1161,6 +1164,7 @@ describe("TeamConfig ProfileInfo tests", () => { it("should update the given property and return true", async () => { const profInfo = createNewProfInfo(teamProjDir); await profInfo.readProfilesFromDisk(); + const jsonPathMatchesSpy = jest.spyOn(ConfigUtils, "jsonPathMatches"); const prof = profInfo.mergeArgsForProfile(profInfo.getAllProfiles("dummy")[0]); const ret = await profInfo.updateKnownProperty({ mergedArgs: prof, property: "host", value: "example.com" }); @@ -1168,6 +1172,7 @@ describe("TeamConfig ProfileInfo tests", () => { expect(newHost).toEqual("example.com"); expect(ret).toBe(true); + expect(jsonPathMatchesSpy).toHaveBeenCalled(); // Verify that profile names are matched correctly }); it("should remove the given property if the value specified if undefined", async () => { diff --git a/packages/imperative/src/config/__tests__/__resources__/project.config.json b/packages/imperative/src/config/__tests__/__resources__/project.config.json index 5a69cd0ddf..c2a1b3be7f 100644 --- a/packages/imperative/src/config/__tests__/__resources__/project.config.json +++ b/packages/imperative/src/config/__tests__/__resources__/project.config.json @@ -16,6 +16,21 @@ "properties": { "color": "orange" } + }, + "grape": { + "type": "fruit", + "properties": { + "color": "red" + }, + "secure": [ + "secret2" + ] + }, + "grapefruit": { + "type": "fruit", + "properties": { + "color": "pink" + } } }, "secure": [ diff --git a/packages/imperative/src/config/__tests__/__snapshots__/Config.unit.test.ts.snap b/packages/imperative/src/config/__tests__/__snapshots__/Config.unit.test.ts.snap index 5c9a0e7e47..eca30feba2 100644 --- a/packages/imperative/src/config/__tests__/__snapshots__/Config.unit.test.ts.snap +++ b/packages/imperative/src/config/__tests__/__snapshots__/Config.unit.test.ts.snap @@ -67,6 +67,21 @@ Object { }, "type": "fruit", }, + "grape": Object { + "properties": Object { + "color": "red", + }, + "secure": Array [ + "secret2", + ], + "type": "fruit", + }, + "grapefruit": Object { + "properties": Object { + "color": "pink", + }, + "type": "fruit", + }, "orange": Object { "properties": Object { "color": "orange", @@ -183,6 +198,21 @@ Object { }, "type": "fruit", }, + "grape": Object { + "properties": Object { + "color": "red", + }, + "secure": Array [ + "secret2", + ], + "type": "fruit", + }, + "grapefruit": Object { + "properties": Object { + "color": "pink", + }, + "type": "fruit", + }, "orange": Object { "properties": Object { "color": "orange", diff --git a/packages/imperative/src/config/index.ts b/packages/imperative/src/config/index.ts index da606bb9d4..0a02bfc2b3 100644 --- a/packages/imperative/src/config/index.ts +++ b/packages/imperative/src/config/index.ts @@ -14,7 +14,7 @@ export * from "./src/ConfigAutoStore"; export * from "./src/ConfigConstants"; export * from "./src/ConfigSchema"; export * from "./src/ConfigBuilder"; -export * as ConfigUtils from "./src/ConfigUtils"; +export * from "./src/ConfigUtils"; export * from "./src/ProfileCredentials"; export * from "./src/ProfileInfo"; export * from "./src/ProfInfoErr"; diff --git a/packages/imperative/src/config/src/Config.ts b/packages/imperative/src/config/src/Config.ts index 18db6e345e..7f9a211590 100644 --- a/packages/imperative/src/config/src/Config.ts +++ b/packages/imperative/src/config/src/Config.ts @@ -27,7 +27,7 @@ import { IConfigOpts } from "./doc/IConfigOpts"; import { IConfigSecure } from "./doc/IConfigSecure"; import { IConfigVault } from "./doc/IConfigVault"; import { ConfigLayers, ConfigPlugins, ConfigProfiles, ConfigSecure } from "./api"; -import { coercePropValue } from "./ConfigUtils"; +import { ConfigUtils } from "./ConfigUtils"; import { IConfigSchemaInfo } from "./doc/IConfigSchema"; import { JsUtils } from "../../utilities/src/JsUtils"; import { IConfigMergeOpts } from "./doc/IConfigMergeOpts"; @@ -443,7 +443,7 @@ export class Config { obj = obj[segment]; } else if (segments.indexOf(segment) === segments.length - 1) { if (opts?.parseString) { - value = coercePropValue(value); + value = ConfigUtils.coercePropValue(value); } if (opts?.parseString && Array.isArray(obj[segment])) { diff --git a/packages/imperative/src/config/src/ConfigAutoStore.ts b/packages/imperative/src/config/src/ConfigAutoStore.ts index a36a921fe1..7c6fae155a 100644 --- a/packages/imperative/src/config/src/ConfigAutoStore.ts +++ b/packages/imperative/src/config/src/ConfigAutoStore.ts @@ -13,7 +13,7 @@ import * as lodash from "lodash"; import { ICommandArguments, IHandlerParameters } from "../../cmd"; import { ICommandHandlerRequire } from "../../cmd/src/doc/handler/ICommandHandlerRequire"; import { ICommandProfileAuthConfig } from "../../cmd/src/doc/profiles/definition/ICommandProfileAuthConfig"; -import * as ConfigUtils from "./ConfigUtils"; +import { ConfigUtils } from "./ConfigUtils"; import { AbstractAuthHandler } from "../../imperative/src/auth/handlers/AbstractAuthHandler"; import { ImperativeConfig } from "../../utilities"; import { ISession } from "../../rest/src/session/doc/ISession"; diff --git a/packages/imperative/src/config/src/ConfigUtils.ts b/packages/imperative/src/config/src/ConfigUtils.ts index 48c95465e1..6a1540fe7a 100644 --- a/packages/imperative/src/config/src/ConfigUtils.ts +++ b/packages/imperative/src/config/src/ConfigUtils.ts @@ -14,59 +14,70 @@ import { ICommandArguments } from "../../cmd"; import { ImperativeConfig } from "../../utilities"; import { ImperativeError } from "../../error"; -/** - * Coeerces string property value to a boolean or number type. - * @param value String value - * @param type Property type defined in the schema - * @returns Boolean, number, or string - */ -export function coercePropValue(value: any, type?: string) { - if (type === "boolean" || type === "number") { - // For boolean or number, parse the string and throw on failure - return JSON.parse(value); - } else if (type == null) { - // For unknown type, try to parse the string and ignore failure - try { +export class ConfigUtils { + /** + * Coeerces string property value to a boolean or number type. + * @param value String value + * @param type Property type defined in the schema + * @returns Boolean, number, or string + */ + public static coercePropValue(value: any, type?: string) { + if (type === "boolean" || type === "number") { + // For boolean or number, parse the string and throw on failure return JSON.parse(value); - } catch { - return value; + } else if (type == null) { + // For unknown type, try to parse the string and ignore failure + try { + return JSON.parse(value); + } catch { + return value; + } + } else { + // For string or other type, don't do any parsing + return value.toString(); } - } else { - // For string or other type, don't do any parsing - return value.toString(); } -} -/** - * Retrieves the name of the active profile for the given type. If no such - * profile exists, returns the default name which can be used to create a new profile. - * @param profileType The type of CLI profile - * @param cmdArguments CLI arguments which may specify a profile - * @param defaultProfileName Name to fall back to if profile doesn't exist. If - * not specified, the profile type will be used. - * @returns The profile name - */ -export function getActiveProfileName(profileType: string, cmdArguments?: ICommandArguments, defaultProfileName?: string): string { - // Look for profile name first in command line arguments, second in - // default profiles defined in config, and finally fall back to using - // the profile type as the profile name. - return cmdArguments?.[`${profileType}-profile`] || - ImperativeConfig.instance.config?.properties.defaults[profileType] || - defaultProfileName || profileType; -} + /** + * Retrieves the name of the active profile for the given type. If no such + * profile exists, returns the default name which can be used to create a new profile. + * @param profileType The type of CLI profile + * @param cmdArguments CLI arguments which may specify a profile + * @param defaultProfileName Name to fall back to if profile doesn't exist. If + * not specified, the profile type will be used. + * @returns The profile name + */ + public static getActiveProfileName(profileType: string, cmdArguments?: ICommandArguments, defaultProfileName?: string): string { + // Look for profile name first in command line arguments, second in + // default profiles defined in config, and finally fall back to using + // the profile type as the profile name. + return cmdArguments?.[`${profileType}-profile`] || + ImperativeConfig.instance.config?.properties.defaults[profileType] || + defaultProfileName || profileType; + } -/** - * Form an error message for failures to securely save a value. - * @param solution Text that our caller can supply for a solution. - * @returns ImperativeError to be thrown - */ -export function secureSaveError(solution?: string): ImperativeError { - let details = CredentialManagerFactory.manager.secureErrorDetails(); - if (solution != null) { - details = (details != null) ? (details + `\n - ${solution}`) : solution; + /** + * Checks if partial path is equal to or nested inside full path + * @param fullPath JSON path to profile 1 + * @param partialPath JSON path to profile 2 + */ + public static jsonPathMatches(fullPath: string, partialPath: string): boolean { + return fullPath === partialPath || fullPath.startsWith(partialPath + ".profiles."); + } + + /** + * Form an error message for failures to securely save a value. + * @param solution Text that our caller can supply for a solution. + * @returns ImperativeError to be thrown + */ + public static secureSaveError(solution?: string): ImperativeError { + let details = CredentialManagerFactory.manager.secureErrorDetails(); + if (solution != null) { + details = (details != null) ? (details + `\n - ${solution}`) : solution; + } + return new ImperativeError({ + msg: "Unable to securely save credentials.", + additionalDetails: details + }); } - return new ImperativeError({ - msg: "Unable to securely save credentials.", - additionalDetails: details - }); } diff --git a/packages/imperative/src/config/src/ProfileInfo.ts b/packages/imperative/src/config/src/ProfileInfo.ts index e8453cb95d..66ac8ba40b 100644 --- a/packages/imperative/src/config/src/ProfileInfo.ts +++ b/packages/imperative/src/config/src/ProfileInfo.ts @@ -51,6 +51,7 @@ import { ConfigAutoStore } from "./ConfigAutoStore"; import { IGetAllProfilesOptions } from "./doc/IProfInfoProps"; import { IConfig } from "./doc/IConfig"; import { IProfInfoRemoveKnownPropOpts } from "./doc/IProfInfoRemoveKnownPropOpts"; +import { ConfigUtils } from "./ConfigUtils"; /** * This class provides functions to retrieve profile-related information. @@ -205,7 +206,7 @@ export class ProfileInfo { const knownProperty = mergedArgs.knownArgs.find((v => v.argName === options.property)); if (knownProperty != null) { const profPath = this.getTeamConfig().api.profiles.getProfilePathFromName(options.profileName); - if (!knownProperty.argLoc.jsonLoc.startsWith(profPath)) { + if (!ConfigUtils.jsonPathMatches(knownProperty.argLoc.jsonLoc, profPath)) { knownProperty.argLoc.jsonLoc = `${profPath}.properties.${options.property}`; } } @@ -293,7 +294,7 @@ export class ProfileInfo { let oldLayer: IProfLocOsLocLayer; const layer = this.getTeamConfig().layerActive(); const osLoc = options.osLocInfo ?? this.getOsLocInfo( - this.getAllProfiles().find(p => toUpdate.argLoc.jsonLoc.startsWith(p.profLoc.jsonLoc)))?.[0]; + this.getAllProfiles().find(p => ConfigUtils.jsonPathMatches(toUpdate.argLoc.jsonLoc, p.profLoc.jsonLoc)))?.[0]; if (osLoc && (layer.user !== osLoc.user || layer.global !== osLoc.global)) { oldLayer = { user: layer.user, global: layer.global }; this.getTeamConfig().api.layers.activate(osLoc.user, osLoc.global); diff --git a/packages/imperative/src/config/src/api/ConfigSecure.ts b/packages/imperative/src/config/src/api/ConfigSecure.ts index 3251e880a9..be89ddc39b 100644 --- a/packages/imperative/src/config/src/api/ConfigSecure.ts +++ b/packages/imperative/src/config/src/api/ConfigSecure.ts @@ -19,6 +19,7 @@ import { IConfigSecureProperties } from "../doc/IConfigSecure"; import { ConfigConstants } from "../ConfigConstants"; import { IConfigProfile } from "../doc/IConfigProfile"; import { CredentialManagerFactory } from "../../../security"; +import { ConfigUtils } from "../ConfigUtils"; /** * API Class for manipulating config layers. @@ -200,17 +201,18 @@ export class ConfigSecure extends ConfigApi { * @param profileName Profile name to search for * @returns Array of secure property names */ - public securePropsForProfile(profileName: string) { + public securePropsForProfile(profileName: string): string[] { const profilePath = this.mConfig.api.profiles.getProfilePathFromName(profileName); - const secureProps = []; + const secureProps = new Set(); for (const propPath of this.secureFields()) { const pathSegments = propPath.split("."); // profiles.XXX.properties.YYY // eslint-disable-next-line @typescript-eslint/no-magic-numbers - if (profilePath.startsWith(pathSegments.slice(0, -2).join("."))) { - secureProps.push(pathSegments.pop()); + const propProfilePath = pathSegments.slice(0, -2).join("."); + if (ConfigUtils.jsonPathMatches(profilePath, propProfilePath)) { + secureProps.add(pathSegments.pop()); } } - return secureProps; + return [...secureProps]; } /** diff --git a/packages/imperative/src/imperative/src/auth/handlers/BaseAuthHandler.ts b/packages/imperative/src/imperative/src/auth/handlers/BaseAuthHandler.ts index 95938b3f60..e0d1ff13fd 100644 --- a/packages/imperative/src/imperative/src/auth/handlers/BaseAuthHandler.ts +++ b/packages/imperative/src/imperative/src/auth/handlers/BaseAuthHandler.ts @@ -23,7 +23,7 @@ import { Imperative } from "../../Imperative"; import { IImperativeError, ImperativeError } from "../../../../error"; import { ISaveProfileFromCliArgs } from "../../../../profiles"; import { ImperativeConfig } from "../../../../utilities"; -import { getActiveProfileName, secureSaveError } from "../../../../config/src/ConfigUtils"; +import { ConfigUtils } from "../../../../config/src/ConfigUtils"; import { AbstractAuthHandler } from "./AbstractAuthHandler"; import { IAuthHandlerApi } from "../doc/IAuthHandlerApi"; @@ -118,7 +118,8 @@ export abstract class BaseAuthHandler extends AbstractAuthHandler { // process login for old school profiles await this.processLoginOld(params, tokenValue); } else if (ImperativeConfig.instance.config.api.secure.loadFailed) { - throw secureSaveError(`Instead of secure storage, rerun this command with the "--show-token" flag to print the token to console. ` + + throw ConfigUtils.secureSaveError(`Instead of secure storage, ` + + `rerun this command with the "--show-token" flag to print the token to console. ` + `Store the token in an environment variable ${ImperativeConfig.instance.loadedConfig.envVariablePrefix}_OPT_TOKEN_VALUE to use it ` + `in future commands.`); } else { @@ -177,7 +178,7 @@ export abstract class BaseAuthHandler extends AbstractAuthHandler { } private getBaseProfileName(params: IHandlerParameters): string { - return getActiveProfileName(this.mProfileType, params.arguments, `${this.mProfileType}_${params.positionals[2]}`); + return ConfigUtils.getActiveProfileName(this.mProfileType, params.arguments, `${this.mProfileType}_${params.positionals[2]}`); } private async promptForBaseProfile(params: IHandlerParameters, profileName: string): Promise { diff --git a/packages/imperative/src/imperative/src/config/cmd/init/init.handler.ts b/packages/imperative/src/imperative/src/config/cmd/init/init.handler.ts index 98338dd429..ae3d298af3 100644 --- a/packages/imperative/src/imperative/src/config/cmd/init/init.handler.ts +++ b/packages/imperative/src/imperative/src/config/cmd/init/init.handler.ts @@ -15,7 +15,7 @@ import { Config, ConfigConstants, ConfigSchema, IConfig } from "../../../../../c import { IProfileProperty } from "../../../../../profiles"; import { ConfigBuilder } from "../../../../../config/src/ConfigBuilder"; import { IConfigBuilderOpts } from "../../../../../config/src/doc/IConfigBuilderOpts"; -import { coercePropValue, secureSaveError } from "../../../../../config/src/ConfigUtils"; +import { ConfigUtils } from "../../../../../config/src/ConfigUtils"; import { OverridesLoader } from "../../../OverridesLoader"; import * as JSONC from "comment-json"; import * as lodash from "lodash"; @@ -102,7 +102,7 @@ export default class InitHandler implements ICommandHandler { await this.initWithSchema(config, params.arguments.userConfig, params.arguments.overwrite && params.arguments.forSure); if (params.arguments.prompt !== false && config.api.secure.loadFailed && config.api.secure.secureFields().length > 0) { - const warning = secureSaveError(); + const warning = ConfigUtils.secureSaveError(); params.response.console.log(TextUtils.chalk.yellow("Warning:\n") + `${warning.message} Skipped prompting for credentials.\n\n${warning.additionalDetails}\n`); } @@ -193,7 +193,7 @@ export default class InitHandler implements ICommandHandler { // coerce to correct type if (propValue && propValue.trim().length > 0) { - return coercePropValue(propValue); + return ConfigUtils.coercePropValue(propValue); } return propValue || null; diff --git a/packages/imperative/src/imperative/src/config/cmd/secure/secure.handler.ts b/packages/imperative/src/imperative/src/config/cmd/secure/secure.handler.ts index 3c88d79197..9398585097 100644 --- a/packages/imperative/src/imperative/src/config/cmd/secure/secure.handler.ts +++ b/packages/imperative/src/imperative/src/config/cmd/secure/secure.handler.ts @@ -11,7 +11,7 @@ import { ICommandArguments, ICommandHandler, IHandlerParameters } from "../../../../../cmd"; import { Config, ConfigAutoStore, ConfigConstants, ConfigSchema } from "../../../../../config"; -import { coercePropValue, secureSaveError } from "../../../../../config/src/ConfigUtils"; +import { ConfigUtils } from "../../../../../config/src/ConfigUtils"; import { ImperativeError } from "../../../../../error"; import { Logger } from "../../../../../logger"; import { ConnectionPropsForSessCfg, ISession, Session } from "../../../../../rest"; @@ -36,7 +36,7 @@ export default class SecureHandler implements ICommandHandler { // Setup the credential vault API for the config if (config.api.secure.loadFailed) { - throw secureSaveError(); + throw ConfigUtils.secureSaveError(); } if (params.arguments.prune) { @@ -74,7 +74,7 @@ export default class SecureHandler implements ICommandHandler { // Save the value in the config securely if (propValue) { - propValue = coercePropValue(propValue, ConfigSchema.findPropertyType(propName, config.properties)); + propValue = ConfigUtils.coercePropValue(propValue, ConfigSchema.findPropertyType(propName, config.properties)); config.set(propName, propValue, { secure: true }); } } diff --git a/packages/imperative/src/imperative/src/config/cmd/set/set.handler.ts b/packages/imperative/src/imperative/src/config/cmd/set/set.handler.ts index 67b9795bc3..9b5fb96324 100644 --- a/packages/imperative/src/imperative/src/config/cmd/set/set.handler.ts +++ b/packages/imperative/src/imperative/src/config/cmd/set/set.handler.ts @@ -12,7 +12,7 @@ import * as JSONC from "comment-json"; import { ICommandHandler, IHandlerParameters } from "../../../../../cmd"; import { ConfigSchema } from "../../../../../config"; -import { coercePropValue, secureSaveError } from "../../../../../config/src/ConfigUtils"; +import { ConfigUtils } from "../../../../../config/src/ConfigUtils"; import { ImperativeError } from "../../../../../error"; import { ImperativeConfig } from "../../../../../utilities"; @@ -39,7 +39,7 @@ export default class SetHandler implements ICommandHandler { // Setup the credential vault API for the config if (secure && config.api.secure.loadFailed) { - throw secureSaveError(); + throw ConfigUtils.secureSaveError(); } // Get the value to set @@ -57,7 +57,7 @@ export default class SetHandler implements ICommandHandler { throw new ImperativeError({ msg: `could not parse JSON value: ${e.message}` }); } } else { - value = coercePropValue(value, ConfigSchema.findPropertyType(params.arguments.property, config.properties)); + value = ConfigUtils.coercePropValue(value, ConfigSchema.findPropertyType(params.arguments.property, config.properties)); } // Set the value in the config, save the secure values, write the config layer diff --git a/packages/imperative/src/rest/src/session/ConnectionPropsForSessCfg.ts b/packages/imperative/src/rest/src/session/ConnectionPropsForSessCfg.ts index 1d319ece26..5bb3ad2888 100644 --- a/packages/imperative/src/rest/src/session/ConnectionPropsForSessCfg.ts +++ b/packages/imperative/src/rest/src/session/ConnectionPropsForSessCfg.ts @@ -19,7 +19,7 @@ import { IPromptOptions } from "../../../cmd/src/doc/response/api/handler/IPromp import { ISession } from "./doc/ISession"; import { IProfileProperty } from "../../../profiles"; import { ConfigAutoStore } from "../../../config/src/ConfigAutoStore"; -import * as ConfigUtils from "../../../config/src/ConfigUtils"; +import { ConfigUtils } from "../../../config/src/ConfigUtils"; /** * Extend options for IPromptOptions for internal wrapper method From 82cca33c7dcbf016d94892f92b8d99d25b2c5843 Mon Sep 17 00:00:00 2001 From: "Andrew W. Harn" Date: Thu, 11 Jan 2024 14:02:07 -0500 Subject: [PATCH 105/138] Finish tests, changelog, implementation Signed-off-by: Andrew W. Harn --- packages/cli/CHANGELOG.md | 4 ++ packages/imperative/CHANGELOG.md | 4 ++ .../response/CommandResponse.unit.test.ts | 49 ++++++++++++++++++- .../src/cmd/src/response/CommandResponse.ts | 3 +- .../imperative/src/utilities/src/TextUtils.ts | 2 +- 5 files changed, 59 insertions(+), 3 deletions(-) diff --git a/packages/cli/CHANGELOG.md b/packages/cli/CHANGELOG.md index 7a618b90e6..a2eff2f83a 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 + +- Enhancement: Hid the progress bar if `CI` environment variable is set, or if `FORCE_COLOR` environment variable is set to `0`. [#1845](https://github.com/zowe/zowe-cli/issues/1845) + ## `7.21.2` - BugFix: Correct extra character being displayed at the end of lines when issuing `zowe files compare` on Windows. [#1992](https://github.com/zowe/zowe-cli/issues/1992) diff --git a/packages/imperative/CHANGELOG.md b/packages/imperative/CHANGELOG.md index 91a1e5dae5..16fa03254a 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 + +- Enhancement: Hid the progress bar if `CI` environment variable is set, or if `FORCE_COLOR` environment variable is set to `0`. [#1845](https://github.com/zowe/zowe-cli/issues/1845) + ## `5.20.2` - BugFix: Fixed issue when a property is not found in `ProfileInfo.updateProperty({forceUpdate: true})`. [zowe-explorer#2493](https://github.com/zowe/vscode-extension-for-zowe/issues/2493) diff --git a/packages/imperative/src/cmd/__tests__/response/CommandResponse.unit.test.ts b/packages/imperative/src/cmd/__tests__/response/CommandResponse.unit.test.ts index 78af4e3eca..a0486604bf 100644 --- a/packages/imperative/src/cmd/__tests__/response/CommandResponse.unit.test.ts +++ b/packages/imperative/src/cmd/__tests__/response/CommandResponse.unit.test.ts @@ -18,7 +18,7 @@ import { inspect } from "util"; import { TestLogger } from "../../../../__tests__/src/TestLogger"; import { IO } from "../../../io"; import { OUTPUT_FORMAT } from "../.."; -import { CliUtils, IDaemonResponse } from "../../../utilities"; +import { CliUtils, IDaemonResponse, TextUtils } from "../../../utilities"; const beforeForceColor = process.env.FORCE_COLOR; @@ -88,6 +88,9 @@ chalk.red = jest.fn((str: string) => { const ORIGINAL_STDOUT_WRITE = process.stdout.write; const ORIGINAL_STDERR_WRITE = process.stderr.write; +let originalCI: any; +let originalForceColor: any; + describe("Command Response", () => { beforeEach(() => { @@ -107,15 +110,22 @@ describe("Command Response", () => { beforeAll(() => { IO.createDirsSyncFromFilePath(testFile); stream = require("fs").createWriteStream(testFile); + originalCI = process.env.CI; + originalForceColor = process.env.FORCE_COLOR; + delete process.env.CI; + delete process.env.FORCE_COLOR; }); afterAll(() => { if (stream != null) { stream.end(); } require("rimraf").sync(testFile); + process.env.CI = originalCI; + process.env.FORCE_COLOR = originalForceColor; }); afterEach(() => { delete process.env.FORCE_COLOR; + delete process.env.CI; }); it("If we create a progress bar, an interval should be set to update the bar. " + @@ -279,6 +289,43 @@ describe("Command Response", () => { expect(response.buildJsonResponse().stderr.toString()).toEqual(beforeMessage + "\n" + duringMessage + "\n" + afterMessage + "\n"); }); + it("should not show a progress bar if FORCE_COLOR is set to 0", () => { // eslint-disable-line jest/no-done-callback + process.env.FORCE_COLOR = "0"; + const response = new CommandResponse({ silent: false, responseFormat: "default", stream }); + const status: ITaskWithStatus = { + statusMessage: "Making a bar", + percentComplete: 10, + stageName: TaskStage.IN_PROGRESS + }; + response.progress.startBar( + { + task: status, + stream + }); + expect((response as any).mProgressBar).not.toBeDefined(); // access private fields + expect((response.progress as any).mProgressBarInterval).not.toBeDefined(); + }); + + it("should not show a progress bar if CI is set", () => { // eslint-disable-line jest/no-done-callback + process.env.CI = "true"; + jest.spyOn(TextUtils, "chalk").mockImplementation(() => { + return {level: 1, enabled: true}; + }); + const response = new CommandResponse({ silent: false, responseFormat: "default", stream }); + const status: ITaskWithStatus = { + statusMessage: "Making a bar", + percentComplete: 10, + stageName: TaskStage.IN_PROGRESS + }; + response.progress.startBar( + { + task: status, + stream + }); + expect((response as any).mProgressBar).not.toBeDefined(); // access private fields + expect((response.progress as any).mProgressBarInterval).not.toBeDefined(); + }); + it("should allow us to create an instance", () => { let caughtError; try { diff --git a/packages/imperative/src/cmd/src/response/CommandResponse.ts b/packages/imperative/src/cmd/src/response/CommandResponse.ts index 80b87ab728..2c25263ec6 100644 --- a/packages/imperative/src/cmd/src/response/CommandResponse.ts +++ b/packages/imperative/src/cmd/src/response/CommandResponse.ts @@ -724,7 +724,8 @@ export class CommandResponse implements ICommandResponseApi { `Please call progress.endBar() before starting a new one.` }); } - if (!outer.silent && outer.mResponseFormat !== "json" && TextUtils.chalk.level > 0) { + if (!outer.silent && outer.mResponseFormat !== "json" && + !(TextUtils.chalk.level === 0 || !TextUtils.chalk.enabled || process.env.CI != null)) { // Persist the task specifications and determine the stream to use for the progress bar this.mProgressBarStdoutStartIndex = outer.mStdout.length; diff --git a/packages/imperative/src/utilities/src/TextUtils.ts b/packages/imperative/src/utilities/src/TextUtils.ts index 63bcb973e1..91af27f12f 100644 --- a/packages/imperative/src/utilities/src/TextUtils.ts +++ b/packages/imperative/src/utilities/src/TextUtils.ts @@ -300,7 +300,7 @@ export class TextUtils { const mChalk = require("chalk"); // chalk is supposed to handle this, but I think it only does so the first time it is loaded // so we need to check ourselves in case we've changed the environmental variables - if (process.env.FORCE_COLOR in ["1", "2", "3", "true"]) { mChalk.enabled = true; } + if (process.env.FORCE_COLOR != null && ["1", "2", "3", "true"].includes(process.env.FORCE_COLOR)) { mChalk.enabled = true; } if (process.env.MARKDOWN_GEN != null || process.env.FORCE_COLOR == "0") { mChalk.enabled = false; } if (!mChalk.enabled) { mChalk.level = 0; } else if (process.env.FORCE_COLOR != null) { From 869c4df58d4376876421984d1a5572e03c2c8928 Mon Sep 17 00:00:00 2001 From: "Andrew W. Harn" Date: Thu, 11 Jan 2024 14:03:40 -0500 Subject: [PATCH 106/138] Remove ESLint overrides Signed-off-by: Andrew W. Harn --- .../src/cmd/__tests__/response/CommandResponse.unit.test.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/imperative/src/cmd/__tests__/response/CommandResponse.unit.test.ts b/packages/imperative/src/cmd/__tests__/response/CommandResponse.unit.test.ts index a0486604bf..ff9ceb524d 100644 --- a/packages/imperative/src/cmd/__tests__/response/CommandResponse.unit.test.ts +++ b/packages/imperative/src/cmd/__tests__/response/CommandResponse.unit.test.ts @@ -289,7 +289,7 @@ describe("Command Response", () => { expect(response.buildJsonResponse().stderr.toString()).toEqual(beforeMessage + "\n" + duringMessage + "\n" + afterMessage + "\n"); }); - it("should not show a progress bar if FORCE_COLOR is set to 0", () => { // eslint-disable-line jest/no-done-callback + it("should not show a progress bar if FORCE_COLOR is set to 0", () => { process.env.FORCE_COLOR = "0"; const response = new CommandResponse({ silent: false, responseFormat: "default", stream }); const status: ITaskWithStatus = { @@ -306,7 +306,7 @@ describe("Command Response", () => { expect((response.progress as any).mProgressBarInterval).not.toBeDefined(); }); - it("should not show a progress bar if CI is set", () => { // eslint-disable-line jest/no-done-callback + it("should not show a progress bar if CI is set", () => { process.env.CI = "true"; jest.spyOn(TextUtils, "chalk").mockImplementation(() => { return {level: 1, enabled: true}; From 65aca7690bf47478457c09c43ee6ef11f4f32bcf Mon Sep 17 00:00:00 2001 From: "Andrew W. Harn" Date: Thu, 11 Jan 2024 15:51:14 -0500 Subject: [PATCH 107/138] Restore all mocks Signed-off-by: Andrew W. Harn --- .../src/cmd/__tests__/response/CommandResponse.unit.test.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/imperative/src/cmd/__tests__/response/CommandResponse.unit.test.ts b/packages/imperative/src/cmd/__tests__/response/CommandResponse.unit.test.ts index ff9ceb524d..001d0861ed 100644 --- a/packages/imperative/src/cmd/__tests__/response/CommandResponse.unit.test.ts +++ b/packages/imperative/src/cmd/__tests__/response/CommandResponse.unit.test.ts @@ -126,6 +126,7 @@ describe("Command Response", () => { afterEach(() => { delete process.env.FORCE_COLOR; delete process.env.CI; + jest.restoreAllMocks(); }); it("If we create a progress bar, an interval should be set to update the bar. " + From 04e7588df5f360462a3159623cb7bad3611aaf83 Mon Sep 17 00:00:00 2001 From: Gene Johnston Date: Fri, 12 Jan 2024 12:28:38 -0500 Subject: [PATCH 108/138] Add entry about profile removal to CLI CHANGELOG Signed-off-by: Gene Johnston --- packages/cli/CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/cli/CHANGELOG.md b/packages/cli/CHANGELOG.md index 4667174042..24e6cd1a55 100644 --- a/packages/cli/CHANGELOG.md +++ b/packages/cli/CHANGELOG.md @@ -4,6 +4,7 @@ All notable changes to the Zowe CLI package will be documented in this file. ## Recent Changes +- LTS Breaking: Remove deprecated V1 'profiles' command group. - BugFix: Properly construct workflow error messages to display properly with V3 error formatting. ## `8.0.0-next.202401081937` From 0c46f6410f842ec5cdf27c84816b6c3f813dbbca Mon Sep 17 00:00:00 2001 From: Gene Johnston Date: Fri, 12 Jan 2024 12:35:28 -0500 Subject: [PATCH 109/138] Add entry about profile removal to core CHANGELOG Signed-off-by: Gene Johnston --- packages/core/CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/core/CHANGELOG.md b/packages/core/CHANGELOG.md index e88eb9dc23..775dc3a876 100644 --- a/packages/core/CHANGELOG.md +++ b/packages/core/CHANGELOG.md @@ -4,6 +4,7 @@ All notable changes to the Zowe core SDK package will be documented in this file ## Recent Changes +- LTS Breaking: Remove deprecated V1 'profiles' command group. - BugFix: Include text from a REST response's causeErrors.message property in error messages. ## `8.0.0-next.202311282012` From 7f05a981b08399f4f52d78b399c264cd18a23145 Mon Sep 17 00:00:00 2001 From: Gene Johnston Date: Fri, 12 Jan 2024 14:33:19 -0500 Subject: [PATCH 110/138] Changes to use only 1 copy of exitOnFailure.sh Signed-off-by: Gene Johnston --- .../__scripts__/exitOnFailure.sh | 0 .../__system__/__scripts__/create_team_cfg.sh | 2 +- .../__scripts__/copy_profiles.sh | 4 ++-- .../__scripts__/exitOnFailure.sh | 12 ---------- .../__scripts__/auth_li_config_password.sh | 4 ++-- .../cli/auth/__scripts__/auth_lo.sh | 4 ++-- .../__scripts__/auth_login_cmd_line_cert.sh | 4 ++-- .../auth_login_cmd_line_password.sh | 4 ++-- .../__scripts__/auth_login_config_cert.sh | 4 ++-- .../auth_login_config_cert_show_token.sh | 4 ++-- .../auth_login_config_cert_show_token_rfj.sh | 4 ++-- .../__scripts__/auth_login_config_password.sh | 4 ++-- .../auth_login_config_password_show_token.sh | 4 ++-- ...th_login_config_password_show_token_rfj.sh | 4 ++-- .../cli/auth/__scripts__/auth_logout.sh | 4 ++-- .../__scripts__/auth_logout_specify_token.sh | 4 ++-- .../cli/auth/__scripts__/exitOnFailure.sh | 12 ---------- .../cli/auth/__scripts__/show_profiles.sh | 4 ++-- .../banana_profile_and_specify_cli.sh | 16 +++++++------- .../banana_profile_and_specify_env.sh | 16 +++++++------- .../banana_profile_and_specify_env_and_cli.sh | 22 +++++++++---------- .../profiles/base_and_kiwi_profile.sh | 10 ++++----- .../__scripts__/profiles/exitOnFailure.sh | 12 ---------- .../profiles/map_banana_to_options.sh | 10 ++++----- .../profiles/map_banana_to_positionals.sh | 10 ++++----- .../__scripts__/profiles/name_type_specify.sh | 14 ++++++------ .../profiles/name_type_undefined.sh | 10 ++++----- .../profiles/specify_env_for_array.sh | 12 +++++----- .../profiles/specify_env_for_boolean.sh | 12 +++++----- .../profiles/specify_env_for_number.sh | 12 +++++----- .../profiles/specify_env_for_positional.sh | 10 ++++----- .../profiles/specify_env_sweetness.sh | 12 +++++----- .../__scripts__/profile/create_and_read.sh | 4 ++-- .../read/__scripts__/profile/exitOnFailure.sh | 12 ---------- .../__scripts__/copy_auto_gen_profiles.sh | 4 ++-- .../__scripts__/exitOnFailure.sh | 12 ---------- .../__scripts__/set_default_profile.sh | 6 ++--- .../__scripts__/copy_profiles.sh | 4 ++-- .../copy_profiles_cli_prof_mgr_creds.sh | 4 ++-- .../__scripts__/exitOnFailure.sh | 12 ---------- 40 files changed, 123 insertions(+), 195 deletions(-) rename {packages/cli/__tests__/auth/__system__ => __tests__}/__scripts__/exitOnFailure.sh (100%) delete mode 100644 packages/core/__tests__/utils/__integration__/__scripts__/exitOnFailure.sh delete mode 100644 packages/imperative/__tests__/__integration__/cmd/__tests__/integration/cli/auth/__scripts__/exitOnFailure.sh delete mode 100644 packages/imperative/__tests__/__integration__/cmd/__tests__/integration/cli/profiles/__scripts__/profiles/exitOnFailure.sh delete mode 100644 packages/imperative/__tests__/__integration__/cmd/__tests__/integration/cli/read/__scripts__/profile/exitOnFailure.sh delete mode 100644 packages/imperative/__tests__/src/example_clis/with_profiles/__integration__/__scripts__/exitOnFailure.sh delete mode 100644 packages/imperative/__tests__/src/packages/profiles/__integration__/__scripts__/exitOnFailure.sh diff --git a/packages/cli/__tests__/auth/__system__/__scripts__/exitOnFailure.sh b/__tests__/__scripts__/exitOnFailure.sh similarity index 100% rename from packages/cli/__tests__/auth/__system__/__scripts__/exitOnFailure.sh rename to __tests__/__scripts__/exitOnFailure.sh diff --git a/packages/cli/__tests__/auth/__system__/__scripts__/create_team_cfg.sh b/packages/cli/__tests__/auth/__system__/__scripts__/create_team_cfg.sh index ee42a8e441..d4dc8e2c4c 100644 --- a/packages/cli/__tests__/auth/__system__/__scripts__/create_team_cfg.sh +++ b/packages/cli/__tests__/auth/__system__/__scripts__/create_team_cfg.sh @@ -6,7 +6,7 @@ REJECT=${3:?"Third parm (REJECT) is required."} scriptsDir=${4:?"Fourth parm (scriptsDir) is required."} # include exitOnFailure function -. "$scriptsDir/exitOnFailure.sh" +. "$scriptsDir/../../../../../../__tests__/__scripts__/exitOnFailure.sh" # copy our config file template cp "$scriptsDir/../__resources__/zowe.config_template.json" . diff --git a/packages/core/__tests__/utils/__integration__/__scripts__/copy_profiles.sh b/packages/core/__tests__/utils/__integration__/__scripts__/copy_profiles.sh index aff8bae320..6433715ec5 100755 --- a/packages/core/__tests__/utils/__integration__/__scripts__/copy_profiles.sh +++ b/packages/core/__tests__/utils/__integration__/__scripts__/copy_profiles.sh @@ -1,8 +1,8 @@ #!/bin/sh -# include exitOnFailure function +# include zowe-cli\__tests__\__scripts__\exitOnFailure function myScriptDir=`dirname $0` -. $myScriptDir/exitOnFailure.sh +. $myScriptDir/../../../../../../__tests__/__scripts__/exitOnFailure.sh # copy pre-existing profiles to test directory cp -r $myScriptDir/../__resources__/profiles profiles diff --git a/packages/core/__tests__/utils/__integration__/__scripts__/exitOnFailure.sh b/packages/core/__tests__/utils/__integration__/__scripts__/exitOnFailure.sh deleted file mode 100644 index 5e7beb8643..0000000000 --- a/packages/core/__tests__/utils/__integration__/__scripts__/exitOnFailure.sh +++ /dev/null @@ -1,12 +0,0 @@ -#!/bin/sh - -# function to exit if we encounter a bad return code -exitOnFailure () { - failureMsg=${1:?"First parm (failureMsg) is required."} - actualExitCode=${2:?"Second parm (actualExitCode) is required."} - goodExitCode=${3:-0} - if [ $actualExitCode != $goodExitCode ]; then - echo `basename $0`": $failureMsg" 1>&2 - exit $actualExitCode - fi -} diff --git a/packages/imperative/__tests__/__integration__/cmd/__tests__/integration/cli/auth/__scripts__/auth_li_config_password.sh b/packages/imperative/__tests__/__integration__/cmd/__tests__/integration/cli/auth/__scripts__/auth_li_config_password.sh index 02f96041b4..09bc2741e1 100644 --- a/packages/imperative/__tests__/__integration__/cmd/__tests__/integration/cli/auth/__scripts__/auth_li_config_password.sh +++ b/packages/imperative/__tests__/__integration__/cmd/__tests__/integration/cli/auth/__scripts__/auth_li_config_password.sh @@ -1,8 +1,8 @@ #!/bin/sh -# include exitOnFailure function +# include zowe-cli\__tests__\__scripts__\exitOnFailure function myScriptDir=`dirname $0` -. $myScriptDir/exitOnFailure.sh +. $myScriptDir/../../../../../../../../../../__tests__/__scripts__/exitOnFailure.sh # copy our config file cp $myScriptDir/../__resources__/base_password.config.json imperative-test-cli.config.json diff --git a/packages/imperative/__tests__/__integration__/cmd/__tests__/integration/cli/auth/__scripts__/auth_lo.sh b/packages/imperative/__tests__/__integration__/cmd/__tests__/integration/cli/auth/__scripts__/auth_lo.sh index a132ff0a96..e81be2cf7d 100644 --- a/packages/imperative/__tests__/__integration__/cmd/__tests__/integration/cli/auth/__scripts__/auth_lo.sh +++ b/packages/imperative/__tests__/__integration__/cmd/__tests__/integration/cli/auth/__scripts__/auth_lo.sh @@ -1,8 +1,8 @@ #!/bin/sh -# include exitOnFailure function +# include zowe-cli\__tests__\__scripts__\exitOnFailure function myScriptDir=`dirname $0` -. $myScriptDir/exitOnFailure.sh +. $myScriptDir/../../../../../../../../../../__tests__/__scripts__/exitOnFailure.sh imperative-test-cli auth lo fruit exitOnFailure "Logging out auth of type fruit failed!" $? diff --git a/packages/imperative/__tests__/__integration__/cmd/__tests__/integration/cli/auth/__scripts__/auth_login_cmd_line_cert.sh b/packages/imperative/__tests__/__integration__/cmd/__tests__/integration/cli/auth/__scripts__/auth_login_cmd_line_cert.sh index dee303c754..3e0ab84fb9 100644 --- a/packages/imperative/__tests__/__integration__/cmd/__tests__/integration/cli/auth/__scripts__/auth_login_cmd_line_cert.sh +++ b/packages/imperative/__tests__/__integration__/cmd/__tests__/integration/cli/auth/__scripts__/auth_login_cmd_line_cert.sh @@ -4,9 +4,9 @@ echoVal=${1:?"First parm (echoVal) is required."} baseCertFile=${2:?"Second parm (baseCertFile) is required."} baseCertKey=${3:?"Third parm (baseCertKey) is required."} -# include exitOnFailure function +# include zowe-cli\__tests__\__scripts__\exitOnFailure function myScriptDir=`dirname $0` -. $myScriptDir/exitOnFailure.sh +. $myScriptDir/../../../../../../../../../../__tests__/__scripts__/exitOnFailure.sh # copy our config file and certificate files resourceDir=$myScriptDir/../__resources__ diff --git a/packages/imperative/__tests__/__integration__/cmd/__tests__/integration/cli/auth/__scripts__/auth_login_cmd_line_password.sh b/packages/imperative/__tests__/__integration__/cmd/__tests__/integration/cli/auth/__scripts__/auth_login_cmd_line_password.sh index 0e8b7e0660..4e7d107694 100644 --- a/packages/imperative/__tests__/__integration__/cmd/__tests__/integration/cli/auth/__scripts__/auth_login_cmd_line_password.sh +++ b/packages/imperative/__tests__/__integration__/cmd/__tests__/integration/cli/auth/__scripts__/auth_login_cmd_line_password.sh @@ -4,9 +4,9 @@ echoVal=${1:?"First parm (echoVal) is required."} baseUser=${2:?"Second parm (baseUser) is required."} basePass=${3:?"Third parm (basePass) is required."} -# include exitOnFailure function +# include zowe-cli\__tests__\__scripts__\exitOnFailure function myScriptDir=`dirname $0` -. $myScriptDir/exitOnFailure.sh +. $myScriptDir/../../../../../../../../../../__tests__/__scripts__/exitOnFailure.sh # copy our config file cp $myScriptDir/../__resources__/base_password.config.json . diff --git a/packages/imperative/__tests__/__integration__/cmd/__tests__/integration/cli/auth/__scripts__/auth_login_config_cert.sh b/packages/imperative/__tests__/__integration__/cmd/__tests__/integration/cli/auth/__scripts__/auth_login_config_cert.sh index 60d5488711..f14b6c3ac8 100644 --- a/packages/imperative/__tests__/__integration__/cmd/__tests__/integration/cli/auth/__scripts__/auth_login_config_cert.sh +++ b/packages/imperative/__tests__/__integration__/cmd/__tests__/integration/cli/auth/__scripts__/auth_login_config_cert.sh @@ -1,8 +1,8 @@ #!/bin/sh -# include exitOnFailure function +# include zowe-cli\__tests__\__scripts__\exitOnFailure function myScriptDir=`dirname $0` -. $myScriptDir/exitOnFailure.sh +. $myScriptDir/../../../../../../../../../../__tests__/__scripts__/exitOnFailure.sh # copy our config file and certificate files resourceDir=$myScriptDir/../__resources__ diff --git a/packages/imperative/__tests__/__integration__/cmd/__tests__/integration/cli/auth/__scripts__/auth_login_config_cert_show_token.sh b/packages/imperative/__tests__/__integration__/cmd/__tests__/integration/cli/auth/__scripts__/auth_login_config_cert_show_token.sh index ade6f29099..0bf0457c25 100644 --- a/packages/imperative/__tests__/__integration__/cmd/__tests__/integration/cli/auth/__scripts__/auth_login_config_cert_show_token.sh +++ b/packages/imperative/__tests__/__integration__/cmd/__tests__/integration/cli/auth/__scripts__/auth_login_config_cert_show_token.sh @@ -1,8 +1,8 @@ #!/bin/sh -# include exitOnFailure function +# include zowe-cli\__tests__\__scripts__\exitOnFailure function myScriptDir=`dirname $0` -. $myScriptDir/exitOnFailure.sh +. $myScriptDir/../../../../../../../../../../__tests__/__scripts__/exitOnFailure.sh # copy our config file and certificate files resourceDir=$myScriptDir/../__resources__ diff --git a/packages/imperative/__tests__/__integration__/cmd/__tests__/integration/cli/auth/__scripts__/auth_login_config_cert_show_token_rfj.sh b/packages/imperative/__tests__/__integration__/cmd/__tests__/integration/cli/auth/__scripts__/auth_login_config_cert_show_token_rfj.sh index 6d68c50190..1dd06409ed 100644 --- a/packages/imperative/__tests__/__integration__/cmd/__tests__/integration/cli/auth/__scripts__/auth_login_config_cert_show_token_rfj.sh +++ b/packages/imperative/__tests__/__integration__/cmd/__tests__/integration/cli/auth/__scripts__/auth_login_config_cert_show_token_rfj.sh @@ -1,8 +1,8 @@ #!/bin/sh -# include exitOnFailure function +# include zowe-cli\__tests__\__scripts__\exitOnFailure function myScriptDir=`dirname $0` -. $myScriptDir/exitOnFailure.sh +. $myScriptDir/../../../../../../../../../../__tests__/__scripts__/exitOnFailure.sh # copy our config file cp $myScriptDir/../__resources__/base_cert.config.json imperative-test-cli.config.json diff --git a/packages/imperative/__tests__/__integration__/cmd/__tests__/integration/cli/auth/__scripts__/auth_login_config_password.sh b/packages/imperative/__tests__/__integration__/cmd/__tests__/integration/cli/auth/__scripts__/auth_login_config_password.sh index 0723d6d0a8..0671508979 100644 --- a/packages/imperative/__tests__/__integration__/cmd/__tests__/integration/cli/auth/__scripts__/auth_login_config_password.sh +++ b/packages/imperative/__tests__/__integration__/cmd/__tests__/integration/cli/auth/__scripts__/auth_login_config_password.sh @@ -1,8 +1,8 @@ #!/bin/sh -# include exitOnFailure function +# include zowe-cli\__tests__\__scripts__\exitOnFailure function myScriptDir=`dirname $0` -. $myScriptDir/exitOnFailure.sh +. $myScriptDir/../../../../../../../../../../__tests__/__scripts__/exitOnFailure.sh # copy our config file cp $myScriptDir/../__resources__/base_password.config.json imperative-test-cli.config.json diff --git a/packages/imperative/__tests__/__integration__/cmd/__tests__/integration/cli/auth/__scripts__/auth_login_config_password_show_token.sh b/packages/imperative/__tests__/__integration__/cmd/__tests__/integration/cli/auth/__scripts__/auth_login_config_password_show_token.sh index ca81b1bb55..2aec38d48e 100644 --- a/packages/imperative/__tests__/__integration__/cmd/__tests__/integration/cli/auth/__scripts__/auth_login_config_password_show_token.sh +++ b/packages/imperative/__tests__/__integration__/cmd/__tests__/integration/cli/auth/__scripts__/auth_login_config_password_show_token.sh @@ -1,8 +1,8 @@ #!/bin/sh -# include exitOnFailure function +# include zowe-cli\__tests__\__scripts__\exitOnFailure function myScriptDir=`dirname $0` -. $myScriptDir/exitOnFailure.sh +. $myScriptDir/../../../../../../../../../../__tests__/__scripts__/exitOnFailure.sh # copy our config file cp $myScriptDir/../__resources__/base_password.config.json imperative-test-cli.config.json diff --git a/packages/imperative/__tests__/__integration__/cmd/__tests__/integration/cli/auth/__scripts__/auth_login_config_password_show_token_rfj.sh b/packages/imperative/__tests__/__integration__/cmd/__tests__/integration/cli/auth/__scripts__/auth_login_config_password_show_token_rfj.sh index 664e9fbec0..d7ae8a3693 100644 --- a/packages/imperative/__tests__/__integration__/cmd/__tests__/integration/cli/auth/__scripts__/auth_login_config_password_show_token_rfj.sh +++ b/packages/imperative/__tests__/__integration__/cmd/__tests__/integration/cli/auth/__scripts__/auth_login_config_password_show_token_rfj.sh @@ -1,8 +1,8 @@ #!/bin/sh -# include exitOnFailure function +# include zowe-cli\__tests__\__scripts__\exitOnFailure function myScriptDir=`dirname $0` -. $myScriptDir/exitOnFailure.sh +. $myScriptDir/../../../../../../../../../../__tests__/__scripts__/exitOnFailure.sh # copy our config file cp $myScriptDir/../__resources__/base_password.config.json imperative-test-cli.config.json diff --git a/packages/imperative/__tests__/__integration__/cmd/__tests__/integration/cli/auth/__scripts__/auth_logout.sh b/packages/imperative/__tests__/__integration__/cmd/__tests__/integration/cli/auth/__scripts__/auth_logout.sh index 426dcc1853..5b86c86718 100644 --- a/packages/imperative/__tests__/__integration__/cmd/__tests__/integration/cli/auth/__scripts__/auth_logout.sh +++ b/packages/imperative/__tests__/__integration__/cmd/__tests__/integration/cli/auth/__scripts__/auth_logout.sh @@ -1,8 +1,8 @@ #!/bin/sh -# include exitOnFailure function +# include zowe-cli\__tests__\__scripts__\exitOnFailure function myScriptDir=`dirname $0` -. $myScriptDir/exitOnFailure.sh +. $myScriptDir/../../../../../../../../../../__tests__/__scripts__/exitOnFailure.sh imperative-test-cli auth logout fruit exitOnFailure "Logging out auth of type fruit failed!" $? diff --git a/packages/imperative/__tests__/__integration__/cmd/__tests__/integration/cli/auth/__scripts__/auth_logout_specify_token.sh b/packages/imperative/__tests__/__integration__/cmd/__tests__/integration/cli/auth/__scripts__/auth_logout_specify_token.sh index d8803feaef..b5d49de297 100644 --- a/packages/imperative/__tests__/__integration__/cmd/__tests__/integration/cli/auth/__scripts__/auth_logout_specify_token.sh +++ b/packages/imperative/__tests__/__integration__/cmd/__tests__/integration/cli/auth/__scripts__/auth_logout_specify_token.sh @@ -2,9 +2,9 @@ tokenValue=$1 -# include exitOnFailure function +# include zowe-cli\__tests__\__scripts__\exitOnFailure function myScriptDir=`dirname $0` -. $myScriptDir/exitOnFailure.sh +. $myScriptDir/../../../../../../../../../../__tests__/__scripts__/exitOnFailure.sh imperative-test-cli auth logout fruit --token-value "$tokenValue" exitOnFailure "Logging out auth of type fruit failed!" $? diff --git a/packages/imperative/__tests__/__integration__/cmd/__tests__/integration/cli/auth/__scripts__/exitOnFailure.sh b/packages/imperative/__tests__/__integration__/cmd/__tests__/integration/cli/auth/__scripts__/exitOnFailure.sh deleted file mode 100644 index 5e7beb8643..0000000000 --- a/packages/imperative/__tests__/__integration__/cmd/__tests__/integration/cli/auth/__scripts__/exitOnFailure.sh +++ /dev/null @@ -1,12 +0,0 @@ -#!/bin/sh - -# function to exit if we encounter a bad return code -exitOnFailure () { - failureMsg=${1:?"First parm (failureMsg) is required."} - actualExitCode=${2:?"Second parm (actualExitCode) is required."} - goodExitCode=${3:-0} - if [ $actualExitCode != $goodExitCode ]; then - echo `basename $0`": $failureMsg" 1>&2 - exit $actualExitCode - fi -} diff --git a/packages/imperative/__tests__/__integration__/cmd/__tests__/integration/cli/auth/__scripts__/show_profiles.sh b/packages/imperative/__tests__/__integration__/cmd/__tests__/integration/cli/auth/__scripts__/show_profiles.sh index 9562f1c5bf..88190d9ac0 100644 --- a/packages/imperative/__tests__/__integration__/cmd/__tests__/integration/cli/auth/__scripts__/show_profiles.sh +++ b/packages/imperative/__tests__/__integration__/cmd/__tests__/integration/cli/auth/__scripts__/show_profiles.sh @@ -1,9 +1,9 @@ #!/bin/sh # This script must be called AFTER a script copies a config file into our test directory. -# include exitOnFailure function +# include zowe-cli\__tests__\__scripts__\exitOnFailure function myScriptDir=`dirname $0` -. $myScriptDir/exitOnFailure.sh +. $myScriptDir/../../../../../../../../../../__tests__/__scripts__/exitOnFailure.sh # show contents of our config file imperative-test-cli config list profiles diff --git a/packages/imperative/__tests__/__integration__/cmd/__tests__/integration/cli/profiles/__scripts__/profiles/banana_profile_and_specify_cli.sh b/packages/imperative/__tests__/__integration__/cmd/__tests__/integration/cli/profiles/__scripts__/profiles/banana_profile_and_specify_cli.sh index 5ed69efb61..dc9f5f7a46 100644 --- a/packages/imperative/__tests__/__integration__/cmd/__tests__/integration/cli/profiles/__scripts__/profiles/banana_profile_and_specify_cli.sh +++ b/packages/imperative/__tests__/__integration__/cmd/__tests__/integration/cli/profiles/__scripts__/profiles/banana_profile_and_specify_cli.sh @@ -1,16 +1,16 @@ #!/bin/sh -profileColor=$1 -profileDescription=$2 -profileMoldType=$3 +profileColor=${1:?"First parm (profileColor) is required."} +profileDescription=${2:?"Second parm (profileDescription) is required."} +profileMoldType=${3:?"Third parm (profileMoldType) is required."} -cliColor=$4 -cliDescription=$5 -cliMoldType=$6 +cliColor=${4:?"Fourth parm (cliColor) is required."} +cliDescription=${5:?"Fifth parm (cliDescription) is required."} +cliMoldType=${6:?"Sixth parm (cliMoldType) is required."} -# include exitOnFailure function +# include zowe-cli\__tests__\__scripts__\exitOnFailure function myScriptDir=`dirname $0` -. $myScriptDir/exitOnFailure.sh +. $myScriptDir/../../../../../../../../../../../__tests__/__scripts__/exitOnFailure.sh # set desired properties in our config file cp $myScriptDir/banana.config.json . diff --git a/packages/imperative/__tests__/__integration__/cmd/__tests__/integration/cli/profiles/__scripts__/profiles/banana_profile_and_specify_env.sh b/packages/imperative/__tests__/__integration__/cmd/__tests__/integration/cli/profiles/__scripts__/profiles/banana_profile_and_specify_env.sh index 852485a057..74a8433318 100644 --- a/packages/imperative/__tests__/__integration__/cmd/__tests__/integration/cli/profiles/__scripts__/profiles/banana_profile_and_specify_env.sh +++ b/packages/imperative/__tests__/__integration__/cmd/__tests__/integration/cli/profiles/__scripts__/profiles/banana_profile_and_specify_env.sh @@ -1,16 +1,16 @@ #!/bin/sh -profileColor=$1 -profileDescription=$2 -profileMoldType=$3 +profileColor=${1:?"First parm (profileColor) is required."} +profileDescription=${2:?"Second parm (profileDescription) is required."} +profileMoldType=${3:?"Third parm (profileMoldType) is required."} -envColor=$4 -envDescription=$5 -envMoldType=$6 +envColor=${4:?"Fourth parm (envColor) is required."} +envDescription=${5:?"Fifth parm (envDescription) is required."} +envMoldType=${6:?"Sixth parm (envMoldType) is required."} -# include exitOnFailure function +# include zowe-cli\__tests__\__scripts__\exitOnFailure function myScriptDir=`dirname $0` -. $myScriptDir/exitOnFailure.sh +. $myScriptDir/../../../../../../../../../../../__tests__/__scripts__/exitOnFailure.sh # set desired properties in our config file cp $myScriptDir/banana.config.json . diff --git a/packages/imperative/__tests__/__integration__/cmd/__tests__/integration/cli/profiles/__scripts__/profiles/banana_profile_and_specify_env_and_cli.sh b/packages/imperative/__tests__/__integration__/cmd/__tests__/integration/cli/profiles/__scripts__/profiles/banana_profile_and_specify_env_and_cli.sh index a813ebeeea..058942b964 100644 --- a/packages/imperative/__tests__/__integration__/cmd/__tests__/integration/cli/profiles/__scripts__/profiles/banana_profile_and_specify_env_and_cli.sh +++ b/packages/imperative/__tests__/__integration__/cmd/__tests__/integration/cli/profiles/__scripts__/profiles/banana_profile_and_specify_env_and_cli.sh @@ -1,20 +1,20 @@ #!/bin/sh -profileColor=$1 -profileDescription=$2 -profileMoldType=$3 +profileColor=${1:?"First parm (profileColor) is required."} +profileDescription=${2:?"Second parm (profileDescription) is required."} +profileMoldType=${3:?"Third parm (profileMoldType) is required."} -envColor=$4 -envDescription=$5 -envMoldType=$6 +envColor=${4:?"Fourth parm (envColor) is required."} +envDescription=${5:?"Fifth parm (envDescription) is required."} +envMoldType=${6:?"Sixth parm (envMoldType) is required."} -cliColor=$7 -cliDescription=$8 -cliMoldType=$9 +cliColor=${7:?"Seventh parm (cliColor) is required."} +cliDescription=${8:?"Eighth parm (cliDescription) is required."} +cliMoldType=${9:?"Nineth parm (cliMoldType) is required."} -# include exitOnFailure function +# include zowe-cli\__tests__\__scripts__\exitOnFailure function myScriptDir=`dirname $0` -. $myScriptDir/exitOnFailure.sh +. $myScriptDir/../../../../../../../../../../../__tests__/__scripts__/exitOnFailure.sh # set desired properties in our config file cp $myScriptDir/banana.config.json . diff --git a/packages/imperative/__tests__/__integration__/cmd/__tests__/integration/cli/profiles/__scripts__/profiles/base_and_kiwi_profile.sh b/packages/imperative/__tests__/__integration__/cmd/__tests__/integration/cli/profiles/__scripts__/profiles/base_and_kiwi_profile.sh index f10dc9ce24..ce499eef37 100644 --- a/packages/imperative/__tests__/__integration__/cmd/__tests__/integration/cli/profiles/__scripts__/profiles/base_and_kiwi_profile.sh +++ b/packages/imperative/__tests__/__integration__/cmd/__tests__/integration/cli/profiles/__scripts__/profiles/base_and_kiwi_profile.sh @@ -1,12 +1,12 @@ #!/bin/sh -baseAmount=$1 -basePrice=$2 -kiwiAmount=$3 +baseAmount=${1:?"First parm (baseAmount) is required."} +basePrice=${2:?"Second parm (basePrice) is required."} +kiwiAmount=${3:?"Third parm (kiwiAmount) is required."} -# include exitOnFailure function +# include zowe-cli\__tests__\__scripts__\exitOnFailure function myScriptDir=`dirname $0` -. $myScriptDir/exitOnFailure.sh +. $myScriptDir/../../../../../../../../../../../__tests__/__scripts__/exitOnFailure.sh # set desired properties in our config file cp $myScriptDir/base_and_kiwi.config.json . diff --git a/packages/imperative/__tests__/__integration__/cmd/__tests__/integration/cli/profiles/__scripts__/profiles/exitOnFailure.sh b/packages/imperative/__tests__/__integration__/cmd/__tests__/integration/cli/profiles/__scripts__/profiles/exitOnFailure.sh deleted file mode 100644 index 5e7beb8643..0000000000 --- a/packages/imperative/__tests__/__integration__/cmd/__tests__/integration/cli/profiles/__scripts__/profiles/exitOnFailure.sh +++ /dev/null @@ -1,12 +0,0 @@ -#!/bin/sh - -# function to exit if we encounter a bad return code -exitOnFailure () { - failureMsg=${1:?"First parm (failureMsg) is required."} - actualExitCode=${2:?"Second parm (actualExitCode) is required."} - goodExitCode=${3:-0} - if [ $actualExitCode != $goodExitCode ]; then - echo `basename $0`": $failureMsg" 1>&2 - exit $actualExitCode - fi -} diff --git a/packages/imperative/__tests__/__integration__/cmd/__tests__/integration/cli/profiles/__scripts__/profiles/map_banana_to_options.sh b/packages/imperative/__tests__/__integration__/cmd/__tests__/integration/cli/profiles/__scripts__/profiles/map_banana_to_options.sh index 9cd881c1ea..afbb066e5e 100644 --- a/packages/imperative/__tests__/__integration__/cmd/__tests__/integration/cli/profiles/__scripts__/profiles/map_banana_to_options.sh +++ b/packages/imperative/__tests__/__integration__/cmd/__tests__/integration/cli/profiles/__scripts__/profiles/map_banana_to_options.sh @@ -1,12 +1,12 @@ #!/bin/sh -profileColor=$1 -profileDescription=$2 -profileMoldType=$3 +profileColor=${1:?"First parm (profileColor) is required."} +profileDescription=${2:?"Second parm (profileDescription) is required."} +profileMoldType=${3:?"Third parm (profileMoldType) is required."} -# include exitOnFailure function +# include zowe-cli\__tests__\__scripts__\exitOnFailure function myScriptDir=`dirname $0` -. $myScriptDir/exitOnFailure.sh +. $myScriptDir/../../../../../../../../../../../__tests__/__scripts__/exitOnFailure.sh # set desired properties in our config file cp $myScriptDir/banana.config.json . diff --git a/packages/imperative/__tests__/__integration__/cmd/__tests__/integration/cli/profiles/__scripts__/profiles/map_banana_to_positionals.sh b/packages/imperative/__tests__/__integration__/cmd/__tests__/integration/cli/profiles/__scripts__/profiles/map_banana_to_positionals.sh index 851f5ba3c1..60f783253c 100644 --- a/packages/imperative/__tests__/__integration__/cmd/__tests__/integration/cli/profiles/__scripts__/profiles/map_banana_to_positionals.sh +++ b/packages/imperative/__tests__/__integration__/cmd/__tests__/integration/cli/profiles/__scripts__/profiles/map_banana_to_positionals.sh @@ -1,12 +1,12 @@ #!/bin/sh -profileColor=$1 -profileDescription=$2 -profileMoldType=$3 +profileColor=${1:?"First parm (profileColor) is required."} +profileDescription=${2:?"Second parm (profileDescription) is required."} +profileMoldType=${3:?"Third parm (profileMoldType) is required."} -# include exitOnFailure function +# include zowe-cli\__tests__\__scripts__\exitOnFailure function myScriptDir=`dirname $0` -. $myScriptDir/exitOnFailure.sh +. $myScriptDir/../../../../../../../../../../../__tests__/__scripts__/exitOnFailure.sh # set desired properties in our config file cp $myScriptDir/banana.config.json . diff --git a/packages/imperative/__tests__/__integration__/cmd/__tests__/integration/cli/profiles/__scripts__/profiles/name_type_specify.sh b/packages/imperative/__tests__/__integration__/cmd/__tests__/integration/cli/profiles/__scripts__/profiles/name_type_specify.sh index 920cc3fa1f..763e21da98 100644 --- a/packages/imperative/__tests__/__integration__/cmd/__tests__/integration/cli/profiles/__scripts__/profiles/name_type_specify.sh +++ b/packages/imperative/__tests__/__integration__/cmd/__tests__/integration/cli/profiles/__scripts__/profiles/name_type_specify.sh @@ -1,14 +1,14 @@ #!/bin/sh -profileColor=$1 -profileDescription=$2 -profileMoldType=$3 -cliName=$4 -cliType=$5 +profileColor=${1:?"First parm (profileColor) is required."} +profileDescription=${2:?"Second parm (profileDescription) is required."} +profileMoldType=${3:?"Third parm (profileMoldType) is required."} +cliName=${4:?"Fourth parm (cliName) is required."} +cliType=${5:?"Fifth parm (cliType) is required."} -# include exitOnFailure function +# include zowe-cli\__tests__\__scripts__\exitOnFailure function myScriptDir=`dirname $0` -. $myScriptDir/exitOnFailure.sh +. $myScriptDir/../../../../../../../../../../../__tests__/__scripts__/exitOnFailure.sh # set desired properties in our config file cp $myScriptDir/banana.config.json . diff --git a/packages/imperative/__tests__/__integration__/cmd/__tests__/integration/cli/profiles/__scripts__/profiles/name_type_undefined.sh b/packages/imperative/__tests__/__integration__/cmd/__tests__/integration/cli/profiles/__scripts__/profiles/name_type_undefined.sh index b2bd9e478a..dc016314f4 100644 --- a/packages/imperative/__tests__/__integration__/cmd/__tests__/integration/cli/profiles/__scripts__/profiles/name_type_undefined.sh +++ b/packages/imperative/__tests__/__integration__/cmd/__tests__/integration/cli/profiles/__scripts__/profiles/name_type_undefined.sh @@ -1,12 +1,12 @@ #!/bin/sh -profileColor=$1 -profileDescription=$2 -profileMoldType=$3 +profileColor=${1:?"First parm (profileColor) is required."} +profileDescription=${2:?"Second parm (profileDescription) is required."} +profileMoldType=${3:?"Third parm (profileMoldType) is required."} -# include exitOnFailure function +# include zowe-cli\__tests__\__scripts__\exitOnFailure function myScriptDir=`dirname $0` -. $myScriptDir/exitOnFailure.sh +. $myScriptDir/../../../../../../../../../../../__tests__/__scripts__/exitOnFailure.sh # set desired properties in our config file cp $myScriptDir/banana.config.json . diff --git a/packages/imperative/__tests__/__integration__/cmd/__tests__/integration/cli/profiles/__scripts__/profiles/specify_env_for_array.sh b/packages/imperative/__tests__/__integration__/cmd/__tests__/integration/cli/profiles/__scripts__/profiles/specify_env_for_array.sh index d5f0cff5d3..37ca311c3e 100644 --- a/packages/imperative/__tests__/__integration__/cmd/__tests__/integration/cli/profiles/__scripts__/profiles/specify_env_for_array.sh +++ b/packages/imperative/__tests__/__integration__/cmd/__tests__/integration/cli/profiles/__scripts__/profiles/specify_env_for_array.sh @@ -1,13 +1,13 @@ #!/bin/sh -cliColor=$1 -cliDescription=$2 -cliMoldType=$3 -envNames=$4 +cliColor=${1:?"First parm (cliColor) is required."} +cliDescription=${2:?"Second parm (cliDescription) is required."} +cliMoldType=${3:?"Third parm (cliMoldType) is required."} +envNames=${4:?"Fourth parm (envNames) is required."} -# include exitOnFailure function +# include zowe-cli\__tests__\__scripts__\exitOnFailure function myScriptDir=`dirname $0` -. $myScriptDir/exitOnFailure.sh +. $myScriptDir/../../../../../../../../../../../__tests__/__scripts__/exitOnFailure.sh CMD_CLI_OPT_NAMES="$envNames" cmd-cli profile mapping --color "$cliColor" --banana-description "$cliDescription" --mold-type "$cliMoldType" exitOnFailure "The 'profile mapping' command failed." $? diff --git a/packages/imperative/__tests__/__integration__/cmd/__tests__/integration/cli/profiles/__scripts__/profiles/specify_env_for_boolean.sh b/packages/imperative/__tests__/__integration__/cmd/__tests__/integration/cli/profiles/__scripts__/profiles/specify_env_for_boolean.sh index a906515d3c..74f16677af 100644 --- a/packages/imperative/__tests__/__integration__/cmd/__tests__/integration/cli/profiles/__scripts__/profiles/specify_env_for_boolean.sh +++ b/packages/imperative/__tests__/__integration__/cmd/__tests__/integration/cli/profiles/__scripts__/profiles/specify_env_for_boolean.sh @@ -1,13 +1,13 @@ #!/bin/sh -cliColor=$1 -cliDescription=$2 -cliMoldType=$3 -envRipe=$4 +cliColor=${1:?"First parm (cliColor) is required."} +cliDescription=${2:?"Second parm (cliDescription) is required."} +cliMoldType=${3:?"Third parm (cliMoldType) is required."} +envRipe=${4:?"Fourth parm (envRipe) is required."} -# include exitOnFailure function +# include zowe-cli\__tests__\__scripts__\exitOnFailure function myScriptDir=`dirname $0` -. $myScriptDir/exitOnFailure.sh +. $myScriptDir/../../../../../../../../../../../__tests__/__scripts__/exitOnFailure.sh CMD_CLI_OPT_RIPE=$envRipe cmd-cli profile mapping --color "$cliColor" --banana-description "$cliDescription" --mold-type "$cliMoldType" exitOnFailure "The 'profile mapping' command failed." $? diff --git a/packages/imperative/__tests__/__integration__/cmd/__tests__/integration/cli/profiles/__scripts__/profiles/specify_env_for_number.sh b/packages/imperative/__tests__/__integration__/cmd/__tests__/integration/cli/profiles/__scripts__/profiles/specify_env_for_number.sh index bb0e89dbd1..1a82c3d3b8 100644 --- a/packages/imperative/__tests__/__integration__/cmd/__tests__/integration/cli/profiles/__scripts__/profiles/specify_env_for_number.sh +++ b/packages/imperative/__tests__/__integration__/cmd/__tests__/integration/cli/profiles/__scripts__/profiles/specify_env_for_number.sh @@ -1,13 +1,13 @@ #!/bin/sh -cliColor=$1 -cliDescription=$2 -cliMoldType=$3 -envSides=$4 +cliColor=${1:?"First parm (cliColor) is required."} +cliDescription=${2:?"Second parm (cliDescription) is required."} +cliMoldType=${3:?"Third parm (cliMoldType) is required."} +envSides=${4:?"Fourth parm (envSides) is required."} -# include exitOnFailure function +# include zowe-cli\__tests__\__scripts__\exitOnFailure function myScriptDir=`dirname $0` -. $myScriptDir/exitOnFailure.sh +. $myScriptDir/../../../../../../../../../../../__tests__/__scripts__/exitOnFailure.sh CMD_CLI_OPT_SIDES=$envSides cmd-cli profile mapping --color "$cliColor" --banana-description "$cliDescription" --mold-type "$cliMoldType" exitOnFailure "The 'profile mapping' command failed." $? diff --git a/packages/imperative/__tests__/__integration__/cmd/__tests__/integration/cli/profiles/__scripts__/profiles/specify_env_for_positional.sh b/packages/imperative/__tests__/__integration__/cmd/__tests__/integration/cli/profiles/__scripts__/profiles/specify_env_for_positional.sh index e779a8877a..cdfd23f411 100644 --- a/packages/imperative/__tests__/__integration__/cmd/__tests__/integration/cli/profiles/__scripts__/profiles/specify_env_for_positional.sh +++ b/packages/imperative/__tests__/__integration__/cmd/__tests__/integration/cli/profiles/__scripts__/profiles/specify_env_for_positional.sh @@ -1,12 +1,12 @@ #!/bin/sh -envColor=$1 -envDescription=$2 -envMoldType=$3 +envColor=${1:?"First parm (envColor) is required."} +envDescription=${2:?"Second parm (envDescription) is required."} +envMoldType=${3:?"Third parm (envMoldType) is required."} -# include exitOnFailure function +# include zowe-cli\__tests__\__scripts__\exitOnFailure function myScriptDir=`dirname $0` -. $myScriptDir/exitOnFailure.sh +. $myScriptDir/../../../../../../../../../../../__tests__/__scripts__/exitOnFailure.sh CMD_CLI_OPT_COLOR="$envColor" CMD_CLI_OPT_BANANA_DESCRIPTION="$envDescription" CMD_CLI_OPT_MOLD_TYPE="$envMoldType" \ cmd-cli profile mapping-positional diff --git a/packages/imperative/__tests__/__integration__/cmd/__tests__/integration/cli/profiles/__scripts__/profiles/specify_env_sweetness.sh b/packages/imperative/__tests__/__integration__/cmd/__tests__/integration/cli/profiles/__scripts__/profiles/specify_env_sweetness.sh index 7b02bb00da..6109b33546 100644 --- a/packages/imperative/__tests__/__integration__/cmd/__tests__/integration/cli/profiles/__scripts__/profiles/specify_env_sweetness.sh +++ b/packages/imperative/__tests__/__integration__/cmd/__tests__/integration/cli/profiles/__scripts__/profiles/specify_env_sweetness.sh @@ -1,13 +1,13 @@ #!/bin/sh -cliColor=$1 -cliDescription=$2 -cliMoldType=$3 -envSweetness=$4 +cliColor=${1:?"First parm (cliColor) is required."} +cliDescription=${2:?"Second parm (cliDescription) is required."} +cliMoldType=${3:?"Third parm (cliMoldType) is required."} +envSweetness=${4:?"Fourth parm (envSweetness) is required."} -# include exitOnFailure function +# include zowe-cli\__tests__\__scripts__\exitOnFailure function myScriptDir=`dirname $0` -. $myScriptDir/exitOnFailure.sh +. $myScriptDir/../../../../../../../../../../../__tests__/__scripts__/exitOnFailure.sh CMD_CLI_OPT_SWEETNESS="$envSweetness" cmd-cli profile mapping --color "$cliColor" --banana-description "$cliDescription" --mold-type "$cliMoldType" exitOnFailure "The 'profile mapping' command failed." $? diff --git a/packages/imperative/__tests__/__integration__/cmd/__tests__/integration/cli/read/__scripts__/profile/create_and_read.sh b/packages/imperative/__tests__/__integration__/cmd/__tests__/integration/cli/read/__scripts__/profile/create_and_read.sh index b70289f909..3e25d4c778 100644 --- a/packages/imperative/__tests__/__integration__/cmd/__tests__/integration/cli/read/__scripts__/profile/create_and_read.sh +++ b/packages/imperative/__tests__/__integration__/cmd/__tests__/integration/cli/read/__scripts__/profile/create_and_read.sh @@ -1,8 +1,8 @@ #!/bin/sh -# include exitOnFailure function +# include zowe-cli\__tests__\__scripts__\exitOnFailure function myScriptDir=`dirname $0` -. $myScriptDir/exitOnFailure.sh +. $myScriptDir/../../../../../../../../../../../__tests__/__scripts__/exitOnFailure.sh # copy pre-existing profiles to test directory cp -r $myScriptDir/../__resources__/profiles profiles diff --git a/packages/imperative/__tests__/__integration__/cmd/__tests__/integration/cli/read/__scripts__/profile/exitOnFailure.sh b/packages/imperative/__tests__/__integration__/cmd/__tests__/integration/cli/read/__scripts__/profile/exitOnFailure.sh deleted file mode 100644 index 5e7beb8643..0000000000 --- a/packages/imperative/__tests__/__integration__/cmd/__tests__/integration/cli/read/__scripts__/profile/exitOnFailure.sh +++ /dev/null @@ -1,12 +0,0 @@ -#!/bin/sh - -# function to exit if we encounter a bad return code -exitOnFailure () { - failureMsg=${1:?"First parm (failureMsg) is required."} - actualExitCode=${2:?"Second parm (actualExitCode) is required."} - goodExitCode=${3:-0} - if [ $actualExitCode != $goodExitCode ]; then - echo `basename $0`": $failureMsg" 1>&2 - exit $actualExitCode - fi -} diff --git a/packages/imperative/__tests__/src/example_clis/with_profiles/__integration__/__scripts__/copy_auto_gen_profiles.sh b/packages/imperative/__tests__/src/example_clis/with_profiles/__integration__/__scripts__/copy_auto_gen_profiles.sh index f34cdaf81c..911f0184f7 100644 --- a/packages/imperative/__tests__/src/example_clis/with_profiles/__integration__/__scripts__/copy_auto_gen_profiles.sh +++ b/packages/imperative/__tests__/src/example_clis/with_profiles/__integration__/__scripts__/copy_auto_gen_profiles.sh @@ -1,8 +1,8 @@ #!/bin/sh -# include exitOnFailure function +# include zowe-cli\__tests__\__scripts__\exitOnFailure function myScriptDir=`dirname $0` -. $myScriptDir/exitOnFailure.sh +. $myScriptDir/../../../../../../../../__tests__/__scripts__/exitOnFailure.sh # copy pre-existing profiles to test directory cp -r $myScriptDir/../__resources__/autoGenProfiles profiles diff --git a/packages/imperative/__tests__/src/example_clis/with_profiles/__integration__/__scripts__/exitOnFailure.sh b/packages/imperative/__tests__/src/example_clis/with_profiles/__integration__/__scripts__/exitOnFailure.sh deleted file mode 100644 index 5e7beb8643..0000000000 --- a/packages/imperative/__tests__/src/example_clis/with_profiles/__integration__/__scripts__/exitOnFailure.sh +++ /dev/null @@ -1,12 +0,0 @@ -#!/bin/sh - -# function to exit if we encounter a bad return code -exitOnFailure () { - failureMsg=${1:?"First parm (failureMsg) is required."} - actualExitCode=${2:?"Second parm (actualExitCode) is required."} - goodExitCode=${3:-0} - if [ $actualExitCode != $goodExitCode ]; then - echo `basename $0`": $failureMsg" 1>&2 - exit $actualExitCode - fi -} diff --git a/packages/imperative/__tests__/src/example_clis/with_profiles/__integration__/__scripts__/set_default_profile.sh b/packages/imperative/__tests__/src/example_clis/with_profiles/__integration__/__scripts__/set_default_profile.sh index c7a3d6c98e..add8385a20 100644 --- a/packages/imperative/__tests__/src/example_clis/with_profiles/__integration__/__scripts__/set_default_profile.sh +++ b/packages/imperative/__tests__/src/example_clis/with_profiles/__integration__/__scripts__/set_default_profile.sh @@ -1,11 +1,11 @@ #!/bin/sh profileType=${1:?"First parm (profileType) is required."} -defaultProfName=${2:?"First parm (defaultProfName) is required."} +defaultProfName=${2:?"Second parm (defaultProfName) is required."} -# include exitOnFailure function +# include zowe-cli\__tests__\__scripts__\exitOnFailure function myScriptDir=`dirname $0` -. $myScriptDir/exitOnFailure.sh +. $myScriptDir/../../../../../../../../__tests__/__scripts__/exitOnFailure.sh # This script expects that pre-existing profiles have already been copied to the test directory mv profiles/$profileType/${profileType}_meta.yaml profiles/$profileType/${profileType}_meta_orig.yaml diff --git a/packages/imperative/__tests__/src/packages/profiles/__integration__/__scripts__/copy_profiles.sh b/packages/imperative/__tests__/src/packages/profiles/__integration__/__scripts__/copy_profiles.sh index aff8bae320..74a8cfcbca 100644 --- a/packages/imperative/__tests__/src/packages/profiles/__integration__/__scripts__/copy_profiles.sh +++ b/packages/imperative/__tests__/src/packages/profiles/__integration__/__scripts__/copy_profiles.sh @@ -1,8 +1,8 @@ #!/bin/sh -# include exitOnFailure function +# include zowe-cli\__tests__\__scripts__\exitOnFailure function myScriptDir=`dirname $0` -. $myScriptDir/exitOnFailure.sh +. $myScriptDir/../../../../../../../../__tests__/__scripts__/exitOnFailure.sh # copy pre-existing profiles to test directory cp -r $myScriptDir/../__resources__/profiles profiles diff --git a/packages/imperative/__tests__/src/packages/profiles/__integration__/__scripts__/copy_profiles_cli_prof_mgr_creds.sh b/packages/imperative/__tests__/src/packages/profiles/__integration__/__scripts__/copy_profiles_cli_prof_mgr_creds.sh index b65457bffb..d44b849331 100644 --- a/packages/imperative/__tests__/src/packages/profiles/__integration__/__scripts__/copy_profiles_cli_prof_mgr_creds.sh +++ b/packages/imperative/__tests__/src/packages/profiles/__integration__/__scripts__/copy_profiles_cli_prof_mgr_creds.sh @@ -1,8 +1,8 @@ #!/bin/sh -# include exitOnFailure function +# include zowe-cli\__tests__\__scripts__\exitOnFailure function myScriptDir=`dirname $0` -. $myScriptDir/exitOnFailure.sh +. $myScriptDir/../../../../../../../../__tests__/__scripts__/exitOnFailure.sh # copy pre-existing profiles to test directory cp -r $myScriptDir/../__resources__/profiles_cli_prof_mgr_creds ./profiles diff --git a/packages/imperative/__tests__/src/packages/profiles/__integration__/__scripts__/exitOnFailure.sh b/packages/imperative/__tests__/src/packages/profiles/__integration__/__scripts__/exitOnFailure.sh deleted file mode 100644 index 5e7beb8643..0000000000 --- a/packages/imperative/__tests__/src/packages/profiles/__integration__/__scripts__/exitOnFailure.sh +++ /dev/null @@ -1,12 +0,0 @@ -#!/bin/sh - -# function to exit if we encounter a bad return code -exitOnFailure () { - failureMsg=${1:?"First parm (failureMsg) is required."} - actualExitCode=${2:?"Second parm (actualExitCode) is required."} - goodExitCode=${3:-0} - if [ $actualExitCode != $goodExitCode ]; then - echo `basename $0`": $failureMsg" 1>&2 - exit $actualExitCode - fi -} From 584454261f5f84c45eae987ede4baa50c2aacf83 Mon Sep 17 00:00:00 2001 From: Gene Johnston Date: Fri, 12 Jan 2024 15:01:30 -0500 Subject: [PATCH 111/138] Add more info to changelog entries Signed-off-by: Gene Johnston --- packages/cli/CHANGELOG.md | 2 +- packages/core/CHANGELOG.md | 2 +- packages/imperative/CHANGELOG.md | 7 ++++++- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/packages/cli/CHANGELOG.md b/packages/cli/CHANGELOG.md index 24e6cd1a55..3f44f4df6b 100644 --- a/packages/cli/CHANGELOG.md +++ b/packages/cli/CHANGELOG.md @@ -4,7 +4,7 @@ All notable changes to the Zowe CLI package will be documented in this file. ## Recent Changes -- LTS Breaking: Remove deprecated V1 'profiles' command group. +- LTS Breaking: Removed all 'profiles' commands, since they only worked with now-obsolete V1 profiles. - BugFix: Properly construct workflow error messages to display properly with V3 error formatting. ## `8.0.0-next.202401081937` diff --git a/packages/core/CHANGELOG.md b/packages/core/CHANGELOG.md index 775dc3a876..905e442b16 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 -- LTS Breaking: Remove deprecated V1 'profiles' command group. +- LTS Breaking: Removed all 'profiles' commands, since they only worked with now-obsolete V1 profiles. - BugFix: Include text from a REST response's causeErrors.message property in error messages. ## `8.0.0-next.202311282012` diff --git a/packages/imperative/CHANGELOG.md b/packages/imperative/CHANGELOG.md index 43a8edea6a..4e0ba9d5f1 100644 --- a/packages/imperative/CHANGELOG.md +++ b/packages/imperative/CHANGELOG.md @@ -4,7 +4,12 @@ All notable changes to the Imperative package will be documented in this file. ## Recent Changes -- LTS Breaking: Remove deprecated V1 'profiles' command group. +- LTS Breaking: Removed the following: + - All 'profiles' commands, since they only worked with now-obsolete V1 profiles. + - BasicProfileManager.initialize function + - These interfaces: + - IProfileManagerInit + - IProfileInitialized ## `8.0.0-next.202401081937` From dc362127b6d21fdbb3039c2a6d3b790cd0dc7ff3 Mon Sep 17 00:00:00 2001 From: zowe-robot Date: Fri, 12 Jan 2024 20:22:30 +0000 Subject: [PATCH 112/138] Bump version to 7.22.0 [ci skip] Signed-off-by: zowe-robot --- .../__packages__/cli-test-utils/package.json | 4 +- lerna.json | 2 +- npm-shrinkwrap.json | 206 +++++++++--------- packages/cli/CHANGELOG.md | 2 +- packages/cli/package.json | 26 +-- packages/core/package.json | 6 +- packages/imperative/CHANGELOG.md | 2 +- packages/imperative/package.json | 2 +- packages/provisioning/package.json | 8 +- packages/workflows/package.json | 10 +- packages/zosconsole/package.json | 8 +- packages/zosfiles/package.json | 10 +- packages/zosjobs/package.json | 10 +- packages/zoslogs/package.json | 8 +- packages/zosmf/package.json | 8 +- packages/zostso/package.json | 10 +- packages/zosuss/package.json | 6 +- 17 files changed, 164 insertions(+), 164 deletions(-) diff --git a/__tests__/__packages__/cli-test-utils/package.json b/__tests__/__packages__/cli-test-utils/package.json index 091c935a8e..3b0830ce7f 100644 --- a/__tests__/__packages__/cli-test-utils/package.json +++ b/__tests__/__packages__/cli-test-utils/package.json @@ -1,6 +1,6 @@ { "name": "@zowe/cli-test-utils", - "version": "7.21.4", + "version": "7.22.0", "description": "Test utilities package for Zowe CLI plug-ins", "author": "Zowe", "license": "EPL-2.0", @@ -43,7 +43,7 @@ "devDependencies": { "@types/js-yaml": "^4.0.0", "@types/uuid": "^8.3.0", - "@zowe/imperative": "5.20.2" + "@zowe/imperative": "5.21.0" }, "peerDependencies": { "@zowe/imperative": "^5.0.0" diff --git a/lerna.json b/lerna.json index 4ce9e9768c..fbfd4eccc2 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "7.21.4", + "version": "7.22.0", "command": { "publish": { "ignoreChanges": [ diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json index c666b3872b..9dce7e980f 100644 --- a/npm-shrinkwrap.json +++ b/npm-shrinkwrap.json @@ -51,7 +51,7 @@ }, "__tests__/__packages__/cli-test-utils": { "name": "@zowe/cli-test-utils", - "version": "7.21.4", + "version": "7.22.0", "license": "EPL-2.0", "dependencies": { "find-up": "^5.0.0", @@ -62,7 +62,7 @@ "devDependencies": { "@types/js-yaml": "^4.0.0", "@types/uuid": "^8.3.0", - "@zowe/imperative": "5.20.2" + "@zowe/imperative": "5.21.0" }, "peerDependencies": { "@zowe/imperative": "^5.0.0" @@ -24704,21 +24704,21 @@ }, "packages/cli": { "name": "@zowe/cli", - "version": "7.21.4", + "version": "7.22.0", "hasInstallScript": true, "license": "EPL-2.0", "dependencies": { - "@zowe/core-for-zowe-sdk": "7.21.4", - "@zowe/imperative": "5.20.2", - "@zowe/provisioning-for-zowe-sdk": "7.21.4", - "@zowe/zos-console-for-zowe-sdk": "7.21.4", - "@zowe/zos-files-for-zowe-sdk": "7.21.4", - "@zowe/zos-jobs-for-zowe-sdk": "7.21.4", - "@zowe/zos-logs-for-zowe-sdk": "7.21.4", - "@zowe/zos-tso-for-zowe-sdk": "7.21.4", - "@zowe/zos-uss-for-zowe-sdk": "7.21.4", - "@zowe/zos-workflows-for-zowe-sdk": "7.21.4", - "@zowe/zosmf-for-zowe-sdk": "7.21.4", + "@zowe/core-for-zowe-sdk": "7.22.0", + "@zowe/imperative": "5.21.0", + "@zowe/provisioning-for-zowe-sdk": "7.22.0", + "@zowe/zos-console-for-zowe-sdk": "7.22.0", + "@zowe/zos-files-for-zowe-sdk": "7.22.0", + "@zowe/zos-jobs-for-zowe-sdk": "7.22.0", + "@zowe/zos-logs-for-zowe-sdk": "7.22.0", + "@zowe/zos-tso-for-zowe-sdk": "7.22.0", + "@zowe/zos-uss-for-zowe-sdk": "7.22.0", + "@zowe/zos-workflows-for-zowe-sdk": "7.22.0", + "@zowe/zosmf-for-zowe-sdk": "7.22.0", "find-process": "1.4.7", "get-stream": "6.0.1", "lodash": "4.17.21", @@ -24733,7 +24733,7 @@ "@types/diff": "^5.0.2", "@types/lodash": "^4.14.175", "@types/tar": "^6.1.2", - "@zowe/cli-test-utils": "7.21.4", + "@zowe/cli-test-utils": "7.22.0", "comment-json": "^4.1.1", "strip-ansi": "^6.0.1", "which": "^2.0.2" @@ -24766,15 +24766,15 @@ }, "packages/core": { "name": "@zowe/core-for-zowe-sdk", - "version": "7.21.4", + "version": "7.22.0", "license": "EPL-2.0", "dependencies": { "comment-json": "4.1.1", "string-width": "4.2.3" }, "devDependencies": { - "@zowe/cli-test-utils": "7.21.4", - "@zowe/imperative": "5.20.2" + "@zowe/cli-test-utils": "7.22.0", + "@zowe/imperative": "5.21.0" }, "peerDependencies": { "@zowe/imperative": "^5.0.0" @@ -24782,7 +24782,7 @@ }, "packages/imperative": { "name": "@zowe/imperative", - "version": "5.20.2", + "version": "5.21.0", "license": "EPL-2.0", "dependencies": { "@types/yargs": "13.0.4", @@ -25130,16 +25130,16 @@ }, "packages/provisioning": { "name": "@zowe/provisioning-for-zowe-sdk", - "version": "7.21.4", + "version": "7.22.0", "license": "EPL-2.0", "dependencies": { "js-yaml": "4.1.0" }, "devDependencies": { "@types/js-yaml": "^4.0.5", - "@zowe/cli-test-utils": "7.21.4", - "@zowe/core-for-zowe-sdk": "7.21.4", - "@zowe/imperative": "5.20.2" + "@zowe/cli-test-utils": "7.22.0", + "@zowe/core-for-zowe-sdk": "7.22.0", + "@zowe/imperative": "5.21.0" }, "peerDependencies": { "@zowe/core-for-zowe-sdk": "^7.0.0", @@ -25161,15 +25161,15 @@ }, "packages/workflows": { "name": "@zowe/zos-workflows-for-zowe-sdk", - "version": "7.21.4", + "version": "7.22.0", "license": "EPL-2.0", "dependencies": { - "@zowe/zos-files-for-zowe-sdk": "7.21.4" + "@zowe/zos-files-for-zowe-sdk": "7.22.0" }, "devDependencies": { - "@zowe/cli-test-utils": "7.21.4", - "@zowe/core-for-zowe-sdk": "7.21.4", - "@zowe/imperative": "5.20.2" + "@zowe/cli-test-utils": "7.22.0", + "@zowe/core-for-zowe-sdk": "7.22.0", + "@zowe/imperative": "5.21.0" }, "peerDependencies": { "@zowe/core-for-zowe-sdk": "^7.0.0", @@ -25178,12 +25178,12 @@ }, "packages/zosconsole": { "name": "@zowe/zos-console-for-zowe-sdk", - "version": "7.21.4", + "version": "7.22.0", "license": "EPL-2.0", "devDependencies": { - "@zowe/cli-test-utils": "7.21.4", - "@zowe/core-for-zowe-sdk": "7.21.4", - "@zowe/imperative": "5.20.2" + "@zowe/cli-test-utils": "7.22.0", + "@zowe/core-for-zowe-sdk": "7.22.0", + "@zowe/imperative": "5.21.0" }, "peerDependencies": { "@zowe/core-for-zowe-sdk": "^7.0.0", @@ -25192,17 +25192,17 @@ }, "packages/zosfiles": { "name": "@zowe/zos-files-for-zowe-sdk", - "version": "7.21.4", + "version": "7.22.0", "license": "EPL-2.0", "dependencies": { "get-stream": "6.0.1", "minimatch": "5.0.1" }, "devDependencies": { - "@zowe/cli-test-utils": "7.21.4", - "@zowe/core-for-zowe-sdk": "7.21.4", - "@zowe/imperative": "5.20.2", - "@zowe/zos-uss-for-zowe-sdk": "7.21.4" + "@zowe/cli-test-utils": "7.22.0", + "@zowe/core-for-zowe-sdk": "7.22.0", + "@zowe/imperative": "5.21.0", + "@zowe/zos-uss-for-zowe-sdk": "7.22.0" }, "peerDependencies": { "@zowe/core-for-zowe-sdk": "^7.0.0", @@ -25230,15 +25230,15 @@ }, "packages/zosjobs": { "name": "@zowe/zos-jobs-for-zowe-sdk", - "version": "7.21.4", + "version": "7.22.0", "license": "EPL-2.0", "dependencies": { - "@zowe/zos-files-for-zowe-sdk": "7.21.4" + "@zowe/zos-files-for-zowe-sdk": "7.22.0" }, "devDependencies": { - "@zowe/cli-test-utils": "7.21.4", - "@zowe/core-for-zowe-sdk": "7.21.4", - "@zowe/imperative": "5.20.2" + "@zowe/cli-test-utils": "7.22.0", + "@zowe/core-for-zowe-sdk": "7.22.0", + "@zowe/imperative": "5.21.0" }, "peerDependencies": { "@zowe/core-for-zowe-sdk": "^7.0.0", @@ -25247,12 +25247,12 @@ }, "packages/zoslogs": { "name": "@zowe/zos-logs-for-zowe-sdk", - "version": "7.21.4", + "version": "7.22.0", "license": "EPL-2.0", "devDependencies": { - "@zowe/cli-test-utils": "7.21.4", - "@zowe/core-for-zowe-sdk": "7.21.4", - "@zowe/imperative": "5.20.2" + "@zowe/cli-test-utils": "7.22.0", + "@zowe/core-for-zowe-sdk": "7.22.0", + "@zowe/imperative": "5.21.0" }, "peerDependencies": { "@zowe/core-for-zowe-sdk": "^7.0.0", @@ -25261,12 +25261,12 @@ }, "packages/zosmf": { "name": "@zowe/zosmf-for-zowe-sdk", - "version": "7.21.4", + "version": "7.22.0", "license": "EPL-2.0", "devDependencies": { - "@zowe/cli-test-utils": "7.21.4", - "@zowe/core-for-zowe-sdk": "7.21.4", - "@zowe/imperative": "5.20.2" + "@zowe/cli-test-utils": "7.22.0", + "@zowe/core-for-zowe-sdk": "7.22.0", + "@zowe/imperative": "5.21.0" }, "peerDependencies": { "@zowe/core-for-zowe-sdk": "^7.0.0", @@ -25275,15 +25275,15 @@ }, "packages/zostso": { "name": "@zowe/zos-tso-for-zowe-sdk", - "version": "7.21.4", + "version": "7.22.0", "license": "EPL-2.0", "dependencies": { - "@zowe/zosmf-for-zowe-sdk": "7.21.4" + "@zowe/zosmf-for-zowe-sdk": "7.22.0" }, "devDependencies": { - "@zowe/cli-test-utils": "7.21.4", - "@zowe/core-for-zowe-sdk": "7.21.4", - "@zowe/imperative": "5.20.2" + "@zowe/cli-test-utils": "7.22.0", + "@zowe/core-for-zowe-sdk": "7.22.0", + "@zowe/imperative": "5.21.0" }, "peerDependencies": { "@zowe/core-for-zowe-sdk": "^7.0.0", @@ -25292,15 +25292,15 @@ }, "packages/zosuss": { "name": "@zowe/zos-uss-for-zowe-sdk", - "version": "7.21.4", + "version": "7.22.0", "license": "EPL-2.0", "dependencies": { "ssh2": "1.15.0" }, "devDependencies": { "@types/ssh2": "^1.11.0", - "@zowe/cli-test-utils": "7.21.4", - "@zowe/imperative": "5.20.2" + "@zowe/cli-test-utils": "7.22.0", + "@zowe/imperative": "5.21.0" }, "peerDependencies": { "@zowe/imperative": "^5.2.0" @@ -31974,19 +31974,19 @@ "@types/diff": "^5.0.2", "@types/lodash": "^4.14.175", "@types/tar": "^6.1.2", - "@zowe/cli-test-utils": "7.21.4", - "@zowe/core-for-zowe-sdk": "7.21.4", - "@zowe/imperative": "5.20.2", - "@zowe/provisioning-for-zowe-sdk": "7.21.4", + "@zowe/cli-test-utils": "7.22.0", + "@zowe/core-for-zowe-sdk": "7.22.0", + "@zowe/imperative": "5.21.0", + "@zowe/provisioning-for-zowe-sdk": "7.22.0", "@zowe/secrets-for-zowe-sdk": "7.18.6", - "@zowe/zos-console-for-zowe-sdk": "7.21.4", - "@zowe/zos-files-for-zowe-sdk": "7.21.4", - "@zowe/zos-jobs-for-zowe-sdk": "7.21.4", - "@zowe/zos-logs-for-zowe-sdk": "7.21.4", - "@zowe/zos-tso-for-zowe-sdk": "7.21.4", - "@zowe/zos-uss-for-zowe-sdk": "7.21.4", - "@zowe/zos-workflows-for-zowe-sdk": "7.21.4", - "@zowe/zosmf-for-zowe-sdk": "7.21.4", + "@zowe/zos-console-for-zowe-sdk": "7.22.0", + "@zowe/zos-files-for-zowe-sdk": "7.22.0", + "@zowe/zos-jobs-for-zowe-sdk": "7.22.0", + "@zowe/zos-logs-for-zowe-sdk": "7.22.0", + "@zowe/zos-tso-for-zowe-sdk": "7.22.0", + "@zowe/zos-uss-for-zowe-sdk": "7.22.0", + "@zowe/zos-workflows-for-zowe-sdk": "7.22.0", + "@zowe/zosmf-for-zowe-sdk": "7.22.0", "comment-json": "^4.1.1", "find-process": "1.4.7", "get-stream": "6.0.1", @@ -32020,7 +32020,7 @@ "requires": { "@types/js-yaml": "^4.0.0", "@types/uuid": "^8.3.0", - "@zowe/imperative": "5.20.2", + "@zowe/imperative": "5.21.0", "find-up": "^5.0.0", "js-yaml": "^4.0.0", "rimraf": "^3.0.2", @@ -32040,8 +32040,8 @@ "@zowe/core-for-zowe-sdk": { "version": "file:packages/core", "requires": { - "@zowe/cli-test-utils": "7.21.4", - "@zowe/imperative": "5.20.2", + "@zowe/cli-test-utils": "7.22.0", + "@zowe/imperative": "5.21.0", "comment-json": "4.1.1", "string-width": "4.2.3" } @@ -32300,9 +32300,9 @@ "version": "file:packages/provisioning", "requires": { "@types/js-yaml": "^4.0.5", - "@zowe/cli-test-utils": "7.21.4", - "@zowe/core-for-zowe-sdk": "7.21.4", - "@zowe/imperative": "5.20.2", + "@zowe/cli-test-utils": "7.22.0", + "@zowe/core-for-zowe-sdk": "7.22.0", + "@zowe/imperative": "5.21.0", "js-yaml": "4.1.0" } }, @@ -32316,18 +32316,18 @@ "@zowe/zos-console-for-zowe-sdk": { "version": "file:packages/zosconsole", "requires": { - "@zowe/cli-test-utils": "7.21.4", - "@zowe/core-for-zowe-sdk": "7.21.4", - "@zowe/imperative": "5.20.2" + "@zowe/cli-test-utils": "7.22.0", + "@zowe/core-for-zowe-sdk": "7.22.0", + "@zowe/imperative": "5.21.0" } }, "@zowe/zos-files-for-zowe-sdk": { "version": "file:packages/zosfiles", "requires": { - "@zowe/cli-test-utils": "7.21.4", - "@zowe/core-for-zowe-sdk": "7.21.4", - "@zowe/imperative": "5.20.2", - "@zowe/zos-uss-for-zowe-sdk": "7.21.4", + "@zowe/cli-test-utils": "7.22.0", + "@zowe/core-for-zowe-sdk": "7.22.0", + "@zowe/imperative": "5.21.0", + "@zowe/zos-uss-for-zowe-sdk": "7.22.0", "get-stream": "6.0.1", "minimatch": "5.0.1" }, @@ -32353,53 +32353,53 @@ "@zowe/zos-jobs-for-zowe-sdk": { "version": "file:packages/zosjobs", "requires": { - "@zowe/cli-test-utils": "7.21.4", - "@zowe/core-for-zowe-sdk": "7.21.4", - "@zowe/imperative": "5.20.2", - "@zowe/zos-files-for-zowe-sdk": "7.21.4" + "@zowe/cli-test-utils": "7.22.0", + "@zowe/core-for-zowe-sdk": "7.22.0", + "@zowe/imperative": "5.21.0", + "@zowe/zos-files-for-zowe-sdk": "7.22.0" } }, "@zowe/zos-logs-for-zowe-sdk": { "version": "file:packages/zoslogs", "requires": { - "@zowe/cli-test-utils": "7.21.4", - "@zowe/core-for-zowe-sdk": "7.21.4", - "@zowe/imperative": "5.20.2" + "@zowe/cli-test-utils": "7.22.0", + "@zowe/core-for-zowe-sdk": "7.22.0", + "@zowe/imperative": "5.21.0" } }, "@zowe/zos-tso-for-zowe-sdk": { "version": "file:packages/zostso", "requires": { - "@zowe/cli-test-utils": "7.21.4", - "@zowe/core-for-zowe-sdk": "7.21.4", - "@zowe/imperative": "5.20.2", - "@zowe/zosmf-for-zowe-sdk": "7.21.4" + "@zowe/cli-test-utils": "7.22.0", + "@zowe/core-for-zowe-sdk": "7.22.0", + "@zowe/imperative": "5.21.0", + "@zowe/zosmf-for-zowe-sdk": "7.22.0" } }, "@zowe/zos-uss-for-zowe-sdk": { "version": "file:packages/zosuss", "requires": { "@types/ssh2": "^1.11.0", - "@zowe/cli-test-utils": "7.21.4", - "@zowe/imperative": "5.20.2", + "@zowe/cli-test-utils": "7.22.0", + "@zowe/imperative": "5.21.0", "ssh2": "1.15.0" } }, "@zowe/zos-workflows-for-zowe-sdk": { "version": "file:packages/workflows", "requires": { - "@zowe/cli-test-utils": "7.21.4", - "@zowe/core-for-zowe-sdk": "7.21.4", - "@zowe/imperative": "5.20.2", - "@zowe/zos-files-for-zowe-sdk": "7.21.4" + "@zowe/cli-test-utils": "7.22.0", + "@zowe/core-for-zowe-sdk": "7.22.0", + "@zowe/imperative": "5.21.0", + "@zowe/zos-files-for-zowe-sdk": "7.22.0" } }, "@zowe/zosmf-for-zowe-sdk": { "version": "file:packages/zosmf", "requires": { - "@zowe/cli-test-utils": "7.21.4", - "@zowe/core-for-zowe-sdk": "7.21.4", - "@zowe/imperative": "5.20.2" + "@zowe/cli-test-utils": "7.22.0", + "@zowe/core-for-zowe-sdk": "7.22.0", + "@zowe/imperative": "5.21.0" } }, "abbrev": { diff --git a/packages/cli/CHANGELOG.md b/packages/cli/CHANGELOG.md index a2eff2f83a..5db080845a 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.22.0` - Enhancement: Hid the progress bar if `CI` environment variable is set, or if `FORCE_COLOR` environment variable is set to `0`. [#1845](https://github.com/zowe/zowe-cli/issues/1845) diff --git a/packages/cli/package.json b/packages/cli/package.json index f7543d8699..b47e544c38 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -1,6 +1,6 @@ { "name": "@zowe/cli", - "version": "7.21.4", + "version": "7.22.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", @@ -58,17 +58,17 @@ "preshrinkwrap": "node ../../scripts/rewriteShrinkwrap.js" }, "dependencies": { - "@zowe/core-for-zowe-sdk": "7.21.4", - "@zowe/imperative": "5.20.2", - "@zowe/provisioning-for-zowe-sdk": "7.21.4", - "@zowe/zos-console-for-zowe-sdk": "7.21.4", - "@zowe/zos-files-for-zowe-sdk": "7.21.4", - "@zowe/zos-jobs-for-zowe-sdk": "7.21.4", - "@zowe/zos-logs-for-zowe-sdk": "7.21.4", - "@zowe/zos-tso-for-zowe-sdk": "7.21.4", - "@zowe/zos-uss-for-zowe-sdk": "7.21.4", - "@zowe/zos-workflows-for-zowe-sdk": "7.21.4", - "@zowe/zosmf-for-zowe-sdk": "7.21.4", + "@zowe/core-for-zowe-sdk": "7.22.0", + "@zowe/imperative": "5.21.0", + "@zowe/provisioning-for-zowe-sdk": "7.22.0", + "@zowe/zos-console-for-zowe-sdk": "7.22.0", + "@zowe/zos-files-for-zowe-sdk": "7.22.0", + "@zowe/zos-jobs-for-zowe-sdk": "7.22.0", + "@zowe/zos-logs-for-zowe-sdk": "7.22.0", + "@zowe/zos-tso-for-zowe-sdk": "7.22.0", + "@zowe/zos-uss-for-zowe-sdk": "7.22.0", + "@zowe/zos-workflows-for-zowe-sdk": "7.22.0", + "@zowe/zosmf-for-zowe-sdk": "7.22.0", "find-process": "1.4.7", "get-stream": "6.0.1", "lodash": "4.17.21", @@ -79,7 +79,7 @@ "@types/diff": "^5.0.2", "@types/lodash": "^4.14.175", "@types/tar": "^6.1.2", - "@zowe/cli-test-utils": "7.21.4", + "@zowe/cli-test-utils": "7.22.0", "comment-json": "^4.1.1", "strip-ansi": "^6.0.1", "which": "^2.0.2" diff --git a/packages/core/package.json b/packages/core/package.json index 192f5bedda..04efbf5ba2 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -1,6 +1,6 @@ { "name": "@zowe/core-for-zowe-sdk", - "version": "7.21.4", + "version": "7.22.0", "description": "Core libraries shared by Zowe SDK packages", "author": "Zowe", "license": "EPL-2.0", @@ -49,8 +49,8 @@ "string-width": "4.2.3" }, "devDependencies": { - "@zowe/cli-test-utils": "7.21.4", - "@zowe/imperative": "5.20.2" + "@zowe/cli-test-utils": "7.22.0", + "@zowe/imperative": "5.21.0" }, "peerDependencies": { "@zowe/imperative": "^5.0.0" diff --git a/packages/imperative/CHANGELOG.md b/packages/imperative/CHANGELOG.md index e9b3df2c8b..eb6da797bb 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.21.0` - Enhancement: Hid the progress bar if `CI` environment variable is set, or if `FORCE_COLOR` environment variable is set to `0`. [#1845](https://github.com/zowe/zowe-cli/issues/1845) - BugFix: Fixed issue where secure property names could be returned for the wrong profile. [zowe-explorer#2633](https://github.com/zowe/vscode-extension-for-zowe/issues/2633) diff --git a/packages/imperative/package.json b/packages/imperative/package.json index 28f5c6c201..0690ec6e56 100644 --- a/packages/imperative/package.json +++ b/packages/imperative/package.json @@ -1,6 +1,6 @@ { "name": "@zowe/imperative", - "version": "5.20.2", + "version": "5.21.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 72b696c146..e606a88a09 100644 --- a/packages/provisioning/package.json +++ b/packages/provisioning/package.json @@ -1,6 +1,6 @@ { "name": "@zowe/provisioning-for-zowe-sdk", - "version": "7.21.4", + "version": "7.22.0", "description": "Zowe SDK to interact with the z/OS provisioning APIs", "author": "Zowe", "license": "EPL-2.0", @@ -49,9 +49,9 @@ }, "devDependencies": { "@types/js-yaml": "^4.0.5", - "@zowe/cli-test-utils": "7.21.4", - "@zowe/core-for-zowe-sdk": "7.21.4", - "@zowe/imperative": "5.20.2" + "@zowe/cli-test-utils": "7.22.0", + "@zowe/core-for-zowe-sdk": "7.22.0", + "@zowe/imperative": "5.21.0" }, "peerDependencies": { "@zowe/core-for-zowe-sdk": "^7.0.0", diff --git a/packages/workflows/package.json b/packages/workflows/package.json index 8946ad003d..a8a05beb07 100644 --- a/packages/workflows/package.json +++ b/packages/workflows/package.json @@ -1,6 +1,6 @@ { "name": "@zowe/zos-workflows-for-zowe-sdk", - "version": "7.21.4", + "version": "7.22.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.21.4" + "@zowe/zos-files-for-zowe-sdk": "7.22.0" }, "devDependencies": { - "@zowe/cli-test-utils": "7.21.4", - "@zowe/core-for-zowe-sdk": "7.21.4", - "@zowe/imperative": "5.20.2" + "@zowe/cli-test-utils": "7.22.0", + "@zowe/core-for-zowe-sdk": "7.22.0", + "@zowe/imperative": "5.21.0" }, "peerDependencies": { "@zowe/core-for-zowe-sdk": "^7.0.0", diff --git a/packages/zosconsole/package.json b/packages/zosconsole/package.json index 8a395d4075..1c20c0a8d9 100644 --- a/packages/zosconsole/package.json +++ b/packages/zosconsole/package.json @@ -1,6 +1,6 @@ { "name": "@zowe/zos-console-for-zowe-sdk", - "version": "7.21.4", + "version": "7.22.0", "description": "Zowe SDK to interact with the z/OS console", "author": "Zowe", "license": "EPL-2.0", @@ -45,9 +45,9 @@ "prepack": "node ../../scripts/prepareLicenses.js" }, "devDependencies": { - "@zowe/cli-test-utils": "7.21.4", - "@zowe/core-for-zowe-sdk": "7.21.4", - "@zowe/imperative": "5.20.2" + "@zowe/cli-test-utils": "7.22.0", + "@zowe/core-for-zowe-sdk": "7.22.0", + "@zowe/imperative": "5.21.0" }, "peerDependencies": { "@zowe/core-for-zowe-sdk": "^7.0.0", diff --git a/packages/zosfiles/package.json b/packages/zosfiles/package.json index fa46e797dc..0ed2345fd6 100644 --- a/packages/zosfiles/package.json +++ b/packages/zosfiles/package.json @@ -1,6 +1,6 @@ { "name": "@zowe/zos-files-for-zowe-sdk", - "version": "7.21.4", + "version": "7.22.0", "description": "Zowe SDK to interact with files and data sets on z/OS", "author": "Zowe", "license": "EPL-2.0", @@ -50,10 +50,10 @@ "minimatch": "5.0.1" }, "devDependencies": { - "@zowe/cli-test-utils": "7.21.4", - "@zowe/core-for-zowe-sdk": "7.21.4", - "@zowe/imperative": "5.20.2", - "@zowe/zos-uss-for-zowe-sdk": "7.21.4" + "@zowe/cli-test-utils": "7.22.0", + "@zowe/core-for-zowe-sdk": "7.22.0", + "@zowe/imperative": "5.21.0", + "@zowe/zos-uss-for-zowe-sdk": "7.22.0" }, "peerDependencies": { "@zowe/core-for-zowe-sdk": "^7.0.0", diff --git a/packages/zosjobs/package.json b/packages/zosjobs/package.json index fa2c406e33..9d2fc99fef 100644 --- a/packages/zosjobs/package.json +++ b/packages/zosjobs/package.json @@ -1,6 +1,6 @@ { "name": "@zowe/zos-jobs-for-zowe-sdk", - "version": "7.21.4", + "version": "7.22.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.21.4" + "@zowe/zos-files-for-zowe-sdk": "7.22.0" }, "devDependencies": { - "@zowe/cli-test-utils": "7.21.4", - "@zowe/core-for-zowe-sdk": "7.21.4", - "@zowe/imperative": "5.20.2" + "@zowe/cli-test-utils": "7.22.0", + "@zowe/core-for-zowe-sdk": "7.22.0", + "@zowe/imperative": "5.21.0" }, "peerDependencies": { "@zowe/core-for-zowe-sdk": "^7.0.0", diff --git a/packages/zoslogs/package.json b/packages/zoslogs/package.json index 0bd2c4db38..2cf3c794d6 100644 --- a/packages/zoslogs/package.json +++ b/packages/zoslogs/package.json @@ -1,6 +1,6 @@ { "name": "@zowe/zos-logs-for-zowe-sdk", - "version": "7.21.4", + "version": "7.22.0", "description": "Zowe SDK to interact with the z/OS logs", "author": "Zowe", "license": "EPL-2.0", @@ -45,9 +45,9 @@ "prepack": "node ../../scripts/prepareLicenses.js" }, "devDependencies": { - "@zowe/cli-test-utils": "7.21.4", - "@zowe/core-for-zowe-sdk": "7.21.4", - "@zowe/imperative": "5.20.2" + "@zowe/cli-test-utils": "7.22.0", + "@zowe/core-for-zowe-sdk": "7.22.0", + "@zowe/imperative": "5.21.0" }, "peerDependencies": { "@zowe/core-for-zowe-sdk": "^7.0.0", diff --git a/packages/zosmf/package.json b/packages/zosmf/package.json index 17ec7faa2b..3a67ab1795 100644 --- a/packages/zosmf/package.json +++ b/packages/zosmf/package.json @@ -1,6 +1,6 @@ { "name": "@zowe/zosmf-for-zowe-sdk", - "version": "7.21.4", + "version": "7.22.0", "description": "Zowe SDK to interact with the z/OS Management Facility", "author": "Zowe", "license": "EPL-2.0", @@ -44,9 +44,9 @@ "prepack": "node ../../scripts/prepareLicenses.js" }, "devDependencies": { - "@zowe/cli-test-utils": "7.21.4", - "@zowe/core-for-zowe-sdk": "7.21.4", - "@zowe/imperative": "5.20.2" + "@zowe/cli-test-utils": "7.22.0", + "@zowe/core-for-zowe-sdk": "7.22.0", + "@zowe/imperative": "5.21.0" }, "peerDependencies": { "@zowe/core-for-zowe-sdk": "^7.0.0", diff --git a/packages/zostso/package.json b/packages/zostso/package.json index 5d14e8d5a9..1779a26b05 100644 --- a/packages/zostso/package.json +++ b/packages/zostso/package.json @@ -1,6 +1,6 @@ { "name": "@zowe/zos-tso-for-zowe-sdk", - "version": "7.21.4", + "version": "7.22.0", "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.21.4" + "@zowe/zosmf-for-zowe-sdk": "7.22.0" }, "devDependencies": { - "@zowe/cli-test-utils": "7.21.4", - "@zowe/core-for-zowe-sdk": "7.21.4", - "@zowe/imperative": "5.20.2" + "@zowe/cli-test-utils": "7.22.0", + "@zowe/core-for-zowe-sdk": "7.22.0", + "@zowe/imperative": "5.21.0" }, "peerDependencies": { "@zowe/core-for-zowe-sdk": "^7.0.0", diff --git a/packages/zosuss/package.json b/packages/zosuss/package.json index fa9fc1153c..78cced0b31 100644 --- a/packages/zosuss/package.json +++ b/packages/zosuss/package.json @@ -1,6 +1,6 @@ { "name": "@zowe/zos-uss-for-zowe-sdk", - "version": "7.21.4", + "version": "7.22.0", "description": "Zowe SDK to interact with USS on z/OS", "author": "Zowe", "license": "EPL-2.0", @@ -49,8 +49,8 @@ }, "devDependencies": { "@types/ssh2": "^1.11.0", - "@zowe/cli-test-utils": "7.21.4", - "@zowe/imperative": "5.20.2" + "@zowe/cli-test-utils": "7.22.0", + "@zowe/imperative": "5.21.0" }, "peerDependencies": { "@zowe/imperative": "^5.2.0" From 666e5f746265a2d562838e0bc96ababe5bacb9f9 Mon Sep 17 00:00:00 2001 From: Amber Torrise Date: Wed, 17 Jan 2024 08:58:10 -0500 Subject: [PATCH 113/138] all changes but halfway through _ unit_/imperative - list Signed-off-by: Amber Torrise --- .../cmd}/ChainedHandlerUtils.unit.test.ts | 4 +- .../cmd}/CommandPreparer.unit.test.ts | 4 +- .../cmd}/CommandProcessor.unit.test.ts | 34 +- .../__unit__/cmd}/__model__/TestArgHandler.ts | 4 +- .../__unit__/cmd}/__model__/TestCmdHandler.ts | 6 +- .../cmd}/__resources__/.zowe.env.json | 0 .../cmd}/__resources__/CommandDefinitions.ts | 6 +- .../__resources__/project.config.user.json | 0 .../ChainedHandlerUtils.unit.test.ts.snap | 0 .../CommandPreparer.unit.test.ts.snap | 0 .../CommandProcessor.unit.test.ts.snap | 0 .../FailedCommandHandler.unit.test.ts | 6 +- .../FailedCommandHandler.unit.test.ts.snap | 0 .../help/AbstractHelpGenerator.unit.test.ts | 6 +- .../AbstractHelpGeneratorFactory.unit.test.ts | 4 +- .../help/DefaultHelpGenerator.unit.test.ts | 16 +- .../cmd}/help/WebHelpGenerator.unit.test.ts | 16 +- .../cmd}/help/WebHelpManager.unit.test.ts | 15 +- .../AbstractHelpGenerator.unit.test.ts.snap | 0 ...ractHelpGeneratorFactory.unit.test.ts.snap | 0 .../DefaultHelpGenerator.unit.test.ts.snap | 0 .../cmd}/help/model/InheritedHelpGenerator.ts | 4 +- .../help/model/TestHelpGeneratorFactory.ts | 6 +- .../process/CommandResponseDataProcess.ts | 4 +- .../CommandResponseJsonFailedProcess.ts | 4 +- .../process/CommandResponseJsonProcess.ts | 4 +- .../cmd}/process/CommandResponseProcess.ts | 4 +- ...CliProfileManager.credentials.unit.test.ts | 14 +- .../profiles/CliProfileManager.unit.test.ts | 44 +-- .../CommandProfileLoader.unit.test.ts | 16 +- .../profiles/CommandProfiles.unit.test.ts | 6 +- ...ofileManager.credentials.unit.test.ts.snap | 0 .../CommandProfileLoader.unit.test.ts.snap | 0 .../CommandProfiles.unit.test.ts.snap | 0 .../CompleteProfilesGroupBuilder.unit.test.ts | 6 +- .../builders/ProfileBuilderTestConstants.ts | 4 +- .../ProfilesCreateCommandBuilder.unit.test.ts | 2 +- .../ProfilesDeleteCommandBuilder.unit.test.ts | 6 +- .../ProfilesListCommandBuilder.unit.test.ts | 2 +- .../ProfilesSetCommandBuilder.unit.test.ts | 2 +- ...howDependenciesCommandBuilder.unit.test.ts | 2 +- .../ProfilesUpdateCommandBuilder.unit.test.ts | 2 +- ...rofilesValidateCommandBuilder.unit.test.ts | 6 +- ...leteProfilesGroupBuilder.unit.test.ts.snap | 0 ...ilesCreateCommandBuilder.unit.test.ts.snap | 0 ...ilesDeleteCommandBuilder.unit.test.ts.snap | 0 ...ofilesListCommandBuilder.unit.test.ts.snap | 0 ...rofilesSetCommandBuilder.unit.test.ts.snap | 0 ...pendenciesCommandBuilder.unit.test.ts.snap | 0 ...ilesUpdateCommandBuilder.unit.test.ts.snap | 0 ...esValidateCommandBuilder.unit.test.ts.snap | 0 .../profileHandlers/AddTwoNumbersHandler.ts | 2 +- .../profileHandlers/DoNothingHandler.ts | 2 +- .../profileHandlers/ThrowErrorHandler.ts | 2 +- .../response/CommandResponse.unit.test.ts | 13 +- .../response/HandlerResponse.unit.test.ts | 6 +- .../CommandResponse.unit.test.ts.snap | 0 .../cmd}/utils/CommandUtils.unit.test.ts | 8 +- .../cmd}/utils/SharedOptions.unit.test.ts | 8 +- .../CommandUtils.unit.test.ts.snap | 0 .../SharedOptions.unit.test.ts.snap | 0 .../cmd}/yargs/YargsConfigurer.unit.test.ts | 4 +- .../YargsConfigurer.unit.test.ts.snap | 0 .../__unit__/config}/Config.api.unit.test.ts | 12 +- .../config}/Config.secure.unit.test.ts | 12 +- .../__unit__/config}/Config.unit.test.ts | 8 +- .../config}/ConfigAutoStore.unit.test.ts | 8 +- .../config}/ConfigBuilder.unit.test.ts | 6 +- .../config}/ConfigSchema.unit.test.ts | 8 +- .../__unit__/config}/ConfigUtils.unit.test.ts | 6 +- .../__unit__/config}/ProfInfoErr.unit.test.ts | 2 +- .../config}/ProfileCredentials.unit.test.ts | 6 +- .../ProfileInfo.OldProfiles.unit.test.ts | 16 +- .../ProfileInfo.TeamConfig.unit.test.ts | 26 +- .../profiles/base/base_apiml.yaml | 0 .../profiles/base/base_for_userNm.yaml | 0 .../profiles/base/base_meta.yaml | 0 .../profiles/missing/missing_meta.yaml | 0 .../profiles/tso/tsoProfName.yaml | 0 .../profiles/tso/tso_meta.yaml | 0 .../profiles/zosmf/lpar1_zosmf.yaml | 0 .../profiles/zosmf/lpar2_zosmf.yaml | 0 .../profiles/zosmf/lpar3_zosmf.yaml | 0 .../profiles/zosmf/lpar4_zosmf.yaml | 0 .../profiles/zosmf/lpar5_zosmf.yaml | 0 .../profiles/zosmf/zosmf_meta.yaml | 0 .../ProfInfoApp.config.json | 0 .../ProfInfoApp.schema.json | 0 .../profiles/base/base_meta.yaml | 0 .../profiles/tso/tso_meta.yaml | 0 .../profiles/zosmf/zosmf_meta.yaml | 0 .../profiles/base/base_apiml.yaml | 0 .../profiles/base/base_for_userNm.yaml | 0 .../profiles/base/base_meta.yaml | 0 .../profiles/tso/tsoProfName.yaml | 0 .../profiles/tso/tso_meta.yaml | 0 .../profiles/zosmf/lpar1_zosmf.yaml | 0 .../profiles/zosmf/lpar2_zosmf.yaml | 0 .../profiles/zosmf/lpar3_zosmf.yaml | 0 .../profiles/zosmf/lpar4_zosmf.yaml | 0 .../profiles/zosmf/lpar5_zosmf.yaml | 0 .../profiles/zosmf/zosmf_meta.yaml | 0 .../ProfInfoApp.config.json | 0 .../ProfInfoApp.config.json | 0 .../ProfInfoApp.schema.json | 0 .../ProfInfoApp.config.json | 0 .../ProfInfoApp.schema.json | 0 .../ProfInfoApp.config.json | 0 .../ProfInfoApp.config.user.json | 0 .../ProfInfoApp.schema.json | 0 .../ProfInfoApp_user.schema.json | 0 .../__resources__/badproject.config.json | 0 .../commented-project.config.user.json | 0 .../config}/__resources__/my_app.config.json | 0 .../__resources__/my_app.config.user.json | 0 .../config}/__resources__/my_app.schema.json | 0 .../config}/__resources__/project.config.json | 0 .../__resources__/project.config.user.json | 0 .../Config.api.unit.test.ts.snap | 0 .../Config.secure.unit.test.ts.snap | 0 .../__snapshots__/Config.unit.test.ts.snap | 0 .../ConfigSchema.unit.test.ts.snap | 0 .../__unit__/console}/Console.unit.test.ts | 2 +- .../error}/ImperativeError.unit.test.ts | 2 +- .../expect}/ImperativeExpect.unit.test.ts | 4 +- .../ImperativeExpect.unit.test.ts.snap | 0 .../imperative}/ConfigValidator.unit.test.ts | 0 .../ConfigurationLoader.unit.test.ts | 0 .../DefinitionTreeResolver.unit.test.ts | 0 .../imperative}/Imperative.unit.test.ts | 4 +- .../LoggingConfigurer.unit.test.ts | 0 .../imperative}/OverridesLoader.unit.test.ts | 2 +- .../__model__/Sample.configuration.ts | 2 +- .../__model__/Sample.definition.ts | 2 +- .../DefinitionTreeResolver.unit.test.ts.snap | 0 .../LoggingConfigurer.unit.test.ts.snap | 0 .../AutoInitCommandBuilder.unit.test.ts | 8 +- .../BaseAutoInitHandler.unit.test.ts | 13 +- ...ompleteAutoInitCommandBuilder.unit.test.ts | 6 +- .../auto-init/__data__/FakeAutoInitHandler.ts | 6 +- .../__data__/SampleAutoInitConfig.ts | 4 +- ...teAutoInitCommandBuilder.unit.test.ts.snap | 0 .../convert-profiles.handler.unit.test.ts | 18 +- .../config/cmd/edit/edit.handler.unit.test.ts | 7 +- .../cmd/import/import.handler.unit.test.ts | 10 +- .../config/cmd/init/init.handler.unit.test.ts | 17 +- .../config/cmd/list/list.handler.unit.test.ts | 8 +- .../profiles/profiles.handler.unit.test.ts | 8 +- .../cmd/report-env/EnvQuery.unit.test.ts | 12 +- .../Report-env.handler.unit.test.ts | 6 +- .../cmd/schema/schema.handler.unit.test.ts | 8 +- .../cmd/secure/secure.handler.unit.test.ts | 18 +- .../config/cmd/set/set.handler.unit.test.ts | 16 +- .../updateSchema.handler.unit.test.ts | 10 +- ...EnvironmentalVariableSettings.unit.test.ts | 10 +- .../DefaultRootCommandHandler.unit.test.ts | 12 +- ...efaultRootCommandHandler.unit.test.ts.snap | 0 .../AbstractPluginLifeCycle.unit.test.ts | 0 .../PluginManagementFacility.unit.test.ts | 2 +- .../PluginRequireProvider.unit.test.ts | 4 +- .../__resources__/baseCliConfig.testData.ts | 0 .../__resources__/impCmdTree.testData.js | 0 .../plugins/__resources__/mockConfigModule.ts | 0 .../showfirststeps.handler.unit.test.ts | 16 +- .../cmd/install/install.handler.unit.test.ts | 40 +-- .../list.handler.unit.test.ts.snap | 0 .../cmd/list/list.handler.unit.test.ts | 0 .../uninstall/uninstall.handler.unit.test.ts | 0 .../cmd/update/update.handler.unit.test.ts | 0 .../validate/validate.handler.unit.test.ts | 2 +- .../utilities/NpmFunctions.unit.test.ts | 0 .../utilities/PMFConstants.unit.test.ts | 6 +- .../utilities/PluginIssues.unit.test.ts | 0 .../npm-interface/install.unit.test.ts | 0 .../npm-interface/uninstall.unit.test.ts | 0 .../npm-interface/update.unit.test.ts | 0 .../utilities/runValidatePlugin.unit.test.ts | 0 .../CreateProfilesHandler.unit.test.ts | 2 +- .../handlers/ListProfilesHandler.unit.test.ts | 2 +- .../NewDeleteProfilesHandler.unit.test.ts | 2 +- .../UpdateProfilesHandler.unit.test.ts | 2 +- .../ValidateProfileHandler.unit.test.ts | 2 +- .../ListProfilesHandler.unit.test.ts.snap | 0 .../__unit__/io}/IO.unit.test.ts | 7 +- .../io}/__snapshots__/IO.unit.test.ts.snap | 0 .../__unit__/logger}/Logger.unit.test.ts | 10 +- .../logger}/LoggerConfigBuilder.unit.test.ts | 2 +- .../__unit__/logger}/LoggerUtils.unit.test.ts | 6 +- .../__snapshots__/Logger.unit.test.ts.snap | 0 .../LoggerConfigBuilder.unit.test.ts.snap | 0 ...sicProfileManager.constructor.unit.test.ts | 8 +- .../BasicProfileManager.delete.unit.test.ts | 4 +- .../BasicProfileManager.load.unit.test.ts | 2 +- .../BasicProfileManager.merge.unit.test.ts | 2 +- .../BasicProfileManager.save.unit.test.ts | 7 +- .../BasicProfileManager.unit.test.ts | 4 +- .../BasicProfileManager.update.unit.test.ts | 4 +- .../BasicProfileManager.validate.unit.test.ts | 4 +- .../__unit__/profiles}/TestConstants.ts | 0 ...ofileManager.constructor.unit.test.ts.snap | 0 ...sicProfileManager.delete.unit.test.ts.snap | 0 ...BasicProfileManager.load.unit.test.ts.snap | 0 ...BasicProfileManager.save.unit.test.ts.snap | 0 .../BasicProfileManager.unit.test.ts.snap | 0 ...sicProfileManager.update.unit.test.ts.snap | 0 ...cProfileManager.validate.unit.test.ts.snap | 0 .../client/AbstractRestClient.unit.test.ts | 18 +- .../client/CompressionUtils.unit.test.ts | 2 +- .../rest}/client/RestClient.unit.test.ts | 12 +- .../rest}/client/RestClientError.unit.test.ts | 4 +- .../client/RestStandAloneUtils.unit.test.ts | 2 +- .../client/__model__/CustomRestClient.ts | 0 .../CustomRestClientWithProcessError.ts | 0 .../__model__/MockHttpRequestResponse.ts | 0 .../AbstractRestClient.unit.test.ts.snap | 0 .../RestClient.unit.test.ts.snap | 0 .../RestClientError.unit.test.ts.snap | 0 .../ConnectionPropsForSessCfg.unit.test.ts | 16 +- .../rest}/session/Session.unit.test.ts | 2 +- .../__snapshots__/Session.unit.test.ts.snap | 0 .../FailToExtend.ts | 0 .../GoodCredentialManager.ts | 2 +- .../CredentialManagerFactory.unit.test.ts | 0 .../CredentialManagerOverride.unit.test.ts | 9 +- .../DefaultCredentialManager.unit.test.ts | 2 +- .../InvalidCredentialManager.unit.test.ts | 4 +- .../AbstractCredentialManager.unit.test.ts | 4 +- ...bstractCredentialManager.unit.test.ts.snap | 0 .../ICredentialManagerNameMap.unit.test.ts | 0 .../BadCredentialManagerError.unit.test.ts | 2 +- .../settings}/AppSettings.unit.test.ts | 8 +- .../__unit__/utilities}/CliUtils.unit.test.ts | 8 +- .../utilities}/DaemonRequest.unit.test.ts | 4 +- .../utilities}/EnvFileUtils.unit.test.ts | 2 +- .../utilities}/ExecUtils.unit.test.ts | 2 +- .../utilities}/ImperativeConfig.unit.test.ts | 4 +- .../utilities}/JSONUtils.unit.test.ts | 2 +- .../__unit__/utilities}/JsUtils.unit.test.ts | 2 +- .../utilities}/ProcessUtils.unit.test.ts | 4 +- .../utilities}/TextUtils.unit.test.ts | 2 +- .../__snapshots__/CliUtils.unit.test.ts.snap | 0 .../__snapshots__/JSONUtils.unit.test.ts.snap | 0 .../__snapshots__/TextUtils.unit.test.ts.snap | 0 .../utilities}/diff/DiffUtils.unit.test.ts | 8 +- .../diff/WebDiffGenerator.unit.test.ts | 6 +- .../diff/WebDiffManager.unit.test.ts | 12 +- .../__snapshots__/DiffUtils.unit.test.ts.snap | 0 .../imperative/__tests__/src/TestLogger.ts | 6 +- .../CliProfileManager.integration.test.ts | 4 +- .../SyntaxValidator.integration.test.ts | 6 +- .../ConfigLoading.integration.test.ts | 2 +- .../plugins/suites/InstallingPlugins.ts | 4 +- .../plugins/suites/UninstallPlugins.ts | 2 +- .../imperative/plugins/suites/UsingPlugins.ts | 2 +- ...fileManager.initialize.integration.test.ts | 2 +- .../BasicProfileManager.integration.test.ts | 2 +- ...Manager.credentials.integration.subtest.ts | 4 +- .../ProfileCommandExample.integration.test.ts | 6 +- .../src/packages/profiles/test_app/TestApp.ts | 4 +- .../profiles/test_app/TestProfileLoader.ts | 4 +- .../src/cmd/{src => }/ChainedHandlerUtils.ts | 6 +- .../src/cmd/{src => }/CommandPreparer.ts | 8 +- .../src/cmd/{src => }/CommandProcessor.ts | 28 +- .../builders/AbstractCommandBuilder.ts | 0 .../{src => }/constants/OptionConstants.ts | 0 .../cmd/{src => }/doc/ICommandDefinition.ts | 2 +- .../{src => }/doc/ICommandDefinitionPassOn.ts | 0 .../doc/ICommandExampleDefinition.ts | 0 .../doc/IPartialCommandDefinition.ts | 0 .../{src => }/doc/args/ICommandArguments.ts | 0 .../handler/IChainedHandlerArgumentMapping.ts | 0 .../doc/handler/IChainedHandlerEntry.ts | 0 .../{src => }/doc/handler/ICommandHandler.ts | 0 .../doc/handler/ICommandHandlerConstructor.ts | 0 .../doc/handler/ICommandHandlerRequire.ts | 0 .../handler/ICommandHandlerResponseChecker.ts | 0 .../ICommandHandlerResponseValidator.ts | 2 +- .../doc/handler/IHandlerParameters.ts | 0 .../option/ICommandOptionAllowableValues.ts | 0 .../doc/option/ICommandOptionDefinition.ts | 0 .../option/ICommandOptionValueImplications.ts | 0 .../option/ICommandPositionalDefinition.ts | 0 .../doc/parms/IInvokeCommandParms.ts | 0 .../doc/processor/ICommandProcessorParms.ts | 8 +- .../profiles/definition/ICommandProfile.ts | 0 .../definition/ICommandProfileAuthConfig.ts | 0 .../ICommandProfileAutoInitConfig.ts | 0 .../definition/ICommandProfileProperty.ts | 2 +- .../definition/ICommandProfileSchema.ts | 2 +- .../ICommandProfileTypeConfiguration.ts | 0 .../doc/profiles/parms/ICliLoadAllProfiles.ts | 2 +- .../doc/profiles/parms/ICliLoadProfile.ts | 2 +- .../doc/profiles/parms/ICommandLoadProfile.ts | 0 .../parms/ICommandProfileLoaderParms.ts | 4 +- .../api/handler/IHandlerFormatOutputApi.ts | 2 +- .../api/handler/IHandlerProgressApi.ts | 0 .../api/handler/IHandlerResponseApi.ts | 0 .../api/handler/IHandlerResponseConsoleApi.ts | 0 .../api/handler/IHandlerResponseDataApi.ts | 0 .../response/api/handler/IPromptOptions.ts | 0 .../api/processor/ICommandResponseApi.ts | 2 +- .../response/parms/ICommandResponseParms.ts | 0 .../doc/response/parms/IProgressBarParms.ts | 2 +- .../response/response/ICommandOutputFormat.ts | 0 .../doc/response/response/ICommandPrepared.ts | 4 +- .../doc/response/response/ICommandResponse.ts | 2 +- .../response/ICommandValidatorError.ts | 0 .../response/ICommandValidatorResponse.ts | 0 .../handlers/FailedCommandHandler.ts | 4 +- .../{src => }/help/DefaultHelpGenerator.ts | 8 +- .../src/cmd/{src => }/help/HelpConstants.ts | 0 .../{src => }/help/HelpGeneratorFactory.ts | 0 .../cmd/{src => }/help/WebHelpGenerator.ts | 4 +- .../src/cmd/{src => }/help/WebHelpManager.ts | 7 +- .../help/abstract/AbstractHelpGenerator.ts | 8 +- .../abstract/AbstractHelpGeneratorFactory.ts | 2 +- .../cmd/{src => }/help/doc/IHelpGenerator.ts | 0 .../help/doc/IHelpGeneratorFactory.ts | 0 .../help/doc/IHelpGeneratorFactoryParms.ts | 0 .../{src => }/help/doc/IHelpGeneratorParms.ts | 0 .../cmd/{src => }/help/doc/IWebHelpManager.ts | 0 .../help/doc/IWebHelpPackageMetadata.ts | 0 .../{src => }/help/doc/IWebHelpTreeNode.ts | 0 packages/imperative/src/cmd/index.ts | 154 ++++---- .../{src => }/profiles/CliProfileManager.ts | 12 +- .../profiles/CommandProfileLoader.ts | 10 +- .../cmd/{src => }/profiles/CommandProfiles.ts | 6 +- .../cmd/{src => }/response/CommandResponse.ts | 19 +- .../cmd/{src => }/response/HandlerResponse.ts | 0 .../response/__mocks__/CommandResponse.ts | 4 +- .../response/__mocks__/HandlerResponse.ts | 2 +- .../cmd/{src => }/syntax/SyntaxValidator.ts | 10 +- .../syntax/__mocks__/SyntaxValidator.ts | 4 +- .../__tests__/SyntaxValidator.unit.test.ts | 8 +- .../types/SecureOperationFunction.ts | 0 .../src/cmd/{src => }/utils/CommandUtils.ts | 2 +- .../src/cmd/{src => }/utils/SharedOptions.ts | 6 +- .../{src => }/yargs/AbstractCommandYargs.ts | 12 +- .../src/cmd/{src => }/yargs/CommandYargs.ts | 10 +- .../cmd/{src => }/yargs/GroupCommandYargs.ts | 2 +- .../cmd/{src => }/yargs/YargsConfigurer.ts | 8 +- .../src/cmd/{src => }/yargs/YargsDefiner.ts | 8 +- .../cmd/{src => }/yargs/doc/IYargsParms.ts | 2 +- .../cmd/{src => }/yargs/doc/IYargsResponse.ts | 2 +- .../imperative/src/config/{src => }/Config.ts | 0 .../src/config/{src => }/ConfigAutoStore.ts | 18 +- .../src/config/{src => }/ConfigBuilder.ts | 6 +- .../src/config/{src => }/ConfigConstants.ts | 0 .../src/config/{src => }/ConfigSchema.ts | 12 +- .../src/config/{src => }/ConfigUtils.ts | 8 +- .../src/config/{src => }/ProfInfoErr.ts | 2 +- .../config/{src => }/ProfileCredentials.ts | 6 +- .../src/config/{src => }/ProfileInfo.ts | 21 +- .../src/config/{src => }/__mocks__/Config.ts | 2 +- .../src/config/{src => }/api/ConfigApi.ts | 0 .../src/config/{src => }/api/ConfigLayers.ts | 2 +- .../src/config/{src => }/api/ConfigPlugins.ts | 0 .../config/{src => }/api/ConfigProfiles.ts | 0 .../src/config/{src => }/api/ConfigSecure.ts | 2 +- .../src/config/{src => }/api/index.ts | 0 .../src/config/{src => }/doc/IConfig.ts | 0 .../{src => }/doc/IConfigAutoStoreOpts.ts | 4 +- .../{src => }/doc/IConfigBuilderOpts.ts | 2 +- .../{src => }/doc/IConfigConvertResult.ts | 0 .../src/config/{src => }/doc/IConfigLayer.ts | 0 .../config/{src => }/doc/IConfigMergeOpts.ts | 0 .../src/config/{src => }/doc/IConfigOpts.ts | 0 .../config/{src => }/doc/IConfigProfile.ts | 0 .../src/config/{src => }/doc/IConfigSchema.ts | 0 .../src/config/{src => }/doc/IConfigSecure.ts | 0 .../src/config/{src => }/doc/IConfigVault.ts | 0 .../src/config/{src => }/doc/IProfArgAttrs.ts | 0 .../src/config/{src => }/doc/IProfAttrs.ts | 0 .../config/{src => }/doc/IProfInfoErrParms.ts | 2 +- .../config/{src => }/doc/IProfInfoProps.ts | 0 .../doc/IProfInfoRemoveKnownPropOpts.ts | 0 .../{src => }/doc/IProfInfoUpdatePropOpts.ts | 0 .../src/config/{src => }/doc/IProfLoc.ts | 0 .../config/{src => }/doc/IProfMergeArgOpts.ts | 0 .../config/{src => }/doc/IProfMergedArg.ts | 0 .../src/config/{src => }/doc/IProfOpts.ts | 2 +- packages/imperative/src/config/index.ts | 58 +-- .../src/console/{src => }/Console.ts | 4 +- .../src/console/{src => }/doc/IConsole.ts | 0 packages/imperative/src/console/index.ts | 4 +- .../src/constants/{src => }/Constants.ts | 0 packages/imperative/src/constants/index.ts | 2 +- .../src/error/{src => }/ImperativeError.ts | 0 .../error/{src => }/doc/IImperativeError.ts | 0 .../{src => }/doc/IImperativeErrorParms.ts | 2 +- packages/imperative/src/error/index.ts | 4 +- .../src/expect/{src => }/ImperativeExpect.ts | 2 +- packages/imperative/src/expect/index.ts | 2 +- .../{src => }/ConfigurationLoader.ts | 0 .../{src => }/ConfigurationValidator.ts | 0 .../{src => }/DefinitionTreeResolver.ts | 0 .../src/imperative/{src => }/Imperative.ts | 2 +- .../imperative/{src => }/LoggingConfigurer.ts | 0 .../imperative/{src => }/OverridesLoader.ts | 0 .../imperative/{src => }/UpdateImpConfig.ts | 0 .../{src => }/__mocks__/Imperative.ts | 4 +- .../{src => }/__mocks__/LoggingConfigurer.ts | 4 +- .../imperative/{src => }/api/ImperativeApi.ts | 6 +- .../{src => }/api/doc/IImperativeApi.ts | 2 +- .../AuthLoginCommandBuilder.unit.test.ts | 6 +- .../AuthLogoutCommandBuilder.unit.test.ts | 6 +- .../BaseAuthHandler.config.unit.test.ts | 14 +- .../__tests__/BaseAuthHandler.unit.test.ts | 4 +- .../CompleteAuthGroupBuilder.unit.test.ts | 6 +- .../__tests__/__data__/FakeAuthHandler.ts | 0 .../__tests__/__data__/SampleAuthConfig.ts | 0 .../__tests__/__resources__/auth.config.json | 0 .../__resources__/no_auth.config.json | 0 ...CompleteAuthGroupBuilder.unit.test.ts.snap | 0 .../auth/builders/AuthCommandBuilder.ts | 10 +- .../auth/builders/AuthLoginCommandBuilder.ts | 8 +- .../auth/builders/AuthLogoutCommandBuilder.ts | 8 +- .../auth/builders/CompleteAuthGroupBuilder.ts | 10 +- .../{src => }/auth/doc/IAuthHandlerApi.ts | 4 +- .../auth/handlers/AbstractAuthHandler.ts | 8 +- .../auth/handlers/BaseAuthHandler.ts | 12 +- .../config/ConfigManagementFacility.ts | 2 +- .../__mocks__/ConfigManagementFacility.ts | 0 .../config/cmd/auto-init/AutoInitConstants.ts | 2 +- .../builders/AutoInitCommandBuilder.ts | 16 +- .../CompleteAutoInitCommandBuilder.ts | 6 +- .../auto-init/handlers/BaseAutoInitHandler.ts | 10 +- .../convert-profiles.definition.ts | 4 +- .../convert-profiles.handler.ts | 10 +- .../config/cmd/edit/edit.definition.ts | 2 +- .../{src => }/config/cmd/edit/edit.handler.ts | 5 +- .../config/cmd/import/import.definition.ts | 2 +- .../config/cmd/import/import.handler.ts | 11 +- .../config/cmd/init/init.definition.ts | 4 +- .../{src => }/config/cmd/init/init.handler.ts | 18 +- .../config/cmd/list/list.definition.ts | 2 +- .../{src => }/config/cmd/list/list.handler.ts | 0 .../cmd/profiles/profiles.definition.ts | 0 .../config/cmd/profiles/profiles.handler.ts | 0 .../config/cmd/report-env/EnvItems.ts | 0 .../config/cmd/report-env/EnvQuery.ts | 0 .../cmd/report-env/Report-env.definition.ts | 0 .../cmd/report-env/Report-env.handler.ts | 0 .../config/cmd/schema/schema.definition.ts | 0 .../config/cmd/schema/schema.handler.ts | 0 .../config/cmd/secure/secure.definition.ts | 0 .../config/cmd/secure/secure.handler.ts | 0 .../config/cmd/set/set.definition.ts | 0 .../{src => }/config/cmd/set/set.handler.ts | 0 .../update-schemas.definition.ts | 0 .../update-schemas/update-schemas.handler.ts | 2 +- .../{src => }/doc/IApimlSvcAttrs.ts | 0 .../{src => }/doc/IDaemonContext.ts | 0 .../doc/IImperativeAuthGroupConfig.ts | 0 .../{src => }/doc/IImperativeConfig.ts | 0 ...IImperativeEnvironmentalVariableSetting.ts | 0 ...ImperativeEnvironmentalVariableSettings.ts | 0 .../{src => }/doc/IImperativeLoggingConfig.ts | 0 .../{src => }/doc/IImperativeLogsConfig.ts | 0 .../{src => }/doc/IImperativeOverrides.ts | 0 .../env/EnvironmentalVariableSettings.ts | 0 .../EnvironmentalVariableSettings.ts | 0 .../handlers/DefaultRootCommandHandler.ts | 0 .../help/ImperativeHelpGeneratorFactory.ts | 0 packages/imperative/src/imperative/index.ts | 36 +- .../plugins/AbstractPluginLifeCycle.ts | 0 .../plugins/PluginManagementFacility.ts | 0 .../plugins/PluginRequireProvider.ts | 0 .../__mocks__/PluginManagementFacility.ts | 0 .../__mocks__/PluginRequireProvider.ts | 0 .../plugins/cmd/install/install.definition.ts | 0 .../plugins/cmd/install/install.handler.ts | 0 .../plugins/cmd/list/list.definition.ts | 0 .../plugins/cmd/list/list.handler.ts | 0 .../showfirststeps.definition.ts | 0 .../showfirststeps/showfirststeps.handler.ts | 0 .../cmd/uninstall/uninstall.definition.ts | 0 .../cmd/uninstall/uninstall.handler.ts | 0 .../plugins/cmd/update/update.definition.ts | 0 .../plugins/cmd/update/update.handler.ts | 0 .../cmd/validate/validate.definition.ts | 0 .../plugins/cmd/validate/validate.handler.ts | 0 .../{src => }/plugins/doc/IPluginCfgProps.ts | 0 .../{src => }/plugins/doc/IPluginIssues.ts | 0 .../{src => }/plugins/doc/IPluginJson.ts | 0 .../plugins/doc/IPluginJsonObject.ts | 0 .../plugins/doc/IPluginPeerDepends.ts | 0 .../PluginRequireAlreadyCreatedError.ts | 0 .../errors/PluginRequireNotCreatedError.ts | 0 .../plugins/utilities/NpmFunctions.ts | 0 .../plugins/utilities/PMFConstants.ts | 0 .../plugins/utilities/PluginIssues.ts | 0 .../utilities/__mocks__/PMFConstants.ts | 2 +- .../plugins/utilities/npm-interface/index.ts | 0 .../utilities/npm-interface/install.ts | 0 .../utilities/npm-interface/uninstall.ts | 0 .../plugins/utilities/npm-interface/update.ts | 0 .../plugins/utilities/runValidatePlugin.ts | 0 .../ImperativeProfileManagerFactory.ts | 0 .../builders/CompleteProfilesGroupBuilder.ts | 0 .../builders/ProfilesCommandBuilder.ts | 0 .../builders/ProfilesCreateCommandBuilder.ts | 0 .../builders/ProfilesDeleteCommandBuilder.ts | 0 .../builders/ProfilesListCommandBuilder.ts | 0 .../builders/ProfilesSetCommandBuilder.ts | 0 .../ProfilesShowDependenciesCommandBuilder.ts | 0 .../builders/ProfilesUpdateCommandBuilder.ts | 0 .../ProfilesValidateCommandBuilder.ts | 0 .../handlers/CreateProfilesHandler.ts | 0 .../profiles/handlers/ListProfilesHandler.ts | 0 .../handlers/NewDeleteProfilesHandler.ts | 0 .../handlers/OldDeleteProfilesHandler.ts | 0 .../handlers/SetDefaultProfilesHandler.ts | 0 .../ShowDependenciesProfilesHandler.ts | 0 .../handlers/UpdateProfilesHandler.ts | 0 .../handlers/ValidateProfileHandler.ts | 0 .../interfaces/{src => }/doc/IConstructor.ts | 0 packages/imperative/src/interfaces/index.ts | 4 +- .../{src => }/types/ImperativeReject.ts | 2 +- packages/imperative/src/io/{src => }/IO.ts | 8 +- packages/imperative/src/io/index.ts | 2 +- .../imperative/src/logger/{src => }/Logger.ts | 8 +- .../logger/{src => }/LoggerConfigBuilder.ts | 2 +- .../src/logger/{src => }/LoggerManager.ts | 2 +- .../src/logger/{src => }/LoggerUtils.ts | 16 +- .../src/logger/{src => }/__mocks__/Logger.ts | 2 +- .../logger/{src => }/__mocks__/LoggerUtils.ts | 0 .../logger/{src => }/doc/IConfigLogging.ts | 0 .../logger/{src => }/doc/ILog4jsAppender.ts | 0 .../src/logger/{src => }/doc/ILog4jsConfig.ts | 0 .../src/logger/{src => }/doc/ILog4jsLayout.ts | 0 .../logger/{src => }/doc/IQueuedMessage.ts | 0 packages/imperative/src/logger/index.ts | 14 +- .../src/messages/{src => }/CoreMessages.ts | 2 +- .../{src => }/doc/IMessageDefinition.ts | 0 packages/imperative/src/messages/index.ts | 4 +- .../src/operations/{src => }/Operation.ts | 4 +- .../src/operations/{src => }/Operations.ts | 2 +- .../src/operations/{src => }/TaskProgress.ts | 0 .../src/operations/{src => }/TaskStage.ts | 0 .../Operations.integration.spec.ts | 335 ------------------ .../__tests__/operation/TestOperations1.ts | 28 -- .../__tests__/operation/TestOperations2.ts | 27 -- .../__tests__/operation/TestOperations3.ts | 29 -- .../__tests__/operation/TestOperations4.ts | 29 -- .../__tests__/operation/TestOperations5.ts | 27 -- .../__tests__/operation/subops/TestSubOp1.ts | 38 -- .../__tests__/operation/subops/TestSubOp2.ts | 40 --- .../__tests__/operation/subops/TestSubOp4.ts | 41 --- .../__tests__/operation/subops/TestSubOp5.ts | 41 --- .../__tests__/operation/subops/TestSubOp6.ts | 41 --- .../operation/subops/TestSubOpDiverge.ts | 43 --- .../operation/subops/TestSubOpFail.ts | 39 -- .../operation/subops/TestSubOpNoUndo.ts | 40 --- .../{src => }/doc/IOperationResult.ts | 0 .../{src => }/doc/ITaskWithStatus.ts | 0 packages/imperative/src/operations/index.ts | 12 +- .../profiles/{src => }/BasicProfileManager.ts | 4 +- .../{src => }/BasicProfileManagerFactory.ts | 0 .../abstract/AbstractProfileManager.ts | 8 +- .../abstract/AbstractProfileManagerFactory.ts | 0 .../{src => }/constants/ProfilesConstants.ts | 0 .../doc/api/IProfileManagerFactory.ts | 0 .../doc/config/IProfileTypeConfiguration.ts | 0 .../{src => }/doc/definition/IMetaProfile.ts | 0 .../{src => }/doc/definition/IProfile.ts | 0 .../doc/definition/IProfileDependency.ts | 0 .../doc/definition/IProfileProperty.ts | 0 .../doc/definition/IProfileSchema.ts | 0 .../{src => }/doc/definition/index.ts | 0 .../src/profiles/{src => }/doc/index.ts | 0 .../{src => }/doc/parms/IDeleteProfile.ts | 0 .../{src => }/doc/parms/ILoadAllProfiles.ts | 0 .../{src => }/doc/parms/ILoadProfile.ts | 0 .../{src => }/doc/parms/IProfileManager.ts | 2 +- .../doc/parms/IProfileManagerInit.ts | 0 .../{src => }/doc/parms/ISaveProfile.ts | 0 .../doc/parms/ISaveProfileFromCliArgs.ts | 0 .../{src => }/doc/parms/ISetDefaultProfile.ts | 0 .../{src => }/doc/parms/IUpdateProfile.ts | 0 .../doc/parms/IUpdateProfileFromCliArgs.ts | 0 .../{src => }/doc/parms/IValidateProfile.ts | 0 .../doc/parms/IValidateProfileForCLI.ts | 0 .../doc/parms/IValidateProfileWithSchema.ts | 0 .../src/profiles/{src => }/doc/parms/index.ts | 0 .../{src => }/doc/response/IProfileDeleted.ts | 0 .../doc/response/IProfileInitialized.ts | 0 .../{src => }/doc/response/IProfileLoaded.ts | 0 .../{src => }/doc/response/IProfileSaved.ts | 0 .../{src => }/doc/response/IProfileUpdated.ts | 0 .../doc/response/IProfileValidated.ts | 0 .../profiles/{src => }/doc/response/index.ts | 0 packages/imperative/src/profiles/index.ts | 96 ++--- .../src/profiles/{src => }/utils/ProfileIO.ts | 6 +- .../profiles/{src => }/utils/ProfileUtils.ts | 0 .../{src => }/utils/__mocks__/ProfileIO.ts | 0 .../utils/__tests__/ProfileIO.unit.test.ts | 12 +- .../utils/__tests__/ProfileUtils.unit.test.ts | 2 +- .../__snapshots__/ProfileIO.unit.test.ts.snap | 0 .../ProfileUtils.unit.test.ts.snap | 0 .../src/profiles/{src => }/utils/index.ts | 0 .../__tests__/ProfileValidation.unit.test.ts | 2 +- .../validation/api/ProfileValidator.ts | 10 +- .../validation/doc/IProfileValidationPlan.ts | 0 .../doc/IProfileValidationReport.ts | 0 .../validation/doc/IProfileValidationTask.ts | 0 .../doc/IProfileValidationTaskResult.ts | 0 .../rest/{src => }/__mocks__/RestClient.ts | 0 .../{src => }/client/AbstractRestClient.ts | 14 +- .../rest/{src => }/client/CompressionUtils.ts | 4 +- .../src/rest/{src => }/client/Headers.ts | 0 .../src/rest/{src => }/client/RestClient.ts | 4 +- .../rest/{src => }/client/RestClientError.ts | 4 +- .../rest/{src => }/client/RestConstants.ts | 0 .../{src => }/client/RestStandAloneUtils.ts | 0 .../{src => }/client/doc/IHTTPSOptions.ts | 0 .../{src => }/client/doc/IHeaderContent.ts | 0 .../client/doc/IOptionsFullResponse.ts | 2 +- .../{src => }/client/doc/IRestClientError.ts | 2 +- .../client/doc/IRestClientResponse.ts | 2 +- .../rest/{src => }/client/doc/IRestOptions.ts | 2 +- .../types/AbstractRestClientProperties.ts | 0 .../rest/{src => }/client/types/HTTPVerb.ts | 0 packages/imperative/src/rest/index.ts | 42 +-- .../rest/{src => }/session/AbstractSession.ts | 6 +- .../session/ConnectionPropsForSessCfg.ts | 17 +- .../rest/{src => }/session/SessConstants.ts | 0 .../src/rest/{src => }/session/Session.ts | 0 .../session/doc/IOptionsForAddConnProps.ts | 2 +- .../session/doc/IOverridePromptConnProps.ts | 0 .../rest/{src => }/session/doc/ISession.ts | 0 .../{src => }/CredentialManagerFactory.ts | 2 +- .../{src => }/CredentialManagerOverride.ts | 6 +- .../{src => }/DefaultCredentialManager.ts | 4 +- .../{src => }/InvalidCredentialManager.ts | 0 .../__mocks__/DefaultCredentialManager.ts | 0 .../abstract/AbstractCredentialManager.ts | 2 +- .../doc/ICredentialManagerConstructor.ts | 0 .../{src => }/doc/ICredentialManagerInit.ts | 2 +- .../doc/ICredentialManagerNameMap.ts | 0 .../errors/BadCredentialManagerError.ts | 2 +- packages/imperative/src/security/index.ts | 16 +- .../src/settings/{src => }/AppSettings.ts | 6 +- .../{src => }/__mocks__/AppSettings.ts | 0 .../settings/{src => }/doc/ISettingsFile.ts | 2 +- .../errors/SettingsAlreadyInitialized.ts | 2 +- .../errors/SettingsNotInitialized.ts | 2 +- .../src/settings/{src => }/errors/index.ts | 0 packages/imperative/src/settings/index.ts | 2 +- .../persistance/ISettingsFilePersistence.ts | 0 .../JSONSettingsFilePersistence.ts | 0 .../src/utilities/{src => }/CliUtils.ts | 12 +- .../src/utilities/{src => }/DaemonRequest.ts | 0 .../src/utilities/{src => }/EnvFileUtils.ts | 4 +- .../src/utilities/{src => }/ExecUtils.ts | 2 +- .../utilities/{src => }/ImperativeConfig.ts | 18 +- .../src/utilities/{src => }/JSONUtils.ts | 4 +- .../src/utilities/{src => }/JsUtils.ts | 0 .../utilities/{src => }/NextVerFeatures.ts | 0 .../src/utilities/{src => }/ProcessUtils.ts | 2 +- .../src/utilities/{src => }/TextUtils.ts | 0 .../{src => }/__mocks__/ImperativeConfig.ts | 4 +- .../src/utilities/{src => }/diff/DiffUtils.ts | 0 .../{src => }/diff/WebDiffGenerator.ts | 6 +- .../{src => }/diff/WebDiffManager.ts | 8 +- .../{src => }/diff/doc/IDiffNameOptions.ts | 0 .../{src => }/diff/doc/IDiffOptions.ts | 0 .../{src => }/diff/doc/IWebDiffGenerator.ts | 0 .../{src => }/diff/doc/IWebDiffManager.ts | 0 .../utilities/{src => }/doc/IDaemonRequest.ts | 0 .../{src => }/doc/IDaemonResponse.ts | 0 .../utilities/{src => }/doc/IOptionFormat.ts | 0 .../utilities/{src => }/doc/ISystemInfo.ts | 0 packages/imperative/tsconfig-tests.json | 39 -- 674 files changed, 1112 insertions(+), 1927 deletions(-) rename packages/imperative/{src/cmd/__tests__ => __tests__/__unit__/cmd}/ChainedHandlerUtils.unit.test.ts (98%) rename packages/imperative/{src/cmd/__tests__ => __tests__/__unit__/cmd}/CommandPreparer.unit.test.ts (99%) rename packages/imperative/{src/cmd/__tests__ => __tests__/__unit__/cmd}/CommandProcessor.unit.test.ts (98%) rename packages/imperative/{src/cmd/__tests__ => __tests__/__unit__/cmd}/__model__/TestArgHandler.ts (75%) rename packages/imperative/{src/cmd/__tests__ => __tests__/__unit__/cmd}/__model__/TestCmdHandler.ts (90%) rename packages/imperative/{src/cmd/__tests__ => __tests__/__unit__/cmd}/__resources__/.zowe.env.json (100%) rename packages/imperative/{src/cmd/__tests__ => __tests__/__unit__/cmd}/__resources__/CommandDefinitions.ts (98%) rename packages/imperative/{src/cmd/__tests__ => __tests__/__unit__/cmd}/__resources__/project.config.user.json (100%) rename packages/imperative/{src/cmd/__tests__ => __tests__/__unit__/cmd}/__snapshots__/ChainedHandlerUtils.unit.test.ts.snap (100%) rename packages/imperative/{src/cmd/__tests__ => __tests__/__unit__/cmd}/__snapshots__/CommandPreparer.unit.test.ts.snap (100%) rename packages/imperative/{src/cmd/__tests__ => __tests__/__unit__/cmd}/__snapshots__/CommandProcessor.unit.test.ts.snap (100%) rename packages/imperative/{src/cmd/__tests__ => __tests__/__unit__/cmd}/handlers/FailedCommandHandler.unit.test.ts (92%) rename packages/imperative/{src/cmd/__tests__ => __tests__/__unit__/cmd}/handlers/__snapshots__/FailedCommandHandler.unit.test.ts.snap (100%) rename packages/imperative/{src/cmd/__tests__ => __tests__/__unit__/cmd}/help/AbstractHelpGenerator.unit.test.ts (97%) rename packages/imperative/{src/cmd/__tests__ => __tests__/__unit__/cmd}/help/AbstractHelpGeneratorFactory.unit.test.ts (96%) rename packages/imperative/{src/cmd/__tests__ => __tests__/__unit__/cmd}/help/DefaultHelpGenerator.unit.test.ts (98%) rename packages/imperative/{src/cmd/__tests__ => __tests__/__unit__/cmd}/help/WebHelpGenerator.unit.test.ts (93%) rename packages/imperative/{src/cmd/__tests__ => __tests__/__unit__/cmd}/help/WebHelpManager.unit.test.ts (93%) rename packages/imperative/{src/cmd/__tests__ => __tests__/__unit__/cmd}/help/__snapshots__/AbstractHelpGenerator.unit.test.ts.snap (100%) rename packages/imperative/{src/cmd/__tests__ => __tests__/__unit__/cmd}/help/__snapshots__/AbstractHelpGeneratorFactory.unit.test.ts.snap (100%) rename packages/imperative/{src/cmd/__tests__ => __tests__/__unit__/cmd}/help/__snapshots__/DefaultHelpGenerator.unit.test.ts.snap (100%) rename packages/imperative/{src/cmd/__tests__ => __tests__/__unit__/cmd}/help/model/InheritedHelpGenerator.ts (85%) rename packages/imperative/{src/cmd/__tests__ => __tests__/__unit__/cmd}/help/model/TestHelpGeneratorFactory.ts (75%) rename packages/imperative/{src/cmd/__tests__ => __tests__/__unit__/cmd}/process/CommandResponseDataProcess.ts (95%) rename packages/imperative/{src/cmd/__tests__ => __tests__/__unit__/cmd}/process/CommandResponseJsonFailedProcess.ts (94%) rename packages/imperative/{src/cmd/__tests__ => __tests__/__unit__/cmd}/process/CommandResponseJsonProcess.ts (95%) rename packages/imperative/{src/cmd/__tests__ => __tests__/__unit__/cmd}/process/CommandResponseProcess.ts (94%) rename packages/imperative/{src/cmd/__tests__ => __tests__/__unit__/cmd}/profiles/CliProfileManager.credentials.unit.test.ts (98%) rename packages/imperative/{src/cmd/__tests__ => __tests__/__unit__/cmd}/profiles/CliProfileManager.unit.test.ts (95%) rename packages/imperative/{src/cmd/__tests__ => __tests__/__unit__/cmd}/profiles/CommandProfileLoader.unit.test.ts (97%) rename packages/imperative/{src/cmd/__tests__ => __tests__/__unit__/cmd}/profiles/CommandProfiles.unit.test.ts (97%) rename packages/imperative/{src/cmd/__tests__ => __tests__/__unit__/cmd}/profiles/__snapshots__/CliProfileManager.credentials.unit.test.ts.snap (100%) rename packages/imperative/{src/cmd/__tests__ => __tests__/__unit__/cmd}/profiles/__snapshots__/CommandProfileLoader.unit.test.ts.snap (100%) rename packages/imperative/{src/cmd/__tests__ => __tests__/__unit__/cmd}/profiles/__snapshots__/CommandProfiles.unit.test.ts.snap (100%) rename packages/imperative/{src/cmd/__tests__ => __tests__/__unit__/cmd}/profiles/builders/CompleteProfilesGroupBuilder.unit.test.ts (81%) rename packages/imperative/{src/cmd/__tests__ => __tests__/__unit__/cmd}/profiles/builders/ProfileBuilderTestConstants.ts (90%) rename packages/imperative/{src/cmd/__tests__ => __tests__/__unit__/cmd}/profiles/builders/ProfilesCreateCommandBuilder.unit.test.ts (97%) rename packages/imperative/{src/cmd/__tests__ => __tests__/__unit__/cmd}/profiles/builders/ProfilesDeleteCommandBuilder.unit.test.ts (82%) rename packages/imperative/{src/cmd/__tests__ => __tests__/__unit__/cmd}/profiles/builders/ProfilesListCommandBuilder.unit.test.ts (89%) rename packages/imperative/{src/cmd/__tests__ => __tests__/__unit__/cmd}/profiles/builders/ProfilesSetCommandBuilder.unit.test.ts (89%) rename packages/imperative/{src/cmd/__tests__ => __tests__/__unit__/cmd}/profiles/builders/ProfilesShowDependenciesCommandBuilder.unit.test.ts (93%) rename packages/imperative/{src/cmd/__tests__ => __tests__/__unit__/cmd}/profiles/builders/ProfilesUpdateCommandBuilder.unit.test.ts (97%) rename packages/imperative/{src/cmd/__tests__ => __tests__/__unit__/cmd}/profiles/builders/ProfilesValidateCommandBuilder.unit.test.ts (82%) rename packages/imperative/{src/cmd/__tests__ => __tests__/__unit__/cmd}/profiles/builders/__snapshots__/CompleteProfilesGroupBuilder.unit.test.ts.snap (100%) rename packages/imperative/{src/cmd/__tests__ => __tests__/__unit__/cmd}/profiles/builders/__snapshots__/ProfilesCreateCommandBuilder.unit.test.ts.snap (100%) rename packages/imperative/{src/cmd/__tests__ => __tests__/__unit__/cmd}/profiles/builders/__snapshots__/ProfilesDeleteCommandBuilder.unit.test.ts.snap (100%) rename packages/imperative/{src/cmd/__tests__ => __tests__/__unit__/cmd}/profiles/builders/__snapshots__/ProfilesListCommandBuilder.unit.test.ts.snap (100%) rename packages/imperative/{src/cmd/__tests__ => __tests__/__unit__/cmd}/profiles/builders/__snapshots__/ProfilesSetCommandBuilder.unit.test.ts.snap (100%) rename packages/imperative/{src/cmd/__tests__ => __tests__/__unit__/cmd}/profiles/builders/__snapshots__/ProfilesShowDependenciesCommandBuilder.unit.test.ts.snap (100%) rename packages/imperative/{src/cmd/__tests__ => __tests__/__unit__/cmd}/profiles/builders/__snapshots__/ProfilesUpdateCommandBuilder.unit.test.ts.snap (100%) rename packages/imperative/{src/cmd/__tests__ => __tests__/__unit__/cmd}/profiles/builders/__snapshots__/ProfilesValidateCommandBuilder.unit.test.ts.snap (100%) rename packages/imperative/{src/cmd/__tests__ => __tests__/__unit__/cmd}/profiles/profileHandlers/AddTwoNumbersHandler.ts (89%) rename packages/imperative/{src/cmd/__tests__ => __tests__/__unit__/cmd}/profiles/profileHandlers/DoNothingHandler.ts (88%) rename packages/imperative/{src/cmd/__tests__ => __tests__/__unit__/cmd}/profiles/profileHandlers/ThrowErrorHandler.ts (87%) rename packages/imperative/{src/cmd/__tests__ => __tests__/__unit__/cmd}/response/CommandResponse.unit.test.ts (99%) rename packages/imperative/{src/cmd/__tests__ => __tests__/__unit__/cmd}/response/HandlerResponse.unit.test.ts (79%) rename packages/imperative/{src/cmd/__tests__ => __tests__/__unit__/cmd}/response/__snapshots__/CommandResponse.unit.test.ts.snap (100%) rename packages/imperative/{src/cmd/__tests__ => __tests__/__unit__/cmd}/utils/CommandUtils.unit.test.ts (92%) rename packages/imperative/{src/cmd/__tests__ => __tests__/__unit__/cmd}/utils/SharedOptions.unit.test.ts (91%) rename packages/imperative/{src/cmd/__tests__ => __tests__/__unit__/cmd}/utils/__snapshots__/CommandUtils.unit.test.ts.snap (100%) rename packages/imperative/{src/cmd/__tests__ => __tests__/__unit__/cmd}/utils/__snapshots__/SharedOptions.unit.test.ts.snap (100%) rename packages/imperative/{src/cmd/__tests__ => __tests__/__unit__/cmd}/yargs/YargsConfigurer.unit.test.ts (98%) rename packages/imperative/{src/cmd/__tests__ => __tests__/__unit__/cmd}/yargs/__snapshots__/YargsConfigurer.unit.test.ts.snap (100%) rename packages/imperative/{src/config/__tests__ => __tests__/__unit__/config}/Config.api.unit.test.ts (98%) rename packages/imperative/{src/config/__tests__ => __tests__/__unit__/config}/Config.secure.unit.test.ts (97%) rename packages/imperative/{src/config/__tests__ => __tests__/__unit__/config}/Config.unit.test.ts (99%) rename packages/imperative/{src/config/__tests__ => __tests__/__unit__/config}/ConfigAutoStore.unit.test.ts (99%) rename packages/imperative/{src/config/__tests__ => __tests__/__unit__/config}/ConfigBuilder.unit.test.ts (99%) rename packages/imperative/{src/config/__tests__ => __tests__/__unit__/config}/ConfigSchema.unit.test.ts (99%) rename packages/imperative/{src/config/__tests__ => __tests__/__unit__/config}/ConfigUtils.unit.test.ts (94%) rename packages/imperative/{src/config/__tests__ => __tests__/__unit__/config}/ProfInfoErr.unit.test.ts (98%) rename packages/imperative/{src/config/__tests__ => __tests__/__unit__/config}/ProfileCredentials.unit.test.ts (98%) rename packages/imperative/{src/config/__tests__ => __tests__/__unit__/config}/ProfileInfo.OldProfiles.unit.test.ts (98%) rename packages/imperative/{src/config/__tests__ => __tests__/__unit__/config}/ProfileInfo.TeamConfig.unit.test.ts (98%) rename packages/imperative/{src/config/__tests__ => __tests__/__unit__/config}/__resources__/ProfInfoApp_home/profiles/base/base_apiml.yaml (100%) rename packages/imperative/{src/config/__tests__ => __tests__/__unit__/config}/__resources__/ProfInfoApp_home/profiles/base/base_for_userNm.yaml (100%) rename packages/imperative/{src/config/__tests__ => __tests__/__unit__/config}/__resources__/ProfInfoApp_home/profiles/base/base_meta.yaml (100%) rename packages/imperative/{src/config/__tests__ => __tests__/__unit__/config}/__resources__/ProfInfoApp_home/profiles/missing/missing_meta.yaml (100%) rename packages/imperative/{src/config/__tests__ => __tests__/__unit__/config}/__resources__/ProfInfoApp_home/profiles/tso/tsoProfName.yaml (100%) rename packages/imperative/{src/config/__tests__ => __tests__/__unit__/config}/__resources__/ProfInfoApp_home/profiles/tso/tso_meta.yaml (100%) rename packages/imperative/{src/config/__tests__ => __tests__/__unit__/config}/__resources__/ProfInfoApp_home/profiles/zosmf/lpar1_zosmf.yaml (100%) rename packages/imperative/{src/config/__tests__ => __tests__/__unit__/config}/__resources__/ProfInfoApp_home/profiles/zosmf/lpar2_zosmf.yaml (100%) rename packages/imperative/{src/config/__tests__ => __tests__/__unit__/config}/__resources__/ProfInfoApp_home/profiles/zosmf/lpar3_zosmf.yaml (100%) rename packages/imperative/{src/config/__tests__ => __tests__/__unit__/config}/__resources__/ProfInfoApp_home/profiles/zosmf/lpar4_zosmf.yaml (100%) rename packages/imperative/{src/config/__tests__ => __tests__/__unit__/config}/__resources__/ProfInfoApp_home/profiles/zosmf/lpar5_zosmf.yaml (100%) rename packages/imperative/{src/config/__tests__ => __tests__/__unit__/config}/__resources__/ProfInfoApp_home/profiles/zosmf/zosmf_meta.yaml (100%) rename packages/imperative/{src/config/__tests__ => __tests__/__unit__/config}/__resources__/ProfInfoApp_home_team_config_proj/ProfInfoApp.config.json (100%) rename packages/imperative/{src/config/__tests__ => __tests__/__unit__/config}/__resources__/ProfInfoApp_home_team_config_proj/ProfInfoApp.schema.json (100%) rename packages/imperative/{src/config/__tests__ => __tests__/__unit__/config}/__resources__/ProfInfoApp_home_three/profiles/base/base_meta.yaml (100%) rename packages/imperative/{src/config/__tests__ => __tests__/__unit__/config}/__resources__/ProfInfoApp_home_three/profiles/tso/tso_meta.yaml (100%) rename packages/imperative/{src/config/__tests__ => __tests__/__unit__/config}/__resources__/ProfInfoApp_home_three/profiles/zosmf/zosmf_meta.yaml (100%) rename packages/imperative/{src/config/__tests__ => __tests__/__unit__/config}/__resources__/ProfInfoApp_home_two/profiles/base/base_apiml.yaml (100%) rename packages/imperative/{src/config/__tests__ => __tests__/__unit__/config}/__resources__/ProfInfoApp_home_two/profiles/base/base_for_userNm.yaml (100%) rename packages/imperative/{src/config/__tests__ => __tests__/__unit__/config}/__resources__/ProfInfoApp_home_two/profiles/base/base_meta.yaml (100%) rename packages/imperative/{src/config/__tests__ => __tests__/__unit__/config}/__resources__/ProfInfoApp_home_two/profiles/tso/tsoProfName.yaml (100%) rename packages/imperative/{src/config/__tests__ => __tests__/__unit__/config}/__resources__/ProfInfoApp_home_two/profiles/tso/tso_meta.yaml (100%) rename packages/imperative/{src/config/__tests__ => __tests__/__unit__/config}/__resources__/ProfInfoApp_home_two/profiles/zosmf/lpar1_zosmf.yaml (100%) rename packages/imperative/{src/config/__tests__ => __tests__/__unit__/config}/__resources__/ProfInfoApp_home_two/profiles/zosmf/lpar2_zosmf.yaml (100%) rename packages/imperative/{src/config/__tests__ => __tests__/__unit__/config}/__resources__/ProfInfoApp_home_two/profiles/zosmf/lpar3_zosmf.yaml (100%) rename packages/imperative/{src/config/__tests__ => __tests__/__unit__/config}/__resources__/ProfInfoApp_home_two/profiles/zosmf/lpar4_zosmf.yaml (100%) rename packages/imperative/{src/config/__tests__ => __tests__/__unit__/config}/__resources__/ProfInfoApp_home_two/profiles/zosmf/lpar5_zosmf.yaml (100%) rename packages/imperative/{src/config/__tests__ => __tests__/__unit__/config}/__resources__/ProfInfoApp_home_two/profiles/zosmf/zosmf_meta.yaml (100%) rename packages/imperative/{src/config/__tests__ => __tests__/__unit__/config}/__resources__/ProfInfoApp_large_team_config_proj/ProfInfoApp.config.json (100%) rename packages/imperative/{src/config/__tests__ => __tests__/__unit__/config}/__resources__/ProfInfoApp_nested_team_config_proj/ProfInfoApp.config.json (100%) rename packages/imperative/{src/config/__tests__ => __tests__/__unit__/config}/__resources__/ProfInfoApp_nested_team_config_proj/ProfInfoApp.schema.json (100%) rename packages/imperative/{src/config/__tests__ => __tests__/__unit__/config}/__resources__/ProfInfoApp_team_config_proj/ProfInfoApp.config.json (100%) rename packages/imperative/{src/config/__tests__ => __tests__/__unit__/config}/__resources__/ProfInfoApp_team_config_proj/ProfInfoApp.schema.json (100%) rename packages/imperative/{src/config/__tests__ => __tests__/__unit__/config}/__resources__/ProfInfoApp_user_and_team_config_proj/ProfInfoApp.config.json (100%) rename packages/imperative/{src/config/__tests__ => __tests__/__unit__/config}/__resources__/ProfInfoApp_user_and_team_config_proj/ProfInfoApp.config.user.json (100%) rename packages/imperative/{src/config/__tests__ => __tests__/__unit__/config}/__resources__/ProfInfoApp_user_and_team_config_proj/ProfInfoApp.schema.json (100%) rename packages/imperative/{src/config/__tests__ => __tests__/__unit__/config}/__resources__/ProfInfoApp_user_and_team_config_proj/ProfInfoApp_user.schema.json (100%) rename packages/imperative/{src/config/__tests__ => __tests__/__unit__/config}/__resources__/badproject.config.json (100%) rename packages/imperative/{src/config/__tests__ => __tests__/__unit__/config}/__resources__/commented-project.config.user.json (100%) rename packages/imperative/{src/config/__tests__ => __tests__/__unit__/config}/__resources__/my_app.config.json (100%) rename packages/imperative/{src/config/__tests__ => __tests__/__unit__/config}/__resources__/my_app.config.user.json (100%) rename packages/imperative/{src/config/__tests__ => __tests__/__unit__/config}/__resources__/my_app.schema.json (100%) rename packages/imperative/{src/config/__tests__ => __tests__/__unit__/config}/__resources__/project.config.json (100%) rename packages/imperative/{src/config/__tests__ => __tests__/__unit__/config}/__resources__/project.config.user.json (100%) rename packages/imperative/{src/config/__tests__ => __tests__/__unit__/config}/__snapshots__/Config.api.unit.test.ts.snap (100%) rename packages/imperative/{src/config/__tests__ => __tests__/__unit__/config}/__snapshots__/Config.secure.unit.test.ts.snap (100%) rename packages/imperative/{src/config/__tests__ => __tests__/__unit__/config}/__snapshots__/Config.unit.test.ts.snap (100%) rename packages/imperative/{src/config/__tests__ => __tests__/__unit__/config}/__snapshots__/ConfigSchema.unit.test.ts.snap (100%) rename packages/imperative/{src/console/__tests__ => __tests__/__unit__/console}/Console.unit.test.ts (98%) rename packages/imperative/{src/error/__tests__ => __tests__/__unit__/error}/ImperativeError.unit.test.ts (91%) rename packages/imperative/{src/expect/__tests__ => __tests__/__unit__/expect}/ImperativeExpect.unit.test.ts (98%) rename packages/imperative/{src/expect/__tests__ => __tests__/__unit__/expect}/__snapshots__/ImperativeExpect.unit.test.ts.snap (100%) rename packages/imperative/{src/imperative/__tests__ => __tests__/__unit__/imperative}/ConfigValidator.unit.test.ts (100%) rename packages/imperative/{src/imperative/__tests__ => __tests__/__unit__/imperative}/ConfigurationLoader.unit.test.ts (100%) rename packages/imperative/{src/imperative/__tests__ => __tests__/__unit__/imperative}/DefinitionTreeResolver.unit.test.ts (100%) rename packages/imperative/{src/imperative/__tests__ => __tests__/__unit__/imperative}/Imperative.unit.test.ts (99%) rename packages/imperative/{src/imperative/__tests__ => __tests__/__unit__/imperative}/LoggingConfigurer.unit.test.ts (100%) rename packages/imperative/{src/imperative/__tests__ => __tests__/__unit__/imperative}/OverridesLoader.unit.test.ts (99%) rename packages/imperative/{src/imperative/__tests__ => __tests__/__unit__/imperative}/__model__/Sample.configuration.ts (88%) rename packages/imperative/{src/imperative/__tests__ => __tests__/__unit__/imperative}/__model__/Sample.definition.ts (92%) rename packages/imperative/{src/imperative/__tests__ => __tests__/__unit__/imperative}/__snapshots__/DefinitionTreeResolver.unit.test.ts.snap (100%) rename packages/imperative/{src/imperative/__tests__ => __tests__/__unit__/imperative}/__snapshots__/LoggingConfigurer.unit.test.ts.snap (100%) rename packages/imperative/{src/imperative/__tests__ => __tests__/__unit__/imperative}/config/cmd/auto-init/AutoInitCommandBuilder.unit.test.ts (84%) rename packages/imperative/{src/imperative/__tests__ => __tests__/__unit__/imperative}/config/cmd/auto-init/BaseAutoInitHandler.unit.test.ts (97%) rename packages/imperative/{src/imperative/__tests__ => __tests__/__unit__/imperative}/config/cmd/auto-init/CompleteAutoInitCommandBuilder.unit.test.ts (73%) rename packages/imperative/{src/imperative/__tests__ => __tests__/__unit__/imperative}/config/cmd/auto-init/__data__/FakeAutoInitHandler.ts (79%) rename packages/imperative/{src/imperative/__tests__ => __tests__/__unit__/imperative}/config/cmd/auto-init/__data__/SampleAutoInitConfig.ts (88%) rename packages/imperative/{src/imperative/__tests__ => __tests__/__unit__/imperative}/config/cmd/auto-init/__snapshots__/CompleteAutoInitCommandBuilder.unit.test.ts.snap (100%) rename packages/imperative/{src/imperative/__tests__ => __tests__/__unit__/imperative}/config/cmd/convert-profiles/convert-profiles.handler.unit.test.ts (98%) rename packages/imperative/{src/imperative/__tests__ => __tests__/__unit__/imperative}/config/cmd/edit/edit.handler.unit.test.ts (89%) rename packages/imperative/{src/imperative/__tests__ => __tests__/__unit__/imperative}/config/cmd/import/import.handler.unit.test.ts (97%) rename packages/imperative/{src/imperative/__tests__ => __tests__/__unit__/imperative}/config/cmd/init/init.handler.unit.test.ts (98%) rename packages/imperative/{src/imperative/__tests__ => __tests__/__unit__/imperative}/config/cmd/list/list.handler.unit.test.ts (95%) rename packages/imperative/{src/imperative/__tests__ => __tests__/__unit__/imperative}/config/cmd/profiles/profiles.handler.unit.test.ts (89%) rename packages/imperative/{src/imperative/__tests__ => __tests__/__unit__/imperative}/config/cmd/report-env/EnvQuery.unit.test.ts (97%) rename packages/imperative/{src/imperative/__tests__ => __tests__/__unit__/imperative}/config/cmd/report-env/Report-env.handler.unit.test.ts (92%) rename packages/imperative/{src/imperative/__tests__ => __tests__/__unit__/imperative}/config/cmd/schema/schema.handler.unit.test.ts (90%) rename packages/imperative/{src/imperative/__tests__ => __tests__/__unit__/imperative}/config/cmd/secure/secure.handler.unit.test.ts (98%) rename packages/imperative/{src/imperative/__tests__ => __tests__/__unit__/imperative}/config/cmd/set/set.handler.unit.test.ts (98%) rename packages/imperative/{src/imperative/__tests__ => __tests__/__unit__/imperative}/config/cmd/update-schema/updateSchema.handler.unit.test.ts (90%) rename packages/imperative/{src/imperative/__tests__ => __tests__/__unit__/imperative}/env/EnvironmentalVariableSettings.unit.test.ts (93%) rename packages/imperative/{src/imperative/__tests__ => __tests__/__unit__/imperative}/handlers/DefaultRootCommandHandler.unit.test.ts (93%) rename packages/imperative/{src/imperative/__tests__ => __tests__/__unit__/imperative}/handlers/__snapshots__/DefaultRootCommandHandler.unit.test.ts.snap (100%) rename packages/imperative/{src/imperative/__tests__ => __tests__/__unit__/imperative}/plugins/AbstractPluginLifeCycle.unit.test.ts (100%) rename packages/imperative/{src/imperative/__tests__ => __tests__/__unit__/imperative}/plugins/PluginManagementFacility.unit.test.ts (99%) rename packages/imperative/{src/imperative/__tests__ => __tests__/__unit__/imperative}/plugins/PluginRequireProvider.unit.test.ts (99%) rename packages/imperative/{src/imperative/__tests__ => __tests__/__unit__/imperative}/plugins/__resources__/baseCliConfig.testData.ts (100%) rename packages/imperative/{src/imperative/__tests__ => __tests__/__unit__/imperative}/plugins/__resources__/impCmdTree.testData.js (100%) rename packages/imperative/{src/imperative/__tests__ => __tests__/__unit__/imperative}/plugins/__resources__/mockConfigModule.ts (100%) rename packages/imperative/{src/imperative/__tests__ => __tests__/__unit__/imperative}/plugins/cmd/firststeps/showfirststeps.handler.unit.test.ts (92%) rename packages/imperative/{src/imperative/__tests__ => __tests__/__unit__/imperative}/plugins/cmd/install/install.handler.unit.test.ts (89%) rename packages/imperative/{src/imperative/__tests__ => __tests__/__unit__/imperative}/plugins/cmd/list/__snapshots__/list.handler.unit.test.ts.snap (100%) rename packages/imperative/{src/imperative/__tests__ => __tests__/__unit__/imperative}/plugins/cmd/list/list.handler.unit.test.ts (100%) rename packages/imperative/{src/imperative/__tests__ => __tests__/__unit__/imperative}/plugins/cmd/uninstall/uninstall.handler.unit.test.ts (100%) rename packages/imperative/{src/imperative/__tests__ => __tests__/__unit__/imperative}/plugins/cmd/update/update.handler.unit.test.ts (100%) rename packages/imperative/{src/imperative/__tests__ => __tests__/__unit__/imperative}/plugins/cmd/validate/validate.handler.unit.test.ts (99%) rename packages/imperative/{src/imperative/__tests__ => __tests__/__unit__/imperative}/plugins/utilities/NpmFunctions.unit.test.ts (100%) rename packages/imperative/{src/imperative/__tests__ => __tests__/__unit__/imperative}/plugins/utilities/PMFConstants.unit.test.ts (95%) rename packages/imperative/{src/imperative/__tests__ => __tests__/__unit__/imperative}/plugins/utilities/PluginIssues.unit.test.ts (100%) rename packages/imperative/{src/imperative/__tests__ => __tests__/__unit__/imperative}/plugins/utilities/npm-interface/install.unit.test.ts (100%) rename packages/imperative/{src/imperative/__tests__ => __tests__/__unit__/imperative}/plugins/utilities/npm-interface/uninstall.unit.test.ts (100%) rename packages/imperative/{src/imperative/__tests__ => __tests__/__unit__/imperative}/plugins/utilities/npm-interface/update.unit.test.ts (100%) rename packages/imperative/{src/imperative/__tests__ => __tests__/__unit__/imperative}/plugins/utilities/runValidatePlugin.unit.test.ts (100%) rename packages/imperative/{src/imperative/__tests__ => __tests__/__unit__/imperative}/profiles/handlers/CreateProfilesHandler.unit.test.ts (98%) rename packages/imperative/{src/imperative/__tests__ => __tests__/__unit__/imperative}/profiles/handlers/ListProfilesHandler.unit.test.ts (99%) rename packages/imperative/{src/imperative/__tests__ => __tests__/__unit__/imperative}/profiles/handlers/NewDeleteProfilesHandler.unit.test.ts (98%) rename packages/imperative/{src/imperative/__tests__ => __tests__/__unit__/imperative}/profiles/handlers/UpdateProfilesHandler.unit.test.ts (98%) rename packages/imperative/{src/imperative/__tests__ => __tests__/__unit__/imperative}/profiles/handlers/ValidateProfileHandler.unit.test.ts (99%) rename packages/imperative/{src/imperative/__tests__ => __tests__/__unit__/imperative}/profiles/handlers/__snapshots__/ListProfilesHandler.unit.test.ts.snap (100%) rename packages/imperative/{src/io/__tests__ => __tests__/__unit__/io}/IO.unit.test.ts (98%) rename packages/imperative/{src/io/__tests__ => __tests__/__unit__/io}/__snapshots__/IO.unit.test.ts.snap (100%) rename packages/imperative/{src/logger/__tests__ => __tests__/__unit__/logger}/Logger.unit.test.ts (97%) rename packages/imperative/{src/logger/__tests__ => __tests__/__unit__/logger}/LoggerConfigBuilder.unit.test.ts (98%) rename packages/imperative/{src/logger/__tests__ => __tests__/__unit__/logger}/LoggerUtils.unit.test.ts (95%) rename packages/imperative/{src/logger/__tests__ => __tests__/__unit__/logger}/__snapshots__/Logger.unit.test.ts.snap (100%) rename packages/imperative/{src/logger/__tests__ => __tests__/__unit__/logger}/__snapshots__/LoggerConfigBuilder.unit.test.ts.snap (100%) rename packages/imperative/{src/profiles/__tests__ => __tests__/__unit__/profiles}/BasicProfileManager.constructor.unit.test.ts (96%) rename packages/imperative/{src/profiles/__tests__ => __tests__/__unit__/profiles}/BasicProfileManager.delete.unit.test.ts (97%) rename packages/imperative/{src/profiles/__tests__ => __tests__/__unit__/profiles}/BasicProfileManager.load.unit.test.ts (99%) rename packages/imperative/{src/profiles/__tests__ => __tests__/__unit__/profiles}/BasicProfileManager.merge.unit.test.ts (99%) rename packages/imperative/{src/profiles/__tests__ => __tests__/__unit__/profiles}/BasicProfileManager.save.unit.test.ts (98%) rename packages/imperative/{src/profiles/__tests__ => __tests__/__unit__/profiles}/BasicProfileManager.unit.test.ts (98%) rename packages/imperative/{src/profiles/__tests__ => __tests__/__unit__/profiles}/BasicProfileManager.update.unit.test.ts (93%) rename packages/imperative/{src/profiles/__tests__ => __tests__/__unit__/profiles}/BasicProfileManager.validate.unit.test.ts (98%) rename packages/imperative/{src/profiles/__tests__ => __tests__/__unit__/profiles}/TestConstants.ts (100%) rename packages/imperative/{src/profiles/__tests__ => __tests__/__unit__/profiles}/__snapshots__/BasicProfileManager.constructor.unit.test.ts.snap (100%) rename packages/imperative/{src/profiles/__tests__ => __tests__/__unit__/profiles}/__snapshots__/BasicProfileManager.delete.unit.test.ts.snap (100%) rename packages/imperative/{src/profiles/__tests__ => __tests__/__unit__/profiles}/__snapshots__/BasicProfileManager.load.unit.test.ts.snap (100%) rename packages/imperative/{src/profiles/__tests__ => __tests__/__unit__/profiles}/__snapshots__/BasicProfileManager.save.unit.test.ts.snap (100%) rename packages/imperative/{src/profiles/__tests__ => __tests__/__unit__/profiles}/__snapshots__/BasicProfileManager.unit.test.ts.snap (100%) rename packages/imperative/{src/profiles/__tests__ => __tests__/__unit__/profiles}/__snapshots__/BasicProfileManager.update.unit.test.ts.snap (100%) rename packages/imperative/{src/profiles/__tests__ => __tests__/__unit__/profiles}/__snapshots__/BasicProfileManager.validate.unit.test.ts.snap (100%) rename packages/imperative/{src/rest/__tests__ => __tests__/__unit__/rest}/client/AbstractRestClient.unit.test.ts (98%) rename packages/imperative/{src/rest/__tests__ => __tests__/__unit__/rest}/client/CompressionUtils.unit.test.ts (98%) rename packages/imperative/{src/rest/__tests__ => __tests__/__unit__/rest}/client/RestClient.unit.test.ts (95%) rename packages/imperative/{src/rest/__tests__ => __tests__/__unit__/rest}/client/RestClientError.unit.test.ts (91%) rename packages/imperative/{src/rest/__tests__ => __tests__/__unit__/rest}/client/RestStandAloneUtils.unit.test.ts (91%) rename packages/imperative/{src/rest/__tests__ => __tests__/__unit__/rest}/client/__model__/CustomRestClient.ts (100%) rename packages/imperative/{src/rest/__tests__ => __tests__/__unit__/rest}/client/__model__/CustomRestClientWithProcessError.ts (100%) rename packages/imperative/{src/rest/__tests__ => __tests__/__unit__/rest}/client/__model__/MockHttpRequestResponse.ts (100%) rename packages/imperative/{src/rest/__tests__ => __tests__/__unit__/rest}/client/__snapshots__/AbstractRestClient.unit.test.ts.snap (100%) rename packages/imperative/{src/rest/__tests__ => __tests__/__unit__/rest}/client/__snapshots__/RestClient.unit.test.ts.snap (100%) rename packages/imperative/{src/rest/__tests__ => __tests__/__unit__/rest}/client/__snapshots__/RestClientError.unit.test.ts.snap (100%) rename packages/imperative/{src/rest/__tests__ => __tests__/__unit__/rest}/session/ConnectionPropsForSessCfg.unit.test.ts (98%) rename packages/imperative/{src/rest/__tests__ => __tests__/__unit__/rest}/session/Session.unit.test.ts (99%) rename packages/imperative/{src/rest/__tests__ => __tests__/__unit__/rest}/session/__snapshots__/Session.unit.test.ts.snap (100%) rename packages/imperative/{src/security/__tests__ => __tests__/__unit__/security}/CredentialManagerFactory-testClasses/FailToExtend.ts (100%) rename packages/imperative/{src/security/__tests__ => __tests__/__unit__/security}/CredentialManagerFactory-testClasses/GoodCredentialManager.ts (99%) rename packages/imperative/{src/security/__tests__ => __tests__/__unit__/security}/CredentialManagerFactory.unit.test.ts (100%) rename packages/imperative/{src/security/__tests__ => __tests__/__unit__/security}/CredentialManagerOverride.unit.test.ts (98%) rename packages/imperative/{src/security/__tests__ => __tests__/__unit__/security}/DefaultCredentialManager.unit.test.ts (99%) rename packages/imperative/{src/security/__tests__ => __tests__/__unit__/security}/InvalidCredentialManager.unit.test.ts (93%) rename packages/imperative/{src/security/__tests__ => __tests__/__unit__/security}/abstract/AbstractCredentialManager.unit.test.ts (98%) rename packages/imperative/{src/security/__tests__ => __tests__/__unit__/security}/abstract/__snapshots__/AbstractCredentialManager.unit.test.ts.snap (100%) rename packages/imperative/{src/security/__tests__ => __tests__/__unit__/security}/doc/ICredentialManagerNameMap.unit.test.ts (100%) rename packages/imperative/{src/security/__tests__ => __tests__/__unit__/security}/errors/BadCredentialManagerError.unit.test.ts (93%) rename packages/imperative/{src/settings/__tests__ => __tests__/__unit__/settings}/AppSettings.unit.test.ts (97%) rename packages/imperative/{src/utilities/__tests__ => __tests__/__unit__/utilities}/CliUtils.unit.test.ts (99%) rename packages/imperative/{src/utilities/__tests__ => __tests__/__unit__/utilities}/DaemonRequest.unit.test.ts (92%) rename packages/imperative/{src/utilities/__tests__ => __tests__/__unit__/utilities}/EnvFileUtils.unit.test.ts (99%) rename packages/imperative/{src/utilities/__tests__ => __tests__/__unit__/utilities}/ExecUtils.unit.test.ts (97%) rename packages/imperative/{src/utilities/__tests__ => __tests__/__unit__/utilities}/ImperativeConfig.unit.test.ts (96%) rename packages/imperative/{src/utilities/__tests__ => __tests__/__unit__/utilities}/JSONUtils.unit.test.ts (97%) rename packages/imperative/{src/utilities/__tests__ => __tests__/__unit__/utilities}/JsUtils.unit.test.ts (96%) rename packages/imperative/{src/utilities/__tests__ => __tests__/__unit__/utilities}/ProcessUtils.unit.test.ts (98%) rename packages/imperative/{src/utilities/__tests__ => __tests__/__unit__/utilities}/TextUtils.unit.test.ts (98%) rename packages/imperative/{src/utilities/__tests__ => __tests__/__unit__/utilities}/__snapshots__/CliUtils.unit.test.ts.snap (100%) rename packages/imperative/{src/utilities/__tests__ => __tests__/__unit__/utilities}/__snapshots__/JSONUtils.unit.test.ts.snap (100%) rename packages/imperative/{src/utilities/__tests__ => __tests__/__unit__/utilities}/__snapshots__/TextUtils.unit.test.ts.snap (100%) rename packages/imperative/{src/utilities/__tests__ => __tests__/__unit__/utilities}/diff/DiffUtils.unit.test.ts (90%) rename packages/imperative/{src/utilities/__tests__ => __tests__/__unit__/utilities}/diff/WebDiffGenerator.unit.test.ts (87%) rename packages/imperative/{src/utilities/__tests__ => __tests__/__unit__/utilities}/diff/WebDiffManager.unit.test.ts (85%) rename packages/imperative/{src/utilities/__tests__ => __tests__/__unit__/utilities}/diff/__snapshots__/DiffUtils.unit.test.ts.snap (100%) rename packages/imperative/src/cmd/{src => }/ChainedHandlerUtils.ts (98%) rename packages/imperative/src/cmd/{src => }/CommandPreparer.ts (99%) rename packages/imperative/src/cmd/{src => }/CommandProcessor.ts (98%) rename packages/imperative/src/cmd/{src => }/builders/AbstractCommandBuilder.ts (100%) rename packages/imperative/src/cmd/{src => }/constants/OptionConstants.ts (100%) rename packages/imperative/src/cmd/{src => }/doc/ICommandDefinition.ts (98%) rename packages/imperative/src/cmd/{src => }/doc/ICommandDefinitionPassOn.ts (100%) rename packages/imperative/src/cmd/{src => }/doc/ICommandExampleDefinition.ts (100%) rename packages/imperative/src/cmd/{src => }/doc/IPartialCommandDefinition.ts (100%) rename packages/imperative/src/cmd/{src => }/doc/args/ICommandArguments.ts (100%) rename packages/imperative/src/cmd/{src => }/doc/handler/IChainedHandlerArgumentMapping.ts (100%) rename packages/imperative/src/cmd/{src => }/doc/handler/IChainedHandlerEntry.ts (100%) rename packages/imperative/src/cmd/{src => }/doc/handler/ICommandHandler.ts (100%) rename packages/imperative/src/cmd/{src => }/doc/handler/ICommandHandlerConstructor.ts (100%) rename packages/imperative/src/cmd/{src => }/doc/handler/ICommandHandlerRequire.ts (100%) rename packages/imperative/src/cmd/{src => }/doc/handler/ICommandHandlerResponseChecker.ts (100%) rename packages/imperative/src/cmd/{src => }/doc/handler/ICommandHandlerResponseValidator.ts (85%) rename packages/imperative/src/cmd/{src => }/doc/handler/IHandlerParameters.ts (100%) rename packages/imperative/src/cmd/{src => }/doc/option/ICommandOptionAllowableValues.ts (100%) rename packages/imperative/src/cmd/{src => }/doc/option/ICommandOptionDefinition.ts (100%) rename packages/imperative/src/cmd/{src => }/doc/option/ICommandOptionValueImplications.ts (100%) rename packages/imperative/src/cmd/{src => }/doc/option/ICommandPositionalDefinition.ts (100%) rename packages/imperative/src/cmd/{src => }/doc/parms/IInvokeCommandParms.ts (100%) rename packages/imperative/src/cmd/{src => }/doc/processor/ICommandProcessorParms.ts (90%) rename packages/imperative/src/cmd/{src => }/doc/profiles/definition/ICommandProfile.ts (100%) rename packages/imperative/src/cmd/{src => }/doc/profiles/definition/ICommandProfileAuthConfig.ts (100%) rename packages/imperative/src/cmd/{src => }/doc/profiles/definition/ICommandProfileAutoInitConfig.ts (100%) rename packages/imperative/src/cmd/{src => }/doc/profiles/definition/ICommandProfileProperty.ts (94%) rename packages/imperative/src/cmd/{src => }/doc/profiles/definition/ICommandProfileSchema.ts (94%) rename packages/imperative/src/cmd/{src => }/doc/profiles/definition/ICommandProfileTypeConfiguration.ts (100%) rename packages/imperative/src/cmd/{src => }/doc/profiles/parms/ICliLoadAllProfiles.ts (90%) rename packages/imperative/src/cmd/{src => }/doc/profiles/parms/ICliLoadProfile.ts (92%) rename packages/imperative/src/cmd/{src => }/doc/profiles/parms/ICommandLoadProfile.ts (100%) rename packages/imperative/src/cmd/{src => }/doc/profiles/parms/ICommandProfileLoaderParms.ts (92%) rename packages/imperative/src/cmd/{src => }/doc/response/api/handler/IHandlerFormatOutputApi.ts (80%) rename packages/imperative/src/cmd/{src => }/doc/response/api/handler/IHandlerProgressApi.ts (100%) rename packages/imperative/src/cmd/{src => }/doc/response/api/handler/IHandlerResponseApi.ts (100%) rename packages/imperative/src/cmd/{src => }/doc/response/api/handler/IHandlerResponseConsoleApi.ts (100%) rename packages/imperative/src/cmd/{src => }/doc/response/api/handler/IHandlerResponseDataApi.ts (100%) rename packages/imperative/src/cmd/{src => }/doc/response/api/handler/IPromptOptions.ts (100%) rename packages/imperative/src/cmd/{src => }/doc/response/api/processor/ICommandResponseApi.ts (97%) rename packages/imperative/src/cmd/{src => }/doc/response/parms/ICommandResponseParms.ts (100%) rename packages/imperative/src/cmd/{src => }/doc/response/parms/IProgressBarParms.ts (88%) rename packages/imperative/src/cmd/{src => }/doc/response/response/ICommandOutputFormat.ts (100%) rename packages/imperative/src/cmd/{src => }/doc/response/response/ICommandPrepared.ts (85%) rename packages/imperative/src/cmd/{src => }/doc/response/response/ICommandResponse.ts (97%) rename packages/imperative/src/cmd/{src => }/doc/response/response/ICommandValidatorError.ts (100%) rename packages/imperative/src/cmd/{src => }/doc/response/response/ICommandValidatorResponse.ts (100%) rename packages/imperative/src/cmd/{src => }/handlers/FailedCommandHandler.ts (92%) rename packages/imperative/src/cmd/{src => }/help/DefaultHelpGenerator.ts (98%) rename packages/imperative/src/cmd/{src => }/help/HelpConstants.ts (100%) rename packages/imperative/src/cmd/{src => }/help/HelpGeneratorFactory.ts (100%) rename packages/imperative/src/cmd/{src => }/help/WebHelpGenerator.ts (99%) rename packages/imperative/src/cmd/{src => }/help/WebHelpManager.ts (97%) rename packages/imperative/src/cmd/{src => }/help/abstract/AbstractHelpGenerator.ts (98%) rename packages/imperative/src/cmd/{src => }/help/abstract/AbstractHelpGeneratorFactory.ts (98%) rename packages/imperative/src/cmd/{src => }/help/doc/IHelpGenerator.ts (100%) rename packages/imperative/src/cmd/{src => }/help/doc/IHelpGeneratorFactory.ts (100%) rename packages/imperative/src/cmd/{src => }/help/doc/IHelpGeneratorFactoryParms.ts (100%) rename packages/imperative/src/cmd/{src => }/help/doc/IHelpGeneratorParms.ts (100%) rename packages/imperative/src/cmd/{src => }/help/doc/IWebHelpManager.ts (100%) rename packages/imperative/src/cmd/{src => }/help/doc/IWebHelpPackageMetadata.ts (100%) rename packages/imperative/src/cmd/{src => }/help/doc/IWebHelpTreeNode.ts (100%) rename packages/imperative/src/cmd/{src => }/profiles/CliProfileManager.ts (99%) rename packages/imperative/src/cmd/{src => }/profiles/CommandProfileLoader.ts (98%) rename packages/imperative/src/cmd/{src => }/profiles/CommandProfiles.ts (98%) rename packages/imperative/src/cmd/{src => }/response/CommandResponse.ts (98%) rename packages/imperative/src/cmd/{src => }/response/HandlerResponse.ts (100%) rename packages/imperative/src/cmd/{src => }/response/__mocks__/CommandResponse.ts (88%) rename packages/imperative/src/cmd/{src => }/response/__mocks__/HandlerResponse.ts (93%) rename packages/imperative/src/cmd/{src => }/syntax/SyntaxValidator.ts (99%) rename packages/imperative/src/cmd/{src => }/syntax/__mocks__/SyntaxValidator.ts (83%) rename packages/imperative/src/cmd/{src => }/syntax/__tests__/SyntaxValidator.unit.test.ts (98%) rename packages/imperative/src/cmd/{src => }/types/SecureOperationFunction.ts (100%) rename packages/imperative/src/cmd/{src => }/utils/CommandUtils.ts (99%) rename packages/imperative/src/cmd/{src => }/utils/SharedOptions.ts (96%) rename packages/imperative/src/cmd/{src => }/yargs/AbstractCommandYargs.ts (97%) rename packages/imperative/src/cmd/{src => }/yargs/CommandYargs.ts (97%) rename packages/imperative/src/cmd/{src => }/yargs/GroupCommandYargs.ts (99%) rename packages/imperative/src/cmd/{src => }/yargs/YargsConfigurer.ts (98%) rename packages/imperative/src/cmd/{src => }/yargs/YargsDefiner.ts (95%) rename packages/imperative/src/cmd/{src => }/yargs/doc/IYargsParms.ts (97%) rename packages/imperative/src/cmd/{src => }/yargs/doc/IYargsResponse.ts (91%) rename packages/imperative/src/config/{src => }/Config.ts (100%) rename packages/imperative/src/config/{src => }/ConfigAutoStore.ts (95%) rename packages/imperative/src/config/{src => }/ConfigBuilder.ts (98%) rename packages/imperative/src/config/{src => }/ConfigConstants.ts (100%) rename packages/imperative/src/config/{src => }/ConfigSchema.ts (98%) rename packages/imperative/src/config/{src => }/ConfigUtils.ts (92%) rename packages/imperative/src/config/{src => }/ProfInfoErr.ts (98%) rename packages/imperative/src/config/{src => }/ProfileCredentials.ts (97%) rename packages/imperative/src/config/{src => }/ProfileInfo.ts (99%) rename packages/imperative/src/config/{src => }/__mocks__/Config.ts (95%) rename packages/imperative/src/config/{src => }/api/ConfigApi.ts (100%) rename packages/imperative/src/config/{src => }/api/ConfigLayers.ts (99%) rename packages/imperative/src/config/{src => }/api/ConfigPlugins.ts (100%) rename packages/imperative/src/config/{src => }/api/ConfigProfiles.ts (100%) rename packages/imperative/src/config/{src => }/api/ConfigSecure.ts (99%) rename packages/imperative/src/config/{src => }/api/index.ts (100%) rename packages/imperative/src/config/{src => }/doc/IConfig.ts (100%) rename packages/imperative/src/config/{src => }/doc/IConfigAutoStoreOpts.ts (93%) rename packages/imperative/src/config/{src => }/doc/IConfigBuilderOpts.ts (94%) rename packages/imperative/src/config/{src => }/doc/IConfigConvertResult.ts (100%) rename packages/imperative/src/config/{src => }/doc/IConfigLayer.ts (100%) rename packages/imperative/src/config/{src => }/doc/IConfigMergeOpts.ts (100%) rename packages/imperative/src/config/{src => }/doc/IConfigOpts.ts (100%) rename packages/imperative/src/config/{src => }/doc/IConfigProfile.ts (100%) rename packages/imperative/src/config/{src => }/doc/IConfigSchema.ts (100%) rename packages/imperative/src/config/{src => }/doc/IConfigSecure.ts (100%) rename packages/imperative/src/config/{src => }/doc/IConfigVault.ts (100%) rename packages/imperative/src/config/{src => }/doc/IProfArgAttrs.ts (100%) rename packages/imperative/src/config/{src => }/doc/IProfAttrs.ts (100%) rename packages/imperative/src/config/{src => }/doc/IProfInfoErrParms.ts (91%) rename packages/imperative/src/config/{src => }/doc/IProfInfoProps.ts (100%) rename packages/imperative/src/config/{src => }/doc/IProfInfoRemoveKnownPropOpts.ts (100%) rename packages/imperative/src/config/{src => }/doc/IProfInfoUpdatePropOpts.ts (100%) rename packages/imperative/src/config/{src => }/doc/IProfLoc.ts (100%) rename packages/imperative/src/config/{src => }/doc/IProfMergeArgOpts.ts (100%) rename packages/imperative/src/config/{src => }/doc/IProfMergedArg.ts (100%) rename packages/imperative/src/config/{src => }/doc/IProfOpts.ts (94%) rename packages/imperative/src/console/{src => }/Console.ts (98%) rename packages/imperative/src/console/{src => }/doc/IConsole.ts (100%) rename packages/imperative/src/constants/{src => }/Constants.ts (100%) rename packages/imperative/src/error/{src => }/ImperativeError.ts (100%) rename packages/imperative/src/error/{src => }/doc/IImperativeError.ts (100%) rename packages/imperative/src/error/{src => }/doc/IImperativeErrorParms.ts (96%) rename packages/imperative/src/expect/{src => }/ImperativeExpect.ts (99%) rename packages/imperative/src/imperative/{src => }/ConfigurationLoader.ts (100%) rename packages/imperative/src/imperative/{src => }/ConfigurationValidator.ts (100%) rename packages/imperative/src/imperative/{src => }/DefinitionTreeResolver.ts (100%) rename packages/imperative/src/imperative/{src => }/Imperative.ts (99%) rename packages/imperative/src/imperative/{src => }/LoggingConfigurer.ts (100%) rename packages/imperative/src/imperative/{src => }/OverridesLoader.ts (100%) rename packages/imperative/src/imperative/{src => }/UpdateImpConfig.ts (100%) rename packages/imperative/src/imperative/{src => }/__mocks__/Imperative.ts (96%) rename packages/imperative/src/imperative/{src => }/__mocks__/LoggingConfigurer.ts (91%) rename packages/imperative/src/imperative/{src => }/api/ImperativeApi.ts (94%) rename packages/imperative/src/imperative/{src => }/api/doc/IImperativeApi.ts (89%) rename packages/imperative/src/imperative/{src => }/auth/__tests__/AuthLoginCommandBuilder.unit.test.ts (89%) rename packages/imperative/src/imperative/{src => }/auth/__tests__/AuthLogoutCommandBuilder.unit.test.ts (89%) rename packages/imperative/src/imperative/{src => }/auth/__tests__/BaseAuthHandler.config.unit.test.ts (98%) rename packages/imperative/src/imperative/{src => }/auth/__tests__/BaseAuthHandler.unit.test.ts (98%) rename packages/imperative/src/imperative/{src => }/auth/__tests__/CompleteAuthGroupBuilder.unit.test.ts (90%) rename packages/imperative/src/imperative/{src => }/auth/__tests__/__data__/FakeAuthHandler.ts (100%) rename packages/imperative/src/imperative/{src => }/auth/__tests__/__data__/SampleAuthConfig.ts (100%) rename packages/imperative/src/imperative/{src => }/auth/__tests__/__resources__/auth.config.json (100%) rename packages/imperative/src/imperative/{src => }/auth/__tests__/__resources__/no_auth.config.json (100%) rename packages/imperative/src/imperative/{src => }/auth/__tests__/__snapshots__/CompleteAuthGroupBuilder.unit.test.ts.snap (100%) rename packages/imperative/src/imperative/{src => }/auth/builders/AuthCommandBuilder.ts (88%) rename packages/imperative/src/imperative/{src => }/auth/builders/AuthLoginCommandBuilder.ts (92%) rename packages/imperative/src/imperative/{src => }/auth/builders/AuthLogoutCommandBuilder.ts (89%) rename packages/imperative/src/imperative/{src => }/auth/builders/CompleteAuthGroupBuilder.ts (92%) rename packages/imperative/src/imperative/{src => }/auth/doc/IAuthHandlerApi.ts (94%) rename packages/imperative/src/imperative/{src => }/auth/handlers/AbstractAuthHandler.ts (94%) rename packages/imperative/src/imperative/{src => }/auth/handlers/BaseAuthHandler.ts (98%) rename packages/imperative/src/imperative/{src => }/config/ConfigManagementFacility.ts (98%) rename packages/imperative/src/imperative/{src => }/config/__mocks__/ConfigManagementFacility.ts (100%) rename packages/imperative/src/imperative/{src => }/config/cmd/auto-init/AutoInitConstants.ts (98%) rename packages/imperative/src/imperative/{src => }/config/cmd/auto-init/builders/AutoInitCommandBuilder.ts (87%) rename packages/imperative/src/imperative/{src => }/config/cmd/auto-init/builders/CompleteAutoInitCommandBuilder.ts (86%) rename packages/imperative/src/imperative/{src => }/config/cmd/auto-init/handlers/BaseAutoInitHandler.ts (95%) rename packages/imperative/src/imperative/{src => }/config/cmd/convert-profiles/convert-profiles.definition.ts (91%) rename packages/imperative/src/imperative/{src => }/config/cmd/convert-profiles/convert-profiles.handler.ts (97%) rename packages/imperative/src/imperative/{src => }/config/cmd/edit/edit.definition.ts (96%) rename packages/imperative/src/imperative/{src => }/config/cmd/edit/edit.handler.ts (89%) rename packages/imperative/src/imperative/{src => }/config/cmd/import/import.definition.ts (97%) rename packages/imperative/src/imperative/{src => }/config/cmd/import/import.handler.ts (94%) rename packages/imperative/src/imperative/{src => }/config/cmd/init/init.definition.ts (96%) rename packages/imperative/src/imperative/{src => }/config/cmd/init/init.handler.ts (93%) rename packages/imperative/src/imperative/{src => }/config/cmd/list/list.definition.ts (97%) rename packages/imperative/src/imperative/{src => }/config/cmd/list/list.handler.ts (100%) rename packages/imperative/src/imperative/{src => }/config/cmd/profiles/profiles.definition.ts (100%) rename packages/imperative/src/imperative/{src => }/config/cmd/profiles/profiles.handler.ts (100%) rename packages/imperative/src/imperative/{src => }/config/cmd/report-env/EnvItems.ts (100%) rename packages/imperative/src/imperative/{src => }/config/cmd/report-env/EnvQuery.ts (100%) rename packages/imperative/src/imperative/{src => }/config/cmd/report-env/Report-env.definition.ts (100%) rename packages/imperative/src/imperative/{src => }/config/cmd/report-env/Report-env.handler.ts (100%) rename packages/imperative/src/imperative/{src => }/config/cmd/schema/schema.definition.ts (100%) rename packages/imperative/src/imperative/{src => }/config/cmd/schema/schema.handler.ts (100%) rename packages/imperative/src/imperative/{src => }/config/cmd/secure/secure.definition.ts (100%) rename packages/imperative/src/imperative/{src => }/config/cmd/secure/secure.handler.ts (100%) rename packages/imperative/src/imperative/{src => }/config/cmd/set/set.definition.ts (100%) rename packages/imperative/src/imperative/{src => }/config/cmd/set/set.handler.ts (100%) rename packages/imperative/src/imperative/{src => }/config/cmd/update-schemas/update-schemas.definition.ts (100%) rename packages/imperative/src/imperative/{src => }/config/cmd/update-schemas/update-schemas.handler.ts (95%) rename packages/imperative/src/imperative/{src => }/doc/IApimlSvcAttrs.ts (100%) rename packages/imperative/src/imperative/{src => }/doc/IDaemonContext.ts (100%) rename packages/imperative/src/imperative/{src => }/doc/IImperativeAuthGroupConfig.ts (100%) rename packages/imperative/src/imperative/{src => }/doc/IImperativeConfig.ts (100%) rename packages/imperative/src/imperative/{src => }/doc/IImperativeEnvironmentalVariableSetting.ts (100%) rename packages/imperative/src/imperative/{src => }/doc/IImperativeEnvironmentalVariableSettings.ts (100%) rename packages/imperative/src/imperative/{src => }/doc/IImperativeLoggingConfig.ts (100%) rename packages/imperative/src/imperative/{src => }/doc/IImperativeLogsConfig.ts (100%) rename packages/imperative/src/imperative/{src => }/doc/IImperativeOverrides.ts (100%) rename packages/imperative/src/imperative/{src => }/env/EnvironmentalVariableSettings.ts (100%) rename packages/imperative/src/imperative/{src => }/env/__mocks__/EnvironmentalVariableSettings.ts (100%) rename packages/imperative/src/imperative/{src => }/handlers/DefaultRootCommandHandler.ts (100%) rename packages/imperative/src/imperative/{src => }/help/ImperativeHelpGeneratorFactory.ts (100%) rename packages/imperative/src/imperative/{src => }/plugins/AbstractPluginLifeCycle.ts (100%) rename packages/imperative/src/imperative/{src => }/plugins/PluginManagementFacility.ts (100%) rename packages/imperative/src/imperative/{src => }/plugins/PluginRequireProvider.ts (100%) rename packages/imperative/src/imperative/{src => }/plugins/__mocks__/PluginManagementFacility.ts (100%) rename packages/imperative/src/imperative/{src => }/plugins/__mocks__/PluginRequireProvider.ts (100%) rename packages/imperative/src/imperative/{src => }/plugins/cmd/install/install.definition.ts (100%) rename packages/imperative/src/imperative/{src => }/plugins/cmd/install/install.handler.ts (100%) rename packages/imperative/src/imperative/{src => }/plugins/cmd/list/list.definition.ts (100%) rename packages/imperative/src/imperative/{src => }/plugins/cmd/list/list.handler.ts (100%) rename packages/imperative/src/imperative/{src => }/plugins/cmd/showfirststeps/showfirststeps.definition.ts (100%) rename packages/imperative/src/imperative/{src => }/plugins/cmd/showfirststeps/showfirststeps.handler.ts (100%) rename packages/imperative/src/imperative/{src => }/plugins/cmd/uninstall/uninstall.definition.ts (100%) rename packages/imperative/src/imperative/{src => }/plugins/cmd/uninstall/uninstall.handler.ts (100%) rename packages/imperative/src/imperative/{src => }/plugins/cmd/update/update.definition.ts (100%) rename packages/imperative/src/imperative/{src => }/plugins/cmd/update/update.handler.ts (100%) rename packages/imperative/src/imperative/{src => }/plugins/cmd/validate/validate.definition.ts (100%) rename packages/imperative/src/imperative/{src => }/plugins/cmd/validate/validate.handler.ts (100%) rename packages/imperative/src/imperative/{src => }/plugins/doc/IPluginCfgProps.ts (100%) rename packages/imperative/src/imperative/{src => }/plugins/doc/IPluginIssues.ts (100%) rename packages/imperative/src/imperative/{src => }/plugins/doc/IPluginJson.ts (100%) rename packages/imperative/src/imperative/{src => }/plugins/doc/IPluginJsonObject.ts (100%) rename packages/imperative/src/imperative/{src => }/plugins/doc/IPluginPeerDepends.ts (100%) rename packages/imperative/src/imperative/{src => }/plugins/errors/PluginRequireAlreadyCreatedError.ts (100%) rename packages/imperative/src/imperative/{src => }/plugins/errors/PluginRequireNotCreatedError.ts (100%) rename packages/imperative/src/imperative/{src => }/plugins/utilities/NpmFunctions.ts (100%) rename packages/imperative/src/imperative/{src => }/plugins/utilities/PMFConstants.ts (100%) rename packages/imperative/src/imperative/{src => }/plugins/utilities/PluginIssues.ts (100%) rename packages/imperative/src/imperative/{src => }/plugins/utilities/__mocks__/PMFConstants.ts (95%) rename packages/imperative/src/imperative/{src => }/plugins/utilities/npm-interface/index.ts (100%) rename packages/imperative/src/imperative/{src => }/plugins/utilities/npm-interface/install.ts (100%) rename packages/imperative/src/imperative/{src => }/plugins/utilities/npm-interface/uninstall.ts (100%) rename packages/imperative/src/imperative/{src => }/plugins/utilities/npm-interface/update.ts (100%) rename packages/imperative/src/imperative/{src => }/plugins/utilities/runValidatePlugin.ts (100%) rename packages/imperative/src/imperative/{src => }/profiles/ImperativeProfileManagerFactory.ts (100%) rename packages/imperative/src/imperative/{src => }/profiles/builders/CompleteProfilesGroupBuilder.ts (100%) rename packages/imperative/src/imperative/{src => }/profiles/builders/ProfilesCommandBuilder.ts (100%) rename packages/imperative/src/imperative/{src => }/profiles/builders/ProfilesCreateCommandBuilder.ts (100%) rename packages/imperative/src/imperative/{src => }/profiles/builders/ProfilesDeleteCommandBuilder.ts (100%) rename packages/imperative/src/imperative/{src => }/profiles/builders/ProfilesListCommandBuilder.ts (100%) rename packages/imperative/src/imperative/{src => }/profiles/builders/ProfilesSetCommandBuilder.ts (100%) rename packages/imperative/src/imperative/{src => }/profiles/builders/ProfilesShowDependenciesCommandBuilder.ts (100%) rename packages/imperative/src/imperative/{src => }/profiles/builders/ProfilesUpdateCommandBuilder.ts (100%) rename packages/imperative/src/imperative/{src => }/profiles/builders/ProfilesValidateCommandBuilder.ts (100%) rename packages/imperative/src/imperative/{src => }/profiles/handlers/CreateProfilesHandler.ts (100%) rename packages/imperative/src/imperative/{src => }/profiles/handlers/ListProfilesHandler.ts (100%) rename packages/imperative/src/imperative/{src => }/profiles/handlers/NewDeleteProfilesHandler.ts (100%) rename packages/imperative/src/imperative/{src => }/profiles/handlers/OldDeleteProfilesHandler.ts (100%) rename packages/imperative/src/imperative/{src => }/profiles/handlers/SetDefaultProfilesHandler.ts (100%) rename packages/imperative/src/imperative/{src => }/profiles/handlers/ShowDependenciesProfilesHandler.ts (100%) rename packages/imperative/src/imperative/{src => }/profiles/handlers/UpdateProfilesHandler.ts (100%) rename packages/imperative/src/imperative/{src => }/profiles/handlers/ValidateProfileHandler.ts (100%) rename packages/imperative/src/interfaces/{src => }/doc/IConstructor.ts (100%) rename packages/imperative/src/interfaces/{src => }/types/ImperativeReject.ts (90%) rename packages/imperative/src/io/{src => }/IO.ts (98%) rename packages/imperative/src/logger/{src => }/Logger.ts (98%) rename packages/imperative/src/logger/{src => }/LoggerConfigBuilder.ts (99%) rename packages/imperative/src/logger/{src => }/LoggerManager.ts (98%) rename packages/imperative/src/logger/{src => }/LoggerUtils.ts (92%) rename packages/imperative/src/logger/{src => }/__mocks__/Logger.ts (96%) rename packages/imperative/src/logger/{src => }/__mocks__/LoggerUtils.ts (100%) rename packages/imperative/src/logger/{src => }/doc/IConfigLogging.ts (100%) rename packages/imperative/src/logger/{src => }/doc/ILog4jsAppender.ts (100%) rename packages/imperative/src/logger/{src => }/doc/ILog4jsConfig.ts (100%) rename packages/imperative/src/logger/{src => }/doc/ILog4jsLayout.ts (100%) rename packages/imperative/src/logger/{src => }/doc/IQueuedMessage.ts (100%) rename packages/imperative/src/messages/{src => }/CoreMessages.ts (99%) rename packages/imperative/src/messages/{src => }/doc/IMessageDefinition.ts (100%) rename packages/imperative/src/operations/{src => }/Operation.ts (99%) rename packages/imperative/src/operations/{src => }/Operations.ts (99%) rename packages/imperative/src/operations/{src => }/TaskProgress.ts (100%) rename packages/imperative/src/operations/{src => }/TaskStage.ts (100%) delete mode 100644 packages/imperative/src/operations/__tests__/__integration__/Operations.integration.spec.ts delete mode 100644 packages/imperative/src/operations/__tests__/operation/TestOperations1.ts delete mode 100644 packages/imperative/src/operations/__tests__/operation/TestOperations2.ts delete mode 100644 packages/imperative/src/operations/__tests__/operation/TestOperations3.ts delete mode 100644 packages/imperative/src/operations/__tests__/operation/TestOperations4.ts delete mode 100644 packages/imperative/src/operations/__tests__/operation/TestOperations5.ts delete mode 100644 packages/imperative/src/operations/__tests__/operation/subops/TestSubOp1.ts delete mode 100644 packages/imperative/src/operations/__tests__/operation/subops/TestSubOp2.ts delete mode 100644 packages/imperative/src/operations/__tests__/operation/subops/TestSubOp4.ts delete mode 100644 packages/imperative/src/operations/__tests__/operation/subops/TestSubOp5.ts delete mode 100644 packages/imperative/src/operations/__tests__/operation/subops/TestSubOp6.ts delete mode 100644 packages/imperative/src/operations/__tests__/operation/subops/TestSubOpDiverge.ts delete mode 100644 packages/imperative/src/operations/__tests__/operation/subops/TestSubOpFail.ts delete mode 100644 packages/imperative/src/operations/__tests__/operation/subops/TestSubOpNoUndo.ts rename packages/imperative/src/operations/{src => }/doc/IOperationResult.ts (100%) rename packages/imperative/src/operations/{src => }/doc/ITaskWithStatus.ts (100%) rename packages/imperative/src/profiles/{src => }/BasicProfileManager.ts (99%) rename packages/imperative/src/profiles/{src => }/BasicProfileManagerFactory.ts (100%) rename packages/imperative/src/profiles/{src => }/abstract/AbstractProfileManager.ts (99%) rename packages/imperative/src/profiles/{src => }/abstract/AbstractProfileManagerFactory.ts (100%) rename packages/imperative/src/profiles/{src => }/constants/ProfilesConstants.ts (100%) rename packages/imperative/src/profiles/{src => }/doc/api/IProfileManagerFactory.ts (100%) rename packages/imperative/src/profiles/{src => }/doc/config/IProfileTypeConfiguration.ts (100%) rename packages/imperative/src/profiles/{src => }/doc/definition/IMetaProfile.ts (100%) rename packages/imperative/src/profiles/{src => }/doc/definition/IProfile.ts (100%) rename packages/imperative/src/profiles/{src => }/doc/definition/IProfileDependency.ts (100%) rename packages/imperative/src/profiles/{src => }/doc/definition/IProfileProperty.ts (100%) rename packages/imperative/src/profiles/{src => }/doc/definition/IProfileSchema.ts (100%) rename packages/imperative/src/profiles/{src => }/doc/definition/index.ts (100%) rename packages/imperative/src/profiles/{src => }/doc/index.ts (100%) rename packages/imperative/src/profiles/{src => }/doc/parms/IDeleteProfile.ts (100%) rename packages/imperative/src/profiles/{src => }/doc/parms/ILoadAllProfiles.ts (100%) rename packages/imperative/src/profiles/{src => }/doc/parms/ILoadProfile.ts (100%) rename packages/imperative/src/profiles/{src => }/doc/parms/IProfileManager.ts (98%) rename packages/imperative/src/profiles/{src => }/doc/parms/IProfileManagerInit.ts (100%) rename packages/imperative/src/profiles/{src => }/doc/parms/ISaveProfile.ts (100%) rename packages/imperative/src/profiles/{src => }/doc/parms/ISaveProfileFromCliArgs.ts (100%) rename packages/imperative/src/profiles/{src => }/doc/parms/ISetDefaultProfile.ts (100%) rename packages/imperative/src/profiles/{src => }/doc/parms/IUpdateProfile.ts (100%) rename packages/imperative/src/profiles/{src => }/doc/parms/IUpdateProfileFromCliArgs.ts (100%) rename packages/imperative/src/profiles/{src => }/doc/parms/IValidateProfile.ts (100%) rename packages/imperative/src/profiles/{src => }/doc/parms/IValidateProfileForCLI.ts (100%) rename packages/imperative/src/profiles/{src => }/doc/parms/IValidateProfileWithSchema.ts (100%) rename packages/imperative/src/profiles/{src => }/doc/parms/index.ts (100%) rename packages/imperative/src/profiles/{src => }/doc/response/IProfileDeleted.ts (100%) rename packages/imperative/src/profiles/{src => }/doc/response/IProfileInitialized.ts (100%) rename packages/imperative/src/profiles/{src => }/doc/response/IProfileLoaded.ts (100%) rename packages/imperative/src/profiles/{src => }/doc/response/IProfileSaved.ts (100%) rename packages/imperative/src/profiles/{src => }/doc/response/IProfileUpdated.ts (100%) rename packages/imperative/src/profiles/{src => }/doc/response/IProfileValidated.ts (100%) rename packages/imperative/src/profiles/{src => }/doc/response/index.ts (100%) rename packages/imperative/src/profiles/{src => }/utils/ProfileIO.ts (98%) rename packages/imperative/src/profiles/{src => }/utils/ProfileUtils.ts (100%) rename packages/imperative/src/profiles/{src => }/utils/__mocks__/ProfileIO.ts (100%) rename packages/imperative/src/profiles/{src => }/utils/__tests__/ProfileIO.unit.test.ts (98%) rename packages/imperative/src/profiles/{src => }/utils/__tests__/ProfileUtils.unit.test.ts (98%) rename packages/imperative/src/profiles/{src => }/utils/__tests__/__snapshots__/ProfileIO.unit.test.ts.snap (100%) rename packages/imperative/src/profiles/{src => }/utils/__tests__/__snapshots__/ProfileUtils.unit.test.ts.snap (100%) rename packages/imperative/src/profiles/{src => }/utils/index.ts (100%) rename packages/imperative/src/profiles/{src => }/validation/__tests__/ProfileValidation.unit.test.ts (99%) rename packages/imperative/src/profiles/{src => }/validation/api/ProfileValidator.ts (98%) rename packages/imperative/src/profiles/{src => }/validation/doc/IProfileValidationPlan.ts (100%) rename packages/imperative/src/profiles/{src => }/validation/doc/IProfileValidationReport.ts (100%) rename packages/imperative/src/profiles/{src => }/validation/doc/IProfileValidationTask.ts (100%) rename packages/imperative/src/profiles/{src => }/validation/doc/IProfileValidationTaskResult.ts (100%) rename packages/imperative/src/rest/{src => }/__mocks__/RestClient.ts (100%) rename packages/imperative/src/rest/{src => }/client/AbstractRestClient.ts (99%) rename packages/imperative/src/rest/{src => }/client/CompressionUtils.ts (98%) rename packages/imperative/src/rest/{src => }/client/Headers.ts (100%) rename packages/imperative/src/rest/{src => }/client/RestClient.ts (99%) rename packages/imperative/src/rest/{src => }/client/RestClientError.ts (89%) rename packages/imperative/src/rest/{src => }/client/RestConstants.ts (100%) rename packages/imperative/src/rest/{src => }/client/RestStandAloneUtils.ts (100%) rename packages/imperative/src/rest/{src => }/client/doc/IHTTPSOptions.ts (100%) rename packages/imperative/src/rest/{src => }/client/doc/IHeaderContent.ts (100%) rename packages/imperative/src/rest/{src => }/client/doc/IOptionsFullResponse.ts (97%) rename packages/imperative/src/rest/{src => }/client/doc/IRestClientError.ts (97%) rename packages/imperative/src/rest/{src => }/client/doc/IRestClientResponse.ts (97%) rename packages/imperative/src/rest/{src => }/client/doc/IRestOptions.ts (97%) rename packages/imperative/src/rest/{src => }/client/types/AbstractRestClientProperties.ts (100%) rename packages/imperative/src/rest/{src => }/client/types/HTTPVerb.ts (100%) rename packages/imperative/src/rest/{src => }/session/AbstractSession.ts (98%) rename packages/imperative/src/rest/{src => }/session/ConnectionPropsForSessCfg.ts (97%) rename packages/imperative/src/rest/{src => }/session/SessConstants.ts (100%) rename packages/imperative/src/rest/{src => }/session/Session.ts (100%) rename packages/imperative/src/rest/{src => }/session/doc/IOptionsForAddConnProps.ts (98%) rename packages/imperative/src/rest/{src => }/session/doc/IOverridePromptConnProps.ts (100%) rename packages/imperative/src/rest/{src => }/session/doc/ISession.ts (100%) rename packages/imperative/src/security/{src => }/CredentialManagerFactory.ts (99%) rename packages/imperative/src/security/{src => }/CredentialManagerOverride.ts (98%) rename packages/imperative/src/security/{src => }/DefaultCredentialManager.ts (99%) rename packages/imperative/src/security/{src => }/InvalidCredentialManager.ts (100%) rename packages/imperative/src/security/{src => }/__mocks__/DefaultCredentialManager.ts (100%) rename packages/imperative/src/security/{src => }/abstract/AbstractCredentialManager.ts (99%) rename packages/imperative/src/security/{src => }/doc/ICredentialManagerConstructor.ts (100%) rename packages/imperative/src/security/{src => }/doc/ICredentialManagerInit.ts (95%) rename packages/imperative/src/security/{src => }/doc/ICredentialManagerNameMap.ts (100%) rename packages/imperative/src/security/{src => }/errors/BadCredentialManagerError.ts (94%) rename packages/imperative/src/settings/{src => }/AppSettings.ts (97%) rename packages/imperative/src/settings/{src => }/__mocks__/AppSettings.ts (100%) rename packages/imperative/src/settings/{src => }/doc/ISettingsFile.ts (94%) rename packages/imperative/src/settings/{src => }/errors/SettingsAlreadyInitialized.ts (92%) rename packages/imperative/src/settings/{src => }/errors/SettingsNotInitialized.ts (93%) rename packages/imperative/src/settings/{src => }/errors/index.ts (100%) rename packages/imperative/src/settings/{src => }/persistance/ISettingsFilePersistence.ts (100%) rename packages/imperative/src/settings/{src => }/persistance/JSONSettingsFilePersistence.ts (100%) rename packages/imperative/src/utilities/{src => }/CliUtils.ts (98%) rename packages/imperative/src/utilities/{src => }/DaemonRequest.ts (100%) rename packages/imperative/src/utilities/{src => }/EnvFileUtils.ts (96%) rename packages/imperative/src/utilities/{src => }/ExecUtils.ts (99%) rename packages/imperative/src/utilities/{src => }/ImperativeConfig.ts (95%) rename packages/imperative/src/utilities/{src => }/JSONUtils.ts (97%) rename packages/imperative/src/utilities/{src => }/JsUtils.ts (100%) rename packages/imperative/src/utilities/{src => }/NextVerFeatures.ts (100%) rename packages/imperative/src/utilities/{src => }/ProcessUtils.ts (99%) rename packages/imperative/src/utilities/{src => }/TextUtils.ts (100%) rename packages/imperative/src/utilities/{src => }/__mocks__/ImperativeConfig.ts (93%) rename packages/imperative/src/utilities/{src => }/diff/DiffUtils.ts (100%) rename packages/imperative/src/utilities/{src => }/diff/WebDiffGenerator.ts (94%) rename packages/imperative/src/utilities/{src => }/diff/WebDiffManager.ts (95%) rename packages/imperative/src/utilities/{src => }/diff/doc/IDiffNameOptions.ts (100%) rename packages/imperative/src/utilities/{src => }/diff/doc/IDiffOptions.ts (100%) rename packages/imperative/src/utilities/{src => }/diff/doc/IWebDiffGenerator.ts (100%) rename packages/imperative/src/utilities/{src => }/diff/doc/IWebDiffManager.ts (100%) rename packages/imperative/src/utilities/{src => }/doc/IDaemonRequest.ts (100%) rename packages/imperative/src/utilities/{src => }/doc/IDaemonResponse.ts (100%) rename packages/imperative/src/utilities/{src => }/doc/IOptionFormat.ts (100%) rename packages/imperative/src/utilities/{src => }/doc/ISystemInfo.ts (100%) delete mode 100644 packages/imperative/tsconfig-tests.json diff --git a/packages/imperative/src/cmd/__tests__/ChainedHandlerUtils.unit.test.ts b/packages/imperative/__tests__/__unit__/cmd/ChainedHandlerUtils.unit.test.ts similarity index 98% rename from packages/imperative/src/cmd/__tests__/ChainedHandlerUtils.unit.test.ts rename to packages/imperative/__tests__/__unit__/cmd/ChainedHandlerUtils.unit.test.ts index f8f32f255b..d204ce64cf 100644 --- a/packages/imperative/src/cmd/__tests__/ChainedHandlerUtils.unit.test.ts +++ b/packages/imperative/__tests__/__unit__/cmd/ChainedHandlerUtils.unit.test.ts @@ -9,8 +9,8 @@ * */ -import { ChainedHandlerService } from "../src/ChainedHandlerUtils"; -import { IChainedHandlerEntry } from "../"; +import { ChainedHandlerService } from "../../../src/cmd/ChainedHandlerUtils"; +import { IChainedHandlerEntry } from "../../../"; import { TestLogger } from "../../../__tests__/src/TestLogger"; import * as yargs from "yargs"; diff --git a/packages/imperative/src/cmd/__tests__/CommandPreparer.unit.test.ts b/packages/imperative/__tests__/__unit__/cmd/CommandPreparer.unit.test.ts similarity index 99% rename from packages/imperative/src/cmd/__tests__/CommandPreparer.unit.test.ts rename to packages/imperative/__tests__/__unit__/cmd/CommandPreparer.unit.test.ts index 13345b0adf..2dd61fe879 100644 --- a/packages/imperative/src/cmd/__tests__/CommandPreparer.unit.test.ts +++ b/packages/imperative/__tests__/__unit__/cmd/CommandPreparer.unit.test.ts @@ -9,8 +9,8 @@ * */ -import { ICommandDefinition } from "../src/doc/ICommandDefinition"; -import { CommandPreparer } from "../src/CommandPreparer"; +import { ICommandDefinition } from "../../../src/cmd/doc/ICommandDefinition"; +import { CommandPreparer } from "../../../src/cmd/CommandPreparer"; import { TestLogger } from "../../../__tests__/src/TestLogger"; import { inspect } from "util"; import { diff --git a/packages/imperative/src/cmd/__tests__/CommandProcessor.unit.test.ts b/packages/imperative/__tests__/__unit__/cmd/CommandProcessor.unit.test.ts similarity index 98% rename from packages/imperative/src/cmd/__tests__/CommandProcessor.unit.test.ts rename to packages/imperative/__tests__/__unit__/cmd/CommandProcessor.unit.test.ts index b5b3e44b10..4867b70d38 100644 --- a/packages/imperative/src/cmd/__tests__/CommandProcessor.unit.test.ts +++ b/packages/imperative/__tests__/__unit__/cmd/CommandProcessor.unit.test.ts @@ -9,27 +9,27 @@ * */ -import { IInvokeCommandParms } from "../src/doc/parms/IInvokeCommandParms"; -import { ICommandDefinition } from "../src/doc/ICommandDefinition"; -import { CommandProcessor } from "../src/CommandProcessor"; -import { ICommandResponse } from "../src/doc/response/response/ICommandResponse"; -import { CommandResponse } from "../src/response/CommandResponse"; -import { IHelpGenerator } from "../src/help/doc/IHelpGenerator"; +import { IInvokeCommandParms } from "../../../src/cmd/doc/parms/IInvokeCommandParms"; +import { ICommandDefinition } from "../../../src/cmd/doc/ICommandDefinition"; +import { CommandProcessor } from "../../../src/cmd/CommandProcessor"; +import { ICommandResponse } from "../../../src/cmd/doc/response/response/ICommandResponse"; +import { CommandResponse } from "../../../src/cmd/response/CommandResponse"; +import { IHelpGenerator } from "../../../src/cmd/help/doc/IHelpGenerator"; import { BasicProfileManager, IProfileManagerFactory, IProfileTypeConfiguration } from "../../profiles"; -import { ImperativeError } from "../../error"; -import { ICommandValidatorResponse } from "../src/doc/response/response/ICommandValidatorResponse"; -import { SharedOptions } from "../src/utils/SharedOptions"; -import { CommandProfileLoader } from "../src/profiles/CommandProfileLoader"; -import { CliUtils } from "../../utilities/src/CliUtils"; -import { WebHelpManager } from "../src/help/WebHelpManager"; -import { ImperativeConfig } from "../../utilities/src/ImperativeConfig"; +import { ImperativeError } from "../../../src/error"; +import { ICommandValidatorResponse } from "../../../src/cmd/doc/response/response/ICommandValidatorResponse"; +import { SharedOptions } from "../../../src/cmd/utils/SharedOptions"; +import { CommandProfileLoader } from "../../../src/cmd/profiles/CommandProfileLoader"; +import { CliUtils } from "../../../src/utilities/CliUtils"; +import { WebHelpManager } from "../../../src/cmd/help/WebHelpManager"; +import { ImperativeConfig } from "../../../src/utilities/ImperativeConfig"; import { setupConfigToLoad } from "../../../__tests__/src/TestUtil"; -import { EnvFileUtils } from "../../utilities"; +import { EnvFileUtils } from "../../../src/utilities/EnvFileUtils"; import { join } from "path"; -jest.mock("../src/syntax/SyntaxValidator"); -jest.mock("../src/utils/SharedOptions"); -jest.mock("../../utilities/src/ImperativeConfig"); +jest.mock("../../../src/cmd/syntax/SyntaxValidator"); +jest.mock("../../../src/cmd/utils/SharedOptions"); +jest.mock("../../utilities/ImperativeConfig"); // Persist the original definitions of process.write const ORIGINAL_STDOUT_WRITE = process.stdout.write; diff --git a/packages/imperative/src/cmd/__tests__/__model__/TestArgHandler.ts b/packages/imperative/__tests__/__unit__/cmd/__model__/TestArgHandler.ts similarity index 75% rename from packages/imperative/src/cmd/__tests__/__model__/TestArgHandler.ts rename to packages/imperative/__tests__/__unit__/cmd/__model__/TestArgHandler.ts index 8f33e4b3fd..251fd3c37e 100644 --- a/packages/imperative/src/cmd/__tests__/__model__/TestArgHandler.ts +++ b/packages/imperative/__tests__/__unit__/cmd/__model__/TestArgHandler.ts @@ -9,8 +9,8 @@ * */ -import { ICommandHandler } from "../../src/doc/handler/ICommandHandler"; -import { IHandlerParameters } from "../../src/doc/handler/IHandlerParameters"; +import { ICommandHandler } from "../../../../src/cmd/doc/handler/ICommandHandler"; +import { IHandlerParameters } from "../../../../src/cmd/doc/handler/IHandlerParameters"; export default class TestCmdHandler implements ICommandHandler { public async process(commandParameters: IHandlerParameters) { diff --git a/packages/imperative/src/cmd/__tests__/__model__/TestCmdHandler.ts b/packages/imperative/__tests__/__unit__/cmd/__model__/TestCmdHandler.ts similarity index 90% rename from packages/imperative/src/cmd/__tests__/__model__/TestCmdHandler.ts rename to packages/imperative/__tests__/__unit__/cmd/__model__/TestCmdHandler.ts index d0c6026002..cdcb7e20c5 100644 --- a/packages/imperative/src/cmd/__tests__/__model__/TestCmdHandler.ts +++ b/packages/imperative/__tests__/__unit__/cmd/__model__/TestCmdHandler.ts @@ -9,9 +9,9 @@ * */ -import { ICommandHandler } from "../../src/doc/handler/ICommandHandler"; -import { IHandlerParameters } from "../../src/doc/handler/IHandlerParameters"; -import { ImperativeError } from "../../../error"; +import { ICommandHandler } from "../../../../src/cmd/doc/handler/ICommandHandler"; +import { IHandlerParameters } from "../../../../src/cmd/doc/handler/IHandlerParameters"; +import { ImperativeError } from "../../../../src/error"; export default class TestCmdHandler implements ICommandHandler { public process(commandParameters: IHandlerParameters): Promise { diff --git a/packages/imperative/src/cmd/__tests__/__resources__/.zowe.env.json b/packages/imperative/__tests__/__unit__/cmd/__resources__/.zowe.env.json similarity index 100% rename from packages/imperative/src/cmd/__tests__/__resources__/.zowe.env.json rename to packages/imperative/__tests__/__unit__/cmd/__resources__/.zowe.env.json diff --git a/packages/imperative/src/cmd/__tests__/__resources__/CommandDefinitions.ts b/packages/imperative/__tests__/__unit__/cmd/__resources__/CommandDefinitions.ts similarity index 98% rename from packages/imperative/src/cmd/__tests__/__resources__/CommandDefinitions.ts rename to packages/imperative/__tests__/__unit__/cmd/__resources__/CommandDefinitions.ts index ea58a59bd6..fa22002a94 100644 --- a/packages/imperative/src/cmd/__tests__/__resources__/CommandDefinitions.ts +++ b/packages/imperative/__tests__/__unit__/cmd/__resources__/CommandDefinitions.ts @@ -9,9 +9,9 @@ * */ -import { ICommandDefinition } from "../../src/doc/ICommandDefinition"; -import { ICommandOptionDefinition } from "../../src/doc/option/ICommandOptionDefinition"; -import { ICommandProfileTypeConfiguration } from "../../src/doc/profiles/definition/ICommandProfileTypeConfiguration"; +import { ICommandDefinition } from "../../../../src/cmd/doc/ICommandDefinition"; +import { ICommandOptionDefinition } from "../../../../src/cmd/doc/option/ICommandOptionDefinition"; +import { ICommandProfileTypeConfiguration } from "../../../../src/cmd/doc/profiles/definition/ICommandProfileTypeConfiguration"; export const COMPLEX_COMMAND: ICommandDefinition = { name: "test-group", diff --git a/packages/imperative/src/cmd/__tests__/__resources__/project.config.user.json b/packages/imperative/__tests__/__unit__/cmd/__resources__/project.config.user.json similarity index 100% rename from packages/imperative/src/cmd/__tests__/__resources__/project.config.user.json rename to packages/imperative/__tests__/__unit__/cmd/__resources__/project.config.user.json diff --git a/packages/imperative/src/cmd/__tests__/__snapshots__/ChainedHandlerUtils.unit.test.ts.snap b/packages/imperative/__tests__/__unit__/cmd/__snapshots__/ChainedHandlerUtils.unit.test.ts.snap similarity index 100% rename from packages/imperative/src/cmd/__tests__/__snapshots__/ChainedHandlerUtils.unit.test.ts.snap rename to packages/imperative/__tests__/__unit__/cmd/__snapshots__/ChainedHandlerUtils.unit.test.ts.snap diff --git a/packages/imperative/src/cmd/__tests__/__snapshots__/CommandPreparer.unit.test.ts.snap b/packages/imperative/__tests__/__unit__/cmd/__snapshots__/CommandPreparer.unit.test.ts.snap similarity index 100% rename from packages/imperative/src/cmd/__tests__/__snapshots__/CommandPreparer.unit.test.ts.snap rename to packages/imperative/__tests__/__unit__/cmd/__snapshots__/CommandPreparer.unit.test.ts.snap diff --git a/packages/imperative/src/cmd/__tests__/__snapshots__/CommandProcessor.unit.test.ts.snap b/packages/imperative/__tests__/__unit__/cmd/__snapshots__/CommandProcessor.unit.test.ts.snap similarity index 100% rename from packages/imperative/src/cmd/__tests__/__snapshots__/CommandProcessor.unit.test.ts.snap rename to packages/imperative/__tests__/__unit__/cmd/__snapshots__/CommandProcessor.unit.test.ts.snap diff --git a/packages/imperative/src/cmd/__tests__/handlers/FailedCommandHandler.unit.test.ts b/packages/imperative/__tests__/__unit__/cmd/handlers/FailedCommandHandler.unit.test.ts similarity index 92% rename from packages/imperative/src/cmd/__tests__/handlers/FailedCommandHandler.unit.test.ts rename to packages/imperative/__tests__/__unit__/cmd/handlers/FailedCommandHandler.unit.test.ts index d03f1c4b88..60e94ad4b7 100644 --- a/packages/imperative/src/cmd/__tests__/handlers/FailedCommandHandler.unit.test.ts +++ b/packages/imperative/__tests__/__unit__/cmd/handlers/FailedCommandHandler.unit.test.ts @@ -9,13 +9,13 @@ * */ -import { CommandResponse, ICommandResponse } from "../../"; -import { ICommandHandler } from "../../src/doc/handler/ICommandHandler"; +import { CommandResponse, ICommandResponse } from "../../../../"; +import { ICommandHandler } from "../../../../src/cmd/doc/handler/ICommandHandler"; import { inspect } from "util"; import { MULTIPLE_GROUPS } from "../__resources__/CommandDefinitions"; import { TestLogger } from "../../../../__tests__/src/TestLogger"; -import { ICommandHandlerRequire } from "../../src/doc/handler/ICommandHandlerRequire"; +import { ICommandHandlerRequire } from "../../../../src/cmd/doc/handler/ICommandHandlerRequire"; jest.mock("../../../imperative/src/Imperative"); diff --git a/packages/imperative/src/cmd/__tests__/handlers/__snapshots__/FailedCommandHandler.unit.test.ts.snap b/packages/imperative/__tests__/__unit__/cmd/handlers/__snapshots__/FailedCommandHandler.unit.test.ts.snap similarity index 100% rename from packages/imperative/src/cmd/__tests__/handlers/__snapshots__/FailedCommandHandler.unit.test.ts.snap rename to packages/imperative/__tests__/__unit__/cmd/handlers/__snapshots__/FailedCommandHandler.unit.test.ts.snap diff --git a/packages/imperative/src/cmd/__tests__/help/AbstractHelpGenerator.unit.test.ts b/packages/imperative/__tests__/__unit__/cmd/help/AbstractHelpGenerator.unit.test.ts similarity index 97% rename from packages/imperative/src/cmd/__tests__/help/AbstractHelpGenerator.unit.test.ts rename to packages/imperative/__tests__/__unit__/cmd/help/AbstractHelpGenerator.unit.test.ts index 416627fa22..b88dc4b9d5 100644 --- a/packages/imperative/src/cmd/__tests__/help/AbstractHelpGenerator.unit.test.ts +++ b/packages/imperative/__tests__/__unit__/cmd/help/AbstractHelpGenerator.unit.test.ts @@ -10,9 +10,9 @@ */ import { InheritedHelpGenerator } from "./model/InheritedHelpGenerator"; -import { IHelpGeneratorFactoryParms } from "../../../cmd/src/help/doc/IHelpGeneratorFactoryParms"; -import { ICommandDefinition } from "../../src/doc/ICommandDefinition"; -import { ICommandOptionDefinition } from "../../src/doc/option/ICommandOptionDefinition"; +import { IHelpGeneratorFactoryParms } from "../../../../src/cmd/help/doc/IHelpGeneratorFactoryParms"; +import { ICommandDefinition } from "../../../../src/cmd/doc/ICommandDefinition"; +import { ICommandOptionDefinition } from "../../../../src/cmd/doc/option/ICommandOptionDefinition"; const chalkColor: string = "blue"; const oldForceColorOption = process.env.FORCE_COLOR; diff --git a/packages/imperative/src/cmd/__tests__/help/AbstractHelpGeneratorFactory.unit.test.ts b/packages/imperative/__tests__/__unit__/cmd/help/AbstractHelpGeneratorFactory.unit.test.ts similarity index 96% rename from packages/imperative/src/cmd/__tests__/help/AbstractHelpGeneratorFactory.unit.test.ts rename to packages/imperative/__tests__/__unit__/cmd/help/AbstractHelpGeneratorFactory.unit.test.ts index 2ea127a098..52c3f24fc8 100644 --- a/packages/imperative/src/cmd/__tests__/help/AbstractHelpGeneratorFactory.unit.test.ts +++ b/packages/imperative/__tests__/__unit__/cmd/help/AbstractHelpGeneratorFactory.unit.test.ts @@ -10,8 +10,8 @@ */ import { TestHelpGeneratorFactory } from "./model/TestHelpGeneratorFactory"; -import { ImperativeError } from "../../../index"; -import { ICommandDefinition } from "../../src/doc/ICommandDefinition"; +import { ImperativeError } from "../../../../src/error"; +import { ICommandDefinition } from "../../../../src/cmd/doc/ICommandDefinition"; import { InheritedHelpGenerator } from "./model/InheritedHelpGenerator"; const SAMPLE_COMMAND: ICommandDefinition = { diff --git a/packages/imperative/src/cmd/__tests__/help/DefaultHelpGenerator.unit.test.ts b/packages/imperative/__tests__/__unit__/cmd/help/DefaultHelpGenerator.unit.test.ts similarity index 98% rename from packages/imperative/src/cmd/__tests__/help/DefaultHelpGenerator.unit.test.ts rename to packages/imperative/__tests__/__unit__/cmd/help/DefaultHelpGenerator.unit.test.ts index fd5385eda5..4d837dd165 100644 --- a/packages/imperative/src/cmd/__tests__/help/DefaultHelpGenerator.unit.test.ts +++ b/packages/imperative/__tests__/__unit__/cmd/help/DefaultHelpGenerator.unit.test.ts @@ -10,14 +10,14 @@ */ jest.mock("../../../imperative/src/Imperative"); -jest.mock("../../../utilities/src/ImperativeConfig"); - -import { IHelpGeneratorFactoryParms } from "../../../cmd/src/help/doc/IHelpGeneratorFactoryParms"; -import { ICommandDefinition } from "../../src/doc/ICommandDefinition"; -import { DefaultHelpGenerator } from "../../src/help/DefaultHelpGenerator"; -import { ICommandOptionDefinition } from "../.."; -import { ImperativeError } from "../../.."; -import { ImperativeConfig } from "../../../utilities"; +jest.mock("../../../utilities/ImperativeConfig"); + +import { IHelpGeneratorFactoryParms } from "../../../../src/cmd/help/doc/IHelpGeneratorFactoryParms"; +import { ICommandDefinition } from "../../../../src/cmd/doc/ICommandDefinition"; +import { DefaultHelpGenerator } from "../../../../src/cmd/help/DefaultHelpGenerator"; +import { ICommandOptionDefinition } from "../../../../"; +import { ImperativeError } from "../../../../."; +import { ImperativeConfig } from "../../../../src/utilities/ImperativeConfig"; const chalkColor: string = "blue"; const oldForceColorOption = process.env.FORCE_COLOR; diff --git a/packages/imperative/src/cmd/__tests__/help/WebHelpGenerator.unit.test.ts b/packages/imperative/__tests__/__unit__/cmd/help/WebHelpGenerator.unit.test.ts similarity index 93% rename from packages/imperative/src/cmd/__tests__/help/WebHelpGenerator.unit.test.ts rename to packages/imperative/__tests__/__unit__/cmd/help/WebHelpGenerator.unit.test.ts index 18a153e089..3e38dbf1b8 100644 --- a/packages/imperative/src/cmd/__tests__/help/WebHelpGenerator.unit.test.ts +++ b/packages/imperative/__tests__/__unit__/cmd/help/WebHelpGenerator.unit.test.ts @@ -12,14 +12,14 @@ import * as fs from "fs"; import * as path from "path"; -import { Imperative } from "../../../imperative/src/Imperative"; -import { WebHelpGenerator } from "../../src/help/WebHelpGenerator"; -import { WebHelpManager } from "../../src/help/WebHelpManager"; -import { CommandResponse } from "../../src/response/CommandResponse"; -import { IImperativeConfig } from "../../../imperative/src/doc/IImperativeConfig"; -import { ImperativeConfig } from "../../../utilities/src/ImperativeConfig"; -import { IO } from "../../../io"; -import { ICommandDefinition } from "../../../cmd/src/doc/ICommandDefinition"; +import { Imperative } from "../../../../src/imperative/Imperative"; +import { WebHelpGenerator } from "../../../../src/cmd/help/WebHelpGenerator"; +import { WebHelpManager } from "../../../../src/cmd/help/WebHelpManager"; +import { CommandResponse } from "../../../../src/cmd/response/CommandResponse"; +import { IImperativeConfig } from "../../../../src/imperative/doc/IImperativeConfig"; +import { ImperativeConfig } from "../../../../src/utilities/ImperativeConfig"; +import { IO } from "../../../../src/io"; +import { ICommandDefinition } from "../../../../src/cmd/doc/ICommandDefinition"; describe("WebHelpGenerator", () => { describe("buildHelp", () => { diff --git a/packages/imperative/src/cmd/__tests__/help/WebHelpManager.unit.test.ts b/packages/imperative/__tests__/__unit__/cmd/help/WebHelpManager.unit.test.ts similarity index 93% rename from packages/imperative/src/cmd/__tests__/help/WebHelpManager.unit.test.ts rename to packages/imperative/__tests__/__unit__/cmd/help/WebHelpManager.unit.test.ts index c49cbfe41a..db812a4279 100644 --- a/packages/imperative/src/cmd/__tests__/help/WebHelpManager.unit.test.ts +++ b/packages/imperative/__tests__/__unit__/cmd/help/WebHelpManager.unit.test.ts @@ -14,13 +14,14 @@ import * as fsExtra from "fs-extra"; import * as path from "path"; import * as rimraf from "rimraf"; -import { IO } from "../../../io/src/IO"; -import { Imperative } from "../../../imperative/src/Imperative"; -import { WebHelpManager } from "../../src/help/WebHelpManager"; -import { CommandResponse } from "../../src/response/CommandResponse"; -import { ImperativeConfig, GuiResult, ProcessUtils } from "../../../utilities"; -import { WebHelpGenerator } from "../.."; -import { IImperativeConfig } from "../../../imperative/src/doc/IImperativeConfig"; +import { IO } from "../../../../src/io/IO"; +import { Imperative } from "../../../../src/imperative/Imperative"; +import { WebHelpManager } from "../../../../src/cmd/help/WebHelpManager"; +import { CommandResponse } from "../../../../src/cmd/response/CommandResponse"; +import { ProcessUtils, GuiResult } from "../../../../src/utilities/ProcessUtils"; +import { ImperativeConfig } from "../../../../src/utilities/ImperativeConfig"; +import { WebHelpGenerator } from "../../../.."; +import { IImperativeConfig } from "../../../../src/imperative/doc/IImperativeConfig"; describe("WebHelpManager", () => { describe("buildHelp", () => { diff --git a/packages/imperative/src/cmd/__tests__/help/__snapshots__/AbstractHelpGenerator.unit.test.ts.snap b/packages/imperative/__tests__/__unit__/cmd/help/__snapshots__/AbstractHelpGenerator.unit.test.ts.snap similarity index 100% rename from packages/imperative/src/cmd/__tests__/help/__snapshots__/AbstractHelpGenerator.unit.test.ts.snap rename to packages/imperative/__tests__/__unit__/cmd/help/__snapshots__/AbstractHelpGenerator.unit.test.ts.snap diff --git a/packages/imperative/src/cmd/__tests__/help/__snapshots__/AbstractHelpGeneratorFactory.unit.test.ts.snap b/packages/imperative/__tests__/__unit__/cmd/help/__snapshots__/AbstractHelpGeneratorFactory.unit.test.ts.snap similarity index 100% rename from packages/imperative/src/cmd/__tests__/help/__snapshots__/AbstractHelpGeneratorFactory.unit.test.ts.snap rename to packages/imperative/__tests__/__unit__/cmd/help/__snapshots__/AbstractHelpGeneratorFactory.unit.test.ts.snap diff --git a/packages/imperative/src/cmd/__tests__/help/__snapshots__/DefaultHelpGenerator.unit.test.ts.snap b/packages/imperative/__tests__/__unit__/cmd/help/__snapshots__/DefaultHelpGenerator.unit.test.ts.snap similarity index 100% rename from packages/imperative/src/cmd/__tests__/help/__snapshots__/DefaultHelpGenerator.unit.test.ts.snap rename to packages/imperative/__tests__/__unit__/cmd/help/__snapshots__/DefaultHelpGenerator.unit.test.ts.snap diff --git a/packages/imperative/src/cmd/__tests__/help/model/InheritedHelpGenerator.ts b/packages/imperative/__tests__/__unit__/cmd/help/model/InheritedHelpGenerator.ts similarity index 85% rename from packages/imperative/src/cmd/__tests__/help/model/InheritedHelpGenerator.ts rename to packages/imperative/__tests__/__unit__/cmd/help/model/InheritedHelpGenerator.ts index e02470b5e1..dddad0268e 100644 --- a/packages/imperative/src/cmd/__tests__/help/model/InheritedHelpGenerator.ts +++ b/packages/imperative/__tests__/__unit__/cmd/help/model/InheritedHelpGenerator.ts @@ -9,8 +9,8 @@ * */ -import { AbstractHelpGenerator } from "../../../src/help/abstract/AbstractHelpGenerator"; -import { CommandOptionType } from "../../../src/doc/option/ICommandOptionDefinition"; +import { AbstractHelpGenerator } from "../../../../../src/cmd/help/abstract/AbstractHelpGenerator"; +import { CommandOptionType } from "../../../../../src/cmd/doc/option/ICommandOptionDefinition"; export class InheritedHelpGenerator extends AbstractHelpGenerator { diff --git a/packages/imperative/src/cmd/__tests__/help/model/TestHelpGeneratorFactory.ts b/packages/imperative/__tests__/__unit__/cmd/help/model/TestHelpGeneratorFactory.ts similarity index 75% rename from packages/imperative/src/cmd/__tests__/help/model/TestHelpGeneratorFactory.ts rename to packages/imperative/__tests__/__unit__/cmd/help/model/TestHelpGeneratorFactory.ts index 3159828706..25206d75ae 100644 --- a/packages/imperative/src/cmd/__tests__/help/model/TestHelpGeneratorFactory.ts +++ b/packages/imperative/__tests__/__unit__/cmd/help/model/TestHelpGeneratorFactory.ts @@ -9,9 +9,9 @@ * */ -import { AbstractHelpGeneratorFactory } from "../../../src/help/abstract/AbstractHelpGeneratorFactory"; -import { IHelpGeneratorParms } from "../../../src/help/doc/IHelpGeneratorParms"; -import { IHelpGenerator } from "../../../src/help/doc/IHelpGenerator"; +import { AbstractHelpGeneratorFactory } from "../../../../../src/cmd/help/abstract/AbstractHelpGeneratorFactory"; +import { IHelpGeneratorParms } from "../../../../../src/cmd/help/doc/IHelpGeneratorParms"; +import { IHelpGenerator } from "../../../../../src/cmd/help/doc/IHelpGenerator"; import { InheritedHelpGenerator } from "./InheritedHelpGenerator"; /** * Test implementation for the abstract help generator factory diff --git a/packages/imperative/src/cmd/__tests__/process/CommandResponseDataProcess.ts b/packages/imperative/__tests__/__unit__/cmd/process/CommandResponseDataProcess.ts similarity index 95% rename from packages/imperative/src/cmd/__tests__/process/CommandResponseDataProcess.ts rename to packages/imperative/__tests__/__unit__/cmd/process/CommandResponseDataProcess.ts index bab8290e1d..432e3e89f1 100644 --- a/packages/imperative/src/cmd/__tests__/process/CommandResponseDataProcess.ts +++ b/packages/imperative/__tests__/__unit__/cmd/process/CommandResponseDataProcess.ts @@ -9,8 +9,8 @@ * */ -import { Imperative } from "../../../imperative/src/Imperative"; -import { CommandResponse } from "../../"; +import { Imperative } from "../../../../src/imperative/Imperative"; +import { CommandResponse } from "../../../../"; export const WRITE_MESSAGE_ONE: string = "Hello from Command Response Process Message 1 (stdout)"; export const WRITE_MESSAGE_TWO: string = "Hello from Command Response Process Message 2 (stdout)"; diff --git a/packages/imperative/src/cmd/__tests__/process/CommandResponseJsonFailedProcess.ts b/packages/imperative/__tests__/__unit__/cmd/process/CommandResponseJsonFailedProcess.ts similarity index 94% rename from packages/imperative/src/cmd/__tests__/process/CommandResponseJsonFailedProcess.ts rename to packages/imperative/__tests__/__unit__/cmd/process/CommandResponseJsonFailedProcess.ts index c1fd716a31..704f818efa 100644 --- a/packages/imperative/src/cmd/__tests__/process/CommandResponseJsonFailedProcess.ts +++ b/packages/imperative/__tests__/__unit__/cmd/process/CommandResponseJsonFailedProcess.ts @@ -9,8 +9,8 @@ * */ -import { Imperative } from "../../../imperative/src/Imperative"; -import { CommandResponse } from "../../"; +import { Imperative } from "../../../../src/imperative/Imperative"; +import { CommandResponse } from "../../../../"; export const JSON_WRITE_ERROR_MESSAGE_ONE: string = "Hello from Command Response JSON Process Message 1 (stderr)"; export const JSON_WRITE_ERROR_MESSAGE_TWO: string = "Hello from Command Response JSON Process Message 2 (stderr)"; diff --git a/packages/imperative/src/cmd/__tests__/process/CommandResponseJsonProcess.ts b/packages/imperative/__tests__/__unit__/cmd/process/CommandResponseJsonProcess.ts similarity index 95% rename from packages/imperative/src/cmd/__tests__/process/CommandResponseJsonProcess.ts rename to packages/imperative/__tests__/__unit__/cmd/process/CommandResponseJsonProcess.ts index 4da4f77a6c..8911770cea 100644 --- a/packages/imperative/src/cmd/__tests__/process/CommandResponseJsonProcess.ts +++ b/packages/imperative/__tests__/__unit__/cmd/process/CommandResponseJsonProcess.ts @@ -9,8 +9,8 @@ * */ -import { Imperative } from "../../../imperative/src/Imperative"; -import { CommandResponse } from "../../"; +import { Imperative } from "../../../../src/imperative/Imperative"; +import { CommandResponse } from "../../../../"; export const JSON_WRITE_MESSAGE_ONE: string = "Hello from Command Response JSON Process Message 1 (stdout)"; export const JSON_WRITE_MESSAGE_TWO: string = "Hello from Command Response JSON Process Message 2 (stdout)"; diff --git a/packages/imperative/src/cmd/__tests__/process/CommandResponseProcess.ts b/packages/imperative/__tests__/__unit__/cmd/process/CommandResponseProcess.ts similarity index 94% rename from packages/imperative/src/cmd/__tests__/process/CommandResponseProcess.ts rename to packages/imperative/__tests__/__unit__/cmd/process/CommandResponseProcess.ts index f8e2c08117..c191d8a98a 100644 --- a/packages/imperative/src/cmd/__tests__/process/CommandResponseProcess.ts +++ b/packages/imperative/__tests__/__unit__/cmd/process/CommandResponseProcess.ts @@ -9,8 +9,8 @@ * */ -import { Imperative } from "../../../imperative/src/Imperative"; -import { CommandResponse } from "../../"; +import { Imperative } from "../../../../src/imperative/Imperative"; +import { CommandResponse } from "../../../../"; export const WRITE_MESSAGE_ONE: string = "Hello from Command Response Process Message 1 (stdout)"; export const WRITE_MESSAGE_TWO: string = "Hello from Command Response Process Message 2 (stdout)"; diff --git a/packages/imperative/src/cmd/__tests__/profiles/CliProfileManager.credentials.unit.test.ts b/packages/imperative/__tests__/__unit__/cmd/profiles/CliProfileManager.credentials.unit.test.ts similarity index 98% rename from packages/imperative/src/cmd/__tests__/profiles/CliProfileManager.credentials.unit.test.ts rename to packages/imperative/__tests__/__unit__/cmd/profiles/CliProfileManager.credentials.unit.test.ts index 0e57e741ce..d6e9de5a93 100644 --- a/packages/imperative/src/cmd/__tests__/profiles/CliProfileManager.credentials.unit.test.ts +++ b/packages/imperative/__tests__/__unit__/cmd/profiles/CliProfileManager.credentials.unit.test.ts @@ -10,17 +10,17 @@ */ import { TestLogger } from "../../../../__tests__/src/TestLogger"; -import { ProfileIO } from "../../../profiles/src/utils/ProfileIO"; -import { CliProfileManager } from "../../src/profiles/CliProfileManager"; -import { IProfile } from "../../../profiles/src/doc/definition/IProfile"; +import { ProfileIO } from "../../../../src/profiles/utils/ProfileIO"; +import { CliProfileManager } from "../../../../src/cmd/profiles/CliProfileManager"; +import { IProfile } from "../../../../src/profiles/doc/definition/IProfile"; import { ONLY_ORANGE_WITH_CREDENTIALS, SECURE_ORANGE_PROFILE_TYPE, TEST_PROFILE_ROOT_DIR -} from "../../../profiles/__tests__/TestConstants"; -import { CredentialManagerFactory, DefaultCredentialManager } from "../../../security"; -import { BasicProfileManager } from "../../../profiles/src/BasicProfileManager"; -import { ProfilesConstants, ISaveProfile, IProfileSaved } from "../../../profiles"; +} from "../../../../__tests__/__unit__/profiles/TestConstants"; +import { CredentialManagerFactory, DefaultCredentialManager } from "../../../../src/security"; +import { BasicProfileManager } from "../../../../src/profiles/BasicProfileManager"; +import { ProfilesConstants, ISaveProfile, IProfileSaved } from "../../../../src/profiles"; jest.mock("../../../profiles/src/utils/ProfileIO"); jest.mock("../../../security/src/DefaultCredentialManager"); diff --git a/packages/imperative/src/cmd/__tests__/profiles/CliProfileManager.unit.test.ts b/packages/imperative/__tests__/__unit__/cmd/profiles/CliProfileManager.unit.test.ts similarity index 95% rename from packages/imperative/src/cmd/__tests__/profiles/CliProfileManager.unit.test.ts rename to packages/imperative/__tests__/__unit__/cmd/profiles/CliProfileManager.unit.test.ts index f221f0dc64..fa7dfc1f15 100644 --- a/packages/imperative/src/cmd/__tests__/profiles/CliProfileManager.unit.test.ts +++ b/packages/imperative/__tests__/__unit__/cmd/profiles/CliProfileManager.unit.test.ts @@ -9,21 +9,21 @@ * */ -import { ProfileUtils } from "../../../profiles/src/utils/ProfileUtils"; +import { ProfileUtils } from "../../../../src/profiles/utils/ProfileUtils"; import { TestLogger } from "../../../../__tests__/src/TestLogger"; -import { ICommandProfileTypeConfiguration } from "../../src/doc/profiles/definition/ICommandProfileTypeConfiguration"; -import { ProfileIO } from "../../../profiles/src/utils/ProfileIO"; -import { CliProfileManager } from "../../src/profiles/CliProfileManager"; -import { IProfile } from "../../../profiles/src/doc/definition/IProfile"; +import { ICommandProfileTypeConfiguration } from "../../../../src/cmd/doc/profiles/definition/ICommandProfileTypeConfiguration"; +import { ProfileIO } from "../../../../src/profiles/utils/ProfileIO"; +import { CliProfileManager } from "../../../../src/cmd/profiles/CliProfileManager"; +import { IProfile } from "../../../../src/profiles/doc/definition/IProfile"; import { inspect } from "util"; -import { ISaveProfileFromCliArgs } from "../../../profiles/src/doc/parms/ISaveProfileFromCliArgs"; -import { ImperativeError } from "../../../error/src/ImperativeError"; -import { PROFILE_TYPE } from "../../../../__tests__/src/packages/profiles/src/constants/BasicProfileManagerTestConstants"; -import { TEST_PROFILE_ROOT_DIR } from "../../../profiles/__tests__/TestConstants"; -import { IProfileLoaded } from "../../.."; +import { ISaveProfileFromCliArgs } from "../../../../src/profiles/doc/parms/ISaveProfileFromCliArgs"; +import { ImperativeError } from "../../../../src/error/ImperativeError"; +import { STRAWBERRY_PROFILE_TYPE } from "../../../../__tests__/__unit__/profiles/TestConstants"; +import { TEST_PROFILE_ROOT_DIR } from "../../../../__tests__/__unit__/profiles/TestConstants"; +import { IProfileLoaded } from "../../../.."; -jest.mock("../../../profiles/src/utils/ProfileIO"); -jest.mock("../../../security/src/DefaultCredentialManager"); +jest.mock("../../../profiles/utils/ProfileIO"); +jest.mock("../../../security/DefaultCredentialManager"); describe("Cli Profile Manager", () => { let writtenProfile: any; @@ -669,7 +669,7 @@ describe("Cli Profile Manager", () => { const prof = new CliProfileManager({ profileRootDirectory: TEST_PROFILE_ROOT_DIR, typeConfigurations: [{ - type: PROFILE_TYPE.STRAWBERRY, + type: STRAWBERRY_PROFILE_TYPE, schema: { type: "object", title: "test profile for updating on merging", @@ -684,11 +684,11 @@ describe("Cli Profile Manager", () => { } } }], - type: PROFILE_TYPE.STRAWBERRY, + type: STRAWBERRY_PROFILE_TYPE, logger: testLogger }); const profileA = { - type: PROFILE_TYPE.STRAWBERRY, name: "first", + type: STRAWBERRY_PROFILE_TYPE, name: "first", myArrayVariable: ["old_value1", "oldValue2"], // test that the array replacement still works on deeply nested fields hasNestedArray: {hasNestedArray: {hasNestedArray: ["old_value1", "old_value2"]}}, @@ -700,7 +700,7 @@ describe("Cli Profile Manager", () => { return path.indexOf("meta") === -1 ? path : undefined; }); ProfileIO.readProfileFile = jest.fn((filePath: string, type: string) => { - if (type === PROFILE_TYPE.STRAWBERRY) { + if (type === STRAWBERRY_PROFILE_TYPE) { return profileA; } else { return { @@ -714,7 +714,7 @@ describe("Cli Profile Manager", () => { hasNestedArray: {hasNestedArray: {hasNestedArray: ["new_value1", "new_value2", "new_value3", "new_value4"]}}, }; const updateResult = await prof.update({ - type: PROFILE_TYPE.STRAWBERRY, + type: STRAWBERRY_PROFILE_TYPE, name: "first", profile: profileB, merge: true }); const merged = updateResult.profile; @@ -735,7 +735,7 @@ describe("Cli Profile Manager", () => { const prof = new CliProfileManager({ profileRootDirectory: TEST_PROFILE_ROOT_DIR, typeConfigurations: [{ - type: PROFILE_TYPE.STRAWBERRY, + type: STRAWBERRY_PROFILE_TYPE, schema: { type: "object", title: "test profile for updating on merging", @@ -769,7 +769,7 @@ describe("Cli Profile Manager", () => { } } }], - type: PROFILE_TYPE.STRAWBERRY, + type: STRAWBERRY_PROFILE_TYPE, logger: testLogger }); const profileA = { @@ -784,7 +784,7 @@ describe("Cli Profile Manager", () => { return path.indexOf("meta") === -1 ? path : undefined; }); ProfileIO.readProfileFile = jest.fn((filePath: string, type: string) => { - if (type === PROFILE_TYPE.STRAWBERRY) { + if (type === STRAWBERRY_PROFILE_TYPE) { return profileA; } else { return { @@ -794,13 +794,13 @@ describe("Cli Profile Manager", () => { } }); const profileB: IProfile = { - type: PROFILE_TYPE.STRAWBERRY, + type: STRAWBERRY_PROFILE_TYPE, name: "first" }; const newArrayVariable = ["new_value1", "new_value2", "new_value3"]; const newNestedArray = ["new_value1", "new_value2", "new_value3", "new_value4"]; const updateResult = await prof.update({ - type: PROFILE_TYPE.STRAWBERRY, name: "first", + type: STRAWBERRY_PROFILE_TYPE, name: "first", profile: profileB, args: { $0: "dummy", _: [], hasNestedArray: newNestedArray, diff --git a/packages/imperative/src/cmd/__tests__/profiles/CommandProfileLoader.unit.test.ts b/packages/imperative/__tests__/__unit__/cmd/profiles/CommandProfileLoader.unit.test.ts similarity index 97% rename from packages/imperative/src/cmd/__tests__/profiles/CommandProfileLoader.unit.test.ts rename to packages/imperative/__tests__/__unit__/cmd/profiles/CommandProfileLoader.unit.test.ts index 13852e998d..e09dbc091a 100644 --- a/packages/imperative/src/cmd/__tests__/profiles/CommandProfileLoader.unit.test.ts +++ b/packages/imperative/__tests__/__unit__/cmd/profiles/CommandProfileLoader.unit.test.ts @@ -11,16 +11,16 @@ jest.mock("../../../profiles/src/BasicProfileManager"); jest.mock("../../../profiles/src/BasicProfileManagerFactory"); -jest.mock("../../../utilities/src/ImperativeConfig"); +jest.mock("../../../utilities/ImperativeConfig"); jest.mock("../../../logger/src/LoggerUtils"); -import { CommandProfileLoader } from "../../src/profiles/CommandProfileLoader"; -import { ICommandDefinition } from "../../src/doc/ICommandDefinition"; -import { BasicProfileManager } from "../../../profiles/src/BasicProfileManager"; +import { CommandProfileLoader } from "../../../../src/cmd/profiles/CommandProfileLoader"; +import { ICommandDefinition } from "../../../../src/cmd/doc/ICommandDefinition"; +import { BasicProfileManager } from "../../../../src/profiles/BasicProfileManager"; import { TestLogger } from "../../../../__tests__/src/TestLogger"; -import { CommandProfiles } from "../../src/profiles/CommandProfiles"; -import { ImperativeError } from "../../../error"; -import { BasicProfileManagerFactory, IProfile, IProfileLoaded } from "../../../profiles"; -import { ImperativeConfig } from "../../../utilities"; +import { CommandProfiles } from "../../../../src/cmd/profiles/CommandProfiles"; +import { ImperativeError } from "../../../../src/error"; +import { BasicProfileManagerFactory, IProfile, IProfileLoaded } from "../../../../src/profiles"; +import { ImperativeConfig } from "../../../../src/utilities/ImperativeConfig"; const TEST_PROFILES_DIR = "/test/data/profiles/fake"; diff --git a/packages/imperative/src/cmd/__tests__/profiles/CommandProfiles.unit.test.ts b/packages/imperative/__tests__/__unit__/cmd/profiles/CommandProfiles.unit.test.ts similarity index 97% rename from packages/imperative/src/cmd/__tests__/profiles/CommandProfiles.unit.test.ts rename to packages/imperative/__tests__/__unit__/cmd/profiles/CommandProfiles.unit.test.ts index bf683a2eaa..bf2f136af2 100644 --- a/packages/imperative/src/cmd/__tests__/profiles/CommandProfiles.unit.test.ts +++ b/packages/imperative/__tests__/__unit__/cmd/profiles/CommandProfiles.unit.test.ts @@ -9,9 +9,9 @@ * */ -import { IProfile, IProfileLoaded } from "../../../profiles"; -import { CommandProfiles } from "../../src/profiles/CommandProfiles"; -import { ImperativeError } from "../../../error"; +import { IProfile, IProfileLoaded } from "../../../../src/profiles"; +import { CommandProfiles } from "../../../../src/cmd/profiles/CommandProfiles"; +import { ImperativeError } from "../../../../src/error"; const BANANA_PROFILE_TYPE: string = "banana"; const STRAWBERRY_PROFILE_TYPE: string = "strawberry"; diff --git a/packages/imperative/src/cmd/__tests__/profiles/__snapshots__/CliProfileManager.credentials.unit.test.ts.snap b/packages/imperative/__tests__/__unit__/cmd/profiles/__snapshots__/CliProfileManager.credentials.unit.test.ts.snap similarity index 100% rename from packages/imperative/src/cmd/__tests__/profiles/__snapshots__/CliProfileManager.credentials.unit.test.ts.snap rename to packages/imperative/__tests__/__unit__/cmd/profiles/__snapshots__/CliProfileManager.credentials.unit.test.ts.snap diff --git a/packages/imperative/src/cmd/__tests__/profiles/__snapshots__/CommandProfileLoader.unit.test.ts.snap b/packages/imperative/__tests__/__unit__/cmd/profiles/__snapshots__/CommandProfileLoader.unit.test.ts.snap similarity index 100% rename from packages/imperative/src/cmd/__tests__/profiles/__snapshots__/CommandProfileLoader.unit.test.ts.snap rename to packages/imperative/__tests__/__unit__/cmd/profiles/__snapshots__/CommandProfileLoader.unit.test.ts.snap diff --git a/packages/imperative/src/cmd/__tests__/profiles/__snapshots__/CommandProfiles.unit.test.ts.snap b/packages/imperative/__tests__/__unit__/cmd/profiles/__snapshots__/CommandProfiles.unit.test.ts.snap similarity index 100% rename from packages/imperative/src/cmd/__tests__/profiles/__snapshots__/CommandProfiles.unit.test.ts.snap rename to packages/imperative/__tests__/__unit__/cmd/profiles/__snapshots__/CommandProfiles.unit.test.ts.snap diff --git a/packages/imperative/src/cmd/__tests__/profiles/builders/CompleteProfilesGroupBuilder.unit.test.ts b/packages/imperative/__tests__/__unit__/cmd/profiles/builders/CompleteProfilesGroupBuilder.unit.test.ts similarity index 81% rename from packages/imperative/src/cmd/__tests__/profiles/builders/CompleteProfilesGroupBuilder.unit.test.ts rename to packages/imperative/__tests__/__unit__/cmd/profiles/builders/CompleteProfilesGroupBuilder.unit.test.ts index 04d7fe60e2..dc6308d091 100644 --- a/packages/imperative/src/cmd/__tests__/profiles/builders/CompleteProfilesGroupBuilder.unit.test.ts +++ b/packages/imperative/__tests__/__unit__/cmd/profiles/builders/CompleteProfilesGroupBuilder.unit.test.ts @@ -9,12 +9,12 @@ * */ -jest.mock("../../../../utilities/src/ImperativeConfig"); +jest.mock("../../../../../src/utilities/ImperativeConfig"); -import { ImperativeConfig } from "../../../../utilities"; +import { ImperativeConfig } from "../../../../../src/utilities/ImperativeConfig"; import { deleteHandlerPaths, testBuilderProfiles } from "./ProfileBuilderTestConstants"; import { TestLogger } from "../../../../../__tests__/src/TestLogger"; -import { CompleteProfilesGroupBuilder } from "../../../../imperative/src/profiles/builders/CompleteProfilesGroupBuilder"; +import { CompleteProfilesGroupBuilder } from "../../../../../src/imperative/profiles/builders/CompleteProfilesGroupBuilder"; describe("Complete Profiles Group Builder", () => { const logger = TestLogger.getTestLogger(); diff --git a/packages/imperative/src/cmd/__tests__/profiles/builders/ProfileBuilderTestConstants.ts b/packages/imperative/__tests__/__unit__/cmd/profiles/builders/ProfileBuilderTestConstants.ts similarity index 90% rename from packages/imperative/src/cmd/__tests__/profiles/builders/ProfileBuilderTestConstants.ts rename to packages/imperative/__tests__/__unit__/cmd/profiles/builders/ProfileBuilderTestConstants.ts index c282ed3626..e15c14aac4 100644 --- a/packages/imperative/src/cmd/__tests__/profiles/builders/ProfileBuilderTestConstants.ts +++ b/packages/imperative/__tests__/__unit__/cmd/profiles/builders/ProfileBuilderTestConstants.ts @@ -9,8 +9,8 @@ * */ -import { ICommandDefinition } from "../../../src/doc/ICommandDefinition"; -import { ICommandProfileTypeConfiguration } from "../../../../cmd/src/doc/profiles/definition/ICommandProfileTypeConfiguration"; +import { ICommandDefinition } from "../../../../../src/cmd/doc/ICommandDefinition"; +import { ICommandProfileTypeConfiguration } from "../../../../../src/cmd/doc/profiles/definition/ICommandProfileTypeConfiguration"; export const testBuilderProfiles: ICommandProfileTypeConfiguration[] = [ { diff --git a/packages/imperative/src/cmd/__tests__/profiles/builders/ProfilesCreateCommandBuilder.unit.test.ts b/packages/imperative/__tests__/__unit__/cmd/profiles/builders/ProfilesCreateCommandBuilder.unit.test.ts similarity index 97% rename from packages/imperative/src/cmd/__tests__/profiles/builders/ProfilesCreateCommandBuilder.unit.test.ts rename to packages/imperative/__tests__/__unit__/cmd/profiles/builders/ProfilesCreateCommandBuilder.unit.test.ts index 68c571efb2..d865747a6b 100644 --- a/packages/imperative/src/cmd/__tests__/profiles/builders/ProfilesCreateCommandBuilder.unit.test.ts +++ b/packages/imperative/__tests__/__unit__/cmd/profiles/builders/ProfilesCreateCommandBuilder.unit.test.ts @@ -11,7 +11,7 @@ import { deleteHandlerPaths, testBuilderProfiles } from "./ProfileBuilderTestConstants"; import { TestLogger } from "../../../../../__tests__/src/TestLogger"; -import { ProfilesCreateCommandBuilder } from "../../../../imperative/src/profiles/builders/ProfilesCreateCommandBuilder"; +import { ProfilesCreateCommandBuilder } from "../../../../../src/imperative/profiles/builders/ProfilesCreateCommandBuilder"; describe("Profile Create Command Builder", () => { const logger = TestLogger.getTestLogger(); diff --git a/packages/imperative/src/cmd/__tests__/profiles/builders/ProfilesDeleteCommandBuilder.unit.test.ts b/packages/imperative/__tests__/__unit__/cmd/profiles/builders/ProfilesDeleteCommandBuilder.unit.test.ts similarity index 82% rename from packages/imperative/src/cmd/__tests__/profiles/builders/ProfilesDeleteCommandBuilder.unit.test.ts rename to packages/imperative/__tests__/__unit__/cmd/profiles/builders/ProfilesDeleteCommandBuilder.unit.test.ts index 3586e80ed5..58d79ae3b5 100644 --- a/packages/imperative/src/cmd/__tests__/profiles/builders/ProfilesDeleteCommandBuilder.unit.test.ts +++ b/packages/imperative/__tests__/__unit__/cmd/profiles/builders/ProfilesDeleteCommandBuilder.unit.test.ts @@ -9,12 +9,12 @@ * */ -jest.mock("../../../../utilities/src/ImperativeConfig"); +jest.mock("../../../../utilities/ImperativeConfig"); import { deleteHandlerPaths, testBuilderProfiles } from "./ProfileBuilderTestConstants"; import { TestLogger } from "../../../../../__tests__/src/TestLogger"; -import { ProfilesDeleteCommandBuilder } from "../../../../imperative/src/profiles/builders/ProfilesDeleteCommandBuilder"; -import { ImperativeConfig } from "../../../../utilities"; +import { ProfilesDeleteCommandBuilder } from "../../../../../src/imperative/profiles/builders/ProfilesDeleteCommandBuilder"; +import { ImperativeConfig } from "../../../../../src/utilities/ImperativeConfig"; describe("Profile Delete Command Builder", () => { const logger = TestLogger.getTestLogger(); diff --git a/packages/imperative/src/cmd/__tests__/profiles/builders/ProfilesListCommandBuilder.unit.test.ts b/packages/imperative/__tests__/__unit__/cmd/profiles/builders/ProfilesListCommandBuilder.unit.test.ts similarity index 89% rename from packages/imperative/src/cmd/__tests__/profiles/builders/ProfilesListCommandBuilder.unit.test.ts rename to packages/imperative/__tests__/__unit__/cmd/profiles/builders/ProfilesListCommandBuilder.unit.test.ts index 8b12c110ca..3d4a74e0f8 100644 --- a/packages/imperative/src/cmd/__tests__/profiles/builders/ProfilesListCommandBuilder.unit.test.ts +++ b/packages/imperative/__tests__/__unit__/cmd/profiles/builders/ProfilesListCommandBuilder.unit.test.ts @@ -11,7 +11,7 @@ import { deleteHandlerPaths, testBuilderProfiles } from "./ProfileBuilderTestConstants"; import { TestLogger } from "../../../../../__tests__/src/TestLogger"; -import { ProfilesListCommandBuilder } from "../../../../imperative/src/profiles/builders/ProfilesListCommandBuilder"; +import { ProfilesListCommandBuilder } from "../../../../../src/imperative/profiles/builders/ProfilesListCommandBuilder"; describe("Profile List Command Builder", () => { diff --git a/packages/imperative/src/cmd/__tests__/profiles/builders/ProfilesSetCommandBuilder.unit.test.ts b/packages/imperative/__tests__/__unit__/cmd/profiles/builders/ProfilesSetCommandBuilder.unit.test.ts similarity index 89% rename from packages/imperative/src/cmd/__tests__/profiles/builders/ProfilesSetCommandBuilder.unit.test.ts rename to packages/imperative/__tests__/__unit__/cmd/profiles/builders/ProfilesSetCommandBuilder.unit.test.ts index 4708f59ac6..0a1b44ce27 100644 --- a/packages/imperative/src/cmd/__tests__/profiles/builders/ProfilesSetCommandBuilder.unit.test.ts +++ b/packages/imperative/__tests__/__unit__/cmd/profiles/builders/ProfilesSetCommandBuilder.unit.test.ts @@ -11,7 +11,7 @@ import { deleteHandlerPaths, testBuilderProfiles } from "./ProfileBuilderTestConstants"; import { TestLogger } from "../../../../../__tests__/src/TestLogger"; -import { ProfilesSetCommandBuilder } from "../../../../imperative/src/profiles/builders/ProfilesSetCommandBuilder"; +import { ProfilesSetCommandBuilder } from ".../../../../../src/imperative/profiles/builders/ProfilesSetCommandBuilder"; describe("Profile Set Command Builder", () => { const logger = TestLogger.getTestLogger(); diff --git a/packages/imperative/src/cmd/__tests__/profiles/builders/ProfilesShowDependenciesCommandBuilder.unit.test.ts b/packages/imperative/__tests__/__unit__/cmd/profiles/builders/ProfilesShowDependenciesCommandBuilder.unit.test.ts similarity index 93% rename from packages/imperative/src/cmd/__tests__/profiles/builders/ProfilesShowDependenciesCommandBuilder.unit.test.ts rename to packages/imperative/__tests__/__unit__/cmd/profiles/builders/ProfilesShowDependenciesCommandBuilder.unit.test.ts index d40c6aa50d..767ad0e7fe 100644 --- a/packages/imperative/src/cmd/__tests__/profiles/builders/ProfilesShowDependenciesCommandBuilder.unit.test.ts +++ b/packages/imperative/__tests__/__unit__/cmd/profiles/builders/ProfilesShowDependenciesCommandBuilder.unit.test.ts @@ -11,7 +11,7 @@ import { deleteHandlerPaths, testBuilderProfiles } from "./ProfileBuilderTestConstants"; import { TestLogger } from "../../../../../__tests__/src/TestLogger"; -import { ProfilesShowDependenciesCommandBuilder } from "../../../../imperative/src/profiles/builders/ProfilesShowDependenciesCommandBuilder"; +import { ProfilesShowDependenciesCommandBuilder } from "../../../../../src/imperative/profiles/builders/ProfilesShowDependenciesCommandBuilder"; describe("Profile Show Dependencies Command Builder", () => { const logger = TestLogger.getTestLogger(); diff --git a/packages/imperative/src/cmd/__tests__/profiles/builders/ProfilesUpdateCommandBuilder.unit.test.ts b/packages/imperative/__tests__/__unit__/cmd/profiles/builders/ProfilesUpdateCommandBuilder.unit.test.ts similarity index 97% rename from packages/imperative/src/cmd/__tests__/profiles/builders/ProfilesUpdateCommandBuilder.unit.test.ts rename to packages/imperative/__tests__/__unit__/cmd/profiles/builders/ProfilesUpdateCommandBuilder.unit.test.ts index b914a10749..22e9f7129a 100644 --- a/packages/imperative/src/cmd/__tests__/profiles/builders/ProfilesUpdateCommandBuilder.unit.test.ts +++ b/packages/imperative/__tests__/__unit__/cmd/profiles/builders/ProfilesUpdateCommandBuilder.unit.test.ts @@ -11,7 +11,7 @@ import { deleteHandlerPaths, testBuilderProfiles } from "./ProfileBuilderTestConstants"; import { TestLogger } from "../../../../../__tests__/src/TestLogger"; -import { ProfilesUpdateCommandBuilder } from "../../../../imperative/src/profiles/builders/ProfilesUpdateCommandBuilder"; +import { ProfilesUpdateCommandBuilder } from "../../../../../src/imperative/profiles/builders/ProfilesUpdateCommandBuilder"; describe("Profile Update Command Builder", () => { const logger = TestLogger.getTestLogger(); diff --git a/packages/imperative/src/cmd/__tests__/profiles/builders/ProfilesValidateCommandBuilder.unit.test.ts b/packages/imperative/__tests__/__unit__/cmd/profiles/builders/ProfilesValidateCommandBuilder.unit.test.ts similarity index 82% rename from packages/imperative/src/cmd/__tests__/profiles/builders/ProfilesValidateCommandBuilder.unit.test.ts rename to packages/imperative/__tests__/__unit__/cmd/profiles/builders/ProfilesValidateCommandBuilder.unit.test.ts index b0111b8003..f2f4bcad4d 100644 --- a/packages/imperative/src/cmd/__tests__/profiles/builders/ProfilesValidateCommandBuilder.unit.test.ts +++ b/packages/imperative/__tests__/__unit__/cmd/profiles/builders/ProfilesValidateCommandBuilder.unit.test.ts @@ -9,12 +9,12 @@ * */ -jest.mock("../../../../utilities/src/ImperativeConfig"); +jest.mock("../../../../utilities/ImperativeConfig"); import { deleteHandlerPaths, testBuilderProfiles } from "./ProfileBuilderTestConstants"; import { TestLogger } from "../../../../../__tests__/src/TestLogger"; -import { ProfilesValidateCommandBuilder } from "../../../../imperative/src/profiles/builders/ProfilesValidateCommandBuilder"; -import { ImperativeConfig } from "../../../../utilities"; +import { ProfilesValidateCommandBuilder } from "../../../../../src/imperative/profiles/builders/ProfilesValidateCommandBuilder"; +import { ImperativeConfig } from "../../../../../src/utilities/ImperativeConfig"; describe("Profile Validate Command Builder", () => { const logger = TestLogger.getTestLogger(); diff --git a/packages/imperative/src/cmd/__tests__/profiles/builders/__snapshots__/CompleteProfilesGroupBuilder.unit.test.ts.snap b/packages/imperative/__tests__/__unit__/cmd/profiles/builders/__snapshots__/CompleteProfilesGroupBuilder.unit.test.ts.snap similarity index 100% rename from packages/imperative/src/cmd/__tests__/profiles/builders/__snapshots__/CompleteProfilesGroupBuilder.unit.test.ts.snap rename to packages/imperative/__tests__/__unit__/cmd/profiles/builders/__snapshots__/CompleteProfilesGroupBuilder.unit.test.ts.snap diff --git a/packages/imperative/src/cmd/__tests__/profiles/builders/__snapshots__/ProfilesCreateCommandBuilder.unit.test.ts.snap b/packages/imperative/__tests__/__unit__/cmd/profiles/builders/__snapshots__/ProfilesCreateCommandBuilder.unit.test.ts.snap similarity index 100% rename from packages/imperative/src/cmd/__tests__/profiles/builders/__snapshots__/ProfilesCreateCommandBuilder.unit.test.ts.snap rename to packages/imperative/__tests__/__unit__/cmd/profiles/builders/__snapshots__/ProfilesCreateCommandBuilder.unit.test.ts.snap diff --git a/packages/imperative/src/cmd/__tests__/profiles/builders/__snapshots__/ProfilesDeleteCommandBuilder.unit.test.ts.snap b/packages/imperative/__tests__/__unit__/cmd/profiles/builders/__snapshots__/ProfilesDeleteCommandBuilder.unit.test.ts.snap similarity index 100% rename from packages/imperative/src/cmd/__tests__/profiles/builders/__snapshots__/ProfilesDeleteCommandBuilder.unit.test.ts.snap rename to packages/imperative/__tests__/__unit__/cmd/profiles/builders/__snapshots__/ProfilesDeleteCommandBuilder.unit.test.ts.snap diff --git a/packages/imperative/src/cmd/__tests__/profiles/builders/__snapshots__/ProfilesListCommandBuilder.unit.test.ts.snap b/packages/imperative/__tests__/__unit__/cmd/profiles/builders/__snapshots__/ProfilesListCommandBuilder.unit.test.ts.snap similarity index 100% rename from packages/imperative/src/cmd/__tests__/profiles/builders/__snapshots__/ProfilesListCommandBuilder.unit.test.ts.snap rename to packages/imperative/__tests__/__unit__/cmd/profiles/builders/__snapshots__/ProfilesListCommandBuilder.unit.test.ts.snap diff --git a/packages/imperative/src/cmd/__tests__/profiles/builders/__snapshots__/ProfilesSetCommandBuilder.unit.test.ts.snap b/packages/imperative/__tests__/__unit__/cmd/profiles/builders/__snapshots__/ProfilesSetCommandBuilder.unit.test.ts.snap similarity index 100% rename from packages/imperative/src/cmd/__tests__/profiles/builders/__snapshots__/ProfilesSetCommandBuilder.unit.test.ts.snap rename to packages/imperative/__tests__/__unit__/cmd/profiles/builders/__snapshots__/ProfilesSetCommandBuilder.unit.test.ts.snap diff --git a/packages/imperative/src/cmd/__tests__/profiles/builders/__snapshots__/ProfilesShowDependenciesCommandBuilder.unit.test.ts.snap b/packages/imperative/__tests__/__unit__/cmd/profiles/builders/__snapshots__/ProfilesShowDependenciesCommandBuilder.unit.test.ts.snap similarity index 100% rename from packages/imperative/src/cmd/__tests__/profiles/builders/__snapshots__/ProfilesShowDependenciesCommandBuilder.unit.test.ts.snap rename to packages/imperative/__tests__/__unit__/cmd/profiles/builders/__snapshots__/ProfilesShowDependenciesCommandBuilder.unit.test.ts.snap diff --git a/packages/imperative/src/cmd/__tests__/profiles/builders/__snapshots__/ProfilesUpdateCommandBuilder.unit.test.ts.snap b/packages/imperative/__tests__/__unit__/cmd/profiles/builders/__snapshots__/ProfilesUpdateCommandBuilder.unit.test.ts.snap similarity index 100% rename from packages/imperative/src/cmd/__tests__/profiles/builders/__snapshots__/ProfilesUpdateCommandBuilder.unit.test.ts.snap rename to packages/imperative/__tests__/__unit__/cmd/profiles/builders/__snapshots__/ProfilesUpdateCommandBuilder.unit.test.ts.snap diff --git a/packages/imperative/src/cmd/__tests__/profiles/builders/__snapshots__/ProfilesValidateCommandBuilder.unit.test.ts.snap b/packages/imperative/__tests__/__unit__/cmd/profiles/builders/__snapshots__/ProfilesValidateCommandBuilder.unit.test.ts.snap similarity index 100% rename from packages/imperative/src/cmd/__tests__/profiles/builders/__snapshots__/ProfilesValidateCommandBuilder.unit.test.ts.snap rename to packages/imperative/__tests__/__unit__/cmd/profiles/builders/__snapshots__/ProfilesValidateCommandBuilder.unit.test.ts.snap diff --git a/packages/imperative/src/cmd/__tests__/profiles/profileHandlers/AddTwoNumbersHandler.ts b/packages/imperative/__tests__/__unit__/cmd/profiles/profileHandlers/AddTwoNumbersHandler.ts similarity index 89% rename from packages/imperative/src/cmd/__tests__/profiles/profileHandlers/AddTwoNumbersHandler.ts rename to packages/imperative/__tests__/__unit__/cmd/profiles/profileHandlers/AddTwoNumbersHandler.ts index 0f3db4eef3..621e113962 100644 --- a/packages/imperative/src/cmd/__tests__/profiles/profileHandlers/AddTwoNumbersHandler.ts +++ b/packages/imperative/__tests__/__unit__/cmd/profiles/profileHandlers/AddTwoNumbersHandler.ts @@ -9,7 +9,7 @@ * */ -import { ICommandHandler, IHandlerParameters } from "../../../"; +import { ICommandHandler, IHandlerParameters } from "../../../../../"; export default class AddTwoNumbersHandler implements ICommandHandler { public async process(params: IHandlerParameters): Promise { diff --git a/packages/imperative/src/cmd/__tests__/profiles/profileHandlers/DoNothingHandler.ts b/packages/imperative/__tests__/__unit__/cmd/profiles/profileHandlers/DoNothingHandler.ts similarity index 88% rename from packages/imperative/src/cmd/__tests__/profiles/profileHandlers/DoNothingHandler.ts rename to packages/imperative/__tests__/__unit__/cmd/profiles/profileHandlers/DoNothingHandler.ts index ab19d2da81..0ad226de53 100644 --- a/packages/imperative/src/cmd/__tests__/profiles/profileHandlers/DoNothingHandler.ts +++ b/packages/imperative/__tests__/__unit__/cmd/profiles/profileHandlers/DoNothingHandler.ts @@ -9,7 +9,7 @@ * */ -import { ICommandHandler, IHandlerParameters } from "../../../"; +import { ICommandHandler, IHandlerParameters } from "../../../../../"; export default class DoNothingHandler implements ICommandHandler { public async process(params: IHandlerParameters): Promise { diff --git a/packages/imperative/src/cmd/__tests__/profiles/profileHandlers/ThrowErrorHandler.ts b/packages/imperative/__tests__/__unit__/cmd/profiles/profileHandlers/ThrowErrorHandler.ts similarity index 87% rename from packages/imperative/src/cmd/__tests__/profiles/profileHandlers/ThrowErrorHandler.ts rename to packages/imperative/__tests__/__unit__/cmd/profiles/profileHandlers/ThrowErrorHandler.ts index 021b5f32d2..2dcfffcc35 100644 --- a/packages/imperative/src/cmd/__tests__/profiles/profileHandlers/ThrowErrorHandler.ts +++ b/packages/imperative/__tests__/__unit__/cmd/profiles/profileHandlers/ThrowErrorHandler.ts @@ -9,7 +9,7 @@ * */ -import { ICommandHandler, IHandlerParameters } from "../../../"; +import { ICommandHandler, IHandlerParameters } from "../../../../../"; export default class ThrowErrorHandler implements ICommandHandler { public async process(params: IHandlerParameters): Promise { diff --git a/packages/imperative/src/cmd/__tests__/response/CommandResponse.unit.test.ts b/packages/imperative/__tests__/__unit__/cmd/response/CommandResponse.unit.test.ts similarity index 99% rename from packages/imperative/src/cmd/__tests__/response/CommandResponse.unit.test.ts rename to packages/imperative/__tests__/__unit__/cmd/response/CommandResponse.unit.test.ts index 02f0af5fd0..965293a71b 100644 --- a/packages/imperative/src/cmd/__tests__/response/CommandResponse.unit.test.ts +++ b/packages/imperative/__tests__/__unit__/cmd/response/CommandResponse.unit.test.ts @@ -9,16 +9,17 @@ * */ -import { ITaskWithStatus, TaskStage } from "../../../operations"; +import { ITaskWithStatus, TaskStage } from "../../../../src/operations"; jest.mock("chalk"); -import { CommandResponse } from "../../src/response/CommandResponse"; -import { ImperativeError } from "../../../error"; +import { CommandResponse } from "../../../../src/cmd/response/CommandResponse"; +import { ImperativeError } from "../../../../src/error"; import { inspect } from "util"; import { TestLogger } from "../../../../__tests__/src/TestLogger"; -import { IO } from "../../../io"; -import { OUTPUT_FORMAT } from "../.."; -import { CliUtils, IDaemonResponse } from "../../../utilities"; +import { IO } from "../../../../src/io"; +import { OUTPUT_FORMAT } from "../../../.."; +import { CliUtils } from "../../../../src/utilities/CliUtils"; +import { IDaemonResponse } from "../../../../src/utilities/doc/IDaemonResponse"; const beforeForceColor = process.env.FORCE_COLOR; diff --git a/packages/imperative/src/cmd/__tests__/response/HandlerResponse.unit.test.ts b/packages/imperative/__tests__/__unit__/cmd/response/HandlerResponse.unit.test.ts similarity index 79% rename from packages/imperative/src/cmd/__tests__/response/HandlerResponse.unit.test.ts rename to packages/imperative/__tests__/__unit__/cmd/response/HandlerResponse.unit.test.ts index e95443b881..31e6b21ce9 100644 --- a/packages/imperative/src/cmd/__tests__/response/HandlerResponse.unit.test.ts +++ b/packages/imperative/__tests__/__unit__/cmd/response/HandlerResponse.unit.test.ts @@ -9,9 +9,9 @@ * */ -import { HandlerResponse } from "../../src/response/HandlerResponse"; -import { CommandResponse } from "../../src/response/CommandResponse"; -import { IHandlerResponseApi } from "../../src/doc/response/api/handler/IHandlerResponseApi"; +import { HandlerResponse } from "../../../../src/cmd/response/HandlerResponse"; +import { CommandResponse } from "../../../../src/cmd/response/CommandResponse"; +import { IHandlerResponseApi } from "../../../../src/cmd/doc/response/api/handler/IHandlerResponseApi"; describe("Handler Response", () => { it("Handler Response", () => { diff --git a/packages/imperative/src/cmd/__tests__/response/__snapshots__/CommandResponse.unit.test.ts.snap b/packages/imperative/__tests__/__unit__/cmd/response/__snapshots__/CommandResponse.unit.test.ts.snap similarity index 100% rename from packages/imperative/src/cmd/__tests__/response/__snapshots__/CommandResponse.unit.test.ts.snap rename to packages/imperative/__tests__/__unit__/cmd/response/__snapshots__/CommandResponse.unit.test.ts.snap diff --git a/packages/imperative/src/cmd/__tests__/utils/CommandUtils.unit.test.ts b/packages/imperative/__tests__/__unit__/cmd/utils/CommandUtils.unit.test.ts similarity index 92% rename from packages/imperative/src/cmd/__tests__/utils/CommandUtils.unit.test.ts rename to packages/imperative/__tests__/__unit__/cmd/utils/CommandUtils.unit.test.ts index c92e854337..b74454a1e7 100644 --- a/packages/imperative/src/cmd/__tests__/utils/CommandUtils.unit.test.ts +++ b/packages/imperative/__tests__/__unit__/cmd/utils/CommandUtils.unit.test.ts @@ -9,13 +9,13 @@ * */ -import { ICommandDefinition } from "../../src/doc/ICommandDefinition"; -import { CommandPreparer } from "../../src/CommandPreparer"; -import { ICommandOptionDefinition } from "../../src/doc/option/ICommandOptionDefinition"; +import { ICommandDefinition } from "../../../../src/cmd/doc/ICommandDefinition"; +import { CommandPreparer } from "../../../../src/cmd/CommandPreparer"; +import { ICommandOptionDefinition } from "../../../../src/cmd/doc/option/ICommandOptionDefinition"; import { COMPLEX_COMMAND, COMPLEX_COMMAND_WITH_ALIASES, MULTIPLE_GROUPS } from "../__resources__/CommandDefinitions"; import { TestLogger } from "../../../../__tests__/src/TestLogger"; import { inspect } from "util"; -import { CommandUtils, ICommandTreeEntry } from "../../"; +import { CommandUtils, ICommandTreeEntry } from "../../../../"; import { cloneDeep } from "lodash"; // UnitTestUtils.replaceIt(); diff --git a/packages/imperative/src/cmd/__tests__/utils/SharedOptions.unit.test.ts b/packages/imperative/__tests__/__unit__/cmd/utils/SharedOptions.unit.test.ts similarity index 91% rename from packages/imperative/src/cmd/__tests__/utils/SharedOptions.unit.test.ts rename to packages/imperative/__tests__/__unit__/cmd/utils/SharedOptions.unit.test.ts index d9690978a7..a51abec191 100644 --- a/packages/imperative/src/cmd/__tests__/utils/SharedOptions.unit.test.ts +++ b/packages/imperative/__tests__/__unit__/cmd/utils/SharedOptions.unit.test.ts @@ -10,12 +10,12 @@ */ // jest.mock("process"); -import { SharedOptions } from "../../src/utils/SharedOptions"; -import { Constants } from "../../../constants/src/Constants"; +import { SharedOptions } from "../../../../src/cmd/utils/SharedOptions"; +import { Constants } from "../../../../src/constants/Constants"; import { Socket } from "net"; -import { ImperativeError } from "../../../error"; -import { CommandResponse } from "../../src/response/CommandResponse"; +import { ImperativeError } from "../../../../src/error"; +import { CommandResponse } from "../../../../src/cmd/response/CommandResponse"; jest.mock("../../src/response/CommandResponse"); diff --git a/packages/imperative/src/cmd/__tests__/utils/__snapshots__/CommandUtils.unit.test.ts.snap b/packages/imperative/__tests__/__unit__/cmd/utils/__snapshots__/CommandUtils.unit.test.ts.snap similarity index 100% rename from packages/imperative/src/cmd/__tests__/utils/__snapshots__/CommandUtils.unit.test.ts.snap rename to packages/imperative/__tests__/__unit__/cmd/utils/__snapshots__/CommandUtils.unit.test.ts.snap diff --git a/packages/imperative/src/cmd/__tests__/utils/__snapshots__/SharedOptions.unit.test.ts.snap b/packages/imperative/__tests__/__unit__/cmd/utils/__snapshots__/SharedOptions.unit.test.ts.snap similarity index 100% rename from packages/imperative/src/cmd/__tests__/utils/__snapshots__/SharedOptions.unit.test.ts.snap rename to packages/imperative/__tests__/__unit__/cmd/utils/__snapshots__/SharedOptions.unit.test.ts.snap diff --git a/packages/imperative/src/cmd/__tests__/yargs/YargsConfigurer.unit.test.ts b/packages/imperative/__tests__/__unit__/cmd/yargs/YargsConfigurer.unit.test.ts similarity index 98% rename from packages/imperative/src/cmd/__tests__/yargs/YargsConfigurer.unit.test.ts rename to packages/imperative/__tests__/__unit__/cmd/yargs/YargsConfigurer.unit.test.ts index 6c3b0c7049..76f9df4fed 100644 --- a/packages/imperative/src/cmd/__tests__/yargs/YargsConfigurer.unit.test.ts +++ b/packages/imperative/__tests__/__unit__/cmd/yargs/YargsConfigurer.unit.test.ts @@ -9,8 +9,8 @@ * */ -import { CommandProcessor } from "../../src/CommandProcessor"; -import { Constants, ImperativeConfig, YargsConfigurer } from "../../.."; +import { CommandProcessor } from "../../../../src/cmd/CommandProcessor"; +import { Constants, ImperativeConfig, YargsConfigurer } from "../../../.."; jest.mock("yargs"); jest.mock("../../src/CommandProcessor"); diff --git a/packages/imperative/src/cmd/__tests__/yargs/__snapshots__/YargsConfigurer.unit.test.ts.snap b/packages/imperative/__tests__/__unit__/cmd/yargs/__snapshots__/YargsConfigurer.unit.test.ts.snap similarity index 100% rename from packages/imperative/src/cmd/__tests__/yargs/__snapshots__/YargsConfigurer.unit.test.ts.snap rename to packages/imperative/__tests__/__unit__/cmd/yargs/__snapshots__/YargsConfigurer.unit.test.ts.snap diff --git a/packages/imperative/src/config/__tests__/Config.api.unit.test.ts b/packages/imperative/__tests__/__unit__/config/Config.api.unit.test.ts similarity index 98% rename from packages/imperative/src/config/__tests__/Config.api.unit.test.ts rename to packages/imperative/__tests__/__unit__/config/Config.api.unit.test.ts index 120166a7df..5c783e1224 100644 --- a/packages/imperative/src/config/__tests__/Config.api.unit.test.ts +++ b/packages/imperative/__tests__/__unit__/config/Config.api.unit.test.ts @@ -12,12 +12,12 @@ import * as fs from "fs"; import * as path from "path"; import * as JSONC from "comment-json"; -import { ConfigSecure } from "../src/api"; -import { Config } from "../src/Config"; -import { ConfigConstants } from "../src/ConfigConstants"; -import { IConfig } from "../src/doc/IConfig"; -import { IConfigLayer } from "../src/doc/IConfigLayer"; -import { IConfigProfile } from "../src/doc/IConfigProfile"; +import { ConfigSecure } from "../../../src/config/api"; +import { Config } from "../../../src/config/"; +import { ConfigConstants } from "../../../src/config/ConfigConstants"; +import { IConfig } from "../../../src/config/doc/IConfig"; +import { IConfigLayer } from "../../../src/config/doc/IConfigLayer"; +import { IConfigProfile } from "../../../src/config/doc/IConfigProfile"; const MY_APP = "my_app"; diff --git a/packages/imperative/src/config/__tests__/Config.secure.unit.test.ts b/packages/imperative/__tests__/__unit__/config/Config.secure.unit.test.ts similarity index 97% rename from packages/imperative/src/config/__tests__/Config.secure.unit.test.ts rename to packages/imperative/__tests__/__unit__/config/Config.secure.unit.test.ts index 44500f6737..afdebc5b33 100644 --- a/packages/imperative/src/config/__tests__/Config.secure.unit.test.ts +++ b/packages/imperative/__tests__/__unit__/config/Config.secure.unit.test.ts @@ -12,12 +12,12 @@ import * as fs from "fs"; import * as path from "path"; import * as lodash from "lodash"; -import { CredentialManagerFactory } from "../../security"; -import { ImperativeError } from "../../error/src/ImperativeError"; -import { Config } from "../src/Config"; -import { IConfig } from "../src/doc/IConfig"; -import { IConfigSecure } from "../src/doc/IConfigSecure"; -import { IConfigVault } from "../src/doc/IConfigVault"; +import { CredentialManagerFactory } from "../../../src/security"; +import { ImperativeError } from "../../../src/error/ImperativeError"; +import { Config } from "../../../src/config/Config"; +import { IConfig } from "../../../src/config/doc/IConfig"; +import { IConfigSecure } from "../../../src/config/doc/IConfigSecure"; +import { IConfigVault } from "../../../src/config/doc/IConfigVault"; const MY_APP = "my_app"; diff --git a/packages/imperative/src/config/__tests__/Config.unit.test.ts b/packages/imperative/__tests__/__unit__/config/Config.unit.test.ts similarity index 99% rename from packages/imperative/src/config/__tests__/Config.unit.test.ts rename to packages/imperative/__tests__/__unit__/config/Config.unit.test.ts index 708e480243..92cfaaaa4e 100644 --- a/packages/imperative/src/config/__tests__/Config.unit.test.ts +++ b/packages/imperative/__tests__/__unit__/config/Config.unit.test.ts @@ -13,11 +13,11 @@ import * as fs from "fs"; import * as os from "os"; import * as path from "path"; import * as findUp from "find-up"; -import { ImperativeError } from "../../error/src/ImperativeError"; -import { Config } from "../src/Config"; -import { ConfigConstants } from "../src/ConfigConstants"; +import { ImperativeError } from "../../../src/error/ImperativeError"; +import { Config } from "../../../src/config/Config"; +import { ConfigConstants } from "../../../src/config/ConfigConstants"; import * as JSONC from "comment-json"; -import { ConfigLayers, ConfigSecure } from "../src/api"; +import { ConfigLayers, ConfigSecure } from "../../../src/config/api"; const MY_APP = "my_app"; diff --git a/packages/imperative/src/config/__tests__/ConfigAutoStore.unit.test.ts b/packages/imperative/__tests__/__unit__/config/ConfigAutoStore.unit.test.ts similarity index 99% rename from packages/imperative/src/config/__tests__/ConfigAutoStore.unit.test.ts rename to packages/imperative/__tests__/__unit__/config/ConfigAutoStore.unit.test.ts index a861671f60..aa419d3be0 100644 --- a/packages/imperative/src/config/__tests__/ConfigAutoStore.unit.test.ts +++ b/packages/imperative/__tests__/__unit__/config/ConfigAutoStore.unit.test.ts @@ -10,10 +10,10 @@ */ jest.mock("../../logger/src/LoggerUtils"); -import { AbstractAuthHandler } from "../../imperative"; -import { SessConstants } from "../../rest"; -import { ImperativeConfig } from "../../utilities"; -import { ConfigAutoStore } from "../src/ConfigAutoStore"; +import { AbstractAuthHandler } from "../../../src/imperative"; +import { SessConstants } from "../../../src/rest"; +import { ImperativeConfig } from "../../../src/utilities/ImperativeConfig"; +import { ConfigAutoStore } from "../../../src/config/ConfigAutoStore"; import { setupConfigToLoad } from "../../../__tests__/src/TestUtil"; describe("ConfigAutoStore tests", () => { diff --git a/packages/imperative/src/config/__tests__/ConfigBuilder.unit.test.ts b/packages/imperative/__tests__/__unit__/config/ConfigBuilder.unit.test.ts similarity index 99% rename from packages/imperative/src/config/__tests__/ConfigBuilder.unit.test.ts rename to packages/imperative/__tests__/__unit__/config/ConfigBuilder.unit.test.ts index f7e2f63cb5..f47c08153a 100644 --- a/packages/imperative/src/config/__tests__/ConfigBuilder.unit.test.ts +++ b/packages/imperative/__tests__/__unit__/config/ConfigBuilder.unit.test.ts @@ -9,9 +9,9 @@ * */ -import { CredentialManagerFactory, IImperativeConfig } from "../.."; -import { Config, ConfigBuilder, IConfig } from "../"; -import { ProfileIO } from "../../profiles"; +import { CredentialManagerFactory, IImperativeConfig } from "../../../"; +import { Config, ConfigBuilder, IConfig } from "../../../"; +import { ProfileIO } from "../../../src/profiles"; import * as config from "../../../__tests__/__integration__/imperative/src/imperative"; import * as lodash from "lodash"; diff --git a/packages/imperative/src/config/__tests__/ConfigSchema.unit.test.ts b/packages/imperative/__tests__/__unit__/config/ConfigSchema.unit.test.ts similarity index 99% rename from packages/imperative/src/config/__tests__/ConfigSchema.unit.test.ts rename to packages/imperative/__tests__/__unit__/config/ConfigSchema.unit.test.ts index b0d582622e..38087b0e7c 100644 --- a/packages/imperative/src/config/__tests__/ConfigSchema.unit.test.ts +++ b/packages/imperative/__tests__/__unit__/config/ConfigSchema.unit.test.ts @@ -9,11 +9,11 @@ * */ -import { IProfileTypeConfiguration } from "../../profiles"; -import { ConfigSchema } from "../src/ConfigSchema"; +import { IProfileTypeConfiguration } from "../../../src/profiles"; +import { ConfigSchema } from "../../../src/config/ConfigSchema"; import { cloneDeep } from "lodash"; -import { ICommandProfileTypeConfiguration, ImperativeConfig, Logger } from "../.."; -import { Config, IConfig, IConfigLayer, IConfigUpdateSchemaHelperOptions } from ".."; +import { ICommandProfileTypeConfiguration, ImperativeConfig, Logger } from "../../../"; +import { Config, IConfig, IConfigLayer, IConfigUpdateSchemaHelperOptions } from "../../.."; import * as path from "path"; describe("Config Schema", () => { diff --git a/packages/imperative/src/config/__tests__/ConfigUtils.unit.test.ts b/packages/imperative/__tests__/__unit__/config/ConfigUtils.unit.test.ts similarity index 94% rename from packages/imperative/src/config/__tests__/ConfigUtils.unit.test.ts rename to packages/imperative/__tests__/__unit__/config/ConfigUtils.unit.test.ts index c909303d13..82c253806a 100644 --- a/packages/imperative/src/config/__tests__/ConfigUtils.unit.test.ts +++ b/packages/imperative/__tests__/__unit__/config/ConfigUtils.unit.test.ts @@ -9,9 +9,9 @@ * */ -import * as ConfigUtils from "../../config/src/ConfigUtils"; -import { CredentialManagerFactory } from "../../security"; -import { ImperativeConfig } from "../../utilities"; +import * as ConfigUtils from "../../../src/config/ConfigUtils"; +import { CredentialManagerFactory } from "../../../src/security"; +import { ImperativeConfig } from "../../../src/utilities/ImperativeConfig"; describe("Config Utils", () => { describe("coercePropValue", () => { diff --git a/packages/imperative/src/config/__tests__/ProfInfoErr.unit.test.ts b/packages/imperative/__tests__/__unit__/config/ProfInfoErr.unit.test.ts similarity index 98% rename from packages/imperative/src/config/__tests__/ProfInfoErr.unit.test.ts rename to packages/imperative/__tests__/__unit__/config/ProfInfoErr.unit.test.ts index b3bffe3691..ece785c3e9 100644 --- a/packages/imperative/src/config/__tests__/ProfInfoErr.unit.test.ts +++ b/packages/imperative/__tests__/__unit__/config/ProfInfoErr.unit.test.ts @@ -9,7 +9,7 @@ * */ -import { ProfInfoErr } from "../src/ProfInfoErr"; +import { ProfInfoErr } from "../../../src/config/ProfInfoErr"; describe("ProfInfoErr tests", () => { it("should throw error with only impErrDetails", async () => { diff --git a/packages/imperative/src/config/__tests__/ProfileCredentials.unit.test.ts b/packages/imperative/__tests__/__unit__/config/ProfileCredentials.unit.test.ts similarity index 98% rename from packages/imperative/src/config/__tests__/ProfileCredentials.unit.test.ts rename to packages/imperative/__tests__/__unit__/config/ProfileCredentials.unit.test.ts index cb8c450dae..c00835e3a2 100644 --- a/packages/imperative/src/config/__tests__/ProfileCredentials.unit.test.ts +++ b/packages/imperative/__tests__/__unit__/config/ProfileCredentials.unit.test.ts @@ -11,12 +11,12 @@ import * as fs from "fs"; import { CredentialManagerFactory, DefaultCredentialManager, ICredentialManagerInit } from "../../security"; -import { ConfigSecure } from "../src/api/ConfigSecure"; -import { ProfileCredentials } from "../src/ProfileCredentials"; +import { ConfigSecure } from "../../../src/config/api/ConfigSecure"; +import { ProfileCredentials } from "../../../src/config/ProfileCredentials"; jest.mock("../../security/src/CredentialManagerFactory"); jest.mock("../../security/src/DefaultCredentialManager"); -jest.mock("../../utilities/src/ImperativeConfig"); +jest.mock("../../utilities/ImperativeConfig"); function mockConfigApi(secureApi: Partial): any { return { diff --git a/packages/imperative/src/config/__tests__/ProfileInfo.OldProfiles.unit.test.ts b/packages/imperative/__tests__/__unit__/config/ProfileInfo.OldProfiles.unit.test.ts similarity index 98% rename from packages/imperative/src/config/__tests__/ProfileInfo.OldProfiles.unit.test.ts rename to packages/imperative/__tests__/__unit__/config/ProfileInfo.OldProfiles.unit.test.ts index d73f69e081..5b6f8e1d7d 100644 --- a/packages/imperative/src/config/__tests__/ProfileInfo.OldProfiles.unit.test.ts +++ b/packages/imperative/__tests__/__unit__/config/ProfileInfo.OldProfiles.unit.test.ts @@ -10,14 +10,14 @@ */ import * as path from "path"; -import { ProfileInfo } from "../src/ProfileInfo"; -import { IProfAttrs } from "../src/doc/IProfAttrs"; -import { IProfOpts } from "../src/doc/IProfOpts"; -import { ProfInfoErr } from "../src/ProfInfoErr"; -import { ProfLocType } from "../src/doc/IProfLoc"; -import { IProfileSchema, ProfileIO } from "../../profiles"; -import { ImperativeError } from "../../error"; -import { IProfArgAttrs } from "../src/doc/IProfArgAttrs"; +import { ProfileInfo } from "../../../src/config/ProfileInfo"; +import { IProfAttrs } from "../../../src/config//doc/IProfAttrs"; +import { IProfOpts } from "../../../src/config/doc/IProfOpts"; +import { ProfInfoErr } from "../../../src/config/ProfInfoErr"; +import { ProfLocType } from "../../../src/config/doc/IProfLoc"; +import { IProfileSchema, ProfileIO } from "../../../src/profiles"; +import { ImperativeError } from "../../../src/error"; +import { IProfArgAttrs } from "../../../src/config/doc/IProfArgAttrs"; const testAppNm = "ProfInfoApp"; const testEnvPrefix = testAppNm.toUpperCase(); diff --git a/packages/imperative/src/config/__tests__/ProfileInfo.TeamConfig.unit.test.ts b/packages/imperative/__tests__/__unit__/config/ProfileInfo.TeamConfig.unit.test.ts similarity index 98% rename from packages/imperative/src/config/__tests__/ProfileInfo.TeamConfig.unit.test.ts rename to packages/imperative/__tests__/__unit__/config/ProfileInfo.TeamConfig.unit.test.ts index 1042b5a537..e3cf436b7e 100644 --- a/packages/imperative/src/config/__tests__/ProfileInfo.TeamConfig.unit.test.ts +++ b/packages/imperative/__tests__/__unit__/config/ProfileInfo.TeamConfig.unit.test.ts @@ -12,19 +12,19 @@ import * as path from "path"; import * as jsonfile from "jsonfile"; import * as lodash from "lodash"; -import { ProfileInfo } from "../src/ProfileInfo"; -import { IProfAttrs } from "../src/doc/IProfAttrs"; -import { IProfArgAttrs } from "../src/doc/IProfArgAttrs"; -import { IProfOpts } from "../src/doc/IProfOpts"; -import { ProfInfoErr } from "../src/ProfInfoErr"; -import { Config } from "../src/Config"; -import { IConfigOpts } from "../src/doc/IConfigOpts"; -import { ProfLocType } from "../src/doc/IProfLoc"; -import { IProfileSchema } from "../../profiles"; -import { AbstractSession, SessConstants } from "../../rest"; -import { ConfigAutoStore } from "../src/ConfigAutoStore"; -import { ImperativeConfig } from "../../utilities/src/ImperativeConfig"; -import { ImperativeError } from "../../error"; +import { ProfileInfo } from "../../../src/config/ProfileInfo"; +import { IProfAttrs } from "../../../src/config/doc/IProfAttrs"; +import { IProfArgAttrs } from "../../../src/config/doc/IProfArgAttrs"; +import { IProfOpts } from "../../../src/config/doc/IProfOpts"; +import { ProfInfoErr } from "../../../src/config/ProfInfoErr"; +import { Config } from "../../../src/config/Config"; +import { IConfigOpts } from "../../../src/config/doc/IConfigOpts"; +import { ProfLocType } from "../../../src/config/doc/IProfLoc"; +import { IProfileSchema } from "../../../src/profiles"; +import { AbstractSession, SessConstants } from "../../../src/rest"; +import { ConfigAutoStore } from "../../../src/config/ConfigAutoStore"; +import { ImperativeConfig } from "../../../src/utilities/ImperativeConfig"; +import { ImperativeError } from "../../../src/error"; const testAppNm = "ProfInfoApp"; const testEnvPrefix = testAppNm.toUpperCase(); diff --git a/packages/imperative/src/config/__tests__/__resources__/ProfInfoApp_home/profiles/base/base_apiml.yaml b/packages/imperative/__tests__/__unit__/config/__resources__/ProfInfoApp_home/profiles/base/base_apiml.yaml similarity index 100% rename from packages/imperative/src/config/__tests__/__resources__/ProfInfoApp_home/profiles/base/base_apiml.yaml rename to packages/imperative/__tests__/__unit__/config/__resources__/ProfInfoApp_home/profiles/base/base_apiml.yaml diff --git a/packages/imperative/src/config/__tests__/__resources__/ProfInfoApp_home/profiles/base/base_for_userNm.yaml b/packages/imperative/__tests__/__unit__/config/__resources__/ProfInfoApp_home/profiles/base/base_for_userNm.yaml similarity index 100% rename from packages/imperative/src/config/__tests__/__resources__/ProfInfoApp_home/profiles/base/base_for_userNm.yaml rename to packages/imperative/__tests__/__unit__/config/__resources__/ProfInfoApp_home/profiles/base/base_for_userNm.yaml diff --git a/packages/imperative/src/config/__tests__/__resources__/ProfInfoApp_home/profiles/base/base_meta.yaml b/packages/imperative/__tests__/__unit__/config/__resources__/ProfInfoApp_home/profiles/base/base_meta.yaml similarity index 100% rename from packages/imperative/src/config/__tests__/__resources__/ProfInfoApp_home/profiles/base/base_meta.yaml rename to packages/imperative/__tests__/__unit__/config/__resources__/ProfInfoApp_home/profiles/base/base_meta.yaml diff --git a/packages/imperative/src/config/__tests__/__resources__/ProfInfoApp_home/profiles/missing/missing_meta.yaml b/packages/imperative/__tests__/__unit__/config/__resources__/ProfInfoApp_home/profiles/missing/missing_meta.yaml similarity index 100% rename from packages/imperative/src/config/__tests__/__resources__/ProfInfoApp_home/profiles/missing/missing_meta.yaml rename to packages/imperative/__tests__/__unit__/config/__resources__/ProfInfoApp_home/profiles/missing/missing_meta.yaml diff --git a/packages/imperative/src/config/__tests__/__resources__/ProfInfoApp_home/profiles/tso/tsoProfName.yaml b/packages/imperative/__tests__/__unit__/config/__resources__/ProfInfoApp_home/profiles/tso/tsoProfName.yaml similarity index 100% rename from packages/imperative/src/config/__tests__/__resources__/ProfInfoApp_home/profiles/tso/tsoProfName.yaml rename to packages/imperative/__tests__/__unit__/config/__resources__/ProfInfoApp_home/profiles/tso/tsoProfName.yaml diff --git a/packages/imperative/src/config/__tests__/__resources__/ProfInfoApp_home/profiles/tso/tso_meta.yaml b/packages/imperative/__tests__/__unit__/config/__resources__/ProfInfoApp_home/profiles/tso/tso_meta.yaml similarity index 100% rename from packages/imperative/src/config/__tests__/__resources__/ProfInfoApp_home/profiles/tso/tso_meta.yaml rename to packages/imperative/__tests__/__unit__/config/__resources__/ProfInfoApp_home/profiles/tso/tso_meta.yaml diff --git a/packages/imperative/src/config/__tests__/__resources__/ProfInfoApp_home/profiles/zosmf/lpar1_zosmf.yaml b/packages/imperative/__tests__/__unit__/config/__resources__/ProfInfoApp_home/profiles/zosmf/lpar1_zosmf.yaml similarity index 100% rename from packages/imperative/src/config/__tests__/__resources__/ProfInfoApp_home/profiles/zosmf/lpar1_zosmf.yaml rename to packages/imperative/__tests__/__unit__/config/__resources__/ProfInfoApp_home/profiles/zosmf/lpar1_zosmf.yaml diff --git a/packages/imperative/src/config/__tests__/__resources__/ProfInfoApp_home/profiles/zosmf/lpar2_zosmf.yaml b/packages/imperative/__tests__/__unit__/config/__resources__/ProfInfoApp_home/profiles/zosmf/lpar2_zosmf.yaml similarity index 100% rename from packages/imperative/src/config/__tests__/__resources__/ProfInfoApp_home/profiles/zosmf/lpar2_zosmf.yaml rename to packages/imperative/__tests__/__unit__/config/__resources__/ProfInfoApp_home/profiles/zosmf/lpar2_zosmf.yaml diff --git a/packages/imperative/src/config/__tests__/__resources__/ProfInfoApp_home/profiles/zosmf/lpar3_zosmf.yaml b/packages/imperative/__tests__/__unit__/config/__resources__/ProfInfoApp_home/profiles/zosmf/lpar3_zosmf.yaml similarity index 100% rename from packages/imperative/src/config/__tests__/__resources__/ProfInfoApp_home/profiles/zosmf/lpar3_zosmf.yaml rename to packages/imperative/__tests__/__unit__/config/__resources__/ProfInfoApp_home/profiles/zosmf/lpar3_zosmf.yaml diff --git a/packages/imperative/src/config/__tests__/__resources__/ProfInfoApp_home/profiles/zosmf/lpar4_zosmf.yaml b/packages/imperative/__tests__/__unit__/config/__resources__/ProfInfoApp_home/profiles/zosmf/lpar4_zosmf.yaml similarity index 100% rename from packages/imperative/src/config/__tests__/__resources__/ProfInfoApp_home/profiles/zosmf/lpar4_zosmf.yaml rename to packages/imperative/__tests__/__unit__/config/__resources__/ProfInfoApp_home/profiles/zosmf/lpar4_zosmf.yaml diff --git a/packages/imperative/src/config/__tests__/__resources__/ProfInfoApp_home/profiles/zosmf/lpar5_zosmf.yaml b/packages/imperative/__tests__/__unit__/config/__resources__/ProfInfoApp_home/profiles/zosmf/lpar5_zosmf.yaml similarity index 100% rename from packages/imperative/src/config/__tests__/__resources__/ProfInfoApp_home/profiles/zosmf/lpar5_zosmf.yaml rename to packages/imperative/__tests__/__unit__/config/__resources__/ProfInfoApp_home/profiles/zosmf/lpar5_zosmf.yaml diff --git a/packages/imperative/src/config/__tests__/__resources__/ProfInfoApp_home/profiles/zosmf/zosmf_meta.yaml b/packages/imperative/__tests__/__unit__/config/__resources__/ProfInfoApp_home/profiles/zosmf/zosmf_meta.yaml similarity index 100% rename from packages/imperative/src/config/__tests__/__resources__/ProfInfoApp_home/profiles/zosmf/zosmf_meta.yaml rename to packages/imperative/__tests__/__unit__/config/__resources__/ProfInfoApp_home/profiles/zosmf/zosmf_meta.yaml diff --git a/packages/imperative/src/config/__tests__/__resources__/ProfInfoApp_home_team_config_proj/ProfInfoApp.config.json b/packages/imperative/__tests__/__unit__/config/__resources__/ProfInfoApp_home_team_config_proj/ProfInfoApp.config.json similarity index 100% rename from packages/imperative/src/config/__tests__/__resources__/ProfInfoApp_home_team_config_proj/ProfInfoApp.config.json rename to packages/imperative/__tests__/__unit__/config/__resources__/ProfInfoApp_home_team_config_proj/ProfInfoApp.config.json diff --git a/packages/imperative/src/config/__tests__/__resources__/ProfInfoApp_home_team_config_proj/ProfInfoApp.schema.json b/packages/imperative/__tests__/__unit__/config/__resources__/ProfInfoApp_home_team_config_proj/ProfInfoApp.schema.json similarity index 100% rename from packages/imperative/src/config/__tests__/__resources__/ProfInfoApp_home_team_config_proj/ProfInfoApp.schema.json rename to packages/imperative/__tests__/__unit__/config/__resources__/ProfInfoApp_home_team_config_proj/ProfInfoApp.schema.json diff --git a/packages/imperative/src/config/__tests__/__resources__/ProfInfoApp_home_three/profiles/base/base_meta.yaml b/packages/imperative/__tests__/__unit__/config/__resources__/ProfInfoApp_home_three/profiles/base/base_meta.yaml similarity index 100% rename from packages/imperative/src/config/__tests__/__resources__/ProfInfoApp_home_three/profiles/base/base_meta.yaml rename to packages/imperative/__tests__/__unit__/config/__resources__/ProfInfoApp_home_three/profiles/base/base_meta.yaml diff --git a/packages/imperative/src/config/__tests__/__resources__/ProfInfoApp_home_three/profiles/tso/tso_meta.yaml b/packages/imperative/__tests__/__unit__/config/__resources__/ProfInfoApp_home_three/profiles/tso/tso_meta.yaml similarity index 100% rename from packages/imperative/src/config/__tests__/__resources__/ProfInfoApp_home_three/profiles/tso/tso_meta.yaml rename to packages/imperative/__tests__/__unit__/config/__resources__/ProfInfoApp_home_three/profiles/tso/tso_meta.yaml diff --git a/packages/imperative/src/config/__tests__/__resources__/ProfInfoApp_home_three/profiles/zosmf/zosmf_meta.yaml b/packages/imperative/__tests__/__unit__/config/__resources__/ProfInfoApp_home_three/profiles/zosmf/zosmf_meta.yaml similarity index 100% rename from packages/imperative/src/config/__tests__/__resources__/ProfInfoApp_home_three/profiles/zosmf/zosmf_meta.yaml rename to packages/imperative/__tests__/__unit__/config/__resources__/ProfInfoApp_home_three/profiles/zosmf/zosmf_meta.yaml diff --git a/packages/imperative/src/config/__tests__/__resources__/ProfInfoApp_home_two/profiles/base/base_apiml.yaml b/packages/imperative/__tests__/__unit__/config/__resources__/ProfInfoApp_home_two/profiles/base/base_apiml.yaml similarity index 100% rename from packages/imperative/src/config/__tests__/__resources__/ProfInfoApp_home_two/profiles/base/base_apiml.yaml rename to packages/imperative/__tests__/__unit__/config/__resources__/ProfInfoApp_home_two/profiles/base/base_apiml.yaml diff --git a/packages/imperative/src/config/__tests__/__resources__/ProfInfoApp_home_two/profiles/base/base_for_userNm.yaml b/packages/imperative/__tests__/__unit__/config/__resources__/ProfInfoApp_home_two/profiles/base/base_for_userNm.yaml similarity index 100% rename from packages/imperative/src/config/__tests__/__resources__/ProfInfoApp_home_two/profiles/base/base_for_userNm.yaml rename to packages/imperative/__tests__/__unit__/config/__resources__/ProfInfoApp_home_two/profiles/base/base_for_userNm.yaml diff --git a/packages/imperative/src/config/__tests__/__resources__/ProfInfoApp_home_two/profiles/base/base_meta.yaml b/packages/imperative/__tests__/__unit__/config/__resources__/ProfInfoApp_home_two/profiles/base/base_meta.yaml similarity index 100% rename from packages/imperative/src/config/__tests__/__resources__/ProfInfoApp_home_two/profiles/base/base_meta.yaml rename to packages/imperative/__tests__/__unit__/config/__resources__/ProfInfoApp_home_two/profiles/base/base_meta.yaml diff --git a/packages/imperative/src/config/__tests__/__resources__/ProfInfoApp_home_two/profiles/tso/tsoProfName.yaml b/packages/imperative/__tests__/__unit__/config/__resources__/ProfInfoApp_home_two/profiles/tso/tsoProfName.yaml similarity index 100% rename from packages/imperative/src/config/__tests__/__resources__/ProfInfoApp_home_two/profiles/tso/tsoProfName.yaml rename to packages/imperative/__tests__/__unit__/config/__resources__/ProfInfoApp_home_two/profiles/tso/tsoProfName.yaml diff --git a/packages/imperative/src/config/__tests__/__resources__/ProfInfoApp_home_two/profiles/tso/tso_meta.yaml b/packages/imperative/__tests__/__unit__/config/__resources__/ProfInfoApp_home_two/profiles/tso/tso_meta.yaml similarity index 100% rename from packages/imperative/src/config/__tests__/__resources__/ProfInfoApp_home_two/profiles/tso/tso_meta.yaml rename to packages/imperative/__tests__/__unit__/config/__resources__/ProfInfoApp_home_two/profiles/tso/tso_meta.yaml diff --git a/packages/imperative/src/config/__tests__/__resources__/ProfInfoApp_home_two/profiles/zosmf/lpar1_zosmf.yaml b/packages/imperative/__tests__/__unit__/config/__resources__/ProfInfoApp_home_two/profiles/zosmf/lpar1_zosmf.yaml similarity index 100% rename from packages/imperative/src/config/__tests__/__resources__/ProfInfoApp_home_two/profiles/zosmf/lpar1_zosmf.yaml rename to packages/imperative/__tests__/__unit__/config/__resources__/ProfInfoApp_home_two/profiles/zosmf/lpar1_zosmf.yaml diff --git a/packages/imperative/src/config/__tests__/__resources__/ProfInfoApp_home_two/profiles/zosmf/lpar2_zosmf.yaml b/packages/imperative/__tests__/__unit__/config/__resources__/ProfInfoApp_home_two/profiles/zosmf/lpar2_zosmf.yaml similarity index 100% rename from packages/imperative/src/config/__tests__/__resources__/ProfInfoApp_home_two/profiles/zosmf/lpar2_zosmf.yaml rename to packages/imperative/__tests__/__unit__/config/__resources__/ProfInfoApp_home_two/profiles/zosmf/lpar2_zosmf.yaml diff --git a/packages/imperative/src/config/__tests__/__resources__/ProfInfoApp_home_two/profiles/zosmf/lpar3_zosmf.yaml b/packages/imperative/__tests__/__unit__/config/__resources__/ProfInfoApp_home_two/profiles/zosmf/lpar3_zosmf.yaml similarity index 100% rename from packages/imperative/src/config/__tests__/__resources__/ProfInfoApp_home_two/profiles/zosmf/lpar3_zosmf.yaml rename to packages/imperative/__tests__/__unit__/config/__resources__/ProfInfoApp_home_two/profiles/zosmf/lpar3_zosmf.yaml diff --git a/packages/imperative/src/config/__tests__/__resources__/ProfInfoApp_home_two/profiles/zosmf/lpar4_zosmf.yaml b/packages/imperative/__tests__/__unit__/config/__resources__/ProfInfoApp_home_two/profiles/zosmf/lpar4_zosmf.yaml similarity index 100% rename from packages/imperative/src/config/__tests__/__resources__/ProfInfoApp_home_two/profiles/zosmf/lpar4_zosmf.yaml rename to packages/imperative/__tests__/__unit__/config/__resources__/ProfInfoApp_home_two/profiles/zosmf/lpar4_zosmf.yaml diff --git a/packages/imperative/src/config/__tests__/__resources__/ProfInfoApp_home_two/profiles/zosmf/lpar5_zosmf.yaml b/packages/imperative/__tests__/__unit__/config/__resources__/ProfInfoApp_home_two/profiles/zosmf/lpar5_zosmf.yaml similarity index 100% rename from packages/imperative/src/config/__tests__/__resources__/ProfInfoApp_home_two/profiles/zosmf/lpar5_zosmf.yaml rename to packages/imperative/__tests__/__unit__/config/__resources__/ProfInfoApp_home_two/profiles/zosmf/lpar5_zosmf.yaml diff --git a/packages/imperative/src/config/__tests__/__resources__/ProfInfoApp_home_two/profiles/zosmf/zosmf_meta.yaml b/packages/imperative/__tests__/__unit__/config/__resources__/ProfInfoApp_home_two/profiles/zosmf/zosmf_meta.yaml similarity index 100% rename from packages/imperative/src/config/__tests__/__resources__/ProfInfoApp_home_two/profiles/zosmf/zosmf_meta.yaml rename to packages/imperative/__tests__/__unit__/config/__resources__/ProfInfoApp_home_two/profiles/zosmf/zosmf_meta.yaml diff --git a/packages/imperative/src/config/__tests__/__resources__/ProfInfoApp_large_team_config_proj/ProfInfoApp.config.json b/packages/imperative/__tests__/__unit__/config/__resources__/ProfInfoApp_large_team_config_proj/ProfInfoApp.config.json similarity index 100% rename from packages/imperative/src/config/__tests__/__resources__/ProfInfoApp_large_team_config_proj/ProfInfoApp.config.json rename to packages/imperative/__tests__/__unit__/config/__resources__/ProfInfoApp_large_team_config_proj/ProfInfoApp.config.json diff --git a/packages/imperative/src/config/__tests__/__resources__/ProfInfoApp_nested_team_config_proj/ProfInfoApp.config.json b/packages/imperative/__tests__/__unit__/config/__resources__/ProfInfoApp_nested_team_config_proj/ProfInfoApp.config.json similarity index 100% rename from packages/imperative/src/config/__tests__/__resources__/ProfInfoApp_nested_team_config_proj/ProfInfoApp.config.json rename to packages/imperative/__tests__/__unit__/config/__resources__/ProfInfoApp_nested_team_config_proj/ProfInfoApp.config.json diff --git a/packages/imperative/src/config/__tests__/__resources__/ProfInfoApp_nested_team_config_proj/ProfInfoApp.schema.json b/packages/imperative/__tests__/__unit__/config/__resources__/ProfInfoApp_nested_team_config_proj/ProfInfoApp.schema.json similarity index 100% rename from packages/imperative/src/config/__tests__/__resources__/ProfInfoApp_nested_team_config_proj/ProfInfoApp.schema.json rename to packages/imperative/__tests__/__unit__/config/__resources__/ProfInfoApp_nested_team_config_proj/ProfInfoApp.schema.json diff --git a/packages/imperative/src/config/__tests__/__resources__/ProfInfoApp_team_config_proj/ProfInfoApp.config.json b/packages/imperative/__tests__/__unit__/config/__resources__/ProfInfoApp_team_config_proj/ProfInfoApp.config.json similarity index 100% rename from packages/imperative/src/config/__tests__/__resources__/ProfInfoApp_team_config_proj/ProfInfoApp.config.json rename to packages/imperative/__tests__/__unit__/config/__resources__/ProfInfoApp_team_config_proj/ProfInfoApp.config.json diff --git a/packages/imperative/src/config/__tests__/__resources__/ProfInfoApp_team_config_proj/ProfInfoApp.schema.json b/packages/imperative/__tests__/__unit__/config/__resources__/ProfInfoApp_team_config_proj/ProfInfoApp.schema.json similarity index 100% rename from packages/imperative/src/config/__tests__/__resources__/ProfInfoApp_team_config_proj/ProfInfoApp.schema.json rename to packages/imperative/__tests__/__unit__/config/__resources__/ProfInfoApp_team_config_proj/ProfInfoApp.schema.json diff --git a/packages/imperative/src/config/__tests__/__resources__/ProfInfoApp_user_and_team_config_proj/ProfInfoApp.config.json b/packages/imperative/__tests__/__unit__/config/__resources__/ProfInfoApp_user_and_team_config_proj/ProfInfoApp.config.json similarity index 100% rename from packages/imperative/src/config/__tests__/__resources__/ProfInfoApp_user_and_team_config_proj/ProfInfoApp.config.json rename to packages/imperative/__tests__/__unit__/config/__resources__/ProfInfoApp_user_and_team_config_proj/ProfInfoApp.config.json diff --git a/packages/imperative/src/config/__tests__/__resources__/ProfInfoApp_user_and_team_config_proj/ProfInfoApp.config.user.json b/packages/imperative/__tests__/__unit__/config/__resources__/ProfInfoApp_user_and_team_config_proj/ProfInfoApp.config.user.json similarity index 100% rename from packages/imperative/src/config/__tests__/__resources__/ProfInfoApp_user_and_team_config_proj/ProfInfoApp.config.user.json rename to packages/imperative/__tests__/__unit__/config/__resources__/ProfInfoApp_user_and_team_config_proj/ProfInfoApp.config.user.json diff --git a/packages/imperative/src/config/__tests__/__resources__/ProfInfoApp_user_and_team_config_proj/ProfInfoApp.schema.json b/packages/imperative/__tests__/__unit__/config/__resources__/ProfInfoApp_user_and_team_config_proj/ProfInfoApp.schema.json similarity index 100% rename from packages/imperative/src/config/__tests__/__resources__/ProfInfoApp_user_and_team_config_proj/ProfInfoApp.schema.json rename to packages/imperative/__tests__/__unit__/config/__resources__/ProfInfoApp_user_and_team_config_proj/ProfInfoApp.schema.json diff --git a/packages/imperative/src/config/__tests__/__resources__/ProfInfoApp_user_and_team_config_proj/ProfInfoApp_user.schema.json b/packages/imperative/__tests__/__unit__/config/__resources__/ProfInfoApp_user_and_team_config_proj/ProfInfoApp_user.schema.json similarity index 100% rename from packages/imperative/src/config/__tests__/__resources__/ProfInfoApp_user_and_team_config_proj/ProfInfoApp_user.schema.json rename to packages/imperative/__tests__/__unit__/config/__resources__/ProfInfoApp_user_and_team_config_proj/ProfInfoApp_user.schema.json diff --git a/packages/imperative/src/config/__tests__/__resources__/badproject.config.json b/packages/imperative/__tests__/__unit__/config/__resources__/badproject.config.json similarity index 100% rename from packages/imperative/src/config/__tests__/__resources__/badproject.config.json rename to packages/imperative/__tests__/__unit__/config/__resources__/badproject.config.json diff --git a/packages/imperative/src/config/__tests__/__resources__/commented-project.config.user.json b/packages/imperative/__tests__/__unit__/config/__resources__/commented-project.config.user.json similarity index 100% rename from packages/imperative/src/config/__tests__/__resources__/commented-project.config.user.json rename to packages/imperative/__tests__/__unit__/config/__resources__/commented-project.config.user.json diff --git a/packages/imperative/src/config/__tests__/__resources__/my_app.config.json b/packages/imperative/__tests__/__unit__/config/__resources__/my_app.config.json similarity index 100% rename from packages/imperative/src/config/__tests__/__resources__/my_app.config.json rename to packages/imperative/__tests__/__unit__/config/__resources__/my_app.config.json diff --git a/packages/imperative/src/config/__tests__/__resources__/my_app.config.user.json b/packages/imperative/__tests__/__unit__/config/__resources__/my_app.config.user.json similarity index 100% rename from packages/imperative/src/config/__tests__/__resources__/my_app.config.user.json rename to packages/imperative/__tests__/__unit__/config/__resources__/my_app.config.user.json diff --git a/packages/imperative/src/config/__tests__/__resources__/my_app.schema.json b/packages/imperative/__tests__/__unit__/config/__resources__/my_app.schema.json similarity index 100% rename from packages/imperative/src/config/__tests__/__resources__/my_app.schema.json rename to packages/imperative/__tests__/__unit__/config/__resources__/my_app.schema.json diff --git a/packages/imperative/src/config/__tests__/__resources__/project.config.json b/packages/imperative/__tests__/__unit__/config/__resources__/project.config.json similarity index 100% rename from packages/imperative/src/config/__tests__/__resources__/project.config.json rename to packages/imperative/__tests__/__unit__/config/__resources__/project.config.json diff --git a/packages/imperative/src/config/__tests__/__resources__/project.config.user.json b/packages/imperative/__tests__/__unit__/config/__resources__/project.config.user.json similarity index 100% rename from packages/imperative/src/config/__tests__/__resources__/project.config.user.json rename to packages/imperative/__tests__/__unit__/config/__resources__/project.config.user.json diff --git a/packages/imperative/src/config/__tests__/__snapshots__/Config.api.unit.test.ts.snap b/packages/imperative/__tests__/__unit__/config/__snapshots__/Config.api.unit.test.ts.snap similarity index 100% rename from packages/imperative/src/config/__tests__/__snapshots__/Config.api.unit.test.ts.snap rename to packages/imperative/__tests__/__unit__/config/__snapshots__/Config.api.unit.test.ts.snap diff --git a/packages/imperative/src/config/__tests__/__snapshots__/Config.secure.unit.test.ts.snap b/packages/imperative/__tests__/__unit__/config/__snapshots__/Config.secure.unit.test.ts.snap similarity index 100% rename from packages/imperative/src/config/__tests__/__snapshots__/Config.secure.unit.test.ts.snap rename to packages/imperative/__tests__/__unit__/config/__snapshots__/Config.secure.unit.test.ts.snap diff --git a/packages/imperative/src/config/__tests__/__snapshots__/Config.unit.test.ts.snap b/packages/imperative/__tests__/__unit__/config/__snapshots__/Config.unit.test.ts.snap similarity index 100% rename from packages/imperative/src/config/__tests__/__snapshots__/Config.unit.test.ts.snap rename to packages/imperative/__tests__/__unit__/config/__snapshots__/Config.unit.test.ts.snap diff --git a/packages/imperative/src/config/__tests__/__snapshots__/ConfigSchema.unit.test.ts.snap b/packages/imperative/__tests__/__unit__/config/__snapshots__/ConfigSchema.unit.test.ts.snap similarity index 100% rename from packages/imperative/src/config/__tests__/__snapshots__/ConfigSchema.unit.test.ts.snap rename to packages/imperative/__tests__/__unit__/config/__snapshots__/ConfigSchema.unit.test.ts.snap diff --git a/packages/imperative/src/console/__tests__/Console.unit.test.ts b/packages/imperative/__tests__/__unit__/console/Console.unit.test.ts similarity index 98% rename from packages/imperative/src/console/__tests__/Console.unit.test.ts rename to packages/imperative/__tests__/__unit__/console/Console.unit.test.ts index 32f3d1f9c3..26ef0173f7 100644 --- a/packages/imperative/src/console/__tests__/Console.unit.test.ts +++ b/packages/imperative/__tests__/__unit__/console/Console.unit.test.ts @@ -9,7 +9,7 @@ * */ -import { Console } from "../../console"; +import { Console } from "../../../src/console"; describe("Console tests", () => { it("Should allow for checking if a level is valid", () => { diff --git a/packages/imperative/src/error/__tests__/ImperativeError.unit.test.ts b/packages/imperative/__tests__/__unit__/error/ImperativeError.unit.test.ts similarity index 91% rename from packages/imperative/src/error/__tests__/ImperativeError.unit.test.ts rename to packages/imperative/__tests__/__unit__/error/ImperativeError.unit.test.ts index a6e46e64e5..94ddf6dbde 100644 --- a/packages/imperative/src/error/__tests__/ImperativeError.unit.test.ts +++ b/packages/imperative/__tests__/__unit__/error/ImperativeError.unit.test.ts @@ -9,7 +9,7 @@ * */ -import { ImperativeError } from "../src/ImperativeError"; +import { ImperativeError } from "../../../src/error/ImperativeError"; describe("ImperativeError", () => { it("should not throw any deprecation warnings", () => { diff --git a/packages/imperative/src/expect/__tests__/ImperativeExpect.unit.test.ts b/packages/imperative/__tests__/__unit__/expect/ImperativeExpect.unit.test.ts similarity index 98% rename from packages/imperative/src/expect/__tests__/ImperativeExpect.unit.test.ts rename to packages/imperative/__tests__/__unit__/expect/ImperativeExpect.unit.test.ts index 9c13f16571..bfb49ba984 100644 --- a/packages/imperative/src/expect/__tests__/ImperativeExpect.unit.test.ts +++ b/packages/imperative/__tests__/__unit__/expect/ImperativeExpect.unit.test.ts @@ -9,8 +9,8 @@ * */ -import { ImperativeExpect } from "../../expect"; -import { ImperativeError } from "../../error"; +import { ImperativeExpect } from "../../../src/expect"; +import { ImperativeError } from "../../../src/error"; import { TestLogger } from "../../../__tests__/src/TestLogger"; // UnitTestUtils.replaceIt(); diff --git a/packages/imperative/src/expect/__tests__/__snapshots__/ImperativeExpect.unit.test.ts.snap b/packages/imperative/__tests__/__unit__/expect/__snapshots__/ImperativeExpect.unit.test.ts.snap similarity index 100% rename from packages/imperative/src/expect/__tests__/__snapshots__/ImperativeExpect.unit.test.ts.snap rename to packages/imperative/__tests__/__unit__/expect/__snapshots__/ImperativeExpect.unit.test.ts.snap diff --git a/packages/imperative/src/imperative/__tests__/ConfigValidator.unit.test.ts b/packages/imperative/__tests__/__unit__/imperative/ConfigValidator.unit.test.ts similarity index 100% rename from packages/imperative/src/imperative/__tests__/ConfigValidator.unit.test.ts rename to packages/imperative/__tests__/__unit__/imperative/ConfigValidator.unit.test.ts diff --git a/packages/imperative/src/imperative/__tests__/ConfigurationLoader.unit.test.ts b/packages/imperative/__tests__/__unit__/imperative/ConfigurationLoader.unit.test.ts similarity index 100% rename from packages/imperative/src/imperative/__tests__/ConfigurationLoader.unit.test.ts rename to packages/imperative/__tests__/__unit__/imperative/ConfigurationLoader.unit.test.ts diff --git a/packages/imperative/src/imperative/__tests__/DefinitionTreeResolver.unit.test.ts b/packages/imperative/__tests__/__unit__/imperative/DefinitionTreeResolver.unit.test.ts similarity index 100% rename from packages/imperative/src/imperative/__tests__/DefinitionTreeResolver.unit.test.ts rename to packages/imperative/__tests__/__unit__/imperative/DefinitionTreeResolver.unit.test.ts diff --git a/packages/imperative/src/imperative/__tests__/Imperative.unit.test.ts b/packages/imperative/__tests__/__unit__/imperative/Imperative.unit.test.ts similarity index 99% rename from packages/imperative/src/imperative/__tests__/Imperative.unit.test.ts rename to packages/imperative/__tests__/__unit__/imperative/Imperative.unit.test.ts index 9b5ff1cc51..cc96672519 100644 --- a/packages/imperative/src/imperative/__tests__/Imperative.unit.test.ts +++ b/packages/imperative/__tests__/__unit__/imperative/Imperative.unit.test.ts @@ -34,7 +34,7 @@ describe("Imperative", () => { jest.doMock("../src/ConfigurationLoader"); jest.doMock("../src/ConfigurationValidator"); jest.doMock("../src/help/ImperativeHelpGeneratorFactory"); - jest.doMock("../../utilities/src/ImperativeConfig"); + jest.doMock("../../utilities/ImperativeConfig"); jest.doMock("../src/config/ConfigManagementFacility"); jest.doMock("../src/plugins/PluginManagementFacility"); jest.doMock("../../settings/src/AppSettings"); @@ -52,7 +52,7 @@ describe("Imperative", () => { const { ConfigurationLoader } = require("../src/ConfigurationLoader"); const ConfigurationValidator = require("../src/ConfigurationValidator").ConfigurationValidator.validate; const { AppSettings } = require("../../settings"); - const { ImperativeConfig } = require("../../utilities/src/ImperativeConfig"); + const { ImperativeConfig } = require("../../utilities/ImperativeConfig"); const { ConfigManagementFacility } = require("../src/config/ConfigManagementFacility"); const { PluginManagementFacility } = require("../src/plugins/PluginManagementFacility"); const { Logger } = require("../../logger"); diff --git a/packages/imperative/src/imperative/__tests__/LoggingConfigurer.unit.test.ts b/packages/imperative/__tests__/__unit__/imperative/LoggingConfigurer.unit.test.ts similarity index 100% rename from packages/imperative/src/imperative/__tests__/LoggingConfigurer.unit.test.ts rename to packages/imperative/__tests__/__unit__/imperative/LoggingConfigurer.unit.test.ts diff --git a/packages/imperative/src/imperative/__tests__/OverridesLoader.unit.test.ts b/packages/imperative/__tests__/__unit__/imperative/OverridesLoader.unit.test.ts similarity index 99% rename from packages/imperative/src/imperative/__tests__/OverridesLoader.unit.test.ts rename to packages/imperative/__tests__/__unit__/imperative/OverridesLoader.unit.test.ts index 1bc0f3ae2e..fd5c0399c0 100644 --- a/packages/imperative/src/imperative/__tests__/OverridesLoader.unit.test.ts +++ b/packages/imperative/__tests__/__unit__/imperative/OverridesLoader.unit.test.ts @@ -12,7 +12,7 @@ import { IImperativeConfig } from "../src/doc/IImperativeConfig"; jest.mock("../../security"); -jest.mock("../../utilities/src/ImperativeConfig"); +jest.mock("../../utilities/ImperativeConfig"); import { OverridesLoader } from "../src/OverridesLoader"; import { CredentialManagerFactory, AbstractCredentialManager } from "../../security"; diff --git a/packages/imperative/src/imperative/__tests__/__model__/Sample.configuration.ts b/packages/imperative/__tests__/__unit__/imperative/__model__/Sample.configuration.ts similarity index 88% rename from packages/imperative/src/imperative/__tests__/__model__/Sample.configuration.ts rename to packages/imperative/__tests__/__unit__/imperative/__model__/Sample.configuration.ts index 34e733f34d..d9a39f4ba7 100644 --- a/packages/imperative/src/imperative/__tests__/__model__/Sample.configuration.ts +++ b/packages/imperative/__tests__/__unit__/imperative/__model__/Sample.configuration.ts @@ -9,7 +9,7 @@ * */ -import { IImperativeConfig } from "../../src/doc/IImperativeConfig"; +import { IImperativeConfig } from "../../../../src/imperative/doc/IImperativeConfig"; import { homedir } from "os"; const config: IImperativeConfig = { diff --git a/packages/imperative/src/imperative/__tests__/__model__/Sample.definition.ts b/packages/imperative/__tests__/__unit__/imperative/__model__/Sample.definition.ts similarity index 92% rename from packages/imperative/src/imperative/__tests__/__model__/Sample.definition.ts rename to packages/imperative/__tests__/__unit__/imperative/__model__/Sample.definition.ts index 400411e552..6f8c113a37 100644 --- a/packages/imperative/src/imperative/__tests__/__model__/Sample.definition.ts +++ b/packages/imperative/__tests__/__unit__/imperative/__model__/Sample.definition.ts @@ -9,7 +9,7 @@ * */ -import { ICommandDefinition } from "../../../cmd"; +import { ICommandDefinition } from "../../../../src/cmd"; const IssueCommand: ICommandDefinition = { name: "users", diff --git a/packages/imperative/src/imperative/__tests__/__snapshots__/DefinitionTreeResolver.unit.test.ts.snap b/packages/imperative/__tests__/__unit__/imperative/__snapshots__/DefinitionTreeResolver.unit.test.ts.snap similarity index 100% rename from packages/imperative/src/imperative/__tests__/__snapshots__/DefinitionTreeResolver.unit.test.ts.snap rename to packages/imperative/__tests__/__unit__/imperative/__snapshots__/DefinitionTreeResolver.unit.test.ts.snap diff --git a/packages/imperative/src/imperative/__tests__/__snapshots__/LoggingConfigurer.unit.test.ts.snap b/packages/imperative/__tests__/__unit__/imperative/__snapshots__/LoggingConfigurer.unit.test.ts.snap similarity index 100% rename from packages/imperative/src/imperative/__tests__/__snapshots__/LoggingConfigurer.unit.test.ts.snap rename to packages/imperative/__tests__/__unit__/imperative/__snapshots__/LoggingConfigurer.unit.test.ts.snap diff --git a/packages/imperative/src/imperative/__tests__/config/cmd/auto-init/AutoInitCommandBuilder.unit.test.ts b/packages/imperative/__tests__/__unit__/imperative/config/cmd/auto-init/AutoInitCommandBuilder.unit.test.ts similarity index 84% rename from packages/imperative/src/imperative/__tests__/config/cmd/auto-init/AutoInitCommandBuilder.unit.test.ts rename to packages/imperative/__tests__/__unit__/imperative/config/cmd/auto-init/AutoInitCommandBuilder.unit.test.ts index 1596a5d784..2e48a191bc 100644 --- a/packages/imperative/src/imperative/__tests__/config/cmd/auto-init/AutoInitCommandBuilder.unit.test.ts +++ b/packages/imperative/__tests__/__unit__/imperative/config/cmd/auto-init/AutoInitCommandBuilder.unit.test.ts @@ -9,11 +9,11 @@ * */ -import { AutoInitCommandBuilder } from "../../../../src/config/cmd/auto-init/builders/AutoInitCommandBuilder"; -import { Logger } from "../../../../../logger"; -import { Constants } from "../../../../../constants"; +import { AutoInitCommandBuilder } from "../../../../../../src/imperative/config/cmd/auto-init/builders/AutoInitCommandBuilder"; +import { Logger } from "../../../../../../src/logger"; +import { Constants } from "../../../../../../src/constants"; import { minimalAutoInitConfig } from "./__data__/SampleAutoInitConfig"; -import { ICommandDefinition } from "../../../../../cmd"; +import { ICommandDefinition } from "../../../../../../src/cmd"; describe("AutoInitCommandBuilder", () => { it("should build command successfully if valid auto init config supplied with buildFull", () => { diff --git a/packages/imperative/src/imperative/__tests__/config/cmd/auto-init/BaseAutoInitHandler.unit.test.ts b/packages/imperative/__tests__/__unit__/imperative/config/cmd/auto-init/BaseAutoInitHandler.unit.test.ts similarity index 97% rename from packages/imperative/src/imperative/__tests__/config/cmd/auto-init/BaseAutoInitHandler.unit.test.ts rename to packages/imperative/__tests__/__unit__/imperative/config/cmd/auto-init/BaseAutoInitHandler.unit.test.ts index c234a30523..11e222f9ac 100644 --- a/packages/imperative/src/imperative/__tests__/config/cmd/auto-init/BaseAutoInitHandler.unit.test.ts +++ b/packages/imperative/__tests__/__unit__/imperative/config/cmd/auto-init/BaseAutoInitHandler.unit.test.ts @@ -9,16 +9,17 @@ * */ -import { IHandlerParameters } from "../../../../../cmd"; -import { ImperativeConfig, ProcessUtils } from "../../../../../utilities"; +import { IHandlerParameters } from "../../../../../../src/cmd"; +import { ImperativeConfig } from "../../../../../../src/utilities/ImperativeConfig"; +import { ProcessUtils } from "../../../../../../src/utilities/ProcessUtils"; import { FakeAutoInitHandler } from "./__data__/FakeAutoInitHandler"; import * as lodash from "lodash"; import * as jestDiff from "jest-diff"; import stripAnsi = require("strip-ansi"); -import { ConfigSchema } from "../../../../../config"; -import { CredentialManagerFactory } from "../../../../../security"; -import { SessConstants, Session } from "../../../../../rest"; -import { OverridesLoader } from "../../../../src/OverridesLoader"; +import { ConfigSchema } from "../../../../../../src/config"; +import { CredentialManagerFactory } from "../../../../../../src/security"; +import { SessConstants, Session } from "../../../../../../src/rest"; +import { OverridesLoader } from "../../../../../../src/imperative/OverridesLoader"; jest.mock("strip-ansi"); diff --git a/packages/imperative/src/imperative/__tests__/config/cmd/auto-init/CompleteAutoInitCommandBuilder.unit.test.ts b/packages/imperative/__tests__/__unit__/imperative/config/cmd/auto-init/CompleteAutoInitCommandBuilder.unit.test.ts similarity index 73% rename from packages/imperative/src/imperative/__tests__/config/cmd/auto-init/CompleteAutoInitCommandBuilder.unit.test.ts rename to packages/imperative/__tests__/__unit__/imperative/config/cmd/auto-init/CompleteAutoInitCommandBuilder.unit.test.ts index d8feeab591..8bb4f90d8f 100644 --- a/packages/imperative/src/imperative/__tests__/config/cmd/auto-init/CompleteAutoInitCommandBuilder.unit.test.ts +++ b/packages/imperative/__tests__/__unit__/imperative/config/cmd/auto-init/CompleteAutoInitCommandBuilder.unit.test.ts @@ -9,9 +9,9 @@ * */ -import { CompleteAutoInitCommandBuilder } from "../../../../src/config/cmd/auto-init/builders/CompleteAutoInitCommandBuilder"; -import { Logger } from "../../../../../logger"; -import { ICommandDefinition } from "../../../../../cmd"; +import { CompleteAutoInitCommandBuilder } from "../../../../../../src/imperative/config/cmd/auto-init/builders/CompleteAutoInitCommandBuilder"; +import { Logger } from "../../../../../../src/logger"; +import { ICommandDefinition } from "../../../../../../src/cmd"; import { fakeAutoInitConfig } from "./__data__/SampleAutoInitConfig"; describe("CompleteAutoInitCommandBuilder", () => { diff --git a/packages/imperative/src/imperative/__tests__/config/cmd/auto-init/__data__/FakeAutoInitHandler.ts b/packages/imperative/__tests__/__unit__/imperative/config/cmd/auto-init/__data__/FakeAutoInitHandler.ts similarity index 79% rename from packages/imperative/src/imperative/__tests__/config/cmd/auto-init/__data__/FakeAutoInitHandler.ts rename to packages/imperative/__tests__/__unit__/imperative/config/cmd/auto-init/__data__/FakeAutoInitHandler.ts index 3284586c0a..246d5a00c3 100644 --- a/packages/imperative/src/imperative/__tests__/config/cmd/auto-init/__data__/FakeAutoInitHandler.ts +++ b/packages/imperative/__tests__/__unit__/imperative/config/cmd/auto-init/__data__/FakeAutoInitHandler.ts @@ -9,9 +9,9 @@ * */ -import { BaseAutoInitHandler } from "../../../../../src/config/cmd/auto-init/handlers/BaseAutoInitHandler"; -import { ICommandArguments, IHandlerResponseApi } from "../../../../../../cmd"; -import { ISession, AbstractSession } from "../../../../../../rest"; +import { BaseAutoInitHandler } from "../../../../../../../src/imperative/config/cmd/auto-init/handlers/BaseAutoInitHandler"; +import { ICommandArguments, IHandlerResponseApi } from "../../../../../../../src/cmd"; +import { ISession, AbstractSession } from "../../../../../../../src/rest"; export class FakeAutoInitHandler extends BaseAutoInitHandler { public mProfileType: string = "fruit"; diff --git a/packages/imperative/src/imperative/__tests__/config/cmd/auto-init/__data__/SampleAutoInitConfig.ts b/packages/imperative/__tests__/__unit__/imperative/config/cmd/auto-init/__data__/SampleAutoInitConfig.ts similarity index 88% rename from packages/imperative/src/imperative/__tests__/config/cmd/auto-init/__data__/SampleAutoInitConfig.ts rename to packages/imperative/__tests__/__unit__/imperative/config/cmd/auto-init/__data__/SampleAutoInitConfig.ts index f74716eeaf..f66575df42 100644 --- a/packages/imperative/src/imperative/__tests__/config/cmd/auto-init/__data__/SampleAutoInitConfig.ts +++ b/packages/imperative/__tests__/__unit__/imperative/config/cmd/auto-init/__data__/SampleAutoInitConfig.ts @@ -9,8 +9,8 @@ * */ -import { ICommandProfileAutoInitConfig } from "../../../../../../cmd/src/doc/profiles/definition/ICommandProfileAutoInitConfig"; -import { ICommandOptionDefinition } from "../../../../../../cmd"; +import { ICommandProfileAutoInitConfig } from "../../../../../../../src/cmd/doc/profiles/definition/ICommandProfileAutoInitConfig"; +import { ICommandOptionDefinition } from "../../../../../../../src/cmd"; const fakeOption: ICommandOptionDefinition = { name: "fake", diff --git a/packages/imperative/src/imperative/__tests__/config/cmd/auto-init/__snapshots__/CompleteAutoInitCommandBuilder.unit.test.ts.snap b/packages/imperative/__tests__/__unit__/imperative/config/cmd/auto-init/__snapshots__/CompleteAutoInitCommandBuilder.unit.test.ts.snap similarity index 100% rename from packages/imperative/src/imperative/__tests__/config/cmd/auto-init/__snapshots__/CompleteAutoInitCommandBuilder.unit.test.ts.snap rename to packages/imperative/__tests__/__unit__/imperative/config/cmd/auto-init/__snapshots__/CompleteAutoInitCommandBuilder.unit.test.ts.snap diff --git a/packages/imperative/src/imperative/__tests__/config/cmd/convert-profiles/convert-profiles.handler.unit.test.ts b/packages/imperative/__tests__/__unit__/imperative/config/cmd/convert-profiles/convert-profiles.handler.unit.test.ts similarity index 98% rename from packages/imperative/src/imperative/__tests__/config/cmd/convert-profiles/convert-profiles.handler.unit.test.ts rename to packages/imperative/__tests__/__unit__/imperative/config/cmd/convert-profiles/convert-profiles.handler.unit.test.ts index 7d9c66e7df..120e92e5ad 100644 --- a/packages/imperative/src/imperative/__tests__/config/cmd/convert-profiles/convert-profiles.handler.unit.test.ts +++ b/packages/imperative/__tests__/__unit__/imperative/config/cmd/convert-profiles/convert-profiles.handler.unit.test.ts @@ -12,17 +12,17 @@ import * as fs from "fs"; import * as fsExtra from "fs-extra"; import { keyring as keytar } from "@zowe/secrets-for-zowe-sdk"; -import { Config, ConfigBuilder, ConfigSchema } from "../../../../../config"; -import { IHandlerParameters } from "../../../../../cmd"; -import { ProfileIO } from "../../../../../profiles"; -import { AppSettings } from "../../../../../settings"; -import { ImperativeConfig } from "../../../../../utilities"; -import * as npmInterface from "../../../../src/plugins/utilities/npm-interface"; -import { PluginIssues } from "../../../../src/plugins/utilities/PluginIssues"; -import ConvertProfilesHandler from "../../../../src/config/cmd/convert-profiles/convert-profiles.handler"; +import { Config, ConfigBuilder, ConfigSchema } from "../../../../../../src/config"; +import { IHandlerParameters } from "../../../../../../src/cmd"; +import { ProfileIO } from "../../../../../../src/profiles"; +import { AppSettings } from "../../../../../../src/settings"; +import { ImperativeConfig } from "../../../../../../src/utilities/ImperativeConfig"; +import * as npmInterface from "../../../../../../src/imperative/plugins/utilities/npm-interface"; +import { PluginIssues } from "../../../../../../src/imperative/plugins/utilities/PluginIssues"; +import ConvertProfilesHandler from "../../../../../../src/imperative/config/cmd/convert-profiles/convert-profiles.handler"; jest.mock("../../../../src/plugins/utilities/npm-interface"); -jest.mock("../../../../../imperative/src/OverridesLoader"); +jest.mock("../../../../../../src/imperative/src/OverridesLoader"); let stdout: string; let stderr: string; diff --git a/packages/imperative/src/imperative/__tests__/config/cmd/edit/edit.handler.unit.test.ts b/packages/imperative/__tests__/__unit__/imperative/config/cmd/edit/edit.handler.unit.test.ts similarity index 89% rename from packages/imperative/src/imperative/__tests__/config/cmd/edit/edit.handler.unit.test.ts rename to packages/imperative/__tests__/__unit__/imperative/config/cmd/edit/edit.handler.unit.test.ts index 1a137dc806..f2163fc412 100644 --- a/packages/imperative/src/imperative/__tests__/config/cmd/edit/edit.handler.unit.test.ts +++ b/packages/imperative/__tests__/__unit__/imperative/config/cmd/edit/edit.handler.unit.test.ts @@ -9,9 +9,10 @@ * */ -import EditHandler from "../../../../src/config/cmd/edit/edit.handler"; -import { IHandlerParameters } from "../../../../../cmd"; -import { ImperativeConfig, ProcessUtils } from "../../../../../utilities"; +import EditHandler from "../../../../../../src/imperative/config/cmd/edit/edit.handler"; +import { IHandlerParameters } from "../../../../../../src/cmd"; +import { ImperativeConfig } from "../../../../../../src/utilities/ImperativeConfig"; +import { ProcessUtils } from "../../../../../../src/utilities/ProcessUtils"; const getIHandlerParametersObject = (): IHandlerParameters => { const x: any = { diff --git a/packages/imperative/src/imperative/__tests__/config/cmd/import/import.handler.unit.test.ts b/packages/imperative/__tests__/__unit__/imperative/config/cmd/import/import.handler.unit.test.ts similarity index 97% rename from packages/imperative/src/imperative/__tests__/config/cmd/import/import.handler.unit.test.ts rename to packages/imperative/__tests__/__unit__/imperative/config/cmd/import/import.handler.unit.test.ts index 671bab25e8..f5762be40c 100644 --- a/packages/imperative/src/imperative/__tests__/config/cmd/import/import.handler.unit.test.ts +++ b/packages/imperative/__tests__/__unit__/imperative/config/cmd/import/import.handler.unit.test.ts @@ -14,11 +14,11 @@ import * as path from "path"; import * as url from "url"; import * as JSONC from "comment-json"; import * as lodash from "lodash"; -import ImportHandler from "../../../../src/config/cmd/import/import.handler"; -import { IHandlerParameters } from "../../../../../cmd"; -import { Config, ConfigConstants, IConfig } from "../../../../../config"; -import { ISession, RestClient } from "../../../../../rest"; -import { ImperativeConfig } from "../../../../.."; +import ImportHandler from "../../../../../../src/imperative/config/cmd/import/import.handler"; +import { IHandlerParameters } from "../../../../../../src/cmd"; +import { Config, ConfigConstants, IConfig } from "../../../../../../src/config"; +import { ISession, RestClient } from "../../../../../../src/rest"; +import { ImperativeConfig } from "../../../../../../src/utilities/ImperativeConfig"; import { expectedConfigObject, expectedSchemaObject } from "../../../../../../__tests__/__integration__/imperative/__tests__/__integration__/cli/config/__resources__/expectedObjects"; diff --git a/packages/imperative/src/imperative/__tests__/config/cmd/init/init.handler.unit.test.ts b/packages/imperative/__tests__/__unit__/imperative/config/cmd/init/init.handler.unit.test.ts similarity index 98% rename from packages/imperative/src/imperative/__tests__/config/cmd/init/init.handler.unit.test.ts rename to packages/imperative/__tests__/__unit__/imperative/config/cmd/init/init.handler.unit.test.ts index 83249761c7..da9fb89710 100644 --- a/packages/imperative/src/imperative/__tests__/config/cmd/init/init.handler.unit.test.ts +++ b/packages/imperative/__tests__/__unit__/imperative/config/cmd/init/init.handler.unit.test.ts @@ -9,21 +9,22 @@ * */ -import { IHandlerParameters } from "../../../../.."; -import { Config } from "../../../../../config/src/Config"; -import { ConfigConstants } from "../../../../../config/src/ConfigConstants"; -import { ImperativeConfig, ProcessUtils } from "../../../../../utilities"; -import { IImperativeConfig } from "../../../../src/doc/IImperativeConfig"; +import { IHandlerParameters } from "../../../../../../"; +import { Config } from "../../../../../../src/config/Config"; +import { ConfigConstants } from "../../../../../../src/config/ConfigConstants"; +import { ProcessUtils } from "../../../../../../src/utilities/ProcessUtils"; +import { ImperativeConfig } from "../../../../../../src/utilities/ImperativeConfig"; +import { IImperativeConfig } from "../../../../../../src/imperative/doc/IImperativeConfig"; import { expectedSchemaObject } from "../../../../../../__tests__/__integration__/imperative/__tests__/__integration__/cli/config/__resources__/expectedObjects"; -import InitHandler from "../../../../src/config/cmd/init/init.handler"; +import InitHandler from "../../../../../../src/imperative/config/cmd/init/init.handler"; import * as config from "../../../../../../__tests__/__integration__/imperative/src/imperative"; import * as path from "path"; import * as lodash from "lodash"; import * as fs from "fs"; -import { CredentialManagerFactory } from "../../../../../security"; +import { CredentialManagerFactory } from "../../../../../../src/security"; import { setupConfigToLoad } from "../../../../../../__tests__/src/TestUtil"; -import { OverridesLoader } from "../../../../src/OverridesLoader"; +import { OverridesLoader } from "../../../../../../src/imperative/OverridesLoader"; jest.mock("fs"); diff --git a/packages/imperative/src/imperative/__tests__/config/cmd/list/list.handler.unit.test.ts b/packages/imperative/__tests__/__unit__/imperative/config/cmd/list/list.handler.unit.test.ts similarity index 95% rename from packages/imperative/src/imperative/__tests__/config/cmd/list/list.handler.unit.test.ts rename to packages/imperative/__tests__/__unit__/imperative/config/cmd/list/list.handler.unit.test.ts index 9651183eb9..3623ead9a2 100644 --- a/packages/imperative/src/imperative/__tests__/config/cmd/list/list.handler.unit.test.ts +++ b/packages/imperative/__tests__/__unit__/imperative/config/cmd/list/list.handler.unit.test.ts @@ -9,12 +9,12 @@ * */ -jest.mock("../../../../../utilities/src/ImperativeConfig"); +jest.mock("../../../../../utilities/ImperativeConfig"); -import { Config, ConfigConstants, IConfig, IConfigLayer } from "../../../../../config"; -import { ImperativeConfig } from "../../../../../utilities"; +import { Config, ConfigConstants, IConfig, IConfigLayer } from "../../../../../../src/config"; +import { ImperativeConfig } from "../../../../../../src/utilities/ImperativeConfig"; import { cloneDeep } from "lodash"; -import ListHandler from "../../../../src/config/cmd/list/list.handler"; +import ListHandler from "../../../../../../src/imperative/config/cmd/list/list.handler"; let dataObj: any; let formatObj: any; diff --git a/packages/imperative/src/imperative/__tests__/config/cmd/profiles/profiles.handler.unit.test.ts b/packages/imperative/__tests__/__unit__/imperative/config/cmd/profiles/profiles.handler.unit.test.ts similarity index 89% rename from packages/imperative/src/imperative/__tests__/config/cmd/profiles/profiles.handler.unit.test.ts rename to packages/imperative/__tests__/__unit__/imperative/config/cmd/profiles/profiles.handler.unit.test.ts index cdd0b68689..ab0a5a95cb 100644 --- a/packages/imperative/src/imperative/__tests__/config/cmd/profiles/profiles.handler.unit.test.ts +++ b/packages/imperative/__tests__/__unit__/imperative/config/cmd/profiles/profiles.handler.unit.test.ts @@ -9,11 +9,11 @@ * */ -jest.mock("../../../../../utilities/src/ImperativeConfig"); +jest.mock("../../../../../utilities/ImperativeConfig"); -import { IConfig } from "../../../../../config"; -import { ImperativeConfig } from "../../../../../utilities"; -import ProfilesHandler from "../../../../src/config/cmd/profiles/profiles.handler"; +import { IConfig } from "../../../../../../src/config"; +import { ImperativeConfig } from "../../../../../../src/utilities/ImperativeConfig"; +import ProfilesHandler from "../../../../../../src/imperative/config/cmd/profiles/profiles.handler"; let dataObj: any; let formatObj: any; diff --git a/packages/imperative/src/imperative/__tests__/config/cmd/report-env/EnvQuery.unit.test.ts b/packages/imperative/__tests__/__unit__/imperative/config/cmd/report-env/EnvQuery.unit.test.ts similarity index 97% rename from packages/imperative/src/imperative/__tests__/config/cmd/report-env/EnvQuery.unit.test.ts rename to packages/imperative/__tests__/__unit__/imperative/config/cmd/report-env/EnvQuery.unit.test.ts index 7a426f180c..44385be761 100644 --- a/packages/imperative/src/imperative/__tests__/config/cmd/report-env/EnvQuery.unit.test.ts +++ b/packages/imperative/__tests__/__unit__/imperative/config/cmd/report-env/EnvQuery.unit.test.ts @@ -13,13 +13,13 @@ import * as fs from "fs"; import * as os from "os"; import * as path from "path"; -import { CommandResponse } from "../../../../../cmd/src/response/CommandResponse"; -import { IO } from "../../../../../io"; -import { ImperativeConfig } from "../../../../../utilities"; -import { PluginIssues } from "../../../../src/plugins/utilities/PluginIssues"; +import { CommandResponse } from "../../../../../../src/cmd/response/CommandResponse"; +import { IO } from "../../../../../../src/io"; +import { ImperativeConfig } from "../../../../../../src/utilities/ImperativeConfig"; +import { PluginIssues } from "../../../../../../src/imperative/plugins/utilities/PluginIssues"; -import { EnvQuery, IGetItemOpts, IGetItemVal } from "../../../../src/config/cmd/report-env/EnvQuery"; -import { ItemId } from "../../../../src/config/cmd/report-env/EnvItems"; +import { EnvQuery, IGetItemOpts, IGetItemVal } from "../../../../../../src/imperative/config/cmd/report-env/EnvQuery"; +import { ItemId } from "../../../../../../src/imperative/config/cmd/report-env/EnvItems"; describe("Tests for EnvQuery module", () => { const fakeCliHomeDir = "this_is_a_fake_cli_home_dir"; diff --git a/packages/imperative/src/imperative/__tests__/config/cmd/report-env/Report-env.handler.unit.test.ts b/packages/imperative/__tests__/__unit__/imperative/config/cmd/report-env/Report-env.handler.unit.test.ts similarity index 92% rename from packages/imperative/src/imperative/__tests__/config/cmd/report-env/Report-env.handler.unit.test.ts rename to packages/imperative/__tests__/__unit__/imperative/config/cmd/report-env/Report-env.handler.unit.test.ts index 9d54433f6b..46ac861cee 100644 --- a/packages/imperative/src/imperative/__tests__/config/cmd/report-env/Report-env.handler.unit.test.ts +++ b/packages/imperative/__tests__/__unit__/imperative/config/cmd/report-env/Report-env.handler.unit.test.ts @@ -9,9 +9,9 @@ * */ -import ReportEnvHandler from "../../../../src/config/cmd/report-env/Report-env.handler"; -import { EnvQuery, IGetItemVal } from "../../../../src/config/cmd/report-env/EnvQuery"; -import { ItemId } from "../../../../src/config/cmd/report-env/EnvItems"; +import ReportEnvHandler from "../../../../../../src/imperative/config/cmd/report-env/Report-env.handler"; +import { EnvQuery, IGetItemVal } from "../../../../../../src/imperative/config/cmd/report-env/EnvQuery"; +import { ItemId } from "../../../../../../src/imperative/config/cmd/report-env/EnvItems"; describe("Handler for config report-env", () => { diff --git a/packages/imperative/src/imperative/__tests__/config/cmd/schema/schema.handler.unit.test.ts b/packages/imperative/__tests__/__unit__/imperative/config/cmd/schema/schema.handler.unit.test.ts similarity index 90% rename from packages/imperative/src/imperative/__tests__/config/cmd/schema/schema.handler.unit.test.ts rename to packages/imperative/__tests__/__unit__/imperative/config/cmd/schema/schema.handler.unit.test.ts index fc726fa006..0cefc66c4e 100644 --- a/packages/imperative/src/imperative/__tests__/config/cmd/schema/schema.handler.unit.test.ts +++ b/packages/imperative/__tests__/__unit__/imperative/config/cmd/schema/schema.handler.unit.test.ts @@ -9,11 +9,11 @@ * */ -jest.mock("../../../../../utilities/src/ImperativeConfig"); +jest.mock("../../../../../utilities/ImperativeConfig"); -import { ImperativeConfig } from "../../../../../utilities"; -import { IProfileTypeConfiguration } from "../../../../../profiles"; -import SchemaHandler from "../../../../src/config/cmd/schema/schema.handler"; +import { ImperativeConfig } from "../../../../../../src/utilities/ImperativeConfig"; +import { IProfileTypeConfiguration } from "../../../../../../src/profiles"; +import SchemaHandler from "../../../../../../src/imperative/config/cmd/schema/schema.handler"; let dataObj: any; let errorText: string; diff --git a/packages/imperative/src/imperative/__tests__/config/cmd/secure/secure.handler.unit.test.ts b/packages/imperative/__tests__/__unit__/imperative/config/cmd/secure/secure.handler.unit.test.ts similarity index 98% rename from packages/imperative/src/imperative/__tests__/config/cmd/secure/secure.handler.unit.test.ts rename to packages/imperative/__tests__/__unit__/imperative/config/cmd/secure/secure.handler.unit.test.ts index eaf068137e..84905948d7 100644 --- a/packages/imperative/src/imperative/__tests__/config/cmd/secure/secure.handler.unit.test.ts +++ b/packages/imperative/__tests__/__unit__/imperative/config/cmd/secure/secure.handler.unit.test.ts @@ -9,22 +9,22 @@ * */ -import { IHandlerParameters, Logger } from "../../../../.."; -import { Config } from "../../../../../config/src/Config"; -import { IConfig, IConfigOpts, IConfigProfile } from "../../../../../config"; -import { ImperativeConfig } from "../../../../../utilities"; -import { IImperativeConfig } from "../../../../src/doc/IImperativeConfig"; -import { ICredentialManagerInit } from "../../../../../security/src/doc/ICredentialManagerInit"; -import { CredentialManagerFactory } from "../../../../../security"; +import { IHandlerParameters, Logger } from "../../../../../../"; +import { Config } from "../../../../../../src/config/Config"; +import { IConfig, IConfigOpts, IConfigProfile } from "../../../../../../src/config"; +import { ImperativeConfig } from "../../../../../../src/utilities/ImperativeConfig"; +import { IImperativeConfig } from "../../../../../../src/imperative/doc/IImperativeConfig"; +import { ICredentialManagerInit } from "../../../../../../src/security/doc/ICredentialManagerInit"; +import { CredentialManagerFactory } from "../../../../../../src/security"; import { expectedConfigObject } from "../../../../../../__tests__/__integration__/imperative/__tests__/__integration__/cli/config/__resources__/expectedObjects"; -import SecureHandler from "../../../../src/config/cmd/secure/secure.handler"; +import SecureHandler from "../../../../../../src/imperative/config/cmd/secure/secure.handler"; import * as config from "../../../../../../__tests__/__integration__/imperative/src/imperative"; import { keyring as keytar } from "@zowe/secrets-for-zowe-sdk"; import * as path from "path"; import * as lodash from "lodash"; import * as fs from "fs"; -import { SessConstants } from "../../../../../rest"; +import { SessConstants } from "../../../../../../src/rest"; import { setupConfigToLoad } from "../../../../../../__tests__/src/TestUtil"; let readPromptSpy: any; diff --git a/packages/imperative/src/imperative/__tests__/config/cmd/set/set.handler.unit.test.ts b/packages/imperative/__tests__/__unit__/imperative/config/cmd/set/set.handler.unit.test.ts similarity index 98% rename from packages/imperative/src/imperative/__tests__/config/cmd/set/set.handler.unit.test.ts rename to packages/imperative/__tests__/__unit__/imperative/config/cmd/set/set.handler.unit.test.ts index d060bcb3f4..5e168beb28 100644 --- a/packages/imperative/src/imperative/__tests__/config/cmd/set/set.handler.unit.test.ts +++ b/packages/imperative/__tests__/__unit__/imperative/config/cmd/set/set.handler.unit.test.ts @@ -9,16 +9,16 @@ * */ -import { IHandlerParameters } from "../../../../.."; -import { Config } from "../../../../../config/src/Config"; -import { IConfigOpts } from "../../../../../config"; -import { ImperativeConfig } from "../../../../../utilities"; -import { IImperativeConfig } from "../../../../src/doc/IImperativeConfig"; -import { ICredentialManagerInit } from "../../../../../security/src/doc/ICredentialManagerInit"; -import { CredentialManagerFactory } from "../../../../../security"; +import { IHandlerParameters } from "../../../../../../"; +import { Config } from "../../../../../../src/config/Config"; +import { IConfigOpts } from "../../../../../../src/config"; +import { ImperativeConfig } from "../../../../../../src/utilities/ImperativeConfig"; +import { IImperativeConfig } from "../../../../../../src/imperative/doc/IImperativeConfig"; +import { ICredentialManagerInit } from "../../../../../../src/security/doc/ICredentialManagerInit"; +import { CredentialManagerFactory } from "../../../../../../src/security"; import { expectedConfigObject, expectedUserConfigObject } from "../../../../../../__tests__/__integration__/imperative/__tests__/__integration__/cli/config/__resources__/expectedObjects"; -import SetHandler from "../../../../src/config/cmd/set/set.handler"; +import SetHandler from "../../../../../../src/imperative/config/cmd/set/set.handler"; import * as config from "../../../../../../__tests__/__integration__/imperative/src/imperative"; import { keyring as keytar } from "@zowe/secrets-for-zowe-sdk"; import * as path from "path"; diff --git a/packages/imperative/src/imperative/__tests__/config/cmd/update-schema/updateSchema.handler.unit.test.ts b/packages/imperative/__tests__/__unit__/imperative/config/cmd/update-schema/updateSchema.handler.unit.test.ts similarity index 90% rename from packages/imperative/src/imperative/__tests__/config/cmd/update-schema/updateSchema.handler.unit.test.ts rename to packages/imperative/__tests__/__unit__/imperative/config/cmd/update-schema/updateSchema.handler.unit.test.ts index 650539f2a8..da58b4fdfb 100644 --- a/packages/imperative/src/imperative/__tests__/config/cmd/update-schema/updateSchema.handler.unit.test.ts +++ b/packages/imperative/__tests__/__unit__/imperative/config/cmd/update-schema/updateSchema.handler.unit.test.ts @@ -9,12 +9,12 @@ * */ -jest.mock("../../../../../utilities/src/ImperativeConfig"); +jest.mock("../../../../../utilities/ImperativeConfig"); -import { ImperativeConfig } from "../../../../../utilities"; -import { IProfileTypeConfiguration } from "../../../../../profiles"; -import UpdateSchemasHandler from "../../../../src/config/cmd/update-schemas/update-schemas.handler"; -import { ConfigSchema } from "../../../../.."; +import { ImperativeConfig } from "../../../../../../src/utilities/ImperativeConfig"; +import { IProfileTypeConfiguration } from "../../../../../../src/profiles"; +import UpdateSchemasHandler from "../../../../../../src/imperative/config/cmd/update-schemas/update-schemas.handler"; +import { ConfigSchema } from "../../../../../../"; let dataObj: any; let formatObj: any; diff --git a/packages/imperative/src/imperative/__tests__/env/EnvironmentalVariableSettings.unit.test.ts b/packages/imperative/__tests__/__unit__/imperative/env/EnvironmentalVariableSettings.unit.test.ts similarity index 93% rename from packages/imperative/src/imperative/__tests__/env/EnvironmentalVariableSettings.unit.test.ts rename to packages/imperative/__tests__/__unit__/imperative/env/EnvironmentalVariableSettings.unit.test.ts index 0f2e479411..5d6a5ad930 100644 --- a/packages/imperative/src/imperative/__tests__/env/EnvironmentalVariableSettings.unit.test.ts +++ b/packages/imperative/__tests__/__unit__/imperative/env/EnvironmentalVariableSettings.unit.test.ts @@ -9,11 +9,11 @@ * */ -import { EnvironmentalVariableSettings } from "../../src/env/EnvironmentalVariableSettings"; -import { IImperativeEnvironmentalVariableSettings } from "../../src/doc/IImperativeEnvironmentalVariableSettings"; -import { IImperativeEnvironmentalVariableSetting } from "../../src/doc/IImperativeEnvironmentalVariableSetting"; -import { ImperativeError } from "../../../error/src/ImperativeError"; -import { Constants } from "../../../constants/src/Constants"; +import { EnvironmentalVariableSettings } from "../../../../src/imperative/env/EnvironmentalVariableSettings"; +import { IImperativeEnvironmentalVariableSettings } from "../../../../src/imperative/doc/IImperativeEnvironmentalVariableSettings"; +import { IImperativeEnvironmentalVariableSetting } from "../../../../src/imperative/doc/IImperativeEnvironmentalVariableSetting"; +import { ImperativeError } from "../../../../src/error/ImperativeError"; +import { Constants } from "../../../../src/constants/Constants"; // save env so we can screw it up later const nodeEnv = process.env; diff --git a/packages/imperative/src/imperative/__tests__/handlers/DefaultRootCommandHandler.unit.test.ts b/packages/imperative/__tests__/__unit__/imperative/handlers/DefaultRootCommandHandler.unit.test.ts similarity index 93% rename from packages/imperative/src/imperative/__tests__/handlers/DefaultRootCommandHandler.unit.test.ts rename to packages/imperative/__tests__/__unit__/imperative/handlers/DefaultRootCommandHandler.unit.test.ts index b98317b2aa..d623f545a6 100644 --- a/packages/imperative/src/imperative/__tests__/handlers/DefaultRootCommandHandler.unit.test.ts +++ b/packages/imperative/__tests__/__unit__/imperative/handlers/DefaultRootCommandHandler.unit.test.ts @@ -9,16 +9,16 @@ * */ -jest.mock("../../../utilities/src/ImperativeConfig"); -jest.mock("../../../imperative/src/Imperative"); +jest.mock("../../../utilities/ImperativeConfig"); +jest.mock("../../../../src/imperative/Imperative"); import { TestLogger } from "../../../../__tests__/src/TestLogger"; -import { ICommandDefinition, CommandResponse, CommandPreparer, ICommandHandler } from "../../../cmd"; -import { ICommandHandlerRequire } from "../../../cmd/src/doc/handler/ICommandHandlerRequire"; -import { ImperativeConfig } from "../../../utilities/src/ImperativeConfig"; +import { ICommandDefinition, CommandResponse, CommandPreparer, ICommandHandler } from "../../../../src/cmd"; +import { ICommandHandlerRequire } from "../../../../src/cmd/doc/handler/ICommandHandlerRequire"; +import { ImperativeConfig } from "../../../../src/utilities/ImperativeConfig"; /* eslint-disable-next-line jest/no-mocks-import */ -import { MOCKED_COMMAND_TREE } from "../../../imperative/src/__mocks__/Imperative"; +import { MOCKED_COMMAND_TREE } from "../../../../src/imperative/__mocks__/Imperative"; (CommandResponse as any).spinnerChars = "-oO0)|(0Oo-"; const beforeForceColor = process.env.FORCE_COLOR; diff --git a/packages/imperative/src/imperative/__tests__/handlers/__snapshots__/DefaultRootCommandHandler.unit.test.ts.snap b/packages/imperative/__tests__/__unit__/imperative/handlers/__snapshots__/DefaultRootCommandHandler.unit.test.ts.snap similarity index 100% rename from packages/imperative/src/imperative/__tests__/handlers/__snapshots__/DefaultRootCommandHandler.unit.test.ts.snap rename to packages/imperative/__tests__/__unit__/imperative/handlers/__snapshots__/DefaultRootCommandHandler.unit.test.ts.snap diff --git a/packages/imperative/src/imperative/__tests__/plugins/AbstractPluginLifeCycle.unit.test.ts b/packages/imperative/__tests__/__unit__/imperative/plugins/AbstractPluginLifeCycle.unit.test.ts similarity index 100% rename from packages/imperative/src/imperative/__tests__/plugins/AbstractPluginLifeCycle.unit.test.ts rename to packages/imperative/__tests__/__unit__/imperative/plugins/AbstractPluginLifeCycle.unit.test.ts diff --git a/packages/imperative/src/imperative/__tests__/plugins/PluginManagementFacility.unit.test.ts b/packages/imperative/__tests__/__unit__/imperative/plugins/PluginManagementFacility.unit.test.ts similarity index 99% rename from packages/imperative/src/imperative/__tests__/plugins/PluginManagementFacility.unit.test.ts rename to packages/imperative/__tests__/__unit__/imperative/plugins/PluginManagementFacility.unit.test.ts index aed70ad3bb..af8e81ce30 100644 --- a/packages/imperative/src/imperative/__tests__/plugins/PluginManagementFacility.unit.test.ts +++ b/packages/imperative/__tests__/__unit__/imperative/plugins/PluginManagementFacility.unit.test.ts @@ -20,7 +20,7 @@ import * as fs from "fs"; import { AppSettings } from "../../../settings"; import { ICommandDefinition } from "../../../../src/cmd"; import { IImperativeConfig } from "../../src/doc/IImperativeConfig"; -import { ImperativeConfig } from "../../../utilities/src/ImperativeConfig"; +import { ImperativeConfig } from "../../../utilities/ImperativeConfig"; import { UpdateImpConfig } from "../../src/UpdateImpConfig"; import { IPluginJson } from "../../src/plugins/doc/IPluginJson"; import { IssueSeverity, PluginIssues } from "../../src/plugins/utilities/PluginIssues"; diff --git a/packages/imperative/src/imperative/__tests__/plugins/PluginRequireProvider.unit.test.ts b/packages/imperative/__tests__/__unit__/imperative/plugins/PluginRequireProvider.unit.test.ts similarity index 99% rename from packages/imperative/src/imperative/__tests__/plugins/PluginRequireProvider.unit.test.ts rename to packages/imperative/__tests__/__unit__/imperative/plugins/PluginRequireProvider.unit.test.ts index 7a2c307a99..db0185ceca 100644 --- a/packages/imperative/src/imperative/__tests__/plugins/PluginRequireProvider.unit.test.ts +++ b/packages/imperative/__tests__/__unit__/imperative/plugins/PluginRequireProvider.unit.test.ts @@ -11,13 +11,13 @@ import { getMockWrapper } from "../../../../__tests__/__src__/types/MockWrapper"; -jest.mock("../../../utilities/src/ImperativeConfig"); +jest.mock("../../../utilities/ImperativeConfig"); jest.mock("find-up"); jest.mock("path"); import * as Module from "module"; import * as findUp from "find-up"; -import { ImperativeConfig } from "../../../utilities/src/ImperativeConfig"; +import { ImperativeConfig } from "../../../utilities/ImperativeConfig"; import { PluginRequireProvider } from "../../src/plugins/PluginRequireProvider"; import { PluginRequireAlreadyCreatedError } from "../../src/plugins/errors/PluginRequireAlreadyCreatedError"; import { PluginRequireNotCreatedError } from "../../src/plugins/errors/PluginRequireNotCreatedError"; diff --git a/packages/imperative/src/imperative/__tests__/plugins/__resources__/baseCliConfig.testData.ts b/packages/imperative/__tests__/__unit__/imperative/plugins/__resources__/baseCliConfig.testData.ts similarity index 100% rename from packages/imperative/src/imperative/__tests__/plugins/__resources__/baseCliConfig.testData.ts rename to packages/imperative/__tests__/__unit__/imperative/plugins/__resources__/baseCliConfig.testData.ts diff --git a/packages/imperative/src/imperative/__tests__/plugins/__resources__/impCmdTree.testData.js b/packages/imperative/__tests__/__unit__/imperative/plugins/__resources__/impCmdTree.testData.js similarity index 100% rename from packages/imperative/src/imperative/__tests__/plugins/__resources__/impCmdTree.testData.js rename to packages/imperative/__tests__/__unit__/imperative/plugins/__resources__/impCmdTree.testData.js diff --git a/packages/imperative/src/imperative/__tests__/plugins/__resources__/mockConfigModule.ts b/packages/imperative/__tests__/__unit__/imperative/plugins/__resources__/mockConfigModule.ts similarity index 100% rename from packages/imperative/src/imperative/__tests__/plugins/__resources__/mockConfigModule.ts rename to packages/imperative/__tests__/__unit__/imperative/plugins/__resources__/mockConfigModule.ts diff --git a/packages/imperative/src/imperative/__tests__/plugins/cmd/firststeps/showfirststeps.handler.unit.test.ts b/packages/imperative/__tests__/__unit__/imperative/plugins/cmd/firststeps/showfirststeps.handler.unit.test.ts similarity index 92% rename from packages/imperative/src/imperative/__tests__/plugins/cmd/firststeps/showfirststeps.handler.unit.test.ts rename to packages/imperative/__tests__/__unit__/imperative/plugins/cmd/firststeps/showfirststeps.handler.unit.test.ts index 3e2e3f79a2..79259ca9e5 100644 --- a/packages/imperative/src/imperative/__tests__/plugins/cmd/firststeps/showfirststeps.handler.unit.test.ts +++ b/packages/imperative/__tests__/__unit__/imperative/plugins/cmd/firststeps/showfirststeps.handler.unit.test.ts @@ -14,15 +14,15 @@ import Mock = jest.Mock; jest.mock("../../../../../cmd/src/response/CommandResponse"); jest.mock("../../../../../cmd/src/response/HandlerResponse"); -import { HandlerResponse, IHandlerParameters } from "../../../../../cmd"; -import { ImperativeConfig } from "../../../../../utilities/src/ImperativeConfig"; -import { IImperativeConfig } from "../../../../src/doc/IImperativeConfig"; +import { HandlerResponse, IHandlerParameters } from "../../../../../../src/cmd"; +import { ImperativeConfig } from "../../../../../../src/utilities/ImperativeConfig"; +import { IImperativeConfig } from "../../../../../../src/imperative/doc/IImperativeConfig"; import { resolve } from "path"; -import { TextUtils } from "../../../../../utilities"; -import FirststepsHandler from "../../../../src/plugins/cmd/showfirststeps/showfirststeps.handler"; -import { ImperativeError } from "../../../../../error/src/ImperativeError"; -import { IPluginCfgProps } from "../../../../src/plugins/doc/IPluginCfgProps"; -import { PluginManagementFacility } from "../../../../src/plugins/PluginManagementFacility"; +import { TextUtils } from "../../../../../../src/utilities/TextUtils"; +import FirststepsHandler from "../../../../../../src/imperative/plugins/cmd/showfirststeps/showfirststeps.handler"; +import { ImperativeError } from "../../../../../../src/error/ImperativeError"; +import { IPluginCfgProps } from "../../../../../../src/imperative/plugins/doc/IPluginCfgProps"; +import { PluginManagementFacility } from "../../../../../../src/imperative/plugins/PluginManagementFacility"; describe("Plugin first steps command handler", () => { diff --git a/packages/imperative/src/imperative/__tests__/plugins/cmd/install/install.handler.unit.test.ts b/packages/imperative/__tests__/__unit__/imperative/plugins/cmd/install/install.handler.unit.test.ts similarity index 89% rename from packages/imperative/src/imperative/__tests__/plugins/cmd/install/install.handler.unit.test.ts rename to packages/imperative/__tests__/__unit__/imperative/plugins/cmd/install/install.handler.unit.test.ts index a5971d7653..5d3aaa9758 100644 --- a/packages/imperative/src/imperative/__tests__/plugins/cmd/install/install.handler.unit.test.ts +++ b/packages/imperative/__tests__/__unit__/imperative/plugins/cmd/install/install.handler.unit.test.ts @@ -14,15 +14,15 @@ import Mock = jest.Mock; jest.mock("cross-spawn"); jest.mock("jsonfile"); -jest.mock("../../../../src/plugins/utilities/npm-interface/install"); -jest.mock("../../../../src/plugins/utilities/runValidatePlugin"); -jest.mock("../../../../src/plugins/utilities/PMFConstants"); -jest.mock("../../../../../cmd/src/response/CommandResponse"); -jest.mock("../../../../../cmd/src/response/HandlerResponse"); -jest.mock("../../../../../cmd/src/doc/handler/IHandlerParameters"); -jest.mock("../../../../../logger"); -jest.mock("../../../../src/Imperative"); -jest.mock("../../../../src/plugins/utilities/NpmFunctions"); +jest.mock("../../../../../../src/imperative/plugins/utilities/npm-interface/install"); +jest.mock("../../../../../../src/imperative/plugins/utilities/runValidatePlugin"); +jest.mock("../../../../../../src/imperative/plugins/utilities/PMFConstants"); +jest.mock("../../../../../../src/cmd/response/CommandResponse"); +jest.mock("../../../../../../src/cmd/response/HandlerResponse"); +jest.mock("../../../../../../src/cmd/doc/handler/IHandlerParameters"); +jest.mock("../../../../../../src/logger"); +jest.mock("../../../../../../src/imperative/Imperative"); +jest.mock("../../../../../../src/imperative/plugins/utilities/NpmFunctions"); jest.doMock("path", () => { const originalPath = jest.requireActual("path"); return { @@ -37,18 +37,18 @@ jest.doMock("path", () => { }; }); -import { HandlerResponse, IHandlerParameters } from "../../../../../cmd"; -import { Console } from "../../../../../console"; -import { ImperativeError } from "../../../../../error"; -import { install } from "../../../../src/plugins/utilities/npm-interface"; -import { runValidatePlugin } from "../../../../src/plugins/utilities/runValidatePlugin"; -import InstallHandler from "../../../../src/plugins/cmd/install/install.handler"; -import { IPluginJson } from "../../../../src/plugins/doc/IPluginJson"; -import { Logger } from "../../../../../logger"; +import { HandlerResponse, IHandlerParameters } from "../../../../../../src/cmd"; +import { Console } from "../../../../../../src/console"; +import { ImperativeError } from "../../../../../../src/error"; +import { install } from "../../../../../../src/imperative/plugins/utilities/npm-interface"; +import { runValidatePlugin } from "../../../../../../src/imperative/plugins/utilities/runValidatePlugin"; +import InstallHandler from "../../../../../../src/imperative/plugins/cmd/install/install.handler"; +import { IPluginJson } from "../../../../../../src/imperative/plugins/doc/IPluginJson"; +import { Logger } from "../../../../../../src/logger"; import { readFileSync, writeFileSync } from "jsonfile"; -import { PMFConstants } from "../../../../src/plugins/utilities/PMFConstants"; -import { TextUtils } from "../../../../../utilities"; -import { getRegistry, npmLogin } from "../../../../src/plugins/utilities/NpmFunctions"; +import { PMFConstants } from "../../../../../../src/imperative/plugins/utilities/PMFConstants"; +import { TextUtils } from "../../../../../../src/utilities/TextUtils"; +import { getRegistry, npmLogin } from "../../../../../../src/imperative/plugins/utilities/NpmFunctions"; import * as spawn from "cross-spawn"; let expectedVal: unknown; diff --git a/packages/imperative/src/imperative/__tests__/plugins/cmd/list/__snapshots__/list.handler.unit.test.ts.snap b/packages/imperative/__tests__/__unit__/imperative/plugins/cmd/list/__snapshots__/list.handler.unit.test.ts.snap similarity index 100% rename from packages/imperative/src/imperative/__tests__/plugins/cmd/list/__snapshots__/list.handler.unit.test.ts.snap rename to packages/imperative/__tests__/__unit__/imperative/plugins/cmd/list/__snapshots__/list.handler.unit.test.ts.snap diff --git a/packages/imperative/src/imperative/__tests__/plugins/cmd/list/list.handler.unit.test.ts b/packages/imperative/__tests__/__unit__/imperative/plugins/cmd/list/list.handler.unit.test.ts similarity index 100% rename from packages/imperative/src/imperative/__tests__/plugins/cmd/list/list.handler.unit.test.ts rename to packages/imperative/__tests__/__unit__/imperative/plugins/cmd/list/list.handler.unit.test.ts diff --git a/packages/imperative/src/imperative/__tests__/plugins/cmd/uninstall/uninstall.handler.unit.test.ts b/packages/imperative/__tests__/__unit__/imperative/plugins/cmd/uninstall/uninstall.handler.unit.test.ts similarity index 100% rename from packages/imperative/src/imperative/__tests__/plugins/cmd/uninstall/uninstall.handler.unit.test.ts rename to packages/imperative/__tests__/__unit__/imperative/plugins/cmd/uninstall/uninstall.handler.unit.test.ts diff --git a/packages/imperative/src/imperative/__tests__/plugins/cmd/update/update.handler.unit.test.ts b/packages/imperative/__tests__/__unit__/imperative/plugins/cmd/update/update.handler.unit.test.ts similarity index 100% rename from packages/imperative/src/imperative/__tests__/plugins/cmd/update/update.handler.unit.test.ts rename to packages/imperative/__tests__/__unit__/imperative/plugins/cmd/update/update.handler.unit.test.ts diff --git a/packages/imperative/src/imperative/__tests__/plugins/cmd/validate/validate.handler.unit.test.ts b/packages/imperative/__tests__/__unit__/imperative/plugins/cmd/validate/validate.handler.unit.test.ts similarity index 99% rename from packages/imperative/src/imperative/__tests__/plugins/cmd/validate/validate.handler.unit.test.ts rename to packages/imperative/__tests__/__unit__/imperative/plugins/cmd/validate/validate.handler.unit.test.ts index d2bb50ed5b..56b94e1f1a 100644 --- a/packages/imperative/src/imperative/__tests__/plugins/cmd/validate/validate.handler.unit.test.ts +++ b/packages/imperative/__tests__/__unit__/imperative/plugins/cmd/validate/validate.handler.unit.test.ts @@ -15,7 +15,7 @@ jest.mock("../../../../../cmd/src/response/CommandResponse"); jest.mock("../../../../../cmd/src/response/HandlerResponse"); import { HandlerResponse, IHandlerParameters } from "../../../../../cmd"; -import { ImperativeConfig } from "../../../../../utilities/src/ImperativeConfig"; +import { ImperativeConfig } from "../../../../../utilities/ImperativeConfig"; import { IssueSeverity, PluginIssues } from "../../../../src/plugins/utilities/PluginIssues"; import { resolve } from "path"; import { TextUtils } from "../../../../../utilities"; diff --git a/packages/imperative/src/imperative/__tests__/plugins/utilities/NpmFunctions.unit.test.ts b/packages/imperative/__tests__/__unit__/imperative/plugins/utilities/NpmFunctions.unit.test.ts similarity index 100% rename from packages/imperative/src/imperative/__tests__/plugins/utilities/NpmFunctions.unit.test.ts rename to packages/imperative/__tests__/__unit__/imperative/plugins/utilities/NpmFunctions.unit.test.ts diff --git a/packages/imperative/src/imperative/__tests__/plugins/utilities/PMFConstants.unit.test.ts b/packages/imperative/__tests__/__unit__/imperative/plugins/utilities/PMFConstants.unit.test.ts similarity index 95% rename from packages/imperative/src/imperative/__tests__/plugins/utilities/PMFConstants.unit.test.ts rename to packages/imperative/__tests__/__unit__/imperative/plugins/utilities/PMFConstants.unit.test.ts index f89c0c6991..c2e332b357 100644 --- a/packages/imperative/src/imperative/__tests__/plugins/utilities/PMFConstants.unit.test.ts +++ b/packages/imperative/__tests__/__unit__/imperative/plugins/utilities/PMFConstants.unit.test.ts @@ -11,13 +11,13 @@ jest.mock("path"); jest.mock("../../../../logger/src/Logger"); -jest.mock("../../../../utilities/src/ImperativeConfig"); +jest.mock("../../../../utilities/ImperativeConfig"); import Mock = jest.Mock; describe("PMFConstants", () => { let {PMFConstants} = require("../../../src/plugins/utilities/PMFConstants"); - let {ImperativeConfig} = require("../../../../utilities/src/ImperativeConfig"); + let {ImperativeConfig} = require("../../../../utilities/ImperativeConfig"); let {EnvironmentalVariableSettings} = require("../../../src/env/EnvironmentalVariableSettings"); let {join} = require("path"); @@ -29,7 +29,7 @@ describe("PMFConstants", () => { beforeEach(async () => { jest.resetModules(); ({PMFConstants} = await import("../../../src/plugins/utilities/PMFConstants")); - ({ImperativeConfig} = await import("../../../../utilities/src/ImperativeConfig")); + ({ImperativeConfig} = await import("../../../../utilities/ImperativeConfig")); ({EnvironmentalVariableSettings} = await import("../../../src/env/EnvironmentalVariableSettings")); ({join} = await import("path")); diff --git a/packages/imperative/src/imperative/__tests__/plugins/utilities/PluginIssues.unit.test.ts b/packages/imperative/__tests__/__unit__/imperative/plugins/utilities/PluginIssues.unit.test.ts similarity index 100% rename from packages/imperative/src/imperative/__tests__/plugins/utilities/PluginIssues.unit.test.ts rename to packages/imperative/__tests__/__unit__/imperative/plugins/utilities/PluginIssues.unit.test.ts diff --git a/packages/imperative/src/imperative/__tests__/plugins/utilities/npm-interface/install.unit.test.ts b/packages/imperative/__tests__/__unit__/imperative/plugins/utilities/npm-interface/install.unit.test.ts similarity index 100% rename from packages/imperative/src/imperative/__tests__/plugins/utilities/npm-interface/install.unit.test.ts rename to packages/imperative/__tests__/__unit__/imperative/plugins/utilities/npm-interface/install.unit.test.ts diff --git a/packages/imperative/src/imperative/__tests__/plugins/utilities/npm-interface/uninstall.unit.test.ts b/packages/imperative/__tests__/__unit__/imperative/plugins/utilities/npm-interface/uninstall.unit.test.ts similarity index 100% rename from packages/imperative/src/imperative/__tests__/plugins/utilities/npm-interface/uninstall.unit.test.ts rename to packages/imperative/__tests__/__unit__/imperative/plugins/utilities/npm-interface/uninstall.unit.test.ts diff --git a/packages/imperative/src/imperative/__tests__/plugins/utilities/npm-interface/update.unit.test.ts b/packages/imperative/__tests__/__unit__/imperative/plugins/utilities/npm-interface/update.unit.test.ts similarity index 100% rename from packages/imperative/src/imperative/__tests__/plugins/utilities/npm-interface/update.unit.test.ts rename to packages/imperative/__tests__/__unit__/imperative/plugins/utilities/npm-interface/update.unit.test.ts diff --git a/packages/imperative/src/imperative/__tests__/plugins/utilities/runValidatePlugin.unit.test.ts b/packages/imperative/__tests__/__unit__/imperative/plugins/utilities/runValidatePlugin.unit.test.ts similarity index 100% rename from packages/imperative/src/imperative/__tests__/plugins/utilities/runValidatePlugin.unit.test.ts rename to packages/imperative/__tests__/__unit__/imperative/plugins/utilities/runValidatePlugin.unit.test.ts diff --git a/packages/imperative/src/imperative/__tests__/profiles/handlers/CreateProfilesHandler.unit.test.ts b/packages/imperative/__tests__/__unit__/imperative/profiles/handlers/CreateProfilesHandler.unit.test.ts similarity index 98% rename from packages/imperative/src/imperative/__tests__/profiles/handlers/CreateProfilesHandler.unit.test.ts rename to packages/imperative/__tests__/__unit__/imperative/profiles/handlers/CreateProfilesHandler.unit.test.ts index f95db9d1b2..6cc7bc5636 100644 --- a/packages/imperative/src/imperative/__tests__/profiles/handlers/CreateProfilesHandler.unit.test.ts +++ b/packages/imperative/__tests__/__unit__/imperative/profiles/handlers/CreateProfilesHandler.unit.test.ts @@ -10,7 +10,7 @@ */ jest.mock("../../../src/Imperative"); -jest.mock("../../../../utilities/src/ImperativeConfig"); +jest.mock("../../../../utilities/ImperativeConfig"); import { IProfileLoaded } from "../../../../profiles"; import { Imperative } from "../../../src/Imperative"; diff --git a/packages/imperative/src/imperative/__tests__/profiles/handlers/ListProfilesHandler.unit.test.ts b/packages/imperative/__tests__/__unit__/imperative/profiles/handlers/ListProfilesHandler.unit.test.ts similarity index 99% rename from packages/imperative/src/imperative/__tests__/profiles/handlers/ListProfilesHandler.unit.test.ts rename to packages/imperative/__tests__/__unit__/imperative/profiles/handlers/ListProfilesHandler.unit.test.ts index e5fcc985b1..6ea7949a4d 100644 --- a/packages/imperative/src/imperative/__tests__/profiles/handlers/ListProfilesHandler.unit.test.ts +++ b/packages/imperative/__tests__/__unit__/imperative/profiles/handlers/ListProfilesHandler.unit.test.ts @@ -10,7 +10,7 @@ */ jest.mock("../../../src/Imperative"); -jest.mock("../../../../utilities/src/ImperativeConfig"); +jest.mock("../../../../utilities/ImperativeConfig"); import { IProfileLoaded } from "../../../../profiles"; import { Imperative } from "../../../src/Imperative"; diff --git a/packages/imperative/src/imperative/__tests__/profiles/handlers/NewDeleteProfilesHandler.unit.test.ts b/packages/imperative/__tests__/__unit__/imperative/profiles/handlers/NewDeleteProfilesHandler.unit.test.ts similarity index 98% rename from packages/imperative/src/imperative/__tests__/profiles/handlers/NewDeleteProfilesHandler.unit.test.ts rename to packages/imperative/__tests__/__unit__/imperative/profiles/handlers/NewDeleteProfilesHandler.unit.test.ts index 6801595838..038915470c 100644 --- a/packages/imperative/src/imperative/__tests__/profiles/handlers/NewDeleteProfilesHandler.unit.test.ts +++ b/packages/imperative/__tests__/__unit__/imperative/profiles/handlers/NewDeleteProfilesHandler.unit.test.ts @@ -10,7 +10,7 @@ */ jest.mock("../../../src/Imperative"); -jest.mock("../../../../utilities/src/ImperativeConfig"); +jest.mock("../../../../utilities/ImperativeConfig"); import { IProfileLoaded } from "../../../../profiles"; import { Imperative } from "../../../src/Imperative"; diff --git a/packages/imperative/src/imperative/__tests__/profiles/handlers/UpdateProfilesHandler.unit.test.ts b/packages/imperative/__tests__/__unit__/imperative/profiles/handlers/UpdateProfilesHandler.unit.test.ts similarity index 98% rename from packages/imperative/src/imperative/__tests__/profiles/handlers/UpdateProfilesHandler.unit.test.ts rename to packages/imperative/__tests__/__unit__/imperative/profiles/handlers/UpdateProfilesHandler.unit.test.ts index 0032535b69..63c71dc5f9 100644 --- a/packages/imperative/src/imperative/__tests__/profiles/handlers/UpdateProfilesHandler.unit.test.ts +++ b/packages/imperative/__tests__/__unit__/imperative/profiles/handlers/UpdateProfilesHandler.unit.test.ts @@ -10,7 +10,7 @@ */ jest.mock("../../../src/Imperative"); -jest.mock("../../../../utilities/src/ImperativeConfig"); +jest.mock("../../../../utilities/ImperativeConfig"); import { IProfileLoaded } from "../../../../profiles"; import { Imperative } from "../../../src/Imperative"; diff --git a/packages/imperative/src/imperative/__tests__/profiles/handlers/ValidateProfileHandler.unit.test.ts b/packages/imperative/__tests__/__unit__/imperative/profiles/handlers/ValidateProfileHandler.unit.test.ts similarity index 99% rename from packages/imperative/src/imperative/__tests__/profiles/handlers/ValidateProfileHandler.unit.test.ts rename to packages/imperative/__tests__/__unit__/imperative/profiles/handlers/ValidateProfileHandler.unit.test.ts index 406679f58c..703fca7f62 100644 --- a/packages/imperative/src/imperative/__tests__/profiles/handlers/ValidateProfileHandler.unit.test.ts +++ b/packages/imperative/__tests__/__unit__/imperative/profiles/handlers/ValidateProfileHandler.unit.test.ts @@ -10,7 +10,7 @@ */ jest.mock("../../../src/Imperative"); -jest.mock("../../../../utilities/src/ImperativeConfig"); +jest.mock("../../../../utilities/ImperativeConfig"); import { IProfileLoaded, ProfileValidator } from "../../../../profiles"; import { ICommandProfileTypeConfiguration } from "../../../../cmd"; diff --git a/packages/imperative/src/imperative/__tests__/profiles/handlers/__snapshots__/ListProfilesHandler.unit.test.ts.snap b/packages/imperative/__tests__/__unit__/imperative/profiles/handlers/__snapshots__/ListProfilesHandler.unit.test.ts.snap similarity index 100% rename from packages/imperative/src/imperative/__tests__/profiles/handlers/__snapshots__/ListProfilesHandler.unit.test.ts.snap rename to packages/imperative/__tests__/__unit__/imperative/profiles/handlers/__snapshots__/ListProfilesHandler.unit.test.ts.snap diff --git a/packages/imperative/src/io/__tests__/IO.unit.test.ts b/packages/imperative/__tests__/__unit__/io/IO.unit.test.ts similarity index 98% rename from packages/imperative/src/io/__tests__/IO.unit.test.ts rename to packages/imperative/__tests__/__unit__/io/IO.unit.test.ts index 880a40a1ea..e3fc20b928 100644 --- a/packages/imperative/src/io/__tests__/IO.unit.test.ts +++ b/packages/imperative/__tests__/__unit__/io/IO.unit.test.ts @@ -16,10 +16,11 @@ jest.mock("path"); import * as fs from "fs"; import * as os from "os"; import * as path from "path"; -import { IO } from "../../io"; +import { IO } from "../../../src/io"; // use complete path to ExecUtils to avoid circular dependency that results from utilities/index -import { ExecUtils } from "../../utilities/src/ExecUtils"; -import { ProcessUtils, ISystemInfo } from "../../utilities"; +import { ExecUtils } from "../../../src/utilities/ExecUtils"; +import { ProcessUtils } from "../../../src/utilities/ProcessUtils"; +import { ISystemInfo } from "../../../src/utilities/doc/ISystemInfo"; describe("IO tests", () => { let existsSyncSpy: any; diff --git a/packages/imperative/src/io/__tests__/__snapshots__/IO.unit.test.ts.snap b/packages/imperative/__tests__/__unit__/io/__snapshots__/IO.unit.test.ts.snap similarity index 100% rename from packages/imperative/src/io/__tests__/__snapshots__/IO.unit.test.ts.snap rename to packages/imperative/__tests__/__unit__/io/__snapshots__/IO.unit.test.ts.snap diff --git a/packages/imperative/src/logger/__tests__/Logger.unit.test.ts b/packages/imperative/__tests__/__unit__/logger/Logger.unit.test.ts similarity index 97% rename from packages/imperative/src/logger/__tests__/Logger.unit.test.ts rename to packages/imperative/__tests__/__unit__/logger/Logger.unit.test.ts index 4e2ef1a769..1645480089 100644 --- a/packages/imperative/src/logger/__tests__/Logger.unit.test.ts +++ b/packages/imperative/__tests__/__unit__/logger/Logger.unit.test.ts @@ -12,16 +12,16 @@ jest.mock("log4js"); jest.mock("fs"); import * as log4js from "log4js"; -import { LoggingConfigurer } from "../../imperative/src/LoggingConfigurer"; -import { IConfigLogging, ILog4jsConfig, Logger } from "../../logger"; -import { LoggerManager } from "../../logger/src/LoggerManager"; +import { LoggingConfigurer } from "../../../src/imperative/LoggingConfigurer"; +import { IConfigLogging, ILog4jsConfig, Logger } from "../../../src/logger"; +import { LoggerManager } from "../../../src/logger/src/LoggerManager"; -import { ImperativeError } from "../../error"; +import { ImperativeError } from "../../../src/error"; import * as os from "os"; import * as path from "path"; import * as fs from "fs"; -import { IO } from "../../io"; +import { IO } from "../../../src/io"; describe("Logger tests", () => { const fakeHome = "/home"; diff --git a/packages/imperative/src/logger/__tests__/LoggerConfigBuilder.unit.test.ts b/packages/imperative/__tests__/__unit__/logger/LoggerConfigBuilder.unit.test.ts similarity index 98% rename from packages/imperative/src/logger/__tests__/LoggerConfigBuilder.unit.test.ts rename to packages/imperative/__tests__/__unit__/logger/LoggerConfigBuilder.unit.test.ts index 489577de15..beeca5256d 100644 --- a/packages/imperative/src/logger/__tests__/LoggerConfigBuilder.unit.test.ts +++ b/packages/imperative/__tests__/__unit__/logger/LoggerConfigBuilder.unit.test.ts @@ -9,7 +9,7 @@ * */ -import { LoggerConfigBuilder } from "../../logger"; +import { LoggerConfigBuilder } from "../../../src/logger"; import * as os from "os"; import * as path from "path"; diff --git a/packages/imperative/src/logger/__tests__/LoggerUtils.unit.test.ts b/packages/imperative/__tests__/__unit__/logger/LoggerUtils.unit.test.ts similarity index 95% rename from packages/imperative/src/logger/__tests__/LoggerUtils.unit.test.ts rename to packages/imperative/__tests__/__unit__/logger/LoggerUtils.unit.test.ts index fe82898085..b3d4e8780f 100644 --- a/packages/imperative/src/logger/__tests__/LoggerUtils.unit.test.ts +++ b/packages/imperative/__tests__/__unit__/logger/LoggerUtils.unit.test.ts @@ -9,9 +9,9 @@ * */ -import { EnvironmentalVariableSettings } from "../../imperative/src/env/EnvironmentalVariableSettings"; -import { LoggerUtils } from "../../logger"; -import { ImperativeConfig } from "../../utilities/src/ImperativeConfig"; +import { EnvironmentalVariableSettings } from "../../../src/imperative/env/EnvironmentalVariableSettings"; +import { LoggerUtils } from "../../../src/logger"; +import { ImperativeConfig } from "../../../src/utilities/ImperativeConfigImperativeConfig"; describe("LoggerUtils tests", () => { diff --git a/packages/imperative/src/logger/__tests__/__snapshots__/Logger.unit.test.ts.snap b/packages/imperative/__tests__/__unit__/logger/__snapshots__/Logger.unit.test.ts.snap similarity index 100% rename from packages/imperative/src/logger/__tests__/__snapshots__/Logger.unit.test.ts.snap rename to packages/imperative/__tests__/__unit__/logger/__snapshots__/Logger.unit.test.ts.snap diff --git a/packages/imperative/src/logger/__tests__/__snapshots__/LoggerConfigBuilder.unit.test.ts.snap b/packages/imperative/__tests__/__unit__/logger/__snapshots__/LoggerConfigBuilder.unit.test.ts.snap similarity index 100% rename from packages/imperative/src/logger/__tests__/__snapshots__/LoggerConfigBuilder.unit.test.ts.snap rename to packages/imperative/__tests__/__unit__/logger/__snapshots__/LoggerConfigBuilder.unit.test.ts.snap diff --git a/packages/imperative/src/profiles/__tests__/BasicProfileManager.constructor.unit.test.ts b/packages/imperative/__tests__/__unit__/profiles/BasicProfileManager.constructor.unit.test.ts similarity index 96% rename from packages/imperative/src/profiles/__tests__/BasicProfileManager.constructor.unit.test.ts rename to packages/imperative/__tests__/__unit__/profiles/BasicProfileManager.constructor.unit.test.ts index 44732265b2..9137824ee6 100644 --- a/packages/imperative/src/profiles/__tests__/BasicProfileManager.constructor.unit.test.ts +++ b/packages/imperative/__tests__/__unit__/profiles/BasicProfileManager.constructor.unit.test.ts @@ -10,11 +10,11 @@ */ jest.mock("../src/utils/ProfileIO"); -import { ImperativeError } from "../../error/src/ImperativeError"; -import { TestLogger } from "../../../__tests__/src/TestLogger"; +import { ImperativeError } from "../../../src/error/ImperativeError"; +import { TestLogger } from "../../../src/../__tests__/src/TestLogger"; import { APPLE_PROFILE_TYPE, FRUIT_BASKET_BAD_DIR, FRUIT_BASKET_WORSE, MANGO_PROFILE_TYPE, ONLY_APPLE, TEST_PROFILE_ROOT_DIR } from "./TestConstants"; -import { BasicProfileManager } from "../src/BasicProfileManager"; -import { IProfileTypeConfiguration } from "../src/doc/config/IProfileTypeConfiguration"; +import { BasicProfileManager } from "../../../src/profiles/BasicProfileManager"; +import { IProfileTypeConfiguration } from "../../../src/profiles/doc/config/IProfileTypeConfiguration"; // UnitTestUtils.replaceIt(); diff --git a/packages/imperative/src/profiles/__tests__/BasicProfileManager.delete.unit.test.ts b/packages/imperative/__tests__/__unit__/profiles/BasicProfileManager.delete.unit.test.ts similarity index 97% rename from packages/imperative/src/profiles/__tests__/BasicProfileManager.delete.unit.test.ts rename to packages/imperative/__tests__/__unit__/profiles/BasicProfileManager.delete.unit.test.ts index 594859a70b..d4cfbe828e 100644 --- a/packages/imperative/src/profiles/__tests__/BasicProfileManager.delete.unit.test.ts +++ b/packages/imperative/__tests__/__unit__/profiles/BasicProfileManager.delete.unit.test.ts @@ -11,9 +11,9 @@ jest.mock("../src/utils/ProfileIO"); -import { BasicProfileManager } from "../src/BasicProfileManager"; +import { BasicProfileManager } from "../../../src/profiles/BasicProfileManager"; import { TestLogger } from "../../../__tests__/src/TestLogger"; -import { IProfileDeleted } from "../src/doc/response/IProfileDeleted"; +import { IProfileDeleted } from "../../../src/profiles/doc/response/IProfileDeleted"; import { inspect } from "util"; import { APPLE_PROFILE_TYPE, diff --git a/packages/imperative/src/profiles/__tests__/BasicProfileManager.load.unit.test.ts b/packages/imperative/__tests__/__unit__/profiles/BasicProfileManager.load.unit.test.ts similarity index 99% rename from packages/imperative/src/profiles/__tests__/BasicProfileManager.load.unit.test.ts rename to packages/imperative/__tests__/__unit__/profiles/BasicProfileManager.load.unit.test.ts index 5530004561..96eac35599 100644 --- a/packages/imperative/src/profiles/__tests__/BasicProfileManager.load.unit.test.ts +++ b/packages/imperative/__tests__/__unit__/profiles/BasicProfileManager.load.unit.test.ts @@ -11,7 +11,7 @@ import { TestLogger } from "../../../__tests__/src/TestLogger"; import { inspect } from "util"; -import { IProfileLoaded } from "../../profiles/src/doc/response/IProfileLoaded"; +import { IProfileLoaded } from "../../../src/profiles/doc/response/IProfileLoaded"; import { APPLE_PROFILE_TYPE, APPLE_TWO_REQ_DEP_BANANA_AND_STRAWBERRIES, diff --git a/packages/imperative/src/profiles/__tests__/BasicProfileManager.merge.unit.test.ts b/packages/imperative/__tests__/__unit__/profiles/BasicProfileManager.merge.unit.test.ts similarity index 99% rename from packages/imperative/src/profiles/__tests__/BasicProfileManager.merge.unit.test.ts rename to packages/imperative/__tests__/__unit__/profiles/BasicProfileManager.merge.unit.test.ts index 02d4f9c1a1..1ab5f411f5 100644 --- a/packages/imperative/src/profiles/__tests__/BasicProfileManager.merge.unit.test.ts +++ b/packages/imperative/__tests__/__unit__/profiles/BasicProfileManager.merge.unit.test.ts @@ -12,7 +12,7 @@ jest.mock("../src/utils/ProfileIO"); import { PROFILE_TYPE } from "../../../__tests__/src/packages/profiles/src/constants/BasicProfileManagerTestConstants"; -import { BasicProfileManager } from "../src/BasicProfileManager"; +import { BasicProfileManager } from "../../../src/profiles/BasicProfileManager"; import { APPLE_PROFILE_TYPE, GRAPE_PROFILE_TYPE, diff --git a/packages/imperative/src/profiles/__tests__/BasicProfileManager.save.unit.test.ts b/packages/imperative/__tests__/__unit__/profiles/BasicProfileManager.save.unit.test.ts similarity index 98% rename from packages/imperative/src/profiles/__tests__/BasicProfileManager.save.unit.test.ts rename to packages/imperative/__tests__/__unit__/profiles/BasicProfileManager.save.unit.test.ts index 793ecf51bf..401713860b 100644 --- a/packages/imperative/src/profiles/__tests__/BasicProfileManager.save.unit.test.ts +++ b/packages/imperative/__tests__/__unit__/profiles/BasicProfileManager.save.unit.test.ts @@ -10,11 +10,12 @@ */ jest.mock("../src/utils/ProfileIO"); -import { ImperativeError } from "../../error/src/ImperativeError"; +import { ImperativeError } from "../../../src/error/ImperativeError"; import { TestLogger } from "../../../__tests__/src/TestLogger"; -import { ISaveProfile } from "../src/doc/parms/ISaveProfile"; +import { ISaveProfile } from "../../../src/profiles/doc/parms/ISaveProfile"; import { inspect } from "util"; -import { IProfileSaved } from "../src/doc/response/IProfileSaved"; +import { IProfileSaved } from "../../../src/profiles/doc/response/IProfileSaved"; + import { APPLE_BAN_UNKNOWN, APPLE_PROFILE_TYPE, diff --git a/packages/imperative/src/profiles/__tests__/BasicProfileManager.unit.test.ts b/packages/imperative/__tests__/__unit__/profiles/BasicProfileManager.unit.test.ts similarity index 98% rename from packages/imperative/src/profiles/__tests__/BasicProfileManager.unit.test.ts rename to packages/imperative/__tests__/__unit__/profiles/BasicProfileManager.unit.test.ts index 8c14a19447..56007f806d 100644 --- a/packages/imperative/src/profiles/__tests__/BasicProfileManager.unit.test.ts +++ b/packages/imperative/__tests__/__unit__/profiles/BasicProfileManager.unit.test.ts @@ -10,9 +10,9 @@ */ jest.mock("../src/utils/ProfileIO"); -import { ImperativeError } from "../../error/src/ImperativeError"; +import { ImperativeError } from "../../../src/error/ImperativeError"; import { TestLogger } from "../../../__tests__/src/TestLogger"; -import { IProfileLoaded } from "../../profiles/src/doc/response/IProfileLoaded"; +import { IProfileLoaded } from "../../../src/profiles/doc/response/IProfileLoaded"; import { APPLE_PROFILE_TYPE, APPLE_TWO_REQ_DEP_BANANA_AND_STRAWBERRIES, diff --git a/packages/imperative/src/profiles/__tests__/BasicProfileManager.update.unit.test.ts b/packages/imperative/__tests__/__unit__/profiles/BasicProfileManager.update.unit.test.ts similarity index 93% rename from packages/imperative/src/profiles/__tests__/BasicProfileManager.update.unit.test.ts rename to packages/imperative/__tests__/__unit__/profiles/BasicProfileManager.update.unit.test.ts index 9071658896..8b1f55f9ba 100644 --- a/packages/imperative/src/profiles/__tests__/BasicProfileManager.update.unit.test.ts +++ b/packages/imperative/__tests__/__unit__/profiles/BasicProfileManager.update.unit.test.ts @@ -9,10 +9,10 @@ * */ -import { BasicProfileManager } from "../src/BasicProfileManager"; +import { BasicProfileManager } from "../../../src/profiles/BasicProfileManager"; import { APPLE_PROFILE_TYPE, ONLY_APPLE, TEST_PROFILE_ROOT_DIR } from "./TestConstants"; import { TestLogger } from "../../../__tests__/src/TestLogger"; -import { IProfileUpdated } from "../src/doc/response/IProfileUpdated"; +import { IProfileUpdated } from "../../../src/profiles/doc/response/IProfileUpdated"; jest.mock("../src/utils/ProfileIO"); diff --git a/packages/imperative/src/profiles/__tests__/BasicProfileManager.validate.unit.test.ts b/packages/imperative/__tests__/__unit__/profiles/BasicProfileManager.validate.unit.test.ts similarity index 98% rename from packages/imperative/src/profiles/__tests__/BasicProfileManager.validate.unit.test.ts rename to packages/imperative/__tests__/__unit__/profiles/BasicProfileManager.validate.unit.test.ts index 9d4b548882..ea266750ca 100644 --- a/packages/imperative/src/profiles/__tests__/BasicProfileManager.validate.unit.test.ts +++ b/packages/imperative/__tests__/__unit__/profiles/BasicProfileManager.validate.unit.test.ts @@ -9,9 +9,9 @@ * */ -import { BasicProfileManager } from "../src/BasicProfileManager"; +import { BasicProfileManager } from "../../../src/profiles/BasicProfileManager"; import { TestLogger } from "../../../__tests__/src/TestLogger"; -import { IProfileValidated } from "../src/doc/response/IProfileValidated"; +import { IProfileValidated } from "../../../src/profiles/doc/response/IProfileValidated"; import { APPLE_PROFILE_TYPE, ONLY_APPLE, diff --git a/packages/imperative/src/profiles/__tests__/TestConstants.ts b/packages/imperative/__tests__/__unit__/profiles/TestConstants.ts similarity index 100% rename from packages/imperative/src/profiles/__tests__/TestConstants.ts rename to packages/imperative/__tests__/__unit__/profiles/TestConstants.ts diff --git a/packages/imperative/src/profiles/__tests__/__snapshots__/BasicProfileManager.constructor.unit.test.ts.snap b/packages/imperative/__tests__/__unit__/profiles/__snapshots__/BasicProfileManager.constructor.unit.test.ts.snap similarity index 100% rename from packages/imperative/src/profiles/__tests__/__snapshots__/BasicProfileManager.constructor.unit.test.ts.snap rename to packages/imperative/__tests__/__unit__/profiles/__snapshots__/BasicProfileManager.constructor.unit.test.ts.snap diff --git a/packages/imperative/src/profiles/__tests__/__snapshots__/BasicProfileManager.delete.unit.test.ts.snap b/packages/imperative/__tests__/__unit__/profiles/__snapshots__/BasicProfileManager.delete.unit.test.ts.snap similarity index 100% rename from packages/imperative/src/profiles/__tests__/__snapshots__/BasicProfileManager.delete.unit.test.ts.snap rename to packages/imperative/__tests__/__unit__/profiles/__snapshots__/BasicProfileManager.delete.unit.test.ts.snap diff --git a/packages/imperative/src/profiles/__tests__/__snapshots__/BasicProfileManager.load.unit.test.ts.snap b/packages/imperative/__tests__/__unit__/profiles/__snapshots__/BasicProfileManager.load.unit.test.ts.snap similarity index 100% rename from packages/imperative/src/profiles/__tests__/__snapshots__/BasicProfileManager.load.unit.test.ts.snap rename to packages/imperative/__tests__/__unit__/profiles/__snapshots__/BasicProfileManager.load.unit.test.ts.snap diff --git a/packages/imperative/src/profiles/__tests__/__snapshots__/BasicProfileManager.save.unit.test.ts.snap b/packages/imperative/__tests__/__unit__/profiles/__snapshots__/BasicProfileManager.save.unit.test.ts.snap similarity index 100% rename from packages/imperative/src/profiles/__tests__/__snapshots__/BasicProfileManager.save.unit.test.ts.snap rename to packages/imperative/__tests__/__unit__/profiles/__snapshots__/BasicProfileManager.save.unit.test.ts.snap diff --git a/packages/imperative/src/profiles/__tests__/__snapshots__/BasicProfileManager.unit.test.ts.snap b/packages/imperative/__tests__/__unit__/profiles/__snapshots__/BasicProfileManager.unit.test.ts.snap similarity index 100% rename from packages/imperative/src/profiles/__tests__/__snapshots__/BasicProfileManager.unit.test.ts.snap rename to packages/imperative/__tests__/__unit__/profiles/__snapshots__/BasicProfileManager.unit.test.ts.snap diff --git a/packages/imperative/src/profiles/__tests__/__snapshots__/BasicProfileManager.update.unit.test.ts.snap b/packages/imperative/__tests__/__unit__/profiles/__snapshots__/BasicProfileManager.update.unit.test.ts.snap similarity index 100% rename from packages/imperative/src/profiles/__tests__/__snapshots__/BasicProfileManager.update.unit.test.ts.snap rename to packages/imperative/__tests__/__unit__/profiles/__snapshots__/BasicProfileManager.update.unit.test.ts.snap diff --git a/packages/imperative/src/profiles/__tests__/__snapshots__/BasicProfileManager.validate.unit.test.ts.snap b/packages/imperative/__tests__/__unit__/profiles/__snapshots__/BasicProfileManager.validate.unit.test.ts.snap similarity index 100% rename from packages/imperative/src/profiles/__tests__/__snapshots__/BasicProfileManager.validate.unit.test.ts.snap rename to packages/imperative/__tests__/__unit__/profiles/__snapshots__/BasicProfileManager.validate.unit.test.ts.snap diff --git a/packages/imperative/src/rest/__tests__/client/AbstractRestClient.unit.test.ts b/packages/imperative/__tests__/__unit__/rest/client/AbstractRestClient.unit.test.ts similarity index 98% rename from packages/imperative/src/rest/__tests__/client/AbstractRestClient.unit.test.ts rename to packages/imperative/__tests__/__unit__/rest/client/AbstractRestClient.unit.test.ts index c97fad3d7d..2acd9bd4ba 100644 --- a/packages/imperative/src/rest/__tests__/client/AbstractRestClient.unit.test.ts +++ b/packages/imperative/__tests__/__unit__/rest/client/AbstractRestClient.unit.test.ts @@ -11,22 +11,22 @@ import * as https from "https"; import * as http from "http"; -import { Session } from "../../src/session/Session"; -import { RestClient } from "../../src/client/RestClient"; -import { Headers } from "../../src/client/Headers"; -import { ProcessUtils } from "../../../utilities"; +import { Session } from "../../../../src/rest/session/Session"; +import { RestClient } from "../../../../src/rest/client/RestClient"; +import { Headers } from "../../../../src/rest/client/Headers"; +import { ProcessUtils } from "../../../../src/utilities/ProcessUtils"; import { MockHttpRequestResponse } from "./__model__/MockHttpRequestResponse"; import { EventEmitter } from "events"; -import { ImperativeError } from "../../../error"; -import { IOptionsFullResponse } from "../../src/client/doc/IOptionsFullResponse"; -import { CLIENT_PROPERTY } from "../../src/client/types/AbstractRestClientProperties"; +import { ImperativeError } from "../../../../src/error"; +import { IOptionsFullResponse } from "../../../../src/rest/client/doc/IOptionsFullResponse"; +import { CLIENT_PROPERTY } from "../../../../src/rest/client/types/AbstractRestClientProperties"; import { PassThrough } from "stream"; import * as zlib from "zlib"; import * as streamToString from "stream-to-string"; -import { AbstractRestClient } from "../../src/client/AbstractRestClient"; +import { AbstractRestClient } from "../../../../src/rest/client/AbstractRestClient"; import * as os from "os"; import { join } from "path"; -import { IO } from "../../../io"; +import { IO } from "../../../../src/io"; /** * To test the AbstractRestClient, we use the existing default RestClient which diff --git a/packages/imperative/src/rest/__tests__/client/CompressionUtils.unit.test.ts b/packages/imperative/__tests__/__unit__/rest/client/CompressionUtils.unit.test.ts similarity index 98% rename from packages/imperative/src/rest/__tests__/client/CompressionUtils.unit.test.ts rename to packages/imperative/__tests__/__unit__/rest/client/CompressionUtils.unit.test.ts index 95f76a2af3..0d8a418b64 100644 --- a/packages/imperative/src/rest/__tests__/client/CompressionUtils.unit.test.ts +++ b/packages/imperative/__tests__/__unit__/rest/client/CompressionUtils.unit.test.ts @@ -13,7 +13,7 @@ import * as os from "os"; import { PassThrough } from "stream"; import * as zlib from "zlib"; import * as streamToString from "stream-to-string"; -import { CompressionUtils } from "../../src/client/CompressionUtils"; +import { CompressionUtils } from "../../../../src/rest/client/CompressionUtils"; const responseText = "Request failed successfully"; const rawBuffer = Buffer.from(responseText); diff --git a/packages/imperative/src/rest/__tests__/client/RestClient.unit.test.ts b/packages/imperative/__tests__/__unit__/rest/client/RestClient.unit.test.ts similarity index 95% rename from packages/imperative/src/rest/__tests__/client/RestClient.unit.test.ts rename to packages/imperative/__tests__/__unit__/rest/client/RestClient.unit.test.ts index 251b959a85..f7b9206126 100644 --- a/packages/imperative/src/rest/__tests__/client/RestClient.unit.test.ts +++ b/packages/imperative/__tests__/__unit__/rest/client/RestClient.unit.test.ts @@ -12,17 +12,17 @@ jest.mock("path"); import * as path from "path"; import * as https from "https"; -import { Session } from "../../src/session/Session"; +import { Session } from "../../../../src/rest/session/Session"; import { EventEmitter } from "events"; -import { ProcessUtils } from "../../../utilities"; +import { ProcessUtils } from "../../../../src/utilities/ProcessUtils"; import { MockHttpRequestResponse } from "./__model__/MockHttpRequestResponse"; import { CustomRestClient } from "./__model__/CustomRestClient"; import { CustomRestClientWithProcessError, EXPECTED_REST_ERROR } from "./__model__/CustomRestClientWithProcessError"; import { getRandomBytes } from "../../../../__tests__/src/TestUtil"; -import { RestClientError } from "../../src/client/RestClientError"; -import { IOptionsFullResponse } from "../../src/client/doc/IOptionsFullResponse"; -import { IRestClientResponse } from "../../src/client/doc/IRestClientResponse"; -import { CLIENT_PROPERTY } from "../../src/client/types/AbstractRestClientProperties"; +import { RestClientError } from "../../../../src/rest/client/RestClientError"; +import { IOptionsFullResponse } from "../../../../src/rest/client/doc/IOptionsFullResponse"; +import { IRestClientResponse } from "../../../../src/rest/client/doc/IRestClientResponse"; +import { CLIENT_PROPERTY } from "../../../../src/rest/client/types/AbstractRestClientProperties"; /** * RestClient is already tested vie the AbstractRestClient test, so we will extend RestClient diff --git a/packages/imperative/src/rest/__tests__/client/RestClientError.unit.test.ts b/packages/imperative/__tests__/__unit__/rest/client/RestClientError.unit.test.ts similarity index 91% rename from packages/imperative/src/rest/__tests__/client/RestClientError.unit.test.ts rename to packages/imperative/__tests__/__unit__/rest/client/RestClientError.unit.test.ts index cb8fe76204..5f8762db2d 100644 --- a/packages/imperative/src/rest/__tests__/client/RestClientError.unit.test.ts +++ b/packages/imperative/__tests__/__unit__/rest/client/RestClientError.unit.test.ts @@ -9,8 +9,8 @@ * */ -import { RestClientError } from "../../src/client/RestClientError"; -import { ImperativeError } from "../../../error"; +import { RestClientError } from "../../../../src/rest/client/RestClientError"; +import { ImperativeError } from "../../../../src/error"; describe("RestClientError tests", () => { it("should be an instance of ImperativeError", async () => { diff --git a/packages/imperative/src/rest/__tests__/client/RestStandAloneUtils.unit.test.ts b/packages/imperative/__tests__/__unit__/rest/client/RestStandAloneUtils.unit.test.ts similarity index 91% rename from packages/imperative/src/rest/__tests__/client/RestStandAloneUtils.unit.test.ts rename to packages/imperative/__tests__/__unit__/rest/client/RestStandAloneUtils.unit.test.ts index f970b332e4..9a167fe902 100644 --- a/packages/imperative/src/rest/__tests__/client/RestStandAloneUtils.unit.test.ts +++ b/packages/imperative/__tests__/__unit__/rest/client/RestStandAloneUtils.unit.test.ts @@ -9,7 +9,7 @@ * */ -import { RestStandAloneUtils } from "../../src/client/RestStandAloneUtils"; +import { RestStandAloneUtils } from "../../../../src/rest/client/RestStandAloneUtils"; const IN_USER = "shadyside"; const IN_PASSWORD = "darkside"; diff --git a/packages/imperative/src/rest/__tests__/client/__model__/CustomRestClient.ts b/packages/imperative/__tests__/__unit__/rest/client/__model__/CustomRestClient.ts similarity index 100% rename from packages/imperative/src/rest/__tests__/client/__model__/CustomRestClient.ts rename to packages/imperative/__tests__/__unit__/rest/client/__model__/CustomRestClient.ts diff --git a/packages/imperative/src/rest/__tests__/client/__model__/CustomRestClientWithProcessError.ts b/packages/imperative/__tests__/__unit__/rest/client/__model__/CustomRestClientWithProcessError.ts similarity index 100% rename from packages/imperative/src/rest/__tests__/client/__model__/CustomRestClientWithProcessError.ts rename to packages/imperative/__tests__/__unit__/rest/client/__model__/CustomRestClientWithProcessError.ts diff --git a/packages/imperative/src/rest/__tests__/client/__model__/MockHttpRequestResponse.ts b/packages/imperative/__tests__/__unit__/rest/client/__model__/MockHttpRequestResponse.ts similarity index 100% rename from packages/imperative/src/rest/__tests__/client/__model__/MockHttpRequestResponse.ts rename to packages/imperative/__tests__/__unit__/rest/client/__model__/MockHttpRequestResponse.ts diff --git a/packages/imperative/src/rest/__tests__/client/__snapshots__/AbstractRestClient.unit.test.ts.snap b/packages/imperative/__tests__/__unit__/rest/client/__snapshots__/AbstractRestClient.unit.test.ts.snap similarity index 100% rename from packages/imperative/src/rest/__tests__/client/__snapshots__/AbstractRestClient.unit.test.ts.snap rename to packages/imperative/__tests__/__unit__/rest/client/__snapshots__/AbstractRestClient.unit.test.ts.snap diff --git a/packages/imperative/src/rest/__tests__/client/__snapshots__/RestClient.unit.test.ts.snap b/packages/imperative/__tests__/__unit__/rest/client/__snapshots__/RestClient.unit.test.ts.snap similarity index 100% rename from packages/imperative/src/rest/__tests__/client/__snapshots__/RestClient.unit.test.ts.snap rename to packages/imperative/__tests__/__unit__/rest/client/__snapshots__/RestClient.unit.test.ts.snap diff --git a/packages/imperative/src/rest/__tests__/client/__snapshots__/RestClientError.unit.test.ts.snap b/packages/imperative/__tests__/__unit__/rest/client/__snapshots__/RestClientError.unit.test.ts.snap similarity index 100% rename from packages/imperative/src/rest/__tests__/client/__snapshots__/RestClientError.unit.test.ts.snap rename to packages/imperative/__tests__/__unit__/rest/client/__snapshots__/RestClientError.unit.test.ts.snap diff --git a/packages/imperative/src/rest/__tests__/session/ConnectionPropsForSessCfg.unit.test.ts b/packages/imperative/__tests__/__unit__/rest/session/ConnectionPropsForSessCfg.unit.test.ts similarity index 98% rename from packages/imperative/src/rest/__tests__/session/ConnectionPropsForSessCfg.unit.test.ts rename to packages/imperative/__tests__/__unit__/rest/session/ConnectionPropsForSessCfg.unit.test.ts index 70cea1f2d2..048030f23e 100644 --- a/packages/imperative/src/rest/__tests__/session/ConnectionPropsForSessCfg.unit.test.ts +++ b/packages/imperative/__tests__/__unit__/rest/session/ConnectionPropsForSessCfg.unit.test.ts @@ -10,16 +10,16 @@ */ jest.mock("../../../logger/src/LoggerUtils"); -import { ConnectionPropsForSessCfg } from "../../src/session/ConnectionPropsForSessCfg"; -import { CliUtils } from "../../../utilities/src/CliUtils"; -import { ImperativeError } from "../../../error"; -import * as SessConstants from "../../src/session/SessConstants"; -import { ISession } from "../../src/session/doc/ISession"; -import { Logger } from "../../../logger"; +import { ConnectionPropsForSessCfg } from "../../../../src/rest/session/ConnectionPropsForSessCfg"; +import { CliUtils } from "../../../../src/utilities/CliUtils"; +import { ImperativeError } from "../../../../src/error"; +import * as SessConstants from "../../../../src/rest/session/SessConstants"; +import { ISession } from "../../../../src/rest/session/doc/ISession"; +import { Logger } from "../../../../src/logger"; import { join } from "path"; -import { ConfigAutoStore } from "../../../config/src/ConfigAutoStore"; +import { ConfigAutoStore } from "../../../../src/config/ConfigAutoStore"; import { setupConfigToLoad } from "../../../../__tests__/src/TestUtil"; -import { IOverridePromptConnProps } from "../../src/session/doc/IOverridePromptConnProps"; +import { IOverridePromptConnProps } from "../../../../src/rest/session/doc/IOverridePromptConnProps"; const certFilePath = join(__dirname, "..", "..", "..", "..", "__tests__", "__integration__", "cmd", "__tests__", "integration", "cli", "auth", "__resources__", "fakeCert.cert"); diff --git a/packages/imperative/src/rest/__tests__/session/Session.unit.test.ts b/packages/imperative/__tests__/__unit__/rest/session/Session.unit.test.ts similarity index 99% rename from packages/imperative/src/rest/__tests__/session/Session.unit.test.ts rename to packages/imperative/__tests__/__unit__/rest/session/Session.unit.test.ts index 4cec4483a0..4f30743d6a 100644 --- a/packages/imperative/src/rest/__tests__/session/Session.unit.test.ts +++ b/packages/imperative/__tests__/__unit__/rest/session/Session.unit.test.ts @@ -10,7 +10,7 @@ */ import { URL } from "url"; -import { Session } from "../../src/session/Session"; +import { Session } from "../../../../src/rest/session/Session"; describe("Session tests", () => { diff --git a/packages/imperative/src/rest/__tests__/session/__snapshots__/Session.unit.test.ts.snap b/packages/imperative/__tests__/__unit__/rest/session/__snapshots__/Session.unit.test.ts.snap similarity index 100% rename from packages/imperative/src/rest/__tests__/session/__snapshots__/Session.unit.test.ts.snap rename to packages/imperative/__tests__/__unit__/rest/session/__snapshots__/Session.unit.test.ts.snap diff --git a/packages/imperative/src/security/__tests__/CredentialManagerFactory-testClasses/FailToExtend.ts b/packages/imperative/__tests__/__unit__/security/CredentialManagerFactory-testClasses/FailToExtend.ts similarity index 100% rename from packages/imperative/src/security/__tests__/CredentialManagerFactory-testClasses/FailToExtend.ts rename to packages/imperative/__tests__/__unit__/security/CredentialManagerFactory-testClasses/FailToExtend.ts diff --git a/packages/imperative/src/security/__tests__/CredentialManagerFactory-testClasses/GoodCredentialManager.ts b/packages/imperative/__tests__/__unit__/security/CredentialManagerFactory-testClasses/GoodCredentialManager.ts similarity index 99% rename from packages/imperative/src/security/__tests__/CredentialManagerFactory-testClasses/GoodCredentialManager.ts rename to packages/imperative/__tests__/__unit__/security/CredentialManagerFactory-testClasses/GoodCredentialManager.ts index cd25eaf5dd..061217d3b8 100644 --- a/packages/imperative/src/security/__tests__/CredentialManagerFactory-testClasses/GoodCredentialManager.ts +++ b/packages/imperative/__tests__/__unit__/security/CredentialManagerFactory-testClasses/GoodCredentialManager.ts @@ -9,7 +9,7 @@ * */ -import { AbstractCredentialManager, SecureCredential } from "../.."; +import { AbstractCredentialManager, SecureCredential } from "../../../.."; /** * This class is used to test the Credential Manager Factory load class method diff --git a/packages/imperative/src/security/__tests__/CredentialManagerFactory.unit.test.ts b/packages/imperative/__tests__/__unit__/security/CredentialManagerFactory.unit.test.ts similarity index 100% rename from packages/imperative/src/security/__tests__/CredentialManagerFactory.unit.test.ts rename to packages/imperative/__tests__/__unit__/security/CredentialManagerFactory.unit.test.ts diff --git a/packages/imperative/src/security/__tests__/CredentialManagerOverride.unit.test.ts b/packages/imperative/__tests__/__unit__/security/CredentialManagerOverride.unit.test.ts similarity index 98% rename from packages/imperative/src/security/__tests__/CredentialManagerOverride.unit.test.ts rename to packages/imperative/__tests__/__unit__/security/CredentialManagerOverride.unit.test.ts index 2433cc66bb..b9d2cf56a1 100644 --- a/packages/imperative/src/security/__tests__/CredentialManagerOverride.unit.test.ts +++ b/packages/imperative/__tests__/__unit__/security/CredentialManagerOverride.unit.test.ts @@ -12,11 +12,10 @@ import * as fsExtra from "fs-extra"; import * as path from "path"; -import { CredentialManagerOverride } from "../src/CredentialManagerOverride"; -import { ICredentialManagerNameMap } from "../src/doc/ICredentialManagerNameMap"; -import { ImperativeConfig } from "../../utilities"; -import { ImperativeError } from "../../error"; -import { ISettingsFile } from "../../settings/src/doc/ISettingsFile"; +import { CredentialManagerOverride,ICredentialManagerNameMap } from "../../../src/security"; +import { ImperativeConfig } from "../../../src/utilities/ImperativeConfig"; +import { ImperativeError } from "../../../src/error"; +import { ISettingsFile } from "../../../src/settings/doc/ISettingsFile"; describe("CredentialManagerOverride", () => { let mockImpConfig: any; diff --git a/packages/imperative/src/security/__tests__/DefaultCredentialManager.unit.test.ts b/packages/imperative/__tests__/__unit__/security/DefaultCredentialManager.unit.test.ts similarity index 99% rename from packages/imperative/src/security/__tests__/DefaultCredentialManager.unit.test.ts rename to packages/imperative/__tests__/__unit__/security/DefaultCredentialManager.unit.test.ts index ea415ba2a2..6821a9c8c4 100644 --- a/packages/imperative/src/security/__tests__/DefaultCredentialManager.unit.test.ts +++ b/packages/imperative/__tests__/__unit__/security/DefaultCredentialManager.unit.test.ts @@ -14,7 +14,7 @@ jest.mock("@zowe/secrets-for-zowe-sdk"); import * as path from "path"; import { DefaultCredentialManager } from ".."; import { keyring as keytar } from "@zowe/secrets-for-zowe-sdk"; -import { ImperativeError } from "../../error"; +import { ImperativeError } from "../../../src/error"; const winMaxCredentialLength = 2560; diff --git a/packages/imperative/src/security/__tests__/InvalidCredentialManager.unit.test.ts b/packages/imperative/__tests__/__unit__/security/InvalidCredentialManager.unit.test.ts similarity index 93% rename from packages/imperative/src/security/__tests__/InvalidCredentialManager.unit.test.ts rename to packages/imperative/__tests__/__unit__/security/InvalidCredentialManager.unit.test.ts index f9640535e8..ab18da19a5 100644 --- a/packages/imperative/src/security/__tests__/InvalidCredentialManager.unit.test.ts +++ b/packages/imperative/__tests__/__unit__/security/InvalidCredentialManager.unit.test.ts @@ -9,8 +9,8 @@ * */ -import { InvalidCredentialManager } from "../src/InvalidCredentialManager"; -import { BadCredentialManagerError } from ".."; +import { InvalidCredentialManager } from "../../../src/security/InvalidCredentialManager"; +import { BadCredentialManagerError } from "../../../"; describe("InvalidCredentialMangager", () => { it("should throw an error for every available method on the class", async () => { diff --git a/packages/imperative/src/security/__tests__/abstract/AbstractCredentialManager.unit.test.ts b/packages/imperative/__tests__/__unit__/security/abstract/AbstractCredentialManager.unit.test.ts similarity index 98% rename from packages/imperative/src/security/__tests__/abstract/AbstractCredentialManager.unit.test.ts rename to packages/imperative/__tests__/__unit__/security/abstract/AbstractCredentialManager.unit.test.ts index 7f684eecee..b25433162c 100644 --- a/packages/imperative/src/security/__tests__/abstract/AbstractCredentialManager.unit.test.ts +++ b/packages/imperative/__tests__/__unit__/security/abstract/AbstractCredentialManager.unit.test.ts @@ -9,8 +9,8 @@ * */ -import { AbstractCredentialManager, DefaultCredentialManager } from "../.."; -import { ImperativeError } from "../../../error"; +import { AbstractCredentialManager, DefaultCredentialManager } from "../../../../"; +import { ImperativeError } from "../../../../src/error"; import { UnitTestUtils } from "../../../../__tests__/src/UnitTestUtils"; describe("AbstractCredentialManager", () => { diff --git a/packages/imperative/src/security/__tests__/abstract/__snapshots__/AbstractCredentialManager.unit.test.ts.snap b/packages/imperative/__tests__/__unit__/security/abstract/__snapshots__/AbstractCredentialManager.unit.test.ts.snap similarity index 100% rename from packages/imperative/src/security/__tests__/abstract/__snapshots__/AbstractCredentialManager.unit.test.ts.snap rename to packages/imperative/__tests__/__unit__/security/abstract/__snapshots__/AbstractCredentialManager.unit.test.ts.snap diff --git a/packages/imperative/src/security/__tests__/doc/ICredentialManagerNameMap.unit.test.ts b/packages/imperative/__tests__/__unit__/security/doc/ICredentialManagerNameMap.unit.test.ts similarity index 100% rename from packages/imperative/src/security/__tests__/doc/ICredentialManagerNameMap.unit.test.ts rename to packages/imperative/__tests__/__unit__/security/doc/ICredentialManagerNameMap.unit.test.ts diff --git a/packages/imperative/src/security/__tests__/errors/BadCredentialManagerError.unit.test.ts b/packages/imperative/__tests__/__unit__/security/errors/BadCredentialManagerError.unit.test.ts similarity index 93% rename from packages/imperative/src/security/__tests__/errors/BadCredentialManagerError.unit.test.ts rename to packages/imperative/__tests__/__unit__/security/errors/BadCredentialManagerError.unit.test.ts index 9c7a32ddf4..593f19dc8d 100644 --- a/packages/imperative/src/security/__tests__/errors/BadCredentialManagerError.unit.test.ts +++ b/packages/imperative/__tests__/__unit__/security/errors/BadCredentialManagerError.unit.test.ts @@ -9,7 +9,7 @@ * */ -import { BadCredentialManagerError } from "../.."; +import { BadCredentialManagerError } from "../../../.."; describe("BadCredentialMangagerError", () => { it("should construct an imperative error with the proper cause error", () => { diff --git a/packages/imperative/src/settings/__tests__/AppSettings.unit.test.ts b/packages/imperative/__tests__/__unit__/settings/AppSettings.unit.test.ts similarity index 97% rename from packages/imperative/src/settings/__tests__/AppSettings.unit.test.ts rename to packages/imperative/__tests__/__unit__/settings/AppSettings.unit.test.ts index 078da76595..326235b87e 100644 --- a/packages/imperative/src/settings/__tests__/AppSettings.unit.test.ts +++ b/packages/imperative/__tests__/__unit__/settings/AppSettings.unit.test.ts @@ -14,13 +14,13 @@ import Mock = jest.Mock; jest.mock("fs"); jest.mock("jsonfile"); -import { AppSettings } from ".."; +import { AppSettings } from "../../../"; import { existsSync } from "fs"; -import { SettingsAlreadyInitialized, SettingsNotInitialized } from "../src/errors"; +import { SettingsAlreadyInitialized, SettingsNotInitialized } from "../../../src/errors"; import { readFileSync, writeFile, writeFileSync } from "jsonfile"; -import { ISettingsFile } from "../src/doc/ISettingsFile"; +import { ISettingsFile } from "../../../src/settings/doc/ISettingsFile"; import * as DeepMerge from "deepmerge"; -import { JSONSettingsFilePersistence } from "../src/persistance/JSONSettingsFilePersistence"; +import { JSONSettingsFilePersistence } from "../../../src/settings/persistance/JSONSettingsFilePersistence"; /** * Type of all the keys in the app settings class diff --git a/packages/imperative/src/utilities/__tests__/CliUtils.unit.test.ts b/packages/imperative/__tests__/__unit__/utilities/CliUtils.unit.test.ts similarity index 99% rename from packages/imperative/src/utilities/__tests__/CliUtils.unit.test.ts rename to packages/imperative/__tests__/__unit__/utilities/CliUtils.unit.test.ts index acfcfd2dda..eb3fb62d61 100644 --- a/packages/imperative/src/utilities/__tests__/CliUtils.unit.test.ts +++ b/packages/imperative/__tests__/__unit__/utilities/CliUtils.unit.test.ts @@ -10,10 +10,10 @@ */ import * as stream from "stream"; -import { CliUtils } from "../src/CliUtils"; -import { CommandProfiles, ICommandOptionDefinition } from "../../cmd"; -import { IProfile } from "../../profiles"; -import { ImperativeError } from "../../error"; +import { CliUtils } from "../../../src/utilities/CliUtils"; +import { CommandProfiles, ICommandOptionDefinition } from "../../../src/cmd"; +import { IProfile } from "../../../src/profiles"; +import { ImperativeError } from "../../../src/error"; jest.mock("readline-sync"); diff --git a/packages/imperative/src/utilities/__tests__/DaemonRequest.unit.test.ts b/packages/imperative/__tests__/__unit__/utilities/DaemonRequest.unit.test.ts similarity index 92% rename from packages/imperative/src/utilities/__tests__/DaemonRequest.unit.test.ts rename to packages/imperative/__tests__/__unit__/utilities/DaemonRequest.unit.test.ts index 5d296a00e2..b15a210d01 100644 --- a/packages/imperative/src/utilities/__tests__/DaemonRequest.unit.test.ts +++ b/packages/imperative/__tests__/__unit__/utilities/DaemonRequest.unit.test.ts @@ -9,8 +9,8 @@ * */ -import { DaemonRequest } from "../src/DaemonRequest"; -import { IDaemonRequest } from "../src/doc/IDaemonRequest"; +import { DaemonRequest } from "../../../src/utilities/DaemonRequest"; +import { IDaemonRequest } from "../../../src/utilities/doc/IDaemonRequest"; describe("DaemonRequest tests", () => { it("should add stdout to JSON request", () => { diff --git a/packages/imperative/src/utilities/__tests__/EnvFileUtils.unit.test.ts b/packages/imperative/__tests__/__unit__/utilities/EnvFileUtils.unit.test.ts similarity index 99% rename from packages/imperative/src/utilities/__tests__/EnvFileUtils.unit.test.ts rename to packages/imperative/__tests__/__unit__/utilities/EnvFileUtils.unit.test.ts index f74bda59db..20326e1550 100644 --- a/packages/imperative/src/utilities/__tests__/EnvFileUtils.unit.test.ts +++ b/packages/imperative/__tests__/__unit__/utilities/EnvFileUtils.unit.test.ts @@ -12,7 +12,7 @@ import * as fs from "fs"; import { homedir } from "os"; import { join } from "path"; -import { EnvFileUtils } from "../../utilities"; +import { EnvFileUtils } from "../../../src/utilities/EnvFileUtils"; describe("EnvFileUtils tests", () => { afterEach(() => { diff --git a/packages/imperative/src/utilities/__tests__/ExecUtils.unit.test.ts b/packages/imperative/__tests__/__unit__/utilities/ExecUtils.unit.test.ts similarity index 97% rename from packages/imperative/src/utilities/__tests__/ExecUtils.unit.test.ts rename to packages/imperative/__tests__/__unit__/utilities/ExecUtils.unit.test.ts index ebc8a18407..9ef1f6af96 100644 --- a/packages/imperative/src/utilities/__tests__/ExecUtils.unit.test.ts +++ b/packages/imperative/__tests__/__unit__/utilities/ExecUtils.unit.test.ts @@ -10,7 +10,7 @@ */ import * as spawn from "cross-spawn"; -import { ExecUtils } from "../../utilities"; +import { ExecUtils } from "../../../src/utilities/ExecUtils"; jest.mock("cross-spawn"); jest.mock("opener"); diff --git a/packages/imperative/src/utilities/__tests__/ImperativeConfig.unit.test.ts b/packages/imperative/__tests__/__unit__/utilities/ImperativeConfig.unit.test.ts similarity index 96% rename from packages/imperative/src/utilities/__tests__/ImperativeConfig.unit.test.ts rename to packages/imperative/__tests__/__unit__/utilities/ImperativeConfig.unit.test.ts index a4c9e11895..e306bc862f 100644 --- a/packages/imperative/src/utilities/__tests__/ImperativeConfig.unit.test.ts +++ b/packages/imperative/__tests__/__unit__/utilities/ImperativeConfig.unit.test.ts @@ -9,10 +9,10 @@ * */ -import { Constants } from "../../constants"; +import { Constants } from "../../../src/constants"; describe("ImperativeConfig", () => { - const {ImperativeConfig} = require("../../utilities/src/ImperativeConfig"); + const {ImperativeConfig} = require("../../utilities/ImperativeConfig"); const mockConfig = { name: "test-cli", diff --git a/packages/imperative/src/utilities/__tests__/JSONUtils.unit.test.ts b/packages/imperative/__tests__/__unit__/utilities/JSONUtils.unit.test.ts similarity index 97% rename from packages/imperative/src/utilities/__tests__/JSONUtils.unit.test.ts rename to packages/imperative/__tests__/__unit__/utilities/JSONUtils.unit.test.ts index 455e669a91..bf6ccf6fca 100644 --- a/packages/imperative/src/utilities/__tests__/JSONUtils.unit.test.ts +++ b/packages/imperative/__tests__/__unit__/utilities/JSONUtils.unit.test.ts @@ -9,7 +9,7 @@ * */ -import { JSONUtils } from "../../utilities"; +import { JSONUtils } from "../../../src/utilities/JSONUtils"; interface ITestObj { name: string; diff --git a/packages/imperative/src/utilities/__tests__/JsUtils.unit.test.ts b/packages/imperative/__tests__/__unit__/utilities/JsUtils.unit.test.ts similarity index 96% rename from packages/imperative/src/utilities/__tests__/JsUtils.unit.test.ts rename to packages/imperative/__tests__/__unit__/utilities/JsUtils.unit.test.ts index 74451e3209..95688f8c60 100644 --- a/packages/imperative/src/utilities/__tests__/JsUtils.unit.test.ts +++ b/packages/imperative/__tests__/__unit__/utilities/JsUtils.unit.test.ts @@ -9,7 +9,7 @@ * */ -import { JsUtils } from "../src/JsUtils"; +import { JsUtils } from "../../../src/utilities/JsUtils"; describe("JsUtils", () => { diff --git a/packages/imperative/src/utilities/__tests__/ProcessUtils.unit.test.ts b/packages/imperative/__tests__/__unit__/utilities/ProcessUtils.unit.test.ts similarity index 98% rename from packages/imperative/src/utilities/__tests__/ProcessUtils.unit.test.ts rename to packages/imperative/__tests__/__unit__/utilities/ProcessUtils.unit.test.ts index a20a6fd03e..63e23004db 100644 --- a/packages/imperative/src/utilities/__tests__/ProcessUtils.unit.test.ts +++ b/packages/imperative/__tests__/__unit__/utilities/ProcessUtils.unit.test.ts @@ -10,7 +10,9 @@ */ import * as spawn from "cross-spawn"; -import { ExecUtils, GuiResult, ImperativeConfig, ProcessUtils } from "../../utilities"; +import { ProcessUtils, GuiResult } from "../../../src/utilities/ProcessUtils"; +import { ImperativeConfig } from "../../../src/utilities/ImperativeConfig"; +import { ExecUtils } from "../../../src/utilities/ExecUtils"; jest.mock("cross-spawn"); jest.mock("opener"); diff --git a/packages/imperative/src/utilities/__tests__/TextUtils.unit.test.ts b/packages/imperative/__tests__/__unit__/utilities/TextUtils.unit.test.ts similarity index 98% rename from packages/imperative/src/utilities/__tests__/TextUtils.unit.test.ts rename to packages/imperative/__tests__/__unit__/utilities/TextUtils.unit.test.ts index f656da77cc..a41e61805f 100644 --- a/packages/imperative/src/utilities/__tests__/TextUtils.unit.test.ts +++ b/packages/imperative/__tests__/__unit__/utilities/TextUtils.unit.test.ts @@ -15,7 +15,7 @@ const tableObjects = [ { header1: "value1", 2: "value2", header3: "value3" }, ]; -import { TextUtils } from "../src/TextUtils"; +import { TextUtils } from "../../../src/utilities/TextUtils"; const beforeForceColor = process.env.FORCE_COLOR; diff --git a/packages/imperative/src/utilities/__tests__/__snapshots__/CliUtils.unit.test.ts.snap b/packages/imperative/__tests__/__unit__/utilities/__snapshots__/CliUtils.unit.test.ts.snap similarity index 100% rename from packages/imperative/src/utilities/__tests__/__snapshots__/CliUtils.unit.test.ts.snap rename to packages/imperative/__tests__/__unit__/utilities/__snapshots__/CliUtils.unit.test.ts.snap diff --git a/packages/imperative/src/utilities/__tests__/__snapshots__/JSONUtils.unit.test.ts.snap b/packages/imperative/__tests__/__unit__/utilities/__snapshots__/JSONUtils.unit.test.ts.snap similarity index 100% rename from packages/imperative/src/utilities/__tests__/__snapshots__/JSONUtils.unit.test.ts.snap rename to packages/imperative/__tests__/__unit__/utilities/__snapshots__/JSONUtils.unit.test.ts.snap diff --git a/packages/imperative/src/utilities/__tests__/__snapshots__/TextUtils.unit.test.ts.snap b/packages/imperative/__tests__/__unit__/utilities/__snapshots__/TextUtils.unit.test.ts.snap similarity index 100% rename from packages/imperative/src/utilities/__tests__/__snapshots__/TextUtils.unit.test.ts.snap rename to packages/imperative/__tests__/__unit__/utilities/__snapshots__/TextUtils.unit.test.ts.snap diff --git a/packages/imperative/src/utilities/__tests__/diff/DiffUtils.unit.test.ts b/packages/imperative/__tests__/__unit__/utilities/diff/DiffUtils.unit.test.ts similarity index 90% rename from packages/imperative/src/utilities/__tests__/diff/DiffUtils.unit.test.ts rename to packages/imperative/__tests__/__unit__/utilities/diff/DiffUtils.unit.test.ts index ec15c04a6f..94eb33aa1d 100644 --- a/packages/imperative/src/utilities/__tests__/diff/DiffUtils.unit.test.ts +++ b/packages/imperative/__tests__/__unit__/utilities/diff/DiffUtils.unit.test.ts @@ -10,10 +10,10 @@ */ import * as diff from "diff"; -import { DiffUtils } from "../../src/diff/DiffUtils"; -import { IDiffOptions } from "../../src/diff/doc/IDiffOptions"; -import { IDiffNameOptions } from "../../src/diff/doc/IDiffNameOptions"; -import { WebDiffManager } from "../../src/diff/WebDiffManager"; +import { DiffUtils } from "../../../../src/utilities/diff/DiffUtils"; +import { IDiffOptions } from "../../../../src/utilities/diff/doc/IDiffOptions"; +import { IDiffNameOptions } from "../../../../src/utilities/diff/doc/IDiffNameOptions"; +import { WebDiffManager } from "../../../../src/utilities/diff/WebDiffManager"; import * as jestDiff from "jest-diff"; import * as diff2html from "diff2html"; jest.mock("diff"); diff --git a/packages/imperative/src/utilities/__tests__/diff/WebDiffGenerator.unit.test.ts b/packages/imperative/__tests__/__unit__/utilities/diff/WebDiffGenerator.unit.test.ts similarity index 87% rename from packages/imperative/src/utilities/__tests__/diff/WebDiffGenerator.unit.test.ts rename to packages/imperative/__tests__/__unit__/utilities/diff/WebDiffGenerator.unit.test.ts index 0b32138381..de6db9ad8b 100644 --- a/packages/imperative/src/utilities/__tests__/diff/WebDiffGenerator.unit.test.ts +++ b/packages/imperative/__tests__/__unit__/utilities/diff/WebDiffGenerator.unit.test.ts @@ -12,9 +12,9 @@ import * as fs from 'fs'; import * as path from 'path'; -import WebDiffGenerator from "../../src/diff/WebDiffGenerator"; -import { ImperativeConfig } from "../../src/ImperativeConfig"; -import { IO } from '../../../io/'; +import WebDiffGenerator from "../../../../src/utilities/diff/WebDiffGenerator"; +import { ImperativeConfig } from "../../../../src/utilities/ImperativeConfig"; +import { IO } from '../../../../src/io/'; describe("WebDiffGenerator", () => { // setting up fake cli home and web diff dir for testing diff --git a/packages/imperative/src/utilities/__tests__/diff/WebDiffManager.unit.test.ts b/packages/imperative/__tests__/__unit__/utilities/diff/WebDiffManager.unit.test.ts similarity index 85% rename from packages/imperative/src/utilities/__tests__/diff/WebDiffManager.unit.test.ts rename to packages/imperative/__tests__/__unit__/utilities/diff/WebDiffManager.unit.test.ts index 76a1884b5f..1a91ed06a4 100644 --- a/packages/imperative/src/utilities/__tests__/diff/WebDiffManager.unit.test.ts +++ b/packages/imperative/__tests__/__unit__/utilities/diff/WebDiffManager.unit.test.ts @@ -12,13 +12,13 @@ import * as fs from 'fs'; import * as path from 'path'; -import { WebDiffManager } from "../../src/diff/WebDiffManager"; +import { WebDiffManager } from "../../../../src/utilities/diff/WebDiffManager"; import * as diff2html from "diff2html"; -import { ImperativeConfig } from "../../src/ImperativeConfig"; -import WebDiffGenerator from "../../src/diff/WebDiffGenerator"; -import { IImperativeConfig } from '../../../imperative'; -import { Imperative } from '../../../imperative/src/Imperative'; -import { ProcessUtils, GuiResult } from '../../src/ProcessUtils'; +import { ImperativeConfig } from "../../../../src/utilities/ImperativeConfig"; +import WebDiffGenerator from "../../../../src/utilities/diff/WebDiffGenerator"; +import { IImperativeConfig } from '../../../../src/imperative'; +import { Imperative } from '../../../../src/imperative/Imperative'; +import { ProcessUtils, GuiResult } from '../../../../src/utilities/ProcessUtils'; describe("WebDiffManager", () => { diff --git a/packages/imperative/src/utilities/__tests__/diff/__snapshots__/DiffUtils.unit.test.ts.snap b/packages/imperative/__tests__/__unit__/utilities/diff/__snapshots__/DiffUtils.unit.test.ts.snap similarity index 100% rename from packages/imperative/src/utilities/__tests__/diff/__snapshots__/DiffUtils.unit.test.ts.snap rename to packages/imperative/__tests__/__unit__/utilities/diff/__snapshots__/DiffUtils.unit.test.ts.snap diff --git a/packages/imperative/__tests__/src/TestLogger.ts b/packages/imperative/__tests__/src/TestLogger.ts index 2654508971..e184dd93c9 100644 --- a/packages/imperative/__tests__/src/TestLogger.ts +++ b/packages/imperative/__tests__/src/TestLogger.ts @@ -9,10 +9,10 @@ * */ -import { LoggerConfigBuilder } from "../../src/logger/src/LoggerConfigBuilder"; -import { Logger } from "../../src/logger/src/Logger"; +import { LoggerConfigBuilder } from "../../src/logger/LoggerConfigBuilder"; +import { Logger } from "../../src/logger/Logger"; import { isNullOrUndefined } from "util"; -import { IConfigLogging } from "../../src/logger/src/doc/IConfigLogging"; +import { IConfigLogging } from "../../src/logger/doc/IConfigLogging"; import * as path from "path"; /** diff --git a/packages/imperative/__tests__/src/packages/cmd/__integration__/CliProfileManager.integration.test.ts b/packages/imperative/__tests__/src/packages/cmd/__integration__/CliProfileManager.integration.test.ts index ff0d7920f3..a1fd8417cd 100644 --- a/packages/imperative/__tests__/src/packages/cmd/__integration__/CliProfileManager.integration.test.ts +++ b/packages/imperative/__tests__/src/packages/cmd/__integration__/CliProfileManager.integration.test.ts @@ -9,12 +9,12 @@ * */ -jest.mock("../../../../../src/utilities/src/ImperativeConfig"); +jest.mock("../../../../../src/utilities/ImperativeConfig"); import { inspect } from "util"; import { rimraf, TEST_RESULT_DIR } from "../../../TestUtil"; import { TestLogger } from "../../../../src/TestLogger"; -import { CliProfileManager } from "../../../../../src/cmd/src/profiles/CliProfileManager"; +import { CliProfileManager } from "../../../../../src/cmd/profiles/CliProfileManager"; import { ICommandProfileTypeConfiguration } from "../../../../../src/cmd"; describe("Cli Profile Manager", () => { diff --git a/packages/imperative/__tests__/src/packages/cmd/__integration__/SyntaxValidator.integration.test.ts b/packages/imperative/__tests__/src/packages/cmd/__integration__/SyntaxValidator.integration.test.ts index 1352a30dd7..0ddb7e8b9b 100644 --- a/packages/imperative/__tests__/src/packages/cmd/__integration__/SyntaxValidator.integration.test.ts +++ b/packages/imperative/__tests__/src/packages/cmd/__integration__/SyntaxValidator.integration.test.ts @@ -14,11 +14,11 @@ import { isNullOrUndefined } from "util"; import { CommandProcessor, ICommandDefinition, ICommandResponse } from "../../../../../src/cmd/index"; import { ValidationTestCommand } from "../ValidationTestCommand"; import { Constants } from "../../../../../src/constants/index"; -import { Imperative } from "../../../../../src/imperative/src/Imperative"; +import { Imperative } from "../../../../../src/imperative/Imperative"; import { TestLogger } from "../../../../src/TestLogger"; import { createUniqueTestDataDir, rimraf } from "../../../TestUtil"; -import { AbstractHelpGenerator } from "../../../../../src/cmd/src/help/abstract/AbstractHelpGenerator"; -import { DefaultHelpGenerator } from "../../../../../src/cmd/src/help/DefaultHelpGenerator"; +import { AbstractHelpGenerator } from "../../../../../src/cmd/help/abstract/AbstractHelpGenerator"; +import { DefaultHelpGenerator } from "../../../../../src/cmd/help/DefaultHelpGenerator"; import { BasicProfileManagerFactory, IProfileTypeConfiguration } from "../../../../../src/index"; const ENV_PREFIX = "INTEGRATION_TEST"; diff --git a/packages/imperative/__tests__/src/packages/imperative/__integration__/ConfigLoading.integration.test.ts b/packages/imperative/__tests__/src/packages/imperative/__integration__/ConfigLoading.integration.test.ts index d6694e4b1f..2aa60250b8 100644 --- a/packages/imperative/__tests__/src/packages/imperative/__integration__/ConfigLoading.integration.test.ts +++ b/packages/imperative/__tests__/src/packages/imperative/__integration__/ConfigLoading.integration.test.ts @@ -11,7 +11,7 @@ import * as T from "../../../TestUtil"; import { IImperativeConfig, Imperative } from "../../../../../src/imperative"; -import { ImperativeConfig } from "../../../../../src/utilities"; +import { ImperativeConfig } from "../../../../../src/utilities/ImperativeConfig"; describe("Imperative should validate config provided by the consumer", function () { const testDir = T.createUniqueTestDataDir("config-loading"); diff --git a/packages/imperative/__tests__/src/packages/imperative/plugins/suites/InstallingPlugins.ts b/packages/imperative/__tests__/src/packages/imperative/plugins/suites/InstallingPlugins.ts index 119fe3ba32..82ff8f770f 100644 --- a/packages/imperative/__tests__/src/packages/imperative/plugins/suites/InstallingPlugins.ts +++ b/packages/imperative/__tests__/src/packages/imperative/plugins/suites/InstallingPlugins.ts @@ -19,9 +19,9 @@ import { TEST_REGISTRY } from "../../../../../__src__/TestConstants"; import { execSync, SpawnSyncReturns } from "child_process"; import { config, cliBin, pluginGroup } from "../PluginTestConstants"; -import { CredentialManagerOverride } from "../../../../../../src/security/src/CredentialManagerOverride"; +import { CredentialManagerOverride } from "../../../../../../src/security/CredentialManagerOverride"; import { readFileSync, writeFileSync } from "jsonfile"; -import { IPluginJson } from "../../../../../../src/imperative/src/plugins/doc/IPluginJson"; +import { IPluginJson } from "../../../../../../src/imperative/plugins/doc/IPluginJson"; import { SetupTestEnvironment } from "../../../../../__src__/environment/SetupTestEnvironment"; import * as fs from "fs"; import { readJsonSync, writeJsonSync } from "fs-extra"; diff --git a/packages/imperative/__tests__/src/packages/imperative/plugins/suites/UninstallPlugins.ts b/packages/imperative/__tests__/src/packages/imperative/plugins/suites/UninstallPlugins.ts index 033041dc11..b838647bb4 100644 --- a/packages/imperative/__tests__/src/packages/imperative/plugins/suites/UninstallPlugins.ts +++ b/packages/imperative/__tests__/src/packages/imperative/plugins/suites/UninstallPlugins.ts @@ -11,7 +11,7 @@ import * as T from "../../../../../src/TestUtil"; import { cliBin, config } from "../PluginTestConstants"; -import { CredentialManagerOverride } from "../../../../../../src/security/src/CredentialManagerOverride"; +import { CredentialManagerOverride } from "../../../../../../src/security/CredentialManagerOverride"; import { join } from "path"; import { readJsonSync, writeJsonSync } from "fs-extra"; diff --git a/packages/imperative/__tests__/src/packages/imperative/plugins/suites/UsingPlugins.ts b/packages/imperative/__tests__/src/packages/imperative/plugins/suites/UsingPlugins.ts index a83a30019f..abce499400 100644 --- a/packages/imperative/__tests__/src/packages/imperative/plugins/suites/UsingPlugins.ts +++ b/packages/imperative/__tests__/src/packages/imperative/plugins/suites/UsingPlugins.ts @@ -20,7 +20,7 @@ import { cliBin, config } from "../PluginTestConstants"; import { join, resolve } from "path"; import { readFileSync, writeFileSync } from "fs"; import { execSync } from "child_process"; -import { CredentialManagerOverride } from "../../../../../../src/security/src/CredentialManagerOverride"; +import { CredentialManagerOverride } from "../../../../../../src/security/CredentialManagerOverride"; describe("Using a Plugin", () => { diff --git a/packages/imperative/__tests__/src/packages/profiles/__integration__/BasicProfileManager.initialize.integration.test.ts b/packages/imperative/__tests__/src/packages/profiles/__integration__/BasicProfileManager.initialize.integration.test.ts index 3d2ae4b317..179ef4e5f1 100644 --- a/packages/imperative/__tests__/src/packages/profiles/__integration__/BasicProfileManager.initialize.integration.test.ts +++ b/packages/imperative/__tests__/src/packages/profiles/__integration__/BasicProfileManager.initialize.integration.test.ts @@ -9,7 +9,7 @@ * */ -jest.mock("../../../../../src/utilities/src/ImperativeConfig"); +jest.mock("../../../../../src/utilities/ImperativeConfig"); import * as TestUtil from "../../../TestUtil"; import { BasicProfileManager } from "../../../../../src/index"; diff --git a/packages/imperative/__tests__/src/packages/profiles/__integration__/BasicProfileManager.integration.test.ts b/packages/imperative/__tests__/src/packages/profiles/__integration__/BasicProfileManager.integration.test.ts index 1d629a28cc..784ba0728d 100644 --- a/packages/imperative/__tests__/src/packages/profiles/__integration__/BasicProfileManager.integration.test.ts +++ b/packages/imperative/__tests__/src/packages/profiles/__integration__/BasicProfileManager.integration.test.ts @@ -20,7 +20,7 @@ describe("Imperative should allow CLI implementations to configure their own pro const loadChangingDependencies = () => { return { Imperative: require("../../../../../src/imperative/src/Imperative").Imperative, - ImperativeConfig: require("../../../../../src/utilities/src/ImperativeConfig").ImperativeConfig, + ImperativeConfig: require("../../../../../src/utilities/ImperativeConfig").ImperativeConfig, ImperativeError: require("../../../../../src/error/src/ImperativeError").ImperativeError }; }; diff --git a/packages/imperative/__tests__/src/packages/profiles/__integration__/CliProfileManager.credentials.integration.subtest.ts b/packages/imperative/__tests__/src/packages/profiles/__integration__/CliProfileManager.credentials.integration.subtest.ts index 3107317863..2b54cab819 100644 --- a/packages/imperative/__tests__/src/packages/profiles/__integration__/CliProfileManager.credentials.integration.subtest.ts +++ b/packages/imperative/__tests__/src/packages/profiles/__integration__/CliProfileManager.credentials.integration.subtest.ts @@ -14,8 +14,8 @@ import * as path from "path"; import * as fs from "fs"; import { IImperativeConfig } from "../../../../../src/imperative"; import { CliProfileManager } from "../../../../../src/cmd"; -import { ProfileIO } from "../../../../../src/profiles/src/utils"; -import { IProfile } from "../../../../../src/profiles/src/doc/definition"; +import { ProfileIO } from "../../../../../src/profiles/utils"; +import { IProfile } from "../../../../../src/profiles/doc/definition"; describe("Cli Profile Manager", () => { let writtenProfile: any; diff --git a/packages/imperative/__tests__/src/packages/profiles/__integration__/ProfileCommandExample.integration.test.ts b/packages/imperative/__tests__/src/packages/profiles/__integration__/ProfileCommandExample.integration.test.ts index 3fe4ee4905..fdb8c9fa95 100644 --- a/packages/imperative/__tests__/src/packages/profiles/__integration__/ProfileCommandExample.integration.test.ts +++ b/packages/imperative/__tests__/src/packages/profiles/__integration__/ProfileCommandExample.integration.test.ts @@ -14,11 +14,11 @@ import { IImperativeConfig } from "../../../../../src/imperative"; import * as yargs from "yargs"; import { Constants } from "../../../../../src/constants"; import { CommandProcessor, ICommandDefinition, ICommandProfileTypeConfiguration, ICommandResponse } from "../../../../../src/cmd"; -import { ICommandProcessorParms } from "../../../../../src/cmd/src/doc/processor/ICommandProcessorParms"; +import { ICommandProcessorParms } from "../../../../../src/cmd/doc/processor/ICommandProcessorParms"; import { isNullOrUndefined } from "util"; import { TestLogger } from "../../../../src/TestLogger"; -import { AbstractHelpGenerator } from "../../../../../src/cmd/src/help/abstract/AbstractHelpGenerator"; -import { DefaultHelpGenerator } from "../../../../../src/cmd/src/help/DefaultHelpGenerator"; +import { AbstractHelpGenerator } from "../../../../../src/cmd/help/abstract/AbstractHelpGenerator"; +import { DefaultHelpGenerator } from "../../../../../src/cmd/help/DefaultHelpGenerator"; import { BasicProfileManagerFactory } from "../../../../../src/index"; const logger = TestLogger.getTestLogger(); diff --git a/packages/imperative/__tests__/src/packages/profiles/test_app/TestApp.ts b/packages/imperative/__tests__/src/packages/profiles/test_app/TestApp.ts index 549f9a06dd..300b704f67 100644 --- a/packages/imperative/__tests__/src/packages/profiles/test_app/TestApp.ts +++ b/packages/imperative/__tests__/src/packages/profiles/test_app/TestApp.ts @@ -11,8 +11,8 @@ import { TestProfileLoader } from "./TestProfileLoader"; import { TestAppImperativeConfig } from "../src/constants/ProfileInfoConstants"; -import { CliProfileManager } from "../../../../../src/cmd/src/profiles/CliProfileManager"; -import { Logger } from "../../../../../src/logger/src/Logger"; +import { CliProfileManager } from "../../../../../src/cmd/profiles/CliProfileManager"; +import { Logger } from "../../../../../src/logger/Logger"; import * as path from "path"; const setupOldProfiles = async (projectDir: string) => { diff --git a/packages/imperative/__tests__/src/packages/profiles/test_app/TestProfileLoader.ts b/packages/imperative/__tests__/src/packages/profiles/test_app/TestProfileLoader.ts index 1bdeb64cc7..63cfbbf5bf 100644 --- a/packages/imperative/__tests__/src/packages/profiles/test_app/TestProfileLoader.ts +++ b/packages/imperative/__tests__/src/packages/profiles/test_app/TestProfileLoader.ts @@ -9,8 +9,8 @@ * */ -import { Logger } from "../../../../../src/logger/src/Logger"; -import { ProfileInfo } from "../../../../../src/config/src/ProfileInfo"; +import { Logger } from "../../../../../src/logger/Logger"; +import { ProfileInfo } from "../../../../../src/config/ProfileInfo"; import { Log4jsConfig } from "../src/constants/ProfileInfoConstants"; import { IProfAttrs } from "../../../../../src"; import * as path from "path"; diff --git a/packages/imperative/src/cmd/src/ChainedHandlerUtils.ts b/packages/imperative/src/cmd/ChainedHandlerUtils.ts similarity index 98% rename from packages/imperative/src/cmd/src/ChainedHandlerUtils.ts rename to packages/imperative/src/cmd/ChainedHandlerUtils.ts index 68d5aa3a32..50216a373b 100644 --- a/packages/imperative/src/cmd/src/ChainedHandlerUtils.ts +++ b/packages/imperative/src/cmd/ChainedHandlerUtils.ts @@ -12,9 +12,9 @@ import * as yargs from "yargs"; import { IChainedHandlerEntry } from "./doc/handler/IChainedHandlerEntry"; import { IChainedHandlerArgumentMapping } from "./doc/handler/IChainedHandlerArgumentMapping"; -import { ImperativeError } from "../../error"; -import { TextUtils } from "../../utilities"; -import { Logger } from "../../logger"; +import { ImperativeError } from "../error"; +import { TextUtils } from "../utilities"; +import { Logger } from "../logger"; const DataObjectParser = require("dataobject-parser"); diff --git a/packages/imperative/src/cmd/src/CommandPreparer.ts b/packages/imperative/src/cmd/CommandPreparer.ts similarity index 99% rename from packages/imperative/src/cmd/src/CommandPreparer.ts rename to packages/imperative/src/cmd/CommandPreparer.ts index 5903f2533a..5395d25eba 100644 --- a/packages/imperative/src/cmd/src/CommandPreparer.ts +++ b/packages/imperative/src/cmd/CommandPreparer.ts @@ -9,12 +9,12 @@ * */ -import { Constants } from "../../constants/src/Constants"; +import { Constants } from "../constants/Constants"; import { ICommandDefinitionPassOn, ICommandDefinitionPassOnIgnore } from "./doc/ICommandDefinitionPassOn"; -import { ImperativeError } from "../../error/src/ImperativeError"; +import { ImperativeError } from "../error/ImperativeError"; import { ICommandDefinition } from "./doc/ICommandDefinition"; -import { ProfileUtils } from "../../profiles/src/utils/ProfileUtils"; -import { TextUtils } from "../../utilities/src/TextUtils"; +import { ProfileUtils } from "../profiles/utils/ProfileUtils"; +import { TextUtils } from "../utilities/TextUtils"; import { OptionConstants } from "./constants/OptionConstants"; import * as DeepMerge from "deepmerge"; import { ICommandProfileTypeConfiguration } from "./doc/profiles/definition/ICommandProfileTypeConfiguration"; diff --git a/packages/imperative/src/cmd/src/CommandProcessor.ts b/packages/imperative/src/cmd/CommandProcessor.ts similarity index 98% rename from packages/imperative/src/cmd/src/CommandProcessor.ts rename to packages/imperative/src/cmd/CommandProcessor.ts index 9a0166f37e..bdd35ba359 100644 --- a/packages/imperative/src/cmd/src/CommandProcessor.ts +++ b/packages/imperative/src/cmd/CommandProcessor.ts @@ -14,10 +14,10 @@ import { CommandUtils } from "./utils/CommandUtils"; import { Arguments } from "yargs"; import { ICommandValidatorResponse } from "./doc/response/response/ICommandValidatorResponse"; import { ICommandHandler } from "./doc/handler/ICommandHandler"; -import { couldNotInstantiateCommandHandler, unexpectedCommandError } from "../../messages"; +import { couldNotInstantiateCommandHandler, unexpectedCommandError } from "../messages"; import { SharedOptions } from "./utils/SharedOptions"; -import { IImperativeError, ImperativeError } from "../../error"; -import { IProfileManagerFactory, ProfileUtils } from "../../profiles"; +import { IImperativeError, ImperativeError } from "../error"; +import { IProfileManagerFactory, ProfileUtils } from "../profiles"; import { SyntaxValidator } from "./syntax/SyntaxValidator"; import { CommandProfileLoader } from "./profiles/CommandProfileLoader"; import { ICommandProfileTypeConfiguration } from "./doc/profiles/definition/ICommandProfileTypeConfiguration"; @@ -25,27 +25,29 @@ import { IHelpGenerator } from "./help/doc/IHelpGenerator"; import { ICommandPrepared } from "./doc/response/response/ICommandPrepared"; import { CommandResponse } from "./response/CommandResponse"; import { ICommandResponse } from "./doc/response/response/ICommandResponse"; -import { Logger, LoggerUtils } from "../../logger"; +import { Logger, LoggerUtils } from "../logger"; import { IInvokeCommandParms } from "./doc/parms/IInvokeCommandParms"; import { ICommandProcessorParms } from "./doc/processor/ICommandProcessorParms"; -import { ImperativeExpect } from "../../expect"; +import { ImperativeExpect } from "../expect"; import { inspect } from "util"; -import { EnvFileUtils, ImperativeConfig, TextUtils } from "../../utilities"; +import { ImperativeConfig } from "../utilities/ImperativeConfig"; +import { TextUtils } from "../utilities/TextUtils"; +import { EnvFileUtils } from "../utilities/EnvFileUtils"; import * as nodePath from "path"; import * as os from "os"; import * as stream from "stream"; import { ICommandHandlerRequire } from "./doc/handler/ICommandHandlerRequire"; -import { IHandlerParameters } from "../../cmd"; +import { IHandlerParameters } from "../cmd"; import { ChainedHandlerService } from "./ChainedHandlerUtils"; -import { Constants } from "../../constants"; +import { Constants } from "../constants"; import { ICommandArguments } from "./doc/args/ICommandArguments"; -import { CliUtils } from "../../utilities/src/CliUtils"; +import { CliUtils } from "../utilities/CliUtils"; import { WebHelpManager } from "./help/WebHelpManager"; import { ICommandProfile } from "./doc/profiles/definition/ICommandProfile"; -import { Config } from "../../config/src/Config"; -import { getActiveProfileName } from "../../config/src/ConfigUtils"; -import { ConfigConstants } from "../../config/src/ConfigConstants"; -import { IDaemonContext } from "../../imperative/src/doc/IDaemonContext"; +import { Config } from "../config/Config"; +import { getActiveProfileName } from "../config/ConfigUtils"; +import { ConfigConstants } from "../config/ConfigConstants"; +import { IDaemonContext } from "../imperative/doc/IDaemonContext"; import { IHandlerResponseApi } from "../.."; diff --git a/packages/imperative/src/cmd/src/builders/AbstractCommandBuilder.ts b/packages/imperative/src/cmd/builders/AbstractCommandBuilder.ts similarity index 100% rename from packages/imperative/src/cmd/src/builders/AbstractCommandBuilder.ts rename to packages/imperative/src/cmd/builders/AbstractCommandBuilder.ts diff --git a/packages/imperative/src/cmd/src/constants/OptionConstants.ts b/packages/imperative/src/cmd/constants/OptionConstants.ts similarity index 100% rename from packages/imperative/src/cmd/src/constants/OptionConstants.ts rename to packages/imperative/src/cmd/constants/OptionConstants.ts diff --git a/packages/imperative/src/cmd/src/doc/ICommandDefinition.ts b/packages/imperative/src/cmd/doc/ICommandDefinition.ts similarity index 98% rename from packages/imperative/src/cmd/src/doc/ICommandDefinition.ts rename to packages/imperative/src/cmd/doc/ICommandDefinition.ts index 3d8294934d..8a750b165d 100644 --- a/packages/imperative/src/cmd/src/doc/ICommandDefinition.ts +++ b/packages/imperative/src/cmd/doc/ICommandDefinition.ts @@ -14,7 +14,7 @@ import { IChainedHandlerEntry } from "./handler/IChainedHandlerEntry"; import { ICommandOptionDefinition } from "./option/ICommandOptionDefinition"; import { ICommandPositionalDefinition } from "./option/ICommandPositionalDefinition"; import { ICommandDefinitionPassOn } from "./ICommandDefinitionPassOn"; -import { ICommandProfile } from "../../src/doc/profiles/definition/ICommandProfile"; +import { ICommandProfile } from "../doc/profiles/definition/ICommandProfile"; /** * Command Segment type - either "group" or "command". * diff --git a/packages/imperative/src/cmd/src/doc/ICommandDefinitionPassOn.ts b/packages/imperative/src/cmd/doc/ICommandDefinitionPassOn.ts similarity index 100% rename from packages/imperative/src/cmd/src/doc/ICommandDefinitionPassOn.ts rename to packages/imperative/src/cmd/doc/ICommandDefinitionPassOn.ts diff --git a/packages/imperative/src/cmd/src/doc/ICommandExampleDefinition.ts b/packages/imperative/src/cmd/doc/ICommandExampleDefinition.ts similarity index 100% rename from packages/imperative/src/cmd/src/doc/ICommandExampleDefinition.ts rename to packages/imperative/src/cmd/doc/ICommandExampleDefinition.ts diff --git a/packages/imperative/src/cmd/src/doc/IPartialCommandDefinition.ts b/packages/imperative/src/cmd/doc/IPartialCommandDefinition.ts similarity index 100% rename from packages/imperative/src/cmd/src/doc/IPartialCommandDefinition.ts rename to packages/imperative/src/cmd/doc/IPartialCommandDefinition.ts diff --git a/packages/imperative/src/cmd/src/doc/args/ICommandArguments.ts b/packages/imperative/src/cmd/doc/args/ICommandArguments.ts similarity index 100% rename from packages/imperative/src/cmd/src/doc/args/ICommandArguments.ts rename to packages/imperative/src/cmd/doc/args/ICommandArguments.ts diff --git a/packages/imperative/src/cmd/src/doc/handler/IChainedHandlerArgumentMapping.ts b/packages/imperative/src/cmd/doc/handler/IChainedHandlerArgumentMapping.ts similarity index 100% rename from packages/imperative/src/cmd/src/doc/handler/IChainedHandlerArgumentMapping.ts rename to packages/imperative/src/cmd/doc/handler/IChainedHandlerArgumentMapping.ts diff --git a/packages/imperative/src/cmd/src/doc/handler/IChainedHandlerEntry.ts b/packages/imperative/src/cmd/doc/handler/IChainedHandlerEntry.ts similarity index 100% rename from packages/imperative/src/cmd/src/doc/handler/IChainedHandlerEntry.ts rename to packages/imperative/src/cmd/doc/handler/IChainedHandlerEntry.ts diff --git a/packages/imperative/src/cmd/src/doc/handler/ICommandHandler.ts b/packages/imperative/src/cmd/doc/handler/ICommandHandler.ts similarity index 100% rename from packages/imperative/src/cmd/src/doc/handler/ICommandHandler.ts rename to packages/imperative/src/cmd/doc/handler/ICommandHandler.ts diff --git a/packages/imperative/src/cmd/src/doc/handler/ICommandHandlerConstructor.ts b/packages/imperative/src/cmd/doc/handler/ICommandHandlerConstructor.ts similarity index 100% rename from packages/imperative/src/cmd/src/doc/handler/ICommandHandlerConstructor.ts rename to packages/imperative/src/cmd/doc/handler/ICommandHandlerConstructor.ts diff --git a/packages/imperative/src/cmd/src/doc/handler/ICommandHandlerRequire.ts b/packages/imperative/src/cmd/doc/handler/ICommandHandlerRequire.ts similarity index 100% rename from packages/imperative/src/cmd/src/doc/handler/ICommandHandlerRequire.ts rename to packages/imperative/src/cmd/doc/handler/ICommandHandlerRequire.ts diff --git a/packages/imperative/src/cmd/src/doc/handler/ICommandHandlerResponseChecker.ts b/packages/imperative/src/cmd/doc/handler/ICommandHandlerResponseChecker.ts similarity index 100% rename from packages/imperative/src/cmd/src/doc/handler/ICommandHandlerResponseChecker.ts rename to packages/imperative/src/cmd/doc/handler/ICommandHandlerResponseChecker.ts diff --git a/packages/imperative/src/cmd/src/doc/handler/ICommandHandlerResponseValidator.ts b/packages/imperative/src/cmd/doc/handler/ICommandHandlerResponseValidator.ts similarity index 85% rename from packages/imperative/src/cmd/src/doc/handler/ICommandHandlerResponseValidator.ts rename to packages/imperative/src/cmd/doc/handler/ICommandHandlerResponseValidator.ts index 6ec47d051c..581bef3595 100644 --- a/packages/imperative/src/cmd/src/doc/handler/ICommandHandlerResponseValidator.ts +++ b/packages/imperative/src/cmd/doc/handler/ICommandHandlerResponseValidator.ts @@ -9,7 +9,7 @@ * */ -import { ICommandResponse } from "../../../src/doc/response/response/ICommandResponse"; +import { ICommandResponse } from "../../doc/response/response/ICommandResponse"; import { CommandResponse } from "../../response/CommandResponse"; export interface ICommandHandlerResponseValidator { diff --git a/packages/imperative/src/cmd/src/doc/handler/IHandlerParameters.ts b/packages/imperative/src/cmd/doc/handler/IHandlerParameters.ts similarity index 100% rename from packages/imperative/src/cmd/src/doc/handler/IHandlerParameters.ts rename to packages/imperative/src/cmd/doc/handler/IHandlerParameters.ts diff --git a/packages/imperative/src/cmd/src/doc/option/ICommandOptionAllowableValues.ts b/packages/imperative/src/cmd/doc/option/ICommandOptionAllowableValues.ts similarity index 100% rename from packages/imperative/src/cmd/src/doc/option/ICommandOptionAllowableValues.ts rename to packages/imperative/src/cmd/doc/option/ICommandOptionAllowableValues.ts diff --git a/packages/imperative/src/cmd/src/doc/option/ICommandOptionDefinition.ts b/packages/imperative/src/cmd/doc/option/ICommandOptionDefinition.ts similarity index 100% rename from packages/imperative/src/cmd/src/doc/option/ICommandOptionDefinition.ts rename to packages/imperative/src/cmd/doc/option/ICommandOptionDefinition.ts diff --git a/packages/imperative/src/cmd/src/doc/option/ICommandOptionValueImplications.ts b/packages/imperative/src/cmd/doc/option/ICommandOptionValueImplications.ts similarity index 100% rename from packages/imperative/src/cmd/src/doc/option/ICommandOptionValueImplications.ts rename to packages/imperative/src/cmd/doc/option/ICommandOptionValueImplications.ts diff --git a/packages/imperative/src/cmd/src/doc/option/ICommandPositionalDefinition.ts b/packages/imperative/src/cmd/doc/option/ICommandPositionalDefinition.ts similarity index 100% rename from packages/imperative/src/cmd/src/doc/option/ICommandPositionalDefinition.ts rename to packages/imperative/src/cmd/doc/option/ICommandPositionalDefinition.ts diff --git a/packages/imperative/src/cmd/src/doc/parms/IInvokeCommandParms.ts b/packages/imperative/src/cmd/doc/parms/IInvokeCommandParms.ts similarity index 100% rename from packages/imperative/src/cmd/src/doc/parms/IInvokeCommandParms.ts rename to packages/imperative/src/cmd/doc/parms/IInvokeCommandParms.ts diff --git a/packages/imperative/src/cmd/src/doc/processor/ICommandProcessorParms.ts b/packages/imperative/src/cmd/doc/processor/ICommandProcessorParms.ts similarity index 90% rename from packages/imperative/src/cmd/src/doc/processor/ICommandProcessorParms.ts rename to packages/imperative/src/cmd/doc/processor/ICommandProcessorParms.ts index 82ffd3fd02..142be40bb7 100644 --- a/packages/imperative/src/cmd/src/doc/processor/ICommandProcessorParms.ts +++ b/packages/imperative/src/cmd/doc/processor/ICommandProcessorParms.ts @@ -11,10 +11,10 @@ import { ICommandDefinition } from "../ICommandDefinition"; import { IHelpGenerator } from "../../help/doc/IHelpGenerator"; -import { IProfileManagerFactory } from "../../../../profiles"; -import { ICommandProfileTypeConfiguration } from "../../../src/doc/profiles/definition/ICommandProfileTypeConfiguration"; -import { Config } from "../../../../config"; -import { IDaemonContext } from "../../../../imperative/src/doc/IDaemonContext"; +import { IProfileManagerFactory } from "../../../profiles"; +import { ICommandProfileTypeConfiguration } from "../../doc/profiles/definition/ICommandProfileTypeConfiguration"; +import { Config } from "../../../config"; +import { IDaemonContext } from "../../../imperative/doc/IDaemonContext"; /** * Parameters to create an instance of the Command Processor. Contains the command definition (for the command diff --git a/packages/imperative/src/cmd/src/doc/profiles/definition/ICommandProfile.ts b/packages/imperative/src/cmd/doc/profiles/definition/ICommandProfile.ts similarity index 100% rename from packages/imperative/src/cmd/src/doc/profiles/definition/ICommandProfile.ts rename to packages/imperative/src/cmd/doc/profiles/definition/ICommandProfile.ts diff --git a/packages/imperative/src/cmd/src/doc/profiles/definition/ICommandProfileAuthConfig.ts b/packages/imperative/src/cmd/doc/profiles/definition/ICommandProfileAuthConfig.ts similarity index 100% rename from packages/imperative/src/cmd/src/doc/profiles/definition/ICommandProfileAuthConfig.ts rename to packages/imperative/src/cmd/doc/profiles/definition/ICommandProfileAuthConfig.ts diff --git a/packages/imperative/src/cmd/src/doc/profiles/definition/ICommandProfileAutoInitConfig.ts b/packages/imperative/src/cmd/doc/profiles/definition/ICommandProfileAutoInitConfig.ts similarity index 100% rename from packages/imperative/src/cmd/src/doc/profiles/definition/ICommandProfileAutoInitConfig.ts rename to packages/imperative/src/cmd/doc/profiles/definition/ICommandProfileAutoInitConfig.ts diff --git a/packages/imperative/src/cmd/src/doc/profiles/definition/ICommandProfileProperty.ts b/packages/imperative/src/cmd/doc/profiles/definition/ICommandProfileProperty.ts similarity index 94% rename from packages/imperative/src/cmd/src/doc/profiles/definition/ICommandProfileProperty.ts rename to packages/imperative/src/cmd/doc/profiles/definition/ICommandProfileProperty.ts index 5d66726f72..6e21333277 100644 --- a/packages/imperative/src/cmd/src/doc/profiles/definition/ICommandProfileProperty.ts +++ b/packages/imperative/src/cmd/doc/profiles/definition/ICommandProfileProperty.ts @@ -9,7 +9,7 @@ * */ -import { IProfileProperty } from "../../../../../profiles"; +import { IProfileProperty } from "../../../../profiles"; import { ICommandOptionDefinition } from "../../option/ICommandOptionDefinition"; /** * Extended version of a team profile schema property that can include option definitions diff --git a/packages/imperative/src/cmd/src/doc/profiles/definition/ICommandProfileSchema.ts b/packages/imperative/src/cmd/doc/profiles/definition/ICommandProfileSchema.ts similarity index 94% rename from packages/imperative/src/cmd/src/doc/profiles/definition/ICommandProfileSchema.ts rename to packages/imperative/src/cmd/doc/profiles/definition/ICommandProfileSchema.ts index a0b09d19d9..ea3f46a168 100644 --- a/packages/imperative/src/cmd/src/doc/profiles/definition/ICommandProfileSchema.ts +++ b/packages/imperative/src/cmd/doc/profiles/definition/ICommandProfileSchema.ts @@ -10,7 +10,7 @@ */ import { ICommandProfileProperty } from "./ICommandProfileProperty"; -import { IProfileSchema } from "../../../../../profiles"; +import { IProfileSchema } from "../../../../profiles"; /** * Externally exposed version of the profile schema with command options for auto-generated commands * @export diff --git a/packages/imperative/src/cmd/src/doc/profiles/definition/ICommandProfileTypeConfiguration.ts b/packages/imperative/src/cmd/doc/profiles/definition/ICommandProfileTypeConfiguration.ts similarity index 100% rename from packages/imperative/src/cmd/src/doc/profiles/definition/ICommandProfileTypeConfiguration.ts rename to packages/imperative/src/cmd/doc/profiles/definition/ICommandProfileTypeConfiguration.ts diff --git a/packages/imperative/src/cmd/src/doc/profiles/parms/ICliLoadAllProfiles.ts b/packages/imperative/src/cmd/doc/profiles/parms/ICliLoadAllProfiles.ts similarity index 90% rename from packages/imperative/src/cmd/src/doc/profiles/parms/ICliLoadAllProfiles.ts rename to packages/imperative/src/cmd/doc/profiles/parms/ICliLoadAllProfiles.ts index bf6cd2f640..fdedbb3031 100644 --- a/packages/imperative/src/cmd/src/doc/profiles/parms/ICliLoadAllProfiles.ts +++ b/packages/imperative/src/cmd/doc/profiles/parms/ICliLoadAllProfiles.ts @@ -9,7 +9,7 @@ * */ -import { ILoadAllProfiles } from "../../../../../profiles"; +import { ILoadAllProfiles } from "../../../../profiles"; /** * Optional parameters to profile manager load all profiles diff --git a/packages/imperative/src/cmd/src/doc/profiles/parms/ICliLoadProfile.ts b/packages/imperative/src/cmd/doc/profiles/parms/ICliLoadProfile.ts similarity index 92% rename from packages/imperative/src/cmd/src/doc/profiles/parms/ICliLoadProfile.ts rename to packages/imperative/src/cmd/doc/profiles/parms/ICliLoadProfile.ts index ac1a6ba0e9..e692f3e221 100644 --- a/packages/imperative/src/cmd/src/doc/profiles/parms/ICliLoadProfile.ts +++ b/packages/imperative/src/cmd/doc/profiles/parms/ICliLoadProfile.ts @@ -9,7 +9,7 @@ * */ -import { ILoadProfile } from "../../../../../profiles"; +import { ILoadProfile } from "../../../../profiles"; /** * Profile Manager "loadProfile" input parameters. Indicates which profile to load (named or default) and if diff --git a/packages/imperative/src/cmd/src/doc/profiles/parms/ICommandLoadProfile.ts b/packages/imperative/src/cmd/doc/profiles/parms/ICommandLoadProfile.ts similarity index 100% rename from packages/imperative/src/cmd/src/doc/profiles/parms/ICommandLoadProfile.ts rename to packages/imperative/src/cmd/doc/profiles/parms/ICommandLoadProfile.ts diff --git a/packages/imperative/src/cmd/src/doc/profiles/parms/ICommandProfileLoaderParms.ts b/packages/imperative/src/cmd/doc/profiles/parms/ICommandProfileLoaderParms.ts similarity index 92% rename from packages/imperative/src/cmd/src/doc/profiles/parms/ICommandProfileLoaderParms.ts rename to packages/imperative/src/cmd/doc/profiles/parms/ICommandProfileLoaderParms.ts index b0a22d2dad..d96ade42a7 100644 --- a/packages/imperative/src/cmd/src/doc/profiles/parms/ICommandProfileLoaderParms.ts +++ b/packages/imperative/src/cmd/doc/profiles/parms/ICommandProfileLoaderParms.ts @@ -9,8 +9,8 @@ * */ -import { IProfileManagerFactory } from "../../../../../profiles"; -import { Logger } from "../../../../../logger"; +import { IProfileManagerFactory } from "../../../../profiles"; +import { Logger } from "../../../../logger"; import { ICommandDefinition } from "../../ICommandDefinition"; import { ICommandProfileTypeConfiguration } from "../definition/ICommandProfileTypeConfiguration"; /** diff --git a/packages/imperative/src/cmd/src/doc/response/api/handler/IHandlerFormatOutputApi.ts b/packages/imperative/src/cmd/doc/response/api/handler/IHandlerFormatOutputApi.ts similarity index 80% rename from packages/imperative/src/cmd/src/doc/response/api/handler/IHandlerFormatOutputApi.ts rename to packages/imperative/src/cmd/doc/response/api/handler/IHandlerFormatOutputApi.ts index f52555ee6d..4ab25a36e9 100644 --- a/packages/imperative/src/cmd/src/doc/response/api/handler/IHandlerFormatOutputApi.ts +++ b/packages/imperative/src/cmd/doc/response/api/handler/IHandlerFormatOutputApi.ts @@ -9,7 +9,7 @@ * */ -import { ICommandOutputFormat } from "../../../../../src/doc/response/response/ICommandOutputFormat"; +import { ICommandOutputFormat } from "../../../../doc/response/response/ICommandOutputFormat"; export interface IHandlerFormatOutputApi { output: (format: ICommandOutputFormat) => void; diff --git a/packages/imperative/src/cmd/src/doc/response/api/handler/IHandlerProgressApi.ts b/packages/imperative/src/cmd/doc/response/api/handler/IHandlerProgressApi.ts similarity index 100% rename from packages/imperative/src/cmd/src/doc/response/api/handler/IHandlerProgressApi.ts rename to packages/imperative/src/cmd/doc/response/api/handler/IHandlerProgressApi.ts diff --git a/packages/imperative/src/cmd/src/doc/response/api/handler/IHandlerResponseApi.ts b/packages/imperative/src/cmd/doc/response/api/handler/IHandlerResponseApi.ts similarity index 100% rename from packages/imperative/src/cmd/src/doc/response/api/handler/IHandlerResponseApi.ts rename to packages/imperative/src/cmd/doc/response/api/handler/IHandlerResponseApi.ts diff --git a/packages/imperative/src/cmd/src/doc/response/api/handler/IHandlerResponseConsoleApi.ts b/packages/imperative/src/cmd/doc/response/api/handler/IHandlerResponseConsoleApi.ts similarity index 100% rename from packages/imperative/src/cmd/src/doc/response/api/handler/IHandlerResponseConsoleApi.ts rename to packages/imperative/src/cmd/doc/response/api/handler/IHandlerResponseConsoleApi.ts diff --git a/packages/imperative/src/cmd/src/doc/response/api/handler/IHandlerResponseDataApi.ts b/packages/imperative/src/cmd/doc/response/api/handler/IHandlerResponseDataApi.ts similarity index 100% rename from packages/imperative/src/cmd/src/doc/response/api/handler/IHandlerResponseDataApi.ts rename to packages/imperative/src/cmd/doc/response/api/handler/IHandlerResponseDataApi.ts diff --git a/packages/imperative/src/cmd/src/doc/response/api/handler/IPromptOptions.ts b/packages/imperative/src/cmd/doc/response/api/handler/IPromptOptions.ts similarity index 100% rename from packages/imperative/src/cmd/src/doc/response/api/handler/IPromptOptions.ts rename to packages/imperative/src/cmd/doc/response/api/handler/IPromptOptions.ts diff --git a/packages/imperative/src/cmd/src/doc/response/api/processor/ICommandResponseApi.ts b/packages/imperative/src/cmd/doc/response/api/processor/ICommandResponseApi.ts similarity index 97% rename from packages/imperative/src/cmd/src/doc/response/api/processor/ICommandResponseApi.ts rename to packages/imperative/src/cmd/doc/response/api/processor/ICommandResponseApi.ts index 0eaf023160..620eed0b21 100644 --- a/packages/imperative/src/cmd/src/doc/response/api/processor/ICommandResponseApi.ts +++ b/packages/imperative/src/cmd/doc/response/api/processor/ICommandResponseApi.ts @@ -9,7 +9,7 @@ * */ -import { IImperativeError } from "../../../../../../error"; +import { IImperativeError } from "../../../../../error"; import { ICommandResponse } from "../../response/ICommandResponse"; /** * The command response format type definition - currently only JSON or default (stdout/stderr) are supported. diff --git a/packages/imperative/src/cmd/src/doc/response/parms/ICommandResponseParms.ts b/packages/imperative/src/cmd/doc/response/parms/ICommandResponseParms.ts similarity index 100% rename from packages/imperative/src/cmd/src/doc/response/parms/ICommandResponseParms.ts rename to packages/imperative/src/cmd/doc/response/parms/ICommandResponseParms.ts diff --git a/packages/imperative/src/cmd/src/doc/response/parms/IProgressBarParms.ts b/packages/imperative/src/cmd/doc/response/parms/IProgressBarParms.ts similarity index 88% rename from packages/imperative/src/cmd/src/doc/response/parms/IProgressBarParms.ts rename to packages/imperative/src/cmd/doc/response/parms/IProgressBarParms.ts index f968095413..3d121f642f 100644 --- a/packages/imperative/src/cmd/src/doc/response/parms/IProgressBarParms.ts +++ b/packages/imperative/src/cmd/doc/response/parms/IProgressBarParms.ts @@ -9,7 +9,7 @@ * */ -import { ITaskWithStatus } from "../../../../../operations"; +import { ITaskWithStatus } from "../../../../operations"; import WriteStream = NodeJS.WriteStream; export interface IProgressBarParms { diff --git a/packages/imperative/src/cmd/src/doc/response/response/ICommandOutputFormat.ts b/packages/imperative/src/cmd/doc/response/response/ICommandOutputFormat.ts similarity index 100% rename from packages/imperative/src/cmd/src/doc/response/response/ICommandOutputFormat.ts rename to packages/imperative/src/cmd/doc/response/response/ICommandOutputFormat.ts diff --git a/packages/imperative/src/cmd/src/doc/response/response/ICommandPrepared.ts b/packages/imperative/src/cmd/doc/response/response/ICommandPrepared.ts similarity index 85% rename from packages/imperative/src/cmd/src/doc/response/response/ICommandPrepared.ts rename to packages/imperative/src/cmd/doc/response/response/ICommandPrepared.ts index 636e0fbc58..f090e2765e 100644 --- a/packages/imperative/src/cmd/src/doc/response/response/ICommandPrepared.ts +++ b/packages/imperative/src/cmd/doc/response/response/ICommandPrepared.ts @@ -9,8 +9,8 @@ * */ -import { CommandProfiles } from "../../../../src/profiles/CommandProfiles"; -import { ICommandArguments } from "../../../../src/doc/args/ICommandArguments"; +import { CommandProfiles } from "../../../profiles/CommandProfiles"; +import { ICommandArguments } from "../../../doc/args/ICommandArguments"; /** * Command Processor prepare response. * @export diff --git a/packages/imperative/src/cmd/src/doc/response/response/ICommandResponse.ts b/packages/imperative/src/cmd/doc/response/response/ICommandResponse.ts similarity index 97% rename from packages/imperative/src/cmd/src/doc/response/response/ICommandResponse.ts rename to packages/imperative/src/cmd/doc/response/response/ICommandResponse.ts index 8d0e63416e..1b55a60157 100644 --- a/packages/imperative/src/cmd/src/doc/response/response/ICommandResponse.ts +++ b/packages/imperative/src/cmd/doc/response/response/ICommandResponse.ts @@ -9,7 +9,7 @@ * */ -import { IImperativeError } from "../../../../../error"; +import { IImperativeError } from "../../../../error"; /** * Command response object built by the command processor (and command handler). The response object is always diff --git a/packages/imperative/src/cmd/src/doc/response/response/ICommandValidatorError.ts b/packages/imperative/src/cmd/doc/response/response/ICommandValidatorError.ts similarity index 100% rename from packages/imperative/src/cmd/src/doc/response/response/ICommandValidatorError.ts rename to packages/imperative/src/cmd/doc/response/response/ICommandValidatorError.ts diff --git a/packages/imperative/src/cmd/src/doc/response/response/ICommandValidatorResponse.ts b/packages/imperative/src/cmd/doc/response/response/ICommandValidatorResponse.ts similarity index 100% rename from packages/imperative/src/cmd/src/doc/response/response/ICommandValidatorResponse.ts rename to packages/imperative/src/cmd/doc/response/response/ICommandValidatorResponse.ts diff --git a/packages/imperative/src/cmd/src/handlers/FailedCommandHandler.ts b/packages/imperative/src/cmd/handlers/FailedCommandHandler.ts similarity index 92% rename from packages/imperative/src/cmd/src/handlers/FailedCommandHandler.ts rename to packages/imperative/src/cmd/handlers/FailedCommandHandler.ts index 2e9d7c4e7b..d28d0b6da1 100644 --- a/packages/imperative/src/cmd/src/handlers/FailedCommandHandler.ts +++ b/packages/imperative/src/cmd/handlers/FailedCommandHandler.ts @@ -9,10 +9,10 @@ * */ -import { IImperativeError } from "../../../error"; +import { IImperativeError } from "../../error"; import { ICommandHandler } from "../doc/handler/ICommandHandler"; import { IHandlerParameters } from "../doc/handler/IHandlerParameters"; -import { ImperativeError } from "../../../error/src/ImperativeError"; +import { ImperativeError } from "../../error/ImperativeError"; /** * Handler used to respond to unexpected errors */ diff --git a/packages/imperative/src/cmd/src/help/DefaultHelpGenerator.ts b/packages/imperative/src/cmd/help/DefaultHelpGenerator.ts similarity index 98% rename from packages/imperative/src/cmd/src/help/DefaultHelpGenerator.ts rename to packages/imperative/src/cmd/help/DefaultHelpGenerator.ts index 0265a773fc..a9bbd2620f 100644 --- a/packages/imperative/src/cmd/src/help/DefaultHelpGenerator.ts +++ b/packages/imperative/src/cmd/help/DefaultHelpGenerator.ts @@ -11,13 +11,13 @@ import { format } from "util"; import { AbstractHelpGenerator } from "./abstract/AbstractHelpGenerator"; -import { TextUtils } from "../../../utilities"; -import { Constants } from "../../../constants"; +import { TextUtils } from "../../../src/utilities/TextUtils"; +import { Constants } from "../../constants"; import { CommandUtils } from "../utils/CommandUtils"; -import { ImperativeError } from "../../../error"; +import { ImperativeError } from "../../error"; import { IHelpGeneratorParms } from "./doc/IHelpGeneratorParms"; import { IHelpGeneratorFactoryParms } from "./doc/IHelpGeneratorFactoryParms"; -import { compareCommands, ICommandDefinition } from "../../src/doc/ICommandDefinition"; +import { compareCommands, ICommandDefinition } from "../doc/ICommandDefinition"; import stripAnsi = require("strip-ansi"); /** diff --git a/packages/imperative/src/cmd/src/help/HelpConstants.ts b/packages/imperative/src/cmd/help/HelpConstants.ts similarity index 100% rename from packages/imperative/src/cmd/src/help/HelpConstants.ts rename to packages/imperative/src/cmd/help/HelpConstants.ts diff --git a/packages/imperative/src/cmd/src/help/HelpGeneratorFactory.ts b/packages/imperative/src/cmd/help/HelpGeneratorFactory.ts similarity index 100% rename from packages/imperative/src/cmd/src/help/HelpGeneratorFactory.ts rename to packages/imperative/src/cmd/help/HelpGeneratorFactory.ts diff --git a/packages/imperative/src/cmd/src/help/WebHelpGenerator.ts b/packages/imperative/src/cmd/help/WebHelpGenerator.ts similarity index 99% rename from packages/imperative/src/cmd/src/help/WebHelpGenerator.ts rename to packages/imperative/src/cmd/help/WebHelpGenerator.ts index f040a9a7e4..f2d1d28b95 100644 --- a/packages/imperative/src/cmd/src/help/WebHelpGenerator.ts +++ b/packages/imperative/src/cmd/help/WebHelpGenerator.ts @@ -14,9 +14,9 @@ import * as path from "path"; import { DefaultHelpGenerator } from "./DefaultHelpGenerator"; import { ICommandDefinition } from "../doc/ICommandDefinition"; -import { ImperativeConfig } from "../../../utilities/src/ImperativeConfig"; +import { ImperativeConfig } from "../../utilities/ImperativeConfig"; import { IHandlerResponseApi } from "../doc/response/api/handler/IHandlerResponseApi"; -import { ImperativeError } from "../../../error/src/ImperativeError"; +import { ImperativeError } from "../../error/ImperativeError"; import { IWebHelpTreeNode } from "./doc/IWebHelpTreeNode"; /** diff --git a/packages/imperative/src/cmd/src/help/WebHelpManager.ts b/packages/imperative/src/cmd/help/WebHelpManager.ts similarity index 97% rename from packages/imperative/src/cmd/src/help/WebHelpManager.ts rename to packages/imperative/src/cmd/help/WebHelpManager.ts index 6e5a431505..4db3374d88 100644 --- a/packages/imperative/src/cmd/src/help/WebHelpManager.ts +++ b/packages/imperative/src/cmd/help/WebHelpManager.ts @@ -12,14 +12,15 @@ import * as fs from "fs"; import * as path from "path"; -import { Constants } from "../../../constants/src/Constants"; -import { ImperativeConfig, GuiResult, ProcessUtils } from "../../../utilities"; +import { Constants } from "../../constants/Constants"; +import { ProcessUtils, GuiResult } from "../../utilities/ProcessUtils"; +import { ImperativeConfig } from "../../utilities/ImperativeConfig"; import { IWebHelpManager } from "./doc/IWebHelpManager"; import { WebHelpGenerator } from "./WebHelpGenerator"; import { IHandlerResponseApi } from "../doc/response/api/handler/IHandlerResponseApi"; import { ICommandDefinition } from "../doc/ICommandDefinition"; import { IWebHelpPackageMetadata } from "./doc/IWebHelpPackageMetadata"; -import { ImperativeError } from "../../../error"; +import { ImperativeError } from "../../error"; /** * Type used when comparing package metadata. If it contains metadata, it is diff --git a/packages/imperative/src/cmd/src/help/abstract/AbstractHelpGenerator.ts b/packages/imperative/src/cmd/help/abstract/AbstractHelpGenerator.ts similarity index 98% rename from packages/imperative/src/cmd/src/help/abstract/AbstractHelpGenerator.ts rename to packages/imperative/src/cmd/help/abstract/AbstractHelpGenerator.ts index e2dc6ead07..51169eb90f 100644 --- a/packages/imperative/src/cmd/src/help/abstract/AbstractHelpGenerator.ts +++ b/packages/imperative/src/cmd/help/abstract/AbstractHelpGenerator.ts @@ -9,14 +9,14 @@ * */ -import { TextUtils } from "../../../../utilities"; +import { TextUtils } from "../../../utilities/TextUtils"; import { format, isNullOrUndefined } from "util"; -import { ImperativeError } from "../../../../error/src/ImperativeError"; -import { Logger } from "../../../../logger/src/Logger"; +import { ImperativeError } from "../../../error/ImperativeError"; +import { Logger } from "../../../logger/Logger"; import { IHelpGeneratorParms } from "../doc/IHelpGeneratorParms"; import { IHelpGeneratorFactoryParms } from "../doc/IHelpGeneratorFactoryParms"; import { IHelpGenerator } from "../doc/IHelpGenerator"; -import { Constants } from "../../../../constants"; +import { Constants } from "../../../constants"; import { ICommandDefinition } from "../../doc/ICommandDefinition"; import { CommandOptionType, ICommandOptionDefinition } from "../../doc/option/ICommandOptionDefinition"; diff --git a/packages/imperative/src/cmd/src/help/abstract/AbstractHelpGeneratorFactory.ts b/packages/imperative/src/cmd/help/abstract/AbstractHelpGeneratorFactory.ts similarity index 98% rename from packages/imperative/src/cmd/src/help/abstract/AbstractHelpGeneratorFactory.ts rename to packages/imperative/src/cmd/help/abstract/AbstractHelpGeneratorFactory.ts index dc522c3367..164322532c 100644 --- a/packages/imperative/src/cmd/src/help/abstract/AbstractHelpGeneratorFactory.ts +++ b/packages/imperative/src/cmd/help/abstract/AbstractHelpGeneratorFactory.ts @@ -14,7 +14,7 @@ import { IHelpGeneratorFactory } from "../doc/IHelpGeneratorFactory"; import { isNullOrUndefined } from "util"; import { IHelpGeneratorParms } from "../doc/IHelpGeneratorParms"; import { IHelpGenerator } from "../doc/IHelpGenerator"; -import { ImperativeExpect } from "../../../../expect"; +import { ImperativeExpect } from "../../../expect"; /** * The abstract help generator factory class - implemented normally by imperative to provide the help generator diff --git a/packages/imperative/src/cmd/src/help/doc/IHelpGenerator.ts b/packages/imperative/src/cmd/help/doc/IHelpGenerator.ts similarity index 100% rename from packages/imperative/src/cmd/src/help/doc/IHelpGenerator.ts rename to packages/imperative/src/cmd/help/doc/IHelpGenerator.ts diff --git a/packages/imperative/src/cmd/src/help/doc/IHelpGeneratorFactory.ts b/packages/imperative/src/cmd/help/doc/IHelpGeneratorFactory.ts similarity index 100% rename from packages/imperative/src/cmd/src/help/doc/IHelpGeneratorFactory.ts rename to packages/imperative/src/cmd/help/doc/IHelpGeneratorFactory.ts diff --git a/packages/imperative/src/cmd/src/help/doc/IHelpGeneratorFactoryParms.ts b/packages/imperative/src/cmd/help/doc/IHelpGeneratorFactoryParms.ts similarity index 100% rename from packages/imperative/src/cmd/src/help/doc/IHelpGeneratorFactoryParms.ts rename to packages/imperative/src/cmd/help/doc/IHelpGeneratorFactoryParms.ts diff --git a/packages/imperative/src/cmd/src/help/doc/IHelpGeneratorParms.ts b/packages/imperative/src/cmd/help/doc/IHelpGeneratorParms.ts similarity index 100% rename from packages/imperative/src/cmd/src/help/doc/IHelpGeneratorParms.ts rename to packages/imperative/src/cmd/help/doc/IHelpGeneratorParms.ts diff --git a/packages/imperative/src/cmd/src/help/doc/IWebHelpManager.ts b/packages/imperative/src/cmd/help/doc/IWebHelpManager.ts similarity index 100% rename from packages/imperative/src/cmd/src/help/doc/IWebHelpManager.ts rename to packages/imperative/src/cmd/help/doc/IWebHelpManager.ts diff --git a/packages/imperative/src/cmd/src/help/doc/IWebHelpPackageMetadata.ts b/packages/imperative/src/cmd/help/doc/IWebHelpPackageMetadata.ts similarity index 100% rename from packages/imperative/src/cmd/src/help/doc/IWebHelpPackageMetadata.ts rename to packages/imperative/src/cmd/help/doc/IWebHelpPackageMetadata.ts diff --git a/packages/imperative/src/cmd/src/help/doc/IWebHelpTreeNode.ts b/packages/imperative/src/cmd/help/doc/IWebHelpTreeNode.ts similarity index 100% rename from packages/imperative/src/cmd/src/help/doc/IWebHelpTreeNode.ts rename to packages/imperative/src/cmd/help/doc/IWebHelpTreeNode.ts diff --git a/packages/imperative/src/cmd/index.ts b/packages/imperative/src/cmd/index.ts index 98b2d91411..aabe40ff0d 100644 --- a/packages/imperative/src/cmd/index.ts +++ b/packages/imperative/src/cmd/index.ts @@ -9,80 +9,80 @@ * */ -export * from "./src/doc/profiles/definition/ICommandProfileSchema"; -export * from "./src/doc/profiles/definition/ICommandProfileProperty"; -export * from "./src/doc/profiles/definition/ICommandProfileTypeConfiguration"; -export * from "./src/doc/handler/ICommandHandler"; -export * from "./src/doc/handler/ICommandHandlerResponseChecker"; -export * from "./src/doc/handler/ICommandHandlerResponseValidator"; -export * from "./src/doc/handler/IHandlerParameters"; -export * from "./src/doc/handler/IChainedHandlerEntry"; -export * from "./src/doc/handler/IChainedHandlerArgumentMapping"; - -export * from "./src/doc/option/ICommandOptionAllowableValues"; -export * from "./src/doc/option/ICommandOptionDefinition"; -export * from "./src/doc/option/ICommandOptionValueImplications"; -export * from "./src/doc/option/ICommandPositionalDefinition"; - -export * from "./src/doc/response/response/ICommandResponse"; -export * from "./src/doc/response/parms/ICommandResponseParms"; -export * from "./src/doc/response/response/ICommandValidatorError"; -export * from "./src/doc/response/response/ICommandValidatorResponse"; - -export * from "./src/doc/ICommandDefinition"; -export * from "./src/doc/ICommandDefinitionPassOn"; -export * from "./src/doc/ICommandExampleDefinition"; -export * from "./src/doc/IPartialCommandDefinition"; - -export * from "./src/doc/args/ICommandArguments"; - -export * from "./src/handlers/FailedCommandHandler"; - -export * from "./src/help/abstract/AbstractHelpGenerator"; -export * from "./src/help/abstract/AbstractHelpGeneratorFactory"; - -export * from "./src/help/doc/IHelpGeneratorFactory"; -export * from "./src/help/doc/IHelpGeneratorFactoryParms"; -export * from "./src/help/doc/IHelpGeneratorParms"; -export * from "./src/help/DefaultHelpGenerator"; -export * from "./src/help/HelpConstants"; -export * from "./src/help/HelpGeneratorFactory"; -export * from "./src/help/doc/IHelpGenerator"; -export * from "./src/help/WebHelpGenerator"; -export * from "./src/help/WebHelpManager"; - -export * from "./src/doc/profiles/definition/ICommandProfile"; -export * from "./src/doc/profiles/definition/ICommandProfileTypeConfiguration"; - -export * from "./src/profiles/CliProfileManager"; - -export * from "./src/syntax/SyntaxValidator"; - -export * from "./src/utils/CommandUtils"; -export * from "./src/utils/SharedOptions"; - -export * from "./src/yargs/doc/IYargsParms"; -export * from "./src/yargs/doc/IYargsResponse"; - -export * from "./src/yargs/AbstractCommandYargs"; -export * from "./src/yargs/CommandYargs"; -export * from "./src/yargs/GroupCommandYargs"; -export * from "./src/yargs/YargsConfigurer"; -export * from "./src/yargs/YargsDefiner"; - -export * from "./src/CommandPreparer"; -export * from "./src/CommandProcessor"; -export * from "./src/response/CommandResponse"; - -export * from "./src/profiles/CommandProfiles"; - -export * from "./src/response/CommandResponse"; -export * from "./src/response/HandlerResponse"; - -export * from "./src/doc/response/api/handler/IHandlerResponseApi"; -export * from "./src/doc/response/api/handler/IHandlerProgressApi"; -export * from "./src/doc/response/api/handler/IHandlerResponseConsoleApi"; -export * from "./src/doc/response/api/handler/IHandlerResponseDataApi"; -export * from "./src/doc/response/api/handler/IHandlerFormatOutputApi"; - -export * from "./src/doc/response/response/ICommandOutputFormat"; +export * from "./doc/profiles/definition/ICommandProfileSchema"; +export * from "./doc/profiles/definition/ICommandProfileProperty"; +export * from "./doc/profiles/definition/ICommandProfileTypeConfiguration"; +export * from "./doc/handler/ICommandHandler"; +export * from "./doc/handler/ICommandHandlerResponseChecker"; +export * from "./doc/handler/ICommandHandlerResponseValidator"; +export * from "./doc/handler/IHandlerParameters"; +export * from "./doc/handler/IChainedHandlerEntry"; +export * from "./doc/handler/IChainedHandlerArgumentMapping"; + +export * from "./doc/option/ICommandOptionAllowableValues"; +export * from "./doc/option/ICommandOptionDefinition"; +export * from "./doc/option/ICommandOptionValueImplications"; +export * from "./doc/option/ICommandPositionalDefinition"; + +export * from "./doc/response/response/ICommandResponse"; +export * from "./doc/response/parms/ICommandResponseParms"; +export * from "./doc/response/response/ICommandValidatorError"; +export * from "./doc/response/response/ICommandValidatorResponse"; + +export * from "./doc/ICommandDefinition"; +export * from "./doc/ICommandDefinitionPassOn"; +export * from "./doc/ICommandExampleDefinition"; +export * from "./doc/IPartialCommandDefinition"; + +export * from "./doc/args/ICommandArguments"; + +export * from "./handlers/FailedCommandHandler"; + +export * from "./help/abstract/AbstractHelpGenerator"; +export * from "./help/abstract/AbstractHelpGeneratorFactory"; + +export * from "./help/doc/IHelpGeneratorFactory"; +export * from "./help/doc/IHelpGeneratorFactoryParms"; +export * from "./help/doc/IHelpGeneratorParms"; +export * from "./help/DefaultHelpGenerator"; +export * from "./help/HelpConstants"; +export * from "./help/HelpGeneratorFactory"; +export * from "./help/doc/IHelpGenerator"; +export * from "./help/WebHelpGenerator"; +export * from "./help/WebHelpManager"; + +export * from "./doc/profiles/definition/ICommandProfile"; +export * from "./doc/profiles/definition/ICommandProfileTypeConfiguration"; + +export * from "./profiles/CliProfileManager"; + +export * from "./syntax/SyntaxValidator"; + +export * from "./utils/CommandUtils"; +export * from "./utils/SharedOptions"; + +export * from "./yargs/doc/IYargsParms"; +export * from "./yargs/doc/IYargsResponse"; + +export * from "./yargs/AbstractCommandYargs"; +export * from "./yargs/CommandYargs"; +export * from "./yargs/GroupCommandYargs"; +export * from "./yargs/YargsConfigurer"; +export * from "./yargs/YargsDefiner"; + +export * from "./CommandPreparer"; +export * from "./CommandProcessor"; +export * from "./response/CommandResponse"; + +export * from "./profiles/CommandProfiles"; + +export * from "./response/CommandResponse"; +export * from "./response/HandlerResponse"; + +export * from "./doc/response/api/handler/IHandlerResponseApi"; +export * from "./doc/response/api/handler/IHandlerProgressApi"; +export * from "./doc/response/api/handler/IHandlerResponseConsoleApi"; +export * from "./doc/response/api/handler/IHandlerResponseDataApi"; +export * from "./doc/response/api/handler/IHandlerFormatOutputApi"; + +export * from "./doc/response/response/ICommandOutputFormat"; diff --git a/packages/imperative/src/cmd/src/profiles/CliProfileManager.ts b/packages/imperative/src/cmd/profiles/CliProfileManager.ts similarity index 99% rename from packages/imperative/src/cmd/src/profiles/CliProfileManager.ts rename to packages/imperative/src/cmd/profiles/CliProfileManager.ts index a4aa983665..6643c6fb4b 100644 --- a/packages/imperative/src/cmd/src/profiles/CliProfileManager.ts +++ b/packages/imperative/src/cmd/profiles/CliProfileManager.ts @@ -21,22 +21,22 @@ import { IValidateProfileForCLI, ProfilesConstants, ProfileUtils -} from "../../../profiles"; +} from "../../profiles"; import { inspect } from "util"; -import { ImperativeError } from "../../../error"; +import { ImperativeError } from "../../error"; import { Arguments } from "yargs"; import { CommandResponse } from "../response/CommandResponse"; import { ICommandHandlerRequire } from "../doc/handler/ICommandHandlerRequire"; -import { ICommandHandler } from "../../src/doc/handler/ICommandHandler"; +import { ICommandHandler } from "../doc/handler/ICommandHandler"; import { ICommandProfileTypeConfiguration } from "../doc/profiles/definition/ICommandProfileTypeConfiguration"; import { CommandProfiles } from "./CommandProfiles"; import { ICommandProfileProperty } from "../doc/profiles/definition/ICommandProfileProperty"; -import { CredentialManagerFactory } from "../../../security"; -import { IDeleteProfile, IProfileDeleted, IProfileLoaded } from "../../../profiles/src/doc"; +import { CredentialManagerFactory } from "../../security"; +import { IDeleteProfile, IProfileDeleted, IProfileLoaded } from "../../profiles/doc"; import { SecureOperationFunction } from "../types/SecureOperationFunction"; import { ICliLoadProfile } from "../doc/profiles/parms/ICliLoadProfile"; import { ICliLoadAllProfiles } from "../doc/profiles/parms/ICliLoadAllProfiles"; -import { CliUtils } from "../../../utilities/src/CliUtils"; +import { CliUtils } from "../../utilities/CliUtils"; /** * A profile management API compatible with transforming command line arguments into diff --git a/packages/imperative/src/cmd/src/profiles/CommandProfileLoader.ts b/packages/imperative/src/cmd/profiles/CommandProfileLoader.ts similarity index 98% rename from packages/imperative/src/cmd/src/profiles/CommandProfileLoader.ts rename to packages/imperative/src/cmd/profiles/CommandProfileLoader.ts index b990ad8952..e291b78912 100644 --- a/packages/imperative/src/cmd/src/profiles/CommandProfileLoader.ts +++ b/packages/imperative/src/cmd/profiles/CommandProfileLoader.ts @@ -11,16 +11,16 @@ import { Arguments } from "yargs"; import { ICommandDefinition } from "../doc/ICommandDefinition"; -import { IProfile, IProfileLoaded, IProfileManagerFactory, ProfileUtils } from "../../../profiles"; +import { IProfile, IProfileLoaded, IProfileManagerFactory, ProfileUtils } from "../../profiles"; import { ICommandProfileTypeConfiguration } from "../doc/profiles/definition/ICommandProfileTypeConfiguration"; import { CommandProfiles } from "./CommandProfiles"; import { inspect, isNullOrUndefined } from "util"; import { ICommandLoadProfile } from "../doc/profiles/parms/ICommandLoadProfile"; import { ICommandProfileLoaderParms } from "../doc/profiles/parms/ICommandProfileLoaderParms"; -import { Logger } from "../../../logger"; -import { ImperativeExpect } from "../../../expect"; -import { ImperativeError } from "../../../error"; -import { ImperativeConfig } from "../../../utilities"; +import { Logger } from "../../logger"; +import { ImperativeExpect } from "../../expect"; +import { ImperativeError } from "../../error"; +import { ImperativeConfig } from "../../utilities/ImperativeConfig"; /** * The command processor profile loader loads all profiles that are required (or optional) given a command diff --git a/packages/imperative/src/cmd/src/profiles/CommandProfiles.ts b/packages/imperative/src/cmd/profiles/CommandProfiles.ts similarity index 98% rename from packages/imperative/src/cmd/src/profiles/CommandProfiles.ts rename to packages/imperative/src/cmd/profiles/CommandProfiles.ts index 001dc1a14c..1f4cfedee7 100644 --- a/packages/imperative/src/cmd/src/profiles/CommandProfiles.ts +++ b/packages/imperative/src/cmd/profiles/CommandProfiles.ts @@ -9,9 +9,9 @@ * */ -import { ImperativeError } from "../../../error"; -import { IProfile, IProfileLoaded } from "../../../profiles"; -import { ImperativeExpect } from "../../../expect"; +import { ImperativeError } from "../../error"; +import { IProfile, IProfileLoaded } from "../../profiles"; +import { ImperativeExpect } from "../../expect"; /** * Profiles map created by the command profile loader and passed to the handler via parameters. Handlers can diff --git a/packages/imperative/src/cmd/src/response/CommandResponse.ts b/packages/imperative/src/cmd/response/CommandResponse.ts similarity index 98% rename from packages/imperative/src/cmd/src/response/CommandResponse.ts rename to packages/imperative/src/cmd/response/CommandResponse.ts index 7351f925fb..8a4192dc89 100644 --- a/packages/imperative/src/cmd/src/response/CommandResponse.ts +++ b/packages/imperative/src/cmd/response/CommandResponse.ts @@ -9,22 +9,23 @@ * */ -import { IImperativeError, ImperativeError } from "../../../error"; +import { IImperativeError, ImperativeError } from "../../error"; import { IHandlerResponseConsoleApi } from "../doc/response/api/handler/IHandlerResponseConsoleApi"; import { IHandlerResponseDataApi } from "../doc/response/api/handler/IHandlerResponseDataApi"; import { ICommandResponseParms } from "../doc/response/parms/ICommandResponseParms"; import { ICommandResponse } from "../doc/response/response/ICommandResponse"; -import { CliUtils, TextUtils } from "../../../utilities"; +import { TextUtils } from "../../utilities/TextUtils"; +import { CliUtils } from "../../utilities/CliUtils"; import { COMMAND_RESPONSE_FORMAT, ICommandResponseApi } from "../doc/response/api/processor/ICommandResponseApi"; -import { ITaskWithStatus, TaskProgress, TaskStage } from "../../../operations"; +import { ITaskWithStatus, TaskProgress, TaskStage } from "../../operations"; import { IHandlerProgressApi } from "../doc/response/api/handler/IHandlerProgressApi"; import { IProgressBarParms } from "../doc/response/parms/IProgressBarParms"; -import { Constants } from "../../../constants"; -import { ImperativeExpect } from "../../../expect"; +import { Constants } from "../../constants"; +import { ImperativeExpect } from "../../expect"; import { IHandlerFormatOutputApi } from "../doc/response/api/handler/IHandlerFormatOutputApi"; import { ICommandOutputFormat, OUTPUT_FORMAT } from "../doc/response/response/ICommandOutputFormat"; import { Arguments } from "yargs"; -import { ICommandDefinition } from "../../src/doc/ICommandDefinition"; +import { ICommandDefinition } from "../doc/ICommandDefinition"; import { OptionConstants } from "../constants/OptionConstants"; import { inspect } from "util"; import * as DeepMerge from "deepmerge"; @@ -32,9 +33,9 @@ import * as ProgressBar from "progress"; import * as net from "net"; import * as tty from "tty"; import { IPromptOptions } from "../doc/response/api/handler/IPromptOptions"; -import { DaemonRequest } from "../../../utilities/src/DaemonRequest"; -import { IDaemonResponse } from "../../../utilities/src/doc/IDaemonResponse"; -import { Logger, LoggerUtils } from "../../../logger"; +import { DaemonRequest } from "../../utilities/DaemonRequest"; +import { IDaemonResponse } from "../../utilities/doc/IDaemonResponse"; +import { Logger, LoggerUtils } from "../../logger"; const DataObjectParser = require("dataobject-parser"); diff --git a/packages/imperative/src/cmd/src/response/HandlerResponse.ts b/packages/imperative/src/cmd/response/HandlerResponse.ts similarity index 100% rename from packages/imperative/src/cmd/src/response/HandlerResponse.ts rename to packages/imperative/src/cmd/response/HandlerResponse.ts diff --git a/packages/imperative/src/cmd/src/response/__mocks__/CommandResponse.ts b/packages/imperative/src/cmd/response/__mocks__/CommandResponse.ts similarity index 88% rename from packages/imperative/src/cmd/src/response/__mocks__/CommandResponse.ts rename to packages/imperative/src/cmd/response/__mocks__/CommandResponse.ts index 0f7290d227..9d5b92be1e 100644 --- a/packages/imperative/src/cmd/src/response/__mocks__/CommandResponse.ts +++ b/packages/imperative/src/cmd/response/__mocks__/CommandResponse.ts @@ -10,8 +10,8 @@ */ import { ICommandResponseApi } from "../../doc/response/api/processor/ICommandResponseApi"; -import { ICommandResponse } from "../../../src/doc/response/response/ICommandResponse"; -import { IImperativeError } from "../../../../error"; +import { ICommandResponse } from "../../doc/response/response/ICommandResponse"; +import { IImperativeError } from "../../../error"; export class CommandResponse implements ICommandResponseApi { public responseFormat: "json" | "default"; diff --git a/packages/imperative/src/cmd/src/response/__mocks__/HandlerResponse.ts b/packages/imperative/src/cmd/response/__mocks__/HandlerResponse.ts similarity index 93% rename from packages/imperative/src/cmd/src/response/__mocks__/HandlerResponse.ts rename to packages/imperative/src/cmd/response/__mocks__/HandlerResponse.ts index f582329f26..b1078f273a 100644 --- a/packages/imperative/src/cmd/src/response/__mocks__/HandlerResponse.ts +++ b/packages/imperative/src/cmd/response/__mocks__/HandlerResponse.ts @@ -9,7 +9,7 @@ * */ -import { IHandlerResponseApi } from "../../../src/doc/response/api/handler/IHandlerResponseApi"; +import { IHandlerResponseApi } from "../../doc/response/api/handler/IHandlerResponseApi"; import { IHandlerResponseConsoleApi } from "../../doc/response/api/handler/IHandlerResponseConsoleApi"; import { IHandlerResponseDataApi } from "../../doc/response/api/handler/IHandlerResponseDataApi"; import { IHandlerProgressApi } from "../../doc/response/api/handler/IHandlerProgressApi"; diff --git a/packages/imperative/src/cmd/src/syntax/SyntaxValidator.ts b/packages/imperative/src/cmd/syntax/SyntaxValidator.ts similarity index 99% rename from packages/imperative/src/cmd/src/syntax/SyntaxValidator.ts rename to packages/imperative/src/cmd/syntax/SyntaxValidator.ts index 56c1c8db3f..41d6096e3c 100644 --- a/packages/imperative/src/cmd/src/syntax/SyntaxValidator.ts +++ b/packages/imperative/src/cmd/syntax/SyntaxValidator.ts @@ -11,9 +11,9 @@ import * as fs from "fs"; import { inspect, isNullOrUndefined } from "util"; -import { syntaxErrorHeader } from "../../../messages"; -import { CliUtils } from "../../../utilities/src/CliUtils"; -import { Constants } from "../../../constants"; +import { syntaxErrorHeader } from "../../messages"; +import { CliUtils } from "../../utilities/CliUtils"; +import { Constants } from "../../constants"; import { ICommandDefinition } from "../doc/ICommandDefinition"; import { ICommandValidatorResponse } from "../doc/response/response/ICommandValidatorResponse"; import { CommandUtils } from "../utils/CommandUtils"; @@ -23,8 +23,8 @@ import { ICommandOptionValueImplications } from "../doc/option/ICommandOptionVal import { ICommandOptionAllowableValues } from "../doc/option/ICommandOptionAllowableValues"; import { ICommandValidatorError } from "../doc/response/response/ICommandValidatorError"; import { CommandResponse } from "../response/CommandResponse"; -import { Logger } from "../../../logger"; -import { TextUtils } from "../../../utilities"; +import { Logger } from "../../logger"; +import { TextUtils } from "../../utilities/TextUtils"; import { ICommandArguments } from "../doc/args/ICommandArguments"; /** diff --git a/packages/imperative/src/cmd/src/syntax/__mocks__/SyntaxValidator.ts b/packages/imperative/src/cmd/syntax/__mocks__/SyntaxValidator.ts similarity index 83% rename from packages/imperative/src/cmd/src/syntax/__mocks__/SyntaxValidator.ts rename to packages/imperative/src/cmd/syntax/__mocks__/SyntaxValidator.ts index 4c99f87760..4db616d2d8 100644 --- a/packages/imperative/src/cmd/src/syntax/__mocks__/SyntaxValidator.ts +++ b/packages/imperative/src/cmd/syntax/__mocks__/SyntaxValidator.ts @@ -9,9 +9,9 @@ * */ -import { CommandResponse } from "../../../src/response/CommandResponse"; +import { CommandResponse } from "../../response/CommandResponse"; import { Arguments } from "yargs"; -import { ICommandValidatorResponse } from "../../../src/doc/response/response/ICommandValidatorResponse"; +import { ICommandValidatorResponse } from "../../doc/response/response/ICommandValidatorResponse"; export class SyntaxValidator { public validate(responseObject: CommandResponse, commandArguments: Arguments): Promise { diff --git a/packages/imperative/src/cmd/src/syntax/__tests__/SyntaxValidator.unit.test.ts b/packages/imperative/src/cmd/syntax/__tests__/SyntaxValidator.unit.test.ts similarity index 98% rename from packages/imperative/src/cmd/src/syntax/__tests__/SyntaxValidator.unit.test.ts rename to packages/imperative/src/cmd/syntax/__tests__/SyntaxValidator.unit.test.ts index 90c4db7dc8..178ac356bc 100644 --- a/packages/imperative/src/cmd/src/syntax/__tests__/SyntaxValidator.unit.test.ts +++ b/packages/imperative/src/cmd/syntax/__tests__/SyntaxValidator.unit.test.ts @@ -10,15 +10,15 @@ */ /* eslint-disable jest/expect-expect */ -import { TextUtils } from "../../../../utilities"; +import { TextUtils } from "../../../utilities/TextUtils"; jest.mock("../../../../imperative/src/Imperative"); import { inspect, isNullOrUndefined } from "util"; -import { TestLogger } from "../../../../../__tests__/src/TestLogger"; +import { TestLogger } from "../../../../__tests__/src/TestLogger"; import { CommandResponse, ICommandDefinition, ICommandValidatorResponse } from "../../../"; -import { ValidationTestCommand } from "../../../../../__tests__/src/packages/cmd/ValidationTestCommand"; +import { ValidationTestCommand } from "../../../../__tests__/src/packages/cmd/ValidationTestCommand"; import { SyntaxValidator } from "../SyntaxValidator"; -import { Constants } from "../../../../constants"; +import { Constants } from "../../../constants"; describe("Imperative should provide advanced syntax validation rules", () => { diff --git a/packages/imperative/src/cmd/src/types/SecureOperationFunction.ts b/packages/imperative/src/cmd/types/SecureOperationFunction.ts similarity index 100% rename from packages/imperative/src/cmd/src/types/SecureOperationFunction.ts rename to packages/imperative/src/cmd/types/SecureOperationFunction.ts diff --git a/packages/imperative/src/cmd/src/utils/CommandUtils.ts b/packages/imperative/src/cmd/utils/CommandUtils.ts similarity index 99% rename from packages/imperative/src/cmd/src/utils/CommandUtils.ts rename to packages/imperative/src/cmd/utils/CommandUtils.ts index f535661524..cc6d76de8e 100644 --- a/packages/imperative/src/cmd/src/utils/CommandUtils.ts +++ b/packages/imperative/src/cmd/utils/CommandUtils.ts @@ -13,7 +13,7 @@ import { Arguments } from "yargs"; import { isNullOrUndefined } from "util"; import { ICommandDefinition } from "../doc/ICommandDefinition"; import { ICommandOptionDefinition } from "../doc/option/ICommandOptionDefinition"; -import { CliUtils } from "../../../utilities/src/CliUtils"; +import { CliUtils } from "../../utilities/CliUtils"; import { ICommandArguments } from "../doc/args/ICommandArguments"; import { isEqual, omit } from "lodash"; diff --git a/packages/imperative/src/cmd/src/utils/SharedOptions.ts b/packages/imperative/src/cmd/utils/SharedOptions.ts similarity index 96% rename from packages/imperative/src/cmd/src/utils/SharedOptions.ts rename to packages/imperative/src/cmd/utils/SharedOptions.ts index 0ac8ca54ca..a6fecbb4b1 100644 --- a/packages/imperative/src/cmd/src/utils/SharedOptions.ts +++ b/packages/imperative/src/cmd/utils/SharedOptions.ts @@ -11,11 +11,11 @@ import { Arguments } from "yargs"; import { ICommandNodeType } from "../doc/ICommandDefinition"; -import { IImperativeError, ImperativeError } from "../../../error"; -import { Constants } from "../../../constants"; +import { IImperativeError, ImperativeError } from "../../error"; +import { Constants } from "../../constants"; import { isNullOrUndefined } from "util"; import { CommandResponse } from "../response/CommandResponse"; -import { Logger } from "../../../logger"; +import { Logger } from "../../logger"; /** * Options which can be reused between different Zowe commands diff --git a/packages/imperative/src/cmd/src/yargs/AbstractCommandYargs.ts b/packages/imperative/src/cmd/yargs/AbstractCommandYargs.ts similarity index 97% rename from packages/imperative/src/cmd/src/yargs/AbstractCommandYargs.ts rename to packages/imperative/src/cmd/yargs/AbstractCommandYargs.ts index 60c19b7059..d5bc37834f 100644 --- a/packages/imperative/src/cmd/src/yargs/AbstractCommandYargs.ts +++ b/packages/imperative/src/cmd/yargs/AbstractCommandYargs.ts @@ -11,21 +11,21 @@ import { Arguments, Argv } from "yargs"; import * as lodashDeep from "lodash-deep"; -import { Logger } from "../../../logger"; +import { Logger } from "../../logger"; import { ICommandDefinition } from "../doc/ICommandDefinition"; import { CommandProcessor } from "../CommandProcessor"; -import { Constants } from "../../../constants"; +import { Constants } from "../../constants"; import { IYargsParms } from "./doc/IYargsParms"; -import { ICommandResponseParms } from "../../../cmd/src/doc/response/parms/ICommandResponseParms"; +import { ICommandResponseParms } from "../../cmd/doc/response/parms/ICommandResponseParms"; import { ImperativeYargsCommandAction, IYargsResponse } from "./doc/IYargsResponse"; import { GroupCommandYargs } from "./GroupCommandYargs"; -import { IProfileManagerFactory } from "../../../profiles"; +import { IProfileManagerFactory } from "../../profiles"; import { ICommandProfileTypeConfiguration } from "../doc/profiles/definition/ICommandProfileTypeConfiguration"; import { IHelpGeneratorFactory } from "../help/doc/IHelpGeneratorFactory"; import { CommandResponse } from "../response/CommandResponse"; -import { ICommandResponse } from "../../src/doc/response/response/ICommandResponse"; +import { ICommandResponse } from "../doc/response/response/ICommandResponse"; import { ICommandExampleDefinition } from "../.."; -import { ImperativeConfig } from "../../../utilities/src/ImperativeConfig"; +import { ImperativeConfig } from "../../utilities/ImperativeConfig"; /** * Callback that is invoked when a command defined to yargs completes execution. diff --git a/packages/imperative/src/cmd/src/yargs/CommandYargs.ts b/packages/imperative/src/cmd/yargs/CommandYargs.ts similarity index 97% rename from packages/imperative/src/cmd/src/yargs/CommandYargs.ts rename to packages/imperative/src/cmd/yargs/CommandYargs.ts index e2481afdda..bbaf407df9 100644 --- a/packages/imperative/src/cmd/src/yargs/CommandYargs.ts +++ b/packages/imperative/src/cmd/yargs/CommandYargs.ts @@ -11,15 +11,15 @@ import { Arguments, Argv, Options } from "yargs"; import { isNullOrUndefined, inspect } from "util"; -import { Constants } from "../../../constants"; +import { Constants } from "../../constants"; import { IYargsResponse } from "./doc/IYargsResponse"; import { AbstractCommandYargs, YargsCommandCompleted } from "./AbstractCommandYargs"; -import { ICommandOptionDefinition } from "../../src/doc/option/ICommandOptionDefinition"; +import { ICommandOptionDefinition } from "../doc/option/ICommandOptionDefinition"; import { ICommandDefinition } from "../doc/ICommandDefinition"; import { CommandProcessor } from "../CommandProcessor"; -import { ICommandResponse } from "../../src/doc/response/response/ICommandResponse"; -import { CommandResponse } from "../../src/response/CommandResponse"; -import { ImperativeConfig } from "../../../utilities"; +import { ICommandResponse } from "../doc/response/response/ICommandResponse"; +import { CommandResponse } from "../response/CommandResponse"; +import { ImperativeConfig } from "../../utilities/ImperativeConfig"; /** * Define an Imperative Command to Yargs. A command implies that an implementation is present (differs from a "group") diff --git a/packages/imperative/src/cmd/src/yargs/GroupCommandYargs.ts b/packages/imperative/src/cmd/yargs/GroupCommandYargs.ts similarity index 99% rename from packages/imperative/src/cmd/src/yargs/GroupCommandYargs.ts rename to packages/imperative/src/cmd/yargs/GroupCommandYargs.ts index e997dac74d..69cf31ecab 100644 --- a/packages/imperative/src/cmd/src/yargs/GroupCommandYargs.ts +++ b/packages/imperative/src/cmd/yargs/GroupCommandYargs.ts @@ -12,7 +12,7 @@ import { Arguments, Argv } from "yargs"; import { AbstractCommandYargs, YargsCommandCompleted } from "./AbstractCommandYargs"; import { CommandYargs } from "./CommandYargs"; -import { Constants } from "../../../constants"; +import { Constants } from "../../constants"; /** * Imperative define group command to Yargs - defines the group and it's children to Yargs. diff --git a/packages/imperative/src/cmd/src/yargs/YargsConfigurer.ts b/packages/imperative/src/cmd/yargs/YargsConfigurer.ts similarity index 98% rename from packages/imperative/src/cmd/src/yargs/YargsConfigurer.ts rename to packages/imperative/src/cmd/yargs/YargsConfigurer.ts index 51c1f0c10d..2f52215ae4 100644 --- a/packages/imperative/src/cmd/src/yargs/YargsConfigurer.ts +++ b/packages/imperative/src/cmd/yargs/YargsConfigurer.ts @@ -11,17 +11,17 @@ import { format, inspect } from "util"; import { Arguments } from "yargs"; -import { Logger } from "../../../logger"; -import { Constants } from "../../../constants"; +import { Logger } from "../../logger"; +import { Constants } from "../../constants"; import { AbstractCommandYargs } from "./AbstractCommandYargs"; import { ICommandDefinition } from "../doc/ICommandDefinition"; import { ICommandResponseParms } from "../doc/response/parms/ICommandResponseParms"; import { CommandProcessor } from "../CommandProcessor"; import { CommandUtils } from "../utils/CommandUtils"; -import { IProfileManagerFactory } from "../../../profiles"; +import { IProfileManagerFactory } from "../../profiles"; import { ICommandProfileTypeConfiguration } from "../doc/profiles/definition/ICommandProfileTypeConfiguration"; import { IHelpGeneratorFactory } from "../help/doc/IHelpGeneratorFactory"; -import { ImperativeConfig } from "../../../utilities"; +import { ImperativeConfig } from "../../utilities/ImperativeConfig"; import { closest } from "fastest-levenshtein"; import { COMMAND_RESPONSE_FORMAT } from "../doc/response/api/processor/ICommandResponseApi"; diff --git a/packages/imperative/src/cmd/src/yargs/YargsDefiner.ts b/packages/imperative/src/cmd/yargs/YargsDefiner.ts similarity index 95% rename from packages/imperative/src/cmd/src/yargs/YargsDefiner.ts rename to packages/imperative/src/cmd/yargs/YargsDefiner.ts index ae850eee1a..b1937e8095 100644 --- a/packages/imperative/src/cmd/src/yargs/YargsDefiner.ts +++ b/packages/imperative/src/cmd/yargs/YargsDefiner.ts @@ -11,13 +11,13 @@ import { Argv } from "yargs"; import { inspect } from "util"; -import { Logger } from "../../../logger"; -import { ICommandDefinition } from "../../../cmd/src/doc/ICommandDefinition"; +import { Logger } from "../../logger"; +import { ICommandDefinition } from "../../cmd/doc/ICommandDefinition"; import { YargsCommandCompleted } from "./AbstractCommandYargs"; import { GroupCommandYargs } from "./GroupCommandYargs"; import { CommandYargs } from "./CommandYargs"; -import { ICommandResponseParms } from "../../../cmd/src/doc/response/parms/ICommandResponseParms"; -import { IProfileManagerFactory } from "../../../profiles"; +import { ICommandResponseParms } from "../../cmd/doc/response/parms/ICommandResponseParms"; +import { IProfileManagerFactory } from "../../profiles"; import { ICommandProfileTypeConfiguration } from "../doc/profiles/definition/ICommandProfileTypeConfiguration"; import { IHelpGeneratorFactory } from "../help/doc/IHelpGeneratorFactory"; diff --git a/packages/imperative/src/cmd/src/yargs/doc/IYargsParms.ts b/packages/imperative/src/cmd/yargs/doc/IYargsParms.ts similarity index 97% rename from packages/imperative/src/cmd/src/yargs/doc/IYargsParms.ts rename to packages/imperative/src/cmd/yargs/doc/IYargsParms.ts index 3d1c8fb4b1..f5cad8b6c2 100644 --- a/packages/imperative/src/cmd/src/yargs/doc/IYargsParms.ts +++ b/packages/imperative/src/cmd/yargs/doc/IYargsParms.ts @@ -13,7 +13,7 @@ import { Argv } from "yargs"; import { ICommandDefinition } from "../../doc/ICommandDefinition"; import { GroupCommandYargs } from "../GroupCommandYargs"; import { ICommandResponseParms } from "../../doc/response/parms/ICommandResponseParms"; -import { IProfileManagerFactory } from "../../../../profiles"; +import { IProfileManagerFactory } from "../../../profiles"; import { IHelpGeneratorFactory } from "../../help/doc/IHelpGeneratorFactory"; /** diff --git a/packages/imperative/src/cmd/src/yargs/doc/IYargsResponse.ts b/packages/imperative/src/cmd/yargs/doc/IYargsResponse.ts similarity index 91% rename from packages/imperative/src/cmd/src/yargs/doc/IYargsResponse.ts rename to packages/imperative/src/cmd/yargs/doc/IYargsResponse.ts index 6d3337007f..97c5b922b5 100644 --- a/packages/imperative/src/cmd/src/yargs/doc/IYargsResponse.ts +++ b/packages/imperative/src/cmd/yargs/doc/IYargsResponse.ts @@ -9,7 +9,7 @@ * */ -import { ICommandResponse } from "../../../src/doc/response/response/ICommandResponse"; +import { ICommandResponse } from "../../doc/response/response/ICommandResponse"; /** * Indicates the action performed. */ diff --git a/packages/imperative/src/config/src/Config.ts b/packages/imperative/src/config/Config.ts similarity index 100% rename from packages/imperative/src/config/src/Config.ts rename to packages/imperative/src/config/Config.ts diff --git a/packages/imperative/src/config/src/ConfigAutoStore.ts b/packages/imperative/src/config/ConfigAutoStore.ts similarity index 95% rename from packages/imperative/src/config/src/ConfigAutoStore.ts rename to packages/imperative/src/config/ConfigAutoStore.ts index a36a921fe1..7d55742516 100644 --- a/packages/imperative/src/config/src/ConfigAutoStore.ts +++ b/packages/imperative/src/config/ConfigAutoStore.ts @@ -10,16 +10,16 @@ */ import * as lodash from "lodash"; -import { ICommandArguments, IHandlerParameters } from "../../cmd"; -import { ICommandHandlerRequire } from "../../cmd/src/doc/handler/ICommandHandlerRequire"; -import { ICommandProfileAuthConfig } from "../../cmd/src/doc/profiles/definition/ICommandProfileAuthConfig"; +import { ICommandArguments, IHandlerParameters } from "../cmd"; +import { ICommandHandlerRequire } from "../cmd/doc/handler/ICommandHandlerRequire"; +import { ICommandProfileAuthConfig } from "../cmd/doc/profiles/definition/ICommandProfileAuthConfig"; import * as ConfigUtils from "./ConfigUtils"; -import { AbstractAuthHandler } from "../../imperative/src/auth/handlers/AbstractAuthHandler"; -import { ImperativeConfig } from "../../utilities"; -import { ISession } from "../../rest/src/session/doc/ISession"; -import { Session } from "../../rest/src/session/Session"; -import { AUTH_TYPE_TOKEN, TOKEN_TYPE_APIML } from "../../rest/src/session/SessConstants"; -import { Logger } from "../../logger"; +import { AbstractAuthHandler } from "../imperative/auth/handlers/AbstractAuthHandler"; +import { ImperativeConfig } from "../utilities/ImperativeConfig"; +import { ISession } from "../rest/session/doc/ISession"; +import { Session } from "../rest/session/Session"; +import { AUTH_TYPE_TOKEN, TOKEN_TYPE_APIML } from "../rest/session/SessConstants"; +import { Logger } from "../logger"; import { IConfigAutoStoreFindActiveProfileOpts, IConfigAutoStoreFindAuthHandlerForProfileOpts, diff --git a/packages/imperative/src/config/src/ConfigBuilder.ts b/packages/imperative/src/config/ConfigBuilder.ts similarity index 98% rename from packages/imperative/src/config/src/ConfigBuilder.ts rename to packages/imperative/src/config/ConfigBuilder.ts index 99be12380b..c945cfc1be 100644 --- a/packages/imperative/src/config/src/ConfigBuilder.ts +++ b/packages/imperative/src/config/ConfigBuilder.ts @@ -11,12 +11,12 @@ import * as path from "path"; import * as lodash from "lodash"; -import { ProfileIO, ProfilesConstants, ProfileUtils } from "../../profiles"; -import { IImperativeConfig } from "../../imperative"; +import { ProfileIO, ProfilesConstants, ProfileUtils } from "../profiles"; +import { IImperativeConfig } from "../imperative"; import { Config } from "./Config"; import { IConfig } from "./doc/IConfig"; import { IConfigBuilderOpts } from "./doc/IConfigBuilderOpts"; -import { CredentialManagerFactory } from "../../security"; +import { CredentialManagerFactory } from "../security"; import { IConfigConvertResult } from "./doc/IConfigConvertResult"; export class ConfigBuilder { diff --git a/packages/imperative/src/config/src/ConfigConstants.ts b/packages/imperative/src/config/ConfigConstants.ts similarity index 100% rename from packages/imperative/src/config/src/ConfigConstants.ts rename to packages/imperative/src/config/ConfigConstants.ts diff --git a/packages/imperative/src/config/src/ConfigSchema.ts b/packages/imperative/src/config/ConfigSchema.ts similarity index 98% rename from packages/imperative/src/config/src/ConfigSchema.ts rename to packages/imperative/src/config/ConfigSchema.ts index 6a04334475..087e63c88b 100644 --- a/packages/imperative/src/config/src/ConfigSchema.ts +++ b/packages/imperative/src/config/ConfigSchema.ts @@ -11,14 +11,14 @@ import * as path from "path"; import * as lodash from "lodash"; -import { IExplanationMap, TextUtils } from "../../utilities/src/TextUtils"; -import { ICommandProfileProperty } from "../../cmd"; -import { IProfileProperty, IProfileSchema, IProfileTypeConfiguration } from "../../profiles"; +import { IExplanationMap, TextUtils } from "../utilities/TextUtils"; +import { ICommandProfileProperty } from "../cmd"; +import { IProfileProperty, IProfileSchema, IProfileTypeConfiguration } from "../profiles"; import { IConfigSchema, IConfigUpdateSchemaHelperOptions, IConfigUpdateSchemaOptions, IConfigUpdateSchemaPaths } from "./doc/IConfigSchema"; -import { ImperativeConfig } from "../../utilities/src/ImperativeConfig"; -import { Logger } from "../../logger/src/Logger"; +import { ImperativeConfig } from "../utilities/ImperativeConfig"; +import { Logger } from "../logger/Logger"; import { Config } from "./Config"; -import { ImperativeError } from "../../error/src/ImperativeError"; +import { ImperativeError } from "../error/ImperativeError"; import { IConfig } from "./doc/IConfig"; export class ConfigSchema { diff --git a/packages/imperative/src/config/src/ConfigUtils.ts b/packages/imperative/src/config/ConfigUtils.ts similarity index 92% rename from packages/imperative/src/config/src/ConfigUtils.ts rename to packages/imperative/src/config/ConfigUtils.ts index 48c95465e1..ceef49ea6a 100644 --- a/packages/imperative/src/config/src/ConfigUtils.ts +++ b/packages/imperative/src/config/ConfigUtils.ts @@ -9,10 +9,10 @@ * */ -import { CredentialManagerFactory } from "../../security"; -import { ICommandArguments } from "../../cmd"; -import { ImperativeConfig } from "../../utilities"; -import { ImperativeError } from "../../error"; +import { CredentialManagerFactory } from "../security"; +import { ICommandArguments } from "../cmd"; +import { ImperativeConfig } from "../utilities/ImperativeConfig"; +import { ImperativeError } from "../error"; /** * Coeerces string property value to a boolean or number type. diff --git a/packages/imperative/src/config/src/ProfInfoErr.ts b/packages/imperative/src/config/ProfInfoErr.ts similarity index 98% rename from packages/imperative/src/config/src/ProfInfoErr.ts rename to packages/imperative/src/config/ProfInfoErr.ts index e470314562..2188a12b20 100644 --- a/packages/imperative/src/config/src/ProfInfoErr.ts +++ b/packages/imperative/src/config/ProfInfoErr.ts @@ -11,7 +11,7 @@ // for imperative operations import { IProfInfoErrParms } from "./doc/IProfInfoErrParms"; -import { ImperativeError, IImperativeError } from "../../error"; +import { ImperativeError, IImperativeError } from "../error"; /** * This class is the error exception mechanism for the ProfileInfo API. diff --git a/packages/imperative/src/config/src/ProfileCredentials.ts b/packages/imperative/src/config/ProfileCredentials.ts similarity index 97% rename from packages/imperative/src/config/src/ProfileCredentials.ts rename to packages/imperative/src/config/ProfileCredentials.ts index 78e5f3e24c..f335fec350 100644 --- a/packages/imperative/src/config/src/ProfileCredentials.ts +++ b/packages/imperative/src/config/ProfileCredentials.ts @@ -12,9 +12,9 @@ import * as fs from "fs"; import * as path from "path"; -import { ImperativeError } from "../../error"; -import { CredentialManagerFactory, DefaultCredentialManager, ICredentialManagerInit } from "../../security"; -import { ImperativeConfig } from "../../utilities"; +import { ImperativeError } from "../error"; +import { CredentialManagerFactory, DefaultCredentialManager, ICredentialManagerInit } from "../security"; +import { ImperativeConfig } from "../utilities/ImperativeConfig"; import { IProfOpts } from "./doc/IProfOpts"; import { ProfileInfo } from "./ProfileInfo"; diff --git a/packages/imperative/src/config/src/ProfileInfo.ts b/packages/imperative/src/config/ProfileInfo.ts similarity index 99% rename from packages/imperative/src/config/src/ProfileInfo.ts rename to packages/imperative/src/config/ProfileInfo.ts index 65d6dadc92..feca8215fb 100644 --- a/packages/imperative/src/config/src/ProfileInfo.ts +++ b/packages/imperative/src/config/ProfileInfo.ts @@ -32,20 +32,21 @@ import { ConfigSchema } from "./ConfigSchema"; import { IConfigOpts } from "./doc/IConfigOpts"; // for old-school profile operations -import { AbstractProfileManager } from "../../profiles/src/abstract/AbstractProfileManager"; -import { CliProfileManager, ICommandProfileProperty, ICommandArguments } from "../../cmd"; -import { IProfileLoaded, IProfileSchema, ProfileIO } from "../../profiles"; +import { AbstractProfileManager } from "../profiles/abstract/AbstractProfileManager"; +import { CliProfileManager, ICommandProfileProperty, ICommandArguments } from "../cmd"; +import { IProfileLoaded, IProfileSchema, ProfileIO } from "../profiles"; // for imperative operations -import { EnvironmentalVariableSettings } from "../../imperative/src/env/EnvironmentalVariableSettings"; -import { LoggingConfigurer } from "../../imperative/src/LoggingConfigurer"; -import { CliUtils, ImperativeConfig } from "../../utilities"; -import { ImperativeExpect } from "../../expect"; -import { Logger, LoggerUtils } from "../../logger"; -import { LoggerManager } from "../../logger/src/LoggerManager"; +import { EnvironmentalVariableSettings } from "../imperative/env/EnvironmentalVariableSettings"; +import { LoggingConfigurer } from "../imperative/LoggingConfigurer"; +import { ImperativeConfig } from "../utilities/ImperativeConfig"; +import { CliUtils } from "../utilities/CliUtils"; +import { ImperativeExpect } from "../expect"; +import { Logger, LoggerUtils } from "../logger"; +import { LoggerManager } from "../logger/LoggerManager"; import { IOptionsForAddConnProps, ISession, Session, SessConstants, ConnectionPropsForSessCfg -} from "../../rest"; +} from "../rest"; import { IProfInfoUpdateKnownPropOpts, IProfInfoUpdatePropOpts } from "./doc/IProfInfoUpdatePropOpts"; import { ConfigAutoStore } from "./ConfigAutoStore"; import { IGetAllProfilesOptions } from "./doc/IProfInfoProps"; diff --git a/packages/imperative/src/config/src/__mocks__/Config.ts b/packages/imperative/src/config/__mocks__/Config.ts similarity index 95% rename from packages/imperative/src/config/src/__mocks__/Config.ts rename to packages/imperative/src/config/__mocks__/Config.ts index 0d3a961ad2..1eca1f612e 100644 --- a/packages/imperative/src/config/src/__mocks__/Config.ts +++ b/packages/imperative/src/config/__mocks__/Config.ts @@ -10,7 +10,7 @@ */ import { IConfigOpts } from "../.."; -import { IConfigLayer } from "../../src/doc/IConfigLayer"; +import { IConfigLayer } from "../doc/IConfigLayer"; export class Config { private mLayers: IConfigLayer[]; diff --git a/packages/imperative/src/config/src/api/ConfigApi.ts b/packages/imperative/src/config/api/ConfigApi.ts similarity index 100% rename from packages/imperative/src/config/src/api/ConfigApi.ts rename to packages/imperative/src/config/api/ConfigApi.ts diff --git a/packages/imperative/src/config/src/api/ConfigLayers.ts b/packages/imperative/src/config/api/ConfigLayers.ts similarity index 99% rename from packages/imperative/src/config/src/api/ConfigLayers.ts rename to packages/imperative/src/config/api/ConfigLayers.ts index 3e90e8337c..3bb73eba99 100644 --- a/packages/imperative/src/config/src/api/ConfigLayers.ts +++ b/packages/imperative/src/config/api/ConfigLayers.ts @@ -13,7 +13,7 @@ import * as fs from "fs"; import * as path from "path"; import * as JSONC from "comment-json"; import * as lodash from "lodash"; -import { ImperativeError } from "../../../error"; +import { ImperativeError } from "../../error"; import { ConfigConstants } from "../ConfigConstants"; import { IConfigLayer } from "../doc/IConfigLayer"; import { ConfigApi } from "./ConfigApi"; diff --git a/packages/imperative/src/config/src/api/ConfigPlugins.ts b/packages/imperative/src/config/api/ConfigPlugins.ts similarity index 100% rename from packages/imperative/src/config/src/api/ConfigPlugins.ts rename to packages/imperative/src/config/api/ConfigPlugins.ts diff --git a/packages/imperative/src/config/src/api/ConfigProfiles.ts b/packages/imperative/src/config/api/ConfigProfiles.ts similarity index 100% rename from packages/imperative/src/config/src/api/ConfigProfiles.ts rename to packages/imperative/src/config/api/ConfigProfiles.ts diff --git a/packages/imperative/src/config/src/api/ConfigSecure.ts b/packages/imperative/src/config/api/ConfigSecure.ts similarity index 99% rename from packages/imperative/src/config/src/api/ConfigSecure.ts rename to packages/imperative/src/config/api/ConfigSecure.ts index 3251e880a9..14d50637c3 100644 --- a/packages/imperative/src/config/src/api/ConfigSecure.ts +++ b/packages/imperative/src/config/api/ConfigSecure.ts @@ -18,7 +18,7 @@ import { IConfigVault } from "../doc/IConfigVault"; import { IConfigSecureProperties } from "../doc/IConfigSecure"; import { ConfigConstants } from "../ConfigConstants"; import { IConfigProfile } from "../doc/IConfigProfile"; -import { CredentialManagerFactory } from "../../../security"; +import { CredentialManagerFactory } from "../../security"; /** * API Class for manipulating config layers. diff --git a/packages/imperative/src/config/src/api/index.ts b/packages/imperative/src/config/api/index.ts similarity index 100% rename from packages/imperative/src/config/src/api/index.ts rename to packages/imperative/src/config/api/index.ts diff --git a/packages/imperative/src/config/src/doc/IConfig.ts b/packages/imperative/src/config/doc/IConfig.ts similarity index 100% rename from packages/imperative/src/config/src/doc/IConfig.ts rename to packages/imperative/src/config/doc/IConfig.ts diff --git a/packages/imperative/src/config/src/doc/IConfigAutoStoreOpts.ts b/packages/imperative/src/config/doc/IConfigAutoStoreOpts.ts similarity index 93% rename from packages/imperative/src/config/src/doc/IConfigAutoStoreOpts.ts rename to packages/imperative/src/config/doc/IConfigAutoStoreOpts.ts index 193632d1eb..91e330d0b3 100644 --- a/packages/imperative/src/config/src/doc/IConfigAutoStoreOpts.ts +++ b/packages/imperative/src/config/doc/IConfigAutoStoreOpts.ts @@ -9,8 +9,8 @@ * */ -import { ICommandArguments } from "../../../cmd/src/doc/args/ICommandArguments"; -import { IHandlerParameters } from "../../../cmd/src/doc/handler/IHandlerParameters"; +import { ICommandArguments } from "../../cmd/doc/args/ICommandArguments"; +import { IHandlerParameters } from "../../cmd/doc/handler/IHandlerParameters"; import { Config } from "../Config"; /** diff --git a/packages/imperative/src/config/src/doc/IConfigBuilderOpts.ts b/packages/imperative/src/config/doc/IConfigBuilderOpts.ts similarity index 94% rename from packages/imperative/src/config/src/doc/IConfigBuilderOpts.ts rename to packages/imperative/src/config/doc/IConfigBuilderOpts.ts index 784947a2be..01e20029d8 100644 --- a/packages/imperative/src/config/src/doc/IConfigBuilderOpts.ts +++ b/packages/imperative/src/config/doc/IConfigBuilderOpts.ts @@ -9,7 +9,7 @@ * */ -import { IProfileProperty } from "../../../profiles"; +import { IProfileProperty } from "../../profiles"; export interface IConfigBuilderOpts { /** diff --git a/packages/imperative/src/config/src/doc/IConfigConvertResult.ts b/packages/imperative/src/config/doc/IConfigConvertResult.ts similarity index 100% rename from packages/imperative/src/config/src/doc/IConfigConvertResult.ts rename to packages/imperative/src/config/doc/IConfigConvertResult.ts diff --git a/packages/imperative/src/config/src/doc/IConfigLayer.ts b/packages/imperative/src/config/doc/IConfigLayer.ts similarity index 100% rename from packages/imperative/src/config/src/doc/IConfigLayer.ts rename to packages/imperative/src/config/doc/IConfigLayer.ts diff --git a/packages/imperative/src/config/src/doc/IConfigMergeOpts.ts b/packages/imperative/src/config/doc/IConfigMergeOpts.ts similarity index 100% rename from packages/imperative/src/config/src/doc/IConfigMergeOpts.ts rename to packages/imperative/src/config/doc/IConfigMergeOpts.ts diff --git a/packages/imperative/src/config/src/doc/IConfigOpts.ts b/packages/imperative/src/config/doc/IConfigOpts.ts similarity index 100% rename from packages/imperative/src/config/src/doc/IConfigOpts.ts rename to packages/imperative/src/config/doc/IConfigOpts.ts diff --git a/packages/imperative/src/config/src/doc/IConfigProfile.ts b/packages/imperative/src/config/doc/IConfigProfile.ts similarity index 100% rename from packages/imperative/src/config/src/doc/IConfigProfile.ts rename to packages/imperative/src/config/doc/IConfigProfile.ts diff --git a/packages/imperative/src/config/src/doc/IConfigSchema.ts b/packages/imperative/src/config/doc/IConfigSchema.ts similarity index 100% rename from packages/imperative/src/config/src/doc/IConfigSchema.ts rename to packages/imperative/src/config/doc/IConfigSchema.ts diff --git a/packages/imperative/src/config/src/doc/IConfigSecure.ts b/packages/imperative/src/config/doc/IConfigSecure.ts similarity index 100% rename from packages/imperative/src/config/src/doc/IConfigSecure.ts rename to packages/imperative/src/config/doc/IConfigSecure.ts diff --git a/packages/imperative/src/config/src/doc/IConfigVault.ts b/packages/imperative/src/config/doc/IConfigVault.ts similarity index 100% rename from packages/imperative/src/config/src/doc/IConfigVault.ts rename to packages/imperative/src/config/doc/IConfigVault.ts diff --git a/packages/imperative/src/config/src/doc/IProfArgAttrs.ts b/packages/imperative/src/config/doc/IProfArgAttrs.ts similarity index 100% rename from packages/imperative/src/config/src/doc/IProfArgAttrs.ts rename to packages/imperative/src/config/doc/IProfArgAttrs.ts diff --git a/packages/imperative/src/config/src/doc/IProfAttrs.ts b/packages/imperative/src/config/doc/IProfAttrs.ts similarity index 100% rename from packages/imperative/src/config/src/doc/IProfAttrs.ts rename to packages/imperative/src/config/doc/IProfAttrs.ts diff --git a/packages/imperative/src/config/src/doc/IProfInfoErrParms.ts b/packages/imperative/src/config/doc/IProfInfoErrParms.ts similarity index 91% rename from packages/imperative/src/config/src/doc/IProfInfoErrParms.ts rename to packages/imperative/src/config/doc/IProfInfoErrParms.ts index 81423e0c24..578559e396 100644 --- a/packages/imperative/src/config/src/doc/IProfInfoErrParms.ts +++ b/packages/imperative/src/config/doc/IProfInfoErrParms.ts @@ -9,7 +9,7 @@ * */ -import { IImperativeErrorParms } from "../../../error/src/doc/IImperativeErrorParms"; +import { IImperativeErrorParms } from "../../error/doc/IImperativeErrorParms"; /** * Options that will affect the behavior of the ProfileInfo class. diff --git a/packages/imperative/src/config/src/doc/IProfInfoProps.ts b/packages/imperative/src/config/doc/IProfInfoProps.ts similarity index 100% rename from packages/imperative/src/config/src/doc/IProfInfoProps.ts rename to packages/imperative/src/config/doc/IProfInfoProps.ts diff --git a/packages/imperative/src/config/src/doc/IProfInfoRemoveKnownPropOpts.ts b/packages/imperative/src/config/doc/IProfInfoRemoveKnownPropOpts.ts similarity index 100% rename from packages/imperative/src/config/src/doc/IProfInfoRemoveKnownPropOpts.ts rename to packages/imperative/src/config/doc/IProfInfoRemoveKnownPropOpts.ts diff --git a/packages/imperative/src/config/src/doc/IProfInfoUpdatePropOpts.ts b/packages/imperative/src/config/doc/IProfInfoUpdatePropOpts.ts similarity index 100% rename from packages/imperative/src/config/src/doc/IProfInfoUpdatePropOpts.ts rename to packages/imperative/src/config/doc/IProfInfoUpdatePropOpts.ts diff --git a/packages/imperative/src/config/src/doc/IProfLoc.ts b/packages/imperative/src/config/doc/IProfLoc.ts similarity index 100% rename from packages/imperative/src/config/src/doc/IProfLoc.ts rename to packages/imperative/src/config/doc/IProfLoc.ts diff --git a/packages/imperative/src/config/src/doc/IProfMergeArgOpts.ts b/packages/imperative/src/config/doc/IProfMergeArgOpts.ts similarity index 100% rename from packages/imperative/src/config/src/doc/IProfMergeArgOpts.ts rename to packages/imperative/src/config/doc/IProfMergeArgOpts.ts diff --git a/packages/imperative/src/config/src/doc/IProfMergedArg.ts b/packages/imperative/src/config/doc/IProfMergedArg.ts similarity index 100% rename from packages/imperative/src/config/src/doc/IProfMergedArg.ts rename to packages/imperative/src/config/doc/IProfMergedArg.ts diff --git a/packages/imperative/src/config/src/doc/IProfOpts.ts b/packages/imperative/src/config/doc/IProfOpts.ts similarity index 94% rename from packages/imperative/src/config/src/doc/IProfOpts.ts rename to packages/imperative/src/config/doc/IProfOpts.ts index ca5b5f14bb..64a41e88be 100644 --- a/packages/imperative/src/config/src/doc/IProfOpts.ts +++ b/packages/imperative/src/config/doc/IProfOpts.ts @@ -9,7 +9,7 @@ * */ -import { ICredentialManagerInit } from "../../../security"; +import { ICredentialManagerInit } from "../../security"; /** * Options that will affect the behavior of the ProfileInfo class. diff --git a/packages/imperative/src/config/index.ts b/packages/imperative/src/config/index.ts index da606bb9d4..e1a83c91f4 100644 --- a/packages/imperative/src/config/index.ts +++ b/packages/imperative/src/config/index.ts @@ -9,32 +9,32 @@ * */ -export * from "./src/Config"; -export * from "./src/ConfigAutoStore"; -export * from "./src/ConfigConstants"; -export * from "./src/ConfigSchema"; -export * from "./src/ConfigBuilder"; -export * as ConfigUtils from "./src/ConfigUtils"; -export * from "./src/ProfileCredentials"; -export * from "./src/ProfileInfo"; -export * from "./src/ProfInfoErr"; -export * from "./src/doc/IConfig"; -export * from "./src/doc/IConfigAutoStoreOpts"; -export * from "./src/doc/IConfigBuilderOpts"; -export * from "./src/doc/IConfigConvertResult"; -export * from "./src/doc/IConfigLayer"; -export * from "./src/doc/IConfigOpts"; -export * from "./src/doc/IConfigProfile"; -export * from "./src/doc/IConfigSchema"; -export * from "./src/doc/IConfigSecure"; -export * from "./src/doc/IConfigVault"; -export * from "./src/doc/IProfArgAttrs"; -export * from "./src/doc/IProfAttrs"; -export * from "./src/doc/IProfInfoUpdatePropOpts"; -export * from "./src/doc/IProfInfoRemoveKnownPropOpts"; -export * from "./src/doc/IProfInfoErrParms"; -export * from "./src/doc/IProfLoc"; -export * from "./src/doc/IProfMergeArgOpts"; -export * from "./src/doc/IProfMergedArg"; -export * from "./src/doc/IProfInfoProps"; -export * from "./src/doc/IProfOpts"; +export * from "./Config"; +export * from "./ConfigAutoStore"; +export * from "./ConfigConstants"; +export * from "./ConfigSchema"; +export * from "./ConfigBuilder"; +export * as ConfigUtils from "./ConfigUtils"; +export * from "./ProfileCredentials"; +export * from "./ProfileInfo"; +export * from "./ProfInfoErr"; +export * from "./doc/IConfig"; +export * from "./doc/IConfigAutoStoreOpts"; +export * from "./doc/IConfigBuilderOpts"; +export * from "./doc/IConfigConvertResult"; +export * from "./doc/IConfigLayer"; +export * from "./doc/IConfigOpts"; +export * from "./doc/IConfigProfile"; +export * from "./doc/IConfigSchema"; +export * from "./doc/IConfigSecure"; +export * from "./doc/IConfigVault"; +export * from "./doc/IProfArgAttrs"; +export * from "./doc/IProfAttrs"; +export * from "./doc/IProfInfoUpdatePropOpts"; +export * from "./doc/IProfInfoRemoveKnownPropOpts"; +export * from "./doc/IProfInfoErrParms"; +export * from "./doc/IProfLoc"; +export * from "./doc/IProfMergeArgOpts"; +export * from "./doc/IProfMergedArg"; +export * from "./doc/IProfInfoProps"; +export * from "./doc/IProfOpts"; diff --git a/packages/imperative/src/console/src/Console.ts b/packages/imperative/src/console/Console.ts similarity index 98% rename from packages/imperative/src/console/src/Console.ts rename to packages/imperative/src/console/Console.ts index 754e9cfe5d..2dbcc41621 100644 --- a/packages/imperative/src/console/src/Console.ts +++ b/packages/imperative/src/console/Console.ts @@ -16,9 +16,9 @@ * This class supports most of the methods / accessors log4js uses. */ import { IConsole } from "./doc/IConsole"; -import { TextUtils } from "../../utilities/src/TextUtils"; +import { TextUtils } from "../utilities/TextUtils"; import { format } from "util"; -import { ImperativeError } from "../../error"; +import { ImperativeError } from "../error"; export class Console implements IConsole { diff --git a/packages/imperative/src/console/src/doc/IConsole.ts b/packages/imperative/src/console/doc/IConsole.ts similarity index 100% rename from packages/imperative/src/console/src/doc/IConsole.ts rename to packages/imperative/src/console/doc/IConsole.ts diff --git a/packages/imperative/src/console/index.ts b/packages/imperative/src/console/index.ts index 04de188651..81b0c0c8a4 100644 --- a/packages/imperative/src/console/index.ts +++ b/packages/imperative/src/console/index.ts @@ -9,5 +9,5 @@ * */ -export * from "./src/doc/IConsole"; -export * from "./src/Console"; +export * from "./doc/IConsole"; +export * from "./Console"; diff --git a/packages/imperative/src/constants/src/Constants.ts b/packages/imperative/src/constants/Constants.ts similarity index 100% rename from packages/imperative/src/constants/src/Constants.ts rename to packages/imperative/src/constants/Constants.ts diff --git a/packages/imperative/src/constants/index.ts b/packages/imperative/src/constants/index.ts index 1b60ae3db8..57e9a43114 100644 --- a/packages/imperative/src/constants/index.ts +++ b/packages/imperative/src/constants/index.ts @@ -9,4 +9,4 @@ * */ -export * from "./src/Constants"; +export * from "./Constants"; diff --git a/packages/imperative/src/error/src/ImperativeError.ts b/packages/imperative/src/error/ImperativeError.ts similarity index 100% rename from packages/imperative/src/error/src/ImperativeError.ts rename to packages/imperative/src/error/ImperativeError.ts diff --git a/packages/imperative/src/error/src/doc/IImperativeError.ts b/packages/imperative/src/error/doc/IImperativeError.ts similarity index 100% rename from packages/imperative/src/error/src/doc/IImperativeError.ts rename to packages/imperative/src/error/doc/IImperativeError.ts diff --git a/packages/imperative/src/error/src/doc/IImperativeErrorParms.ts b/packages/imperative/src/error/doc/IImperativeErrorParms.ts similarity index 96% rename from packages/imperative/src/error/src/doc/IImperativeErrorParms.ts rename to packages/imperative/src/error/doc/IImperativeErrorParms.ts index 50b817efd3..cca8770df5 100644 --- a/packages/imperative/src/error/src/doc/IImperativeErrorParms.ts +++ b/packages/imperative/src/error/doc/IImperativeErrorParms.ts @@ -9,7 +9,7 @@ * */ -import { Logger } from "../../../logger"; +import { Logger } from "../../logger"; /** * Imperative Standard Error - All Imperative services/utils must thrown an Imperative Error (not a generic Error). * The Imperative Error collects additional diagnostics and most (if not all) Imperative Promises diff --git a/packages/imperative/src/error/index.ts b/packages/imperative/src/error/index.ts index 7999ad76fc..aebe9cfef8 100644 --- a/packages/imperative/src/error/index.ts +++ b/packages/imperative/src/error/index.ts @@ -9,5 +9,5 @@ * */ -export * from "./src/doc/IImperativeError"; -export * from "./src/ImperativeError"; +export * from "./doc/IImperativeError"; +export * from "./ImperativeError"; diff --git a/packages/imperative/src/expect/src/ImperativeExpect.ts b/packages/imperative/src/expect/ImperativeExpect.ts similarity index 99% rename from packages/imperative/src/expect/src/ImperativeExpect.ts rename to packages/imperative/src/expect/ImperativeExpect.ts index 4aab004e5b..b2753ad056 100644 --- a/packages/imperative/src/expect/src/ImperativeExpect.ts +++ b/packages/imperative/src/expect/ImperativeExpect.ts @@ -9,7 +9,7 @@ * */ -import { ImperativeError } from "../../error"; +import { ImperativeError } from "../error"; import { inspect, isNullOrUndefined } from "util"; const DataObjectParser = require("dataobject-parser"); diff --git a/packages/imperative/src/expect/index.ts b/packages/imperative/src/expect/index.ts index e02c4e49dc..d80faf5f80 100644 --- a/packages/imperative/src/expect/index.ts +++ b/packages/imperative/src/expect/index.ts @@ -9,4 +9,4 @@ * */ -export * from "./src/ImperativeExpect"; +export * from "./ImperativeExpect"; diff --git a/packages/imperative/src/imperative/src/ConfigurationLoader.ts b/packages/imperative/src/imperative/ConfigurationLoader.ts similarity index 100% rename from packages/imperative/src/imperative/src/ConfigurationLoader.ts rename to packages/imperative/src/imperative/ConfigurationLoader.ts diff --git a/packages/imperative/src/imperative/src/ConfigurationValidator.ts b/packages/imperative/src/imperative/ConfigurationValidator.ts similarity index 100% rename from packages/imperative/src/imperative/src/ConfigurationValidator.ts rename to packages/imperative/src/imperative/ConfigurationValidator.ts diff --git a/packages/imperative/src/imperative/src/DefinitionTreeResolver.ts b/packages/imperative/src/imperative/DefinitionTreeResolver.ts similarity index 100% rename from packages/imperative/src/imperative/src/DefinitionTreeResolver.ts rename to packages/imperative/src/imperative/DefinitionTreeResolver.ts diff --git a/packages/imperative/src/imperative/src/Imperative.ts b/packages/imperative/src/imperative/Imperative.ts similarity index 99% rename from packages/imperative/src/imperative/src/Imperative.ts rename to packages/imperative/src/imperative/Imperative.ts index 2e83949c47..bbf699c93e 100644 --- a/packages/imperative/src/imperative/src/Imperative.ts +++ b/packages/imperative/src/imperative/Imperative.ts @@ -23,7 +23,7 @@ import { ImperativeApi } from "./api/ImperativeApi"; import { IImperativeApi } from "./api/doc/IImperativeApi"; import { Constants } from "../../constants/src/Constants"; import { TextUtils } from "../../utilities/src/TextUtils"; -import { ImperativeConfig } from "../../utilities/src/ImperativeConfig"; +import { ImperativeConfig } from "../../utilities/ImperativeConfig"; import { ImperativeReject } from "../../interfaces/src/types/ImperativeReject"; import { LoggingConfigurer } from "./LoggingConfigurer"; import { ImperativeError } from "../../error"; diff --git a/packages/imperative/src/imperative/src/LoggingConfigurer.ts b/packages/imperative/src/imperative/LoggingConfigurer.ts similarity index 100% rename from packages/imperative/src/imperative/src/LoggingConfigurer.ts rename to packages/imperative/src/imperative/LoggingConfigurer.ts diff --git a/packages/imperative/src/imperative/src/OverridesLoader.ts b/packages/imperative/src/imperative/OverridesLoader.ts similarity index 100% rename from packages/imperative/src/imperative/src/OverridesLoader.ts rename to packages/imperative/src/imperative/OverridesLoader.ts diff --git a/packages/imperative/src/imperative/src/UpdateImpConfig.ts b/packages/imperative/src/imperative/UpdateImpConfig.ts similarity index 100% rename from packages/imperative/src/imperative/src/UpdateImpConfig.ts rename to packages/imperative/src/imperative/UpdateImpConfig.ts diff --git a/packages/imperative/src/imperative/src/__mocks__/Imperative.ts b/packages/imperative/src/imperative/__mocks__/Imperative.ts similarity index 96% rename from packages/imperative/src/imperative/src/__mocks__/Imperative.ts rename to packages/imperative/src/imperative/__mocks__/Imperative.ts index c35c52b03f..d4bdf53ae7 100644 --- a/packages/imperative/src/imperative/src/__mocks__/Imperative.ts +++ b/packages/imperative/src/imperative/__mocks__/Imperative.ts @@ -9,8 +9,8 @@ * */ -import { TextUtils } from "../../../utilities/"; -import { AbstractHelpGenerator, DefaultHelpGenerator, IHelpGeneratorParms, ICommandDefinition } from "../../../cmd"; +import { TextUtils } from "../../../src/utilities/TextUtils"; +import { AbstractHelpGenerator, DefaultHelpGenerator, IHelpGeneratorParms, ICommandDefinition } from "../../../src/cmd"; import { IImperativeConfig } from "../doc/IImperativeConfig"; const PRIMARY_COLOR: string = "yellow"; diff --git a/packages/imperative/src/imperative/src/__mocks__/LoggingConfigurer.ts b/packages/imperative/src/imperative/__mocks__/LoggingConfigurer.ts similarity index 91% rename from packages/imperative/src/imperative/src/__mocks__/LoggingConfigurer.ts rename to packages/imperative/src/imperative/__mocks__/LoggingConfigurer.ts index 8ce0eb927b..9835bf793d 100644 --- a/packages/imperative/src/imperative/src/__mocks__/LoggingConfigurer.ts +++ b/packages/imperative/src/imperative/__mocks__/LoggingConfigurer.ts @@ -9,12 +9,12 @@ * */ -import { IConfigLogging } from "../../../logger"; +import { IConfigLogging } from "../../../src/logger"; const LoggingConfigurer: any = (jest.genMockFromModule("../LoggingConfigurer") as any).LoggingConfigurer; -const {Logger} = (jest as any).requireActual("../../../logger"); +const {Logger} = (jest as any).requireActual("../../../src/logger"); LoggingConfigurer.configureLogger.mockImplementation((): IConfigLogging => { return { diff --git a/packages/imperative/src/imperative/src/api/ImperativeApi.ts b/packages/imperative/src/imperative/api/ImperativeApi.ts similarity index 94% rename from packages/imperative/src/imperative/src/api/ImperativeApi.ts rename to packages/imperative/src/imperative/api/ImperativeApi.ts index 5011223b6c..323c49fa78 100644 --- a/packages/imperative/src/imperative/src/api/ImperativeApi.ts +++ b/packages/imperative/src/imperative/api/ImperativeApi.ts @@ -11,9 +11,9 @@ import { IImperativeConfig } from "../doc/IImperativeConfig"; import { IImperativeApi } from "./doc/IImperativeApi"; -import { Logger } from "../../../logger"; -import { ProfileUtils } from "../../../profiles"; -import { CliProfileManager } from "../../../cmd"; +import { Logger } from "../../../src/logger"; +import { ProfileUtils } from "../../../src/profiles"; +import { CliProfileManager } from "../../../src/cmd"; export class ImperativeApi { /** diff --git a/packages/imperative/src/imperative/src/api/doc/IImperativeApi.ts b/packages/imperative/src/imperative/api/doc/IImperativeApi.ts similarity index 89% rename from packages/imperative/src/imperative/src/api/doc/IImperativeApi.ts rename to packages/imperative/src/imperative/api/doc/IImperativeApi.ts index dd8ea34fdc..968c2a445d 100644 --- a/packages/imperative/src/imperative/src/api/doc/IImperativeApi.ts +++ b/packages/imperative/src/imperative/api/doc/IImperativeApi.ts @@ -9,7 +9,7 @@ * */ -import { Logger } from "../../../../logger"; +import { Logger } from "../../../../src/logger"; export interface IImperativeApi { "imperativeLogger": Logger; diff --git a/packages/imperative/src/imperative/src/auth/__tests__/AuthLoginCommandBuilder.unit.test.ts b/packages/imperative/src/imperative/auth/__tests__/AuthLoginCommandBuilder.unit.test.ts similarity index 89% rename from packages/imperative/src/imperative/src/auth/__tests__/AuthLoginCommandBuilder.unit.test.ts rename to packages/imperative/src/imperative/auth/__tests__/AuthLoginCommandBuilder.unit.test.ts index 1cf32cf590..b9ad25ea1d 100644 --- a/packages/imperative/src/imperative/src/auth/__tests__/AuthLoginCommandBuilder.unit.test.ts +++ b/packages/imperative/src/imperative/auth/__tests__/AuthLoginCommandBuilder.unit.test.ts @@ -10,10 +10,10 @@ */ import { AuthLoginCommandBuilder } from "../builders/AuthLoginCommandBuilder"; -import { Logger } from "../../../../logger"; -import { Constants } from "../../../../constants"; +import { Logger } from "../../../../src/logger"; +import { Constants } from "../../../../src/constants"; import { minimalAuthConfig } from "./__data__/SampleAuthConfig"; -import { ICommandDefinition } from "../../../../cmd"; +import { ICommandDefinition } from "../../../../src/cmd"; describe("AuthLoginCommandBuilder", () => { diff --git a/packages/imperative/src/imperative/src/auth/__tests__/AuthLogoutCommandBuilder.unit.test.ts b/packages/imperative/src/imperative/auth/__tests__/AuthLogoutCommandBuilder.unit.test.ts similarity index 89% rename from packages/imperative/src/imperative/src/auth/__tests__/AuthLogoutCommandBuilder.unit.test.ts rename to packages/imperative/src/imperative/auth/__tests__/AuthLogoutCommandBuilder.unit.test.ts index c6921116ba..05307ae12b 100644 --- a/packages/imperative/src/imperative/src/auth/__tests__/AuthLogoutCommandBuilder.unit.test.ts +++ b/packages/imperative/src/imperative/auth/__tests__/AuthLogoutCommandBuilder.unit.test.ts @@ -10,10 +10,10 @@ */ import { AuthLogoutCommandBuilder } from "../builders/AuthLogoutCommandBuilder"; -import { Logger } from "../../../../logger"; -import { Constants } from "../../../../constants"; +import { Logger } from "../../../../src/logger"; +import { Constants } from "../../../../src/constants"; import { minimalAuthConfig } from "./__data__/SampleAuthConfig"; -import { ICommandDefinition } from "../../../../cmd"; +import { ICommandDefinition } from "../../../../src/cmd"; describe("AuthLogoutCommandBuilder", () => { it("should build command successfully if valid auth config supplied", () => { diff --git a/packages/imperative/src/imperative/src/auth/__tests__/BaseAuthHandler.config.unit.test.ts b/packages/imperative/src/imperative/auth/__tests__/BaseAuthHandler.config.unit.test.ts similarity index 98% rename from packages/imperative/src/imperative/src/auth/__tests__/BaseAuthHandler.config.unit.test.ts rename to packages/imperative/src/imperative/auth/__tests__/BaseAuthHandler.config.unit.test.ts index e4ebcf3690..ed1ff613a4 100644 --- a/packages/imperative/src/imperative/src/auth/__tests__/BaseAuthHandler.config.unit.test.ts +++ b/packages/imperative/src/imperative/auth/__tests__/BaseAuthHandler.config.unit.test.ts @@ -9,17 +9,17 @@ * */ -jest.mock("../../../../logger/src/LoggerUtils"); +jest.mock("../../../../src/logger/LoggerUtils"); import * as fs from "fs"; import * as path from "path"; import * as lodash from "lodash"; -import { IHandlerParameters } from "../../../../cmd"; -import { SessConstants } from "../../../../rest"; -import { ImperativeConfig } from "../../../../utilities"; -import { Config } from "../../../../config"; -import { IConfigSecure } from "../../../../config/src/doc/IConfigSecure"; +import { IHandlerParameters } from "../../../../src/cmd"; +import { SessConstants } from "../../../../src/rest"; +import { ImperativeConfig } from "../../../../src/utilities/ImperativeConfig"; +import { Config } from "../../../../src/config"; +import { IConfigSecure } from "../../../../src/config/doc/IConfigSecure"; import FakeAuthHandler from "./__data__/FakeAuthHandler"; -import { CredentialManagerFactory } from "../../../../security"; +import { CredentialManagerFactory } from "../../../../src/security"; import { ImperativeError } from "../../../.."; const MY_APP = "my_app"; diff --git a/packages/imperative/src/imperative/src/auth/__tests__/BaseAuthHandler.unit.test.ts b/packages/imperative/src/imperative/auth/__tests__/BaseAuthHandler.unit.test.ts similarity index 98% rename from packages/imperative/src/imperative/src/auth/__tests__/BaseAuthHandler.unit.test.ts rename to packages/imperative/src/imperative/auth/__tests__/BaseAuthHandler.unit.test.ts index e05e1e899f..7c119ef033 100644 --- a/packages/imperative/src/imperative/src/auth/__tests__/BaseAuthHandler.unit.test.ts +++ b/packages/imperative/src/imperative/auth/__tests__/BaseAuthHandler.unit.test.ts @@ -9,9 +9,9 @@ * */ -import { IHandlerParameters } from "../../../../cmd"; +import { IHandlerParameters } from "../../../../src/cmd"; import { Imperative } from "../../Imperative"; -import { ImperativeConfig } from "../../../.."; +import { ImperativeConfig } from "../../../../src/utilities/ImperativeConfig"; import FakeAuthHandler from "./__data__/FakeAuthHandler"; describe("BaseAuthHandler", () => { diff --git a/packages/imperative/src/imperative/src/auth/__tests__/CompleteAuthGroupBuilder.unit.test.ts b/packages/imperative/src/imperative/auth/__tests__/CompleteAuthGroupBuilder.unit.test.ts similarity index 90% rename from packages/imperative/src/imperative/src/auth/__tests__/CompleteAuthGroupBuilder.unit.test.ts rename to packages/imperative/src/imperative/auth/__tests__/CompleteAuthGroupBuilder.unit.test.ts index 47defee1ab..1a3ae28350 100644 --- a/packages/imperative/src/imperative/src/auth/__tests__/CompleteAuthGroupBuilder.unit.test.ts +++ b/packages/imperative/src/imperative/auth/__tests__/CompleteAuthGroupBuilder.unit.test.ts @@ -10,9 +10,9 @@ */ import { CompleteAuthGroupBuilder } from "../builders/CompleteAuthGroupBuilder"; -import { Logger } from "../../../../logger"; -import { ICommandProfileAuthConfig } from "../../../../cmd/src/doc/profiles/definition/ICommandProfileAuthConfig"; -import { ICommandDefinition } from "../../../../cmd"; +import { Logger } from "../../../../src/logger"; +import { ICommandProfileAuthConfig } from "../../../../src/cmd/doc/profiles/definition/ICommandProfileAuthConfig"; +import { ICommandDefinition } from "../../../../src/cmd"; import { fakeAuthConfig } from "./__data__/SampleAuthConfig"; import { IImperativeAuthGroupConfig } from "../../doc/IImperativeAuthGroupConfig"; diff --git a/packages/imperative/src/imperative/src/auth/__tests__/__data__/FakeAuthHandler.ts b/packages/imperative/src/imperative/auth/__tests__/__data__/FakeAuthHandler.ts similarity index 100% rename from packages/imperative/src/imperative/src/auth/__tests__/__data__/FakeAuthHandler.ts rename to packages/imperative/src/imperative/auth/__tests__/__data__/FakeAuthHandler.ts diff --git a/packages/imperative/src/imperative/src/auth/__tests__/__data__/SampleAuthConfig.ts b/packages/imperative/src/imperative/auth/__tests__/__data__/SampleAuthConfig.ts similarity index 100% rename from packages/imperative/src/imperative/src/auth/__tests__/__data__/SampleAuthConfig.ts rename to packages/imperative/src/imperative/auth/__tests__/__data__/SampleAuthConfig.ts diff --git a/packages/imperative/src/imperative/src/auth/__tests__/__resources__/auth.config.json b/packages/imperative/src/imperative/auth/__tests__/__resources__/auth.config.json similarity index 100% rename from packages/imperative/src/imperative/src/auth/__tests__/__resources__/auth.config.json rename to packages/imperative/src/imperative/auth/__tests__/__resources__/auth.config.json diff --git a/packages/imperative/src/imperative/src/auth/__tests__/__resources__/no_auth.config.json b/packages/imperative/src/imperative/auth/__tests__/__resources__/no_auth.config.json similarity index 100% rename from packages/imperative/src/imperative/src/auth/__tests__/__resources__/no_auth.config.json rename to packages/imperative/src/imperative/auth/__tests__/__resources__/no_auth.config.json diff --git a/packages/imperative/src/imperative/src/auth/__tests__/__snapshots__/CompleteAuthGroupBuilder.unit.test.ts.snap b/packages/imperative/src/imperative/auth/__tests__/__snapshots__/CompleteAuthGroupBuilder.unit.test.ts.snap similarity index 100% rename from packages/imperative/src/imperative/src/auth/__tests__/__snapshots__/CompleteAuthGroupBuilder.unit.test.ts.snap rename to packages/imperative/src/imperative/auth/__tests__/__snapshots__/CompleteAuthGroupBuilder.unit.test.ts.snap diff --git a/packages/imperative/src/imperative/src/auth/builders/AuthCommandBuilder.ts b/packages/imperative/src/imperative/auth/builders/AuthCommandBuilder.ts similarity index 88% rename from packages/imperative/src/imperative/src/auth/builders/AuthCommandBuilder.ts rename to packages/imperative/src/imperative/auth/builders/AuthCommandBuilder.ts index 8897d86214..3a9676cf4c 100644 --- a/packages/imperative/src/imperative/src/auth/builders/AuthCommandBuilder.ts +++ b/packages/imperative/src/imperative/auth/builders/AuthCommandBuilder.ts @@ -9,11 +9,11 @@ * */ -import { AbstractCommandBuilder } from "../../../../cmd/src/builders/AbstractCommandBuilder"; -import { ICommandDefinition } from "../../../../cmd"; -import { Logger } from "../../../../logger"; -import { ICommandProfileAuthConfig } from "../../../../cmd/src/doc/profiles/definition/ICommandProfileAuthConfig"; -import { ImperativeError } from "../../../../error"; +import { AbstractCommandBuilder } from "../../../../src/cmd/builders/AbstractCommandBuilder"; +import { ICommandDefinition } from "../../../../src/cmd"; +import { Logger } from "../../../../src/logger"; +import { ICommandProfileAuthConfig } from "../../../../src/cmd/doc/profiles/definition/ICommandProfileAuthConfig"; +import { ImperativeError } from "../../../../src/error"; /** * Abstract class for generating auth-related commands diff --git a/packages/imperative/src/imperative/src/auth/builders/AuthLoginCommandBuilder.ts b/packages/imperative/src/imperative/auth/builders/AuthLoginCommandBuilder.ts similarity index 92% rename from packages/imperative/src/imperative/src/auth/builders/AuthLoginCommandBuilder.ts rename to packages/imperative/src/imperative/auth/builders/AuthLoginCommandBuilder.ts index 169722f28f..53f6ebfbf1 100644 --- a/packages/imperative/src/imperative/src/auth/builders/AuthLoginCommandBuilder.ts +++ b/packages/imperative/src/imperative/auth/builders/AuthLoginCommandBuilder.ts @@ -10,10 +10,10 @@ */ import { AuthCommandBuilder } from "./AuthCommandBuilder"; -import { ICommandDefinition } from "../../../../cmd"; -import { authLoginCommandDesc, authLoginShowTokenDesc } from "../../../../messages"; -import { Constants } from "../../../../constants"; -import { TextUtils } from "../../../../utilities"; +import { ICommandDefinition } from "../../../../src/cmd"; +import { authLoginCommandDesc, authLoginShowTokenDesc } from "../../../../src/messages"; +import { Constants } from "../../../../src/constants"; +import { TextUtils } from "../../../../src/utilities/TextUtils"; /** * Used to build auth login command definitions. diff --git a/packages/imperative/src/imperative/src/auth/builders/AuthLogoutCommandBuilder.ts b/packages/imperative/src/imperative/auth/builders/AuthLogoutCommandBuilder.ts similarity index 89% rename from packages/imperative/src/imperative/src/auth/builders/AuthLogoutCommandBuilder.ts rename to packages/imperative/src/imperative/auth/builders/AuthLogoutCommandBuilder.ts index 9292085126..d459c5a7d7 100644 --- a/packages/imperative/src/imperative/src/auth/builders/AuthLogoutCommandBuilder.ts +++ b/packages/imperative/src/imperative/auth/builders/AuthLogoutCommandBuilder.ts @@ -10,10 +10,10 @@ */ import { AuthCommandBuilder } from "./AuthCommandBuilder"; -import { ICommandDefinition } from "../../../../cmd"; -import { authLogoutCommandDesc } from "../../../../messages"; -import { Constants } from "../../../../constants"; -import { TextUtils } from "../../../../utilities"; +import { ICommandDefinition } from "../../../../src/cmd"; +import { authLogoutCommandDesc } from "../../../../src/messages"; +import { Constants } from "../../../../src/constants"; +import { TextUtils } from "../../../../src/utilities/TextUtils"; /** * Used to build auth logout command definitions. diff --git a/packages/imperative/src/imperative/src/auth/builders/CompleteAuthGroupBuilder.ts b/packages/imperative/src/imperative/auth/builders/CompleteAuthGroupBuilder.ts similarity index 92% rename from packages/imperative/src/imperative/src/auth/builders/CompleteAuthGroupBuilder.ts rename to packages/imperative/src/imperative/auth/builders/CompleteAuthGroupBuilder.ts index ddc1fe40e8..a26fd41afc 100644 --- a/packages/imperative/src/imperative/src/auth/builders/CompleteAuthGroupBuilder.ts +++ b/packages/imperative/src/imperative/auth/builders/CompleteAuthGroupBuilder.ts @@ -9,17 +9,17 @@ * */ -import { ICommandDefinition } from "../../../../cmd"; +import { ICommandDefinition } from "../../../../src/cmd"; import { authCategoryDesc, authCategorySummary, authLoginGroupDesc, authLoginGroupSummary, authLogoutGroupDesc, authLogoutGroupSummary -} from "../../../../messages"; -import { Constants } from "../../../../constants"; +} from "../../../../src/messages"; +import { Constants } from "../../../../src/constants"; import { AuthLoginCommandBuilder } from "./AuthLoginCommandBuilder"; import { AuthLogoutCommandBuilder } from "./AuthLogoutCommandBuilder"; -import { Logger } from "../../../../logger/index"; -import { ICommandProfileAuthConfig } from "../../../../cmd/src/doc/profiles/definition/ICommandProfileAuthConfig"; +import { Logger } from "../../../../src/logger/index"; +import { ICommandProfileAuthConfig } from "../../../../src/cmd/doc/profiles/definition/ICommandProfileAuthConfig"; import { IImperativeAuthGroupConfig } from "../../doc/IImperativeAuthGroupConfig"; /** diff --git a/packages/imperative/src/imperative/src/auth/doc/IAuthHandlerApi.ts b/packages/imperative/src/imperative/auth/doc/IAuthHandlerApi.ts similarity index 94% rename from packages/imperative/src/imperative/src/auth/doc/IAuthHandlerApi.ts rename to packages/imperative/src/imperative/auth/doc/IAuthHandlerApi.ts index 5920f53189..298d999fe0 100644 --- a/packages/imperative/src/imperative/src/auth/doc/IAuthHandlerApi.ts +++ b/packages/imperative/src/imperative/auth/doc/IAuthHandlerApi.ts @@ -9,8 +9,8 @@ * */ -import { ICommandArguments } from "../../../../cmd"; -import { AbstractSession, IOptionsForAddConnProps, ISession } from "../../../../rest"; +import { ICommandArguments } from "../../../../src/cmd"; +import { AbstractSession, IOptionsForAddConnProps, ISession } from "../../../../src/rest"; /** * Auth handler API that provides convenient functions to create a session from diff --git a/packages/imperative/src/imperative/src/auth/handlers/AbstractAuthHandler.ts b/packages/imperative/src/imperative/auth/handlers/AbstractAuthHandler.ts similarity index 94% rename from packages/imperative/src/imperative/src/auth/handlers/AbstractAuthHandler.ts rename to packages/imperative/src/imperative/auth/handlers/AbstractAuthHandler.ts index 5aceeff341..b6978636a9 100644 --- a/packages/imperative/src/imperative/src/auth/handlers/AbstractAuthHandler.ts +++ b/packages/imperative/src/imperative/auth/handlers/AbstractAuthHandler.ts @@ -9,10 +9,10 @@ * */ -import { ICommandHandler, IHandlerParameters, ICommandArguments } from "../../../../cmd"; -import { Constants } from "../../../../constants"; -import { ISession, SessConstants } from "../../../../rest"; -import { ImperativeError } from "../../../../error"; +import { ICommandHandler, IHandlerParameters, ICommandArguments } from "../../../../src/cmd"; +import { Constants } from "../../../../src/constants"; +import { ISession, SessConstants } from "../../../../src/rest"; +import { ImperativeError } from "../../../../src/error"; import { IAuthHandlerApi } from "../doc/IAuthHandlerApi"; /** diff --git a/packages/imperative/src/imperative/src/auth/handlers/BaseAuthHandler.ts b/packages/imperative/src/imperative/auth/handlers/BaseAuthHandler.ts similarity index 98% rename from packages/imperative/src/imperative/src/auth/handlers/BaseAuthHandler.ts rename to packages/imperative/src/imperative/auth/handlers/BaseAuthHandler.ts index 6a99f418bb..ffc992e62e 100644 --- a/packages/imperative/src/imperative/src/auth/handlers/BaseAuthHandler.ts +++ b/packages/imperative/src/imperative/auth/handlers/BaseAuthHandler.ts @@ -9,7 +9,7 @@ * */ -import { IHandlerParameters, IHandlerResponseApi } from "../../../../cmd"; +import { IHandlerParameters, IHandlerResponseApi } from "../../../../src/cmd"; import { AbstractSession, ConnectionPropsForSessCfg, @@ -17,12 +17,12 @@ import { RestConstants, SessConstants, Session -} from "../../../../rest"; +} from "../../../../src/rest"; import { Imperative } from "../../Imperative"; -import { IImperativeError, ImperativeError } from "../../../../error"; -import { ISaveProfileFromCliArgs } from "../../../../profiles"; -import { ImperativeConfig } from "../../../../utilities"; -import { getActiveProfileName, secureSaveError } from "../../../../config/src/ConfigUtils"; +import { IImperativeError, ImperativeError } from "../../../../src/error"; +import { ISaveProfileFromCliArgs } from "../../../../src/profiles"; +import { ImperativeConfig } from "../../../../src/utilities"; +import { getActiveProfileName, secureSaveError } from "../../../../src/config/src/ConfigUtils"; import { AbstractAuthHandler } from "./AbstractAuthHandler"; import { IAuthHandlerApi } from "../doc/IAuthHandlerApi"; diff --git a/packages/imperative/src/imperative/src/config/ConfigManagementFacility.ts b/packages/imperative/src/imperative/config/ConfigManagementFacility.ts similarity index 98% rename from packages/imperative/src/imperative/src/config/ConfigManagementFacility.ts rename to packages/imperative/src/imperative/config/ConfigManagementFacility.ts index 22dd7ff124..0105a9713e 100644 --- a/packages/imperative/src/imperative/src/config/ConfigManagementFacility.ts +++ b/packages/imperative/src/imperative/config/ConfigManagementFacility.ts @@ -10,7 +10,7 @@ */ import { UpdateImpConfig } from "../UpdateImpConfig"; -import { Logger } from "../../../logger"; +import { Logger } from "../../../src/logger"; import { listDefinition } from "./cmd/list/list.definition"; import { initDefinition } from "./cmd/init/init.definition"; import { schemaDefinition } from "./cmd/schema/schema.definition"; diff --git a/packages/imperative/src/imperative/src/config/__mocks__/ConfigManagementFacility.ts b/packages/imperative/src/imperative/config/__mocks__/ConfigManagementFacility.ts similarity index 100% rename from packages/imperative/src/imperative/src/config/__mocks__/ConfigManagementFacility.ts rename to packages/imperative/src/imperative/config/__mocks__/ConfigManagementFacility.ts diff --git a/packages/imperative/src/imperative/src/config/cmd/auto-init/AutoInitConstants.ts b/packages/imperative/src/imperative/config/cmd/auto-init/AutoInitConstants.ts similarity index 98% rename from packages/imperative/src/imperative/src/config/cmd/auto-init/AutoInitConstants.ts rename to packages/imperative/src/imperative/config/cmd/auto-init/AutoInitConstants.ts index e5dbfd1e81..81b580613d 100644 --- a/packages/imperative/src/imperative/src/config/cmd/auto-init/AutoInitConstants.ts +++ b/packages/imperative/src/imperative/config/cmd/auto-init/AutoInitConstants.ts @@ -9,7 +9,7 @@ * */ -import { ICommandOptionDefinition } from "../../../../../cmd"; +import { ICommandOptionDefinition } from "../../../../../src/cmd"; export class AutoInitConstants { public static AUTO_INIT_OPTION_GROUP = "Automatic Config Initialization Options"; diff --git a/packages/imperative/src/imperative/src/config/cmd/auto-init/builders/AutoInitCommandBuilder.ts b/packages/imperative/src/imperative/config/cmd/auto-init/builders/AutoInitCommandBuilder.ts similarity index 87% rename from packages/imperative/src/imperative/src/config/cmd/auto-init/builders/AutoInitCommandBuilder.ts rename to packages/imperative/src/imperative/config/cmd/auto-init/builders/AutoInitCommandBuilder.ts index 32c290f339..a29d127df8 100644 --- a/packages/imperative/src/imperative/src/config/cmd/auto-init/builders/AutoInitCommandBuilder.ts +++ b/packages/imperative/src/imperative/config/cmd/auto-init/builders/AutoInitCommandBuilder.ts @@ -9,14 +9,14 @@ * */ -import { AbstractCommandBuilder } from "../../../../../../cmd/src/builders/AbstractCommandBuilder"; -import { ICommandDefinition } from "../../../../../../cmd"; -import { Logger } from "../../../../../../logger"; -import { ICommandProfileAutoInitConfig } from "../../../../../../cmd/src/doc/profiles/definition/ICommandProfileAutoInitConfig"; -import { ImperativeError } from "../../../../../../error"; -import { TextUtils } from "../../../../../../utilities"; -import { autoInitCommandDesc, autoInitCommandSummary } from "../../../../../../messages"; -import { Constants } from "../../../../../../constants"; +import { AbstractCommandBuilder } from "../../../../../../src/cmd/builders/AbstractCommandBuilder"; +import { ICommandDefinition } from "../../../../../../src/cmd"; +import { Logger } from "../../../../../../src/logger"; +import { ICommandProfileAutoInitConfig } from "../../../../../../src/cmd/doc/profiles/definition/ICommandProfileAutoInitConfig"; +import { ImperativeError } from "../../../../../../src/error"; +import { TextUtils } from "../../../../../../src/utilities/TextUtils"; +import { autoInitCommandDesc, autoInitCommandSummary } from "../../../../../../src/messages"; +import { Constants } from "../../../../../../src/constants"; import { AutoInitConstants } from "../AutoInitConstants"; /** diff --git a/packages/imperative/src/imperative/src/config/cmd/auto-init/builders/CompleteAutoInitCommandBuilder.ts b/packages/imperative/src/imperative/config/cmd/auto-init/builders/CompleteAutoInitCommandBuilder.ts similarity index 86% rename from packages/imperative/src/imperative/src/config/cmd/auto-init/builders/CompleteAutoInitCommandBuilder.ts rename to packages/imperative/src/imperative/config/cmd/auto-init/builders/CompleteAutoInitCommandBuilder.ts index 50587b2904..754ecca5aa 100644 --- a/packages/imperative/src/imperative/src/config/cmd/auto-init/builders/CompleteAutoInitCommandBuilder.ts +++ b/packages/imperative/src/imperative/config/cmd/auto-init/builders/CompleteAutoInitCommandBuilder.ts @@ -9,10 +9,10 @@ * */ -import { ICommandDefinition } from "../../../../../../cmd"; +import { ICommandDefinition } from "../../../../../../src/cmd"; import { AutoInitCommandBuilder } from "./AutoInitCommandBuilder"; -import { Logger } from "../../../../../../logger/index"; -import { ICommandProfileAutoInitConfig } from "../../../../../../cmd/src/doc/profiles/definition/ICommandProfileAutoInitConfig"; +import { Logger } from "../../../../../../src/logger/index"; +import { ICommandProfileAutoInitConfig } from "../../../../../../src/cmd/doc/profiles/definition/ICommandProfileAutoInitConfig"; /** * Generate a complete command for automatic initialization of a user configuration diff --git a/packages/imperative/src/imperative/src/config/cmd/auto-init/handlers/BaseAutoInitHandler.ts b/packages/imperative/src/imperative/config/cmd/auto-init/handlers/BaseAutoInitHandler.ts similarity index 95% rename from packages/imperative/src/imperative/src/config/cmd/auto-init/handlers/BaseAutoInitHandler.ts rename to packages/imperative/src/imperative/config/cmd/auto-init/handlers/BaseAutoInitHandler.ts index 193ae1a1d0..cccc1c2858 100644 --- a/packages/imperative/src/imperative/src/config/cmd/auto-init/handlers/BaseAutoInitHandler.ts +++ b/packages/imperative/src/imperative/config/cmd/auto-init/handlers/BaseAutoInitHandler.ts @@ -9,13 +9,15 @@ * */ -import { ICommandHandler, IHandlerParameters, ICommandArguments, IHandlerResponseApi } from "../../../../../../cmd"; -import { ISession, ConnectionPropsForSessCfg, Session, AbstractSession } from "../../../../../../rest"; -import { ConfigConstants, ConfigSchema, IConfig } from "../../../../../../config"; +import { ICommandHandler, IHandlerParameters, ICommandArguments, IHandlerResponseApi } from "../../../../../../src/cmd"; +import { ISession, ConnectionPropsForSessCfg, Session, AbstractSession } from "../../../../../../src/rest"; +import { ConfigConstants, ConfigSchema, IConfig } from "../../../../../../src/config"; import { diff } from "jest-diff"; import * as JSONC from "comment-json"; import * as lodash from "lodash"; -import { ImperativeConfig, ProcessUtils, TextUtils } from "../../../../../../utilities"; +import { ImperativeConfig } from "../../../../../../src/utilities/ImperativeConfig"; +import { ProcessUtils } from "../../../../../../src/utilities/ProcessUtils"; +import { TextUtils } from "../../../../../../src/utilities/TextUtils"; import { OverridesLoader } from "../../../../OverridesLoader"; import stripAnsi = require("strip-ansi"); diff --git a/packages/imperative/src/imperative/src/config/cmd/convert-profiles/convert-profiles.definition.ts b/packages/imperative/src/imperative/config/cmd/convert-profiles/convert-profiles.definition.ts similarity index 91% rename from packages/imperative/src/imperative/src/config/cmd/convert-profiles/convert-profiles.definition.ts rename to packages/imperative/src/imperative/config/cmd/convert-profiles/convert-profiles.definition.ts index 7b54f3294b..71222d9918 100644 --- a/packages/imperative/src/imperative/src/config/cmd/convert-profiles/convert-profiles.definition.ts +++ b/packages/imperative/src/imperative/config/cmd/convert-profiles/convert-profiles.definition.ts @@ -10,8 +10,8 @@ */ import { join } from "path"; -import { ICommandDefinition } from "../../../../../cmd"; -import { ImperativeConfig } from "../../../../../utilities"; +import { ICommandDefinition } from "../../../../../src/cmd"; +import { ImperativeConfig } from "../../../../../src/utilities"; /** * Definition of the convert-profiles command. diff --git a/packages/imperative/src/imperative/src/config/cmd/convert-profiles/convert-profiles.handler.ts b/packages/imperative/src/imperative/config/cmd/convert-profiles/convert-profiles.handler.ts similarity index 97% rename from packages/imperative/src/imperative/src/config/cmd/convert-profiles/convert-profiles.handler.ts rename to packages/imperative/src/imperative/config/cmd/convert-profiles/convert-profiles.handler.ts index 43c7113c2c..7ea5aa8a72 100644 --- a/packages/imperative/src/imperative/src/config/cmd/convert-profiles/convert-profiles.handler.ts +++ b/packages/imperative/src/imperative/config/cmd/convert-profiles/convert-profiles.handler.ts @@ -13,11 +13,11 @@ import * as fs from "fs"; import { removeSync } from "fs-extra"; import * as path from "path"; import { keyring as keytar } from "@zowe/secrets-for-zowe-sdk"; -import { ICommandHandler, IHandlerParameters } from "../../../../../cmd"; -import { ConfigBuilder, ConfigSchema } from "../../../../../config"; -import { ProfileIO, ProfileUtils } from "../../../../../profiles"; -import { ImperativeConfig } from "../../../../../utilities"; -import { AppSettings } from "../../../../../settings"; +import { ICommandHandler, IHandlerParameters } from "../../../../../src/cmd"; +import { ConfigBuilder, ConfigSchema } from "../../../../../src/config"; +import { ProfileIO, ProfileUtils } from "../../../../../src/profiles"; +import { ImperativeConfig } from "../../../../../src/utilities/ImperativeConfig"; +import { AppSettings } from "../../../../../src/settings"; import { PluginIssues } from "../../../plugins/utilities/PluginIssues"; import { uninstall as uninstallPlugin } from "../../../plugins/utilities/npm-interface"; import { OverridesLoader } from "../../../OverridesLoader"; diff --git a/packages/imperative/src/imperative/src/config/cmd/edit/edit.definition.ts b/packages/imperative/src/imperative/config/cmd/edit/edit.definition.ts similarity index 96% rename from packages/imperative/src/imperative/src/config/cmd/edit/edit.definition.ts rename to packages/imperative/src/imperative/config/cmd/edit/edit.definition.ts index 56c82804f4..f208401e8b 100644 --- a/packages/imperative/src/imperative/src/config/cmd/edit/edit.definition.ts +++ b/packages/imperative/src/imperative/config/cmd/edit/edit.definition.ts @@ -9,7 +9,7 @@ * */ -import { ICommandDefinition } from "../../../../../cmd"; +import { ICommandDefinition } from "../../../../../src/cmd"; import { join } from "path"; /** diff --git a/packages/imperative/src/imperative/src/config/cmd/edit/edit.handler.ts b/packages/imperative/src/imperative/config/cmd/edit/edit.handler.ts similarity index 89% rename from packages/imperative/src/imperative/src/config/cmd/edit/edit.handler.ts rename to packages/imperative/src/imperative/config/cmd/edit/edit.handler.ts index ec7ed8e733..36767e94ab 100644 --- a/packages/imperative/src/imperative/src/config/cmd/edit/edit.handler.ts +++ b/packages/imperative/src/imperative/config/cmd/edit/edit.handler.ts @@ -9,8 +9,9 @@ * */ -import { ICommandHandler, IHandlerParameters } from "../../../../../cmd"; -import { ImperativeConfig, ProcessUtils } from "../../../../../utilities"; +import { ICommandHandler, IHandlerParameters } from "../../../../../src/cmd"; +import { ProcessUtils } from "../../../../../src/utilities/ProcessUtils"; +import { ImperativeConfig } from "../../../../../src/utilities/ImperativeConfig"; /** * Edit config diff --git a/packages/imperative/src/imperative/src/config/cmd/import/import.definition.ts b/packages/imperative/src/imperative/config/cmd/import/import.definition.ts similarity index 97% rename from packages/imperative/src/imperative/src/config/cmd/import/import.definition.ts rename to packages/imperative/src/imperative/config/cmd/import/import.definition.ts index 473021c773..e71787b054 100644 --- a/packages/imperative/src/imperative/src/config/cmd/import/import.definition.ts +++ b/packages/imperative/src/imperative/config/cmd/import/import.definition.ts @@ -10,7 +10,7 @@ */ import { join } from "path"; -import { ICommandDefinition } from "../../../../../cmd"; +import { ICommandDefinition } from "../../../../../src/cmd"; const CONNECTION_OPTION_GROUP = "Connection Options"; diff --git a/packages/imperative/src/imperative/src/config/cmd/import/import.handler.ts b/packages/imperative/src/imperative/config/cmd/import/import.handler.ts similarity index 94% rename from packages/imperative/src/imperative/src/config/cmd/import/import.handler.ts rename to packages/imperative/src/imperative/config/cmd/import/import.handler.ts index 5d9d4791e6..c5ac2c71ff 100644 --- a/packages/imperative/src/imperative/src/config/cmd/import/import.handler.ts +++ b/packages/imperative/src/imperative/config/cmd/import/import.handler.ts @@ -13,11 +13,12 @@ import * as fs from "fs"; import * as path from "path"; import { fileURLToPath, pathToFileURL, URL } from "url"; import * as JSONC from "comment-json"; -import { ICommandHandler, IHandlerParameters } from "../../../../../cmd"; -import { ImperativeError } from "../../../../../error"; -import { ImperativeConfig, TextUtils } from "../../../../../utilities"; -import { IConfig } from "../../../../../config"; -import { RestClient, Session, SessConstants } from "../../../../../rest"; +import { ICommandHandler, IHandlerParameters } from "../../../../../src/cmd"; +import { ImperativeError } from "../../../../../src/error"; +import { ImperativeConfig } from "../../../../../src/utilities/ImperativeConfig"; +import { TextUtils } from "../../../../../src/utilities/TextUtils"; +import { IConfig } from "../../../../../src/config"; +import { RestClient, Session, SessConstants } from "../../../../../src/rest"; /** * Import config diff --git a/packages/imperative/src/imperative/src/config/cmd/init/init.definition.ts b/packages/imperative/src/imperative/config/cmd/init/init.definition.ts similarity index 96% rename from packages/imperative/src/imperative/src/config/cmd/init/init.definition.ts rename to packages/imperative/src/imperative/config/cmd/init/init.definition.ts index 0b0e0c0239..4ccafab58e 100644 --- a/packages/imperative/src/imperative/src/config/cmd/init/init.definition.ts +++ b/packages/imperative/src/imperative/config/cmd/init/init.definition.ts @@ -9,9 +9,9 @@ * */ -import { ICommandDefinition } from "../../../../../cmd"; +import { ICommandDefinition } from "../../../../../src/cmd"; import { join } from "path"; -import { ImperativeConfig } from "../../../../../utilities"; +import { ImperativeConfig } from "../../../../../src/utilities/ImperativeConfig"; /** * Definition of the init command. diff --git a/packages/imperative/src/imperative/src/config/cmd/init/init.handler.ts b/packages/imperative/src/imperative/config/cmd/init/init.handler.ts similarity index 93% rename from packages/imperative/src/imperative/src/config/cmd/init/init.handler.ts rename to packages/imperative/src/imperative/config/cmd/init/init.handler.ts index 66e876b65f..64ef1cb93e 100644 --- a/packages/imperative/src/imperative/src/config/cmd/init/init.handler.ts +++ b/packages/imperative/src/imperative/config/cmd/init/init.handler.ts @@ -9,19 +9,23 @@ * */ -import { ICommandHandler, IHandlerParameters } from "../../../../../cmd"; -import { ImperativeConfig, ProcessUtils, TextUtils } from "../../../../../utilities"; -import { Config, ConfigConstants, ConfigSchema, IConfig } from "../../../../../config"; -import { IProfileProperty } from "../../../../../profiles"; -import { ConfigBuilder } from "../../../../../config/src/ConfigBuilder"; -import { IConfigBuilderOpts } from "../../../../../config/src/doc/IConfigBuilderOpts"; -import { coercePropValue, secureSaveError } from "../../../../../config/src/ConfigUtils"; +import { ICommandHandler, IHandlerParameters } from "../../../../../src/cmd"; +import { ImperativeConfig } from "../../../../../src/utilities/ImperativeConfig"; +import { ProcessUtils } from "../../../../../src/utilities/ProcessUtils"; +import { TextUtils } from "../../../../../src/utilities/TextUtils"; +import { Config, ConfigConstants, ConfigSchema, IConfig } from "../../../../../src/config"; +import { IProfileProperty } from "../../../../../src/profiles"; +import { ConfigBuilder } from "../../../../../src/config/src/ConfigBuilder"; +import { IConfigBuilderOpts } from "../../../../../src/config/src/doc/IConfigBuilderOpts"; +import { coercePropValue, secureSaveError } from "../../../../../src/config/src/ConfigUtils"; import { OverridesLoader } from "../../../OverridesLoader"; import * as JSONC from "comment-json"; import * as lodash from "lodash"; import { diff } from "jest-diff"; import stripAnsi = require("strip-ansi"); + + /** * Init config */ diff --git a/packages/imperative/src/imperative/src/config/cmd/list/list.definition.ts b/packages/imperative/src/imperative/config/cmd/list/list.definition.ts similarity index 97% rename from packages/imperative/src/imperative/src/config/cmd/list/list.definition.ts rename to packages/imperative/src/imperative/config/cmd/list/list.definition.ts index bbce1be259..02a378fd0a 100644 --- a/packages/imperative/src/imperative/src/config/cmd/list/list.definition.ts +++ b/packages/imperative/src/imperative/config/cmd/list/list.definition.ts @@ -10,7 +10,7 @@ */ import { join } from "path"; -import { ICommandDefinition } from "../../../../../cmd"; +import { ICommandDefinition } from "../../../../../src/cmd"; export const listDefinition: ICommandDefinition = { name: "list", diff --git a/packages/imperative/src/imperative/src/config/cmd/list/list.handler.ts b/packages/imperative/src/imperative/config/cmd/list/list.handler.ts similarity index 100% rename from packages/imperative/src/imperative/src/config/cmd/list/list.handler.ts rename to packages/imperative/src/imperative/config/cmd/list/list.handler.ts diff --git a/packages/imperative/src/imperative/src/config/cmd/profiles/profiles.definition.ts b/packages/imperative/src/imperative/config/cmd/profiles/profiles.definition.ts similarity index 100% rename from packages/imperative/src/imperative/src/config/cmd/profiles/profiles.definition.ts rename to packages/imperative/src/imperative/config/cmd/profiles/profiles.definition.ts diff --git a/packages/imperative/src/imperative/src/config/cmd/profiles/profiles.handler.ts b/packages/imperative/src/imperative/config/cmd/profiles/profiles.handler.ts similarity index 100% rename from packages/imperative/src/imperative/src/config/cmd/profiles/profiles.handler.ts rename to packages/imperative/src/imperative/config/cmd/profiles/profiles.handler.ts diff --git a/packages/imperative/src/imperative/src/config/cmd/report-env/EnvItems.ts b/packages/imperative/src/imperative/config/cmd/report-env/EnvItems.ts similarity index 100% rename from packages/imperative/src/imperative/src/config/cmd/report-env/EnvItems.ts rename to packages/imperative/src/imperative/config/cmd/report-env/EnvItems.ts diff --git a/packages/imperative/src/imperative/src/config/cmd/report-env/EnvQuery.ts b/packages/imperative/src/imperative/config/cmd/report-env/EnvQuery.ts similarity index 100% rename from packages/imperative/src/imperative/src/config/cmd/report-env/EnvQuery.ts rename to packages/imperative/src/imperative/config/cmd/report-env/EnvQuery.ts diff --git a/packages/imperative/src/imperative/src/config/cmd/report-env/Report-env.definition.ts b/packages/imperative/src/imperative/config/cmd/report-env/Report-env.definition.ts similarity index 100% rename from packages/imperative/src/imperative/src/config/cmd/report-env/Report-env.definition.ts rename to packages/imperative/src/imperative/config/cmd/report-env/Report-env.definition.ts diff --git a/packages/imperative/src/imperative/src/config/cmd/report-env/Report-env.handler.ts b/packages/imperative/src/imperative/config/cmd/report-env/Report-env.handler.ts similarity index 100% rename from packages/imperative/src/imperative/src/config/cmd/report-env/Report-env.handler.ts rename to packages/imperative/src/imperative/config/cmd/report-env/Report-env.handler.ts diff --git a/packages/imperative/src/imperative/src/config/cmd/schema/schema.definition.ts b/packages/imperative/src/imperative/config/cmd/schema/schema.definition.ts similarity index 100% rename from packages/imperative/src/imperative/src/config/cmd/schema/schema.definition.ts rename to packages/imperative/src/imperative/config/cmd/schema/schema.definition.ts diff --git a/packages/imperative/src/imperative/src/config/cmd/schema/schema.handler.ts b/packages/imperative/src/imperative/config/cmd/schema/schema.handler.ts similarity index 100% rename from packages/imperative/src/imperative/src/config/cmd/schema/schema.handler.ts rename to packages/imperative/src/imperative/config/cmd/schema/schema.handler.ts diff --git a/packages/imperative/src/imperative/src/config/cmd/secure/secure.definition.ts b/packages/imperative/src/imperative/config/cmd/secure/secure.definition.ts similarity index 100% rename from packages/imperative/src/imperative/src/config/cmd/secure/secure.definition.ts rename to packages/imperative/src/imperative/config/cmd/secure/secure.definition.ts diff --git a/packages/imperative/src/imperative/src/config/cmd/secure/secure.handler.ts b/packages/imperative/src/imperative/config/cmd/secure/secure.handler.ts similarity index 100% rename from packages/imperative/src/imperative/src/config/cmd/secure/secure.handler.ts rename to packages/imperative/src/imperative/config/cmd/secure/secure.handler.ts diff --git a/packages/imperative/src/imperative/src/config/cmd/set/set.definition.ts b/packages/imperative/src/imperative/config/cmd/set/set.definition.ts similarity index 100% rename from packages/imperative/src/imperative/src/config/cmd/set/set.definition.ts rename to packages/imperative/src/imperative/config/cmd/set/set.definition.ts diff --git a/packages/imperative/src/imperative/src/config/cmd/set/set.handler.ts b/packages/imperative/src/imperative/config/cmd/set/set.handler.ts similarity index 100% rename from packages/imperative/src/imperative/src/config/cmd/set/set.handler.ts rename to packages/imperative/src/imperative/config/cmd/set/set.handler.ts diff --git a/packages/imperative/src/imperative/src/config/cmd/update-schemas/update-schemas.definition.ts b/packages/imperative/src/imperative/config/cmd/update-schemas/update-schemas.definition.ts similarity index 100% rename from packages/imperative/src/imperative/src/config/cmd/update-schemas/update-schemas.definition.ts rename to packages/imperative/src/imperative/config/cmd/update-schemas/update-schemas.definition.ts diff --git a/packages/imperative/src/imperative/src/config/cmd/update-schemas/update-schemas.handler.ts b/packages/imperative/src/imperative/config/cmd/update-schemas/update-schemas.handler.ts similarity index 95% rename from packages/imperative/src/imperative/src/config/cmd/update-schemas/update-schemas.handler.ts rename to packages/imperative/src/imperative/config/cmd/update-schemas/update-schemas.handler.ts index 08fe9eadf9..24214e316b 100644 --- a/packages/imperative/src/imperative/src/config/cmd/update-schemas/update-schemas.handler.ts +++ b/packages/imperative/src/imperative/config/cmd/update-schemas/update-schemas.handler.ts @@ -12,7 +12,7 @@ import { ICommandHandler, IHandlerParameters } from "../../../../../cmd"; import { ConfigSchema } from "../../../../../config/src/ConfigSchema"; import { ImperativeExpect } from "../../../../../expect/src/ImperativeExpect"; -import { ImperativeConfig } from "../../../../../utilities/src/ImperativeConfig"; +import { ImperativeConfig } from "../../../../../utilities/ImperativeConfig"; import { TextUtils } from "../../../../../utilities/src/TextUtils"; export default class UpdateSchemasHandler implements ICommandHandler { diff --git a/packages/imperative/src/imperative/src/doc/IApimlSvcAttrs.ts b/packages/imperative/src/imperative/doc/IApimlSvcAttrs.ts similarity index 100% rename from packages/imperative/src/imperative/src/doc/IApimlSvcAttrs.ts rename to packages/imperative/src/imperative/doc/IApimlSvcAttrs.ts diff --git a/packages/imperative/src/imperative/src/doc/IDaemonContext.ts b/packages/imperative/src/imperative/doc/IDaemonContext.ts similarity index 100% rename from packages/imperative/src/imperative/src/doc/IDaemonContext.ts rename to packages/imperative/src/imperative/doc/IDaemonContext.ts diff --git a/packages/imperative/src/imperative/src/doc/IImperativeAuthGroupConfig.ts b/packages/imperative/src/imperative/doc/IImperativeAuthGroupConfig.ts similarity index 100% rename from packages/imperative/src/imperative/src/doc/IImperativeAuthGroupConfig.ts rename to packages/imperative/src/imperative/doc/IImperativeAuthGroupConfig.ts diff --git a/packages/imperative/src/imperative/src/doc/IImperativeConfig.ts b/packages/imperative/src/imperative/doc/IImperativeConfig.ts similarity index 100% rename from packages/imperative/src/imperative/src/doc/IImperativeConfig.ts rename to packages/imperative/src/imperative/doc/IImperativeConfig.ts diff --git a/packages/imperative/src/imperative/src/doc/IImperativeEnvironmentalVariableSetting.ts b/packages/imperative/src/imperative/doc/IImperativeEnvironmentalVariableSetting.ts similarity index 100% rename from packages/imperative/src/imperative/src/doc/IImperativeEnvironmentalVariableSetting.ts rename to packages/imperative/src/imperative/doc/IImperativeEnvironmentalVariableSetting.ts diff --git a/packages/imperative/src/imperative/src/doc/IImperativeEnvironmentalVariableSettings.ts b/packages/imperative/src/imperative/doc/IImperativeEnvironmentalVariableSettings.ts similarity index 100% rename from packages/imperative/src/imperative/src/doc/IImperativeEnvironmentalVariableSettings.ts rename to packages/imperative/src/imperative/doc/IImperativeEnvironmentalVariableSettings.ts diff --git a/packages/imperative/src/imperative/src/doc/IImperativeLoggingConfig.ts b/packages/imperative/src/imperative/doc/IImperativeLoggingConfig.ts similarity index 100% rename from packages/imperative/src/imperative/src/doc/IImperativeLoggingConfig.ts rename to packages/imperative/src/imperative/doc/IImperativeLoggingConfig.ts diff --git a/packages/imperative/src/imperative/src/doc/IImperativeLogsConfig.ts b/packages/imperative/src/imperative/doc/IImperativeLogsConfig.ts similarity index 100% rename from packages/imperative/src/imperative/src/doc/IImperativeLogsConfig.ts rename to packages/imperative/src/imperative/doc/IImperativeLogsConfig.ts diff --git a/packages/imperative/src/imperative/src/doc/IImperativeOverrides.ts b/packages/imperative/src/imperative/doc/IImperativeOverrides.ts similarity index 100% rename from packages/imperative/src/imperative/src/doc/IImperativeOverrides.ts rename to packages/imperative/src/imperative/doc/IImperativeOverrides.ts diff --git a/packages/imperative/src/imperative/src/env/EnvironmentalVariableSettings.ts b/packages/imperative/src/imperative/env/EnvironmentalVariableSettings.ts similarity index 100% rename from packages/imperative/src/imperative/src/env/EnvironmentalVariableSettings.ts rename to packages/imperative/src/imperative/env/EnvironmentalVariableSettings.ts diff --git a/packages/imperative/src/imperative/src/env/__mocks__/EnvironmentalVariableSettings.ts b/packages/imperative/src/imperative/env/__mocks__/EnvironmentalVariableSettings.ts similarity index 100% rename from packages/imperative/src/imperative/src/env/__mocks__/EnvironmentalVariableSettings.ts rename to packages/imperative/src/imperative/env/__mocks__/EnvironmentalVariableSettings.ts diff --git a/packages/imperative/src/imperative/src/handlers/DefaultRootCommandHandler.ts b/packages/imperative/src/imperative/handlers/DefaultRootCommandHandler.ts similarity index 100% rename from packages/imperative/src/imperative/src/handlers/DefaultRootCommandHandler.ts rename to packages/imperative/src/imperative/handlers/DefaultRootCommandHandler.ts diff --git a/packages/imperative/src/imperative/src/help/ImperativeHelpGeneratorFactory.ts b/packages/imperative/src/imperative/help/ImperativeHelpGeneratorFactory.ts similarity index 100% rename from packages/imperative/src/imperative/src/help/ImperativeHelpGeneratorFactory.ts rename to packages/imperative/src/imperative/help/ImperativeHelpGeneratorFactory.ts diff --git a/packages/imperative/src/imperative/index.ts b/packages/imperative/src/imperative/index.ts index f5b505beb9..1cea4af697 100644 --- a/packages/imperative/src/imperative/index.ts +++ b/packages/imperative/src/imperative/index.ts @@ -9,21 +9,21 @@ * */ -export * from "./src/env/EnvironmentalVariableSettings"; -export * from "./src/doc/IApimlSvcAttrs"; -export * from "./src/doc/IDaemonContext"; -export * from "./src/doc/IImperativeEnvironmentalVariableSetting"; -export * from "./src/doc/IImperativeEnvironmentalVariableSettings"; -export * from "./src/doc/IImperativeConfig"; -export * from "./src/doc/IImperativeLoggingConfig"; -export * from "./src/ConfigurationLoader"; -export * from "./src/ConfigurationValidator"; -export * from "./src/DefinitionTreeResolver"; -export * from "./src/Imperative"; -export * from "./src/LoggingConfigurer"; -export * from "./src/plugins/AbstractPluginLifeCycle"; -export * from "./src/plugins/PluginManagementFacility"; -export * from "./src/auth/doc/IAuthHandlerApi"; -export * from "./src/auth/handlers/AbstractAuthHandler"; -export * from "./src/auth/handlers/BaseAuthHandler"; -export * from "./src/config/cmd/auto-init/handlers/BaseAutoInitHandler"; +export * from "./env/EnvironmentalVariableSettings"; +export * from "./doc/IApimlSvcAttrs"; +export * from "./doc/IDaemonContext"; +export * from "./doc/IImperativeEnvironmentalVariableSetting"; +export * from "./doc/IImperativeEnvironmentalVariableSettings"; +export * from "./doc/IImperativeConfig"; +export * from "./doc/IImperativeLoggingConfig"; +export * from "./ConfigurationLoader"; +export * from "./ConfigurationValidator"; +export * from "./DefinitionTreeResolver"; +export * from "./Imperative"; +export * from "./LoggingConfigurer"; +export * from "./plugins/AbstractPluginLifeCycle"; +export * from "./plugins/PluginManagementFacility"; +export * from "./auth/doc/IAuthHandlerApi"; +export * from "./auth/handlers/AbstractAuthHandler"; +export * from "./auth/handlers/BaseAuthHandler"; +export * from "./config/cmd/auto-init/handlers/BaseAutoInitHandler"; diff --git a/packages/imperative/src/imperative/src/plugins/AbstractPluginLifeCycle.ts b/packages/imperative/src/imperative/plugins/AbstractPluginLifeCycle.ts similarity index 100% rename from packages/imperative/src/imperative/src/plugins/AbstractPluginLifeCycle.ts rename to packages/imperative/src/imperative/plugins/AbstractPluginLifeCycle.ts diff --git a/packages/imperative/src/imperative/src/plugins/PluginManagementFacility.ts b/packages/imperative/src/imperative/plugins/PluginManagementFacility.ts similarity index 100% rename from packages/imperative/src/imperative/src/plugins/PluginManagementFacility.ts rename to packages/imperative/src/imperative/plugins/PluginManagementFacility.ts diff --git a/packages/imperative/src/imperative/src/plugins/PluginRequireProvider.ts b/packages/imperative/src/imperative/plugins/PluginRequireProvider.ts similarity index 100% rename from packages/imperative/src/imperative/src/plugins/PluginRequireProvider.ts rename to packages/imperative/src/imperative/plugins/PluginRequireProvider.ts diff --git a/packages/imperative/src/imperative/src/plugins/__mocks__/PluginManagementFacility.ts b/packages/imperative/src/imperative/plugins/__mocks__/PluginManagementFacility.ts similarity index 100% rename from packages/imperative/src/imperative/src/plugins/__mocks__/PluginManagementFacility.ts rename to packages/imperative/src/imperative/plugins/__mocks__/PluginManagementFacility.ts diff --git a/packages/imperative/src/imperative/src/plugins/__mocks__/PluginRequireProvider.ts b/packages/imperative/src/imperative/plugins/__mocks__/PluginRequireProvider.ts similarity index 100% rename from packages/imperative/src/imperative/src/plugins/__mocks__/PluginRequireProvider.ts rename to packages/imperative/src/imperative/plugins/__mocks__/PluginRequireProvider.ts diff --git a/packages/imperative/src/imperative/src/plugins/cmd/install/install.definition.ts b/packages/imperative/src/imperative/plugins/cmd/install/install.definition.ts similarity index 100% rename from packages/imperative/src/imperative/src/plugins/cmd/install/install.definition.ts rename to packages/imperative/src/imperative/plugins/cmd/install/install.definition.ts diff --git a/packages/imperative/src/imperative/src/plugins/cmd/install/install.handler.ts b/packages/imperative/src/imperative/plugins/cmd/install/install.handler.ts similarity index 100% rename from packages/imperative/src/imperative/src/plugins/cmd/install/install.handler.ts rename to packages/imperative/src/imperative/plugins/cmd/install/install.handler.ts diff --git a/packages/imperative/src/imperative/src/plugins/cmd/list/list.definition.ts b/packages/imperative/src/imperative/plugins/cmd/list/list.definition.ts similarity index 100% rename from packages/imperative/src/imperative/src/plugins/cmd/list/list.definition.ts rename to packages/imperative/src/imperative/plugins/cmd/list/list.definition.ts diff --git a/packages/imperative/src/imperative/src/plugins/cmd/list/list.handler.ts b/packages/imperative/src/imperative/plugins/cmd/list/list.handler.ts similarity index 100% rename from packages/imperative/src/imperative/src/plugins/cmd/list/list.handler.ts rename to packages/imperative/src/imperative/plugins/cmd/list/list.handler.ts diff --git a/packages/imperative/src/imperative/src/plugins/cmd/showfirststeps/showfirststeps.definition.ts b/packages/imperative/src/imperative/plugins/cmd/showfirststeps/showfirststeps.definition.ts similarity index 100% rename from packages/imperative/src/imperative/src/plugins/cmd/showfirststeps/showfirststeps.definition.ts rename to packages/imperative/src/imperative/plugins/cmd/showfirststeps/showfirststeps.definition.ts diff --git a/packages/imperative/src/imperative/src/plugins/cmd/showfirststeps/showfirststeps.handler.ts b/packages/imperative/src/imperative/plugins/cmd/showfirststeps/showfirststeps.handler.ts similarity index 100% rename from packages/imperative/src/imperative/src/plugins/cmd/showfirststeps/showfirststeps.handler.ts rename to packages/imperative/src/imperative/plugins/cmd/showfirststeps/showfirststeps.handler.ts diff --git a/packages/imperative/src/imperative/src/plugins/cmd/uninstall/uninstall.definition.ts b/packages/imperative/src/imperative/plugins/cmd/uninstall/uninstall.definition.ts similarity index 100% rename from packages/imperative/src/imperative/src/plugins/cmd/uninstall/uninstall.definition.ts rename to packages/imperative/src/imperative/plugins/cmd/uninstall/uninstall.definition.ts diff --git a/packages/imperative/src/imperative/src/plugins/cmd/uninstall/uninstall.handler.ts b/packages/imperative/src/imperative/plugins/cmd/uninstall/uninstall.handler.ts similarity index 100% rename from packages/imperative/src/imperative/src/plugins/cmd/uninstall/uninstall.handler.ts rename to packages/imperative/src/imperative/plugins/cmd/uninstall/uninstall.handler.ts diff --git a/packages/imperative/src/imperative/src/plugins/cmd/update/update.definition.ts b/packages/imperative/src/imperative/plugins/cmd/update/update.definition.ts similarity index 100% rename from packages/imperative/src/imperative/src/plugins/cmd/update/update.definition.ts rename to packages/imperative/src/imperative/plugins/cmd/update/update.definition.ts diff --git a/packages/imperative/src/imperative/src/plugins/cmd/update/update.handler.ts b/packages/imperative/src/imperative/plugins/cmd/update/update.handler.ts similarity index 100% rename from packages/imperative/src/imperative/src/plugins/cmd/update/update.handler.ts rename to packages/imperative/src/imperative/plugins/cmd/update/update.handler.ts diff --git a/packages/imperative/src/imperative/src/plugins/cmd/validate/validate.definition.ts b/packages/imperative/src/imperative/plugins/cmd/validate/validate.definition.ts similarity index 100% rename from packages/imperative/src/imperative/src/plugins/cmd/validate/validate.definition.ts rename to packages/imperative/src/imperative/plugins/cmd/validate/validate.definition.ts diff --git a/packages/imperative/src/imperative/src/plugins/cmd/validate/validate.handler.ts b/packages/imperative/src/imperative/plugins/cmd/validate/validate.handler.ts similarity index 100% rename from packages/imperative/src/imperative/src/plugins/cmd/validate/validate.handler.ts rename to packages/imperative/src/imperative/plugins/cmd/validate/validate.handler.ts diff --git a/packages/imperative/src/imperative/src/plugins/doc/IPluginCfgProps.ts b/packages/imperative/src/imperative/plugins/doc/IPluginCfgProps.ts similarity index 100% rename from packages/imperative/src/imperative/src/plugins/doc/IPluginCfgProps.ts rename to packages/imperative/src/imperative/plugins/doc/IPluginCfgProps.ts diff --git a/packages/imperative/src/imperative/src/plugins/doc/IPluginIssues.ts b/packages/imperative/src/imperative/plugins/doc/IPluginIssues.ts similarity index 100% rename from packages/imperative/src/imperative/src/plugins/doc/IPluginIssues.ts rename to packages/imperative/src/imperative/plugins/doc/IPluginIssues.ts diff --git a/packages/imperative/src/imperative/src/plugins/doc/IPluginJson.ts b/packages/imperative/src/imperative/plugins/doc/IPluginJson.ts similarity index 100% rename from packages/imperative/src/imperative/src/plugins/doc/IPluginJson.ts rename to packages/imperative/src/imperative/plugins/doc/IPluginJson.ts diff --git a/packages/imperative/src/imperative/src/plugins/doc/IPluginJsonObject.ts b/packages/imperative/src/imperative/plugins/doc/IPluginJsonObject.ts similarity index 100% rename from packages/imperative/src/imperative/src/plugins/doc/IPluginJsonObject.ts rename to packages/imperative/src/imperative/plugins/doc/IPluginJsonObject.ts diff --git a/packages/imperative/src/imperative/src/plugins/doc/IPluginPeerDepends.ts b/packages/imperative/src/imperative/plugins/doc/IPluginPeerDepends.ts similarity index 100% rename from packages/imperative/src/imperative/src/plugins/doc/IPluginPeerDepends.ts rename to packages/imperative/src/imperative/plugins/doc/IPluginPeerDepends.ts diff --git a/packages/imperative/src/imperative/src/plugins/errors/PluginRequireAlreadyCreatedError.ts b/packages/imperative/src/imperative/plugins/errors/PluginRequireAlreadyCreatedError.ts similarity index 100% rename from packages/imperative/src/imperative/src/plugins/errors/PluginRequireAlreadyCreatedError.ts rename to packages/imperative/src/imperative/plugins/errors/PluginRequireAlreadyCreatedError.ts diff --git a/packages/imperative/src/imperative/src/plugins/errors/PluginRequireNotCreatedError.ts b/packages/imperative/src/imperative/plugins/errors/PluginRequireNotCreatedError.ts similarity index 100% rename from packages/imperative/src/imperative/src/plugins/errors/PluginRequireNotCreatedError.ts rename to packages/imperative/src/imperative/plugins/errors/PluginRequireNotCreatedError.ts diff --git a/packages/imperative/src/imperative/src/plugins/utilities/NpmFunctions.ts b/packages/imperative/src/imperative/plugins/utilities/NpmFunctions.ts similarity index 100% rename from packages/imperative/src/imperative/src/plugins/utilities/NpmFunctions.ts rename to packages/imperative/src/imperative/plugins/utilities/NpmFunctions.ts diff --git a/packages/imperative/src/imperative/src/plugins/utilities/PMFConstants.ts b/packages/imperative/src/imperative/plugins/utilities/PMFConstants.ts similarity index 100% rename from packages/imperative/src/imperative/src/plugins/utilities/PMFConstants.ts rename to packages/imperative/src/imperative/plugins/utilities/PMFConstants.ts diff --git a/packages/imperative/src/imperative/src/plugins/utilities/PluginIssues.ts b/packages/imperative/src/imperative/plugins/utilities/PluginIssues.ts similarity index 100% rename from packages/imperative/src/imperative/src/plugins/utilities/PluginIssues.ts rename to packages/imperative/src/imperative/plugins/utilities/PluginIssues.ts diff --git a/packages/imperative/src/imperative/src/plugins/utilities/__mocks__/PMFConstants.ts b/packages/imperative/src/imperative/plugins/utilities/__mocks__/PMFConstants.ts similarity index 95% rename from packages/imperative/src/imperative/src/plugins/utilities/__mocks__/PMFConstants.ts rename to packages/imperative/src/imperative/plugins/utilities/__mocks__/PMFConstants.ts index cea97286d2..99c752400c 100644 --- a/packages/imperative/src/imperative/src/plugins/utilities/__mocks__/PMFConstants.ts +++ b/packages/imperative/src/imperative/plugins/utilities/__mocks__/PMFConstants.ts @@ -9,7 +9,7 @@ * */ -import { ImperativeConfig } from "../../../../../utilities/src/__mocks__/ImperativeConfig"; +import { ImperativeConfig } from "../../../../../utilities/src//ImperativeConfig"; import { Config } from "../../../../../config/src/__mocks__/Config"; /** diff --git a/packages/imperative/src/imperative/src/plugins/utilities/npm-interface/index.ts b/packages/imperative/src/imperative/plugins/utilities/npm-interface/index.ts similarity index 100% rename from packages/imperative/src/imperative/src/plugins/utilities/npm-interface/index.ts rename to packages/imperative/src/imperative/plugins/utilities/npm-interface/index.ts diff --git a/packages/imperative/src/imperative/src/plugins/utilities/npm-interface/install.ts b/packages/imperative/src/imperative/plugins/utilities/npm-interface/install.ts similarity index 100% rename from packages/imperative/src/imperative/src/plugins/utilities/npm-interface/install.ts rename to packages/imperative/src/imperative/plugins/utilities/npm-interface/install.ts diff --git a/packages/imperative/src/imperative/src/plugins/utilities/npm-interface/uninstall.ts b/packages/imperative/src/imperative/plugins/utilities/npm-interface/uninstall.ts similarity index 100% rename from packages/imperative/src/imperative/src/plugins/utilities/npm-interface/uninstall.ts rename to packages/imperative/src/imperative/plugins/utilities/npm-interface/uninstall.ts diff --git a/packages/imperative/src/imperative/src/plugins/utilities/npm-interface/update.ts b/packages/imperative/src/imperative/plugins/utilities/npm-interface/update.ts similarity index 100% rename from packages/imperative/src/imperative/src/plugins/utilities/npm-interface/update.ts rename to packages/imperative/src/imperative/plugins/utilities/npm-interface/update.ts diff --git a/packages/imperative/src/imperative/src/plugins/utilities/runValidatePlugin.ts b/packages/imperative/src/imperative/plugins/utilities/runValidatePlugin.ts similarity index 100% rename from packages/imperative/src/imperative/src/plugins/utilities/runValidatePlugin.ts rename to packages/imperative/src/imperative/plugins/utilities/runValidatePlugin.ts diff --git a/packages/imperative/src/imperative/src/profiles/ImperativeProfileManagerFactory.ts b/packages/imperative/src/imperative/profiles/ImperativeProfileManagerFactory.ts similarity index 100% rename from packages/imperative/src/imperative/src/profiles/ImperativeProfileManagerFactory.ts rename to packages/imperative/src/imperative/profiles/ImperativeProfileManagerFactory.ts diff --git a/packages/imperative/src/imperative/src/profiles/builders/CompleteProfilesGroupBuilder.ts b/packages/imperative/src/imperative/profiles/builders/CompleteProfilesGroupBuilder.ts similarity index 100% rename from packages/imperative/src/imperative/src/profiles/builders/CompleteProfilesGroupBuilder.ts rename to packages/imperative/src/imperative/profiles/builders/CompleteProfilesGroupBuilder.ts diff --git a/packages/imperative/src/imperative/src/profiles/builders/ProfilesCommandBuilder.ts b/packages/imperative/src/imperative/profiles/builders/ProfilesCommandBuilder.ts similarity index 100% rename from packages/imperative/src/imperative/src/profiles/builders/ProfilesCommandBuilder.ts rename to packages/imperative/src/imperative/profiles/builders/ProfilesCommandBuilder.ts diff --git a/packages/imperative/src/imperative/src/profiles/builders/ProfilesCreateCommandBuilder.ts b/packages/imperative/src/imperative/profiles/builders/ProfilesCreateCommandBuilder.ts similarity index 100% rename from packages/imperative/src/imperative/src/profiles/builders/ProfilesCreateCommandBuilder.ts rename to packages/imperative/src/imperative/profiles/builders/ProfilesCreateCommandBuilder.ts diff --git a/packages/imperative/src/imperative/src/profiles/builders/ProfilesDeleteCommandBuilder.ts b/packages/imperative/src/imperative/profiles/builders/ProfilesDeleteCommandBuilder.ts similarity index 100% rename from packages/imperative/src/imperative/src/profiles/builders/ProfilesDeleteCommandBuilder.ts rename to packages/imperative/src/imperative/profiles/builders/ProfilesDeleteCommandBuilder.ts diff --git a/packages/imperative/src/imperative/src/profiles/builders/ProfilesListCommandBuilder.ts b/packages/imperative/src/imperative/profiles/builders/ProfilesListCommandBuilder.ts similarity index 100% rename from packages/imperative/src/imperative/src/profiles/builders/ProfilesListCommandBuilder.ts rename to packages/imperative/src/imperative/profiles/builders/ProfilesListCommandBuilder.ts diff --git a/packages/imperative/src/imperative/src/profiles/builders/ProfilesSetCommandBuilder.ts b/packages/imperative/src/imperative/profiles/builders/ProfilesSetCommandBuilder.ts similarity index 100% rename from packages/imperative/src/imperative/src/profiles/builders/ProfilesSetCommandBuilder.ts rename to packages/imperative/src/imperative/profiles/builders/ProfilesSetCommandBuilder.ts diff --git a/packages/imperative/src/imperative/src/profiles/builders/ProfilesShowDependenciesCommandBuilder.ts b/packages/imperative/src/imperative/profiles/builders/ProfilesShowDependenciesCommandBuilder.ts similarity index 100% rename from packages/imperative/src/imperative/src/profiles/builders/ProfilesShowDependenciesCommandBuilder.ts rename to packages/imperative/src/imperative/profiles/builders/ProfilesShowDependenciesCommandBuilder.ts diff --git a/packages/imperative/src/imperative/src/profiles/builders/ProfilesUpdateCommandBuilder.ts b/packages/imperative/src/imperative/profiles/builders/ProfilesUpdateCommandBuilder.ts similarity index 100% rename from packages/imperative/src/imperative/src/profiles/builders/ProfilesUpdateCommandBuilder.ts rename to packages/imperative/src/imperative/profiles/builders/ProfilesUpdateCommandBuilder.ts diff --git a/packages/imperative/src/imperative/src/profiles/builders/ProfilesValidateCommandBuilder.ts b/packages/imperative/src/imperative/profiles/builders/ProfilesValidateCommandBuilder.ts similarity index 100% rename from packages/imperative/src/imperative/src/profiles/builders/ProfilesValidateCommandBuilder.ts rename to packages/imperative/src/imperative/profiles/builders/ProfilesValidateCommandBuilder.ts diff --git a/packages/imperative/src/imperative/src/profiles/handlers/CreateProfilesHandler.ts b/packages/imperative/src/imperative/profiles/handlers/CreateProfilesHandler.ts similarity index 100% rename from packages/imperative/src/imperative/src/profiles/handlers/CreateProfilesHandler.ts rename to packages/imperative/src/imperative/profiles/handlers/CreateProfilesHandler.ts diff --git a/packages/imperative/src/imperative/src/profiles/handlers/ListProfilesHandler.ts b/packages/imperative/src/imperative/profiles/handlers/ListProfilesHandler.ts similarity index 100% rename from packages/imperative/src/imperative/src/profiles/handlers/ListProfilesHandler.ts rename to packages/imperative/src/imperative/profiles/handlers/ListProfilesHandler.ts diff --git a/packages/imperative/src/imperative/src/profiles/handlers/NewDeleteProfilesHandler.ts b/packages/imperative/src/imperative/profiles/handlers/NewDeleteProfilesHandler.ts similarity index 100% rename from packages/imperative/src/imperative/src/profiles/handlers/NewDeleteProfilesHandler.ts rename to packages/imperative/src/imperative/profiles/handlers/NewDeleteProfilesHandler.ts diff --git a/packages/imperative/src/imperative/src/profiles/handlers/OldDeleteProfilesHandler.ts b/packages/imperative/src/imperative/profiles/handlers/OldDeleteProfilesHandler.ts similarity index 100% rename from packages/imperative/src/imperative/src/profiles/handlers/OldDeleteProfilesHandler.ts rename to packages/imperative/src/imperative/profiles/handlers/OldDeleteProfilesHandler.ts diff --git a/packages/imperative/src/imperative/src/profiles/handlers/SetDefaultProfilesHandler.ts b/packages/imperative/src/imperative/profiles/handlers/SetDefaultProfilesHandler.ts similarity index 100% rename from packages/imperative/src/imperative/src/profiles/handlers/SetDefaultProfilesHandler.ts rename to packages/imperative/src/imperative/profiles/handlers/SetDefaultProfilesHandler.ts diff --git a/packages/imperative/src/imperative/src/profiles/handlers/ShowDependenciesProfilesHandler.ts b/packages/imperative/src/imperative/profiles/handlers/ShowDependenciesProfilesHandler.ts similarity index 100% rename from packages/imperative/src/imperative/src/profiles/handlers/ShowDependenciesProfilesHandler.ts rename to packages/imperative/src/imperative/profiles/handlers/ShowDependenciesProfilesHandler.ts diff --git a/packages/imperative/src/imperative/src/profiles/handlers/UpdateProfilesHandler.ts b/packages/imperative/src/imperative/profiles/handlers/UpdateProfilesHandler.ts similarity index 100% rename from packages/imperative/src/imperative/src/profiles/handlers/UpdateProfilesHandler.ts rename to packages/imperative/src/imperative/profiles/handlers/UpdateProfilesHandler.ts diff --git a/packages/imperative/src/imperative/src/profiles/handlers/ValidateProfileHandler.ts b/packages/imperative/src/imperative/profiles/handlers/ValidateProfileHandler.ts similarity index 100% rename from packages/imperative/src/imperative/src/profiles/handlers/ValidateProfileHandler.ts rename to packages/imperative/src/imperative/profiles/handlers/ValidateProfileHandler.ts diff --git a/packages/imperative/src/interfaces/src/doc/IConstructor.ts b/packages/imperative/src/interfaces/doc/IConstructor.ts similarity index 100% rename from packages/imperative/src/interfaces/src/doc/IConstructor.ts rename to packages/imperative/src/interfaces/doc/IConstructor.ts diff --git a/packages/imperative/src/interfaces/index.ts b/packages/imperative/src/interfaces/index.ts index 5df127e1ce..8caf4f16bf 100644 --- a/packages/imperative/src/interfaces/index.ts +++ b/packages/imperative/src/interfaces/index.ts @@ -9,5 +9,5 @@ * */ -export * from "./src/types/ImperativeReject"; -export * from "./src/doc/IConstructor"; +export * from "./types/ImperativeReject"; +export * from "./doc/IConstructor"; diff --git a/packages/imperative/src/interfaces/src/types/ImperativeReject.ts b/packages/imperative/src/interfaces/types/ImperativeReject.ts similarity index 90% rename from packages/imperative/src/interfaces/src/types/ImperativeReject.ts rename to packages/imperative/src/interfaces/types/ImperativeReject.ts index 90d7d39bb5..2c3fb839f4 100644 --- a/packages/imperative/src/interfaces/src/types/ImperativeReject.ts +++ b/packages/imperative/src/interfaces/types/ImperativeReject.ts @@ -9,7 +9,7 @@ * */ -import { ImperativeError } from "../../../error"; +import { ImperativeError } from "../../error"; /** * Definition for a promise rejection method that provides an ImperativeError (or subclass) */ diff --git a/packages/imperative/src/io/src/IO.ts b/packages/imperative/src/io/IO.ts similarity index 98% rename from packages/imperative/src/io/src/IO.ts rename to packages/imperative/src/io/IO.ts index 327335ce00..f2f05982ca 100644 --- a/packages/imperative/src/io/src/IO.ts +++ b/packages/imperative/src/io/IO.ts @@ -12,11 +12,11 @@ import * as fs from "fs"; import * as path from "path"; import * as os from "os"; -import { ImperativeReject } from "../../interfaces"; -import { ImperativeError } from "../../error"; -import { ImperativeExpect } from "../../expect"; +import { ImperativeReject } from "../interfaces"; +import { ImperativeError } from "../error"; +import { ImperativeExpect } from "../expect"; // use complete path to ExecUtils to avoid circular dependency that results from utilities/index -import { ExecUtils } from "../../utilities/src/ExecUtils"; +import { ExecUtils } from "../utilities/ExecUtils"; import { Readable, Writable } from "stream"; import { mkdirpSync } from "fs-extra"; diff --git a/packages/imperative/src/io/index.ts b/packages/imperative/src/io/index.ts index 4c30ba8c3c..b62278ebf6 100644 --- a/packages/imperative/src/io/index.ts +++ b/packages/imperative/src/io/index.ts @@ -9,4 +9,4 @@ * */ -export * from "./src/IO"; +export * from "./IO"; diff --git a/packages/imperative/src/logger/src/Logger.ts b/packages/imperative/src/logger/Logger.ts similarity index 98% rename from packages/imperative/src/logger/src/Logger.ts rename to packages/imperative/src/logger/Logger.ts index 85e8d6a380..5d048e2c38 100644 --- a/packages/imperative/src/logger/src/Logger.ts +++ b/packages/imperative/src/logger/Logger.ts @@ -10,15 +10,15 @@ */ import { format, inspect, isNullOrUndefined } from "util"; -import { ImperativeError } from "../../error/src/ImperativeError"; +import { ImperativeError } from "../error/ImperativeError"; import * as StackTrace from "stack-trace"; import * as path from "path"; -import { TextUtils } from "../../utilities/src/TextUtils"; -import { IO } from "../../io"; +import { TextUtils } from "../utilities/TextUtils"; +import { IO } from "../io"; import { IConfigLogging } from "./doc/IConfigLogging"; import { LoggerManager } from "./LoggerManager"; import * as log4js from "log4js"; -import { Console } from "../../console/src/Console"; +import { Console } from "../console/Console"; import { LoggerUtils } from "./LoggerUtils"; /** diff --git a/packages/imperative/src/logger/src/LoggerConfigBuilder.ts b/packages/imperative/src/logger/LoggerConfigBuilder.ts similarity index 99% rename from packages/imperative/src/logger/src/LoggerConfigBuilder.ts rename to packages/imperative/src/logger/LoggerConfigBuilder.ts index 79171c5acf..24555e483a 100644 --- a/packages/imperative/src/logger/src/LoggerConfigBuilder.ts +++ b/packages/imperative/src/logger/LoggerConfigBuilder.ts @@ -10,7 +10,7 @@ */ import { IConfigLogging } from "./doc/IConfigLogging"; -import { IO } from "../../io"; +import { IO } from "../io"; import * as path from "path"; import * as os from "os"; diff --git a/packages/imperative/src/logger/src/LoggerManager.ts b/packages/imperative/src/logger/LoggerManager.ts similarity index 98% rename from packages/imperative/src/logger/src/LoggerManager.ts rename to packages/imperative/src/logger/LoggerManager.ts index 011c2f2fb0..0f74744ecf 100644 --- a/packages/imperative/src/logger/src/LoggerManager.ts +++ b/packages/imperative/src/logger/LoggerManager.ts @@ -10,7 +10,7 @@ */ import { IQueuedMessage } from "./doc/IQueuedMessage"; -import { Console } from "../../console"; +import { Console } from "../console"; import { appendFileSync } from "fs"; /** diff --git a/packages/imperative/src/logger/src/LoggerUtils.ts b/packages/imperative/src/logger/LoggerUtils.ts similarity index 92% rename from packages/imperative/src/logger/src/LoggerUtils.ts rename to packages/imperative/src/logger/LoggerUtils.ts index 5a3465d9dc..00d8983b41 100644 --- a/packages/imperative/src/logger/src/LoggerUtils.ts +++ b/packages/imperative/src/logger/LoggerUtils.ts @@ -10,15 +10,15 @@ */ import { Arguments } from "yargs"; -import { EnvironmentalVariableSettings } from "../../imperative/src/env/EnvironmentalVariableSettings"; -import { CliUtils } from "../../utilities/src/CliUtils"; -import { ImperativeConfig } from "../../utilities/src/ImperativeConfig"; +import { EnvironmentalVariableSettings } from "../imperative/env/EnvironmentalVariableSettings"; +import { CliUtils } from "../utilities/CliUtils"; +import { ImperativeConfig } from "../utilities/ImperativeConfig"; import * as lodash from "lodash"; -import { Config } from "../../config/src/Config"; -import { IConfigLayer } from "../../config/src/doc/IConfigLayer"; -import { ICommandProfileTypeConfiguration } from "../../cmd/src/doc/profiles/definition/ICommandProfileTypeConfiguration"; -import { ICommandProfileProperty } from "../../cmd/src/doc/profiles/definition/ICommandProfileProperty"; -import { IProfileSchema } from "../../profiles/src/doc/definition/IProfileSchema"; +import { Config } from "../config/Config"; +import { IConfigLayer } from "../config/doc/IConfigLayer"; +import { ICommandProfileTypeConfiguration } from "../cmd/doc/profiles/definition/ICommandProfileTypeConfiguration"; +import { ICommandProfileProperty } from "../cmd/doc/profiles/definition/ICommandProfileProperty"; +import { IProfileSchema } from "../profiles/doc/definition/IProfileSchema"; export class LoggerUtils { public static readonly CENSOR_RESPONSE = "****"; diff --git a/packages/imperative/src/logger/src/__mocks__/Logger.ts b/packages/imperative/src/logger/__mocks__/Logger.ts similarity index 96% rename from packages/imperative/src/logger/src/__mocks__/Logger.ts rename to packages/imperative/src/logger/__mocks__/Logger.ts index a0ddaee943..c5206ade46 100644 --- a/packages/imperative/src/logger/src/__mocks__/Logger.ts +++ b/packages/imperative/src/logger/__mocks__/Logger.ts @@ -9,7 +9,7 @@ * */ -import { Console } from "../../../console"; +import { Console } from "../../console"; const Logger: any = (jest.genMockFromModule("../Logger") as any).Logger; diff --git a/packages/imperative/src/logger/src/__mocks__/LoggerUtils.ts b/packages/imperative/src/logger/__mocks__/LoggerUtils.ts similarity index 100% rename from packages/imperative/src/logger/src/__mocks__/LoggerUtils.ts rename to packages/imperative/src/logger/__mocks__/LoggerUtils.ts diff --git a/packages/imperative/src/logger/src/doc/IConfigLogging.ts b/packages/imperative/src/logger/doc/IConfigLogging.ts similarity index 100% rename from packages/imperative/src/logger/src/doc/IConfigLogging.ts rename to packages/imperative/src/logger/doc/IConfigLogging.ts diff --git a/packages/imperative/src/logger/src/doc/ILog4jsAppender.ts b/packages/imperative/src/logger/doc/ILog4jsAppender.ts similarity index 100% rename from packages/imperative/src/logger/src/doc/ILog4jsAppender.ts rename to packages/imperative/src/logger/doc/ILog4jsAppender.ts diff --git a/packages/imperative/src/logger/src/doc/ILog4jsConfig.ts b/packages/imperative/src/logger/doc/ILog4jsConfig.ts similarity index 100% rename from packages/imperative/src/logger/src/doc/ILog4jsConfig.ts rename to packages/imperative/src/logger/doc/ILog4jsConfig.ts diff --git a/packages/imperative/src/logger/src/doc/ILog4jsLayout.ts b/packages/imperative/src/logger/doc/ILog4jsLayout.ts similarity index 100% rename from packages/imperative/src/logger/src/doc/ILog4jsLayout.ts rename to packages/imperative/src/logger/doc/ILog4jsLayout.ts diff --git a/packages/imperative/src/logger/src/doc/IQueuedMessage.ts b/packages/imperative/src/logger/doc/IQueuedMessage.ts similarity index 100% rename from packages/imperative/src/logger/src/doc/IQueuedMessage.ts rename to packages/imperative/src/logger/doc/IQueuedMessage.ts diff --git a/packages/imperative/src/logger/index.ts b/packages/imperative/src/logger/index.ts index d5f79edc41..a4ffbce608 100644 --- a/packages/imperative/src/logger/index.ts +++ b/packages/imperative/src/logger/index.ts @@ -9,10 +9,10 @@ * */ -export * from "./src/doc/IConfigLogging"; -export * from "./src/doc/ILog4jsAppender"; -export * from "./src/doc/ILog4jsConfig"; -export * from "./src/doc/ILog4jsLayout"; -export * from "./src/Logger"; -export * from "./src/LoggerConfigBuilder"; -export * from "./src/LoggerUtils"; +export * from "./doc/IConfigLogging"; +export * from "./doc/ILog4jsAppender"; +export * from "./doc/ILog4jsConfig"; +export * from "./doc/ILog4jsLayout"; +export * from "./Logger"; +export * from "./LoggerConfigBuilder"; +export * from "./LoggerUtils"; diff --git a/packages/imperative/src/messages/src/CoreMessages.ts b/packages/imperative/src/messages/CoreMessages.ts similarity index 99% rename from packages/imperative/src/messages/src/CoreMessages.ts rename to packages/imperative/src/messages/CoreMessages.ts index d70be82fc8..784a27aaaf 100644 --- a/packages/imperative/src/messages/src/CoreMessages.ts +++ b/packages/imperative/src/messages/CoreMessages.ts @@ -10,7 +10,7 @@ */ import { IMessageDefinition } from "./doc/IMessageDefinition"; -import { Constants } from "../../constants"; +import { Constants } from "../constants"; export const apiErrorHeader: IMessageDefinition = { message: `${Constants.FRAMEWORK_DISPLAY_NAME} API Error` diff --git a/packages/imperative/src/messages/src/doc/IMessageDefinition.ts b/packages/imperative/src/messages/doc/IMessageDefinition.ts similarity index 100% rename from packages/imperative/src/messages/src/doc/IMessageDefinition.ts rename to packages/imperative/src/messages/doc/IMessageDefinition.ts diff --git a/packages/imperative/src/messages/index.ts b/packages/imperative/src/messages/index.ts index cc688e4217..5aef4b4a61 100644 --- a/packages/imperative/src/messages/index.ts +++ b/packages/imperative/src/messages/index.ts @@ -9,5 +9,5 @@ * */ -export * from "./src/doc/IMessageDefinition"; -export * from "./src/CoreMessages"; +export * from "./doc/IMessageDefinition"; +export * from "./CoreMessages"; diff --git a/packages/imperative/src/operations/src/Operation.ts b/packages/imperative/src/operations/Operation.ts similarity index 99% rename from packages/imperative/src/operations/src/Operation.ts rename to packages/imperative/src/operations/Operation.ts index e616531aee..20d270aef1 100644 --- a/packages/imperative/src/operations/src/Operation.ts +++ b/packages/imperative/src/operations/Operation.ts @@ -13,10 +13,10 @@ import { IOperationResult } from "./doc/IOperationResult"; import { TaskStage } from "./TaskStage"; import * as fs from "fs"; import { removeSync } from "fs-extra"; -import { TextUtils } from "../../utilities"; +import { TextUtils } from "../utilities/TextUtils"; import { ITaskWithStatus } from "./doc/ITaskWithStatus"; import { TaskProgress } from "./TaskProgress"; -import { Logger } from "../../logger"; +import { Logger } from "../logger"; export type IOperationCompleted = diff --git a/packages/imperative/src/operations/src/Operations.ts b/packages/imperative/src/operations/Operations.ts similarity index 99% rename from packages/imperative/src/operations/src/Operations.ts rename to packages/imperative/src/operations/Operations.ts index 4ea02bf2a4..8ab0af473b 100644 --- a/packages/imperative/src/operations/src/Operations.ts +++ b/packages/imperative/src/operations/Operations.ts @@ -12,7 +12,7 @@ import { IOperationResultReady, Operation } from "./Operation"; import { IOperationResult } from "./doc/IOperationResult"; import { isNullOrUndefined } from "util"; -import { TextUtils } from "../../utilities"; +import { TextUtils } from "../utilities"; import { TaskProgress } from "./TaskProgress"; /** diff --git a/packages/imperative/src/operations/src/TaskProgress.ts b/packages/imperative/src/operations/TaskProgress.ts similarity index 100% rename from packages/imperative/src/operations/src/TaskProgress.ts rename to packages/imperative/src/operations/TaskProgress.ts diff --git a/packages/imperative/src/operations/src/TaskStage.ts b/packages/imperative/src/operations/TaskStage.ts similarity index 100% rename from packages/imperative/src/operations/src/TaskStage.ts rename to packages/imperative/src/operations/TaskStage.ts diff --git a/packages/imperative/src/operations/__tests__/__integration__/Operations.integration.spec.ts b/packages/imperative/src/operations/__tests__/__integration__/Operations.integration.spec.ts deleted file mode 100644 index b5273a15e6..0000000000 --- a/packages/imperative/src/operations/__tests__/__integration__/Operations.integration.spec.ts +++ /dev/null @@ -1,335 +0,0 @@ -/* -* 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. -* -*/ - -/* eslint-disable jest/expect-expect */ -import { TestOperations1 } from "../operation/TestOperations1"; -import { TestOperations4 } from "../operation/TestOperations4"; - -import { isNullOrUndefined } from "util"; -import { TestOperations3 } from "../operation/TestOperations3"; - -import { IOperationResult, Operation, Operations } from "../../index"; -import { TestLogger } from "../../../../__tests__/src/TestLogger"; - -const logger = TestLogger.getTestLogger(); - -class OperationTestConstants { - public static OPER_TEST1_RESULTS: Array> = [{ - operationName: "Initialize Test Sub Op 1", - resultMessage: "", - operationFailed: false, - diverge: false, - divergeTo: null, - continuePath: true, - nextOperationResult: null, - operationObject: null, - operationUndoPossible: true, - operationUndoFailed: false, - operationUndoAttempted: false, - critical: true, - output: null, - infoMessages: [], - errorMessages: [] - }, { - operationName: "Initialize Test Sub Op 2", - resultMessage: "", - operationFailed: false, - diverge: false, - divergeTo: null, - continuePath: true, - nextOperationResult: null, - operationObject: null, - operationUndoPossible: true, - operationUndoFailed: false, - operationUndoAttempted: false, - critical: true, - output: null, - infoMessages: [], - errorMessages: [] - }, { - operationName: "Initialize Test Sub Op No Undo", - resultMessage: "", - operationFailed: false, - diverge: false, - divergeTo: null, - continuePath: true, - nextOperationResult: null, - operationObject: null, - operationUndoPossible: false, - operationUndoFailed: false, - operationUndoAttempted: false, - critical: true, - output: null, - infoMessages: [], - errorMessages: [] - }]; - - public static OPER_TEST2_RESULTS: Array> = [{ - operationName: "Initialize Test Sub Op 1", - resultMessage: "", - operationFailed: false, - diverge: false, - divergeTo: null, - continuePath: true, - nextOperationResult: null, - operationObject: null, - operationUndoPossible: true, - operationUndoFailed: false, - operationUndoAttempted: true, - critical: true, - output: null, - infoMessages: [], - errorMessages: [] - }, { - operationName: "Initialize Test Sub Op 2", - resultMessage: "", - operationFailed: false, - diverge: false, - divergeTo: null, - continuePath: true, - nextOperationResult: null, - operationObject: null, - operationUndoPossible: true, - operationUndoFailed: false, - operationUndoAttempted: true, - critical: true, - output: null, - infoMessages: [], - errorMessages: [] - }, { - operationName: "Initialize Test Sub Op No Undo", - resultMessage: "", - operationFailed: false, - diverge: false, - divergeTo: null, - continuePath: true, - nextOperationResult: null, - operationObject: null, - operationUndoPossible: false, - operationUndoFailed: false, - operationUndoAttempted: false, - critical: true, - output: null, - infoMessages: [], - errorMessages: [] - }, { - operationName: "Initialize Test Sub Op 4", - resultMessage: "", - operationFailed: false, - diverge: false, - divergeTo: null, - continuePath: true, - nextOperationResult: null, - operationObject: null, - operationUndoPossible: true, - operationUndoFailed: false, - operationUndoAttempted: true, - critical: true, - output: null, - infoMessages: [], - errorMessages: [] - }, { - operationName: "Initialize Test Sub Op 5", - resultMessage: "", - operationFailed: false, - diverge: false, - divergeTo: null, - continuePath: true, - nextOperationResult: null, - operationObject: null, - operationUndoPossible: true, - operationUndoFailed: false, - operationUndoAttempted: true, - critical: true, - output: null, - infoMessages: [], - errorMessages: [] - }, { - operationName: "Initialize Test Sub Op fail", - resultMessage: "", - operationFailed: true, - diverge: false, - divergeTo: null, - continuePath: true, - nextOperationResult: null, - operationObject: null, - operationUndoPossible: true, - operationUndoFailed: true, - operationUndoAttempted: true, - critical: true, - output: null, - infoMessages: [], - errorMessages: [] - }]; - - public static OPER_TEST3_RESULTS: Array> = [{ - operationName: "Initialize Test Sub Op 1", - resultMessage: "", - operationFailed: false, - diverge: false, - divergeTo: null, - continuePath: true, - nextOperationResult: null, - operationObject: null, - operationUndoPossible: true, - operationUndoFailed: false, - operationUndoAttempted: false, - critical: true, - output: null, - infoMessages: [], - errorMessages: [] - }, { - operationName: "Initialize Test Sub Op 2", - resultMessage: "", - operationFailed: false, - diverge: false, - divergeTo: null, - continuePath: true, - nextOperationResult: null, - operationObject: null, - operationUndoPossible: true, - operationUndoFailed: false, - operationUndoAttempted: false, - critical: true, - output: null, - infoMessages: [], - errorMessages: [] - }, { - operationName: "Initialize Test Sub Op No Undo", - resultMessage: "", - operationFailed: false, - diverge: false, - divergeTo: null, - continuePath: true, - nextOperationResult: null, - operationObject: null, - operationUndoPossible: false, - operationUndoFailed: false, - operationUndoAttempted: false, - critical: true, - output: null, - infoMessages: [], - errorMessages: [] - }, { - operationName: "Initialize Test Sub Op 4", - resultMessage: "", - operationFailed: false, - diverge: false, - divergeTo: null, - continuePath: true, - nextOperationResult: null, - operationObject: null, - operationUndoPossible: true, - operationUndoFailed: false, - operationUndoAttempted: false, - critical: true, - output: null, - infoMessages: [], - errorMessages: [] - }, { - operationName: "Initialize Test Sub Op 5", - resultMessage: "", - operationFailed: false, - diverge: false, - divergeTo: null, - continuePath: true, - nextOperationResult: null, - operationObject: null, - operationUndoPossible: true, - operationUndoFailed: false, - operationUndoAttempted: false, - critical: true, - output: null, - infoMessages: [], - errorMessages: [] - }, { - operationName: "Initialize Test Sub Op 6", - resultMessage: "", - operationFailed: false, - diverge: false, - divergeTo: null, - continuePath: true, - nextOperationResult: null, - operationObject: null, - operationUndoPossible: true, - operationUndoFailed: false, - operationUndoAttempted: false, - critical: true, - output: null, - infoMessages: [], - errorMessages: [] - }]; -} - -describe("Operation Infrastructure", () => { - it("Operations: Test a simple set of operations", () => { - logger.debug("Starting simple operations test."); - const testOperation: Operations = new TestOperations1(); - let operationResults: IOperationResult = null; - testOperation.executeOperation(Operation.NO_PARMS, (output: any, opResults: IOperationResult) => { - logger.debug("All operations have completed"); - operationResults = opResults; - checkResults(operationResults, OperationTestConstants.OPER_TEST1_RESULTS); - }); - }); - it("Operations: Test for complex set of operations", () => { - logger.debug("Starting complex operations tests."); - const testOperation: Operations = new TestOperations3(); - let operationResults: IOperationResult = null; - testOperation.executeOperation(Operation.NO_PARMS, (output: any, opResults: IOperationResult) => { - logger.debug("All operations have completed"); - operationResults = opResults; - checkResults(operationResults, OperationTestConstants.OPER_TEST3_RESULTS); - }); - }); - it("Operations: Test for complex set of undo operations", () => { - logger.debug("Starting simple undo test"); - const testOperation: Operations = new TestOperations4(); - let operationResults: IOperationResult = null; - testOperation.executeOperation(Operation.NO_PARMS, (output: any, opResults: IOperationResult) => { - logger.debug("All operations have completed"); - operationResults = opResults; - checkResults(operationResults, OperationTestConstants.OPER_TEST2_RESULTS); - }); - }); -}); - -function checkResults(operationActualResults: IOperationResult, - operationExpectedResults: Array>) { - - if (isNullOrUndefined(operationActualResults)) { - expect(0).toEqual(1); - let currentOperationResults: IOperationResult = operationActualResults; - for (const result of operationExpectedResults) { - logger.debug("Result operation name: " + currentOperationResults.operationName); - logger.debug("Result expected name: " + result.operationName); - - /** - * Test all the operation result properties agaisnt the set of expected properties - */ - logger.debug("Checking operation name match..."); - expect(currentOperationResults.operationName).toEqual(result.operationName); - logger.debug("Checking operation failed match..."); - expect(currentOperationResults.operationFailed).toEqual(result.operationFailed); - logger.debug("Checking operation undo possible match..."); - expect(currentOperationResults.operationUndoPossible).toEqual(result.operationUndoPossible); - logger.debug("Checking operation undo attempted match..."); - expect(currentOperationResults.operationUndoAttempted).toEqual(result.operationUndoAttempted); - - currentOperationResults = currentOperationResults.nextOperationResult; - } - - if (!isNullOrUndefined(currentOperationResults)) { - // more results than expected - fail - expect(0).toEqual(1); - } - } -} diff --git a/packages/imperative/src/operations/__tests__/operation/TestOperations1.ts b/packages/imperative/src/operations/__tests__/operation/TestOperations1.ts deleted file mode 100644 index a56482a68f..0000000000 --- a/packages/imperative/src/operations/__tests__/operation/TestOperations1.ts +++ /dev/null @@ -1,28 +0,0 @@ -/* -* 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 { TestSubOp1 } from "./subops/TestSubOp1"; -import { TestSubOp2 } from "./subops/TestSubOp2"; -import { TestSubOpNoUndo } from "./subops/TestSubOpNoUndo"; -import { Operations } from "../../../index"; -export class TestOperations1 extends Operations { - - constructor() { - super("Test Operations 1", true); - this.defineOperations(); - } - - protected defineOperations(): void { - this.addNextOperation(new TestSubOp1()); - this.addNextOperation(new TestSubOp2()); - this.addNextOperation(new TestSubOpNoUndo()); - } -} diff --git a/packages/imperative/src/operations/__tests__/operation/TestOperations2.ts b/packages/imperative/src/operations/__tests__/operation/TestOperations2.ts deleted file mode 100644 index 2734327281..0000000000 --- a/packages/imperative/src/operations/__tests__/operation/TestOperations2.ts +++ /dev/null @@ -1,27 +0,0 @@ -/* -* 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 { TestSubOp4 } from "./subops/TestSubOp4"; -import { TestSubOp5 } from "./subops/TestSubOp5"; -import { Operations } from "../../../index"; - -export class TestOperations2 extends Operations { - - constructor() { - super("Test Operations 2", true); - this.defineOperations(); - } - - protected defineOperations(): void { - this.addNextOperation(new TestSubOp4()); - this.addNextOperation(new TestSubOp5()); - } -} diff --git a/packages/imperative/src/operations/__tests__/operation/TestOperations3.ts b/packages/imperative/src/operations/__tests__/operation/TestOperations3.ts deleted file mode 100644 index bf38287b1a..0000000000 --- a/packages/imperative/src/operations/__tests__/operation/TestOperations3.ts +++ /dev/null @@ -1,29 +0,0 @@ -/* -* 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 { TestSubOp6 } from "./subops/TestSubOp6"; -import { TestOperations1 } from "./TestOperations1"; -import { TestOperations2 } from "./TestOperations2"; -import { Operations } from "../../../index"; - -export class TestOperations3 extends Operations { - - constructor() { - super("Test Operations 3", true); - this.defineOperations(); - } - - protected defineOperations(): void { - this.addNextOperation(new TestOperations1()); - this.addNextOperation(new TestOperations2()); - this.addNextOperation(new TestSubOp6()); - } -} diff --git a/packages/imperative/src/operations/__tests__/operation/TestOperations4.ts b/packages/imperative/src/operations/__tests__/operation/TestOperations4.ts deleted file mode 100644 index 0d8761e2ee..0000000000 --- a/packages/imperative/src/operations/__tests__/operation/TestOperations4.ts +++ /dev/null @@ -1,29 +0,0 @@ -/* -* 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 { TestOperations1 } from "./TestOperations1"; -import { TestOperations2 } from "./TestOperations2"; -import { TestSubOpFail } from "./subops/TestSubOpFail"; -import { Operations } from "../../../index"; - -export class TestOperations4 extends Operations { - - constructor() { - super("Test Operations 4: Fail Test", true); - this.defineOperations(); - } - - protected defineOperations(): void { - this.addNextOperation(new TestOperations1()); - this.addNextOperation(new TestOperations2()); - this.addNextOperation(new TestSubOpFail()); - } -} diff --git a/packages/imperative/src/operations/__tests__/operation/TestOperations5.ts b/packages/imperative/src/operations/__tests__/operation/TestOperations5.ts deleted file mode 100644 index 9568473ef6..0000000000 --- a/packages/imperative/src/operations/__tests__/operation/TestOperations5.ts +++ /dev/null @@ -1,27 +0,0 @@ -/* -* 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 { TestOperations1 } from "./TestOperations1"; -import { TestSubOpDiverge } from "./subops/TestSubOpDiverge"; -import { Operations } from "../../../index"; - -export class TestOperation5 extends Operations { - - constructor() { - super("Test Operations 5: Diverge Test", true); - this.defineOperations(); - } - - protected defineOperations(): void { - this.addNextOperation(new TestOperations1()); - this.addNextOperation(new TestSubOpDiverge()); - } -} diff --git a/packages/imperative/src/operations/__tests__/operation/subops/TestSubOp1.ts b/packages/imperative/src/operations/__tests__/operation/subops/TestSubOp1.ts deleted file mode 100644 index bcd7e68d40..0000000000 --- a/packages/imperative/src/operations/__tests__/operation/subops/TestSubOp1.ts +++ /dev/null @@ -1,38 +0,0 @@ -/* -* 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 { IOperationCompleted, IOperationUndoCompleted, Operation } from "../../../../index"; - -export class TestSubOp1 extends Operation { - - constructor() { - super("Initialize Test Sub Op 1", true); - } - - public logOperationResults(): void { - this.log.info("Test sub operation 1 has ended."); - } - - protected execute(inputParameters: any, operationCompletedCallback: IOperationCompleted) { - this.operationResultMessage = "The test sub op 1 is executing."; - this.setOperationUndoable(); - operationCompletedCallback(Operation.NO_OUTPUT); - } - - protected undo(undoCompletedCallback: IOperationUndoCompleted): void { - this.log.info("Performing undo action for test sub op 1."); - undoCompletedCallback(); - } - - protected logOperationBeginMessages(): void { - this.log.info("Test sub operation 1 is beginning."); - } -} diff --git a/packages/imperative/src/operations/__tests__/operation/subops/TestSubOp2.ts b/packages/imperative/src/operations/__tests__/operation/subops/TestSubOp2.ts deleted file mode 100644 index fd91710248..0000000000 --- a/packages/imperative/src/operations/__tests__/operation/subops/TestSubOp2.ts +++ /dev/null @@ -1,40 +0,0 @@ -/* -* 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 { IOperationCompleted, IOperationUndoCompleted, Operation } from "../../../../index"; - -export class TestSubOp2 extends Operation { - - constructor() { - super("Initialize Test Sub Op 2", true); - } - - public logOperationResults(): void { - this.log.info("Test sub operation 2 has ended."); - } - - protected execute(inputParameters: any, operationCompletedCallback: IOperationCompleted) { - this.operationResultMessage = "The test sub op 2 was executed."; - this.setOperationUndoable(); - operationCompletedCallback(Operation.NO_OUTPUT); - } - - protected undo(undoCompletedCallback: IOperationUndoCompleted): void { - this.log.info("Performing undo action for test sub op 2."); - undoCompletedCallback(); - } - - protected logOperationBeginMessages(): void { - this.log.info("Test sub operation 2 is beginning."); - } - - -} diff --git a/packages/imperative/src/operations/__tests__/operation/subops/TestSubOp4.ts b/packages/imperative/src/operations/__tests__/operation/subops/TestSubOp4.ts deleted file mode 100644 index a6bba7be64..0000000000 --- a/packages/imperative/src/operations/__tests__/operation/subops/TestSubOp4.ts +++ /dev/null @@ -1,41 +0,0 @@ -/* -* 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 { IOperationCompleted, IOperationUndoCompleted, Operation } from "../../../../index"; -import { TestLogger } from "../../../../../__tests__/src/TestLogger"; - -const logger = TestLogger.getTestLogger(); - -export class TestSubOp4 extends Operation { - - constructor() { - super("Initialize Test Sub Op 4", true); - } - - public logOperationResults(): void { - logger.info("Test sub operation 4 has ended."); - } - - protected execute(inputParameters: any, operationCompletedCallback: IOperationCompleted) { - this.operationResultMessage = "The test sub op 4 was executed."; - this.setOperationUndoable(); - operationCompletedCallback(Operation.NO_OUTPUT); - } - - protected undo(undoCompletedCallback: IOperationUndoCompleted): void { - logger.info("Performing undo action for test sub op 4."); - undoCompletedCallback(); - } - - protected logOperationBeginMessages(): void { - logger.info("Test sub operation 4 is beginning."); - } -} diff --git a/packages/imperative/src/operations/__tests__/operation/subops/TestSubOp5.ts b/packages/imperative/src/operations/__tests__/operation/subops/TestSubOp5.ts deleted file mode 100644 index 07194c129c..0000000000 --- a/packages/imperative/src/operations/__tests__/operation/subops/TestSubOp5.ts +++ /dev/null @@ -1,41 +0,0 @@ -/* -* 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 { IOperationCompleted, IOperationUndoCompleted, Operation } from "../../../../index"; -import { TestLogger } from "../../../../../__tests__/src/TestLogger"; - -const logger = TestLogger.getTestLogger(); - -export class TestSubOp5 extends Operation { - - constructor() { - super("Initialize Test Sub Op 5", true); - } - - public logOperationResults(): void { - logger.debug("Test sub operation 5 has ended."); - } - - protected execute(inputParameters: any, operationCompletedCallback: IOperationCompleted) { - this.operationResultMessage = "The test sub op 5 was executed."; - this.setOperationUndoable(); - operationCompletedCallback(Operation.NO_OUTPUT); - } - - protected undo(undoCompletedCallback: IOperationUndoCompleted): void { - logger.debug("Performing undo action for test sub op 5."); - undoCompletedCallback(); - } - - protected logOperationBeginMessages(): void { - logger.debug("Test sub operation 5 is beginning."); - } -} diff --git a/packages/imperative/src/operations/__tests__/operation/subops/TestSubOp6.ts b/packages/imperative/src/operations/__tests__/operation/subops/TestSubOp6.ts deleted file mode 100644 index 5a7e97c0ce..0000000000 --- a/packages/imperative/src/operations/__tests__/operation/subops/TestSubOp6.ts +++ /dev/null @@ -1,41 +0,0 @@ -/* -* 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 { IOperationCompleted, IOperationUndoCompleted, Operation } from "../../../../index"; -import { TestLogger } from "../../../../../__tests__/src/TestLogger"; - -const logger = TestLogger.getTestLogger(); - -export class TestSubOp6 extends Operation { - - constructor() { - super("Initialize Test Sub Op 6", true); - } - - public logOperationResults(): void { - logger.debug("Test sub operation 6 has ended."); - } - - protected execute(inputParameters: any, operationCompletedCallback: IOperationCompleted) { - this.operationResultMessage = "The test sub op 6 was executed."; - this.setOperationUndoable(); - operationCompletedCallback(Operation.NO_OUTPUT); - } - - protected undo(undoCompletedCallback: IOperationUndoCompleted): void { - logger.debug("Performing undo action for test sub op 6."); - undoCompletedCallback(); - } - - protected logOperationBeginMessages(): void { - logger.debug("Test sub operation 6 is beginning."); - } -} diff --git a/packages/imperative/src/operations/__tests__/operation/subops/TestSubOpDiverge.ts b/packages/imperative/src/operations/__tests__/operation/subops/TestSubOpDiverge.ts deleted file mode 100644 index a5163a238d..0000000000 --- a/packages/imperative/src/operations/__tests__/operation/subops/TestSubOpDiverge.ts +++ /dev/null @@ -1,43 +0,0 @@ -/* -* 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 { TestOperations2 } from "../TestOperations2"; -import { IOperationCompleted, IOperationUndoCompleted, Operation } from "../../../../index"; -import { TestLogger } from "../../../../../__tests__/src/TestLogger"; - -const logger = TestLogger.getTestLogger(); - -export class TestSubOpDiverge extends Operation { - - constructor() { - super("Initialize Test Sub Op diverge", true); - } - - public logOperationResults(): void { - logger.debug("Test sub operation diverge has ended."); - } - - protected execute(inputParameters: any, operationCompletedCallback: IOperationCompleted) { - this.operationResultMessage = "The test sub op diverge was executed."; - this.setOperationUndoable(); - this.setOperationDiverge(new TestOperations2(), true); - operationCompletedCallback(Operation.NO_OUTPUT); - } - - protected undo(undoCompletedCallback: IOperationUndoCompleted): void { - logger.debug("Performing undo action for test sub op diverge."); - undoCompletedCallback(); - } - - protected logOperationBeginMessages(): void { - logger.debug("Test sub operation diverge is beginning."); - } -} diff --git a/packages/imperative/src/operations/__tests__/operation/subops/TestSubOpFail.ts b/packages/imperative/src/operations/__tests__/operation/subops/TestSubOpFail.ts deleted file mode 100644 index 2806d2e80e..0000000000 --- a/packages/imperative/src/operations/__tests__/operation/subops/TestSubOpFail.ts +++ /dev/null @@ -1,39 +0,0 @@ -/* -* 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 { IOperationCompleted, IOperationUndoCompleted, Operation } from "../../../../index"; - -export class TestSubOpFail extends Operation { - - constructor() { - super("Initialize Test Sub Op fail", true); - } - - public logOperationResults(): void { - this.log.info("Test sub operation failed has ended."); - } - - protected execute(inputParameters: any, operationCompletedCallback: IOperationCompleted) { - this.operationResultMessage = "The test sub op diverge was fail."; - this.setOperationUndoable(); - this.setOperationFailed(); - operationCompletedCallback(Operation.NO_OUTPUT); - } - - protected undo(undoCompleteCallback: IOperationUndoCompleted): void { - this.log.info("Performing undo action for test sub op fail."); - undoCompleteCallback(); - } - - protected logOperationBeginMessages(): void { - this.log.info("Test sub operation failed is beginning."); - } -} diff --git a/packages/imperative/src/operations/__tests__/operation/subops/TestSubOpNoUndo.ts b/packages/imperative/src/operations/__tests__/operation/subops/TestSubOpNoUndo.ts deleted file mode 100644 index 6ecf15e227..0000000000 --- a/packages/imperative/src/operations/__tests__/operation/subops/TestSubOpNoUndo.ts +++ /dev/null @@ -1,40 +0,0 @@ -/* -* 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 { IOperationCompleted, IOperationUndoCompleted, Operation } from "../../../../index"; -import { TestLogger } from "../../../../../__tests__/src/TestLogger"; - -const logger = TestLogger.getTestLogger(); - -export class TestSubOpNoUndo extends Operation { - - constructor() { - super("Initialize Test Sub Op No Undo", false); - } - - public logOperationResults(): void { - logger.debug("Test sub operation no undo has ended."); - } - - protected execute(inputParameters: any, operationCompletedCallback: IOperationCompleted) { - this.operationResultMessage = "The test sub op No Undo was executed."; - operationCompletedCallback(Operation.NO_OUTPUT); - } - - protected undo(undoCompletedCallback: IOperationUndoCompleted): void { - logger.debug("Performing undo action for test sub op No Undo."); - undoCompletedCallback(); - } - - protected logOperationBeginMessages(): void { - logger.debug("Test sub operation no undo is beginning."); - } -} diff --git a/packages/imperative/src/operations/src/doc/IOperationResult.ts b/packages/imperative/src/operations/doc/IOperationResult.ts similarity index 100% rename from packages/imperative/src/operations/src/doc/IOperationResult.ts rename to packages/imperative/src/operations/doc/IOperationResult.ts diff --git a/packages/imperative/src/operations/src/doc/ITaskWithStatus.ts b/packages/imperative/src/operations/doc/ITaskWithStatus.ts similarity index 100% rename from packages/imperative/src/operations/src/doc/ITaskWithStatus.ts rename to packages/imperative/src/operations/doc/ITaskWithStatus.ts diff --git a/packages/imperative/src/operations/index.ts b/packages/imperative/src/operations/index.ts index dea33611e2..c935e4f059 100644 --- a/packages/imperative/src/operations/index.ts +++ b/packages/imperative/src/operations/index.ts @@ -9,9 +9,9 @@ * */ -export * from "./src/doc/IOperationResult"; -export * from "./src/doc/ITaskWithStatus"; -export * from "./src/Operation"; -export * from "./src/Operations"; -export * from "./src/TaskProgress"; -export * from "./src/TaskStage"; +export * from "./doc/IOperationResult"; +export * from "./doc/ITaskWithStatus"; +export * from "./Operation"; +export * from "./Operations"; +export * from "./TaskProgress"; +export * from "./TaskStage"; diff --git a/packages/imperative/src/profiles/src/BasicProfileManager.ts b/packages/imperative/src/profiles/BasicProfileManager.ts similarity index 99% rename from packages/imperative/src/profiles/src/BasicProfileManager.ts rename to packages/imperative/src/profiles/BasicProfileManager.ts index 75859ef234..b85a3cc0af 100644 --- a/packages/imperative/src/profiles/src/BasicProfileManager.ts +++ b/packages/imperative/src/profiles/BasicProfileManager.ts @@ -28,9 +28,9 @@ import { IValidateProfileWithSchema } from "./doc"; -import { ImperativeExpect } from "../../expect"; +import { ImperativeExpect } from "../expect"; import { isNullOrUndefined } from "util"; -import { ImperativeError } from "../../error"; +import { ImperativeError } from "../error"; import { ProfileIO } from "./utils"; /** diff --git a/packages/imperative/src/profiles/src/BasicProfileManagerFactory.ts b/packages/imperative/src/profiles/BasicProfileManagerFactory.ts similarity index 100% rename from packages/imperative/src/profiles/src/BasicProfileManagerFactory.ts rename to packages/imperative/src/profiles/BasicProfileManagerFactory.ts diff --git a/packages/imperative/src/profiles/src/abstract/AbstractProfileManager.ts b/packages/imperative/src/profiles/abstract/AbstractProfileManager.ts similarity index 99% rename from packages/imperative/src/profiles/src/abstract/AbstractProfileManager.ts rename to packages/imperative/src/profiles/abstract/AbstractProfileManager.ts index 50eaa93ff9..70279204fe 100644 --- a/packages/imperative/src/profiles/src/abstract/AbstractProfileManager.ts +++ b/packages/imperative/src/profiles/abstract/AbstractProfileManager.ts @@ -9,10 +9,10 @@ * */ -import { ImperativeExpect } from "../../../expect"; +import { ImperativeExpect } from "../../expect"; import { inspect, isNullOrUndefined, isString } from "util"; -import { Logger } from "../../../logger"; -import { ImperativeError } from "../../../error"; +import { Logger } from "../../logger"; +import { ImperativeError } from "../../error"; import * as nodePath from "path"; import { IDeleteProfile, @@ -35,7 +35,7 @@ import { ILoadAllProfiles } from "../doc/"; import { ProfileIO, ProfileUtils } from "../utils"; -import { ImperativeConfig } from "../../../utilities"; +import { ImperativeConfig } from "../../utilities"; const SchemaValidator = require("jsonschema").Validator; diff --git a/packages/imperative/src/profiles/src/abstract/AbstractProfileManagerFactory.ts b/packages/imperative/src/profiles/abstract/AbstractProfileManagerFactory.ts similarity index 100% rename from packages/imperative/src/profiles/src/abstract/AbstractProfileManagerFactory.ts rename to packages/imperative/src/profiles/abstract/AbstractProfileManagerFactory.ts diff --git a/packages/imperative/src/profiles/src/constants/ProfilesConstants.ts b/packages/imperative/src/profiles/constants/ProfilesConstants.ts similarity index 100% rename from packages/imperative/src/profiles/src/constants/ProfilesConstants.ts rename to packages/imperative/src/profiles/constants/ProfilesConstants.ts diff --git a/packages/imperative/src/profiles/src/doc/api/IProfileManagerFactory.ts b/packages/imperative/src/profiles/doc/api/IProfileManagerFactory.ts similarity index 100% rename from packages/imperative/src/profiles/src/doc/api/IProfileManagerFactory.ts rename to packages/imperative/src/profiles/doc/api/IProfileManagerFactory.ts diff --git a/packages/imperative/src/profiles/src/doc/config/IProfileTypeConfiguration.ts b/packages/imperative/src/profiles/doc/config/IProfileTypeConfiguration.ts similarity index 100% rename from packages/imperative/src/profiles/src/doc/config/IProfileTypeConfiguration.ts rename to packages/imperative/src/profiles/doc/config/IProfileTypeConfiguration.ts diff --git a/packages/imperative/src/profiles/src/doc/definition/IMetaProfile.ts b/packages/imperative/src/profiles/doc/definition/IMetaProfile.ts similarity index 100% rename from packages/imperative/src/profiles/src/doc/definition/IMetaProfile.ts rename to packages/imperative/src/profiles/doc/definition/IMetaProfile.ts diff --git a/packages/imperative/src/profiles/src/doc/definition/IProfile.ts b/packages/imperative/src/profiles/doc/definition/IProfile.ts similarity index 100% rename from packages/imperative/src/profiles/src/doc/definition/IProfile.ts rename to packages/imperative/src/profiles/doc/definition/IProfile.ts diff --git a/packages/imperative/src/profiles/src/doc/definition/IProfileDependency.ts b/packages/imperative/src/profiles/doc/definition/IProfileDependency.ts similarity index 100% rename from packages/imperative/src/profiles/src/doc/definition/IProfileDependency.ts rename to packages/imperative/src/profiles/doc/definition/IProfileDependency.ts diff --git a/packages/imperative/src/profiles/src/doc/definition/IProfileProperty.ts b/packages/imperative/src/profiles/doc/definition/IProfileProperty.ts similarity index 100% rename from packages/imperative/src/profiles/src/doc/definition/IProfileProperty.ts rename to packages/imperative/src/profiles/doc/definition/IProfileProperty.ts diff --git a/packages/imperative/src/profiles/src/doc/definition/IProfileSchema.ts b/packages/imperative/src/profiles/doc/definition/IProfileSchema.ts similarity index 100% rename from packages/imperative/src/profiles/src/doc/definition/IProfileSchema.ts rename to packages/imperative/src/profiles/doc/definition/IProfileSchema.ts diff --git a/packages/imperative/src/profiles/src/doc/definition/index.ts b/packages/imperative/src/profiles/doc/definition/index.ts similarity index 100% rename from packages/imperative/src/profiles/src/doc/definition/index.ts rename to packages/imperative/src/profiles/doc/definition/index.ts diff --git a/packages/imperative/src/profiles/src/doc/index.ts b/packages/imperative/src/profiles/doc/index.ts similarity index 100% rename from packages/imperative/src/profiles/src/doc/index.ts rename to packages/imperative/src/profiles/doc/index.ts diff --git a/packages/imperative/src/profiles/src/doc/parms/IDeleteProfile.ts b/packages/imperative/src/profiles/doc/parms/IDeleteProfile.ts similarity index 100% rename from packages/imperative/src/profiles/src/doc/parms/IDeleteProfile.ts rename to packages/imperative/src/profiles/doc/parms/IDeleteProfile.ts diff --git a/packages/imperative/src/profiles/src/doc/parms/ILoadAllProfiles.ts b/packages/imperative/src/profiles/doc/parms/ILoadAllProfiles.ts similarity index 100% rename from packages/imperative/src/profiles/src/doc/parms/ILoadAllProfiles.ts rename to packages/imperative/src/profiles/doc/parms/ILoadAllProfiles.ts diff --git a/packages/imperative/src/profiles/src/doc/parms/ILoadProfile.ts b/packages/imperative/src/profiles/doc/parms/ILoadProfile.ts similarity index 100% rename from packages/imperative/src/profiles/src/doc/parms/ILoadProfile.ts rename to packages/imperative/src/profiles/doc/parms/ILoadProfile.ts diff --git a/packages/imperative/src/profiles/src/doc/parms/IProfileManager.ts b/packages/imperative/src/profiles/doc/parms/IProfileManager.ts similarity index 98% rename from packages/imperative/src/profiles/src/doc/parms/IProfileManager.ts rename to packages/imperative/src/profiles/doc/parms/IProfileManager.ts index c4f4ac6cb9..6c8ece15b2 100644 --- a/packages/imperative/src/profiles/src/doc/parms/IProfileManager.ts +++ b/packages/imperative/src/profiles/doc/parms/IProfileManager.ts @@ -15,7 +15,7 @@ * @export * @interface IProfileManager */ -import { Logger } from "../../../../logger"; +import { Logger } from "../../../logger"; import { IProfileTypeConfiguration } from "../config/IProfileTypeConfiguration"; export interface IProfileManager { diff --git a/packages/imperative/src/profiles/src/doc/parms/IProfileManagerInit.ts b/packages/imperative/src/profiles/doc/parms/IProfileManagerInit.ts similarity index 100% rename from packages/imperative/src/profiles/src/doc/parms/IProfileManagerInit.ts rename to packages/imperative/src/profiles/doc/parms/IProfileManagerInit.ts diff --git a/packages/imperative/src/profiles/src/doc/parms/ISaveProfile.ts b/packages/imperative/src/profiles/doc/parms/ISaveProfile.ts similarity index 100% rename from packages/imperative/src/profiles/src/doc/parms/ISaveProfile.ts rename to packages/imperative/src/profiles/doc/parms/ISaveProfile.ts diff --git a/packages/imperative/src/profiles/src/doc/parms/ISaveProfileFromCliArgs.ts b/packages/imperative/src/profiles/doc/parms/ISaveProfileFromCliArgs.ts similarity index 100% rename from packages/imperative/src/profiles/src/doc/parms/ISaveProfileFromCliArgs.ts rename to packages/imperative/src/profiles/doc/parms/ISaveProfileFromCliArgs.ts diff --git a/packages/imperative/src/profiles/src/doc/parms/ISetDefaultProfile.ts b/packages/imperative/src/profiles/doc/parms/ISetDefaultProfile.ts similarity index 100% rename from packages/imperative/src/profiles/src/doc/parms/ISetDefaultProfile.ts rename to packages/imperative/src/profiles/doc/parms/ISetDefaultProfile.ts diff --git a/packages/imperative/src/profiles/src/doc/parms/IUpdateProfile.ts b/packages/imperative/src/profiles/doc/parms/IUpdateProfile.ts similarity index 100% rename from packages/imperative/src/profiles/src/doc/parms/IUpdateProfile.ts rename to packages/imperative/src/profiles/doc/parms/IUpdateProfile.ts diff --git a/packages/imperative/src/profiles/src/doc/parms/IUpdateProfileFromCliArgs.ts b/packages/imperative/src/profiles/doc/parms/IUpdateProfileFromCliArgs.ts similarity index 100% rename from packages/imperative/src/profiles/src/doc/parms/IUpdateProfileFromCliArgs.ts rename to packages/imperative/src/profiles/doc/parms/IUpdateProfileFromCliArgs.ts diff --git a/packages/imperative/src/profiles/src/doc/parms/IValidateProfile.ts b/packages/imperative/src/profiles/doc/parms/IValidateProfile.ts similarity index 100% rename from packages/imperative/src/profiles/src/doc/parms/IValidateProfile.ts rename to packages/imperative/src/profiles/doc/parms/IValidateProfile.ts diff --git a/packages/imperative/src/profiles/src/doc/parms/IValidateProfileForCLI.ts b/packages/imperative/src/profiles/doc/parms/IValidateProfileForCLI.ts similarity index 100% rename from packages/imperative/src/profiles/src/doc/parms/IValidateProfileForCLI.ts rename to packages/imperative/src/profiles/doc/parms/IValidateProfileForCLI.ts diff --git a/packages/imperative/src/profiles/src/doc/parms/IValidateProfileWithSchema.ts b/packages/imperative/src/profiles/doc/parms/IValidateProfileWithSchema.ts similarity index 100% rename from packages/imperative/src/profiles/src/doc/parms/IValidateProfileWithSchema.ts rename to packages/imperative/src/profiles/doc/parms/IValidateProfileWithSchema.ts diff --git a/packages/imperative/src/profiles/src/doc/parms/index.ts b/packages/imperative/src/profiles/doc/parms/index.ts similarity index 100% rename from packages/imperative/src/profiles/src/doc/parms/index.ts rename to packages/imperative/src/profiles/doc/parms/index.ts diff --git a/packages/imperative/src/profiles/src/doc/response/IProfileDeleted.ts b/packages/imperative/src/profiles/doc/response/IProfileDeleted.ts similarity index 100% rename from packages/imperative/src/profiles/src/doc/response/IProfileDeleted.ts rename to packages/imperative/src/profiles/doc/response/IProfileDeleted.ts diff --git a/packages/imperative/src/profiles/src/doc/response/IProfileInitialized.ts b/packages/imperative/src/profiles/doc/response/IProfileInitialized.ts similarity index 100% rename from packages/imperative/src/profiles/src/doc/response/IProfileInitialized.ts rename to packages/imperative/src/profiles/doc/response/IProfileInitialized.ts diff --git a/packages/imperative/src/profiles/src/doc/response/IProfileLoaded.ts b/packages/imperative/src/profiles/doc/response/IProfileLoaded.ts similarity index 100% rename from packages/imperative/src/profiles/src/doc/response/IProfileLoaded.ts rename to packages/imperative/src/profiles/doc/response/IProfileLoaded.ts diff --git a/packages/imperative/src/profiles/src/doc/response/IProfileSaved.ts b/packages/imperative/src/profiles/doc/response/IProfileSaved.ts similarity index 100% rename from packages/imperative/src/profiles/src/doc/response/IProfileSaved.ts rename to packages/imperative/src/profiles/doc/response/IProfileSaved.ts diff --git a/packages/imperative/src/profiles/src/doc/response/IProfileUpdated.ts b/packages/imperative/src/profiles/doc/response/IProfileUpdated.ts similarity index 100% rename from packages/imperative/src/profiles/src/doc/response/IProfileUpdated.ts rename to packages/imperative/src/profiles/doc/response/IProfileUpdated.ts diff --git a/packages/imperative/src/profiles/src/doc/response/IProfileValidated.ts b/packages/imperative/src/profiles/doc/response/IProfileValidated.ts similarity index 100% rename from packages/imperative/src/profiles/src/doc/response/IProfileValidated.ts rename to packages/imperative/src/profiles/doc/response/IProfileValidated.ts diff --git a/packages/imperative/src/profiles/src/doc/response/index.ts b/packages/imperative/src/profiles/doc/response/index.ts similarity index 100% rename from packages/imperative/src/profiles/src/doc/response/index.ts rename to packages/imperative/src/profiles/doc/response/index.ts diff --git a/packages/imperative/src/profiles/index.ts b/packages/imperative/src/profiles/index.ts index 1e761a6387..a33497f089 100644 --- a/packages/imperative/src/profiles/index.ts +++ b/packages/imperative/src/profiles/index.ts @@ -9,51 +9,51 @@ * */ -export * from "./src/constants/ProfilesConstants"; - -export * from "./src/doc"; - -export * from "./src/doc/definition/IMetaProfile"; -export * from "./src/doc/definition/IProfile"; -export * from "./src/doc/definition/IProfileDependency"; -export * from "./src/doc/definition/IProfileProperty"; -export * from "./src/doc/definition/IProfileSchema"; -export * from "./src/doc/api/IProfileManagerFactory"; - -export * from "./src/doc/parms/IDeleteProfile"; -export * from "./src/doc/parms/ILoadProfile"; -export * from "./src/doc/parms/IProfileManager"; -export * from "./src/doc/parms/IProfileManagerInit"; -export * from "./src/doc/parms/ISaveProfile"; -export * from "./src/doc/parms/ISaveProfileFromCliArgs"; -export * from "./src/doc/parms/ISetDefaultProfile"; -export * from "./src/doc/parms/IUpdateProfile"; -export * from "./src/doc/parms/IUpdateProfileFromCliArgs"; -export * from "./src/doc/parms/IValidateProfile"; -export * from "./src/doc/parms/IValidateProfileForCLI"; -export * from "./src/doc/parms/IValidateProfileWithSchema"; - -export * from "./src/doc/api/IProfileManagerFactory"; - -export * from "./src/doc/response/IProfileDeleted"; -export * from "./src/doc/response/IProfileInitialized"; -export * from "./src/doc/response/IProfileLoaded"; -export * from "./src/doc/response/IProfileSaved"; -export * from "./src/doc/response/IProfileUpdated"; -export * from "./src/doc/response/IProfileValidated"; - -export * from "./src/utils/ProfileIO"; -export * from "./src/utils/ProfileUtils"; -export * from "./src/utils"; - -export * from "./src/validation/api/ProfileValidator"; - -export * from "./src/validation/doc/IProfileValidationPlan"; -export * from "./src/validation/doc/IProfileValidationReport"; -export * from "./src/validation/doc/IProfileValidationTask"; -export * from "./src/validation/doc/IProfileValidationTaskResult"; - -export * from "./src/BasicProfileManager"; -export * from "./src/BasicProfileManagerFactory"; - -export * from "./src/abstract/AbstractProfileManagerFactory"; +export * from "./constants/ProfilesConstants"; + +export * from "./doc"; + +export * from "./doc/definition/IMetaProfile"; +export * from "./doc/definition/IProfile"; +export * from "./doc/definition/IProfileDependency"; +export * from "./doc/definition/IProfileProperty"; +export * from "./doc/definition/IProfileSchema"; +export * from "./doc/api/IProfileManagerFactory"; + +export * from "./doc/parms/IDeleteProfile"; +export * from "./doc/parms/ILoadProfile"; +export * from "./doc/parms/IProfileManager"; +export * from "./doc/parms/IProfileManagerInit"; +export * from "./doc/parms/ISaveProfile"; +export * from "./doc/parms/ISaveProfileFromCliArgs"; +export * from "./doc/parms/ISetDefaultProfile"; +export * from "./doc/parms/IUpdateProfile"; +export * from "./doc/parms/IUpdateProfileFromCliArgs"; +export * from "./doc/parms/IValidateProfile"; +export * from "./doc/parms/IValidateProfileForCLI"; +export * from "./doc/parms/IValidateProfileWithSchema"; + +export * from "./doc/api/IProfileManagerFactory"; + +export * from "./doc/response/IProfileDeleted"; +export * from "./doc/response/IProfileInitialized"; +export * from "./doc/response/IProfileLoaded"; +export * from "./doc/response/IProfileSaved"; +export * from "./doc/response/IProfileUpdated"; +export * from "./doc/response/IProfileValidated"; + +export * from "./utils/ProfileIO"; +export * from "./utils/ProfileUtils"; +export * from "./utils"; + +export * from "./validation/api/ProfileValidator"; + +export * from "./validation/doc/IProfileValidationPlan"; +export * from "./validation/doc/IProfileValidationReport"; +export * from "./validation/doc/IProfileValidationTask"; +export * from "./validation/doc/IProfileValidationTaskResult"; + +export * from "./BasicProfileManager"; +export * from "./BasicProfileManagerFactory"; + +export * from "./abstract/AbstractProfileManagerFactory"; diff --git a/packages/imperative/src/profiles/src/utils/ProfileIO.ts b/packages/imperative/src/profiles/utils/ProfileIO.ts similarity index 98% rename from packages/imperative/src/profiles/src/utils/ProfileIO.ts rename to packages/imperative/src/profiles/utils/ProfileIO.ts index 41f7419d19..63073f544a 100644 --- a/packages/imperative/src/profiles/src/utils/ProfileIO.ts +++ b/packages/imperative/src/profiles/utils/ProfileIO.ts @@ -9,13 +9,13 @@ * */ -import { ImperativeError } from "../../../error"; -import { ImperativeConfig } from "../../../utilities"; +import { ImperativeError } from "../../error"; +import { ImperativeConfig } from "../../utilities/ImperativeConfig"; import * as fs from "fs"; import { IProfile } from "../doc/definition/IProfile"; import { IMetaProfile } from "../doc/definition/IMetaProfile"; import * as pathPackage from "path"; -import { IO } from "../../../io"; +import { IO } from "../../io"; import { IProfileTypeConfiguration } from "../doc/config/IProfileTypeConfiguration"; const readYaml = require("js-yaml"); diff --git a/packages/imperative/src/profiles/src/utils/ProfileUtils.ts b/packages/imperative/src/profiles/utils/ProfileUtils.ts similarity index 100% rename from packages/imperative/src/profiles/src/utils/ProfileUtils.ts rename to packages/imperative/src/profiles/utils/ProfileUtils.ts diff --git a/packages/imperative/src/profiles/src/utils/__mocks__/ProfileIO.ts b/packages/imperative/src/profiles/utils/__mocks__/ProfileIO.ts similarity index 100% rename from packages/imperative/src/profiles/src/utils/__mocks__/ProfileIO.ts rename to packages/imperative/src/profiles/utils/__mocks__/ProfileIO.ts diff --git a/packages/imperative/src/profiles/src/utils/__tests__/ProfileIO.unit.test.ts b/packages/imperative/src/profiles/utils/__tests__/ProfileIO.unit.test.ts similarity index 98% rename from packages/imperative/src/profiles/src/utils/__tests__/ProfileIO.unit.test.ts rename to packages/imperative/src/profiles/utils/__tests__/ProfileIO.unit.test.ts index 4ec7455fcc..cb57be6d89 100644 --- a/packages/imperative/src/profiles/src/utils/__tests__/ProfileIO.unit.test.ts +++ b/packages/imperative/src/profiles/utils/__tests__/ProfileIO.unit.test.ts @@ -15,21 +15,21 @@ jest.mock("fs"); jest.mock("../../../../io/src/IO"); jest.mock("js-yaml"); jest.mock("yamljs"); -jest.mock("../../../../utilities/src/ImperativeConfig"); +jest.mock("../../../../utilities/ImperativeConfig"); import * as fs from "fs"; -import { IO } from "../../../../io/src/IO"; +import { IO } from "../../../io/IO"; import { ProfileIO } from "../ProfileIO"; -import { ImperativeError } from "../../../../error/index"; +import { ImperativeError } from "../../../error/index"; import { BANANA_PROFILE_TYPE, BLUEBERRY_PROFILE_TYPE, BLUEBERRY_TYPE_SCHEMA, STRAWBERRY_PROFILE_TYPE -} from "../../../__tests__/TestConstants"; -import { IMetaProfile, IProfile } from "../../../../index"; +} from "../../../../__tests__/__unit__/profiles/TestConstants"; +import { IMetaProfile, IProfile } from "../../../index"; import { IProfileTypeConfiguration } from "../../doc/config/IProfileTypeConfiguration"; -import { ImperativeConfig } from "../../../../utilities"; +import { ImperativeConfig } from "../../../utilities/ImperativeConfig"; const readYaml = require("js-yaml"); const writeYaml = require("yamljs"); diff --git a/packages/imperative/src/profiles/src/utils/__tests__/ProfileUtils.unit.test.ts b/packages/imperative/src/profiles/utils/__tests__/ProfileUtils.unit.test.ts similarity index 98% rename from packages/imperative/src/profiles/src/utils/__tests__/ProfileUtils.unit.test.ts rename to packages/imperative/src/profiles/utils/__tests__/ProfileUtils.unit.test.ts index c645aeb82d..ed1d2d6967 100644 --- a/packages/imperative/src/profiles/src/utils/__tests__/ProfileUtils.unit.test.ts +++ b/packages/imperative/src/profiles/utils/__tests__/ProfileUtils.unit.test.ts @@ -13,7 +13,7 @@ import Mock = jest.Mock; jest.mock("path"); import { ProfileUtils } from "../ProfileUtils"; import * as path from "path"; -import { IProfileLoaded } from "../../../../index"; +import { IProfileLoaded } from "../../../index"; import { APPLE_TWO_REQ_DEP_BANANA_ONE_REQ_DEP_GRAPE_ONE_REQ_DEP, BLUEBERRY_PROFILE_TYPE } from "../../../__tests__/TestConstants"; const mocks = { diff --git a/packages/imperative/src/profiles/src/utils/__tests__/__snapshots__/ProfileIO.unit.test.ts.snap b/packages/imperative/src/profiles/utils/__tests__/__snapshots__/ProfileIO.unit.test.ts.snap similarity index 100% rename from packages/imperative/src/profiles/src/utils/__tests__/__snapshots__/ProfileIO.unit.test.ts.snap rename to packages/imperative/src/profiles/utils/__tests__/__snapshots__/ProfileIO.unit.test.ts.snap diff --git a/packages/imperative/src/profiles/src/utils/__tests__/__snapshots__/ProfileUtils.unit.test.ts.snap b/packages/imperative/src/profiles/utils/__tests__/__snapshots__/ProfileUtils.unit.test.ts.snap similarity index 100% rename from packages/imperative/src/profiles/src/utils/__tests__/__snapshots__/ProfileUtils.unit.test.ts.snap rename to packages/imperative/src/profiles/utils/__tests__/__snapshots__/ProfileUtils.unit.test.ts.snap diff --git a/packages/imperative/src/profiles/src/utils/index.ts b/packages/imperative/src/profiles/utils/index.ts similarity index 100% rename from packages/imperative/src/profiles/src/utils/index.ts rename to packages/imperative/src/profiles/utils/index.ts diff --git a/packages/imperative/src/profiles/src/validation/__tests__/ProfileValidation.unit.test.ts b/packages/imperative/src/profiles/validation/__tests__/ProfileValidation.unit.test.ts similarity index 99% rename from packages/imperative/src/profiles/src/validation/__tests__/ProfileValidation.unit.test.ts rename to packages/imperative/src/profiles/validation/__tests__/ProfileValidation.unit.test.ts index 04691e2eef..91678e5340 100644 --- a/packages/imperative/src/profiles/src/validation/__tests__/ProfileValidation.unit.test.ts +++ b/packages/imperative/src/profiles/validation/__tests__/ProfileValidation.unit.test.ts @@ -10,7 +10,7 @@ */ import { inspect } from "util"; -import { TestLogger } from "../../../../../__tests__/src/TestLogger"; +import { TestLogger } from "../../../../__tests__/src/TestLogger"; import { IProfile } from "../../doc/definition/IProfile"; import { IProfileValidationPlan } from "../doc/IProfileValidationPlan"; import { IProfileValidationReport } from "../doc/IProfileValidationReport"; diff --git a/packages/imperative/src/profiles/src/validation/api/ProfileValidator.ts b/packages/imperative/src/profiles/validation/api/ProfileValidator.ts similarity index 98% rename from packages/imperative/src/profiles/src/validation/api/ProfileValidator.ts rename to packages/imperative/src/profiles/validation/api/ProfileValidator.ts index fdec3318ef..2b186bf761 100644 --- a/packages/imperative/src/profiles/src/validation/api/ProfileValidator.ts +++ b/packages/imperative/src/profiles/validation/api/ProfileValidator.ts @@ -18,12 +18,12 @@ import { } from "../doc/IProfileValidationTask"; import { IProfileValidationTaskResult } from "../doc/IProfileValidationTaskResult"; import { isNullOrUndefined } from "util"; -import { Logger, LoggerUtils } from "../../../../logger"; -import { TextUtils } from "../../../../utilities"; -import { IPromiseWithProgress, ITaskWithStatus, TaskProgress, TaskStage } from "../../../../operations"; -import { ICommandOptionDefinition } from "../../../../cmd"; +import { Logger, LoggerUtils } from "../../../logger"; +import { TextUtils } from "../../../utilities/TextUtils"; +import { IPromiseWithProgress, ITaskWithStatus, TaskProgress, TaskStage } from "../../../operations"; +import { ICommandOptionDefinition } from "../../../cmd"; import { IProfile } from "../../doc/definition/IProfile"; -import { CliUtils } from "../../../../utilities/src/CliUtils"; +import { CliUtils } from "../../../utilities/CliUtils"; /** * API for going through the full validation test for a Zowe CLI profile diff --git a/packages/imperative/src/profiles/src/validation/doc/IProfileValidationPlan.ts b/packages/imperative/src/profiles/validation/doc/IProfileValidationPlan.ts similarity index 100% rename from packages/imperative/src/profiles/src/validation/doc/IProfileValidationPlan.ts rename to packages/imperative/src/profiles/validation/doc/IProfileValidationPlan.ts diff --git a/packages/imperative/src/profiles/src/validation/doc/IProfileValidationReport.ts b/packages/imperative/src/profiles/validation/doc/IProfileValidationReport.ts similarity index 100% rename from packages/imperative/src/profiles/src/validation/doc/IProfileValidationReport.ts rename to packages/imperative/src/profiles/validation/doc/IProfileValidationReport.ts diff --git a/packages/imperative/src/profiles/src/validation/doc/IProfileValidationTask.ts b/packages/imperative/src/profiles/validation/doc/IProfileValidationTask.ts similarity index 100% rename from packages/imperative/src/profiles/src/validation/doc/IProfileValidationTask.ts rename to packages/imperative/src/profiles/validation/doc/IProfileValidationTask.ts diff --git a/packages/imperative/src/profiles/src/validation/doc/IProfileValidationTaskResult.ts b/packages/imperative/src/profiles/validation/doc/IProfileValidationTaskResult.ts similarity index 100% rename from packages/imperative/src/profiles/src/validation/doc/IProfileValidationTaskResult.ts rename to packages/imperative/src/profiles/validation/doc/IProfileValidationTaskResult.ts diff --git a/packages/imperative/src/rest/src/__mocks__/RestClient.ts b/packages/imperative/src/rest/__mocks__/RestClient.ts similarity index 100% rename from packages/imperative/src/rest/src/__mocks__/RestClient.ts rename to packages/imperative/src/rest/__mocks__/RestClient.ts diff --git a/packages/imperative/src/rest/src/client/AbstractRestClient.ts b/packages/imperative/src/rest/client/AbstractRestClient.ts similarity index 99% rename from packages/imperative/src/rest/src/client/AbstractRestClient.ts rename to packages/imperative/src/rest/client/AbstractRestClient.ts index db962b2ed0..fef3baf036 100644 --- a/packages/imperative/src/rest/src/client/AbstractRestClient.ts +++ b/packages/imperative/src/rest/client/AbstractRestClient.ts @@ -10,26 +10,26 @@ */ import { inspect } from "util"; -import { Logger } from "../../../logger"; -import { IImperativeError, ImperativeError } from "../../../error"; +import { Logger } from "../../logger"; +import { IImperativeError, ImperativeError } from "../../error"; import { AbstractSession } from "../session/AbstractSession"; import * as https from "https"; import * as http from "http"; import { readFileSync } from "fs"; import { ContentEncoding, Headers } from "./Headers"; import { RestConstants } from "./RestConstants"; -import { ImperativeReject } from "../../../interfaces"; +import { ImperativeReject } from "../../interfaces"; import { IHTTPSOptions } from "./doc/IHTTPSOptions"; import { HTTP_VERB } from "./types/HTTPVerb"; -import { ImperativeExpect } from "../../../expect"; +import { ImperativeExpect } from "../../expect"; 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 { IO } from "../../../io"; -import { ITaskWithStatus, TaskProgress, TaskStage } from "../../../operations"; -import { TextUtils } from "../../../utilities"; +import { IO } from "../../io"; +import { ITaskWithStatus, TaskProgress, TaskStage } from "../../operations"; +import { TextUtils } from "../../utilities/TextUtils"; import { IRestOptions } from "./doc/IRestOptions"; import * as SessConstants from "../session/SessConstants"; import { CompressionUtils } from "./CompressionUtils"; diff --git a/packages/imperative/src/rest/src/client/CompressionUtils.ts b/packages/imperative/src/rest/client/CompressionUtils.ts similarity index 98% rename from packages/imperative/src/rest/src/client/CompressionUtils.ts rename to packages/imperative/src/rest/client/CompressionUtils.ts index 7e05de3c54..3664fbeeca 100644 --- a/packages/imperative/src/rest/src/client/CompressionUtils.ts +++ b/packages/imperative/src/rest/client/CompressionUtils.ts @@ -11,8 +11,8 @@ import { Duplex, Transform, Writable } from "stream"; import * as zlib from "zlib"; -import { ImperativeError } from "../../../error"; -import { IO } from "../../../io"; +import { ImperativeError } from "../../error"; +import { IO } from "../../io"; import { ContentEncoding, Headers } from "./Headers"; export class CompressionUtils { diff --git a/packages/imperative/src/rest/src/client/Headers.ts b/packages/imperative/src/rest/client/Headers.ts similarity index 100% rename from packages/imperative/src/rest/src/client/Headers.ts rename to packages/imperative/src/rest/client/Headers.ts diff --git a/packages/imperative/src/rest/src/client/RestClient.ts b/packages/imperative/src/rest/client/RestClient.ts similarity index 99% rename from packages/imperative/src/rest/src/client/RestClient.ts rename to packages/imperative/src/rest/client/RestClient.ts index 6702ca9f4d..c59bd5a8a1 100644 --- a/packages/imperative/src/rest/src/client/RestClient.ts +++ b/packages/imperative/src/rest/client/RestClient.ts @@ -13,9 +13,9 @@ import { AbstractSession } from "../session/AbstractSession"; import { RestConstants } from "./RestConstants"; import { HTTP_VERB } from "./types/HTTPVerb"; import { AbstractRestClient } from "./AbstractRestClient"; -import { JSONUtils } from "../../../utilities"; +import { JSONUtils } from "../../utilities/JSONUtils"; import { Readable, Writable } from "stream"; -import { ITaskWithStatus } from "../../../operations"; +import { ITaskWithStatus } from "../../operations"; import { IRestClientResponse } from "./doc/IRestClientResponse"; import { IOptionsFullResponse } from "./doc/IOptionsFullResponse"; import { CLIENT_PROPERTY } from "./types/AbstractRestClientProperties"; diff --git a/packages/imperative/src/rest/src/client/RestClientError.ts b/packages/imperative/src/rest/client/RestClientError.ts similarity index 89% rename from packages/imperative/src/rest/src/client/RestClientError.ts rename to packages/imperative/src/rest/client/RestClientError.ts index be5cd0546e..8ae221bcb0 100644 --- a/packages/imperative/src/rest/src/client/RestClientError.ts +++ b/packages/imperative/src/rest/client/RestClientError.ts @@ -9,9 +9,9 @@ * */ -import { ImperativeError } from "../../../error"; +import { ImperativeError } from "../../error"; import { IRestClientError } from "./doc/IRestClientError"; -import { IImperativeErrorParms } from "../../../error/src/doc/IImperativeErrorParms"; +import { IImperativeErrorParms } from "../../error/doc/IImperativeErrorParms"; export class RestClientError extends ImperativeError { /** diff --git a/packages/imperative/src/rest/src/client/RestConstants.ts b/packages/imperative/src/rest/client/RestConstants.ts similarity index 100% rename from packages/imperative/src/rest/src/client/RestConstants.ts rename to packages/imperative/src/rest/client/RestConstants.ts diff --git a/packages/imperative/src/rest/src/client/RestStandAloneUtils.ts b/packages/imperative/src/rest/client/RestStandAloneUtils.ts similarity index 100% rename from packages/imperative/src/rest/src/client/RestStandAloneUtils.ts rename to packages/imperative/src/rest/client/RestStandAloneUtils.ts diff --git a/packages/imperative/src/rest/src/client/doc/IHTTPSOptions.ts b/packages/imperative/src/rest/client/doc/IHTTPSOptions.ts similarity index 100% rename from packages/imperative/src/rest/src/client/doc/IHTTPSOptions.ts rename to packages/imperative/src/rest/client/doc/IHTTPSOptions.ts diff --git a/packages/imperative/src/rest/src/client/doc/IHeaderContent.ts b/packages/imperative/src/rest/client/doc/IHeaderContent.ts similarity index 100% rename from packages/imperative/src/rest/src/client/doc/IHeaderContent.ts rename to packages/imperative/src/rest/client/doc/IHeaderContent.ts diff --git a/packages/imperative/src/rest/src/client/doc/IOptionsFullResponse.ts b/packages/imperative/src/rest/client/doc/IOptionsFullResponse.ts similarity index 97% rename from packages/imperative/src/rest/src/client/doc/IOptionsFullResponse.ts rename to packages/imperative/src/rest/client/doc/IOptionsFullResponse.ts index 4ea10d63f8..2e5680d7e3 100644 --- a/packages/imperative/src/rest/src/client/doc/IOptionsFullResponse.ts +++ b/packages/imperative/src/rest/client/doc/IOptionsFullResponse.ts @@ -10,7 +10,7 @@ */ import { Writable, Readable } from "stream"; -import { ITaskWithStatus } from "../../../../operations"; +import { ITaskWithStatus } from "../../../operations"; import { CLIENT_PROPERTY } from "../types/AbstractRestClientProperties"; /** * Interface to define input options for RestClient GET|POST|PUT|DELETE ExpectFullResponse methods diff --git a/packages/imperative/src/rest/src/client/doc/IRestClientError.ts b/packages/imperative/src/rest/client/doc/IRestClientError.ts similarity index 97% rename from packages/imperative/src/rest/src/client/doc/IRestClientError.ts rename to packages/imperative/src/rest/client/doc/IRestClientError.ts index 2123b2cb5f..0c5c7e0325 100644 --- a/packages/imperative/src/rest/src/client/doc/IRestClientError.ts +++ b/packages/imperative/src/rest/client/doc/IRestClientError.ts @@ -9,7 +9,7 @@ * */ -import { IImperativeError } from "../../../../error"; +import { IImperativeError } from "../../../error"; export type RestErrorSource = "client" | "http"; diff --git a/packages/imperative/src/rest/src/client/doc/IRestClientResponse.ts b/packages/imperative/src/rest/client/doc/IRestClientResponse.ts similarity index 97% rename from packages/imperative/src/rest/src/client/doc/IRestClientResponse.ts rename to packages/imperative/src/rest/client/doc/IRestClientResponse.ts index 1bd4c3850e..6ae3cfb9d8 100644 --- a/packages/imperative/src/rest/src/client/doc/IRestClientResponse.ts +++ b/packages/imperative/src/rest/client/doc/IRestClientResponse.ts @@ -11,7 +11,7 @@ */ import { Session } from "../../session/Session"; -import { Logger } from "../../../../logger"; +import { Logger } from "../../../logger"; /** * Interface to map client's REST call response diff --git a/packages/imperative/src/rest/src/client/doc/IRestOptions.ts b/packages/imperative/src/rest/client/doc/IRestOptions.ts similarity index 97% rename from packages/imperative/src/rest/src/client/doc/IRestOptions.ts rename to packages/imperative/src/rest/client/doc/IRestOptions.ts index b33c027876..8703aea235 100644 --- a/packages/imperative/src/rest/src/client/doc/IRestOptions.ts +++ b/packages/imperative/src/rest/client/doc/IRestOptions.ts @@ -11,7 +11,7 @@ import { HTTP_VERB } from "../types/HTTPVerb"; import { Writable, Readable } from "stream"; -import { ITaskWithStatus } from "../../../../operations"; +import { ITaskWithStatus } from "../../../operations"; /** * Interface to define input for AbstractRestClient.request method diff --git a/packages/imperative/src/rest/src/client/types/AbstractRestClientProperties.ts b/packages/imperative/src/rest/client/types/AbstractRestClientProperties.ts similarity index 100% rename from packages/imperative/src/rest/src/client/types/AbstractRestClientProperties.ts rename to packages/imperative/src/rest/client/types/AbstractRestClientProperties.ts diff --git a/packages/imperative/src/rest/src/client/types/HTTPVerb.ts b/packages/imperative/src/rest/client/types/HTTPVerb.ts similarity index 100% rename from packages/imperative/src/rest/src/client/types/HTTPVerb.ts rename to packages/imperative/src/rest/client/types/HTTPVerb.ts diff --git a/packages/imperative/src/rest/index.ts b/packages/imperative/src/rest/index.ts index b5f48dbe18..7c0629683b 100644 --- a/packages/imperative/src/rest/index.ts +++ b/packages/imperative/src/rest/index.ts @@ -9,26 +9,26 @@ * */ -export * from "./src/client/types/HTTPVerb"; -export * from "./src/client/doc/IHeaderContent"; -export * from "./src/client/doc/IHTTPSOptions"; -export * from "./src/client/doc/IOptionsFullResponse"; -export * from "./src/client/doc/IRestClientError"; -export * from "./src/client/doc/IRestClientResponse"; -export * from "./src/client/doc/IRestOptions"; -export * from "./src/client/Headers"; -export * from "./src/client/AbstractRestClient"; -export * from "./src/client/CompressionUtils"; -export * from "./src/client/RestClient"; -export * from "./src/client/RestConstants"; -export * from "./src/client/RestStandAloneUtils"; -export * from "./src/client/RestClientError"; +export * from "./client/types/HTTPVerb"; +export * from "./client/doc/IHeaderContent"; +export * from "./client/doc/IHTTPSOptions"; +export * from "./client/doc/IOptionsFullResponse"; +export * from "./client/doc/IRestClientError"; +export * from "./client/doc/IRestClientResponse"; +export * from "./client/doc/IRestOptions"; +export * from "./client/Headers"; +export * from "./client/AbstractRestClient"; +export * from "./client/CompressionUtils"; +export * from "./client/RestClient"; +export * from "./client/RestConstants"; +export * from "./client/RestStandAloneUtils"; +export * from "./client/RestClientError"; -export * as SessConstants from "./src/session/SessConstants"; +export * as SessConstants from "./session/SessConstants"; -export * from "./src/session/doc/ISession"; -export * from "./src/session/doc/IOptionsForAddConnProps"; -export * from "./src/session/doc/IOverridePromptConnProps"; -export * from "./src/session/AbstractSession"; -export * from "./src/session/ConnectionPropsForSessCfg"; -export * from "./src/session/Session"; +export * from "./session/doc/ISession"; +export * from "./session/doc/IOptionsForAddConnProps"; +export * from "./session/doc/IOverridePromptConnProps"; +export * from "./session/AbstractSession"; +export * from "./session/ConnectionPropsForSessCfg"; +export * from "./session/Session"; diff --git a/packages/imperative/src/rest/src/session/AbstractSession.ts b/packages/imperative/src/rest/session/AbstractSession.ts similarity index 98% rename from packages/imperative/src/rest/src/session/AbstractSession.ts rename to packages/imperative/src/rest/session/AbstractSession.ts index eff14b1312..b66289b4ce 100644 --- a/packages/imperative/src/rest/src/session/AbstractSession.ts +++ b/packages/imperative/src/rest/session/AbstractSession.ts @@ -10,9 +10,9 @@ */ import { ISession } from "./doc/ISession"; -import { Logger } from "../../../logger"; -import { ImperativeError } from "../../../error"; -import { ImperativeExpect } from "../../../expect"; +import { Logger } from "../../logger"; +import { ImperativeError } from "../../error"; +import { ImperativeExpect } from "../../expect"; import * as SessConstants from "./SessConstants"; /** diff --git a/packages/imperative/src/rest/src/session/ConnectionPropsForSessCfg.ts b/packages/imperative/src/rest/session/ConnectionPropsForSessCfg.ts similarity index 97% rename from packages/imperative/src/rest/src/session/ConnectionPropsForSessCfg.ts rename to packages/imperative/src/rest/session/ConnectionPropsForSessCfg.ts index 1d319ece26..8e12c3a00f 100644 --- a/packages/imperative/src/rest/src/session/ConnectionPropsForSessCfg.ts +++ b/packages/imperative/src/rest/session/ConnectionPropsForSessCfg.ts @@ -9,17 +9,18 @@ * */ -import { CliUtils, ImperativeConfig } from "../../../utilities"; -import { ICommandArguments, IHandlerParameters } from "../../../cmd"; -import { ImperativeError } from "../../../error"; +import { CliUtils } from "../../utilities/CliUtils"; +import { ImperativeConfig } from "../../utilities/ImperativeConfig"; +import { ICommandArguments, IHandlerParameters } from "../../cmd"; +import { ImperativeError } from "../../error"; import { IOptionsForAddConnProps } from "./doc/IOptionsForAddConnProps"; -import { Logger } from "../../../logger"; +import { Logger } from "../../logger"; import * as SessConstants from "./SessConstants"; -import { IPromptOptions } from "../../../cmd/src/doc/response/api/handler/IPromptOptions"; +import { IPromptOptions } from "../../cmd/doc/response/api/handler/IPromptOptions"; import { ISession } from "./doc/ISession"; -import { IProfileProperty } from "../../../profiles"; -import { ConfigAutoStore } from "../../../config/src/ConfigAutoStore"; -import * as ConfigUtils from "../../../config/src/ConfigUtils"; +import { IProfileProperty } from "../../profiles"; +import { ConfigAutoStore } from "../../config/ConfigAutoStore"; +import * as ConfigUtils from "../../config/ConfigUtils"; /** * Extend options for IPromptOptions for internal wrapper method diff --git a/packages/imperative/src/rest/src/session/SessConstants.ts b/packages/imperative/src/rest/session/SessConstants.ts similarity index 100% rename from packages/imperative/src/rest/src/session/SessConstants.ts rename to packages/imperative/src/rest/session/SessConstants.ts diff --git a/packages/imperative/src/rest/src/session/Session.ts b/packages/imperative/src/rest/session/Session.ts similarity index 100% rename from packages/imperative/src/rest/src/session/Session.ts rename to packages/imperative/src/rest/session/Session.ts diff --git a/packages/imperative/src/rest/src/session/doc/IOptionsForAddConnProps.ts b/packages/imperative/src/rest/session/doc/IOptionsForAddConnProps.ts similarity index 98% rename from packages/imperative/src/rest/src/session/doc/IOptionsForAddConnProps.ts rename to packages/imperative/src/rest/session/doc/IOptionsForAddConnProps.ts index ac50b7f30d..60b90b0328 100644 --- a/packages/imperative/src/rest/src/session/doc/IOptionsForAddConnProps.ts +++ b/packages/imperative/src/rest/session/doc/IOptionsForAddConnProps.ts @@ -10,7 +10,7 @@ */ import { SessConstants } from "../../.."; -import { IHandlerParameters } from "../../../../cmd"; +import { IHandlerParameters } from "../../../cmd"; import { IOverridePromptConnProps } from "./IOverridePromptConnProps"; /** diff --git a/packages/imperative/src/rest/src/session/doc/IOverridePromptConnProps.ts b/packages/imperative/src/rest/session/doc/IOverridePromptConnProps.ts similarity index 100% rename from packages/imperative/src/rest/src/session/doc/IOverridePromptConnProps.ts rename to packages/imperative/src/rest/session/doc/IOverridePromptConnProps.ts diff --git a/packages/imperative/src/rest/src/session/doc/ISession.ts b/packages/imperative/src/rest/session/doc/ISession.ts similarity index 100% rename from packages/imperative/src/rest/src/session/doc/ISession.ts rename to packages/imperative/src/rest/session/doc/ISession.ts diff --git a/packages/imperative/src/security/src/CredentialManagerFactory.ts b/packages/imperative/src/security/CredentialManagerFactory.ts similarity index 99% rename from packages/imperative/src/security/src/CredentialManagerFactory.ts rename to packages/imperative/src/security/CredentialManagerFactory.ts index 011d804068..32dc60ae9b 100644 --- a/packages/imperative/src/security/src/CredentialManagerFactory.ts +++ b/packages/imperative/src/security/CredentialManagerFactory.ts @@ -10,7 +10,7 @@ */ import { AbstractCredentialManager } from "./abstract/AbstractCredentialManager"; -import { ImperativeError } from "../../error"; +import { ImperativeError } from "../error"; import { ICredentialManagerInit } from "./doc/ICredentialManagerInit"; import { DefaultCredentialManager } from "./DefaultCredentialManager"; diff --git a/packages/imperative/src/security/src/CredentialManagerOverride.ts b/packages/imperative/src/security/CredentialManagerOverride.ts similarity index 98% rename from packages/imperative/src/security/src/CredentialManagerOverride.ts rename to packages/imperative/src/security/CredentialManagerOverride.ts index 60459512be..af39d4d747 100644 --- a/packages/imperative/src/security/src/CredentialManagerOverride.ts +++ b/packages/imperative/src/security/CredentialManagerOverride.ts @@ -13,9 +13,9 @@ import * as path from "path"; import { readJsonSync, writeJsonSync } from "fs-extra"; import { ICredentialManagerNameMap } from "./doc/ICredentialManagerNameMap"; -import { ImperativeConfig } from "../../utilities"; -import { ImperativeError } from "../../error"; -import { ISettingsFile } from "../../settings/src/doc/ISettingsFile"; +import { ImperativeConfig } from "../utilities/ImperativeConfig"; +import { ImperativeError } from "../error"; +import { ISettingsFile } from "../settings/doc/ISettingsFile"; /** * This class provides access to the known set of credential manager overrides diff --git a/packages/imperative/src/security/src/DefaultCredentialManager.ts b/packages/imperative/src/security/DefaultCredentialManager.ts similarity index 99% rename from packages/imperative/src/security/src/DefaultCredentialManager.ts rename to packages/imperative/src/security/DefaultCredentialManager.ts index 8a2b9e43ea..a953e3a14e 100644 --- a/packages/imperative/src/security/src/DefaultCredentialManager.ts +++ b/packages/imperative/src/security/DefaultCredentialManager.ts @@ -10,8 +10,8 @@ */ import { AbstractCredentialManager, SecureCredential } from "./abstract/AbstractCredentialManager"; -import { ImperativeError } from "../../error"; -import { Logger } from "../../logger"; +import { ImperativeError } from "../error"; +import { Logger } from "../logger"; import { keyring as keytar } from "@zowe/secrets-for-zowe-sdk"; // Used for typing purposes only diff --git a/packages/imperative/src/security/src/InvalidCredentialManager.ts b/packages/imperative/src/security/InvalidCredentialManager.ts similarity index 100% rename from packages/imperative/src/security/src/InvalidCredentialManager.ts rename to packages/imperative/src/security/InvalidCredentialManager.ts diff --git a/packages/imperative/src/security/src/__mocks__/DefaultCredentialManager.ts b/packages/imperative/src/security/__mocks__/DefaultCredentialManager.ts similarity index 100% rename from packages/imperative/src/security/src/__mocks__/DefaultCredentialManager.ts rename to packages/imperative/src/security/__mocks__/DefaultCredentialManager.ts diff --git a/packages/imperative/src/security/src/abstract/AbstractCredentialManager.ts b/packages/imperative/src/security/abstract/AbstractCredentialManager.ts similarity index 99% rename from packages/imperative/src/security/src/abstract/AbstractCredentialManager.ts rename to packages/imperative/src/security/abstract/AbstractCredentialManager.ts index bbf6dd2b59..9b77105228 100644 --- a/packages/imperative/src/security/src/abstract/AbstractCredentialManager.ts +++ b/packages/imperative/src/security/abstract/AbstractCredentialManager.ts @@ -9,7 +9,7 @@ * */ -import { ImperativeError } from "../../../error"; +import { ImperativeError } from "../../error"; import { isNullOrUndefined } from "util"; /** diff --git a/packages/imperative/src/security/src/doc/ICredentialManagerConstructor.ts b/packages/imperative/src/security/doc/ICredentialManagerConstructor.ts similarity index 100% rename from packages/imperative/src/security/src/doc/ICredentialManagerConstructor.ts rename to packages/imperative/src/security/doc/ICredentialManagerConstructor.ts diff --git a/packages/imperative/src/security/src/doc/ICredentialManagerInit.ts b/packages/imperative/src/security/doc/ICredentialManagerInit.ts similarity index 95% rename from packages/imperative/src/security/src/doc/ICredentialManagerInit.ts rename to packages/imperative/src/security/doc/ICredentialManagerInit.ts index f32d8f13ac..71dc4a58f8 100644 --- a/packages/imperative/src/security/src/doc/ICredentialManagerInit.ts +++ b/packages/imperative/src/security/doc/ICredentialManagerInit.ts @@ -9,7 +9,7 @@ * */ -import { IImperativeOverrides } from "../../../imperative/src/doc/IImperativeOverrides"; +import { IImperativeOverrides } from "../../imperative/doc/IImperativeOverrides"; export interface ICredentialManagerInit { /** diff --git a/packages/imperative/src/security/src/doc/ICredentialManagerNameMap.ts b/packages/imperative/src/security/doc/ICredentialManagerNameMap.ts similarity index 100% rename from packages/imperative/src/security/src/doc/ICredentialManagerNameMap.ts rename to packages/imperative/src/security/doc/ICredentialManagerNameMap.ts diff --git a/packages/imperative/src/security/src/errors/BadCredentialManagerError.ts b/packages/imperative/src/security/errors/BadCredentialManagerError.ts similarity index 94% rename from packages/imperative/src/security/src/errors/BadCredentialManagerError.ts rename to packages/imperative/src/security/errors/BadCredentialManagerError.ts index 0b2a479fa4..c9be65adc0 100644 --- a/packages/imperative/src/security/src/errors/BadCredentialManagerError.ts +++ b/packages/imperative/src/security/errors/BadCredentialManagerError.ts @@ -9,7 +9,7 @@ * */ -import { ImperativeError } from "../../../error"; +import { ImperativeError } from "../../error"; /** * This class represents the error thrown by methods of the {@link InvalidCredentialManager} diff --git a/packages/imperative/src/security/index.ts b/packages/imperative/src/security/index.ts index c2ca8f1c80..53e7b7a5e8 100644 --- a/packages/imperative/src/security/index.ts +++ b/packages/imperative/src/security/index.ts @@ -9,11 +9,11 @@ * */ -export * from "./src/CredentialManagerFactory"; -export * from "./src/DefaultCredentialManager"; -export * from "./src/CredentialManagerOverride"; -export * from "./src/abstract/AbstractCredentialManager"; -export * from "./src/doc/ICredentialManagerConstructor"; -export * from "./src/doc/ICredentialManagerInit"; -export * from "./src/doc/ICredentialManagerNameMap"; -export * from "./src/errors/BadCredentialManagerError"; +export * from "./CredentialManagerFactory"; +export * from "./DefaultCredentialManager"; +export * from "./CredentialManagerOverride"; +export * from "./abstract/AbstractCredentialManager"; +export * from "./doc/ICredentialManagerConstructor"; +export * from "./doc/ICredentialManagerInit"; +export * from "./doc/ICredentialManagerNameMap"; +export * from "./errors/BadCredentialManagerError"; diff --git a/packages/imperative/src/settings/src/AppSettings.ts b/packages/imperative/src/settings/AppSettings.ts similarity index 97% rename from packages/imperative/src/settings/src/AppSettings.ts rename to packages/imperative/src/settings/AppSettings.ts index b2d5f30795..c3136ea66a 100644 --- a/packages/imperative/src/settings/src/AppSettings.ts +++ b/packages/imperative/src/settings/AppSettings.ts @@ -12,11 +12,11 @@ import * as DeepMerge from "deepmerge"; import { existsSync } from "fs"; import { ISettingsFile } from "./doc/ISettingsFile"; -import { Logger } from "../../logger"; +import { Logger } from "../logger"; import { ISettingsFilePersistence } from "./persistance/ISettingsFilePersistence"; import { JSONSettingsFilePersistence } from "./persistance/JSONSettingsFilePersistence"; -import { IO } from "../../io"; -import { ImperativeError } from "../../error"; +import { IO } from "../io"; +import { ImperativeError } from "../error"; type SettingValue = false | string; diff --git a/packages/imperative/src/settings/src/__mocks__/AppSettings.ts b/packages/imperative/src/settings/__mocks__/AppSettings.ts similarity index 100% rename from packages/imperative/src/settings/src/__mocks__/AppSettings.ts rename to packages/imperative/src/settings/__mocks__/AppSettings.ts diff --git a/packages/imperative/src/settings/src/doc/ISettingsFile.ts b/packages/imperative/src/settings/doc/ISettingsFile.ts similarity index 94% rename from packages/imperative/src/settings/src/doc/ISettingsFile.ts rename to packages/imperative/src/settings/doc/ISettingsFile.ts index 1fedf7ee2b..63be1aa2cc 100644 --- a/packages/imperative/src/settings/src/doc/ISettingsFile.ts +++ b/packages/imperative/src/settings/doc/ISettingsFile.ts @@ -9,7 +9,7 @@ * */ -import { IImperativeOverrides } from "../../../imperative/src/doc/IImperativeOverrides"; +import { IImperativeOverrides } from "../../imperative/doc/IImperativeOverrides"; /** * This interface defines the structure of the settings file. diff --git a/packages/imperative/src/settings/src/errors/SettingsAlreadyInitialized.ts b/packages/imperative/src/settings/errors/SettingsAlreadyInitialized.ts similarity index 92% rename from packages/imperative/src/settings/src/errors/SettingsAlreadyInitialized.ts rename to packages/imperative/src/settings/errors/SettingsAlreadyInitialized.ts index d4bb384058..0aa907676e 100644 --- a/packages/imperative/src/settings/src/errors/SettingsAlreadyInitialized.ts +++ b/packages/imperative/src/settings/errors/SettingsAlreadyInitialized.ts @@ -9,7 +9,7 @@ * */ -import { ImperativeError } from "../../../error/"; +import { ImperativeError } from "../../error/"; /** * This class represents an error that is thrown when a second settings singleton attempts to initialize. diff --git a/packages/imperative/src/settings/src/errors/SettingsNotInitialized.ts b/packages/imperative/src/settings/errors/SettingsNotInitialized.ts similarity index 93% rename from packages/imperative/src/settings/src/errors/SettingsNotInitialized.ts rename to packages/imperative/src/settings/errors/SettingsNotInitialized.ts index f19b4bfa69..4fb2db7041 100644 --- a/packages/imperative/src/settings/src/errors/SettingsNotInitialized.ts +++ b/packages/imperative/src/settings/errors/SettingsNotInitialized.ts @@ -9,7 +9,7 @@ * */ -import { ImperativeError } from "../../../error"; +import { ImperativeError } from "../../error"; /** * This class represents an error thrown when a null singleton {@link AppSettings} object is referenced. diff --git a/packages/imperative/src/settings/src/errors/index.ts b/packages/imperative/src/settings/errors/index.ts similarity index 100% rename from packages/imperative/src/settings/src/errors/index.ts rename to packages/imperative/src/settings/errors/index.ts diff --git a/packages/imperative/src/settings/index.ts b/packages/imperative/src/settings/index.ts index 4590749c16..302dafd3ab 100644 --- a/packages/imperative/src/settings/index.ts +++ b/packages/imperative/src/settings/index.ts @@ -9,4 +9,4 @@ * */ -export * from "./src/AppSettings"; +export * from "./AppSettings"; diff --git a/packages/imperative/src/settings/src/persistance/ISettingsFilePersistence.ts b/packages/imperative/src/settings/persistance/ISettingsFilePersistence.ts similarity index 100% rename from packages/imperative/src/settings/src/persistance/ISettingsFilePersistence.ts rename to packages/imperative/src/settings/persistance/ISettingsFilePersistence.ts diff --git a/packages/imperative/src/settings/src/persistance/JSONSettingsFilePersistence.ts b/packages/imperative/src/settings/persistance/JSONSettingsFilePersistence.ts similarity index 100% rename from packages/imperative/src/settings/src/persistance/JSONSettingsFilePersistence.ts rename to packages/imperative/src/settings/persistance/JSONSettingsFilePersistence.ts diff --git a/packages/imperative/src/utilities/src/CliUtils.ts b/packages/imperative/src/utilities/CliUtils.ts similarity index 98% rename from packages/imperative/src/utilities/src/CliUtils.ts rename to packages/imperative/src/utilities/CliUtils.ts index 34720325bb..0ed2b80e38 100644 --- a/packages/imperative/src/utilities/src/CliUtils.ts +++ b/packages/imperative/src/utilities/CliUtils.ts @@ -9,17 +9,17 @@ * */ -import { ImperativeError } from "../../error"; -import { Constants } from "../../constants"; +import { ImperativeError } from "../error"; +import { Constants } from "../constants"; import { Arguments } from "yargs"; import { TextUtils } from "./TextUtils"; import { IOptionFormat } from "./doc/IOptionFormat"; import { CommandProfiles, ICommandOptionDefinition, ICommandPositionalDefinition, ICommandProfile, IHandlerParameters -} from "../../cmd"; -import { ICommandArguments } from "../../cmd/src/doc/args/ICommandArguments"; -import { IProfile } from "../../profiles"; -import { IPromptOptions } from "../../cmd/src/doc/response/api/handler/IPromptOptions"; +} from "../cmd"; +import { ICommandArguments } from "../cmd/doc/args/ICommandArguments"; +import { IProfile } from "../profiles"; +import { IPromptOptions } from "../cmd/doc/response/api/handler/IPromptOptions"; /** * Cli Utils contains a set of static methods/helpers that are CLI related (forming options, censoring args, etc.) diff --git a/packages/imperative/src/utilities/src/DaemonRequest.ts b/packages/imperative/src/utilities/DaemonRequest.ts similarity index 100% rename from packages/imperative/src/utilities/src/DaemonRequest.ts rename to packages/imperative/src/utilities/DaemonRequest.ts diff --git a/packages/imperative/src/utilities/src/EnvFileUtils.ts b/packages/imperative/src/utilities/EnvFileUtils.ts similarity index 96% rename from packages/imperative/src/utilities/src/EnvFileUtils.ts rename to packages/imperative/src/utilities/EnvFileUtils.ts index f6f3b0582c..b3f8bfc71c 100644 --- a/packages/imperative/src/utilities/src/EnvFileUtils.ts +++ b/packages/imperative/src/utilities/EnvFileUtils.ts @@ -12,8 +12,8 @@ import { existsSync, readFileSync } from "fs"; import { homedir } from "os"; import { join } from "path"; -import { ImperativeError } from "../../error/src/ImperativeError"; -import { EnvironmentalVariableSettings } from "../../imperative/src/env/EnvironmentalVariableSettings"; +import { ImperativeError } from "../error/ImperativeError"; +import { EnvironmentalVariableSettings } from "../imperative/env/EnvironmentalVariableSettings"; import * as JSONC from "comment-json"; /** diff --git a/packages/imperative/src/utilities/src/ExecUtils.ts b/packages/imperative/src/utilities/ExecUtils.ts similarity index 99% rename from packages/imperative/src/utilities/src/ExecUtils.ts rename to packages/imperative/src/utilities/ExecUtils.ts index af533d1682..b129a7b166 100644 --- a/packages/imperative/src/utilities/src/ExecUtils.ts +++ b/packages/imperative/src/utilities/ExecUtils.ts @@ -40,4 +40,4 @@ export class ExecUtils { } return result.stdout; } -} +} \ No newline at end of file diff --git a/packages/imperative/src/utilities/src/ImperativeConfig.ts b/packages/imperative/src/utilities/ImperativeConfig.ts similarity index 95% rename from packages/imperative/src/utilities/src/ImperativeConfig.ts rename to packages/imperative/src/utilities/ImperativeConfig.ts index 2b0d4cdbc4..417ee420fc 100644 --- a/packages/imperative/src/utilities/src/ImperativeConfig.ts +++ b/packages/imperative/src/utilities/ImperativeConfig.ts @@ -9,14 +9,14 @@ * */ -import { Constants } from "../../constants"; +import { Constants } from "../constants"; import { join } from "path"; -import { IImperativeConfig } from "../../imperative/src/doc/IImperativeConfig"; -import { ImperativeError } from "../../error"; -import { EnvironmentalVariableSettings } from "../../imperative/src/env/EnvironmentalVariableSettings"; -import { IDaemonContext } from "../../imperative/src/doc/IDaemonContext"; -import { ICommandProfileSchema } from "../../cmd"; -import { Config } from "../../config"; +import { IImperativeConfig } from "../imperative/doc/IImperativeConfig"; +import { ImperativeError } from "../error"; +import { EnvironmentalVariableSettings } from "../imperative/env/EnvironmentalVariableSettings"; +import { IDaemonContext } from "../imperative/doc/IDaemonContext"; +import { ICommandProfileSchema } from "../cmd"; +import { Config } from "../config"; /** * This class is used to contain all configuration being set by Imperative. @@ -167,7 +167,7 @@ export class ImperativeConfig { */ public get imperativePackageName(): string { if (!this.mImperativePackageName) { - this.mImperativePackageName = require(join(__dirname, "../../../package.json")).name; + this.mImperativePackageName = require(join(__dirname, "../../package.json")).name; } return this.mImperativePackageName; @@ -301,4 +301,4 @@ export class ImperativeConfig { ImperativeConfig.instance.loadedConfig.profiles.forEach(profile => schemas[profile.type] = profile.schema); return schemas; } -} +} \ No newline at end of file diff --git a/packages/imperative/src/utilities/src/JSONUtils.ts b/packages/imperative/src/utilities/JSONUtils.ts similarity index 97% rename from packages/imperative/src/utilities/src/JSONUtils.ts rename to packages/imperative/src/utilities/JSONUtils.ts index e8aa97d7c8..e9ca8f776a 100644 --- a/packages/imperative/src/utilities/src/JSONUtils.ts +++ b/packages/imperative/src/utilities/JSONUtils.ts @@ -9,7 +9,7 @@ * */ -import { ImperativeError } from "../../error"; +import { ImperativeError } from "../error"; import { isNullOrUndefined } from "util"; /** @@ -49,4 +49,4 @@ export class JSONUtils { }); } } -} +} \ No newline at end of file diff --git a/packages/imperative/src/utilities/src/JsUtils.ts b/packages/imperative/src/utilities/JsUtils.ts similarity index 100% rename from packages/imperative/src/utilities/src/JsUtils.ts rename to packages/imperative/src/utilities/JsUtils.ts diff --git a/packages/imperative/src/utilities/src/NextVerFeatures.ts b/packages/imperative/src/utilities/NextVerFeatures.ts similarity index 100% rename from packages/imperative/src/utilities/src/NextVerFeatures.ts rename to packages/imperative/src/utilities/NextVerFeatures.ts diff --git a/packages/imperative/src/utilities/src/ProcessUtils.ts b/packages/imperative/src/utilities/ProcessUtils.ts similarity index 99% rename from packages/imperative/src/utilities/src/ProcessUtils.ts rename to packages/imperative/src/utilities/ProcessUtils.ts index 38313f9e2b..e3dafacc5d 100644 --- a/packages/imperative/src/utilities/src/ProcessUtils.ts +++ b/packages/imperative/src/utilities/ProcessUtils.ts @@ -11,7 +11,7 @@ import { SpawnSyncOptions } from "child_process"; import { ExecUtils } from "./ExecUtils"; -import { Logger } from "../../logger"; +import { Logger } from "../logger"; import { ISystemInfo } from "./doc/ISystemInfo"; import * as spawn from "cross-spawn"; diff --git a/packages/imperative/src/utilities/src/TextUtils.ts b/packages/imperative/src/utilities/TextUtils.ts similarity index 100% rename from packages/imperative/src/utilities/src/TextUtils.ts rename to packages/imperative/src/utilities/TextUtils.ts diff --git a/packages/imperative/src/utilities/src/__mocks__/ImperativeConfig.ts b/packages/imperative/src/utilities/__mocks__/ImperativeConfig.ts similarity index 93% rename from packages/imperative/src/utilities/src/__mocks__/ImperativeConfig.ts rename to packages/imperative/src/utilities/__mocks__/ImperativeConfig.ts index f6535abce4..80e3e6dd73 100644 --- a/packages/imperative/src/utilities/src/__mocks__/ImperativeConfig.ts +++ b/packages/imperative/src/utilities/__mocks__/ImperativeConfig.ts @@ -10,8 +10,8 @@ */ -import { Config } from "../../../config/src/__mocks__/Config"; -import { IImperativeConfig } from "../../../imperative/src/doc/IImperativeConfig"; +import { Config } from "../../config/__mocks__/Config"; +import { IImperativeConfig } from "../../imperative/doc/IImperativeConfig"; export class ImperativeConfig { private static mInstance: ImperativeConfig = null; diff --git a/packages/imperative/src/utilities/src/diff/DiffUtils.ts b/packages/imperative/src/utilities/diff/DiffUtils.ts similarity index 100% rename from packages/imperative/src/utilities/src/diff/DiffUtils.ts rename to packages/imperative/src/utilities/diff/DiffUtils.ts diff --git a/packages/imperative/src/utilities/src/diff/WebDiffGenerator.ts b/packages/imperative/src/utilities/diff/WebDiffGenerator.ts similarity index 94% rename from packages/imperative/src/utilities/src/diff/WebDiffGenerator.ts rename to packages/imperative/src/utilities/diff/WebDiffGenerator.ts index d268496f7d..67312ae9f1 100644 --- a/packages/imperative/src/utilities/src/diff/WebDiffGenerator.ts +++ b/packages/imperative/src/utilities/diff/WebDiffGenerator.ts @@ -13,8 +13,8 @@ import * as fs from "fs"; import * as path from "path"; -import { ImperativeConfig } from "../ImperativeConfig"; -import { ImperativeError } from "../../../error/src/ImperativeError"; +import { ImperativeConfig } from "..//ImperativeConfig"; +import { ImperativeError } from "../../error/ImperativeError"; import { IWebDiffGenerator } from "./doc/IWebDiffGenerator"; /** @@ -60,7 +60,7 @@ class WebDiffGenerator implements IWebDiffGenerator { } // getting the template directory for web-diff in the root of project - const templateWebDiffDir: string = path.join(__dirname, "../../../../web-diff"); + const templateWebDiffDir: string = path.join(__dirname, "../../../web-diff"); if (!fs.existsSync(templateWebDiffDir)) { throw new ImperativeError({ msg: `The web-diff distribution directory does not exist:\n "${templateWebDiffDir}"` diff --git a/packages/imperative/src/utilities/src/diff/WebDiffManager.ts b/packages/imperative/src/utilities/diff/WebDiffManager.ts similarity index 95% rename from packages/imperative/src/utilities/src/diff/WebDiffManager.ts rename to packages/imperative/src/utilities/diff/WebDiffManager.ts index 59f516cfe6..e4f7ce6d06 100644 --- a/packages/imperative/src/utilities/src/diff/WebDiffManager.ts +++ b/packages/imperative/src/utilities/diff/WebDiffManager.ts @@ -12,12 +12,12 @@ import * as fs from "fs"; import * as path from "path"; -import { Constants } from "../../../constants/src/Constants"; -import { ProcessUtils, GuiResult } from "../../../utilities/src/ProcessUtils"; -import { ImperativeConfig } from "../../../utilities/src/ImperativeConfig"; +import { Constants } from "../../constants/Constants"; +import { ProcessUtils, GuiResult } from "../../utilities/ProcessUtils"; +import { ImperativeConfig } from "../../utilities/ImperativeConfig"; import WebDiffGenerator from "./WebDiffGenerator"; import { IWebDiffManager } from "./doc/IWebDiffManager"; -import { ImperativeError } from "../../../error"; +import { ImperativeError } from "../../error"; import { html } from "diff2html"; /** diff --git a/packages/imperative/src/utilities/src/diff/doc/IDiffNameOptions.ts b/packages/imperative/src/utilities/diff/doc/IDiffNameOptions.ts similarity index 100% rename from packages/imperative/src/utilities/src/diff/doc/IDiffNameOptions.ts rename to packages/imperative/src/utilities/diff/doc/IDiffNameOptions.ts diff --git a/packages/imperative/src/utilities/src/diff/doc/IDiffOptions.ts b/packages/imperative/src/utilities/diff/doc/IDiffOptions.ts similarity index 100% rename from packages/imperative/src/utilities/src/diff/doc/IDiffOptions.ts rename to packages/imperative/src/utilities/diff/doc/IDiffOptions.ts diff --git a/packages/imperative/src/utilities/src/diff/doc/IWebDiffGenerator.ts b/packages/imperative/src/utilities/diff/doc/IWebDiffGenerator.ts similarity index 100% rename from packages/imperative/src/utilities/src/diff/doc/IWebDiffGenerator.ts rename to packages/imperative/src/utilities/diff/doc/IWebDiffGenerator.ts diff --git a/packages/imperative/src/utilities/src/diff/doc/IWebDiffManager.ts b/packages/imperative/src/utilities/diff/doc/IWebDiffManager.ts similarity index 100% rename from packages/imperative/src/utilities/src/diff/doc/IWebDiffManager.ts rename to packages/imperative/src/utilities/diff/doc/IWebDiffManager.ts diff --git a/packages/imperative/src/utilities/src/doc/IDaemonRequest.ts b/packages/imperative/src/utilities/doc/IDaemonRequest.ts similarity index 100% rename from packages/imperative/src/utilities/src/doc/IDaemonRequest.ts rename to packages/imperative/src/utilities/doc/IDaemonRequest.ts diff --git a/packages/imperative/src/utilities/src/doc/IDaemonResponse.ts b/packages/imperative/src/utilities/doc/IDaemonResponse.ts similarity index 100% rename from packages/imperative/src/utilities/src/doc/IDaemonResponse.ts rename to packages/imperative/src/utilities/doc/IDaemonResponse.ts diff --git a/packages/imperative/src/utilities/src/doc/IOptionFormat.ts b/packages/imperative/src/utilities/doc/IOptionFormat.ts similarity index 100% rename from packages/imperative/src/utilities/src/doc/IOptionFormat.ts rename to packages/imperative/src/utilities/doc/IOptionFormat.ts diff --git a/packages/imperative/src/utilities/src/doc/ISystemInfo.ts b/packages/imperative/src/utilities/doc/ISystemInfo.ts similarity index 100% rename from packages/imperative/src/utilities/src/doc/ISystemInfo.ts rename to packages/imperative/src/utilities/doc/ISystemInfo.ts diff --git a/packages/imperative/tsconfig-tests.json b/packages/imperative/tsconfig-tests.json deleted file mode 100644 index 6bd842eb0f..0000000000 --- a/packages/imperative/tsconfig-tests.json +++ /dev/null @@ -1,39 +0,0 @@ -{ - "compilerOptions": { - "types": [ - "node", - "jest" - ], - "lib": [ - "esnext" - ], - "experimentalDecorators": true, - "target": "es2015", - "module": "commonjs", - "noEmit": true, - "declaration": true, - "moduleResolution": "node", - "noImplicitAny": true, - "outDir": "./lib", - "preserveConstEnums": true, - "removeComments": false, - "pretty": true, - "sourceMap": true, - "newLine": "lf" - }, - "typeRoots": [ - "./node_modules/@types" - ], - "include": [ - "**/__tests__/*" - ], - "exclude": [ - "lib", - "node_modules", - "**/__mocks__/*" - ], - "files": [ - "../../__types__/wontache.d.ts" - ], - "allowJs": true -} From f672c5166dc4d3a1b1810fdc47f7805f6fc01cdb Mon Sep 17 00:00:00 2001 From: Amber Torrise Date: Wed, 17 Jan 2024 10:26:48 -0500 Subject: [PATCH 114/138] final import adjustments Signed-off-by: Amber Torrise --- .../imperative/ConfigValidator.unit.test.ts | 2 +- .../ConfigurationLoader.unit.test.ts | 6 +-- .../DefinitionTreeResolver.unit.test.ts | 10 ++--- .../imperative/Imperative.unit.test.ts | 12 +++--- .../imperative/LoggingConfigurer.unit.test.ts | 2 +- .../imperative/OverridesLoader.unit.test.ts | 11 ++--- .../PluginManagementFacility.unit.test.ts | 34 +++++++-------- .../PluginRequireProvider.unit.test.ts | 10 ++--- .../cmd/list/list.handler.unit.test.ts | 20 ++++----- .../uninstall/uninstall.handler.unit.test.ts | 42 +++++++++---------- .../cmd/update/update.handler.unit.test.ts | 32 +++++++------- .../validate/validate.handler.unit.test.ts | 14 +++---- .../utilities/NpmFunctions.unit.test.ts | 4 +- .../utilities/PMFConstants.unit.test.ts | 6 +-- .../utilities/PluginIssues.unit.test.ts | 2 +- .../npm-interface/install.unit.test.ts | 28 ++++++------- .../npm-interface/uninstall.unit.test.ts | 14 +++---- .../npm-interface/update.unit.test.ts | 24 +++++------ .../utilities/runValidatePlugin.unit.test.ts | 4 +- .../CreateProfilesHandler.unit.test.ts | 10 ++--- .../handlers/ListProfilesHandler.unit.test.ts | 10 ++--- .../NewDeleteProfilesHandler.unit.test.ts | 10 ++--- .../UpdateProfilesHandler.unit.test.ts | 10 ++--- .../ValidateProfileHandler.unit.test.ts | 12 +++--- 24 files changed, 165 insertions(+), 164 deletions(-) diff --git a/packages/imperative/__tests__/__unit__/imperative/ConfigValidator.unit.test.ts b/packages/imperative/__tests__/__unit__/imperative/ConfigValidator.unit.test.ts index bbee4d5c4b..b088a8b6a3 100644 --- a/packages/imperative/__tests__/__unit__/imperative/ConfigValidator.unit.test.ts +++ b/packages/imperative/__tests__/__unit__/imperative/ConfigValidator.unit.test.ts @@ -9,7 +9,7 @@ * */ -import { ConfigurationValidator, IImperativeConfig } from "../index"; +import { ConfigurationValidator, IImperativeConfig } from "../../../src/index"; describe("Imperative should validate config provided by the consumer", () => { diff --git a/packages/imperative/__tests__/__unit__/imperative/ConfigurationLoader.unit.test.ts b/packages/imperative/__tests__/__unit__/imperative/ConfigurationLoader.unit.test.ts index ed29e8905b..d8e75ec5a1 100644 --- a/packages/imperative/__tests__/__unit__/imperative/ConfigurationLoader.unit.test.ts +++ b/packages/imperative/__tests__/__unit__/imperative/ConfigurationLoader.unit.test.ts @@ -9,9 +9,9 @@ * */ -import { ConfigurationLoader } from ".."; -import { IImperativeOverrides } from "../src/doc/IImperativeOverrides"; -import { IApimlSvcAttrs } from "../src/doc/IApimlSvcAttrs"; +import { ConfigurationLoader } from "../../.."; +import { IImperativeOverrides } from "../../../src/imperative/doc/IImperativeOverrides"; +import { IApimlSvcAttrs } from "../../../src/imperative/doc/IApimlSvcAttrs"; import { homedir } from "os"; import * as path from "path"; diff --git a/packages/imperative/__tests__/__unit__/imperative/DefinitionTreeResolver.unit.test.ts b/packages/imperative/__tests__/__unit__/imperative/DefinitionTreeResolver.unit.test.ts index 4e551cf54a..4fa162f17c 100644 --- a/packages/imperative/__tests__/__unit__/imperative/DefinitionTreeResolver.unit.test.ts +++ b/packages/imperative/__tests__/__unit__/imperative/DefinitionTreeResolver.unit.test.ts @@ -9,11 +9,11 @@ * */ -import { DefinitionTreeResolver } from "../src/DefinitionTreeResolver"; -import { ImperativeError } from "../../error"; -import { Logger } from "../../logger"; -import { Console } from "../../console"; -import { ICommandDefinition } from "../../cmd"; +import { DefinitionTreeResolver } from "../../../src/imperative/DefinitionTreeResolver"; +import { ImperativeError } from "../../../src/error"; +import { Logger } from "../../../src/logger"; +import { Console } from "../../../src/console"; +import { ICommandDefinition } from "../../../src/cmd"; const fakeDefinition: ICommandDefinition = { name: "users", diff --git a/packages/imperative/__tests__/__unit__/imperative/Imperative.unit.test.ts b/packages/imperative/__tests__/__unit__/imperative/Imperative.unit.test.ts index cc96672519..793d3d5285 100644 --- a/packages/imperative/__tests__/__unit__/imperative/Imperative.unit.test.ts +++ b/packages/imperative/__tests__/__unit__/imperative/Imperative.unit.test.ts @@ -12,13 +12,13 @@ import Mock = jest.Mock; import { join } from "path"; import { generateRandomAlphaNumericString } from "../../../__tests__/src/TestUtil"; -import { IImperativeConfig } from "../src/doc/IImperativeConfig"; -import { IImperativeOverrides } from "../src/doc/IImperativeOverrides"; -import { IConfigLogging } from "../../logger"; -import { IImperativeEnvironmentalVariableSettings } from ".."; -import { ICommandDefinition } from "../../cmd/src/doc/ICommandDefinition"; +import { IImperativeConfig } from "../../../src/imperative/doc/IImperativeConfig"; +import { IImperativeOverrides } from "../../../src/imperative/doc/IImperativeOverrides"; +import { IConfigLogging } from "../../../src/logger"; +import { IImperativeEnvironmentalVariableSettings } from "../../.."; +import { ICommandDefinition } from "../../../src/cmd/doc/ICommandDefinition"; import * as yargs from "yargs"; -import { ImperativeError } from "../../error/src/ImperativeError"; +import { ImperativeError } from "../../../src/error/ImperativeError"; describe("Imperative", () => { const mainModule = process.mainModule; diff --git a/packages/imperative/__tests__/__unit__/imperative/LoggingConfigurer.unit.test.ts b/packages/imperative/__tests__/__unit__/imperative/LoggingConfigurer.unit.test.ts index ba39b217b7..6bba102fe1 100644 --- a/packages/imperative/__tests__/__unit__/imperative/LoggingConfigurer.unit.test.ts +++ b/packages/imperative/__tests__/__unit__/imperative/LoggingConfigurer.unit.test.ts @@ -9,7 +9,7 @@ * */ -import { LoggingConfigurer } from "../src/LoggingConfigurer"; +import { LoggingConfigurer } from "../../../src/imperative/LoggingConfigurer"; import * as os from "os"; import * as path from "path"; diff --git a/packages/imperative/__tests__/__unit__/imperative/OverridesLoader.unit.test.ts b/packages/imperative/__tests__/__unit__/imperative/OverridesLoader.unit.test.ts index fd5c0399c0..a5410b9dde 100644 --- a/packages/imperative/__tests__/__unit__/imperative/OverridesLoader.unit.test.ts +++ b/packages/imperative/__tests__/__unit__/imperative/OverridesLoader.unit.test.ts @@ -9,16 +9,17 @@ * */ -import { IImperativeConfig } from "../src/doc/IImperativeConfig"; +import { IImperativeConfig } from "../../../src/imperative/doc/IImperativeConfig"; jest.mock("../../security"); jest.mock("../../utilities/ImperativeConfig"); -import { OverridesLoader } from "../src/OverridesLoader"; -import { CredentialManagerFactory, AbstractCredentialManager } from "../../security"; +import { OverridesLoader } from "../../../src/imperative/OverridesLoader"; +import { CredentialManagerFactory, AbstractCredentialManager } from "../../../src/security"; import * as path from "path"; -import { ImperativeConfig, Logger } from "../.."; -import { AppSettings } from "../../settings"; +import { Logger } from "../../../"; +import { ImperativeConfig } from "../../../src/utilities/ImperativeConfig"; +import { AppSettings } from "../../../src/settings"; const TEST_MANAGER_NAME = "test manager"; diff --git a/packages/imperative/__tests__/__unit__/imperative/plugins/PluginManagementFacility.unit.test.ts b/packages/imperative/__tests__/__unit__/imperative/plugins/PluginManagementFacility.unit.test.ts index af8e81ce30..ac19d2d6a7 100644 --- a/packages/imperative/__tests__/__unit__/imperative/plugins/PluginManagementFacility.unit.test.ts +++ b/packages/imperative/__tests__/__unit__/imperative/plugins/PluginManagementFacility.unit.test.ts @@ -17,26 +17,26 @@ jest.mock("../../src/plugins/utilities/PMFConstants"); jest.mock("../../src/plugins/PluginRequireProvider"); import * as fs from "fs"; -import { AppSettings } from "../../../settings"; +import { AppSettings } from "../../../../src/settings"; import { ICommandDefinition } from "../../../../src/cmd"; -import { IImperativeConfig } from "../../src/doc/IImperativeConfig"; -import { ImperativeConfig } from "../../../utilities/ImperativeConfig"; -import { UpdateImpConfig } from "../../src/UpdateImpConfig"; -import { IPluginJson } from "../../src/plugins/doc/IPluginJson"; -import { IssueSeverity, PluginIssues } from "../../src/plugins/utilities/PluginIssues"; +import { IImperativeConfig } from "../../../../src/imperative/doc/IImperativeConfig"; +import { ImperativeConfig } from "../../../../src/utilities/ImperativeConfig"; +import { UpdateImpConfig } from "../../../../src/imperative/UpdateImpConfig"; +import { IPluginJson } from "../../../../src/imperative/plugins/doc/IPluginJson"; +import { IssueSeverity, PluginIssues } from "../../../../src/imperative/plugins/utilities/PluginIssues"; import { join, resolve } from "path"; -import { PluginManagementFacility } from "../../src/plugins/PluginManagementFacility"; -import { PMFConstants } from "../../src/plugins/utilities/PMFConstants"; +import { PluginManagementFacility } from "../../../../src/imperative/plugins/PluginManagementFacility"; +import { PMFConstants } from "../../../../src/imperative/plugins/utilities/PMFConstants"; import * as jsonfile from "jsonfile"; -import { ConfigurationLoader } from "../../src/ConfigurationLoader"; -import { ConfigurationValidator } from "../../src/ConfigurationValidator"; -import { ICommandProfileTypeConfiguration } from "../../../cmd"; -import { DefinitionTreeResolver } from "../../src/DefinitionTreeResolver"; -import { IPluginCfgProps } from "../../src/plugins/doc/IPluginCfgProps"; -import { Logger } from "../../../logger"; -import { IO } from "../../../io"; -import { ISettingsFile } from "../../../settings/src/doc/ISettingsFile"; -import { CredentialManagerOverride } from "../../../security/src/CredentialManagerOverride"; +import { ConfigurationLoader } from "../../../../src/imperative/ConfigurationLoader"; +import { ConfigurationValidator } from "../../../../src/imperative/ConfigurationValidator"; +import { ICommandProfileTypeConfiguration } from "../../../../src/cmd"; +import { DefinitionTreeResolver } from "../../../../src/imperative/DefinitionTreeResolver"; +import { IPluginCfgProps } from "../../../../src/imperative/plugins/doc/IPluginCfgProps"; +import { Logger } from "../../../../src/logger"; +import { IO } from "../../../../src/io"; +import { ISettingsFile } from "../../../../src/settings/doc/ISettingsFile"; +import { CredentialManagerOverride } from "../../../../src/security/CredentialManagerOverride"; // NOTE: Several tests for CredentialManager override are currently disabled describe("Plugin Management Facility", () => { diff --git a/packages/imperative/__tests__/__unit__/imperative/plugins/PluginRequireProvider.unit.test.ts b/packages/imperative/__tests__/__unit__/imperative/plugins/PluginRequireProvider.unit.test.ts index db0185ceca..971d3b7e17 100644 --- a/packages/imperative/__tests__/__unit__/imperative/plugins/PluginRequireProvider.unit.test.ts +++ b/packages/imperative/__tests__/__unit__/imperative/plugins/PluginRequireProvider.unit.test.ts @@ -11,16 +11,16 @@ import { getMockWrapper } from "../../../../__tests__/__src__/types/MockWrapper"; -jest.mock("../../../utilities/ImperativeConfig"); +jest.mock("../../../../../src/utilities/ImperativeConfig"); jest.mock("find-up"); jest.mock("path"); import * as Module from "module"; import * as findUp from "find-up"; -import { ImperativeConfig } from "../../../utilities/ImperativeConfig"; -import { PluginRequireProvider } from "../../src/plugins/PluginRequireProvider"; -import { PluginRequireAlreadyCreatedError } from "../../src/plugins/errors/PluginRequireAlreadyCreatedError"; -import { PluginRequireNotCreatedError } from "../../src/plugins/errors/PluginRequireNotCreatedError"; +import { ImperativeConfig } from "../../../../src/utilities/ImperativeConfig"; +import { PluginRequireProvider } from "../../../../src/imperative/plugins/PluginRequireProvider"; +import { PluginRequireAlreadyCreatedError } from "../../../../src/imperative/plugins/errors/PluginRequireAlreadyCreatedError"; +import { PluginRequireNotCreatedError } from "../../../../src/imperative/plugins/errors/PluginRequireNotCreatedError"; import * as path from "path"; import { generateRandomAlphaNumericString } from "../../../../__tests__/src/TestUtil"; diff --git a/packages/imperative/__tests__/__unit__/imperative/plugins/cmd/list/list.handler.unit.test.ts b/packages/imperative/__tests__/__unit__/imperative/plugins/cmd/list/list.handler.unit.test.ts index ba6d499011..51cd799156 100644 --- a/packages/imperative/__tests__/__unit__/imperative/plugins/cmd/list/list.handler.unit.test.ts +++ b/packages/imperative/__tests__/__unit__/imperative/plugins/cmd/list/list.handler.unit.test.ts @@ -13,16 +13,16 @@ import Mock = jest.Mock; jest.mock("jsonfile"); -jest.mock("../../../../src/plugins/utilities/PMFConstants"); -jest.mock("../../../../../cmd/src/response/CommandResponse"); -jest.mock("../../../../../cmd/src/response/HandlerResponse"); -jest.mock("../../../../../logger"); - -import { HandlerResponse, IHandlerParameters } from "../../../../../cmd"; -import { Console } from "../../../../../console"; -import { IPluginJson } from "../../../../src/plugins/doc/IPluginJson"; -import ListHandler from "../../../../src/plugins/cmd/list/list.handler"; -import { Logger } from "../../../../../logger/"; +jest.mock("../../../../../../src/imperative/plugins/utilities/PMFConstants"); +jest.mock("../../../../../../src/cmd/response/CommandResponse"); +jest.mock("../../../../../../src/cmd/response/HandlerResponse"); +jest.mock("../../../../../../src/logger"); + +import { HandlerResponse, IHandlerParameters } from "../../../../../../src/cmd"; +import { Console } from "../../../../../../src/console"; +import { IPluginJson } from "../../../../../../src/imperative/plugins/doc/IPluginJson"; +import ListHandler from "../../../../../../src/imperative/plugins/cmd/list/list.handler"; +import { Logger } from "../../../../../../src/logger/"; import { readFileSync } from "jsonfile"; const stripAnsi = require("strip-ansi"); diff --git a/packages/imperative/__tests__/__unit__/imperative/plugins/cmd/uninstall/uninstall.handler.unit.test.ts b/packages/imperative/__tests__/__unit__/imperative/plugins/cmd/uninstall/uninstall.handler.unit.test.ts index 0c7ebdb07a..7b395a6bfb 100644 --- a/packages/imperative/__tests__/__unit__/imperative/plugins/cmd/uninstall/uninstall.handler.unit.test.ts +++ b/packages/imperative/__tests__/__unit__/imperative/plugins/cmd/uninstall/uninstall.handler.unit.test.ts @@ -14,29 +14,29 @@ import Mock = jest.Mock; jest.mock("child_process"); jest.mock("jsonfile"); -jest.mock("../../../../src/plugins/utilities/npm-interface/uninstall"); -jest.mock("../../../../src/plugins/utilities/PMFConstants"); -jest.mock("../../../../../cmd/src/response/CommandResponse"); -jest.mock("../../../../../cmd/src/response/HandlerResponse"); -jest.mock("../../../../../cmd/src/doc/handler/IHandlerParameters"); -jest.mock("../../../../../logger"); - -import { HandlerResponse, IHandlerParameters } from "../../../../../cmd"; -import { Console } from "../../../../../console"; -import { ConfigurationLoader } from "../../../../src/ConfigurationLoader"; -import { CredentialManagerOverride } from "../../../../../security"; -import { IImperativeConfig } from "../../../../src/doc/IImperativeConfig"; -import { IPluginJson } from "../../../../src/plugins/doc/IPluginJson"; -import { PluginManagementFacility } from "../../../../src/plugins/PluginManagementFacility"; -import { AbstractPluginLifeCycle } from "../../../../src/plugins/AbstractPluginLifeCycle"; -import { ImperativeError } from "../../../../../error"; -import { Logger } from "../../../../../logger"; -import { TextUtils } from "../../../../../utilities"; -import UninstallHandler from "../../../../src/plugins/cmd/uninstall/uninstall.handler"; +jest.mock("../../../../../../src/imperative/plugins/utilities/npm-interface/uninstall"); +jest.mock("../../../../../../src/imperative/plugins/utilities/PMFConstants"); +jest.mock("../../../../../../src/cmd/response/CommandResponse"); +jest.mock("../../../../../../src/cmd/response/HandlerResponse"); +jest.mock("../../../../../../src/cmd/doc/handler/IHandlerParameters"); +jest.mock("../../../../../../src/logger"); + +import { HandlerResponse, IHandlerParameters } from "../../../../../../src/cmd"; +import { Console } from "../../../../../../src/console"; +import { ConfigurationLoader } from "../../../../../../src/imperative/ConfigurationLoader"; +import { CredentialManagerOverride } from "../../../../../../src/security"; +import { IImperativeConfig } from "../../../../../../src/imperative/doc/IImperativeConfig"; +import { IPluginJson } from "../../../../../../src/imperative/plugins/doc/IPluginJson"; +import { PluginManagementFacility } from "../../../../../../src/imperative/plugins/PluginManagementFacility"; +import { AbstractPluginLifeCycle } from "../../../../../../src/imperative/plugins/AbstractPluginLifeCycle"; +import { ImperativeError } from "../../../../../../src/error"; +import { Logger } from "../../../../../../src/logger"; +import { TextUtils } from "../../../../../../src/utilities/TextUtils"; +import UninstallHandler from "../../../../../../src/imperative/plugins/cmd/uninstall/uninstall.handler"; import * as ChildProcesses from "child_process"; import * as JsonFile from "jsonfile"; -import * as NpmInterface from "../../../../src/plugins/utilities/npm-interface"; -import * as NpmFunctions from "../../../../src/plugins/utilities/NpmFunctions"; +import * as NpmInterface from "../../../../../../src/imperative/plugins/utilities/npm-interface"; +import * as NpmFunctions from "../../../../../../src/imperative/plugins/utilities/NpmFunctions"; describe("Plugin Management Facility uninstall handler", () => { diff --git a/packages/imperative/__tests__/__unit__/imperative/plugins/cmd/update/update.handler.unit.test.ts b/packages/imperative/__tests__/__unit__/imperative/plugins/cmd/update/update.handler.unit.test.ts index 40c914b7ba..681f77ca1a 100644 --- a/packages/imperative/__tests__/__unit__/imperative/plugins/cmd/update/update.handler.unit.test.ts +++ b/packages/imperative/__tests__/__unit__/imperative/plugins/cmd/update/update.handler.unit.test.ts @@ -13,24 +13,24 @@ import Mock = jest.Mock; jest.mock("child_process"); jest.mock("jsonfile"); -jest.mock("../../../../src/plugins/utilities/npm-interface/update"); -jest.mock("../../../../src/plugins/utilities/PMFConstants"); -jest.mock("../../../../../cmd/src/doc/handler/IHandlerParameters"); -jest.mock("../../../../../cmd/src/response/CommandResponse"); -jest.mock("../../../../../cmd/src/response/HandlerResponse"); -jest.mock("../../../../../logger"); -jest.mock("../../../../src/plugins/utilities/NpmFunctions"); - -import { HandlerResponse, IHandlerParameters } from "../../../../../cmd"; -import { Console } from "../../../../../console"; -import { IPluginJson } from "../../../../src/plugins/doc/IPluginJson"; -import { Logger } from "../../../../../logger"; -import { PMFConstants } from "../../../../src/plugins/utilities/PMFConstants"; -import UpdateHandler from "../../../../src/plugins/cmd/update/update.handler"; -import * as NpmFunctions from "../../../../src/plugins/utilities/NpmFunctions"; +jest.mock("../../../../../../src/imperative/plugins/utilities/npm-interface/update"); +jest.mock("../../../../../../src/imperative/plugins/utilities/PMFConstants"); +jest.mock("../../../../../../src/cmd/doc/handler/IHandlerParameters"); +jest.mock("../../../../../../src/cmd/response/CommandResponse"); +jest.mock("../../../../../../src/cmd/response/HandlerResponse"); +jest.mock("../../../../../../src/logger"); +jest.mock("../../../../../../src/imperative/plugins/utilities/NpmFunctions"); + +import { HandlerResponse, IHandlerParameters } from "../../../../../../src/cmd"; +import { Console } from "../../../../../../src/console"; +import { IPluginJson } from "../../../../../../src/imperative/plugins/doc/IPluginJson"; +import { Logger } from "../../../../../../src/logger"; +import { PMFConstants } from "../../../../../../src/imperative/plugins/utilities/PMFConstants"; +import UpdateHandler from "../../../../../../src/imperative/plugins/cmd/update/update.handler"; +import * as NpmFunctions from "../../../../../../src/imperative/plugins/utilities/NpmFunctions"; import * as ChildProcesses from "child_process"; import * as JsonFile from "jsonfile"; -import * as NpmInterface from "../../../../src/plugins/utilities/npm-interface"; +import * as NpmInterface from "../../../../../../src/imperative/plugins/utilities/npm-interface"; describe("Plugin Management Facility update handler", () => { diff --git a/packages/imperative/__tests__/__unit__/imperative/plugins/cmd/validate/validate.handler.unit.test.ts b/packages/imperative/__tests__/__unit__/imperative/plugins/cmd/validate/validate.handler.unit.test.ts index 56b94e1f1a..db7b16b849 100644 --- a/packages/imperative/__tests__/__unit__/imperative/plugins/cmd/validate/validate.handler.unit.test.ts +++ b/packages/imperative/__tests__/__unit__/imperative/plugins/cmd/validate/validate.handler.unit.test.ts @@ -11,15 +11,15 @@ import Mock = jest.Mock; -jest.mock("../../../../../cmd/src/response/CommandResponse"); -jest.mock("../../../../../cmd/src/response/HandlerResponse"); +jest.mock("../../../../../../src/cmd/response/CommandResponse"); +jest.mock("../../../../../../src/cmd/response/HandlerResponse"); -import { HandlerResponse, IHandlerParameters } from "../../../../../cmd"; -import { ImperativeConfig } from "../../../../../utilities/ImperativeConfig"; -import { IssueSeverity, PluginIssues } from "../../../../src/plugins/utilities/PluginIssues"; +import { HandlerResponse, IHandlerParameters } from "../../../../../../src/cmd"; +import { ImperativeConfig } from "../../../../../../src/utilities/ImperativeConfig"; +import { IssueSeverity, PluginIssues } from "../../../../../../src/imperative/plugins/utilities/PluginIssues"; import { resolve } from "path"; -import { TextUtils } from "../../../../../utilities"; -import ValidateHandler from "../../../../src/plugins/cmd/validate/validate.handler"; +import { TextUtils } from "../../../../../../src/utilities/TextUtils"; +import ValidateHandler from "../../../../../../src/imperative/plugins/cmd/validate/validate.handler"; describe("Plugin validate command handler", () => { diff --git a/packages/imperative/__tests__/__unit__/imperative/plugins/utilities/NpmFunctions.unit.test.ts b/packages/imperative/__tests__/__unit__/imperative/plugins/utilities/NpmFunctions.unit.test.ts index 41c9021617..9169098a81 100644 --- a/packages/imperative/__tests__/__unit__/imperative/plugins/utilities/NpmFunctions.unit.test.ts +++ b/packages/imperative/__tests__/__unit__/imperative/plugins/utilities/NpmFunctions.unit.test.ts @@ -13,8 +13,8 @@ import * as spawn from "cross-spawn"; import * as jsonfile from "jsonfile"; import * as npmPackageArg from "npm-package-arg"; import * as pacote from "pacote"; -import * as npmFunctions from "../../../src/plugins/utilities/NpmFunctions"; -import { PMFConstants } from "../../../src/plugins/utilities/PMFConstants"; +import * as npmFunctions from "../../../../../src/imperative/plugins/utilities/NpmFunctions"; +import { PMFConstants } from "../../../../../src/imperative/plugins/utilities/PMFConstants"; jest.mock("cross-spawn"); jest.mock("jsonfile"); diff --git a/packages/imperative/__tests__/__unit__/imperative/plugins/utilities/PMFConstants.unit.test.ts b/packages/imperative/__tests__/__unit__/imperative/plugins/utilities/PMFConstants.unit.test.ts index c2e332b357..1d1c067f76 100644 --- a/packages/imperative/__tests__/__unit__/imperative/plugins/utilities/PMFConstants.unit.test.ts +++ b/packages/imperative/__tests__/__unit__/imperative/plugins/utilities/PMFConstants.unit.test.ts @@ -28,9 +28,9 @@ describe("PMFConstants", () => { beforeEach(async () => { jest.resetModules(); - ({PMFConstants} = await import("../../../src/plugins/utilities/PMFConstants")); - ({ImperativeConfig} = await import("../../../../utilities/ImperativeConfig")); - ({EnvironmentalVariableSettings} = await import("../../../src/env/EnvironmentalVariableSettings")); + ({PMFConstants} = await import("../../../../../src/imperative/plugins/utilities/PMFConstants")); + ({ImperativeConfig} = await import("../../../../../src/utilities/ImperativeConfig")); + ({EnvironmentalVariableSettings} = await import("../../../../../src/imperative/env/EnvironmentalVariableSettings")); ({join} = await import("path")); mocks.join = join; diff --git a/packages/imperative/__tests__/__unit__/imperative/plugins/utilities/PluginIssues.unit.test.ts b/packages/imperative/__tests__/__unit__/imperative/plugins/utilities/PluginIssues.unit.test.ts index 0ce7de7ef7..4b0cc7d432 100644 --- a/packages/imperative/__tests__/__unit__/imperative/plugins/utilities/PluginIssues.unit.test.ts +++ b/packages/imperative/__tests__/__unit__/imperative/plugins/utilities/PluginIssues.unit.test.ts @@ -9,7 +9,7 @@ * */ -import { IssueSeverity, PluginIssues } from "../../../src/plugins/utilities/PluginIssues"; +import { IssueSeverity, PluginIssues } from "../../../../../src/imperative/plugins/utilities/PluginIssues"; describe("PluginIssues", () => { diff --git a/packages/imperative/__tests__/__unit__/imperative/plugins/utilities/npm-interface/install.unit.test.ts b/packages/imperative/__tests__/__unit__/imperative/plugins/utilities/npm-interface/install.unit.test.ts index 8c7ff5b02f..ece39f672a 100644 --- a/packages/imperative/__tests__/__unit__/imperative/plugins/utilities/npm-interface/install.unit.test.ts +++ b/packages/imperative/__tests__/__unit__/imperative/plugins/utilities/npm-interface/install.unit.test.ts @@ -40,22 +40,22 @@ jest.doMock("path", () => { }; }); -import { Console } from "../../../../../console"; -import { ImperativeError } from "../../../../../error"; -import { IImperativeConfig } from "../../../../src/doc/IImperativeConfig"; -import { install } from "../../../../src/plugins/utilities/npm-interface"; -import { IPluginJson } from "../../../../src/plugins/doc/IPluginJson"; -import { IPluginJsonObject } from "../../../../src/plugins/doc/IPluginJsonObject"; -import { Logger } from "../../../../../logger"; -import { PMFConstants } from "../../../../src/plugins/utilities/PMFConstants"; +import { Console } from "../../../../../../src/console"; +import { ImperativeError } from "../../../../../../src/error"; +import { IImperativeConfig } from "../../../../../../src/imperative/doc/IImperativeConfig"; +import { install } from "../../../../../../src/imperative/plugins/utilities/npm-interface"; +import { IPluginJson } from "../../../../../../src/imperative/plugins/doc/IPluginJson"; +import { IPluginJsonObject } from "../../../../../../src/imperative/plugins/doc/IPluginJsonObject"; +import { Logger } from "../../../../../../src/logger"; +import { PMFConstants } from "../../../../../../src/imperative/plugins/utilities/PMFConstants"; import { readFileSync, writeFileSync } from "jsonfile"; import { sync } from "find-up"; -import { getPackageInfo, installPackages } from "../../../../src/plugins/utilities/NpmFunctions"; -import { ConfigSchema } from "../../../../../config/src/ConfigSchema"; -import { PluginManagementFacility } from "../../../../src/plugins/PluginManagementFacility"; -import { AbstractPluginLifeCycle } from "../../../../src/plugins/AbstractPluginLifeCycle"; -import { ConfigurationLoader } from "../../../../src/ConfigurationLoader"; -import { UpdateImpConfig } from "../../../../src/UpdateImpConfig"; +import { getPackageInfo, installPackages } from "../../../../../../src/imperative/plugins/utilities/NpmFunctions"; +import { ConfigSchema } from "../../../../../../src/config/ConfigSchema"; +import { PluginManagementFacility } from "../../../../../../src/imperative/plugins/PluginManagementFacility"; +import { AbstractPluginLifeCycle } from "../../../../../../src/imperative/plugins/AbstractPluginLifeCycle"; +import { ConfigurationLoader } from "../../../../../../src/imperative/ConfigurationLoader"; +import { UpdateImpConfig } from "../../../../../../src/imperative/UpdateImpConfig"; import * as fs from "fs"; import * as path from "path"; diff --git a/packages/imperative/__tests__/__unit__/imperative/plugins/utilities/npm-interface/uninstall.unit.test.ts b/packages/imperative/__tests__/__unit__/imperative/plugins/utilities/npm-interface/uninstall.unit.test.ts index 28204bd208..105e28e126 100644 --- a/packages/imperative/__tests__/__unit__/imperative/plugins/utilities/npm-interface/uninstall.unit.test.ts +++ b/packages/imperative/__tests__/__unit__/imperative/plugins/utilities/npm-interface/uninstall.unit.test.ts @@ -20,15 +20,15 @@ jest.mock("../../../../../cmd/src/response/CommandResponse"); jest.mock("../../../../../cmd/src/response/HandlerResponse"); import * as fs from "fs"; -import { Console } from "../../../../../console"; +import { Console } from "../../../../../../src/console"; import { sync } from "cross-spawn"; -import { ImperativeError } from "../../../../../error"; -import { IPluginJson } from "../../../../src/plugins/doc/IPluginJson"; -import { Logger } from "../../../../../logger"; -import { PMFConstants } from "../../../../src/plugins/utilities/PMFConstants"; +import { ImperativeError } from "../../../../../../src/error"; +import { IPluginJson } from "../../../../../../src/imperative/plugins/doc/IPluginJson"; +import { Logger } from "../../../../../../src/logger"; +import { PMFConstants } from "../../../../../../src/imperative/plugins/utilities/PMFConstants"; import { readFileSync, writeFileSync } from "jsonfile"; -import { findNpmOnPath } from "../../../../src/plugins/utilities/NpmFunctions"; -import { uninstall } from "../../../../src/plugins/utilities/npm-interface"; +import { findNpmOnPath } from "../../../../../../src/imperative/plugins/utilities/NpmFunctions"; +import { uninstall } from "../../../../../../src/imperative/plugins/utilities/npm-interface"; describe("PMF: Uninstall Interface", () => { diff --git a/packages/imperative/__tests__/__unit__/imperative/plugins/utilities/npm-interface/update.unit.test.ts b/packages/imperative/__tests__/__unit__/imperative/plugins/utilities/npm-interface/update.unit.test.ts index da2ec64195..f68402efb4 100644 --- a/packages/imperative/__tests__/__unit__/imperative/plugins/utilities/npm-interface/update.unit.test.ts +++ b/packages/imperative/__tests__/__unit__/imperative/plugins/utilities/npm-interface/update.unit.test.ts @@ -13,19 +13,19 @@ import Mock = jest.Mock; jest.mock("cross-spawn"); jest.mock("jsonfile"); -jest.mock("../../../../src/plugins/utilities/PMFConstants"); -jest.mock("../../../../../logger"); -jest.mock("../../../../../cmd/src/response/CommandResponse"); -jest.mock("../../../../../cmd/src/response/HandlerResponse"); -jest.mock("../../../../src/plugins/utilities/NpmFunctions"); - -import { Console } from "../../../../../console"; -import { IPluginJson } from "../../../../src/plugins/doc/IPluginJson"; -import { Logger } from "../../../../../logger"; -import { PMFConstants } from "../../../../src/plugins/utilities/PMFConstants"; +jest.mock("../../../../../../src/imperative/plugins/utilities/PMFConstants"); +jest.mock("../../../../../../src/imperative/logger"); +jest.mock("../../../../../../src/imperative/cmd/response/CommandResponse"); +jest.mock("../../../../../../src/imperative/cmd/response/HandlerResponse"); +jest.mock("../../../../../../src/imperative/imperative/utilities/NpmFunctions"); + +import { Console } from "../../../../../../src/console"; +import { IPluginJson } from "../../../../../../src/imperative/plugins/doc/IPluginJson"; +import { Logger } from "../../../../../../src/logger"; +import { PMFConstants } from "../../../../../../src/imperative/plugins/utilities/PMFConstants"; import { readFileSync } from "jsonfile"; -import { update } from "../../../../src/plugins/utilities/npm-interface"; -import { getPackageInfo, installPackages } from "../../../../src/plugins/utilities/NpmFunctions"; +import { update } from "../../../../../../src/imperative/plugins/utilities/npm-interface"; +import { getPackageInfo, installPackages } from "../../../../../../src/imperative/plugins/utilities/NpmFunctions"; describe("PMF: update Interface", () => { // Objects created so types are correct. diff --git a/packages/imperative/__tests__/__unit__/imperative/plugins/utilities/runValidatePlugin.unit.test.ts b/packages/imperative/__tests__/__unit__/imperative/plugins/utilities/runValidatePlugin.unit.test.ts index 1f5ae7e922..0f1aafc8c8 100644 --- a/packages/imperative/__tests__/__unit__/imperative/plugins/utilities/runValidatePlugin.unit.test.ts +++ b/packages/imperative/__tests__/__unit__/imperative/plugins/utilities/runValidatePlugin.unit.test.ts @@ -9,9 +9,9 @@ * */ -import { runValidatePlugin } from "../../../src/plugins/utilities/runValidatePlugin"; +import { runValidatePlugin } from "../../../../../src/imperative/plugins/utilities/runValidatePlugin"; import { sync } from "cross-spawn"; -import { Imperative } from "../../.."; +import { Imperative } from "../../../../../"; import Mock = jest.Mock; jest.mock("cross-spawn"); diff --git a/packages/imperative/__tests__/__unit__/imperative/profiles/handlers/CreateProfilesHandler.unit.test.ts b/packages/imperative/__tests__/__unit__/imperative/profiles/handlers/CreateProfilesHandler.unit.test.ts index 6cc7bc5636..b6fb4d5d43 100644 --- a/packages/imperative/__tests__/__unit__/imperative/profiles/handlers/CreateProfilesHandler.unit.test.ts +++ b/packages/imperative/__tests__/__unit__/imperative/profiles/handlers/CreateProfilesHandler.unit.test.ts @@ -9,12 +9,12 @@ * */ -jest.mock("../../../src/Imperative"); -jest.mock("../../../../utilities/ImperativeConfig"); +jest.mock("../../../../../src/imperative/Imperative"); +jest.mock("../../../../../src/utilities/ImperativeConfig"); -import { IProfileLoaded } from "../../../../profiles"; -import { Imperative } from "../../../src/Imperative"; -import { ImperativeConfig } from "../../../../utilities"; +import { IProfileLoaded } from "../../../../../src/profiles"; +import { Imperative } from "../../../../../src/imperative/Imperative"; +import { ImperativeConfig } from "../../../../../src/utilities/ImperativeConfig"; const fakeProfileIoError = "Pretend a ProfileIO error occurred"; const noMsgText = "No message text"; diff --git a/packages/imperative/__tests__/__unit__/imperative/profiles/handlers/ListProfilesHandler.unit.test.ts b/packages/imperative/__tests__/__unit__/imperative/profiles/handlers/ListProfilesHandler.unit.test.ts index 6ea7949a4d..06218a8079 100644 --- a/packages/imperative/__tests__/__unit__/imperative/profiles/handlers/ListProfilesHandler.unit.test.ts +++ b/packages/imperative/__tests__/__unit__/imperative/profiles/handlers/ListProfilesHandler.unit.test.ts @@ -9,12 +9,12 @@ * */ -jest.mock("../../../src/Imperative"); -jest.mock("../../../../utilities/ImperativeConfig"); +jest.mock("../../../../../src/imperative/Imperative"); +jest.mock("../../../../../src/utilities/ImperativeConfig"); -import { IProfileLoaded } from "../../../../profiles"; -import { Imperative } from "../../../src/Imperative"; -import { ImperativeConfig } from "../../../../utilities"; +import { IProfileLoaded } from "../../../../../src/profiles"; +import { Imperative } from "../../../../../src/imperative/Imperative"; +import { ImperativeConfig } from "../../../../../src/utilities/ImperativeConfig"; // "Mocked" profiles const FAKE_PROFS: IProfileLoaded[] = [ diff --git a/packages/imperative/__tests__/__unit__/imperative/profiles/handlers/NewDeleteProfilesHandler.unit.test.ts b/packages/imperative/__tests__/__unit__/imperative/profiles/handlers/NewDeleteProfilesHandler.unit.test.ts index 038915470c..f9380665c6 100644 --- a/packages/imperative/__tests__/__unit__/imperative/profiles/handlers/NewDeleteProfilesHandler.unit.test.ts +++ b/packages/imperative/__tests__/__unit__/imperative/profiles/handlers/NewDeleteProfilesHandler.unit.test.ts @@ -9,12 +9,12 @@ * */ -jest.mock("../../../src/Imperative"); -jest.mock("../../../../utilities/ImperativeConfig"); +jest.mock("../../../../../src/imperative/Imperative"); +jest.mock("../../../../../src/utilities/ImperativeConfig"); -import { IProfileLoaded } from "../../../../profiles"; -import { Imperative } from "../../../src/Imperative"; -import { ImperativeConfig } from "../../../../utilities"; +import { IProfileLoaded } from "../../../../../src/profiles"; +import { Imperative } from "../../../../../src/imperative/Imperative"; +import { ImperativeConfig } from "../../../../../src/utilities/ImperativeConfig"; const fakeProfileIoError = "Pretend a ProfileIO error occurred"; const noMsgText = "No message text"; diff --git a/packages/imperative/__tests__/__unit__/imperative/profiles/handlers/UpdateProfilesHandler.unit.test.ts b/packages/imperative/__tests__/__unit__/imperative/profiles/handlers/UpdateProfilesHandler.unit.test.ts index 63c71dc5f9..46e21e4acf 100644 --- a/packages/imperative/__tests__/__unit__/imperative/profiles/handlers/UpdateProfilesHandler.unit.test.ts +++ b/packages/imperative/__tests__/__unit__/imperative/profiles/handlers/UpdateProfilesHandler.unit.test.ts @@ -9,12 +9,12 @@ * */ -jest.mock("../../../src/Imperative"); -jest.mock("../../../../utilities/ImperativeConfig"); +jest.mock("../../../../../src/imperative/Imperative"); +jest.mock("../../../../../src/utilities/ImperativeConfig"); -import { IProfileLoaded } from "../../../../profiles"; -import { Imperative } from "../../../src/Imperative"; -import { ImperativeConfig } from "../../../../utilities"; +import { IProfileLoaded } from "../../../../../src/profiles"; +import { Imperative } from "../../../../../src/imperative/Imperative"; +import { ImperativeConfig } from "../../../../../src/utilities/ImperativeConfig"; const fakeProfileIoError = "Pretend a ProfileIO error occurred"; const noMsgText = "No message text"; diff --git a/packages/imperative/__tests__/__unit__/imperative/profiles/handlers/ValidateProfileHandler.unit.test.ts b/packages/imperative/__tests__/__unit__/imperative/profiles/handlers/ValidateProfileHandler.unit.test.ts index 703fca7f62..7ffcf80f45 100644 --- a/packages/imperative/__tests__/__unit__/imperative/profiles/handlers/ValidateProfileHandler.unit.test.ts +++ b/packages/imperative/__tests__/__unit__/imperative/profiles/handlers/ValidateProfileHandler.unit.test.ts @@ -9,13 +9,13 @@ * */ -jest.mock("../../../src/Imperative"); -jest.mock("../../../../utilities/ImperativeConfig"); +jest.mock("../../../../../src/imperative/Imperative"); +jest.mock("../../../../../src/utilities/ImperativeConfig"); -import { IProfileLoaded, ProfileValidator } from "../../../../profiles"; -import { ICommandProfileTypeConfiguration } from "../../../../cmd"; -import { Imperative } from "../../../src/Imperative"; -import { ImperativeConfig } from "../../../../utilities"; +import { IProfileLoaded, ProfileValidator } from "../../../../../src/profiles"; +import { ICommandProfileTypeConfiguration } from "../../../../../src/cmd"; +import { Imperative } from "../../../../../src/imperative/Imperative"; +import { ImperativeConfig } from "../../../../../src/utilities/ImperativeConfig"; const fakeProfileIoError = "Pretend a ProfileIO error occurred"; const noMsgText = "No message text"; From 9399f9353e32d0a8c2aa94ae5d923c3facdd6f07 Mon Sep 17 00:00:00 2001 From: Amber Torrise Date: Wed, 17 Jan 2024 10:42:44 -0500 Subject: [PATCH 115/138] fixing build errors Signed-off-by: Amber Torrise --- .../src/imperative/UpdateImpConfig.ts | 6 ++-- .../plugins/PluginManagementFacility.ts | 16 +++++----- .../plugins/PluginRequireProvider.ts | 2 +- .../plugins/cmd/validate/validate.handler.ts | 4 +-- .../PluginRequireAlreadyCreatedError.ts | 2 +- .../errors/PluginRequireNotCreatedError.ts | 2 +- .../plugins/utilities/NpmFunctions.ts | 2 +- .../plugins/utilities/PMFConstants.ts | 4 +-- .../plugins/utilities/PluginIssues.ts | 2 +- .../utilities/npm-interface/install.ts | 8 ++--- .../utilities/npm-interface/uninstall.ts | 6 ++-- .../plugins/utilities/npm-interface/update.ts | 2 +- .../plugins/utilities/runValidatePlugin.ts | 6 ++-- .../ImperativeProfileManagerFactory.ts | 4 +-- .../builders/CompleteProfilesGroupBuilder.ts | 12 +++---- .../builders/ProfilesCommandBuilder.ts | 10 +++--- .../builders/ProfilesCreateCommandBuilder.ts | 12 +++---- .../builders/ProfilesDeleteCommandBuilder.ts | 10 +++--- .../builders/ProfilesListCommandBuilder.ts | 12 +++---- .../builders/ProfilesSetCommandBuilder.ts | 10 +++--- .../ProfilesShowDependenciesCommandBuilder.ts | 10 +++--- .../builders/ProfilesUpdateCommandBuilder.ts | 12 +++---- .../ProfilesValidateCommandBuilder.ts | 12 +++---- .../handlers/CreateProfilesHandler.ts | 10 +++--- .../profiles/handlers/ListProfilesHandler.ts | 4 +-- .../handlers/NewDeleteProfilesHandler.ts | 6 ++-- .../handlers/SetDefaultProfilesHandler.ts | 6 ++-- .../ShowDependenciesProfilesHandler.ts | 2 +- .../handlers/UpdateProfilesHandler.ts | 8 ++--- .../src/security/CredentialManagerFactory.ts | 2 +- packages/imperative/src/utilities/index.ts | 32 +++++++++---------- 31 files changed, 118 insertions(+), 118 deletions(-) diff --git a/packages/imperative/src/imperative/UpdateImpConfig.ts b/packages/imperative/src/imperative/UpdateImpConfig.ts index 75ad5a1cfc..3e99fb7f3c 100644 --- a/packages/imperative/src/imperative/UpdateImpConfig.ts +++ b/packages/imperative/src/imperative/UpdateImpConfig.ts @@ -9,10 +9,10 @@ * */ -import { ImperativeConfig } from "../../utilities"; +import { ImperativeConfig } from "../../src/utilities/ImperativeConfig"; import { IImperativeConfig } from "./doc/IImperativeConfig"; -import { ICommandDefinition, ICommandProfileTypeConfiguration } from "../../cmd"; -import { Logger } from "../../logger"; +import { ICommandDefinition, ICommandProfileTypeConfiguration } from "../../src/cmd"; +import { Logger } from "../../src/logger"; /** * This class is used to update the imperative config object, that was initially diff --git a/packages/imperative/src/imperative/plugins/PluginManagementFacility.ts b/packages/imperative/src/imperative/plugins/PluginManagementFacility.ts index cec88ecf4c..85814d0410 100644 --- a/packages/imperative/src/imperative/plugins/PluginManagementFacility.ts +++ b/packages/imperative/src/imperative/plugins/PluginManagementFacility.ts @@ -9,24 +9,24 @@ * */ -import { IImperativeConfig } from "../../src/doc/IImperativeConfig"; -import { UpdateImpConfig } from "../../src/UpdateImpConfig"; +import { IImperativeConfig } from "../../../src/imperative/doc/IImperativeConfig"; +import { UpdateImpConfig } from "../../../src/imperative/UpdateImpConfig"; import { isAbsolute, join } from "path"; -import { ImperativeConfig, JsUtils } from "../../../utilities"; -import { Logger } from "../../../logger"; +import { ImperativeConfig, JsUtils } from "../../../src/utilities"; +import { Logger } from "../../../src/logger"; import { existsSync } from "fs"; import { PMFConstants } from "./utilities/PMFConstants"; import { readFileSync, writeFileSync } from "jsonfile"; import { IPluginCfgProps } from "./doc/IPluginCfgProps"; -import { ICommandDefinition, ICommandProfileTypeConfiguration } from "../../../cmd"; +import { ICommandDefinition, ICommandProfileTypeConfiguration } from "../../../src/cmd"; import { IssueSeverity, PluginIssues } from "./utilities/PluginIssues"; import { ConfigurationValidator } from "../ConfigurationValidator"; import { ConfigurationLoader } from "../ConfigurationLoader"; import { DefinitionTreeResolver } from "../DefinitionTreeResolver"; import { IImperativeOverrides } from "../doc/IImperativeOverrides"; -import { AppSettings } from "../../../settings"; -import { IO } from "../../../io"; -import { CredentialManagerOverride, ICredentialManagerNameMap } from "../../../security"; +import { AppSettings } from "../../../src/settings"; +import { IO } from "../../../src/io"; +import { CredentialManagerOverride, ICredentialManagerNameMap } from "../../../src/security"; /** * This class is the main engine for the Plugin Management Facility. The diff --git a/packages/imperative/src/imperative/plugins/PluginRequireProvider.ts b/packages/imperative/src/imperative/plugins/PluginRequireProvider.ts index 7bc6b90f29..a4ed2a2918 100644 --- a/packages/imperative/src/imperative/plugins/PluginRequireProvider.ts +++ b/packages/imperative/src/imperative/plugins/PluginRequireProvider.ts @@ -11,7 +11,7 @@ import Module = require("module"); -import { ImperativeConfig } from "../../../utilities"; +import { ImperativeConfig } from "../../../src/utilities"; import * as path from "path"; import * as findUp from "find-up"; import * as lodash from "lodash"; diff --git a/packages/imperative/src/imperative/plugins/cmd/validate/validate.handler.ts b/packages/imperative/src/imperative/plugins/cmd/validate/validate.handler.ts index cc8256e8b9..73b5523aa4 100644 --- a/packages/imperative/src/imperative/plugins/cmd/validate/validate.handler.ts +++ b/packages/imperative/src/imperative/plugins/cmd/validate/validate.handler.ts @@ -9,8 +9,8 @@ * */ -import { ICommandHandler, IHandlerParameters, IHandlerResponseApi } from "../../../../../cmd"; -import { TextUtils } from "../../../../../utilities"; +import { ICommandHandler, IHandlerParameters, IHandlerResponseApi } from "../../../../../src/cmd"; +import { TextUtils } from "../../../../../src/utilities"; import { IssueSeverity, PluginIssues } from "../../utilities/PluginIssues"; import { IPluginJson } from "../../doc/IPluginJson"; diff --git a/packages/imperative/src/imperative/plugins/errors/PluginRequireAlreadyCreatedError.ts b/packages/imperative/src/imperative/plugins/errors/PluginRequireAlreadyCreatedError.ts index 6380952e1d..bd518c3138 100644 --- a/packages/imperative/src/imperative/plugins/errors/PluginRequireAlreadyCreatedError.ts +++ b/packages/imperative/src/imperative/plugins/errors/PluginRequireAlreadyCreatedError.ts @@ -9,7 +9,7 @@ * */ -import { ImperativeError } from "../../../../error"; +import { ImperativeError } from "../../../../src/error"; /** * This error is thrown when a second call to {@link PluginRequireProvider.createPluginHooks} has diff --git a/packages/imperative/src/imperative/plugins/errors/PluginRequireNotCreatedError.ts b/packages/imperative/src/imperative/plugins/errors/PluginRequireNotCreatedError.ts index 420b8e2493..bdd5c7f348 100644 --- a/packages/imperative/src/imperative/plugins/errors/PluginRequireNotCreatedError.ts +++ b/packages/imperative/src/imperative/plugins/errors/PluginRequireNotCreatedError.ts @@ -9,7 +9,7 @@ * */ -import { ImperativeError } from "../../../../error"; +import { ImperativeError } from "../../../../src/error"; /** * This error is thrown when a call to {@link PluginRequireProvider.destroyPluginHooks} has diff --git a/packages/imperative/src/imperative/plugins/utilities/NpmFunctions.ts b/packages/imperative/src/imperative/plugins/utilities/NpmFunctions.ts index 52e0f12ea2..7a8da1cd39 100644 --- a/packages/imperative/src/imperative/plugins/utilities/NpmFunctions.ts +++ b/packages/imperative/src/imperative/plugins/utilities/NpmFunctions.ts @@ -16,7 +16,7 @@ import { StdioOptions } from "child_process"; import { readFileSync } from "jsonfile"; import * as npmPackageArg from "npm-package-arg"; import * as pacote from "pacote"; -import { ExecUtils } from "../../../../utilities"; +import { ExecUtils } from "../../../../src/utilities"; const npmCmd = findNpmOnPath(); /** diff --git a/packages/imperative/src/imperative/plugins/utilities/PMFConstants.ts b/packages/imperative/src/imperative/plugins/utilities/PMFConstants.ts index b411a59763..9f203c89b3 100644 --- a/packages/imperative/src/imperative/plugins/utilities/PMFConstants.ts +++ b/packages/imperative/src/imperative/plugins/utilities/PMFConstants.ts @@ -9,9 +9,9 @@ * */ -import { ImperativeConfig } from "../../../../utilities"; +import { ImperativeConfig } from "../../../../src/utilities"; import { dirname, join } from "path"; -import { Config } from "../../../../config"; +import { Config } from "../../../../src/config"; import { EnvironmentalVariableSettings } from "../../env/EnvironmentalVariableSettings"; /** diff --git a/packages/imperative/src/imperative/plugins/utilities/PluginIssues.ts b/packages/imperative/src/imperative/plugins/utilities/PluginIssues.ts index f3b2441fbb..db76517eda 100644 --- a/packages/imperative/src/imperative/plugins/utilities/PluginIssues.ts +++ b/packages/imperative/src/imperative/plugins/utilities/PluginIssues.ts @@ -11,7 +11,7 @@ import { IPluginIssues, IPluginIssue } from "../doc/IPluginIssues"; import { IPluginJson } from "../doc/IPluginJson"; -import { ImperativeError } from "../../../../error"; +import { ImperativeError } from "../../../../src/error"; import { PMFConstants } from "./PMFConstants"; import { readFileSync } from "jsonfile"; diff --git a/packages/imperative/src/imperative/plugins/utilities/npm-interface/install.ts b/packages/imperative/src/imperative/plugins/utilities/npm-interface/install.ts index f76354c168..ee16c12823 100644 --- a/packages/imperative/src/imperative/plugins/utilities/npm-interface/install.ts +++ b/packages/imperative/src/imperative/plugins/utilities/npm-interface/install.ts @@ -14,16 +14,16 @@ import * as path from "path"; import * as fs from "fs"; import { readFileSync, writeFileSync } from "jsonfile"; import { IPluginJson } from "../../doc/IPluginJson"; -import { Logger } from "../../../../../logger"; +import { Logger } from "../../../../src/../logger"; import { IImperativeConfig } from "../../../doc/IImperativeConfig"; -import { ImperativeError } from "../../../../../error"; +import { ImperativeError } from "../../../../src/../error"; import { IPluginJsonObject } from "../../doc/IPluginJsonObject"; import { getPackageInfo, installPackages } from "../NpmFunctions"; -import { ConfigSchema } from "../../../../../config/src/ConfigSchema"; +import { ConfigSchema } from "../../../../src/../config/ConfigSchema"; import { PluginManagementFacility } from "../../PluginManagementFacility"; import { ConfigurationLoader } from "../../../ConfigurationLoader"; import { UpdateImpConfig } from "../../../UpdateImpConfig"; -import { CredentialManagerOverride, ICredentialManagerNameMap } from "../../../../../security"; +import { CredentialManagerOverride, ICredentialManagerNameMap } from "../../../../src/../security"; /** * Common function that abstracts the install process. This function should be called for each diff --git a/packages/imperative/src/imperative/plugins/utilities/npm-interface/uninstall.ts b/packages/imperative/src/imperative/plugins/utilities/npm-interface/uninstall.ts index 4239da8dda..a52de001f1 100644 --- a/packages/imperative/src/imperative/plugins/utilities/npm-interface/uninstall.ts +++ b/packages/imperative/src/imperative/plugins/utilities/npm-interface/uninstall.ts @@ -14,9 +14,9 @@ import * as path from "path"; import { PMFConstants } from "../PMFConstants"; import { readFileSync, writeFileSync } from "jsonfile"; import { IPluginJson } from "../../doc/IPluginJson"; -import { Logger } from "../../../../../logger"; -import { ImperativeError } from "../../../../../error"; -import { ExecUtils, TextUtils } from "../../../../../utilities"; +import { Logger } from "../../../../src/../logger"; +import { ImperativeError } from "../../../../src/../error"; +import { ExecUtils, TextUtils } from "../../../../src/../utilities"; import { StdioOptions } from "child_process"; import { findNpmOnPath } from "../NpmFunctions"; const npmCmd = findNpmOnPath(); diff --git a/packages/imperative/src/imperative/plugins/utilities/npm-interface/update.ts b/packages/imperative/src/imperative/plugins/utilities/npm-interface/update.ts index 837f92bf92..1b0a5a1981 100644 --- a/packages/imperative/src/imperative/plugins/utilities/npm-interface/update.ts +++ b/packages/imperative/src/imperative/plugins/utilities/npm-interface/update.ts @@ -10,7 +10,7 @@ */ import { PMFConstants } from "../PMFConstants"; -import { Logger } from "../../../../../logger"; +import { Logger } from "../../../../src/../logger"; import { getPackageInfo, installPackages } from "../NpmFunctions"; /** diff --git a/packages/imperative/src/imperative/plugins/utilities/runValidatePlugin.ts b/packages/imperative/src/imperative/plugins/utilities/runValidatePlugin.ts index c9c408d188..fce6cd2b5b 100644 --- a/packages/imperative/src/imperative/plugins/utilities/runValidatePlugin.ts +++ b/packages/imperative/src/imperative/plugins/utilities/runValidatePlugin.ts @@ -9,10 +9,10 @@ * */ -import { Logger } from "../../../../logger"; -import { ExecUtils } from "../../../../utilities"; +import { Logger } from "../../../../src/logger"; +import { ExecUtils } from "../../../../src/utilities"; import { PMFConstants } from "./PMFConstants"; -import { ImperativeError } from "../../../../error"; +import { ImperativeError } from "../../../../src/error"; /** * Run another instance of the host CLI command to validate a plugin that has diff --git a/packages/imperative/src/imperative/profiles/ImperativeProfileManagerFactory.ts b/packages/imperative/src/imperative/profiles/ImperativeProfileManagerFactory.ts index 8da02adabd..5a8d8c4d87 100644 --- a/packages/imperative/src/imperative/profiles/ImperativeProfileManagerFactory.ts +++ b/packages/imperative/src/imperative/profiles/ImperativeProfileManagerFactory.ts @@ -9,8 +9,8 @@ * */ -import { AbstractProfileManagerFactory } from "../../../profiles"; -import { CliProfileManager, ICommandProfileTypeConfiguration } from "../../../cmd/"; +import { AbstractProfileManagerFactory } from "../../../src/profiles"; +import { CliProfileManager, ICommandProfileTypeConfiguration } from "../../../src/cmd/"; import { ImperativeApi } from "../api/ImperativeApi"; /** * The imperative profile manager factory returns instances of the cli profile manager diff --git a/packages/imperative/src/imperative/profiles/builders/CompleteProfilesGroupBuilder.ts b/packages/imperative/src/imperative/profiles/builders/CompleteProfilesGroupBuilder.ts index c84f5d08d9..3440352e44 100644 --- a/packages/imperative/src/imperative/profiles/builders/CompleteProfilesGroupBuilder.ts +++ b/packages/imperative/src/imperative/profiles/builders/CompleteProfilesGroupBuilder.ts @@ -9,7 +9,7 @@ * */ -import { ICommandDefinition } from "../../../../cmd"; +import { ICommandDefinition } from "../../../../src/cmd"; import { createProfilesCommandDesc, createProfilesCommandSummary, deleteProfilesCommandDesc, deleteProfilesCommandSummary, @@ -17,17 +17,17 @@ import { setProfileActionDesc, setProfileActionSummary, updateProfileCommandDesc, updateProfileCommandSummary, validateProfileGroupDesc, validateProfileCommandSummary -} from "../../../../messages"; -import { Constants } from "../../../../constants"; +} from "../../../../src/messages"; +import { Constants } from "../../../../src/constants"; import { ProfilesCreateCommandBuilder } from "./ProfilesCreateCommandBuilder"; import { ProfilesUpdateCommandBuilder } from "./ProfilesUpdateCommandBuilder"; import { ProfilesDeleteCommandBuilder } from "./ProfilesDeleteCommandBuilder"; import { ProfilesValidateCommandBuilder } from "./ProfilesValidateCommandBuilder"; import { ProfilesListCommandBuilder } from "./ProfilesListCommandBuilder"; import { ProfilesSetCommandBuilder } from "./ProfilesSetCommandBuilder"; -import { Logger } from "../../../../logger/index"; -import { IProfileTypeConfiguration, ProfilesConstants } from "../../../../profiles"; -import { ImperativeConfig } from "../../../../utilities"; +import { Logger } from "../../../../src/logger/index"; +import { IProfileTypeConfiguration, ProfilesConstants } from "../../../../src/profiles"; +import { ImperativeConfig } from "../../../../src/utilities"; /** * Generate a complete group of commands for maintaining configuration profiles diff --git a/packages/imperative/src/imperative/profiles/builders/ProfilesCommandBuilder.ts b/packages/imperative/src/imperative/profiles/builders/ProfilesCommandBuilder.ts index 997a11ad80..78f839bbfa 100644 --- a/packages/imperative/src/imperative/profiles/builders/ProfilesCommandBuilder.ts +++ b/packages/imperative/src/imperative/profiles/builders/ProfilesCommandBuilder.ts @@ -9,12 +9,12 @@ * */ -import { AbstractCommandBuilder } from "../../../../cmd/src/builders/AbstractCommandBuilder"; +import { AbstractCommandBuilder } from "../../../../src/cmd/builders/AbstractCommandBuilder"; import { isNullOrUndefined } from "util"; -import { ICommandDefinition, ICommandOptionDefinition, ICommandProfileTypeConfiguration } from "../../../../cmd"; -import { Logger } from "../../../../logger"; -import { IProfileSchema, ProfileUtils } from "../../../../profiles"; -import { ICommandProfileProperty } from "../../../../cmd/src/doc/profiles/definition/ICommandProfileProperty"; +import { ICommandDefinition, ICommandOptionDefinition, ICommandProfileTypeConfiguration } from "../../../../src/cmd"; +import { Logger } from "../../../../src/logger"; +import { IProfileSchema, ProfileUtils } from "../../../../src/profiles"; +import { ICommandProfileProperty } from "../../../../src/cmd/doc/profiles/definition/ICommandProfileProperty"; /** * Abstract class for generating profile-related commands diff --git a/packages/imperative/src/imperative/profiles/builders/ProfilesCreateCommandBuilder.ts b/packages/imperative/src/imperative/profiles/builders/ProfilesCreateCommandBuilder.ts index e79f4df129..567264bbed 100644 --- a/packages/imperative/src/imperative/profiles/builders/ProfilesCreateCommandBuilder.ts +++ b/packages/imperative/src/imperative/profiles/builders/ProfilesCreateCommandBuilder.ts @@ -10,13 +10,13 @@ */ import { ProfilesCommandBuilder } from "./ProfilesCommandBuilder"; -import { ICommandDefinition, ICommandProfileTypeConfiguration } from "../../../../cmd"; +import { ICommandDefinition, ICommandProfileTypeConfiguration } from "../../../../src/cmd"; import { createProfileCommandSummary, createProfileOptionDesc, createProfileOptionOverwriteDesc, - createProfileDisableDefaultsDesc } from "../../../../messages"; -import { Constants } from "../../../../constants"; -import { TextUtils } from "../../../../utilities"; -import { Logger } from "../../../../logger/index"; -import { ProfilesConstants, ProfileUtils } from "../../../../profiles"; + createProfileDisableDefaultsDesc } from "../../../../src/messages"; +import { Constants } from "../../../../src/constants"; +import { TextUtils } from "../../../../src/utilities"; +import { Logger } from "../../../../src/logger/index"; +import { ProfilesConstants, ProfileUtils } from "../../../../src/profiles"; /** * Used to build profile create command definitions. diff --git a/packages/imperative/src/imperative/profiles/builders/ProfilesDeleteCommandBuilder.ts b/packages/imperative/src/imperative/profiles/builders/ProfilesDeleteCommandBuilder.ts index c5174b1f22..47c52dda0e 100644 --- a/packages/imperative/src/imperative/profiles/builders/ProfilesDeleteCommandBuilder.ts +++ b/packages/imperative/src/imperative/profiles/builders/ProfilesDeleteCommandBuilder.ts @@ -10,17 +10,17 @@ */ import { ProfilesCommandBuilder } from "./ProfilesCommandBuilder"; -import { Constants } from "../../../../constants"; -import { ICommandDefinition } from "../../../../cmd"; +import { Constants } from "../../../../src/constants"; +import { ICommandDefinition } from "../../../../src/cmd"; import { deleteProfileActionDesc, deleteProfileCommandDesc, deleteProfileExample, deleteProfileForceOptionDesc, deleteProfileNameDesc -} from "../../../../messages/index"; -import { ImperativeConfig, TextUtils } from "../../../../utilities"; -import { ProfilesConstants, ProfileUtils } from "../../../../profiles"; +} from "../../../../src/messages/index"; +import { ImperativeConfig, TextUtils } from "../../../../src/utilities"; +import { ProfilesConstants, ProfileUtils } from "../../../../src/profiles"; /** * Used to build delete profile command definitions. diff --git a/packages/imperative/src/imperative/profiles/builders/ProfilesListCommandBuilder.ts b/packages/imperative/src/imperative/profiles/builders/ProfilesListCommandBuilder.ts index 084b9b37d3..563062ed0f 100644 --- a/packages/imperative/src/imperative/profiles/builders/ProfilesListCommandBuilder.ts +++ b/packages/imperative/src/imperative/profiles/builders/ProfilesListCommandBuilder.ts @@ -10,17 +10,17 @@ */ import { ProfilesCommandBuilder } from "./ProfilesCommandBuilder"; -import { Constants } from "../../../../constants"; -import { ICommandDefinition, ICommandProfileTypeConfiguration } from "../../../../cmd"; +import { Constants } from "../../../../src/constants"; +import { ICommandDefinition, ICommandProfileTypeConfiguration } from "../../../../src/cmd"; import { listProfileCommandDesc, listProfileExample, listProfileExampleShowContents, listProfileVerboseOptionDesc -} from "../../../../messages"; -import { TextUtils } from "../../../../utilities"; -import { Logger } from "../../../../logger/"; -import { ProfilesConstants } from "../../../../profiles"; +} from "../../../../src/messages"; +import { TextUtils } from "../../../../src/utilities"; +import { Logger } from "../../../../src/logger/"; +import { ProfilesConstants } from "../../../../src/profiles"; /** * Used to build profile update command definitions. diff --git a/packages/imperative/src/imperative/profiles/builders/ProfilesSetCommandBuilder.ts b/packages/imperative/src/imperative/profiles/builders/ProfilesSetCommandBuilder.ts index b628451d16..8766abe3ff 100644 --- a/packages/imperative/src/imperative/profiles/builders/ProfilesSetCommandBuilder.ts +++ b/packages/imperative/src/imperative/profiles/builders/ProfilesSetCommandBuilder.ts @@ -10,16 +10,16 @@ */ import { ProfilesCommandBuilder } from "./ProfilesCommandBuilder"; -import { ICommandDefinition } from "../../../../cmd"; -import { TextUtils } from "../../../../utilities"; -import { Constants } from "../../../../constants"; +import { ICommandDefinition } from "../../../../src/cmd"; +import { TextUtils } from "../../../../src/utilities"; +import { Constants } from "../../../../src/constants"; import { setGroupWithOnlyProfilesCommandDesc, setGroupWithOnlyProfilesSummary, setProfileExample, setProfileOptionDesc -} from "../../../../messages/index"; -import { ProfilesConstants } from "../../../../profiles"; +} from "../../../../src/messages/index"; +import { ProfilesConstants } from "../../../../src/profiles"; /** * Used to build "set default profile" command definitions. diff --git a/packages/imperative/src/imperative/profiles/builders/ProfilesShowDependenciesCommandBuilder.ts b/packages/imperative/src/imperative/profiles/builders/ProfilesShowDependenciesCommandBuilder.ts index 408d3b9de5..7aedb634a3 100644 --- a/packages/imperative/src/imperative/profiles/builders/ProfilesShowDependenciesCommandBuilder.ts +++ b/packages/imperative/src/imperative/profiles/builders/ProfilesShowDependenciesCommandBuilder.ts @@ -10,11 +10,11 @@ */ import { ProfilesCommandBuilder } from "./ProfilesCommandBuilder"; -import { Constants } from "../../../../constants"; -import { ICommandDefinition } from "../../../../cmd"; -import { deleteProfileNameDesc, showDependenciesCommandDesc } from "../../../../messages"; -import { TextUtils } from "../../../../utilities"; -import { ProfilesConstants, ProfileUtils } from "../../../../profiles"; +import { Constants } from "../../../../src/constants"; +import { ICommandDefinition } from "../../../../src/cmd"; +import { deleteProfileNameDesc, showDependenciesCommandDesc } from "../../../../src/messages"; +import { TextUtils } from "../../../../src/utilities"; +import { ProfilesConstants, ProfileUtils } from "../../../../src/profiles"; /** * Used to build profile create command definitions. diff --git a/packages/imperative/src/imperative/profiles/builders/ProfilesUpdateCommandBuilder.ts b/packages/imperative/src/imperative/profiles/builders/ProfilesUpdateCommandBuilder.ts index fb4bccd8c7..919d9115c8 100644 --- a/packages/imperative/src/imperative/profiles/builders/ProfilesUpdateCommandBuilder.ts +++ b/packages/imperative/src/imperative/profiles/builders/ProfilesUpdateCommandBuilder.ts @@ -11,12 +11,12 @@ import { ProfilesCommandBuilder } from "./ProfilesCommandBuilder"; import { isNullOrUndefined } from "util"; -import { Constants } from "../../../../constants"; -import { ICommandDefinition } from "../../../../cmd"; -import { createProfileOptionDesc, updateProfileCommandDesc } from "../../../../messages"; -import { TextUtils } from "../../../../utilities"; -import { IProfileProperty, ProfilesConstants, ProfileUtils } from "../../../../profiles"; -import { ICommandProfileProperty } from "../../../../cmd/src/doc/profiles/definition/ICommandProfileProperty"; +import { Constants } from "../../../../src/constants"; +import { ICommandDefinition } from "../../../../src/cmd"; +import { createProfileOptionDesc, updateProfileCommandDesc } from "../../../../src/messages"; +import { TextUtils } from "../../../../src/utilities"; +import { IProfileProperty, ProfilesConstants, ProfileUtils } from "../../../../src/profiles"; +import { ICommandProfileProperty } from "../../../../src/cmd/doc/profiles/definition/ICommandProfileProperty"; /** * Used to build profile update command definitions. diff --git a/packages/imperative/src/imperative/profiles/builders/ProfilesValidateCommandBuilder.ts b/packages/imperative/src/imperative/profiles/builders/ProfilesValidateCommandBuilder.ts index c8f6113f78..ee106f678b 100644 --- a/packages/imperative/src/imperative/profiles/builders/ProfilesValidateCommandBuilder.ts +++ b/packages/imperative/src/imperative/profiles/builders/ProfilesValidateCommandBuilder.ts @@ -10,13 +10,13 @@ */ import { ProfilesCommandBuilder } from "./ProfilesCommandBuilder"; -import { ICommandDefinition, ICommandProfileTypeConfiguration } from "../../../../cmd"; -import { Constants } from "../../../../constants"; -import { deleteProfileNameDesc, validateProfileCommandDesc } from "../../../../messages"; -import { ImperativeConfig, TextUtils } from "../../../../utilities"; -import { Logger } from "../../../../logger/index"; +import { ICommandDefinition, ICommandProfileTypeConfiguration } from "../../../../src/cmd"; +import { Constants } from "../../../../src/constants"; +import { deleteProfileNameDesc, validateProfileCommandDesc } from "../../../../src/messages"; +import { ImperativeConfig, TextUtils } from "../../../../src/utilities"; +import { Logger } from "../../../../src/logger/index"; import { isNullOrUndefined } from "util"; -import { ProfilesConstants, ProfileUtils, ProfileValidator } from "../../../../profiles"; +import { ProfilesConstants, ProfileUtils, ProfileValidator } from "../../../../src/profiles"; /** * Used to build profile validate command definitions. diff --git a/packages/imperative/src/imperative/profiles/handlers/CreateProfilesHandler.ts b/packages/imperative/src/imperative/profiles/handlers/CreateProfilesHandler.ts index dc588f06a8..fcc630e413 100644 --- a/packages/imperative/src/imperative/profiles/handlers/CreateProfilesHandler.ts +++ b/packages/imperative/src/imperative/profiles/handlers/CreateProfilesHandler.ts @@ -9,13 +9,13 @@ * */ -import { overroteProfileMessage, profileCreatedSuccessfullyAndPath, profileReviewMessage } from "../../../../messages"; +import { overroteProfileMessage, profileCreatedSuccessfullyAndPath, profileReviewMessage } from "../../../../src/messages"; import { Imperative } from "../../Imperative"; -import { IProfileSaved, ISaveProfileFromCliArgs, ProfilesConstants } from "../../../../profiles"; -import { CliProfileManager, ICommandHandler, IHandlerParameters } from "../../../../cmd"; +import { IProfileSaved, ISaveProfileFromCliArgs, ProfilesConstants } from "../../../../src/profiles"; +import { CliProfileManager, ICommandHandler, IHandlerParameters } from "../../../../src/cmd"; -import { Constants } from "../../../../constants"; -import { TextUtils } from "../../../../utilities"; +import { Constants } from "../../../../src/constants"; +import { TextUtils } from "../../../../src/utilities"; /** * Handler that allows creation of a profile from command line arguments. Intended for usage with the automatically diff --git a/packages/imperative/src/imperative/profiles/handlers/ListProfilesHandler.ts b/packages/imperative/src/imperative/profiles/handlers/ListProfilesHandler.ts index 2d33126600..eb08b9704f 100644 --- a/packages/imperative/src/imperative/profiles/handlers/ListProfilesHandler.ts +++ b/packages/imperative/src/imperative/profiles/handlers/ListProfilesHandler.ts @@ -10,8 +10,8 @@ */ import { Imperative } from "../../../"; -import { ProfilesConstants } from "../../../../profiles/src/constants/ProfilesConstants"; -import { CliProfileManager, ICommandHandler, IHandlerParameters } from "../../../../cmd"; +import { ProfilesConstants } from "../../../../src/profiles/constants/ProfilesConstants"; +import { CliProfileManager, ICommandHandler, IHandlerParameters } from "../../../../src/cmd"; import { IProfileLoaded } from "../../../.."; /** diff --git a/packages/imperative/src/imperative/profiles/handlers/NewDeleteProfilesHandler.ts b/packages/imperative/src/imperative/profiles/handlers/NewDeleteProfilesHandler.ts index ac12434759..6848b989a0 100644 --- a/packages/imperative/src/imperative/profiles/handlers/NewDeleteProfilesHandler.ts +++ b/packages/imperative/src/imperative/profiles/handlers/NewDeleteProfilesHandler.ts @@ -9,10 +9,10 @@ * */ -import { IHandlerParameters } from "../../../../cmd"; +import { IHandlerParameters } from "../../../../src/cmd"; import { Imperative } from "../../Imperative"; -import { Constants } from "../../../../constants"; -import { IProfileDeleted, ProfilesConstants } from "../../../../profiles"; +import { Constants } from "../../../../src/constants"; +import { IProfileDeleted, ProfilesConstants } from "../../../../src/profiles"; export default class NewDeleteProfilesHandler { public async process(commandParameters: IHandlerParameters) { diff --git a/packages/imperative/src/imperative/profiles/handlers/SetDefaultProfilesHandler.ts b/packages/imperative/src/imperative/profiles/handlers/SetDefaultProfilesHandler.ts index 7cdb46ea20..078ff3ad38 100644 --- a/packages/imperative/src/imperative/profiles/handlers/SetDefaultProfilesHandler.ts +++ b/packages/imperative/src/imperative/profiles/handlers/SetDefaultProfilesHandler.ts @@ -10,9 +10,9 @@ */ import { Imperative } from "../../Imperative"; -import { ProfilesConstants } from "../../../../profiles"; -import { ICommandHandler, IHandlerParameters } from "../../../../cmd"; -import { Constants } from "../../../../constants"; +import { ProfilesConstants } from "../../../../src/profiles"; +import { ICommandHandler, IHandlerParameters } from "../../../../src/cmd"; +import { Constants } from "../../../../src/constants"; /** * Handler for the auto generated commands to set the default profile for a type * The default profile is loaded when no specific profile name is specified diff --git a/packages/imperative/src/imperative/profiles/handlers/ShowDependenciesProfilesHandler.ts b/packages/imperative/src/imperative/profiles/handlers/ShowDependenciesProfilesHandler.ts index 338699071a..616ca9d929 100644 --- a/packages/imperative/src/imperative/profiles/handlers/ShowDependenciesProfilesHandler.ts +++ b/packages/imperative/src/imperative/profiles/handlers/ShowDependenciesProfilesHandler.ts @@ -9,7 +9,7 @@ * */ -import { ICommandHandler, IHandlerParameters } from "../../../../cmd"; +import { ICommandHandler, IHandlerParameters } from "../../../../src/cmd"; /** * Handler for the auto-generated show dependencies command diff --git a/packages/imperative/src/imperative/profiles/handlers/UpdateProfilesHandler.ts b/packages/imperative/src/imperative/profiles/handlers/UpdateProfilesHandler.ts index 6ec64af53f..a692185c48 100644 --- a/packages/imperative/src/imperative/profiles/handlers/UpdateProfilesHandler.ts +++ b/packages/imperative/src/imperative/profiles/handlers/UpdateProfilesHandler.ts @@ -11,10 +11,10 @@ import { overroteProfileMessage, profileUpdatedSuccessfullyAndPath, profileReviewMessage } from "../../../../messages"; import { Imperative } from "../../Imperative"; -import { IProfileUpdated, ProfilesConstants } from "../../../../profiles"; -import { ICommandHandler, IHandlerParameters } from "../../../../cmd"; -import { Constants } from "../../../../constants"; -import { TextUtils } from "../../../../utilities"; +import { IProfileUpdated, ProfilesConstants } from "../../../../src/profiles"; +import { ICommandHandler, IHandlerParameters } from "../../../../src/cmd"; +import { Constants } from "../../../../src/constants"; +import { TextUtils } from "../../../../src/utilities"; /** * Handler for the auto-generated update profile commands diff --git a/packages/imperative/src/security/CredentialManagerFactory.ts b/packages/imperative/src/security/CredentialManagerFactory.ts index 32dc60ae9b..56a22f2755 100644 --- a/packages/imperative/src/security/CredentialManagerFactory.ts +++ b/packages/imperative/src/security/CredentialManagerFactory.ts @@ -136,7 +136,7 @@ export class CredentialManagerFactory { } catch (error) { // Perform dynamic requires when an error happens const { InvalidCredentialManager } = await import("./InvalidCredentialManager"); - const { Logger } = await import("../../logger"); + const { Logger } = await import("../../src/logger"); // Log appropriate error messages if (Manager !== DefaultCredentialManager) { diff --git a/packages/imperative/src/utilities/index.ts b/packages/imperative/src/utilities/index.ts index 50422471b8..04516431aa 100644 --- a/packages/imperative/src/utilities/index.ts +++ b/packages/imperative/src/utilities/index.ts @@ -9,19 +9,19 @@ * */ -export * from "./src/doc/IDaemonRequest"; -export * from "./src/doc/IDaemonResponse"; -export * from "./src/DaemonRequest"; -export * from "./src/ExecUtils"; -export * from "./src/ImperativeConfig"; -export * from "./src/JSONUtils"; -export * from "./src/JsUtils"; -export * from "./src/NextVerFeatures"; -export * from "./src/ProcessUtils"; -export * from "./src/TextUtils"; -export * from "./src/CliUtils"; -export * from "./src/EnvFileUtils"; -export * from "./src/doc/ISystemInfo"; -export * from "./src/diff/DiffUtils"; -export * from "./src/diff/doc/IDiffOptions"; -export * from "./src/diff/doc/IDiffNameOptions"; +export * from "./doc/IDaemonRequest"; +export * from "./doc/IDaemonResponse"; +export * from "./DaemonRequest"; +export * from "./ExecUtils"; +export * from "./ImperativeConfig"; +export * from "./JSONUtils"; +export * from "./JsUtils"; +export * from "./NextVerFeatures"; +export * from "./ProcessUtils"; +export * from "./TextUtils"; +export * from "./CliUtils"; +export * from "./EnvFileUtils"; +export * from "./doc/ISystemInfo"; +export * from "./diff/DiffUtils"; +export * from "./diff/doc/IDiffOptions"; +export * from "./diff/doc/IDiffNameOptions"; From b46e2f66a885678347a339d0b77a9cb290674717 Mon Sep 17 00:00:00 2001 From: zFernand0 <37381190+zFernand0@users.noreply.github.com> Date: Wed, 17 Jan 2024 15:43:19 +0000 Subject: [PATCH 116/138] help with some imports Signed-off-by: zFernand0 <37381190+zFernand0@users.noreply.github.com> --- .../imperative/src/cmd/CommandProcessor.ts | 3 +- .../ICommandProfileTypeConfiguration.ts | 2 +- packages/imperative/src/config/Config.ts | 4 +- .../src/imperative/ConfigurationLoader.ts | 2 +- .../src/imperative/ConfigurationValidator.ts | 27 ++++---- .../src/imperative/DefinitionTreeResolver.ts | 6 +- .../imperative/src/imperative/Imperative.ts | 64 +++++++++---------- 7 files changed, 52 insertions(+), 56 deletions(-) diff --git a/packages/imperative/src/cmd/CommandProcessor.ts b/packages/imperative/src/cmd/CommandProcessor.ts index bdd35ba359..d782f60290 100644 --- a/packages/imperative/src/cmd/CommandProcessor.ts +++ b/packages/imperative/src/cmd/CommandProcessor.ts @@ -37,7 +37,7 @@ import * as nodePath from "path"; import * as os from "os"; import * as stream from "stream"; import { ICommandHandlerRequire } from "./doc/handler/ICommandHandlerRequire"; -import { IHandlerParameters } from "../cmd"; +import { IHandlerParameters, IHandlerResponseApi } from "../cmd"; import { ChainedHandlerService } from "./ChainedHandlerUtils"; import { Constants } from "../constants"; import { ICommandArguments } from "./doc/args/ICommandArguments"; @@ -48,7 +48,6 @@ import { Config } from "../config/Config"; import { getActiveProfileName } from "../config/ConfigUtils"; import { ConfigConstants } from "../config/ConfigConstants"; import { IDaemonContext } from "../imperative/doc/IDaemonContext"; -import { IHandlerResponseApi } from "../.."; /** diff --git a/packages/imperative/src/cmd/doc/profiles/definition/ICommandProfileTypeConfiguration.ts b/packages/imperative/src/cmd/doc/profiles/definition/ICommandProfileTypeConfiguration.ts index a2e86a1aa8..13147cc231 100644 --- a/packages/imperative/src/cmd/doc/profiles/definition/ICommandProfileTypeConfiguration.ts +++ b/packages/imperative/src/cmd/doc/profiles/definition/ICommandProfileTypeConfiguration.ts @@ -10,9 +10,9 @@ */ import { ICommandProfileSchema } from "./ICommandProfileSchema"; -import { IProfileTypeConfiguration } from "../../../../.."; import { ICommandExampleDefinition } from "../../ICommandExampleDefinition"; import { ICommandProfileAuthConfig } from "./ICommandProfileAuthConfig"; +import { IProfileTypeConfiguration } from "../../../../profiles/doc/config/IProfileTypeConfiguration"; /** * Cmd packages additions to the profile manager type configuration document. Used by the CliProfileManager. Allows diff --git a/packages/imperative/src/config/Config.ts b/packages/imperative/src/config/Config.ts index 18db6e345e..e9834ec8be 100644 --- a/packages/imperative/src/config/Config.ts +++ b/packages/imperative/src/config/Config.ts @@ -21,7 +21,7 @@ import { fileURLToPath } from "url"; import { ConfigConstants } from "./ConfigConstants"; import { IConfig } from "./doc/IConfig"; import { IConfigLayer } from "./doc/IConfigLayer"; -import { ImperativeError } from "../../error"; +import { ImperativeError } from "../error"; import { IConfigProfile } from "./doc/IConfigProfile"; import { IConfigOpts } from "./doc/IConfigOpts"; import { IConfigSecure } from "./doc/IConfigSecure"; @@ -29,7 +29,7 @@ import { IConfigVault } from "./doc/IConfigVault"; import { ConfigLayers, ConfigPlugins, ConfigProfiles, ConfigSecure } from "./api"; import { coercePropValue } from "./ConfigUtils"; import { IConfigSchemaInfo } from "./doc/IConfigSchema"; -import { JsUtils } from "../../utilities/src/JsUtils"; +import { JsUtils } from "../utilities/JsUtils"; import { IConfigMergeOpts } from "./doc/IConfigMergeOpts"; /** diff --git a/packages/imperative/src/imperative/ConfigurationLoader.ts b/packages/imperative/src/imperative/ConfigurationLoader.ts index 4e4e2b88ff..2cda509004 100644 --- a/packages/imperative/src/imperative/ConfigurationLoader.ts +++ b/packages/imperative/src/imperative/ConfigurationLoader.ts @@ -15,7 +15,7 @@ */ import { IImperativeConfig } from "./doc/IImperativeConfig"; import * as os from "os"; -import { ImperativeError } from "../../error"; +import { ImperativeError } from "../error"; export class ConfigurationLoader { diff --git a/packages/imperative/src/imperative/ConfigurationValidator.ts b/packages/imperative/src/imperative/ConfigurationValidator.ts index e4054d6da3..6bb016153c 100644 --- a/packages/imperative/src/imperative/ConfigurationValidator.ts +++ b/packages/imperative/src/imperative/ConfigurationValidator.ts @@ -10,10 +10,9 @@ */ import { IImperativeConfig } from "./doc/IImperativeConfig"; -import { isNullOrUndefined } from "util"; -import { TextUtils } from "../../utilities"; -import { ImperativeError } from "../../error"; -import { ICommandProfileProperty } from "../../cmd/src/doc/profiles/definition/ICommandProfileProperty"; +import { TextUtils } from "../utilities"; +import { ImperativeError } from "../error"; +import { ICommandProfileProperty } from "../cmd/doc/profiles/definition/ICommandProfileProperty"; /** * Imperative-internal class to validate configuration @@ -34,10 +33,10 @@ export class ConfigurationValidator { + fieldName + ". Please provide this field in order to use Imperative" }); }; - if (isNullOrUndefined(config.productDisplayName)) { + if (config.productDisplayName == null) { throw getMissingFieldError("productDisplayName"); } - if (isNullOrUndefined(config.commandModuleGlobs) && isNullOrUndefined(config.definitions)) { + if (config.commandModuleGlobs == null && config.definitions == null) { throw new ImperativeError({ msg: "Your Imperative configuration had neither \"definitions\"" + " nor \"commandModuleGlobs\". At least one of these fields is required so that the syntax for " + @@ -45,31 +44,31 @@ export class ConfigurationValidator { }); } - if (isNullOrUndefined(config.primaryTextColor)) { + if (config.primaryTextColor == null) { config.primaryTextColor = "yellow"; } else { // if the user specified a color, test to make sure it works ConfigurationValidator.verifyChalkColor(config, "primaryTextColor", "primary text highlighting"); } - if (isNullOrUndefined(config.secondaryTextColor)) { + if (config.secondaryTextColor == null) { config.secondaryTextColor = "blue"; } else { // if the user specified a color, test to make sure it works ConfigurationValidator.verifyChalkColor(config, "secondaryTextColor", "secondary text highlighting"); } - if (isNullOrUndefined(config.allowConfigGroup)) { + if (config.allowConfigGroup == null) { // default allowConfigGroup to true config.allowConfigGroup = true; } - if (isNullOrUndefined(config.allowPlugins)) { + if (config.allowPlugins == null) { // default allowPlugins to true config.allowPlugins = true; } // validate profile configurations - if (!isNullOrUndefined(config.profiles)) { + if (config.profiles != null) { for (const profileConfig of config.profiles) { - if (isNullOrUndefined(profileConfig.schema)) { + if (profileConfig.schema == null) { throw new ImperativeError({ msg: "Your Imperative profile configuration of type \"" + profileConfig.type + "\" has no schema. Please provide a schema for your profile so that it can be used to " + @@ -80,9 +79,7 @@ export class ConfigurationValidator { for (const propertyName of Object.keys(profileConfig.schema.properties)) { const property: ICommandProfileProperty = profileConfig.schema.properties[propertyName]; - if (!isNullOrUndefined(property.optionDefinitions) && - property.optionDefinitions.length > 1 && - isNullOrUndefined(profileConfig.createProfileFromArgumentsHandler)) { + if (property.optionDefinitions?.length > 1 && profileConfig.createProfileFromArgumentsHandler == null) { throw new ImperativeError({ msg: TextUtils.formatMessage( "Your Imperative profile configuration of type \"{{type}}\"" + diff --git a/packages/imperative/src/imperative/DefinitionTreeResolver.ts b/packages/imperative/src/imperative/DefinitionTreeResolver.ts index 7bc7784d11..6e2785d1bf 100644 --- a/packages/imperative/src/imperative/DefinitionTreeResolver.ts +++ b/packages/imperative/src/imperative/DefinitionTreeResolver.ts @@ -9,10 +9,10 @@ * */ -import { ICommandDefinition } from "../../cmd"; -import { Logger } from "../../logger"; +import { ICommandDefinition } from "../cmd"; +import { Logger } from "../logger"; import * as glob from "fast-glob"; -import { ImperativeError } from "../../error"; +import { ImperativeError } from "../error"; /** * Combines a root command definition with an array of diff --git a/packages/imperative/src/imperative/Imperative.ts b/packages/imperative/src/imperative/Imperative.ts index bbf699c93e..10fd5314f7 100644 --- a/packages/imperative/src/imperative/Imperative.ts +++ b/packages/imperative/src/imperative/Imperative.ts @@ -13,59 +13,59 @@ * Main class of the Imperative framework, returned when you * require("@zowe/imperative") e.g. const imperative = require("@zowe/imperative"); */ -import { Logger} from "../../logger/src/Logger"; -import { LoggerConfigBuilder } from "../../logger/src/LoggerConfigBuilder"; +import { Logger} from "../logger/Logger"; +import { LoggerConfigBuilder } from "../logger/LoggerConfigBuilder"; import { IImperativeConfig } from "./doc/IImperativeConfig"; import * as yargs from "yargs"; import { ConfigurationLoader } from "./ConfigurationLoader"; import { ConfigurationValidator } from "./ConfigurationValidator"; import { ImperativeApi } from "./api/ImperativeApi"; import { IImperativeApi } from "./api/doc/IImperativeApi"; -import { Constants } from "../../constants/src/Constants"; -import { TextUtils } from "../../utilities/src/TextUtils"; -import { ImperativeConfig } from "../../utilities/ImperativeConfig"; -import { ImperativeReject } from "../../interfaces/src/types/ImperativeReject"; +import { Constants } from "../constants/Constants"; +import { TextUtils } from "../utilities/TextUtils"; +import { ImperativeConfig } from "../utilities/ImperativeConfig"; +import { ImperativeReject } from "../interfaces/types/ImperativeReject"; import { LoggingConfigurer } from "./LoggingConfigurer"; -import { ImperativeError } from "../../error"; +import { ImperativeError } from "../error"; import { PluginManagementFacility } from "./plugins/PluginManagementFacility"; // import { ConfigManagementFacility } from "./config/ConfigManagementFacility"; -import { AbstractCommandYargs } from "../../cmd/src/yargs/AbstractCommandYargs"; -import { CliProfileManager } from "../../cmd/src/profiles/CliProfileManager"; -import { CommandPreparer } from "../../cmd/src/CommandPreparer"; -import { CommandYargs } from "../../cmd/src/yargs/CommandYargs"; -import { ICommandDefinition } from "../../cmd/src/doc/ICommandDefinition"; -import { ICommandProfileTypeConfiguration } from "../../cmd/src/doc/profiles/definition/ICommandProfileTypeConfiguration"; -import { ICommandResponseParms } from "../../cmd/src/doc/response/parms/ICommandResponseParms"; -import { IHelpGenerator } from "../../cmd/src/help/doc/IHelpGenerator"; -import { IHelpGeneratorFactory } from "../../cmd/src/help/doc/IHelpGeneratorFactory"; -import { IHelpGeneratorParms } from "../../cmd/src/help/doc/IHelpGeneratorParms"; -import { IYargsResponse } from "../../cmd/src/yargs/doc/IYargsResponse"; -import { WebHelpManager } from "../../cmd/src/help/WebHelpManager"; -import { YargsConfigurer } from "../../cmd/src/yargs/YargsConfigurer"; -import { YargsDefiner } from "../../cmd/src/yargs/YargsDefiner"; - -import { ProfileUtils } from "../../profiles/src/utils/ProfileUtils"; -import { IProfileTypeConfiguration } from "../../profiles/src/doc/config/IProfileTypeConfiguration"; +import { AbstractCommandYargs } from "../cmd/yargs/AbstractCommandYargs"; +import { CliProfileManager } from "../cmd/profiles/CliProfileManager"; +import { CommandPreparer } from "../cmd/CommandPreparer"; +import { CommandYargs } from "../cmd/yargs/CommandYargs"; +import { ICommandDefinition } from "../cmd/doc/ICommandDefinition"; +import { ICommandProfileTypeConfiguration } from "../cmd/doc/profiles/definition/ICommandProfileTypeConfiguration"; +import { ICommandResponseParms } from "../cmd/doc/response/parms/ICommandResponseParms"; +import { IHelpGenerator } from "../cmd/help/doc/IHelpGenerator"; +import { IHelpGeneratorFactory } from "../cmd/help/doc/IHelpGeneratorFactory"; +import { IHelpGeneratorParms } from "../cmd/help/doc/IHelpGeneratorParms"; +import { IYargsResponse } from "../cmd/yargs/doc/IYargsResponse"; +import { WebHelpManager } from "../cmd/help/WebHelpManager"; +import { YargsConfigurer } from "../cmd/yargs/YargsConfigurer"; +import { YargsDefiner } from "../cmd/yargs/YargsDefiner"; + +import { ProfileUtils } from "../profiles/utils/ProfileUtils"; +import { IProfileTypeConfiguration } from "../profiles/doc/config/IProfileTypeConfiguration"; import { CompleteProfilesGroupBuilder } from "./profiles/builders/CompleteProfilesGroupBuilder"; import { ImperativeHelpGeneratorFactory } from "./help/ImperativeHelpGeneratorFactory"; import { OverridesLoader } from "./OverridesLoader"; import { ImperativeProfileManagerFactory } from "./profiles/ImperativeProfileManagerFactory"; import { DefinitionTreeResolver } from "./DefinitionTreeResolver"; import { EnvironmentalVariableSettings } from "./env/EnvironmentalVariableSettings"; -import { AppSettings } from "../../settings/src/AppSettings"; +import { AppSettings } from "../settings/AppSettings"; import { dirname, join } from "path"; -import { Console } from "../../console/src/Console"; -import { ISettingsFile } from "../../settings/src/doc/ISettingsFile"; +import { Console } from "../console/Console"; +import { ISettingsFile } from "../settings/doc/ISettingsFile"; import { IDaemonContext } from "./doc/IDaemonContext"; -import { ICommandProfileAuthConfig } from "../../cmd/src/doc/profiles/definition/ICommandProfileAuthConfig"; -import { ImperativeExpect } from "../../expect/src/ImperativeExpect"; +import { ICommandProfileAuthConfig } from "../cmd/doc/profiles/definition/ICommandProfileAuthConfig"; +import { ImperativeExpect } from "../expect/ImperativeExpect"; import { CompleteAuthGroupBuilder } from "./auth/builders/CompleteAuthGroupBuilder"; -import { Config } from "../../config/src/Config"; +import { Config } from "../config/Config"; import { CompleteAutoInitCommandBuilder } from "./config/cmd/auto-init/builders/CompleteAutoInitCommandBuilder"; -import { ICommandProfileAutoInitConfig } from "../../cmd/src/doc/profiles/definition/ICommandProfileAutoInitConfig"; -import { EnvFileUtils } from "../../utilities/src/EnvFileUtils"; +import { ICommandProfileAutoInitConfig } from "../cmd/doc/profiles/definition/ICommandProfileAutoInitConfig"; +import { EnvFileUtils } from "../utilities/EnvFileUtils"; export class Imperative { From 9e27a8c517b782260a2d030760e9c6e3724c5b6e Mon Sep 17 00:00:00 2001 From: zFernand0 <37381190+zFernand0@users.noreply.github.com> Date: Wed, 17 Jan 2024 15:48:25 +0000 Subject: [PATCH 117/138] logconfig Signed-off-by: zFernand0 <37381190+zFernand0@users.noreply.github.com> --- .../src/imperative/LoggingConfigurer.ts | 39 +++++++++---------- 1 file changed, 18 insertions(+), 21 deletions(-) diff --git a/packages/imperative/src/imperative/LoggingConfigurer.ts b/packages/imperative/src/imperative/LoggingConfigurer.ts index 6e5a1db3c0..98069c9197 100644 --- a/packages/imperative/src/imperative/LoggingConfigurer.ts +++ b/packages/imperative/src/imperative/LoggingConfigurer.ts @@ -9,16 +9,15 @@ * */ -import { IConfigLogging } from "../../logger/src/doc/IConfigLogging"; -import { Logger } from "../../logger/src/Logger"; -import { LoggerConfigBuilder } from "../../logger/src/LoggerConfigBuilder"; +import { IConfigLogging } from "../logger/doc/IConfigLogging"; +import { Logger } from "../logger/Logger"; +import { LoggerConfigBuilder } from "../logger/LoggerConfigBuilder"; import { IImperativeConfig } from "./doc/IImperativeConfig"; -import { Console } from "../../console"; -import { isNullOrUndefined } from "util"; -import { IO } from "../../io/src/IO"; +import { Console } from "../console"; +import { IO } from "../io/IO"; import { IImperativeLoggingConfig } from "./doc/IImperativeLoggingConfig"; -import { ImperativeError } from "../../error/src/ImperativeError"; -import { ImperativeExpect } from "../../expect/src/ImperativeExpect"; +import { ImperativeError } from "../error/ImperativeError"; +import { ImperativeExpect } from "../expect/ImperativeExpect"; /** * Helper class to construct default config, log4js config, and define @@ -89,9 +88,9 @@ export class LoggingConfigurer { /** * All remaining logs are created here */ - if (!isNullOrUndefined(imperativeConfig.logging.additionalLogging)) { + if (imperativeConfig.logging.additionalLogging != null) { imperativeConfig.logging.additionalLogging.forEach((logConfig) => { - if (isNullOrUndefined(logConfig.apiName)) { + if (logConfig.apiName == null) { throw new ImperativeError({ msg: "apiName is required for additionalLoggers", }); @@ -160,11 +159,9 @@ export class LoggingConfigurer { */ private static configureLoggerByKey( home: string, imperativeConfig: IImperativeConfig, loggingConfig: IConfigLogging, entryKey: string, configKey: string) { - if (!isNullOrUndefined(imperativeConfig.logging)) { - if (!isNullOrUndefined(imperativeConfig.logging[configKey])) { - loggingConfig = LoggingConfigurer.configureLoggerByKeyHelper( - home, imperativeConfig.logging[configKey], loggingConfig, entryKey, configKey); - } + if (imperativeConfig.logging?.[configKey] != null) { + loggingConfig = LoggingConfigurer.configureLoggerByKeyHelper( + home, imperativeConfig.logging[configKey], loggingConfig, entryKey, configKey); } return loggingConfig; @@ -184,12 +181,12 @@ export class LoggingConfigurer { */ private static configureLoggerByKeyHelper(home: string, impLogConfig: IImperativeLoggingConfig, loggingConfig: IConfigLogging, entryKey: string, configKey: string) { - if (!isNullOrUndefined(impLogConfig.logFile)) { + if (impLogConfig.logFile != null) { const fullLogFilePath = home + LoggingConfigurer.normalizeDir(impLogConfig.logFile); loggingConfig.log4jsConfig.appenders[entryKey].filename = fullLogFilePath as any; } - if (!isNullOrUndefined(impLogConfig.level)) { + if (impLogConfig.level != null) { Console.validateLevel(impLogConfig.level); loggingConfig.log4jsConfig.categories[entryKey].level = impLogConfig.level; } @@ -269,12 +266,12 @@ export class LoggingConfigurer { */ private static buildLoggingDefaultsByKey( imperativeConfig: IImperativeConfig, key: string, apiName: string, category = apiName): IImperativeConfig { - if (isNullOrUndefined(imperativeConfig.logging)) { + if (imperativeConfig.logging == null) { imperativeConfig.logging = {}; - imperativeConfig.logging[key] = {apiName, category}; + imperativeConfig.logging[key] = { apiName, category }; } else { - if (isNullOrUndefined(imperativeConfig.logging[key])) { - imperativeConfig.logging[key] = {apiName, category}; + if (imperativeConfig.logging[key] == null) { + imperativeConfig.logging[key] = { apiName, category }; } else { imperativeConfig.logging[key].apiName = apiName; imperativeConfig.logging[key].category = category; From 5f565128a8c4ac0329a56d5fd6c19c4b375b5ac4 Mon Sep 17 00:00:00 2001 From: Amber Torrise Date: Wed, 17 Jan 2024 10:49:39 -0500 Subject: [PATCH 118/138] updates Signed-off-by: Amber Torrise --- packages/imperative/src/imperative/OverridesLoader.ts | 10 +++++----- .../plugins/cmd/install/install.definition.ts | 4 ++-- .../imperative/plugins/cmd/install/install.handler.ts | 8 ++++---- .../src/imperative/plugins/cmd/list/list.definition.ts | 2 +- .../src/imperative/plugins/cmd/list/list.handler.ts | 6 +++--- .../cmd/showfirststeps/showfirststeps.definition.ts | 2 +- .../cmd/showfirststeps/showfirststeps.handler.ts | 8 ++++---- .../plugins/cmd/uninstall/uninstall.definition.ts | 2 +- .../plugins/cmd/uninstall/uninstall.handler.ts | 10 +++++----- .../imperative/plugins/cmd/update/update.definition.ts | 2 +- .../imperative/plugins/cmd/update/update.handler.ts | 8 ++++---- .../plugins/cmd/validate/validate.definition.ts | 2 +- .../profiles/handlers/UpdateProfilesHandler.ts | 2 +- .../profiles/handlers/ValidateProfileHandler.ts | 10 +++++----- .../src/security/CredentialManagerFactory.ts | 2 +- 15 files changed, 39 insertions(+), 39 deletions(-) diff --git a/packages/imperative/src/imperative/OverridesLoader.ts b/packages/imperative/src/imperative/OverridesLoader.ts index 1e72675441..f4b9ccb75e 100644 --- a/packages/imperative/src/imperative/OverridesLoader.ts +++ b/packages/imperative/src/imperative/OverridesLoader.ts @@ -10,13 +10,13 @@ */ import { IImperativeOverrides } from "./doc/IImperativeOverrides"; -import { CredentialManagerFactory, DefaultCredentialManager } from "../../security"; +import { CredentialManagerFactory, DefaultCredentialManager } from "../../src/security"; import { IImperativeConfig } from "./doc/IImperativeConfig"; import { isAbsolute, resolve } from "path"; -import { AppSettings } from "../../settings"; -import { ImperativeConfig } from "../../utilities"; -import { IConfigVault } from "../../config"; -import { Logger } from "../../logger"; +import { AppSettings } from "../../src/settings"; +import { ImperativeConfig } from "../../src/utilities"; +import { IConfigVault } from "../../src/config"; +import { Logger } from "../../src/logger"; /** * Imperative-internal class to load overrides diff --git a/packages/imperative/src/imperative/plugins/cmd/install/install.definition.ts b/packages/imperative/src/imperative/plugins/cmd/install/install.definition.ts index 45ed3f6a87..0a59685470 100644 --- a/packages/imperative/src/imperative/plugins/cmd/install/install.definition.ts +++ b/packages/imperative/src/imperative/plugins/cmd/install/install.definition.ts @@ -9,10 +9,10 @@ * */ -import { ICommandDefinition } from "../../../../../cmd"; +import { ICommandDefinition } from "../../../../../src/cmd"; import { join } from "path"; import { PMFConstants } from "../../utilities/PMFConstants"; -import { ImperativeConfig } from "../../../../../utilities"; +import { ImperativeConfig } from "../../../../../src/utilities"; const cliCmdName = ImperativeConfig.instance.findPackageBinName() ? ImperativeConfig.instance.findPackageBinName() : "Your_CLI_Command_Name"; diff --git a/packages/imperative/src/imperative/plugins/cmd/install/install.handler.ts b/packages/imperative/src/imperative/plugins/cmd/install/install.handler.ts index c7d43271b1..caf4e6525d 100644 --- a/packages/imperative/src/imperative/plugins/cmd/install/install.handler.ts +++ b/packages/imperative/src/imperative/plugins/cmd/install/install.handler.ts @@ -9,16 +9,16 @@ * */ -import { ICommandHandler, IHandlerParameters } from "../../../../../cmd"; -import { Logger } from "../../../../../logger/"; +import { ICommandHandler, IHandlerParameters } from "../../../../../src/cmd"; +import { Logger } from "../../../../../src/logger/"; import { PMFConstants } from "../../utilities/PMFConstants"; import { resolve } from "path"; import { install } from "../../utilities/npm-interface"; import { IPluginJson } from "../../doc/IPluginJson"; import { IPluginJsonObject } from "../../doc/IPluginJsonObject"; import { readFileSync } from "jsonfile"; -import { ImperativeConfig, TextUtils } from "../../../../../utilities"; -import { ImperativeError } from "../../../../../error"; +import { ImperativeConfig, TextUtils } from "../../../../../src/utilities"; +import { ImperativeError } from "../../../../../src/error"; import { runValidatePlugin } from "../../utilities/runValidatePlugin"; import { getRegistry, npmLogin } from "../../utilities/NpmFunctions"; diff --git a/packages/imperative/src/imperative/plugins/cmd/list/list.definition.ts b/packages/imperative/src/imperative/plugins/cmd/list/list.definition.ts index d4907ecb5b..166a08d9d9 100644 --- a/packages/imperative/src/imperative/plugins/cmd/list/list.definition.ts +++ b/packages/imperative/src/imperative/plugins/cmd/list/list.definition.ts @@ -9,7 +9,7 @@ * */ -import { ICommandDefinition } from "../../../../../cmd"; +import { ICommandDefinition } from "../../../../../src/cmd"; import { join } from "path"; /** diff --git a/packages/imperative/src/imperative/plugins/cmd/list/list.handler.ts b/packages/imperative/src/imperative/plugins/cmd/list/list.handler.ts index 0ceb5b8499..b001dd5fd6 100644 --- a/packages/imperative/src/imperative/plugins/cmd/list/list.handler.ts +++ b/packages/imperative/src/imperative/plugins/cmd/list/list.handler.ts @@ -9,10 +9,10 @@ * */ -import { ICommandHandler, IHandlerParameters } from "../../../../../cmd"; -import { Logger } from "../../../../../logger/"; +import { ICommandHandler, IHandlerParameters } from "../../../../../src/cmd"; +import { Logger } from "../../../../../src/logger/"; import { IPluginJson } from "../../doc/IPluginJson"; -import { TextUtils } from "../../../../../utilities"; +import { TextUtils } from "../../../../../src/utilities"; import { PluginIssues } from "../../utilities/PluginIssues"; /** diff --git a/packages/imperative/src/imperative/plugins/cmd/showfirststeps/showfirststeps.definition.ts b/packages/imperative/src/imperative/plugins/cmd/showfirststeps/showfirststeps.definition.ts index 34893a117c..6263b5fe31 100644 --- a/packages/imperative/src/imperative/plugins/cmd/showfirststeps/showfirststeps.definition.ts +++ b/packages/imperative/src/imperative/plugins/cmd/showfirststeps/showfirststeps.definition.ts @@ -9,7 +9,7 @@ * */ -import { ICommandDefinition } from "../../../../../cmd"; +import { ICommandDefinition } from "../../../../../src/cmd"; import { join } from "path"; const pluginDescription = diff --git a/packages/imperative/src/imperative/plugins/cmd/showfirststeps/showfirststeps.handler.ts b/packages/imperative/src/imperative/plugins/cmd/showfirststeps/showfirststeps.handler.ts index b49903defe..1d003c84a5 100644 --- a/packages/imperative/src/imperative/plugins/cmd/showfirststeps/showfirststeps.handler.ts +++ b/packages/imperative/src/imperative/plugins/cmd/showfirststeps/showfirststeps.handler.ts @@ -9,11 +9,11 @@ * */ -import { ICommandHandler, IHandlerParameters } from "../../../../../cmd"; -import { Logger } from "../../../../../logger"; +import { ICommandHandler, IHandlerParameters } from "../../../../../src/cmd"; +import { Logger } from "../../../../../src/logger"; import { PMFConstants } from "../../utilities/PMFConstants"; -import { TextUtils } from "../../../../../utilities"; -import { ImperativeError } from "../../../../../error"; +import { TextUtils } from "../../../../../src/utilities"; +import { ImperativeError } from "../../../../../src/error"; import { PluginManagementFacility } from "../../PluginManagementFacility"; /** diff --git a/packages/imperative/src/imperative/plugins/cmd/uninstall/uninstall.definition.ts b/packages/imperative/src/imperative/plugins/cmd/uninstall/uninstall.definition.ts index 13057de779..f102bf8df5 100644 --- a/packages/imperative/src/imperative/plugins/cmd/uninstall/uninstall.definition.ts +++ b/packages/imperative/src/imperative/plugins/cmd/uninstall/uninstall.definition.ts @@ -9,7 +9,7 @@ * */ -import { ICommandDefinition } from "../../../../../cmd"; +import { ICommandDefinition } from "../../../../../src/cmd"; import { join } from "path"; const pluginDescription = diff --git a/packages/imperative/src/imperative/plugins/cmd/uninstall/uninstall.handler.ts b/packages/imperative/src/imperative/plugins/cmd/uninstall/uninstall.handler.ts index 6af4ecd530..67326e01f8 100644 --- a/packages/imperative/src/imperative/plugins/cmd/uninstall/uninstall.handler.ts +++ b/packages/imperative/src/imperative/plugins/cmd/uninstall/uninstall.handler.ts @@ -9,16 +9,16 @@ * */ -import { ICommandHandler, IHandlerParameters } from "../../../../../cmd"; +import { ICommandHandler, IHandlerParameters } from "../../../../../src/cmd"; import { ConfigurationLoader } from "../../../ConfigurationLoader"; -import { CredentialManagerOverride, ICredentialManagerNameMap } from "../../../../../security"; -import { Logger } from "../../../../../logger/"; +import { CredentialManagerOverride, ICredentialManagerNameMap } from "../../../../../src/security"; +import { Logger } from "../../../../../src/logger/"; import { PluginManagementFacility } from "../../PluginManagementFacility"; import { PMFConstants } from "../../utilities/PMFConstants"; import { uninstall } from "../../utilities/npm-interface"; import { getPackageInfo } from "../../utilities/NpmFunctions"; -import { ImperativeError } from "../../../../../error"; -import { TextUtils } from "../../../../../utilities"; +import { ImperativeError } from "../../../../../src/error"; +import { TextUtils } from "../../../../../src/utilities"; /** * The uninstall command handler for cli plugin install. diff --git a/packages/imperative/src/imperative/plugins/cmd/update/update.definition.ts b/packages/imperative/src/imperative/plugins/cmd/update/update.definition.ts index 42dd4d8245..97e70f1a80 100644 --- a/packages/imperative/src/imperative/plugins/cmd/update/update.definition.ts +++ b/packages/imperative/src/imperative/plugins/cmd/update/update.definition.ts @@ -9,7 +9,7 @@ * */ -import { ICommandDefinition } from "../../../../../cmd"; +import { ICommandDefinition } from "../../../../../src/cmd"; import { join } from "path"; const pluginDescription = diff --git a/packages/imperative/src/imperative/plugins/cmd/update/update.handler.ts b/packages/imperative/src/imperative/plugins/cmd/update/update.handler.ts index c4ddecf3f9..4d52207827 100644 --- a/packages/imperative/src/imperative/plugins/cmd/update/update.handler.ts +++ b/packages/imperative/src/imperative/plugins/cmd/update/update.handler.ts @@ -9,12 +9,12 @@ * */ -import { ICommandHandler, IHandlerParameters } from "../../../../../cmd"; -import { Logger } from "../../../../../logger"; +import { ICommandHandler, IHandlerParameters } from "../../../../../src/cmd"; +import { Logger } from "../../../../../src/logger"; import { PMFConstants } from "../../utilities/PMFConstants"; import { update } from "../../utilities/npm-interface"; -import { ImperativeError } from "../../../../../error"; -import { TextUtils } from "../../../../../utilities"; +import { ImperativeError } from "../../../../../src/error"; +import { TextUtils } from "../../../../../src/utilities"; import { IPluginJson } from "../../doc/IPluginJson"; import { readFileSync, writeFileSync } from "jsonfile"; import { npmLogin } from "../../utilities/NpmFunctions"; diff --git a/packages/imperative/src/imperative/plugins/cmd/validate/validate.definition.ts b/packages/imperative/src/imperative/plugins/cmd/validate/validate.definition.ts index 57947d1915..c2cd0076c2 100644 --- a/packages/imperative/src/imperative/plugins/cmd/validate/validate.definition.ts +++ b/packages/imperative/src/imperative/plugins/cmd/validate/validate.definition.ts @@ -9,7 +9,7 @@ * */ -import { ICommandDefinition } from "../../../../../cmd"; +import { ICommandDefinition } from "../../../../../src/cmd"; import { join } from "path"; const pluginDescription = diff --git a/packages/imperative/src/imperative/profiles/handlers/UpdateProfilesHandler.ts b/packages/imperative/src/imperative/profiles/handlers/UpdateProfilesHandler.ts index a692185c48..f7187d03b5 100644 --- a/packages/imperative/src/imperative/profiles/handlers/UpdateProfilesHandler.ts +++ b/packages/imperative/src/imperative/profiles/handlers/UpdateProfilesHandler.ts @@ -9,7 +9,7 @@ * */ -import { overroteProfileMessage, profileUpdatedSuccessfullyAndPath, profileReviewMessage } from "../../../../messages"; +import { overroteProfileMessage, profileUpdatedSuccessfullyAndPath, profileReviewMessage } from "../../../../src/messages"; import { Imperative } from "../../Imperative"; import { IProfileUpdated, ProfilesConstants } from "../../../../src/profiles"; import { ICommandHandler, IHandlerParameters } from "../../../../src/cmd"; diff --git a/packages/imperative/src/imperative/profiles/handlers/ValidateProfileHandler.ts b/packages/imperative/src/imperative/profiles/handlers/ValidateProfileHandler.ts index f435403304..06f4af51d3 100644 --- a/packages/imperative/src/imperative/profiles/handlers/ValidateProfileHandler.ts +++ b/packages/imperative/src/imperative/profiles/handlers/ValidateProfileHandler.ts @@ -10,8 +10,8 @@ */ import { isNullOrUndefined } from "util"; -import { CliProfileManager, ICommandHandler, IHandlerParameters } from "../../../../cmd"; -import { IImperativeError, ImperativeError } from "../../../../error"; +import { CliProfileManager, ICommandHandler, IHandlerParameters } from "../../../../src/cmd"; +import { IImperativeError, ImperativeError } from "../../../../src/error"; import { Imperative } from "../../../index"; import { IProfileValidationPlan, @@ -19,9 +19,9 @@ import { IProfileValidationTask, ProfilesConstants, ProfileValidator -} from "../../../../profiles"; -import { Logger } from "../../../../logger"; -import { ImperativeConfig } from "../../../../utilities"; +} from "../../../../src/profiles"; +import { Logger } from "../../../../src/logger"; +import { ImperativeConfig } from "../../../../src/utilities"; /** * Generic handler for validating a profile and printing a report in response diff --git a/packages/imperative/src/security/CredentialManagerFactory.ts b/packages/imperative/src/security/CredentialManagerFactory.ts index 56a22f2755..eacc01b4da 100644 --- a/packages/imperative/src/security/CredentialManagerFactory.ts +++ b/packages/imperative/src/security/CredentialManagerFactory.ts @@ -129,7 +129,7 @@ export class CredentialManagerFactory { if (this.mManager.initialize) { await this.mManager.initialize(); - const { Logger } = await import("../../logger"); + const { Logger } = await import("../../src/logger"); Logger.getImperativeLogger().debug(`Initialized the "${displayName}" credential manager for "${params.service}".`); } From 0025b934db30dd30b2a88a76fd88d3dc63f2e262 Mon Sep 17 00:00:00 2001 From: Amber Torrise Date: Wed, 17 Jan 2024 10:55:39 -0500 Subject: [PATCH 119/138] import errs Signed-off-by: Amber Torrise --- packages/imperative/src/imperative/doc/IDaemonContext.ts | 2 +- .../src/imperative/doc/IImperativeAuthGroupConfig.ts | 2 +- packages/imperative/src/imperative/doc/IImperativeConfig.ts | 4 ++-- .../imperative/src/imperative/doc/IImperativeLogsConfig.ts | 2 +- .../imperative/src/imperative/doc/IImperativeOverrides.ts | 4 ++-- .../src/imperative/env/EnvironmentalVariableSettings.ts | 4 ++-- .../src/imperative/handlers/DefaultRootCommandHandler.ts | 6 +++--- .../src/imperative/help/ImperativeHelpGeneratorFactory.ts | 2 +- 8 files changed, 13 insertions(+), 13 deletions(-) diff --git a/packages/imperative/src/imperative/doc/IDaemonContext.ts b/packages/imperative/src/imperative/doc/IDaemonContext.ts index 482bc09bdd..82b76cc0e4 100644 --- a/packages/imperative/src/imperative/doc/IDaemonContext.ts +++ b/packages/imperative/src/imperative/doc/IDaemonContext.ts @@ -11,7 +11,7 @@ import * as net from "net"; import * as stream from "stream"; -import { IDaemonResponse } from "../../../utilities"; +import { IDaemonResponse } from "../../../src/utilities"; /** * Allow for passing our own "context" / user data to the Imperative parser diff --git a/packages/imperative/src/imperative/doc/IImperativeAuthGroupConfig.ts b/packages/imperative/src/imperative/doc/IImperativeAuthGroupConfig.ts index 0a449e72d2..85450662c7 100644 --- a/packages/imperative/src/imperative/doc/IImperativeAuthGroupConfig.ts +++ b/packages/imperative/src/imperative/doc/IImperativeAuthGroupConfig.ts @@ -9,7 +9,7 @@ * */ -import { IPartialCommandDefinition } from "../../../cmd"; +import { IPartialCommandDefinition } from "../../../src/cmd"; export interface IImperativeAuthGroupConfig { /** diff --git a/packages/imperative/src/imperative/doc/IImperativeConfig.ts b/packages/imperative/src/imperative/doc/IImperativeConfig.ts index 473941bae8..bc91076268 100644 --- a/packages/imperative/src/imperative/doc/IImperativeConfig.ts +++ b/packages/imperative/src/imperative/doc/IImperativeConfig.ts @@ -9,12 +9,12 @@ * */ -import { ICommandDefinition, ICommandProfileTypeConfiguration } from "../../../cmd"; +import { ICommandDefinition, ICommandProfileTypeConfiguration } from "../../../src/cmd"; import { IImperativeLogsConfig } from "./IImperativeLogsConfig"; import { IImperativeOverrides } from "./IImperativeOverrides"; import { IImperativeAuthGroupConfig } from "./IImperativeAuthGroupConfig"; import { IApimlSvcAttrs } from "./IApimlSvcAttrs"; -import { ICommandProfileAutoInitConfig } from "../../../cmd/src/doc/profiles/definition/ICommandProfileAutoInitConfig"; +import { ICommandProfileAutoInitConfig } from "../../../src/cmd/doc/profiles/definition/ICommandProfileAutoInitConfig"; /** * All of the configuration required to set up your Imperative CLI app diff --git a/packages/imperative/src/imperative/doc/IImperativeLogsConfig.ts b/packages/imperative/src/imperative/doc/IImperativeLogsConfig.ts index ca43fcaed6..eb670e310b 100644 --- a/packages/imperative/src/imperative/doc/IImperativeLogsConfig.ts +++ b/packages/imperative/src/imperative/doc/IImperativeLogsConfig.ts @@ -9,7 +9,7 @@ * */ -import { IImperativeLoggingConfig } from "../../../index"; +import { IImperativeLoggingConfig } from "../../../src/index"; export interface IImperativeLogsConfig { diff --git a/packages/imperative/src/imperative/doc/IImperativeOverrides.ts b/packages/imperative/src/imperative/doc/IImperativeOverrides.ts index 7ae9eef68b..dde04dbcd2 100644 --- a/packages/imperative/src/imperative/doc/IImperativeOverrides.ts +++ b/packages/imperative/src/imperative/doc/IImperativeOverrides.ts @@ -32,8 +32,8 @@ * strings and undefined values. */ -import { ICredentialManagerConstructor } from "../../../security"; -import { IConstructor } from "../../../interfaces"; +import { ICredentialManagerConstructor } from "../../../src/security"; +import { IConstructor } from "../../../src/interfaces"; /** * Type of the {@link ImperativeOverrides} interface. This ensures that all diff --git a/packages/imperative/src/imperative/env/EnvironmentalVariableSettings.ts b/packages/imperative/src/imperative/env/EnvironmentalVariableSettings.ts index 8bd0601e00..be7d3cad09 100644 --- a/packages/imperative/src/imperative/env/EnvironmentalVariableSettings.ts +++ b/packages/imperative/src/imperative/env/EnvironmentalVariableSettings.ts @@ -10,8 +10,8 @@ */ import { IImperativeEnvironmentalVariableSettings } from "../doc/IImperativeEnvironmentalVariableSettings"; -import { ImperativeExpect } from "../../../expect"; -import { Constants } from "../../../constants/src/Constants"; +import { ImperativeExpect } from "../../../src/expect"; +import { Constants } from "../../../src/constants/Constants"; /** * Service for reading environmental variable settings diff --git a/packages/imperative/src/imperative/handlers/DefaultRootCommandHandler.ts b/packages/imperative/src/imperative/handlers/DefaultRootCommandHandler.ts index 176b8b7775..804d5517f9 100644 --- a/packages/imperative/src/imperative/handlers/DefaultRootCommandHandler.ts +++ b/packages/imperative/src/imperative/handlers/DefaultRootCommandHandler.ts @@ -9,10 +9,10 @@ * */ -import { Imperative } from "../../../imperative/src/Imperative"; +import { Imperative } from "../../../src/imperative/Imperative"; import { ICommandHandler, IHandlerParameters, ICommandTreeEntry, CommandUtils } from "../../../cmd"; -import { ImperativeConfig, TextUtils } from "../../../utilities"; -import { WebHelpManager } from "../../../cmd/src/help/WebHelpManager"; +import { ImperativeConfig, TextUtils } from "../../../src/utilities"; +import { WebHelpManager } from "../../../src/cmd/help/WebHelpManager"; /** * The default command handler for the top level/root command * Allows the user to check the version of the package. diff --git a/packages/imperative/src/imperative/help/ImperativeHelpGeneratorFactory.ts b/packages/imperative/src/imperative/help/ImperativeHelpGeneratorFactory.ts index 1443d098ea..6f16df62ea 100644 --- a/packages/imperative/src/imperative/help/ImperativeHelpGeneratorFactory.ts +++ b/packages/imperative/src/imperative/help/ImperativeHelpGeneratorFactory.ts @@ -13,7 +13,7 @@ import { isNullOrUndefined } from "util"; import { IHelpGenerator, HelpGeneratorFactory, IHelpGeneratorParms, - AbstractHelpGeneratorFactory } from "../../../cmd"; + AbstractHelpGeneratorFactory } from "../../../src/cmd"; import { IImperativeConfig } from "../doc/IImperativeConfig"; /** * Imperative Help generator factory passed to yargs to build help generators where needed. From 2726b6d9f7ef87975433eb791fc0bb73cf134cc4 Mon Sep 17 00:00:00 2001 From: Amber Torrise Date: Wed, 17 Jan 2024 11:30:48 -0500 Subject: [PATCH 120/138] final import changes Signed-off-by: Amber Torrise --- .../imperative/auth/handlers/BaseAuthHandler.ts | 2 +- .../src/imperative/config/cmd/init/init.handler.ts | 6 +++--- .../src/imperative/config/cmd/list/list.handler.ts | 6 +++--- .../config/cmd/profiles/profiles.definition.ts | 2 +- .../config/cmd/profiles/profiles.handler.ts | 6 +++--- .../imperative/config/cmd/report-env/EnvQuery.ts | 12 ++++++------ .../config/cmd/report-env/Report-env.definition.ts | 2 +- .../config/cmd/report-env/Report-env.handler.ts | 4 ++-- .../config/cmd/schema/schema.definition.ts | 2 +- .../imperative/config/cmd/schema/schema.handler.ts | 6 +++--- .../config/cmd/secure/secure.definition.ts | 2 +- .../imperative/config/cmd/secure/secure.handler.ts | 14 +++++++------- .../imperative/config/cmd/set/set.definition.ts | 2 +- .../src/imperative/config/cmd/set/set.handler.ts | 10 +++++----- .../update-schemas/update-schemas.definition.ts | 2 +- .../cmd/update-schemas/update-schemas.handler.ts | 10 +++++----- .../handlers/DefaultRootCommandHandler.ts | 2 +- .../profiles/handlers/ListProfilesHandler.ts | 2 +- 18 files changed, 46 insertions(+), 46 deletions(-) diff --git a/packages/imperative/src/imperative/auth/handlers/BaseAuthHandler.ts b/packages/imperative/src/imperative/auth/handlers/BaseAuthHandler.ts index ffc992e62e..65c1259e4f 100644 --- a/packages/imperative/src/imperative/auth/handlers/BaseAuthHandler.ts +++ b/packages/imperative/src/imperative/auth/handlers/BaseAuthHandler.ts @@ -22,7 +22,7 @@ import { Imperative } from "../../Imperative"; import { IImperativeError, ImperativeError } from "../../../../src/error"; import { ISaveProfileFromCliArgs } from "../../../../src/profiles"; import { ImperativeConfig } from "../../../../src/utilities"; -import { getActiveProfileName, secureSaveError } from "../../../../src/config/src/ConfigUtils"; +import { getActiveProfileName, secureSaveError } from "../../../../src/config/ConfigUtils"; import { AbstractAuthHandler } from "./AbstractAuthHandler"; import { IAuthHandlerApi } from "../doc/IAuthHandlerApi"; diff --git a/packages/imperative/src/imperative/config/cmd/init/init.handler.ts b/packages/imperative/src/imperative/config/cmd/init/init.handler.ts index 64ef1cb93e..9646c7dfbf 100644 --- a/packages/imperative/src/imperative/config/cmd/init/init.handler.ts +++ b/packages/imperative/src/imperative/config/cmd/init/init.handler.ts @@ -15,9 +15,9 @@ import { ProcessUtils } from "../../../../../src/utilities/ProcessUtils"; import { TextUtils } from "../../../../../src/utilities/TextUtils"; import { Config, ConfigConstants, ConfigSchema, IConfig } from "../../../../../src/config"; import { IProfileProperty } from "../../../../../src/profiles"; -import { ConfigBuilder } from "../../../../../src/config/src/ConfigBuilder"; -import { IConfigBuilderOpts } from "../../../../../src/config/src/doc/IConfigBuilderOpts"; -import { coercePropValue, secureSaveError } from "../../../../../src/config/src/ConfigUtils"; +import { ConfigBuilder } from "../../../../../src/config/ConfigBuilder"; +import { IConfigBuilderOpts } from "../../../../../src/config/doc/IConfigBuilderOpts"; +import { coercePropValue, secureSaveError } from "../../../../../src/config/ConfigUtils"; import { OverridesLoader } from "../../../OverridesLoader"; import * as JSONC from "comment-json"; import * as lodash from "lodash"; diff --git a/packages/imperative/src/imperative/config/cmd/list/list.handler.ts b/packages/imperative/src/imperative/config/cmd/list/list.handler.ts index 6198922be5..6a9eeae75c 100644 --- a/packages/imperative/src/imperative/config/cmd/list/list.handler.ts +++ b/packages/imperative/src/imperative/config/cmd/list/list.handler.ts @@ -10,9 +10,9 @@ */ import * as lodash from "lodash"; -import { ICommandHandler, IHandlerParameters } from "../../../../../cmd"; -import { ConfigConstants } from "../../../../../config"; -import { ImperativeConfig } from "../../../../../utilities"; +import { ICommandHandler, IHandlerParameters } from "../../../../../src/cmd"; +import { ConfigConstants } from "../../../../../src/config"; +import { ImperativeConfig } from "../../../../../src/utilities"; export default class ListHandler implements ICommandHandler { /** diff --git a/packages/imperative/src/imperative/config/cmd/profiles/profiles.definition.ts b/packages/imperative/src/imperative/config/cmd/profiles/profiles.definition.ts index 0da5f5e8f6..bbfb62fa00 100644 --- a/packages/imperative/src/imperative/config/cmd/profiles/profiles.definition.ts +++ b/packages/imperative/src/imperative/config/cmd/profiles/profiles.definition.ts @@ -9,7 +9,7 @@ * */ -import { ICommandDefinition } from "../../../../../cmd"; +import { ICommandDefinition } from "../../../../../src/cmd"; import { join } from "path"; /** diff --git a/packages/imperative/src/imperative/config/cmd/profiles/profiles.handler.ts b/packages/imperative/src/imperative/config/cmd/profiles/profiles.handler.ts index 028655b519..582d46b41d 100644 --- a/packages/imperative/src/imperative/config/cmd/profiles/profiles.handler.ts +++ b/packages/imperative/src/imperative/config/cmd/profiles/profiles.handler.ts @@ -9,9 +9,9 @@ * */ -import { ICommandHandler, IHandlerParameters } from "../../../../../cmd"; -import { IConfigProfile } from "../../../../../config"; -import { ImperativeConfig } from "../../../../../utilities"; +import { ICommandHandler, IHandlerParameters } from "../../../../../src/cmd"; +import { IConfigProfile } from "../../../../../src/config"; +import { ImperativeConfig } from "../../../../../src/utilities"; /** * The get command group handler for cli configuration settings. diff --git a/packages/imperative/src/imperative/config/cmd/report-env/EnvQuery.ts b/packages/imperative/src/imperative/config/cmd/report-env/EnvQuery.ts index 577b7100a0..5502edf0af 100644 --- a/packages/imperative/src/imperative/config/cmd/report-env/EnvQuery.ts +++ b/packages/imperative/src/imperative/config/cmd/report-env/EnvQuery.ts @@ -16,12 +16,12 @@ import * as path from "path"; import * as spawn from "cross-spawn"; import { StdioOptions } from "child_process"; -import { ConfigConstants, IConfigProfile } from "../../../../../config"; -import { IHandlerProgressApi } from "../../../../../cmd"; -import { IO } from "../../../../../io"; -import { ImperativeConfig , TextUtils } from "../../../../../utilities"; -import { ITaskWithStatus, TaskProgress, TaskStage } from "../../../../../operations"; -import { CliUtils } from "../../../../../utilities/src/CliUtils"; +import { ConfigConstants, IConfigProfile } from "../../../../../src/config"; +import { IHandlerProgressApi } from "../../../../../src/cmd"; +import { IO } from "../../../../../src/io"; +import { ImperativeConfig , TextUtils } from "../../../../../src/utilities"; +import { ITaskWithStatus, TaskProgress, TaskStage } from "../../../../../src/operations"; +import { CliUtils } from "../../../../../src/utilities/CliUtils"; import { IPluginJson } from "../../../plugins/doc/IPluginJson"; import { PluginIssues } from "../../../plugins/utilities/PluginIssues"; diff --git a/packages/imperative/src/imperative/config/cmd/report-env/Report-env.definition.ts b/packages/imperative/src/imperative/config/cmd/report-env/Report-env.definition.ts index 8411ebf4f3..66c9c9f5e7 100644 --- a/packages/imperative/src/imperative/config/cmd/report-env/Report-env.definition.ts +++ b/packages/imperative/src/imperative/config/cmd/report-env/Report-env.definition.ts @@ -10,7 +10,7 @@ */ import { join } from "path"; -import { ICommandDefinition } from "../../../../../cmd"; +import { ICommandDefinition } from "../../../../../src/cmd"; /** * Definition for the 'config report-env' command. diff --git a/packages/imperative/src/imperative/config/cmd/report-env/Report-env.handler.ts b/packages/imperative/src/imperative/config/cmd/report-env/Report-env.handler.ts index 9b3005f989..160616cea6 100644 --- a/packages/imperative/src/imperative/config/cmd/report-env/Report-env.handler.ts +++ b/packages/imperative/src/imperative/config/cmd/report-env/Report-env.handler.ts @@ -9,10 +9,10 @@ * */ -import { ICommandHandler, IHandlerParameters, IHandlerResponseApi } from "../../../../../cmd"; +import { ICommandHandler, IHandlerParameters, IHandlerResponseApi } from "../../../../../src/cmd"; import { ItemId } from "./EnvItems"; import { EnvQuery, IGetItemOpts } from "./EnvQuery"; -import { TextUtils } from "../../../../../utilities/src/TextUtils"; +import { TextUtils } from "../../../../../src/utilities/TextUtils"; /** * Handler to report a user's wroking environment. diff --git a/packages/imperative/src/imperative/config/cmd/schema/schema.definition.ts b/packages/imperative/src/imperative/config/cmd/schema/schema.definition.ts index e902517642..26cf6e71f6 100644 --- a/packages/imperative/src/imperative/config/cmd/schema/schema.definition.ts +++ b/packages/imperative/src/imperative/config/cmd/schema/schema.definition.ts @@ -9,7 +9,7 @@ * */ -import { ICommandDefinition } from "../../../../../cmd"; +import { ICommandDefinition } from "../../../../../src/cmd"; import { join } from "path"; /** diff --git a/packages/imperative/src/imperative/config/cmd/schema/schema.handler.ts b/packages/imperative/src/imperative/config/cmd/schema/schema.handler.ts index a89c5cbee1..c540fcd619 100644 --- a/packages/imperative/src/imperative/config/cmd/schema/schema.handler.ts +++ b/packages/imperative/src/imperative/config/cmd/schema/schema.handler.ts @@ -9,9 +9,9 @@ * */ -import { ICommandHandler, ICommandProfileTypeConfiguration, IHandlerParameters } from "../../../../../cmd"; -import { ConfigConstants, ConfigSchema } from "../../../../../config"; -import { ImperativeConfig } from "../../../../../utilities"; +import { ICommandHandler, ICommandProfileTypeConfiguration, IHandlerParameters } from "../../../../../src/cmd"; +import { ConfigConstants, ConfigSchema } from "../../../../../src/config"; +import { ImperativeConfig } from "../../../../../src/utilities"; /** * The get command group handler for cli configuration settings. diff --git a/packages/imperative/src/imperative/config/cmd/secure/secure.definition.ts b/packages/imperative/src/imperative/config/cmd/secure/secure.definition.ts index efe1eb1c78..f962fcc8e1 100644 --- a/packages/imperative/src/imperative/config/cmd/secure/secure.definition.ts +++ b/packages/imperative/src/imperative/config/cmd/secure/secure.definition.ts @@ -9,7 +9,7 @@ * */ -import { ICommandDefinition } from "../../../../../cmd"; +import { ICommandDefinition } from "../../../../../src/cmd"; import { join } from "path"; export const secureDefinition: ICommandDefinition = { diff --git a/packages/imperative/src/imperative/config/cmd/secure/secure.handler.ts b/packages/imperative/src/imperative/config/cmd/secure/secure.handler.ts index 3c88d79197..c5ceb0a98a 100644 --- a/packages/imperative/src/imperative/config/cmd/secure/secure.handler.ts +++ b/packages/imperative/src/imperative/config/cmd/secure/secure.handler.ts @@ -9,13 +9,13 @@ * */ -import { ICommandArguments, ICommandHandler, IHandlerParameters } from "../../../../../cmd"; -import { Config, ConfigAutoStore, ConfigConstants, ConfigSchema } from "../../../../../config"; -import { coercePropValue, secureSaveError } from "../../../../../config/src/ConfigUtils"; -import { ImperativeError } from "../../../../../error"; -import { Logger } from "../../../../../logger"; -import { ConnectionPropsForSessCfg, ISession, Session } from "../../../../../rest"; -import { ImperativeConfig } from "../../../../../utilities"; +import { ICommandArguments, ICommandHandler, IHandlerParameters } from "../../../../../src/cmd"; +import { Config, ConfigAutoStore, ConfigConstants, ConfigSchema } from "../../../../../src/config"; +import { coercePropValue, secureSaveError } from "../../../../../src/config/ConfigUtils"; +import { ImperativeError } from "../../../../../src/error"; +import { Logger } from "../../../../../src/logger"; +import { ConnectionPropsForSessCfg, ISession, Session } from "../../../../../src/rest"; +import { ImperativeConfig } from "../../../../../src/utilities"; export default class SecureHandler implements ICommandHandler { /** diff --git a/packages/imperative/src/imperative/config/cmd/set/set.definition.ts b/packages/imperative/src/imperative/config/cmd/set/set.definition.ts index b340482dcb..f12f863b5b 100644 --- a/packages/imperative/src/imperative/config/cmd/set/set.definition.ts +++ b/packages/imperative/src/imperative/config/cmd/set/set.definition.ts @@ -9,7 +9,7 @@ * */ -import { ICommandDefinition } from "../../../../../cmd"; +import { ICommandDefinition } from "../../../../../src/cmd"; import { join } from "path"; export const setDefinition: ICommandDefinition = { diff --git a/packages/imperative/src/imperative/config/cmd/set/set.handler.ts b/packages/imperative/src/imperative/config/cmd/set/set.handler.ts index 67b9795bc3..2419e72b1f 100644 --- a/packages/imperative/src/imperative/config/cmd/set/set.handler.ts +++ b/packages/imperative/src/imperative/config/cmd/set/set.handler.ts @@ -10,11 +10,11 @@ */ import * as JSONC from "comment-json"; -import { ICommandHandler, IHandlerParameters } from "../../../../../cmd"; -import { ConfigSchema } from "../../../../../config"; -import { coercePropValue, secureSaveError } from "../../../../../config/src/ConfigUtils"; -import { ImperativeError } from "../../../../../error"; -import { ImperativeConfig } from "../../../../../utilities"; +import { ICommandHandler, IHandlerParameters } from "../../../../../src/cmd"; +import { ConfigSchema } from "../../../../../src/config"; +import { coercePropValue, secureSaveError } from "../../../../../src/config/ConfigUtils"; +import { ImperativeError } from "../../../../../src/error"; +import { ImperativeConfig } from "../../../../../src/utilities"; export default class SetHandler implements ICommandHandler { diff --git a/packages/imperative/src/imperative/config/cmd/update-schemas/update-schemas.definition.ts b/packages/imperative/src/imperative/config/cmd/update-schemas/update-schemas.definition.ts index 572dbcd711..8ff4b1bd30 100644 --- a/packages/imperative/src/imperative/config/cmd/update-schemas/update-schemas.definition.ts +++ b/packages/imperative/src/imperative/config/cmd/update-schemas/update-schemas.definition.ts @@ -10,7 +10,7 @@ */ import { join } from "path"; -import { ICommandDefinition } from "../../../../../cmd"; +import { ICommandDefinition } from "../../../../../src/cmd"; export const updateSchemasDefinition: ICommandDefinition = { name: "update-schemas", diff --git a/packages/imperative/src/imperative/config/cmd/update-schemas/update-schemas.handler.ts b/packages/imperative/src/imperative/config/cmd/update-schemas/update-schemas.handler.ts index 24214e316b..d42b027568 100644 --- a/packages/imperative/src/imperative/config/cmd/update-schemas/update-schemas.handler.ts +++ b/packages/imperative/src/imperative/config/cmd/update-schemas/update-schemas.handler.ts @@ -9,11 +9,11 @@ * */ -import { ICommandHandler, IHandlerParameters } from "../../../../../cmd"; -import { ConfigSchema } from "../../../../../config/src/ConfigSchema"; -import { ImperativeExpect } from "../../../../../expect/src/ImperativeExpect"; -import { ImperativeConfig } from "../../../../../utilities/ImperativeConfig"; -import { TextUtils } from "../../../../../utilities/src/TextUtils"; +import { ICommandHandler, IHandlerParameters } from "../../../../../src/cmd"; +import { ConfigSchema } from "../../../../../src/config/ConfigSchema"; +import { ImperativeExpect } from "../../../../../src/expect/ImperativeExpect"; +import { ImperativeConfig } from "../../../../../src/utilities/ImperativeConfig"; +import { TextUtils } from "../../../../../src/utilities/TextUtils"; export default class UpdateSchemasHandler implements ICommandHandler { /** diff --git a/packages/imperative/src/imperative/handlers/DefaultRootCommandHandler.ts b/packages/imperative/src/imperative/handlers/DefaultRootCommandHandler.ts index 804d5517f9..76dc66ad44 100644 --- a/packages/imperative/src/imperative/handlers/DefaultRootCommandHandler.ts +++ b/packages/imperative/src/imperative/handlers/DefaultRootCommandHandler.ts @@ -10,7 +10,7 @@ */ import { Imperative } from "../../../src/imperative/Imperative"; -import { ICommandHandler, IHandlerParameters, ICommandTreeEntry, CommandUtils } from "../../../cmd"; +import { ICommandHandler, IHandlerParameters, ICommandTreeEntry, CommandUtils } from "../../../src/cmd"; import { ImperativeConfig, TextUtils } from "../../../src/utilities"; import { WebHelpManager } from "../../../src/cmd/help/WebHelpManager"; /** diff --git a/packages/imperative/src/imperative/profiles/handlers/ListProfilesHandler.ts b/packages/imperative/src/imperative/profiles/handlers/ListProfilesHandler.ts index eb08b9704f..1bfdaa103f 100644 --- a/packages/imperative/src/imperative/profiles/handlers/ListProfilesHandler.ts +++ b/packages/imperative/src/imperative/profiles/handlers/ListProfilesHandler.ts @@ -12,7 +12,7 @@ import { Imperative } from "../../../"; import { ProfilesConstants } from "../../../../src/profiles/constants/ProfilesConstants"; import { CliProfileManager, ICommandHandler, IHandlerParameters } from "../../../../src/cmd"; -import { IProfileLoaded } from "../../../.."; +import { IProfileLoaded } from "../../../"; /** * Handler for the auto-generated list profiles command. From adb75e4583e9d4f35df1f835159e93a8abe5e890 Mon Sep 17 00:00:00 2001 From: zFernand0 <37381190+zFernand0@users.noreply.github.com> Date: Wed, 17 Jan 2024 17:31:58 +0000 Subject: [PATCH 121/138] update cli-test-util tsconfig to avoid strict checking of imperative Signed-off-by: zFernand0 <37381190+zFernand0@users.noreply.github.com> --- .../__packages__/cli-test-utils/tsconfig.json | 35 +++++++++++++------ 1 file changed, 24 insertions(+), 11 deletions(-) diff --git a/__tests__/__packages__/cli-test-utils/tsconfig.json b/__tests__/__packages__/cli-test-utils/tsconfig.json index 6e76d7b0f5..4254df1842 100644 --- a/__tests__/__packages__/cli-test-utils/tsconfig.json +++ b/__tests__/__packages__/cli-test-utils/tsconfig.json @@ -1,18 +1,31 @@ { + "extends": "../../../tsconfig.json", "compilerOptions": { - /* Visit https://aka.ms/tsconfig.json to read more about this file */ - "target": "es5", - "module": "commonjs", - "declaration": true, "outDir": "./lib", - "rootDir": "./src", - "strict": true, - "esModuleInterop": true, "skipLibCheck": true, "forceConsistentCasingInFileNames": true, - "types": [ - "node", - "jest" - ] + "rootDir": "./src", + "esModuleInterop": true, + "target": "es5", } } + +// Standardize the tsconfig to match any other SDK package +// { +// "compilerOptions": { +// /* Visit https://aka.ms/tsconfig.json to read more about this file */ +// "target": "es5", +// "module": "commonjs", +// "declaration": true, +// "outDir": "./lib", +// "rootDir": "./src", +// // "strict": true, // We do not enable strict on other dependencies (like @zowe/imperative) +// "esModuleInterop": true, +// "skipLibCheck": true, +// "forceConsistentCasingInFileNames": true, +// "types": [ +// "node", +// "jest" +// ] +// } +// } From dd1dc000c71a98cdc8cad0cf5182be2f751165f0 Mon Sep 17 00:00:00 2001 From: zFernand0 <37381190+zFernand0@users.noreply.github.com> Date: Wed, 17 Jan 2024 20:48:18 +0000 Subject: [PATCH 122/138] fixing a few things in the build Signed-off-by: zFernand0 <37381190+zFernand0@users.noreply.github.com> --- .../imperative.integration.subtest.ts | 2 +- .../__src__/environment/TestEnvironment.ts | 2 +- .../logging/LoggingCredentials.system.test.ts | 2 +- .../src/cmd/help/DefaultHelpGenerator.ts | 2 +- .../src/imperative/OverridesLoader.ts | 10 +++++----- .../src/imperative/UpdateImpConfig.ts | 6 +++--- .../src/imperative/__mocks__/Imperative.ts | 4 ++-- .../imperative/__mocks__/LoggingConfigurer.ts | 4 ++-- .../src/imperative/api/ImperativeApi.ts | 6 +++--- .../src/imperative/api/doc/IImperativeApi.ts | 2 +- .../auth/builders/AuthCommandBuilder.ts | 10 +++++----- .../auth/builders/AuthLoginCommandBuilder.ts | 8 ++++---- .../auth/builders/AuthLogoutCommandBuilder.ts | 8 ++++---- .../auth/builders/CompleteAuthGroupBuilder.ts | 10 +++++----- .../imperative/auth/doc/IAuthHandlerApi.ts | 4 ++-- .../auth/handlers/AbstractAuthHandler.ts | 8 ++++---- .../auth/handlers/BaseAuthHandler.ts | 12 ++++++------ .../config/ConfigManagementFacility.ts | 2 +- .../config/cmd/auto-init/AutoInitConstants.ts | 2 +- .../builders/AutoInitCommandBuilder.ts | 16 ++++++++-------- .../CompleteAutoInitCommandBuilder.ts | 6 +++--- .../auto-init/handlers/BaseAutoInitHandler.ts | 12 ++++++------ .../convert-profiles.definition.ts | 4 ++-- .../convert-profiles.handler.ts | 10 +++++----- .../config/cmd/edit/edit.definition.ts | 2 +- .../config/cmd/edit/edit.handler.ts | 6 +++--- .../config/cmd/import/import.definition.ts | 2 +- .../config/cmd/import/import.handler.ts | 12 ++++++------ .../config/cmd/init/init.definition.ts | 4 ++-- .../config/cmd/init/init.handler.ts | 19 +++++++++---------- .../config/cmd/list/list.definition.ts | 2 +- .../config/cmd/list/list.handler.ts | 6 +++--- .../cmd/profiles/profiles.definition.ts | 2 +- .../config/cmd/profiles/profiles.handler.ts | 6 +++--- .../config/cmd/report-env/EnvQuery.ts | 12 ++++++------ .../cmd/report-env/Report-env.definition.ts | 2 +- .../cmd/report-env/Report-env.handler.ts | 4 ++-- .../config/cmd/schema/schema.definition.ts | 2 +- .../config/cmd/schema/schema.handler.ts | 6 +++--- .../config/cmd/secure/secure.definition.ts | 2 +- .../config/cmd/secure/secure.handler.ts | 14 +++++++------- .../config/cmd/set/set.definition.ts | 2 +- .../imperative/config/cmd/set/set.handler.ts | 10 +++++----- .../update-schemas.definition.ts | 2 +- .../update-schemas/update-schemas.handler.ts | 10 +++++----- .../src/imperative/doc/IDaemonContext.ts | 2 +- .../doc/IImperativeAuthGroupConfig.ts | 2 +- .../src/imperative/doc/IImperativeConfig.ts | 4 ++-- .../imperative/doc/IImperativeLogsConfig.ts | 2 +- .../imperative/doc/IImperativeOverrides.ts | 4 ++-- .../env/EnvironmentalVariableSettings.ts | 4 ++-- .../handlers/DefaultRootCommandHandler.ts | 8 ++++---- .../help/ImperativeHelpGeneratorFactory.ts | 2 +- .../plugins/PluginManagementFacility.ts | 16 ++++++++-------- .../plugins/PluginRequireProvider.ts | 2 +- .../plugins/cmd/install/install.definition.ts | 4 ++-- .../plugins/cmd/install/install.handler.ts | 8 ++++---- .../plugins/cmd/list/list.definition.ts | 2 +- .../plugins/cmd/list/list.handler.ts | 6 +++--- .../showfirststeps.definition.ts | 2 +- .../showfirststeps/showfirststeps.handler.ts | 8 ++++---- .../cmd/uninstall/uninstall.definition.ts | 2 +- .../cmd/uninstall/uninstall.handler.ts | 10 +++++----- .../plugins/cmd/update/update.definition.ts | 2 +- .../plugins/cmd/update/update.handler.ts | 8 ++++---- .../cmd/validate/validate.definition.ts | 2 +- .../plugins/cmd/validate/validate.handler.ts | 4 ++-- .../PluginRequireAlreadyCreatedError.ts | 2 +- .../errors/PluginRequireNotCreatedError.ts | 2 +- .../plugins/utilities/NpmFunctions.ts | 2 +- .../plugins/utilities/PMFConstants.ts | 4 ++-- .../plugins/utilities/PluginIssues.ts | 2 +- .../utilities/npm-interface/install.ts | 8 ++++---- .../utilities/npm-interface/uninstall.ts | 6 +++--- .../plugins/utilities/npm-interface/update.ts | 2 +- .../plugins/utilities/runValidatePlugin.ts | 6 +++--- .../ImperativeProfileManagerFactory.ts | 4 ++-- .../builders/CompleteProfilesGroupBuilder.ts | 12 ++++++------ .../builders/ProfilesCommandBuilder.ts | 10 +++++----- .../builders/ProfilesCreateCommandBuilder.ts | 12 ++++++------ .../builders/ProfilesDeleteCommandBuilder.ts | 10 +++++----- .../builders/ProfilesListCommandBuilder.ts | 12 ++++++------ .../builders/ProfilesSetCommandBuilder.ts | 10 +++++----- .../ProfilesShowDependenciesCommandBuilder.ts | 10 +++++----- .../builders/ProfilesUpdateCommandBuilder.ts | 12 ++++++------ .../ProfilesValidateCommandBuilder.ts | 12 ++++++------ .../handlers/CreateProfilesHandler.ts | 10 +++++----- .../profiles/handlers/ListProfilesHandler.ts | 4 ++-- .../handlers/NewDeleteProfilesHandler.ts | 6 +++--- .../handlers/SetDefaultProfilesHandler.ts | 6 +++--- .../ShowDependenciesProfilesHandler.ts | 2 +- .../handlers/UpdateProfilesHandler.ts | 10 +++++----- .../handlers/ValidateProfileHandler.ts | 10 +++++----- .../src/rest/__mocks__/RestClient.ts | 2 +- .../src/security/CredentialManagerFactory.ts | 4 ++-- .../src/utilities/diff/WebDiffGenerator.ts | 2 +- 96 files changed, 288 insertions(+), 289 deletions(-) diff --git a/__tests__/__integration__/imperative.integration.subtest.ts b/__tests__/__integration__/imperative.integration.subtest.ts index b3d42c0247..3985a5d72f 100644 --- a/__tests__/__integration__/imperative.integration.subtest.ts +++ b/__tests__/__integration__/imperative.integration.subtest.ts @@ -9,7 +9,7 @@ * */ -import { ITestEnvironment, runCliScript } from "../__packages__/cli-test-utils"; +import { ITestEnvironment, runCliScript } from "../__packages__/cli-test-utils/src"; import { TestEnvironment } from "../__src__/environment/TestEnvironment"; import { ITestPropertiesSchema } from "../__src__/properties/ITestPropertiesSchema"; diff --git a/__tests__/__src__/environment/TestEnvironment.ts b/__tests__/__src__/environment/TestEnvironment.ts index ad81b91189..eacc357466 100644 --- a/__tests__/__src__/environment/TestEnvironment.ts +++ b/__tests__/__src__/environment/TestEnvironment.ts @@ -14,7 +14,7 @@ import * as nodePath from "path"; import { AbstractSession, Session } from "@zowe/imperative"; import { ITestPropertiesSchema } from "../properties/ITestPropertiesSchema"; -import { ISetupEnvironmentParms, ITestEnvironment, TestEnvironment as BaseTestEnvironment } from "../../__packages__/cli-test-utils"; +import { ISetupEnvironmentParms, ITestEnvironment, TestEnvironment as BaseTestEnvironment } from "../../__packages__/cli-test-utils/src"; import { SshSession } from "../../../packages/zosuss/src/SshSession"; /** diff --git a/__tests__/__system__/cli/logging/LoggingCredentials.system.test.ts b/__tests__/__system__/cli/logging/LoggingCredentials.system.test.ts index a9ad2c6d4f..10189f338a 100644 --- a/__tests__/__system__/cli/logging/LoggingCredentials.system.test.ts +++ b/__tests__/__system__/cli/logging/LoggingCredentials.system.test.ts @@ -9,7 +9,7 @@ * */ -import { ITestEnvironment, TempTestProfiles, runCliScript } from "../../../__packages__/cli-test-utils"; +import { ITestEnvironment, TempTestProfiles, runCliScript } from "../../../__packages__/cli-test-utils/src"; import { TestEnvironment } from "../../../__src__/environment/TestEnvironment"; import { ITestPropertiesSchema } from "../../../__src__/properties/ITestPropertiesSchema"; import { join } from "path"; diff --git a/packages/imperative/src/cmd/help/DefaultHelpGenerator.ts b/packages/imperative/src/cmd/help/DefaultHelpGenerator.ts index a9bbd2620f..f79b9ab654 100644 --- a/packages/imperative/src/cmd/help/DefaultHelpGenerator.ts +++ b/packages/imperative/src/cmd/help/DefaultHelpGenerator.ts @@ -11,7 +11,7 @@ import { format } from "util"; import { AbstractHelpGenerator } from "./abstract/AbstractHelpGenerator"; -import { TextUtils } from "../../../src/utilities/TextUtils"; +import { TextUtils } from "../../utilities/TextUtils"; import { Constants } from "../../constants"; import { CommandUtils } from "../utils/CommandUtils"; import { ImperativeError } from "../../error"; diff --git a/packages/imperative/src/imperative/OverridesLoader.ts b/packages/imperative/src/imperative/OverridesLoader.ts index f4b9ccb75e..27b9926f87 100644 --- a/packages/imperative/src/imperative/OverridesLoader.ts +++ b/packages/imperative/src/imperative/OverridesLoader.ts @@ -10,13 +10,13 @@ */ import { IImperativeOverrides } from "./doc/IImperativeOverrides"; -import { CredentialManagerFactory, DefaultCredentialManager } from "../../src/security"; +import { CredentialManagerFactory, DefaultCredentialManager } from "../security"; import { IImperativeConfig } from "./doc/IImperativeConfig"; import { isAbsolute, resolve } from "path"; -import { AppSettings } from "../../src/settings"; -import { ImperativeConfig } from "../../src/utilities"; -import { IConfigVault } from "../../src/config"; -import { Logger } from "../../src/logger"; +import { AppSettings } from "../settings"; +import { ImperativeConfig } from "../utilities"; +import { IConfigVault } from "../config"; +import { Logger } from "../logger"; /** * Imperative-internal class to load overrides diff --git a/packages/imperative/src/imperative/UpdateImpConfig.ts b/packages/imperative/src/imperative/UpdateImpConfig.ts index 3e99fb7f3c..7f00ee943a 100644 --- a/packages/imperative/src/imperative/UpdateImpConfig.ts +++ b/packages/imperative/src/imperative/UpdateImpConfig.ts @@ -9,10 +9,10 @@ * */ -import { ImperativeConfig } from "../../src/utilities/ImperativeConfig"; +import { ImperativeConfig } from "../utilities/ImperativeConfig"; import { IImperativeConfig } from "./doc/IImperativeConfig"; -import { ICommandDefinition, ICommandProfileTypeConfiguration } from "../../src/cmd"; -import { Logger } from "../../src/logger"; +import { ICommandDefinition, ICommandProfileTypeConfiguration } from "../cmd"; +import { Logger } from "../logger"; /** * This class is used to update the imperative config object, that was initially diff --git a/packages/imperative/src/imperative/__mocks__/Imperative.ts b/packages/imperative/src/imperative/__mocks__/Imperative.ts index d4bdf53ae7..8aa9a381a2 100644 --- a/packages/imperative/src/imperative/__mocks__/Imperative.ts +++ b/packages/imperative/src/imperative/__mocks__/Imperative.ts @@ -9,8 +9,8 @@ * */ -import { TextUtils } from "../../../src/utilities/TextUtils"; -import { AbstractHelpGenerator, DefaultHelpGenerator, IHelpGeneratorParms, ICommandDefinition } from "../../../src/cmd"; +import { TextUtils } from "../../utilities/TextUtils"; +import { AbstractHelpGenerator, DefaultHelpGenerator, IHelpGeneratorParms, ICommandDefinition } from "../../cmd"; import { IImperativeConfig } from "../doc/IImperativeConfig"; const PRIMARY_COLOR: string = "yellow"; diff --git a/packages/imperative/src/imperative/__mocks__/LoggingConfigurer.ts b/packages/imperative/src/imperative/__mocks__/LoggingConfigurer.ts index 9835bf793d..e89b7ebf27 100644 --- a/packages/imperative/src/imperative/__mocks__/LoggingConfigurer.ts +++ b/packages/imperative/src/imperative/__mocks__/LoggingConfigurer.ts @@ -9,12 +9,12 @@ * */ -import { IConfigLogging } from "../../../src/logger"; +import { IConfigLogging } from "../../logger"; const LoggingConfigurer: any = (jest.genMockFromModule("../LoggingConfigurer") as any).LoggingConfigurer; -const {Logger} = (jest as any).requireActual("../../../src/logger"); +const {Logger} = (jest as any).requireActual("../../logger"); LoggingConfigurer.configureLogger.mockImplementation((): IConfigLogging => { return { diff --git a/packages/imperative/src/imperative/api/ImperativeApi.ts b/packages/imperative/src/imperative/api/ImperativeApi.ts index 323c49fa78..79f0794441 100644 --- a/packages/imperative/src/imperative/api/ImperativeApi.ts +++ b/packages/imperative/src/imperative/api/ImperativeApi.ts @@ -11,9 +11,9 @@ import { IImperativeConfig } from "../doc/IImperativeConfig"; import { IImperativeApi } from "./doc/IImperativeApi"; -import { Logger } from "../../../src/logger"; -import { ProfileUtils } from "../../../src/profiles"; -import { CliProfileManager } from "../../../src/cmd"; +import { Logger } from "../../logger"; +import { ProfileUtils } from "../../profiles"; +import { CliProfileManager } from "../../cmd"; export class ImperativeApi { /** diff --git a/packages/imperative/src/imperative/api/doc/IImperativeApi.ts b/packages/imperative/src/imperative/api/doc/IImperativeApi.ts index 968c2a445d..f1b44a2ae8 100644 --- a/packages/imperative/src/imperative/api/doc/IImperativeApi.ts +++ b/packages/imperative/src/imperative/api/doc/IImperativeApi.ts @@ -9,7 +9,7 @@ * */ -import { Logger } from "../../../../src/logger"; +import { Logger } from "../../../logger"; export interface IImperativeApi { "imperativeLogger": Logger; diff --git a/packages/imperative/src/imperative/auth/builders/AuthCommandBuilder.ts b/packages/imperative/src/imperative/auth/builders/AuthCommandBuilder.ts index 3a9676cf4c..1448ddf38c 100644 --- a/packages/imperative/src/imperative/auth/builders/AuthCommandBuilder.ts +++ b/packages/imperative/src/imperative/auth/builders/AuthCommandBuilder.ts @@ -9,11 +9,11 @@ * */ -import { AbstractCommandBuilder } from "../../../../src/cmd/builders/AbstractCommandBuilder"; -import { ICommandDefinition } from "../../../../src/cmd"; -import { Logger } from "../../../../src/logger"; -import { ICommandProfileAuthConfig } from "../../../../src/cmd/doc/profiles/definition/ICommandProfileAuthConfig"; -import { ImperativeError } from "../../../../src/error"; +import { AbstractCommandBuilder } from "../../../cmd/builders/AbstractCommandBuilder"; +import { ICommandDefinition } from "../../../cmd"; +import { Logger } from "../../../logger"; +import { ICommandProfileAuthConfig } from "../../../cmd/doc/profiles/definition/ICommandProfileAuthConfig"; +import { ImperativeError } from "../../../error"; /** * Abstract class for generating auth-related commands diff --git a/packages/imperative/src/imperative/auth/builders/AuthLoginCommandBuilder.ts b/packages/imperative/src/imperative/auth/builders/AuthLoginCommandBuilder.ts index 53f6ebfbf1..55cc043aa5 100644 --- a/packages/imperative/src/imperative/auth/builders/AuthLoginCommandBuilder.ts +++ b/packages/imperative/src/imperative/auth/builders/AuthLoginCommandBuilder.ts @@ -10,10 +10,10 @@ */ import { AuthCommandBuilder } from "./AuthCommandBuilder"; -import { ICommandDefinition } from "../../../../src/cmd"; -import { authLoginCommandDesc, authLoginShowTokenDesc } from "../../../../src/messages"; -import { Constants } from "../../../../src/constants"; -import { TextUtils } from "../../../../src/utilities/TextUtils"; +import { ICommandDefinition } from "../../../cmd"; +import { authLoginCommandDesc, authLoginShowTokenDesc } from "../../../messages"; +import { Constants } from "../../../constants"; +import { TextUtils } from "../../../utilities/TextUtils"; /** * Used to build auth login command definitions. diff --git a/packages/imperative/src/imperative/auth/builders/AuthLogoutCommandBuilder.ts b/packages/imperative/src/imperative/auth/builders/AuthLogoutCommandBuilder.ts index d459c5a7d7..d724332529 100644 --- a/packages/imperative/src/imperative/auth/builders/AuthLogoutCommandBuilder.ts +++ b/packages/imperative/src/imperative/auth/builders/AuthLogoutCommandBuilder.ts @@ -10,10 +10,10 @@ */ import { AuthCommandBuilder } from "./AuthCommandBuilder"; -import { ICommandDefinition } from "../../../../src/cmd"; -import { authLogoutCommandDesc } from "../../../../src/messages"; -import { Constants } from "../../../../src/constants"; -import { TextUtils } from "../../../../src/utilities/TextUtils"; +import { ICommandDefinition } from "../../../cmd"; +import { authLogoutCommandDesc } from "../../../messages"; +import { Constants } from "../../../constants"; +import { TextUtils } from "../../../utilities/TextUtils"; /** * Used to build auth logout command definitions. diff --git a/packages/imperative/src/imperative/auth/builders/CompleteAuthGroupBuilder.ts b/packages/imperative/src/imperative/auth/builders/CompleteAuthGroupBuilder.ts index a26fd41afc..05215789c1 100644 --- a/packages/imperative/src/imperative/auth/builders/CompleteAuthGroupBuilder.ts +++ b/packages/imperative/src/imperative/auth/builders/CompleteAuthGroupBuilder.ts @@ -9,17 +9,17 @@ * */ -import { ICommandDefinition } from "../../../../src/cmd"; +import { ICommandDefinition } from "../../../cmd"; import { authCategoryDesc, authCategorySummary, authLoginGroupDesc, authLoginGroupSummary, authLogoutGroupDesc, authLogoutGroupSummary -} from "../../../../src/messages"; -import { Constants } from "../../../../src/constants"; +} from "../../../messages"; +import { Constants } from "../../../constants"; import { AuthLoginCommandBuilder } from "./AuthLoginCommandBuilder"; import { AuthLogoutCommandBuilder } from "./AuthLogoutCommandBuilder"; -import { Logger } from "../../../../src/logger/index"; -import { ICommandProfileAuthConfig } from "../../../../src/cmd/doc/profiles/definition/ICommandProfileAuthConfig"; +import { Logger } from "../../../logger/index"; +import { ICommandProfileAuthConfig } from "../../../cmd/doc/profiles/definition/ICommandProfileAuthConfig"; import { IImperativeAuthGroupConfig } from "../../doc/IImperativeAuthGroupConfig"; /** diff --git a/packages/imperative/src/imperative/auth/doc/IAuthHandlerApi.ts b/packages/imperative/src/imperative/auth/doc/IAuthHandlerApi.ts index 298d999fe0..3a9aa22969 100644 --- a/packages/imperative/src/imperative/auth/doc/IAuthHandlerApi.ts +++ b/packages/imperative/src/imperative/auth/doc/IAuthHandlerApi.ts @@ -9,8 +9,8 @@ * */ -import { ICommandArguments } from "../../../../src/cmd"; -import { AbstractSession, IOptionsForAddConnProps, ISession } from "../../../../src/rest"; +import { ICommandArguments } from "../../../cmd"; +import { AbstractSession, IOptionsForAddConnProps, ISession } from "../../../rest"; /** * Auth handler API that provides convenient functions to create a session from diff --git a/packages/imperative/src/imperative/auth/handlers/AbstractAuthHandler.ts b/packages/imperative/src/imperative/auth/handlers/AbstractAuthHandler.ts index b6978636a9..b57bdd3dbd 100644 --- a/packages/imperative/src/imperative/auth/handlers/AbstractAuthHandler.ts +++ b/packages/imperative/src/imperative/auth/handlers/AbstractAuthHandler.ts @@ -9,10 +9,10 @@ * */ -import { ICommandHandler, IHandlerParameters, ICommandArguments } from "../../../../src/cmd"; -import { Constants } from "../../../../src/constants"; -import { ISession, SessConstants } from "../../../../src/rest"; -import { ImperativeError } from "../../../../src/error"; +import { ICommandHandler, IHandlerParameters, ICommandArguments } from "../../../cmd"; +import { Constants } from "../../../constants"; +import { ISession, SessConstants } from "../../../rest"; +import { ImperativeError } from "../../../error"; import { IAuthHandlerApi } from "../doc/IAuthHandlerApi"; /** diff --git a/packages/imperative/src/imperative/auth/handlers/BaseAuthHandler.ts b/packages/imperative/src/imperative/auth/handlers/BaseAuthHandler.ts index 65c1259e4f..6fe1d325ef 100644 --- a/packages/imperative/src/imperative/auth/handlers/BaseAuthHandler.ts +++ b/packages/imperative/src/imperative/auth/handlers/BaseAuthHandler.ts @@ -9,7 +9,7 @@ * */ -import { IHandlerParameters, IHandlerResponseApi } from "../../../../src/cmd"; +import { IHandlerParameters, IHandlerResponseApi } from "../../../cmd"; import { AbstractSession, ConnectionPropsForSessCfg, @@ -17,12 +17,12 @@ import { RestConstants, SessConstants, Session -} from "../../../../src/rest"; +} from "../../../rest"; import { Imperative } from "../../Imperative"; -import { IImperativeError, ImperativeError } from "../../../../src/error"; -import { ISaveProfileFromCliArgs } from "../../../../src/profiles"; -import { ImperativeConfig } from "../../../../src/utilities"; -import { getActiveProfileName, secureSaveError } from "../../../../src/config/ConfigUtils"; +import { IImperativeError, ImperativeError } from "../../../error"; +import { ISaveProfileFromCliArgs } from "../../../profiles"; +import { ImperativeConfig } from "../../../utilities"; +import { getActiveProfileName, secureSaveError } from "../../../config/ConfigUtils"; import { AbstractAuthHandler } from "./AbstractAuthHandler"; import { IAuthHandlerApi } from "../doc/IAuthHandlerApi"; diff --git a/packages/imperative/src/imperative/config/ConfigManagementFacility.ts b/packages/imperative/src/imperative/config/ConfigManagementFacility.ts index 0105a9713e..d3325bf1e3 100644 --- a/packages/imperative/src/imperative/config/ConfigManagementFacility.ts +++ b/packages/imperative/src/imperative/config/ConfigManagementFacility.ts @@ -10,7 +10,7 @@ */ import { UpdateImpConfig } from "../UpdateImpConfig"; -import { Logger } from "../../../src/logger"; +import { Logger } from "../../logger"; import { listDefinition } from "./cmd/list/list.definition"; import { initDefinition } from "./cmd/init/init.definition"; import { schemaDefinition } from "./cmd/schema/schema.definition"; diff --git a/packages/imperative/src/imperative/config/cmd/auto-init/AutoInitConstants.ts b/packages/imperative/src/imperative/config/cmd/auto-init/AutoInitConstants.ts index 81b580613d..b07a66bf39 100644 --- a/packages/imperative/src/imperative/config/cmd/auto-init/AutoInitConstants.ts +++ b/packages/imperative/src/imperative/config/cmd/auto-init/AutoInitConstants.ts @@ -9,7 +9,7 @@ * */ -import { ICommandOptionDefinition } from "../../../../../src/cmd"; +import { ICommandOptionDefinition } from "../../../../cmd"; export class AutoInitConstants { public static AUTO_INIT_OPTION_GROUP = "Automatic Config Initialization Options"; diff --git a/packages/imperative/src/imperative/config/cmd/auto-init/builders/AutoInitCommandBuilder.ts b/packages/imperative/src/imperative/config/cmd/auto-init/builders/AutoInitCommandBuilder.ts index a29d127df8..a52135bcde 100644 --- a/packages/imperative/src/imperative/config/cmd/auto-init/builders/AutoInitCommandBuilder.ts +++ b/packages/imperative/src/imperative/config/cmd/auto-init/builders/AutoInitCommandBuilder.ts @@ -9,14 +9,14 @@ * */ -import { AbstractCommandBuilder } from "../../../../../../src/cmd/builders/AbstractCommandBuilder"; -import { ICommandDefinition } from "../../../../../../src/cmd"; -import { Logger } from "../../../../../../src/logger"; -import { ICommandProfileAutoInitConfig } from "../../../../../../src/cmd/doc/profiles/definition/ICommandProfileAutoInitConfig"; -import { ImperativeError } from "../../../../../../src/error"; -import { TextUtils } from "../../../../../../src/utilities/TextUtils"; -import { autoInitCommandDesc, autoInitCommandSummary } from "../../../../../../src/messages"; -import { Constants } from "../../../../../../src/constants"; +import { AbstractCommandBuilder } from "../../../../../cmd/builders/AbstractCommandBuilder"; +import { ICommandDefinition } from "../../../../../cmd"; +import { Logger } from "../../../../../logger"; +import { ICommandProfileAutoInitConfig } from "../../../../../cmd/doc/profiles/definition/ICommandProfileAutoInitConfig"; +import { ImperativeError } from "../../../../../error"; +import { TextUtils } from "../../../../../utilities/TextUtils"; +import { autoInitCommandDesc, autoInitCommandSummary } from "../../../../../messages"; +import { Constants } from "../../../../../constants"; import { AutoInitConstants } from "../AutoInitConstants"; /** diff --git a/packages/imperative/src/imperative/config/cmd/auto-init/builders/CompleteAutoInitCommandBuilder.ts b/packages/imperative/src/imperative/config/cmd/auto-init/builders/CompleteAutoInitCommandBuilder.ts index 754ecca5aa..a1c4001f18 100644 --- a/packages/imperative/src/imperative/config/cmd/auto-init/builders/CompleteAutoInitCommandBuilder.ts +++ b/packages/imperative/src/imperative/config/cmd/auto-init/builders/CompleteAutoInitCommandBuilder.ts @@ -9,10 +9,10 @@ * */ -import { ICommandDefinition } from "../../../../../../src/cmd"; +import { ICommandDefinition } from "../../../../../cmd"; import { AutoInitCommandBuilder } from "./AutoInitCommandBuilder"; -import { Logger } from "../../../../../../src/logger/index"; -import { ICommandProfileAutoInitConfig } from "../../../../../../src/cmd/doc/profiles/definition/ICommandProfileAutoInitConfig"; +import { Logger } from "../../../../../logger/index"; +import { ICommandProfileAutoInitConfig } from "../../../../../cmd/doc/profiles/definition/ICommandProfileAutoInitConfig"; /** * Generate a complete command for automatic initialization of a user configuration diff --git a/packages/imperative/src/imperative/config/cmd/auto-init/handlers/BaseAutoInitHandler.ts b/packages/imperative/src/imperative/config/cmd/auto-init/handlers/BaseAutoInitHandler.ts index cccc1c2858..f29c558f78 100644 --- a/packages/imperative/src/imperative/config/cmd/auto-init/handlers/BaseAutoInitHandler.ts +++ b/packages/imperative/src/imperative/config/cmd/auto-init/handlers/BaseAutoInitHandler.ts @@ -9,15 +9,15 @@ * */ -import { ICommandHandler, IHandlerParameters, ICommandArguments, IHandlerResponseApi } from "../../../../../../src/cmd"; -import { ISession, ConnectionPropsForSessCfg, Session, AbstractSession } from "../../../../../../src/rest"; -import { ConfigConstants, ConfigSchema, IConfig } from "../../../../../../src/config"; +import { ICommandHandler, IHandlerParameters, ICommandArguments, IHandlerResponseApi } from "../../../../../cmd"; +import { ISession, ConnectionPropsForSessCfg, Session, AbstractSession } from "../../../../../rest"; +import { ConfigConstants, ConfigSchema, IConfig } from "../../../../../config"; import { diff } from "jest-diff"; import * as JSONC from "comment-json"; import * as lodash from "lodash"; -import { ImperativeConfig } from "../../../../../../src/utilities/ImperativeConfig"; -import { ProcessUtils } from "../../../../../../src/utilities/ProcessUtils"; -import { TextUtils } from "../../../../../../src/utilities/TextUtils"; +import { ImperativeConfig } from "../../../../../utilities/ImperativeConfig"; +import { ProcessUtils } from "../../../../../utilities/ProcessUtils"; +import { TextUtils } from "../../../../../utilities/TextUtils"; import { OverridesLoader } from "../../../../OverridesLoader"; import stripAnsi = require("strip-ansi"); diff --git a/packages/imperative/src/imperative/config/cmd/convert-profiles/convert-profiles.definition.ts b/packages/imperative/src/imperative/config/cmd/convert-profiles/convert-profiles.definition.ts index 71222d9918..99912335f3 100644 --- a/packages/imperative/src/imperative/config/cmd/convert-profiles/convert-profiles.definition.ts +++ b/packages/imperative/src/imperative/config/cmd/convert-profiles/convert-profiles.definition.ts @@ -10,8 +10,8 @@ */ import { join } from "path"; -import { ICommandDefinition } from "../../../../../src/cmd"; -import { ImperativeConfig } from "../../../../../src/utilities"; +import { ICommandDefinition } from "../../../../cmd"; +import { ImperativeConfig } from "../../../../utilities"; /** * Definition of the convert-profiles command. diff --git a/packages/imperative/src/imperative/config/cmd/convert-profiles/convert-profiles.handler.ts b/packages/imperative/src/imperative/config/cmd/convert-profiles/convert-profiles.handler.ts index 7ea5aa8a72..1e8fc3db48 100644 --- a/packages/imperative/src/imperative/config/cmd/convert-profiles/convert-profiles.handler.ts +++ b/packages/imperative/src/imperative/config/cmd/convert-profiles/convert-profiles.handler.ts @@ -13,11 +13,11 @@ import * as fs from "fs"; import { removeSync } from "fs-extra"; import * as path from "path"; import { keyring as keytar } from "@zowe/secrets-for-zowe-sdk"; -import { ICommandHandler, IHandlerParameters } from "../../../../../src/cmd"; -import { ConfigBuilder, ConfigSchema } from "../../../../../src/config"; -import { ProfileIO, ProfileUtils } from "../../../../../src/profiles"; -import { ImperativeConfig } from "../../../../../src/utilities/ImperativeConfig"; -import { AppSettings } from "../../../../../src/settings"; +import { ICommandHandler, IHandlerParameters } from "../../../../cmd"; +import { ConfigBuilder, ConfigSchema } from "../../../../config"; +import { ProfileIO, ProfileUtils } from "../../../../profiles"; +import { ImperativeConfig } from "../../../../utilities/ImperativeConfig"; +import { AppSettings } from "../../../../settings"; import { PluginIssues } from "../../../plugins/utilities/PluginIssues"; import { uninstall as uninstallPlugin } from "../../../plugins/utilities/npm-interface"; import { OverridesLoader } from "../../../OverridesLoader"; diff --git a/packages/imperative/src/imperative/config/cmd/edit/edit.definition.ts b/packages/imperative/src/imperative/config/cmd/edit/edit.definition.ts index f208401e8b..ba0c03b1e2 100644 --- a/packages/imperative/src/imperative/config/cmd/edit/edit.definition.ts +++ b/packages/imperative/src/imperative/config/cmd/edit/edit.definition.ts @@ -9,7 +9,7 @@ * */ -import { ICommandDefinition } from "../../../../../src/cmd"; +import { ICommandDefinition } from "../../../../cmd"; import { join } from "path"; /** diff --git a/packages/imperative/src/imperative/config/cmd/edit/edit.handler.ts b/packages/imperative/src/imperative/config/cmd/edit/edit.handler.ts index 36767e94ab..9aa441bfc4 100644 --- a/packages/imperative/src/imperative/config/cmd/edit/edit.handler.ts +++ b/packages/imperative/src/imperative/config/cmd/edit/edit.handler.ts @@ -9,9 +9,9 @@ * */ -import { ICommandHandler, IHandlerParameters } from "../../../../../src/cmd"; -import { ProcessUtils } from "../../../../../src/utilities/ProcessUtils"; -import { ImperativeConfig } from "../../../../../src/utilities/ImperativeConfig"; +import { ICommandHandler, IHandlerParameters } from "../../../../cmd"; +import { ProcessUtils } from "../../../../utilities/ProcessUtils"; +import { ImperativeConfig } from "../../../../utilities/ImperativeConfig"; /** * Edit config diff --git a/packages/imperative/src/imperative/config/cmd/import/import.definition.ts b/packages/imperative/src/imperative/config/cmd/import/import.definition.ts index e71787b054..f9c0f53a3a 100644 --- a/packages/imperative/src/imperative/config/cmd/import/import.definition.ts +++ b/packages/imperative/src/imperative/config/cmd/import/import.definition.ts @@ -10,7 +10,7 @@ */ import { join } from "path"; -import { ICommandDefinition } from "../../../../../src/cmd"; +import { ICommandDefinition } from "../../../../cmd"; const CONNECTION_OPTION_GROUP = "Connection Options"; diff --git a/packages/imperative/src/imperative/config/cmd/import/import.handler.ts b/packages/imperative/src/imperative/config/cmd/import/import.handler.ts index c5ac2c71ff..f07393e4d2 100644 --- a/packages/imperative/src/imperative/config/cmd/import/import.handler.ts +++ b/packages/imperative/src/imperative/config/cmd/import/import.handler.ts @@ -13,12 +13,12 @@ import * as fs from "fs"; import * as path from "path"; import { fileURLToPath, pathToFileURL, URL } from "url"; import * as JSONC from "comment-json"; -import { ICommandHandler, IHandlerParameters } from "../../../../../src/cmd"; -import { ImperativeError } from "../../../../../src/error"; -import { ImperativeConfig } from "../../../../../src/utilities/ImperativeConfig"; -import { TextUtils } from "../../../../../src/utilities/TextUtils"; -import { IConfig } from "../../../../../src/config"; -import { RestClient, Session, SessConstants } from "../../../../../src/rest"; +import { ICommandHandler, IHandlerParameters } from "../../../../cmd"; +import { ImperativeError } from "../../../../error"; +import { ImperativeConfig } from "../../../../utilities/ImperativeConfig"; +import { TextUtils } from "../../../../utilities/TextUtils"; +import { IConfig } from "../../../../config"; +import { RestClient, Session, SessConstants } from "../../../../rest"; /** * Import config diff --git a/packages/imperative/src/imperative/config/cmd/init/init.definition.ts b/packages/imperative/src/imperative/config/cmd/init/init.definition.ts index 4ccafab58e..301228f2df 100644 --- a/packages/imperative/src/imperative/config/cmd/init/init.definition.ts +++ b/packages/imperative/src/imperative/config/cmd/init/init.definition.ts @@ -9,9 +9,9 @@ * */ -import { ICommandDefinition } from "../../../../../src/cmd"; +import { ICommandDefinition } from "../../../../cmd"; import { join } from "path"; -import { ImperativeConfig } from "../../../../../src/utilities/ImperativeConfig"; +import { ImperativeConfig } from "../../../../utilities/ImperativeConfig"; /** * Definition of the init command. diff --git a/packages/imperative/src/imperative/config/cmd/init/init.handler.ts b/packages/imperative/src/imperative/config/cmd/init/init.handler.ts index 9646c7dfbf..d3236dbd6a 100644 --- a/packages/imperative/src/imperative/config/cmd/init/init.handler.ts +++ b/packages/imperative/src/imperative/config/cmd/init/init.handler.ts @@ -9,15 +9,15 @@ * */ -import { ICommandHandler, IHandlerParameters } from "../../../../../src/cmd"; -import { ImperativeConfig } from "../../../../../src/utilities/ImperativeConfig"; -import { ProcessUtils } from "../../../../../src/utilities/ProcessUtils"; -import { TextUtils } from "../../../../../src/utilities/TextUtils"; -import { Config, ConfigConstants, ConfigSchema, IConfig } from "../../../../../src/config"; -import { IProfileProperty } from "../../../../../src/profiles"; -import { ConfigBuilder } from "../../../../../src/config/ConfigBuilder"; -import { IConfigBuilderOpts } from "../../../../../src/config/doc/IConfigBuilderOpts"; -import { coercePropValue, secureSaveError } from "../../../../../src/config/ConfigUtils"; +import { ICommandHandler, IHandlerParameters } from "../../../../cmd"; +import { ImperativeConfig } from "../../../../utilities/ImperativeConfig"; +import { ProcessUtils } from "../../../../utilities/ProcessUtils"; +import { TextUtils } from "../../../../utilities/TextUtils"; +import { Config, ConfigConstants, ConfigSchema, IConfig } from "../../../../config"; +import { IProfileProperty } from "../../../../profiles"; +import { ConfigBuilder } from "../../../../config/ConfigBuilder"; +import { IConfigBuilderOpts } from "../../../../config/doc/IConfigBuilderOpts"; +import { coercePropValue, secureSaveError } from "../../../../config/ConfigUtils"; import { OverridesLoader } from "../../../OverridesLoader"; import * as JSONC from "comment-json"; import * as lodash from "lodash"; @@ -25,7 +25,6 @@ import { diff } from "jest-diff"; import stripAnsi = require("strip-ansi"); - /** * Init config */ diff --git a/packages/imperative/src/imperative/config/cmd/list/list.definition.ts b/packages/imperative/src/imperative/config/cmd/list/list.definition.ts index 02a378fd0a..dd6de40f41 100644 --- a/packages/imperative/src/imperative/config/cmd/list/list.definition.ts +++ b/packages/imperative/src/imperative/config/cmd/list/list.definition.ts @@ -10,7 +10,7 @@ */ import { join } from "path"; -import { ICommandDefinition } from "../../../../../src/cmd"; +import { ICommandDefinition } from "../../../../cmd"; export const listDefinition: ICommandDefinition = { name: "list", diff --git a/packages/imperative/src/imperative/config/cmd/list/list.handler.ts b/packages/imperative/src/imperative/config/cmd/list/list.handler.ts index 6a9eeae75c..ca0e87f1de 100644 --- a/packages/imperative/src/imperative/config/cmd/list/list.handler.ts +++ b/packages/imperative/src/imperative/config/cmd/list/list.handler.ts @@ -10,9 +10,9 @@ */ import * as lodash from "lodash"; -import { ICommandHandler, IHandlerParameters } from "../../../../../src/cmd"; -import { ConfigConstants } from "../../../../../src/config"; -import { ImperativeConfig } from "../../../../../src/utilities"; +import { ICommandHandler, IHandlerParameters } from "../../../../cmd"; +import { ConfigConstants } from "../../../../config"; +import { ImperativeConfig } from "../../../../utilities"; export default class ListHandler implements ICommandHandler { /** diff --git a/packages/imperative/src/imperative/config/cmd/profiles/profiles.definition.ts b/packages/imperative/src/imperative/config/cmd/profiles/profiles.definition.ts index bbfb62fa00..e03fb94467 100644 --- a/packages/imperative/src/imperative/config/cmd/profiles/profiles.definition.ts +++ b/packages/imperative/src/imperative/config/cmd/profiles/profiles.definition.ts @@ -9,7 +9,7 @@ * */ -import { ICommandDefinition } from "../../../../../src/cmd"; +import { ICommandDefinition } from "../../../../cmd"; import { join } from "path"; /** diff --git a/packages/imperative/src/imperative/config/cmd/profiles/profiles.handler.ts b/packages/imperative/src/imperative/config/cmd/profiles/profiles.handler.ts index 582d46b41d..b6a7f23e22 100644 --- a/packages/imperative/src/imperative/config/cmd/profiles/profiles.handler.ts +++ b/packages/imperative/src/imperative/config/cmd/profiles/profiles.handler.ts @@ -9,9 +9,9 @@ * */ -import { ICommandHandler, IHandlerParameters } from "../../../../../src/cmd"; -import { IConfigProfile } from "../../../../../src/config"; -import { ImperativeConfig } from "../../../../../src/utilities"; +import { ICommandHandler, IHandlerParameters } from "../../../../cmd"; +import { IConfigProfile } from "../../../../config"; +import { ImperativeConfig } from "../../../../utilities"; /** * The get command group handler for cli configuration settings. diff --git a/packages/imperative/src/imperative/config/cmd/report-env/EnvQuery.ts b/packages/imperative/src/imperative/config/cmd/report-env/EnvQuery.ts index 5502edf0af..f66a5b1489 100644 --- a/packages/imperative/src/imperative/config/cmd/report-env/EnvQuery.ts +++ b/packages/imperative/src/imperative/config/cmd/report-env/EnvQuery.ts @@ -16,12 +16,12 @@ import * as path from "path"; import * as spawn from "cross-spawn"; import { StdioOptions } from "child_process"; -import { ConfigConstants, IConfigProfile } from "../../../../../src/config"; -import { IHandlerProgressApi } from "../../../../../src/cmd"; -import { IO } from "../../../../../src/io"; -import { ImperativeConfig , TextUtils } from "../../../../../src/utilities"; -import { ITaskWithStatus, TaskProgress, TaskStage } from "../../../../../src/operations"; -import { CliUtils } from "../../../../../src/utilities/CliUtils"; +import { ConfigConstants, IConfigProfile } from "../../../../config"; +import { IHandlerProgressApi } from "../../../../cmd"; +import { IO } from "../../../../io"; +import { ImperativeConfig , TextUtils } from "../../../../utilities"; +import { ITaskWithStatus, TaskProgress, TaskStage } from "../../../../operations"; +import { CliUtils } from "../../../../utilities/CliUtils"; import { IPluginJson } from "../../../plugins/doc/IPluginJson"; import { PluginIssues } from "../../../plugins/utilities/PluginIssues"; diff --git a/packages/imperative/src/imperative/config/cmd/report-env/Report-env.definition.ts b/packages/imperative/src/imperative/config/cmd/report-env/Report-env.definition.ts index 66c9c9f5e7..5c74932ccc 100644 --- a/packages/imperative/src/imperative/config/cmd/report-env/Report-env.definition.ts +++ b/packages/imperative/src/imperative/config/cmd/report-env/Report-env.definition.ts @@ -10,7 +10,7 @@ */ import { join } from "path"; -import { ICommandDefinition } from "../../../../../src/cmd"; +import { ICommandDefinition } from "../../../../cmd"; /** * Definition for the 'config report-env' command. diff --git a/packages/imperative/src/imperative/config/cmd/report-env/Report-env.handler.ts b/packages/imperative/src/imperative/config/cmd/report-env/Report-env.handler.ts index 160616cea6..f8b23e7160 100644 --- a/packages/imperative/src/imperative/config/cmd/report-env/Report-env.handler.ts +++ b/packages/imperative/src/imperative/config/cmd/report-env/Report-env.handler.ts @@ -9,10 +9,10 @@ * */ -import { ICommandHandler, IHandlerParameters, IHandlerResponseApi } from "../../../../../src/cmd"; +import { ICommandHandler, IHandlerParameters, IHandlerResponseApi } from "../../../../cmd"; import { ItemId } from "./EnvItems"; import { EnvQuery, IGetItemOpts } from "./EnvQuery"; -import { TextUtils } from "../../../../../src/utilities/TextUtils"; +import { TextUtils } from "../../../../utilities/TextUtils"; /** * Handler to report a user's wroking environment. diff --git a/packages/imperative/src/imperative/config/cmd/schema/schema.definition.ts b/packages/imperative/src/imperative/config/cmd/schema/schema.definition.ts index 26cf6e71f6..081f7071dd 100644 --- a/packages/imperative/src/imperative/config/cmd/schema/schema.definition.ts +++ b/packages/imperative/src/imperative/config/cmd/schema/schema.definition.ts @@ -9,7 +9,7 @@ * */ -import { ICommandDefinition } from "../../../../../src/cmd"; +import { ICommandDefinition } from "../../../../cmd"; import { join } from "path"; /** diff --git a/packages/imperative/src/imperative/config/cmd/schema/schema.handler.ts b/packages/imperative/src/imperative/config/cmd/schema/schema.handler.ts index c540fcd619..962ba138f3 100644 --- a/packages/imperative/src/imperative/config/cmd/schema/schema.handler.ts +++ b/packages/imperative/src/imperative/config/cmd/schema/schema.handler.ts @@ -9,9 +9,9 @@ * */ -import { ICommandHandler, ICommandProfileTypeConfiguration, IHandlerParameters } from "../../../../../src/cmd"; -import { ConfigConstants, ConfigSchema } from "../../../../../src/config"; -import { ImperativeConfig } from "../../../../../src/utilities"; +import { ICommandHandler, ICommandProfileTypeConfiguration, IHandlerParameters } from "../../../../cmd"; +import { ConfigConstants, ConfigSchema } from "../../../../config"; +import { ImperativeConfig } from "../../../../utilities"; /** * The get command group handler for cli configuration settings. diff --git a/packages/imperative/src/imperative/config/cmd/secure/secure.definition.ts b/packages/imperative/src/imperative/config/cmd/secure/secure.definition.ts index f962fcc8e1..01ad89e4c1 100644 --- a/packages/imperative/src/imperative/config/cmd/secure/secure.definition.ts +++ b/packages/imperative/src/imperative/config/cmd/secure/secure.definition.ts @@ -9,7 +9,7 @@ * */ -import { ICommandDefinition } from "../../../../../src/cmd"; +import { ICommandDefinition } from "../../../../cmd"; import { join } from "path"; export const secureDefinition: ICommandDefinition = { diff --git a/packages/imperative/src/imperative/config/cmd/secure/secure.handler.ts b/packages/imperative/src/imperative/config/cmd/secure/secure.handler.ts index c5ceb0a98a..15093cc428 100644 --- a/packages/imperative/src/imperative/config/cmd/secure/secure.handler.ts +++ b/packages/imperative/src/imperative/config/cmd/secure/secure.handler.ts @@ -9,13 +9,13 @@ * */ -import { ICommandArguments, ICommandHandler, IHandlerParameters } from "../../../../../src/cmd"; -import { Config, ConfigAutoStore, ConfigConstants, ConfigSchema } from "../../../../../src/config"; -import { coercePropValue, secureSaveError } from "../../../../../src/config/ConfigUtils"; -import { ImperativeError } from "../../../../../src/error"; -import { Logger } from "../../../../../src/logger"; -import { ConnectionPropsForSessCfg, ISession, Session } from "../../../../../src/rest"; -import { ImperativeConfig } from "../../../../../src/utilities"; +import { ICommandArguments, ICommandHandler, IHandlerParameters } from "../../../../cmd"; +import { Config, ConfigAutoStore, ConfigConstants, ConfigSchema } from "../../../../config"; +import { coercePropValue, secureSaveError } from "../../../../config/ConfigUtils"; +import { ImperativeError } from "../../../../error"; +import { Logger } from "../../../../logger"; +import { ConnectionPropsForSessCfg, ISession, Session } from "../../../../rest"; +import { ImperativeConfig } from "../../../../utilities"; export default class SecureHandler implements ICommandHandler { /** diff --git a/packages/imperative/src/imperative/config/cmd/set/set.definition.ts b/packages/imperative/src/imperative/config/cmd/set/set.definition.ts index f12f863b5b..52e8fd7440 100644 --- a/packages/imperative/src/imperative/config/cmd/set/set.definition.ts +++ b/packages/imperative/src/imperative/config/cmd/set/set.definition.ts @@ -9,7 +9,7 @@ * */ -import { ICommandDefinition } from "../../../../../src/cmd"; +import { ICommandDefinition } from "../../../../cmd"; import { join } from "path"; export const setDefinition: ICommandDefinition = { diff --git a/packages/imperative/src/imperative/config/cmd/set/set.handler.ts b/packages/imperative/src/imperative/config/cmd/set/set.handler.ts index 2419e72b1f..6eda91772c 100644 --- a/packages/imperative/src/imperative/config/cmd/set/set.handler.ts +++ b/packages/imperative/src/imperative/config/cmd/set/set.handler.ts @@ -10,11 +10,11 @@ */ import * as JSONC from "comment-json"; -import { ICommandHandler, IHandlerParameters } from "../../../../../src/cmd"; -import { ConfigSchema } from "../../../../../src/config"; -import { coercePropValue, secureSaveError } from "../../../../../src/config/ConfigUtils"; -import { ImperativeError } from "../../../../../src/error"; -import { ImperativeConfig } from "../../../../../src/utilities"; +import { ICommandHandler, IHandlerParameters } from "../../../../cmd"; +import { ConfigSchema } from "../../../../config"; +import { coercePropValue, secureSaveError } from "../../../../config/ConfigUtils"; +import { ImperativeError } from "../../../../error"; +import { ImperativeConfig } from "../../../../utilities"; export default class SetHandler implements ICommandHandler { diff --git a/packages/imperative/src/imperative/config/cmd/update-schemas/update-schemas.definition.ts b/packages/imperative/src/imperative/config/cmd/update-schemas/update-schemas.definition.ts index 8ff4b1bd30..4a481df97d 100644 --- a/packages/imperative/src/imperative/config/cmd/update-schemas/update-schemas.definition.ts +++ b/packages/imperative/src/imperative/config/cmd/update-schemas/update-schemas.definition.ts @@ -10,7 +10,7 @@ */ import { join } from "path"; -import { ICommandDefinition } from "../../../../../src/cmd"; +import { ICommandDefinition } from "../../../../cmd"; export const updateSchemasDefinition: ICommandDefinition = { name: "update-schemas", diff --git a/packages/imperative/src/imperative/config/cmd/update-schemas/update-schemas.handler.ts b/packages/imperative/src/imperative/config/cmd/update-schemas/update-schemas.handler.ts index d42b027568..ae701d8887 100644 --- a/packages/imperative/src/imperative/config/cmd/update-schemas/update-schemas.handler.ts +++ b/packages/imperative/src/imperative/config/cmd/update-schemas/update-schemas.handler.ts @@ -9,11 +9,11 @@ * */ -import { ICommandHandler, IHandlerParameters } from "../../../../../src/cmd"; -import { ConfigSchema } from "../../../../../src/config/ConfigSchema"; -import { ImperativeExpect } from "../../../../../src/expect/ImperativeExpect"; -import { ImperativeConfig } from "../../../../../src/utilities/ImperativeConfig"; -import { TextUtils } from "../../../../../src/utilities/TextUtils"; +import { ICommandHandler, IHandlerParameters } from "../../../../cmd"; +import { ConfigSchema } from "../../../../config/ConfigSchema"; +import { ImperativeExpect } from "../../../../expect/ImperativeExpect"; +import { ImperativeConfig } from "../../../../utilities/ImperativeConfig"; +import { TextUtils } from "../../../../utilities/TextUtils"; export default class UpdateSchemasHandler implements ICommandHandler { /** diff --git a/packages/imperative/src/imperative/doc/IDaemonContext.ts b/packages/imperative/src/imperative/doc/IDaemonContext.ts index 82b76cc0e4..462cb02d43 100644 --- a/packages/imperative/src/imperative/doc/IDaemonContext.ts +++ b/packages/imperative/src/imperative/doc/IDaemonContext.ts @@ -11,7 +11,7 @@ import * as net from "net"; import * as stream from "stream"; -import { IDaemonResponse } from "../../../src/utilities"; +import { IDaemonResponse } from "../../utilities"; /** * Allow for passing our own "context" / user data to the Imperative parser diff --git a/packages/imperative/src/imperative/doc/IImperativeAuthGroupConfig.ts b/packages/imperative/src/imperative/doc/IImperativeAuthGroupConfig.ts index 85450662c7..c92dbb10ac 100644 --- a/packages/imperative/src/imperative/doc/IImperativeAuthGroupConfig.ts +++ b/packages/imperative/src/imperative/doc/IImperativeAuthGroupConfig.ts @@ -9,7 +9,7 @@ * */ -import { IPartialCommandDefinition } from "../../../src/cmd"; +import { IPartialCommandDefinition } from "../../cmd"; export interface IImperativeAuthGroupConfig { /** diff --git a/packages/imperative/src/imperative/doc/IImperativeConfig.ts b/packages/imperative/src/imperative/doc/IImperativeConfig.ts index bc91076268..a93ca23786 100644 --- a/packages/imperative/src/imperative/doc/IImperativeConfig.ts +++ b/packages/imperative/src/imperative/doc/IImperativeConfig.ts @@ -9,12 +9,12 @@ * */ -import { ICommandDefinition, ICommandProfileTypeConfiguration } from "../../../src/cmd"; +import { ICommandDefinition, ICommandProfileTypeConfiguration } from "../../cmd"; import { IImperativeLogsConfig } from "./IImperativeLogsConfig"; import { IImperativeOverrides } from "./IImperativeOverrides"; import { IImperativeAuthGroupConfig } from "./IImperativeAuthGroupConfig"; import { IApimlSvcAttrs } from "./IApimlSvcAttrs"; -import { ICommandProfileAutoInitConfig } from "../../../src/cmd/doc/profiles/definition/ICommandProfileAutoInitConfig"; +import { ICommandProfileAutoInitConfig } from "../../cmd/doc/profiles/definition/ICommandProfileAutoInitConfig"; /** * All of the configuration required to set up your Imperative CLI app diff --git a/packages/imperative/src/imperative/doc/IImperativeLogsConfig.ts b/packages/imperative/src/imperative/doc/IImperativeLogsConfig.ts index eb670e310b..76501010c6 100644 --- a/packages/imperative/src/imperative/doc/IImperativeLogsConfig.ts +++ b/packages/imperative/src/imperative/doc/IImperativeLogsConfig.ts @@ -9,7 +9,7 @@ * */ -import { IImperativeLoggingConfig } from "../../../src/index"; +import { IImperativeLoggingConfig } from "../../index"; export interface IImperativeLogsConfig { diff --git a/packages/imperative/src/imperative/doc/IImperativeOverrides.ts b/packages/imperative/src/imperative/doc/IImperativeOverrides.ts index dde04dbcd2..26894d2be8 100644 --- a/packages/imperative/src/imperative/doc/IImperativeOverrides.ts +++ b/packages/imperative/src/imperative/doc/IImperativeOverrides.ts @@ -32,8 +32,8 @@ * strings and undefined values. */ -import { ICredentialManagerConstructor } from "../../../src/security"; -import { IConstructor } from "../../../src/interfaces"; +import { ICredentialManagerConstructor } from "../../security"; +import { IConstructor } from "../../interfaces"; /** * Type of the {@link ImperativeOverrides} interface. This ensures that all diff --git a/packages/imperative/src/imperative/env/EnvironmentalVariableSettings.ts b/packages/imperative/src/imperative/env/EnvironmentalVariableSettings.ts index be7d3cad09..b6453b87c6 100644 --- a/packages/imperative/src/imperative/env/EnvironmentalVariableSettings.ts +++ b/packages/imperative/src/imperative/env/EnvironmentalVariableSettings.ts @@ -10,8 +10,8 @@ */ import { IImperativeEnvironmentalVariableSettings } from "../doc/IImperativeEnvironmentalVariableSettings"; -import { ImperativeExpect } from "../../../src/expect"; -import { Constants } from "../../../src/constants/Constants"; +import { ImperativeExpect } from "../../expect"; +import { Constants } from "../../constants/Constants"; /** * Service for reading environmental variable settings diff --git a/packages/imperative/src/imperative/handlers/DefaultRootCommandHandler.ts b/packages/imperative/src/imperative/handlers/DefaultRootCommandHandler.ts index 76dc66ad44..0045404425 100644 --- a/packages/imperative/src/imperative/handlers/DefaultRootCommandHandler.ts +++ b/packages/imperative/src/imperative/handlers/DefaultRootCommandHandler.ts @@ -9,10 +9,10 @@ * */ -import { Imperative } from "../../../src/imperative/Imperative"; -import { ICommandHandler, IHandlerParameters, ICommandTreeEntry, CommandUtils } from "../../../src/cmd"; -import { ImperativeConfig, TextUtils } from "../../../src/utilities"; -import { WebHelpManager } from "../../../src/cmd/help/WebHelpManager"; +import { Imperative } from "../../imperative/Imperative"; +import { ICommandHandler, IHandlerParameters, ICommandTreeEntry, CommandUtils } from "../../cmd"; +import { ImperativeConfig, TextUtils } from "../../utilities"; +import { WebHelpManager } from "../../cmd/help/WebHelpManager"; /** * The default command handler for the top level/root command * Allows the user to check the version of the package. diff --git a/packages/imperative/src/imperative/help/ImperativeHelpGeneratorFactory.ts b/packages/imperative/src/imperative/help/ImperativeHelpGeneratorFactory.ts index 6f16df62ea..e081d99a17 100644 --- a/packages/imperative/src/imperative/help/ImperativeHelpGeneratorFactory.ts +++ b/packages/imperative/src/imperative/help/ImperativeHelpGeneratorFactory.ts @@ -13,7 +13,7 @@ import { isNullOrUndefined } from "util"; import { IHelpGenerator, HelpGeneratorFactory, IHelpGeneratorParms, - AbstractHelpGeneratorFactory } from "../../../src/cmd"; + AbstractHelpGeneratorFactory } from "../../cmd"; import { IImperativeConfig } from "../doc/IImperativeConfig"; /** * Imperative Help generator factory passed to yargs to build help generators where needed. diff --git a/packages/imperative/src/imperative/plugins/PluginManagementFacility.ts b/packages/imperative/src/imperative/plugins/PluginManagementFacility.ts index 85814d0410..7cc49daf92 100644 --- a/packages/imperative/src/imperative/plugins/PluginManagementFacility.ts +++ b/packages/imperative/src/imperative/plugins/PluginManagementFacility.ts @@ -9,24 +9,24 @@ * */ -import { IImperativeConfig } from "../../../src/imperative/doc/IImperativeConfig"; -import { UpdateImpConfig } from "../../../src/imperative/UpdateImpConfig"; +import { IImperativeConfig } from "../../imperative/doc/IImperativeConfig"; +import { UpdateImpConfig } from "../../imperative/UpdateImpConfig"; import { isAbsolute, join } from "path"; -import { ImperativeConfig, JsUtils } from "../../../src/utilities"; -import { Logger } from "../../../src/logger"; +import { ImperativeConfig, JsUtils } from "../../utilities"; +import { Logger } from "../../logger"; import { existsSync } from "fs"; import { PMFConstants } from "./utilities/PMFConstants"; import { readFileSync, writeFileSync } from "jsonfile"; import { IPluginCfgProps } from "./doc/IPluginCfgProps"; -import { ICommandDefinition, ICommandProfileTypeConfiguration } from "../../../src/cmd"; +import { ICommandDefinition, ICommandProfileTypeConfiguration } from "../../cmd"; import { IssueSeverity, PluginIssues } from "./utilities/PluginIssues"; import { ConfigurationValidator } from "../ConfigurationValidator"; import { ConfigurationLoader } from "../ConfigurationLoader"; import { DefinitionTreeResolver } from "../DefinitionTreeResolver"; import { IImperativeOverrides } from "../doc/IImperativeOverrides"; -import { AppSettings } from "../../../src/settings"; -import { IO } from "../../../src/io"; -import { CredentialManagerOverride, ICredentialManagerNameMap } from "../../../src/security"; +import { AppSettings } from "../../settings"; +import { IO } from "../../io"; +import { CredentialManagerOverride, ICredentialManagerNameMap } from "../../security"; /** * This class is the main engine for the Plugin Management Facility. The diff --git a/packages/imperative/src/imperative/plugins/PluginRequireProvider.ts b/packages/imperative/src/imperative/plugins/PluginRequireProvider.ts index a4ed2a2918..93a93f9caa 100644 --- a/packages/imperative/src/imperative/plugins/PluginRequireProvider.ts +++ b/packages/imperative/src/imperative/plugins/PluginRequireProvider.ts @@ -11,7 +11,7 @@ import Module = require("module"); -import { ImperativeConfig } from "../../../src/utilities"; +import { ImperativeConfig } from "../../utilities"; import * as path from "path"; import * as findUp from "find-up"; import * as lodash from "lodash"; diff --git a/packages/imperative/src/imperative/plugins/cmd/install/install.definition.ts b/packages/imperative/src/imperative/plugins/cmd/install/install.definition.ts index 0a59685470..d92770b5ad 100644 --- a/packages/imperative/src/imperative/plugins/cmd/install/install.definition.ts +++ b/packages/imperative/src/imperative/plugins/cmd/install/install.definition.ts @@ -9,10 +9,10 @@ * */ -import { ICommandDefinition } from "../../../../../src/cmd"; +import { ICommandDefinition } from "../../../../cmd"; import { join } from "path"; import { PMFConstants } from "../../utilities/PMFConstants"; -import { ImperativeConfig } from "../../../../../src/utilities"; +import { ImperativeConfig } from "../../../../utilities"; const cliCmdName = ImperativeConfig.instance.findPackageBinName() ? ImperativeConfig.instance.findPackageBinName() : "Your_CLI_Command_Name"; diff --git a/packages/imperative/src/imperative/plugins/cmd/install/install.handler.ts b/packages/imperative/src/imperative/plugins/cmd/install/install.handler.ts index caf4e6525d..de4507c9c1 100644 --- a/packages/imperative/src/imperative/plugins/cmd/install/install.handler.ts +++ b/packages/imperative/src/imperative/plugins/cmd/install/install.handler.ts @@ -9,16 +9,16 @@ * */ -import { ICommandHandler, IHandlerParameters } from "../../../../../src/cmd"; -import { Logger } from "../../../../../src/logger/"; +import { ICommandHandler, IHandlerParameters } from "../../../../cmd"; +import { Logger } from "../../../../logger/"; import { PMFConstants } from "../../utilities/PMFConstants"; import { resolve } from "path"; import { install } from "../../utilities/npm-interface"; import { IPluginJson } from "../../doc/IPluginJson"; import { IPluginJsonObject } from "../../doc/IPluginJsonObject"; import { readFileSync } from "jsonfile"; -import { ImperativeConfig, TextUtils } from "../../../../../src/utilities"; -import { ImperativeError } from "../../../../../src/error"; +import { ImperativeConfig, TextUtils } from "../../../../utilities"; +import { ImperativeError } from "../../../../error"; import { runValidatePlugin } from "../../utilities/runValidatePlugin"; import { getRegistry, npmLogin } from "../../utilities/NpmFunctions"; diff --git a/packages/imperative/src/imperative/plugins/cmd/list/list.definition.ts b/packages/imperative/src/imperative/plugins/cmd/list/list.definition.ts index 166a08d9d9..14fa593dfd 100644 --- a/packages/imperative/src/imperative/plugins/cmd/list/list.definition.ts +++ b/packages/imperative/src/imperative/plugins/cmd/list/list.definition.ts @@ -9,7 +9,7 @@ * */ -import { ICommandDefinition } from "../../../../../src/cmd"; +import { ICommandDefinition } from "../../../../cmd"; import { join } from "path"; /** diff --git a/packages/imperative/src/imperative/plugins/cmd/list/list.handler.ts b/packages/imperative/src/imperative/plugins/cmd/list/list.handler.ts index b001dd5fd6..46f0775a0a 100644 --- a/packages/imperative/src/imperative/plugins/cmd/list/list.handler.ts +++ b/packages/imperative/src/imperative/plugins/cmd/list/list.handler.ts @@ -9,10 +9,10 @@ * */ -import { ICommandHandler, IHandlerParameters } from "../../../../../src/cmd"; -import { Logger } from "../../../../../src/logger/"; +import { ICommandHandler, IHandlerParameters } from "../../../../cmd"; +import { Logger } from "../../../../logger/"; import { IPluginJson } from "../../doc/IPluginJson"; -import { TextUtils } from "../../../../../src/utilities"; +import { TextUtils } from "../../../../utilities"; import { PluginIssues } from "../../utilities/PluginIssues"; /** diff --git a/packages/imperative/src/imperative/plugins/cmd/showfirststeps/showfirststeps.definition.ts b/packages/imperative/src/imperative/plugins/cmd/showfirststeps/showfirststeps.definition.ts index 6263b5fe31..c039cfbf80 100644 --- a/packages/imperative/src/imperative/plugins/cmd/showfirststeps/showfirststeps.definition.ts +++ b/packages/imperative/src/imperative/plugins/cmd/showfirststeps/showfirststeps.definition.ts @@ -9,7 +9,7 @@ * */ -import { ICommandDefinition } from "../../../../../src/cmd"; +import { ICommandDefinition } from "../../../../cmd"; import { join } from "path"; const pluginDescription = diff --git a/packages/imperative/src/imperative/plugins/cmd/showfirststeps/showfirststeps.handler.ts b/packages/imperative/src/imperative/plugins/cmd/showfirststeps/showfirststeps.handler.ts index 1d003c84a5..35853862cb 100644 --- a/packages/imperative/src/imperative/plugins/cmd/showfirststeps/showfirststeps.handler.ts +++ b/packages/imperative/src/imperative/plugins/cmd/showfirststeps/showfirststeps.handler.ts @@ -9,11 +9,11 @@ * */ -import { ICommandHandler, IHandlerParameters } from "../../../../../src/cmd"; -import { Logger } from "../../../../../src/logger"; +import { ICommandHandler, IHandlerParameters } from "../../../../cmd"; +import { Logger } from "../../../../logger"; import { PMFConstants } from "../../utilities/PMFConstants"; -import { TextUtils } from "../../../../../src/utilities"; -import { ImperativeError } from "../../../../../src/error"; +import { TextUtils } from "../../../../utilities"; +import { ImperativeError } from "../../../../error"; import { PluginManagementFacility } from "../../PluginManagementFacility"; /** diff --git a/packages/imperative/src/imperative/plugins/cmd/uninstall/uninstall.definition.ts b/packages/imperative/src/imperative/plugins/cmd/uninstall/uninstall.definition.ts index f102bf8df5..80c8111042 100644 --- a/packages/imperative/src/imperative/plugins/cmd/uninstall/uninstall.definition.ts +++ b/packages/imperative/src/imperative/plugins/cmd/uninstall/uninstall.definition.ts @@ -9,7 +9,7 @@ * */ -import { ICommandDefinition } from "../../../../../src/cmd"; +import { ICommandDefinition } from "../../../../cmd"; import { join } from "path"; const pluginDescription = diff --git a/packages/imperative/src/imperative/plugins/cmd/uninstall/uninstall.handler.ts b/packages/imperative/src/imperative/plugins/cmd/uninstall/uninstall.handler.ts index 67326e01f8..8328b77a5d 100644 --- a/packages/imperative/src/imperative/plugins/cmd/uninstall/uninstall.handler.ts +++ b/packages/imperative/src/imperative/plugins/cmd/uninstall/uninstall.handler.ts @@ -9,16 +9,16 @@ * */ -import { ICommandHandler, IHandlerParameters } from "../../../../../src/cmd"; +import { ICommandHandler, IHandlerParameters } from "../../../../cmd"; import { ConfigurationLoader } from "../../../ConfigurationLoader"; -import { CredentialManagerOverride, ICredentialManagerNameMap } from "../../../../../src/security"; -import { Logger } from "../../../../../src/logger/"; +import { CredentialManagerOverride, ICredentialManagerNameMap } from "../../../../security"; +import { Logger } from "../../../../logger/"; import { PluginManagementFacility } from "../../PluginManagementFacility"; import { PMFConstants } from "../../utilities/PMFConstants"; import { uninstall } from "../../utilities/npm-interface"; import { getPackageInfo } from "../../utilities/NpmFunctions"; -import { ImperativeError } from "../../../../../src/error"; -import { TextUtils } from "../../../../../src/utilities"; +import { ImperativeError } from "../../../../error"; +import { TextUtils } from "../../../../utilities"; /** * The uninstall command handler for cli plugin install. diff --git a/packages/imperative/src/imperative/plugins/cmd/update/update.definition.ts b/packages/imperative/src/imperative/plugins/cmd/update/update.definition.ts index 97e70f1a80..a637854306 100644 --- a/packages/imperative/src/imperative/plugins/cmd/update/update.definition.ts +++ b/packages/imperative/src/imperative/plugins/cmd/update/update.definition.ts @@ -9,7 +9,7 @@ * */ -import { ICommandDefinition } from "../../../../../src/cmd"; +import { ICommandDefinition } from "../../../../cmd"; import { join } from "path"; const pluginDescription = diff --git a/packages/imperative/src/imperative/plugins/cmd/update/update.handler.ts b/packages/imperative/src/imperative/plugins/cmd/update/update.handler.ts index 4d52207827..68989063c8 100644 --- a/packages/imperative/src/imperative/plugins/cmd/update/update.handler.ts +++ b/packages/imperative/src/imperative/plugins/cmd/update/update.handler.ts @@ -9,12 +9,12 @@ * */ -import { ICommandHandler, IHandlerParameters } from "../../../../../src/cmd"; -import { Logger } from "../../../../../src/logger"; +import { ICommandHandler, IHandlerParameters } from "../../../../cmd"; +import { Logger } from "../../../../logger"; import { PMFConstants } from "../../utilities/PMFConstants"; import { update } from "../../utilities/npm-interface"; -import { ImperativeError } from "../../../../../src/error"; -import { TextUtils } from "../../../../../src/utilities"; +import { ImperativeError } from "../../../../error"; +import { TextUtils } from "../../../../utilities"; import { IPluginJson } from "../../doc/IPluginJson"; import { readFileSync, writeFileSync } from "jsonfile"; import { npmLogin } from "../../utilities/NpmFunctions"; diff --git a/packages/imperative/src/imperative/plugins/cmd/validate/validate.definition.ts b/packages/imperative/src/imperative/plugins/cmd/validate/validate.definition.ts index c2cd0076c2..d3d2cd6163 100644 --- a/packages/imperative/src/imperative/plugins/cmd/validate/validate.definition.ts +++ b/packages/imperative/src/imperative/plugins/cmd/validate/validate.definition.ts @@ -9,7 +9,7 @@ * */ -import { ICommandDefinition } from "../../../../../src/cmd"; +import { ICommandDefinition } from "../../../../cmd"; import { join } from "path"; const pluginDescription = diff --git a/packages/imperative/src/imperative/plugins/cmd/validate/validate.handler.ts b/packages/imperative/src/imperative/plugins/cmd/validate/validate.handler.ts index 73b5523aa4..2d8cf77b38 100644 --- a/packages/imperative/src/imperative/plugins/cmd/validate/validate.handler.ts +++ b/packages/imperative/src/imperative/plugins/cmd/validate/validate.handler.ts @@ -9,8 +9,8 @@ * */ -import { ICommandHandler, IHandlerParameters, IHandlerResponseApi } from "../../../../../src/cmd"; -import { TextUtils } from "../../../../../src/utilities"; +import { ICommandHandler, IHandlerParameters, IHandlerResponseApi } from "../../../../cmd"; +import { TextUtils } from "../../../../utilities"; import { IssueSeverity, PluginIssues } from "../../utilities/PluginIssues"; import { IPluginJson } from "../../doc/IPluginJson"; diff --git a/packages/imperative/src/imperative/plugins/errors/PluginRequireAlreadyCreatedError.ts b/packages/imperative/src/imperative/plugins/errors/PluginRequireAlreadyCreatedError.ts index bd518c3138..1f9c7bf124 100644 --- a/packages/imperative/src/imperative/plugins/errors/PluginRequireAlreadyCreatedError.ts +++ b/packages/imperative/src/imperative/plugins/errors/PluginRequireAlreadyCreatedError.ts @@ -9,7 +9,7 @@ * */ -import { ImperativeError } from "../../../../src/error"; +import { ImperativeError } from "../../../error"; /** * This error is thrown when a second call to {@link PluginRequireProvider.createPluginHooks} has diff --git a/packages/imperative/src/imperative/plugins/errors/PluginRequireNotCreatedError.ts b/packages/imperative/src/imperative/plugins/errors/PluginRequireNotCreatedError.ts index bdd5c7f348..66a62a54e2 100644 --- a/packages/imperative/src/imperative/plugins/errors/PluginRequireNotCreatedError.ts +++ b/packages/imperative/src/imperative/plugins/errors/PluginRequireNotCreatedError.ts @@ -9,7 +9,7 @@ * */ -import { ImperativeError } from "../../../../src/error"; +import { ImperativeError } from "../../../error"; /** * This error is thrown when a call to {@link PluginRequireProvider.destroyPluginHooks} has diff --git a/packages/imperative/src/imperative/plugins/utilities/NpmFunctions.ts b/packages/imperative/src/imperative/plugins/utilities/NpmFunctions.ts index 7a8da1cd39..f925312ac5 100644 --- a/packages/imperative/src/imperative/plugins/utilities/NpmFunctions.ts +++ b/packages/imperative/src/imperative/plugins/utilities/NpmFunctions.ts @@ -16,7 +16,7 @@ import { StdioOptions } from "child_process"; import { readFileSync } from "jsonfile"; import * as npmPackageArg from "npm-package-arg"; import * as pacote from "pacote"; -import { ExecUtils } from "../../../../src/utilities"; +import { ExecUtils } from "../../../utilities"; const npmCmd = findNpmOnPath(); /** diff --git a/packages/imperative/src/imperative/plugins/utilities/PMFConstants.ts b/packages/imperative/src/imperative/plugins/utilities/PMFConstants.ts index 9f203c89b3..c41a45468d 100644 --- a/packages/imperative/src/imperative/plugins/utilities/PMFConstants.ts +++ b/packages/imperative/src/imperative/plugins/utilities/PMFConstants.ts @@ -9,9 +9,9 @@ * */ -import { ImperativeConfig } from "../../../../src/utilities"; +import { ImperativeConfig } from "../../../utilities"; import { dirname, join } from "path"; -import { Config } from "../../../../src/config"; +import { Config } from "../../../config"; import { EnvironmentalVariableSettings } from "../../env/EnvironmentalVariableSettings"; /** diff --git a/packages/imperative/src/imperative/plugins/utilities/PluginIssues.ts b/packages/imperative/src/imperative/plugins/utilities/PluginIssues.ts index db76517eda..95b1f88106 100644 --- a/packages/imperative/src/imperative/plugins/utilities/PluginIssues.ts +++ b/packages/imperative/src/imperative/plugins/utilities/PluginIssues.ts @@ -11,7 +11,7 @@ import { IPluginIssues, IPluginIssue } from "../doc/IPluginIssues"; import { IPluginJson } from "../doc/IPluginJson"; -import { ImperativeError } from "../../../../src/error"; +import { ImperativeError } from "../../../error"; import { PMFConstants } from "./PMFConstants"; import { readFileSync } from "jsonfile"; diff --git a/packages/imperative/src/imperative/plugins/utilities/npm-interface/install.ts b/packages/imperative/src/imperative/plugins/utilities/npm-interface/install.ts index ee16c12823..4884d14a6a 100644 --- a/packages/imperative/src/imperative/plugins/utilities/npm-interface/install.ts +++ b/packages/imperative/src/imperative/plugins/utilities/npm-interface/install.ts @@ -14,16 +14,16 @@ import * as path from "path"; import * as fs from "fs"; import { readFileSync, writeFileSync } from "jsonfile"; import { IPluginJson } from "../../doc/IPluginJson"; -import { Logger } from "../../../../src/../logger"; +import { Logger } from "../../../../logger"; import { IImperativeConfig } from "../../../doc/IImperativeConfig"; -import { ImperativeError } from "../../../../src/../error"; +import { ImperativeError } from "../../../../error"; import { IPluginJsonObject } from "../../doc/IPluginJsonObject"; import { getPackageInfo, installPackages } from "../NpmFunctions"; -import { ConfigSchema } from "../../../../src/../config/ConfigSchema"; +import { ConfigSchema } from "../../../../config/ConfigSchema"; import { PluginManagementFacility } from "../../PluginManagementFacility"; import { ConfigurationLoader } from "../../../ConfigurationLoader"; import { UpdateImpConfig } from "../../../UpdateImpConfig"; -import { CredentialManagerOverride, ICredentialManagerNameMap } from "../../../../src/../security"; +import { CredentialManagerOverride, ICredentialManagerNameMap } from "../../../../security"; /** * Common function that abstracts the install process. This function should be called for each diff --git a/packages/imperative/src/imperative/plugins/utilities/npm-interface/uninstall.ts b/packages/imperative/src/imperative/plugins/utilities/npm-interface/uninstall.ts index a52de001f1..6b4159bd12 100644 --- a/packages/imperative/src/imperative/plugins/utilities/npm-interface/uninstall.ts +++ b/packages/imperative/src/imperative/plugins/utilities/npm-interface/uninstall.ts @@ -14,9 +14,9 @@ import * as path from "path"; import { PMFConstants } from "../PMFConstants"; import { readFileSync, writeFileSync } from "jsonfile"; import { IPluginJson } from "../../doc/IPluginJson"; -import { Logger } from "../../../../src/../logger"; -import { ImperativeError } from "../../../../src/../error"; -import { ExecUtils, TextUtils } from "../../../../src/../utilities"; +import { Logger } from "../../../../logger"; +import { ImperativeError } from "../../../../error"; +import { ExecUtils, TextUtils } from "../../../../utilities"; import { StdioOptions } from "child_process"; import { findNpmOnPath } from "../NpmFunctions"; const npmCmd = findNpmOnPath(); diff --git a/packages/imperative/src/imperative/plugins/utilities/npm-interface/update.ts b/packages/imperative/src/imperative/plugins/utilities/npm-interface/update.ts index 1b0a5a1981..306180590e 100644 --- a/packages/imperative/src/imperative/plugins/utilities/npm-interface/update.ts +++ b/packages/imperative/src/imperative/plugins/utilities/npm-interface/update.ts @@ -10,7 +10,7 @@ */ import { PMFConstants } from "../PMFConstants"; -import { Logger } from "../../../../src/../logger"; +import { Logger } from "../../../../logger"; import { getPackageInfo, installPackages } from "../NpmFunctions"; /** diff --git a/packages/imperative/src/imperative/plugins/utilities/runValidatePlugin.ts b/packages/imperative/src/imperative/plugins/utilities/runValidatePlugin.ts index fce6cd2b5b..ba49dfbc16 100644 --- a/packages/imperative/src/imperative/plugins/utilities/runValidatePlugin.ts +++ b/packages/imperative/src/imperative/plugins/utilities/runValidatePlugin.ts @@ -9,10 +9,10 @@ * */ -import { Logger } from "../../../../src/logger"; -import { ExecUtils } from "../../../../src/utilities"; +import { Logger } from "../../../logger"; +import { ExecUtils } from "../../../utilities"; import { PMFConstants } from "./PMFConstants"; -import { ImperativeError } from "../../../../src/error"; +import { ImperativeError } from "../../../error"; /** * Run another instance of the host CLI command to validate a plugin that has diff --git a/packages/imperative/src/imperative/profiles/ImperativeProfileManagerFactory.ts b/packages/imperative/src/imperative/profiles/ImperativeProfileManagerFactory.ts index 5a8d8c4d87..529c299c67 100644 --- a/packages/imperative/src/imperative/profiles/ImperativeProfileManagerFactory.ts +++ b/packages/imperative/src/imperative/profiles/ImperativeProfileManagerFactory.ts @@ -9,8 +9,8 @@ * */ -import { AbstractProfileManagerFactory } from "../../../src/profiles"; -import { CliProfileManager, ICommandProfileTypeConfiguration } from "../../../src/cmd/"; +import { AbstractProfileManagerFactory } from "../../profiles"; +import { CliProfileManager, ICommandProfileTypeConfiguration } from "../../cmd/"; import { ImperativeApi } from "../api/ImperativeApi"; /** * The imperative profile manager factory returns instances of the cli profile manager diff --git a/packages/imperative/src/imperative/profiles/builders/CompleteProfilesGroupBuilder.ts b/packages/imperative/src/imperative/profiles/builders/CompleteProfilesGroupBuilder.ts index 3440352e44..1f325c9f48 100644 --- a/packages/imperative/src/imperative/profiles/builders/CompleteProfilesGroupBuilder.ts +++ b/packages/imperative/src/imperative/profiles/builders/CompleteProfilesGroupBuilder.ts @@ -9,7 +9,7 @@ * */ -import { ICommandDefinition } from "../../../../src/cmd"; +import { ICommandDefinition } from "../../../cmd"; import { createProfilesCommandDesc, createProfilesCommandSummary, deleteProfilesCommandDesc, deleteProfilesCommandSummary, @@ -17,17 +17,17 @@ import { setProfileActionDesc, setProfileActionSummary, updateProfileCommandDesc, updateProfileCommandSummary, validateProfileGroupDesc, validateProfileCommandSummary -} from "../../../../src/messages"; -import { Constants } from "../../../../src/constants"; +} from "../../../messages"; +import { Constants } from "../../../constants"; import { ProfilesCreateCommandBuilder } from "./ProfilesCreateCommandBuilder"; import { ProfilesUpdateCommandBuilder } from "./ProfilesUpdateCommandBuilder"; import { ProfilesDeleteCommandBuilder } from "./ProfilesDeleteCommandBuilder"; import { ProfilesValidateCommandBuilder } from "./ProfilesValidateCommandBuilder"; import { ProfilesListCommandBuilder } from "./ProfilesListCommandBuilder"; import { ProfilesSetCommandBuilder } from "./ProfilesSetCommandBuilder"; -import { Logger } from "../../../../src/logger/index"; -import { IProfileTypeConfiguration, ProfilesConstants } from "../../../../src/profiles"; -import { ImperativeConfig } from "../../../../src/utilities"; +import { Logger } from "../../../logger/index"; +import { IProfileTypeConfiguration, ProfilesConstants } from "../../../profiles"; +import { ImperativeConfig } from "../../../utilities"; /** * Generate a complete group of commands for maintaining configuration profiles diff --git a/packages/imperative/src/imperative/profiles/builders/ProfilesCommandBuilder.ts b/packages/imperative/src/imperative/profiles/builders/ProfilesCommandBuilder.ts index 78f839bbfa..60e6dc0c86 100644 --- a/packages/imperative/src/imperative/profiles/builders/ProfilesCommandBuilder.ts +++ b/packages/imperative/src/imperative/profiles/builders/ProfilesCommandBuilder.ts @@ -9,12 +9,12 @@ * */ -import { AbstractCommandBuilder } from "../../../../src/cmd/builders/AbstractCommandBuilder"; +import { AbstractCommandBuilder } from "../../../cmd/builders/AbstractCommandBuilder"; import { isNullOrUndefined } from "util"; -import { ICommandDefinition, ICommandOptionDefinition, ICommandProfileTypeConfiguration } from "../../../../src/cmd"; -import { Logger } from "../../../../src/logger"; -import { IProfileSchema, ProfileUtils } from "../../../../src/profiles"; -import { ICommandProfileProperty } from "../../../../src/cmd/doc/profiles/definition/ICommandProfileProperty"; +import { ICommandDefinition, ICommandOptionDefinition, ICommandProfileTypeConfiguration } from "../../../cmd"; +import { Logger } from "../../../logger"; +import { IProfileSchema, ProfileUtils } from "../../../profiles"; +import { ICommandProfileProperty } from "../../../cmd/doc/profiles/definition/ICommandProfileProperty"; /** * Abstract class for generating profile-related commands diff --git a/packages/imperative/src/imperative/profiles/builders/ProfilesCreateCommandBuilder.ts b/packages/imperative/src/imperative/profiles/builders/ProfilesCreateCommandBuilder.ts index 567264bbed..21ae1dd218 100644 --- a/packages/imperative/src/imperative/profiles/builders/ProfilesCreateCommandBuilder.ts +++ b/packages/imperative/src/imperative/profiles/builders/ProfilesCreateCommandBuilder.ts @@ -10,13 +10,13 @@ */ import { ProfilesCommandBuilder } from "./ProfilesCommandBuilder"; -import { ICommandDefinition, ICommandProfileTypeConfiguration } from "../../../../src/cmd"; +import { ICommandDefinition, ICommandProfileTypeConfiguration } from "../../../cmd"; import { createProfileCommandSummary, createProfileOptionDesc, createProfileOptionOverwriteDesc, - createProfileDisableDefaultsDesc } from "../../../../src/messages"; -import { Constants } from "../../../../src/constants"; -import { TextUtils } from "../../../../src/utilities"; -import { Logger } from "../../../../src/logger/index"; -import { ProfilesConstants, ProfileUtils } from "../../../../src/profiles"; + createProfileDisableDefaultsDesc } from "../../../messages"; +import { Constants } from "../../../constants"; +import { TextUtils } from "../../../utilities"; +import { Logger } from "../../../logger/index"; +import { ProfilesConstants, ProfileUtils } from "../../../profiles"; /** * Used to build profile create command definitions. diff --git a/packages/imperative/src/imperative/profiles/builders/ProfilesDeleteCommandBuilder.ts b/packages/imperative/src/imperative/profiles/builders/ProfilesDeleteCommandBuilder.ts index 47c52dda0e..14c29d4029 100644 --- a/packages/imperative/src/imperative/profiles/builders/ProfilesDeleteCommandBuilder.ts +++ b/packages/imperative/src/imperative/profiles/builders/ProfilesDeleteCommandBuilder.ts @@ -10,17 +10,17 @@ */ import { ProfilesCommandBuilder } from "./ProfilesCommandBuilder"; -import { Constants } from "../../../../src/constants"; -import { ICommandDefinition } from "../../../../src/cmd"; +import { Constants } from "../../../constants"; +import { ICommandDefinition } from "../../../cmd"; import { deleteProfileActionDesc, deleteProfileCommandDesc, deleteProfileExample, deleteProfileForceOptionDesc, deleteProfileNameDesc -} from "../../../../src/messages/index"; -import { ImperativeConfig, TextUtils } from "../../../../src/utilities"; -import { ProfilesConstants, ProfileUtils } from "../../../../src/profiles"; +} from "../../../messages/index"; +import { ImperativeConfig, TextUtils } from "../../../utilities"; +import { ProfilesConstants, ProfileUtils } from "../../../profiles"; /** * Used to build delete profile command definitions. diff --git a/packages/imperative/src/imperative/profiles/builders/ProfilesListCommandBuilder.ts b/packages/imperative/src/imperative/profiles/builders/ProfilesListCommandBuilder.ts index 563062ed0f..99bf24f956 100644 --- a/packages/imperative/src/imperative/profiles/builders/ProfilesListCommandBuilder.ts +++ b/packages/imperative/src/imperative/profiles/builders/ProfilesListCommandBuilder.ts @@ -10,17 +10,17 @@ */ import { ProfilesCommandBuilder } from "./ProfilesCommandBuilder"; -import { Constants } from "../../../../src/constants"; -import { ICommandDefinition, ICommandProfileTypeConfiguration } from "../../../../src/cmd"; +import { Constants } from "../../../constants"; +import { ICommandDefinition, ICommandProfileTypeConfiguration } from "../../../cmd"; import { listProfileCommandDesc, listProfileExample, listProfileExampleShowContents, listProfileVerboseOptionDesc -} from "../../../../src/messages"; -import { TextUtils } from "../../../../src/utilities"; -import { Logger } from "../../../../src/logger/"; -import { ProfilesConstants } from "../../../../src/profiles"; +} from "../../../messages"; +import { TextUtils } from "../../../utilities"; +import { Logger } from "../../../logger/"; +import { ProfilesConstants } from "../../../profiles"; /** * Used to build profile update command definitions. diff --git a/packages/imperative/src/imperative/profiles/builders/ProfilesSetCommandBuilder.ts b/packages/imperative/src/imperative/profiles/builders/ProfilesSetCommandBuilder.ts index 8766abe3ff..a227298cb1 100644 --- a/packages/imperative/src/imperative/profiles/builders/ProfilesSetCommandBuilder.ts +++ b/packages/imperative/src/imperative/profiles/builders/ProfilesSetCommandBuilder.ts @@ -10,16 +10,16 @@ */ import { ProfilesCommandBuilder } from "./ProfilesCommandBuilder"; -import { ICommandDefinition } from "../../../../src/cmd"; -import { TextUtils } from "../../../../src/utilities"; -import { Constants } from "../../../../src/constants"; +import { ICommandDefinition } from "../../../cmd"; +import { TextUtils } from "../../../utilities"; +import { Constants } from "../../../constants"; import { setGroupWithOnlyProfilesCommandDesc, setGroupWithOnlyProfilesSummary, setProfileExample, setProfileOptionDesc -} from "../../../../src/messages/index"; -import { ProfilesConstants } from "../../../../src/profiles"; +} from "../../../messages/index"; +import { ProfilesConstants } from "../../../profiles"; /** * Used to build "set default profile" command definitions. diff --git a/packages/imperative/src/imperative/profiles/builders/ProfilesShowDependenciesCommandBuilder.ts b/packages/imperative/src/imperative/profiles/builders/ProfilesShowDependenciesCommandBuilder.ts index 7aedb634a3..2093ad968f 100644 --- a/packages/imperative/src/imperative/profiles/builders/ProfilesShowDependenciesCommandBuilder.ts +++ b/packages/imperative/src/imperative/profiles/builders/ProfilesShowDependenciesCommandBuilder.ts @@ -10,11 +10,11 @@ */ import { ProfilesCommandBuilder } from "./ProfilesCommandBuilder"; -import { Constants } from "../../../../src/constants"; -import { ICommandDefinition } from "../../../../src/cmd"; -import { deleteProfileNameDesc, showDependenciesCommandDesc } from "../../../../src/messages"; -import { TextUtils } from "../../../../src/utilities"; -import { ProfilesConstants, ProfileUtils } from "../../../../src/profiles"; +import { Constants } from "../../../constants"; +import { ICommandDefinition } from "../../../cmd"; +import { deleteProfileNameDesc, showDependenciesCommandDesc } from "../../../messages"; +import { TextUtils } from "../../../utilities"; +import { ProfilesConstants, ProfileUtils } from "../../../profiles"; /** * Used to build profile create command definitions. diff --git a/packages/imperative/src/imperative/profiles/builders/ProfilesUpdateCommandBuilder.ts b/packages/imperative/src/imperative/profiles/builders/ProfilesUpdateCommandBuilder.ts index 919d9115c8..641e6e1402 100644 --- a/packages/imperative/src/imperative/profiles/builders/ProfilesUpdateCommandBuilder.ts +++ b/packages/imperative/src/imperative/profiles/builders/ProfilesUpdateCommandBuilder.ts @@ -11,12 +11,12 @@ import { ProfilesCommandBuilder } from "./ProfilesCommandBuilder"; import { isNullOrUndefined } from "util"; -import { Constants } from "../../../../src/constants"; -import { ICommandDefinition } from "../../../../src/cmd"; -import { createProfileOptionDesc, updateProfileCommandDesc } from "../../../../src/messages"; -import { TextUtils } from "../../../../src/utilities"; -import { IProfileProperty, ProfilesConstants, ProfileUtils } from "../../../../src/profiles"; -import { ICommandProfileProperty } from "../../../../src/cmd/doc/profiles/definition/ICommandProfileProperty"; +import { Constants } from "../../../constants"; +import { ICommandDefinition } from "../../../cmd"; +import { createProfileOptionDesc, updateProfileCommandDesc } from "../../../messages"; +import { TextUtils } from "../../../utilities"; +import { IProfileProperty, ProfilesConstants, ProfileUtils } from "../../../profiles"; +import { ICommandProfileProperty } from "../../../cmd/doc/profiles/definition/ICommandProfileProperty"; /** * Used to build profile update command definitions. diff --git a/packages/imperative/src/imperative/profiles/builders/ProfilesValidateCommandBuilder.ts b/packages/imperative/src/imperative/profiles/builders/ProfilesValidateCommandBuilder.ts index ee106f678b..d53590e6d8 100644 --- a/packages/imperative/src/imperative/profiles/builders/ProfilesValidateCommandBuilder.ts +++ b/packages/imperative/src/imperative/profiles/builders/ProfilesValidateCommandBuilder.ts @@ -10,13 +10,13 @@ */ import { ProfilesCommandBuilder } from "./ProfilesCommandBuilder"; -import { ICommandDefinition, ICommandProfileTypeConfiguration } from "../../../../src/cmd"; -import { Constants } from "../../../../src/constants"; -import { deleteProfileNameDesc, validateProfileCommandDesc } from "../../../../src/messages"; -import { ImperativeConfig, TextUtils } from "../../../../src/utilities"; -import { Logger } from "../../../../src/logger/index"; +import { ICommandDefinition, ICommandProfileTypeConfiguration } from "../../../cmd"; +import { Constants } from "../../../constants"; +import { deleteProfileNameDesc, validateProfileCommandDesc } from "../../../messages"; +import { ImperativeConfig, TextUtils } from "../../../utilities"; +import { Logger } from "../../../logger/index"; import { isNullOrUndefined } from "util"; -import { ProfilesConstants, ProfileUtils, ProfileValidator } from "../../../../src/profiles"; +import { ProfilesConstants, ProfileUtils, ProfileValidator } from "../../../profiles"; /** * Used to build profile validate command definitions. diff --git a/packages/imperative/src/imperative/profiles/handlers/CreateProfilesHandler.ts b/packages/imperative/src/imperative/profiles/handlers/CreateProfilesHandler.ts index fcc630e413..681c57e37f 100644 --- a/packages/imperative/src/imperative/profiles/handlers/CreateProfilesHandler.ts +++ b/packages/imperative/src/imperative/profiles/handlers/CreateProfilesHandler.ts @@ -9,13 +9,13 @@ * */ -import { overroteProfileMessage, profileCreatedSuccessfullyAndPath, profileReviewMessage } from "../../../../src/messages"; +import { overroteProfileMessage, profileCreatedSuccessfullyAndPath, profileReviewMessage } from "../../../messages"; import { Imperative } from "../../Imperative"; -import { IProfileSaved, ISaveProfileFromCliArgs, ProfilesConstants } from "../../../../src/profiles"; -import { CliProfileManager, ICommandHandler, IHandlerParameters } from "../../../../src/cmd"; +import { IProfileSaved, ISaveProfileFromCliArgs, ProfilesConstants } from "../../../profiles"; +import { CliProfileManager, ICommandHandler, IHandlerParameters } from "../../../cmd"; -import { Constants } from "../../../../src/constants"; -import { TextUtils } from "../../../../src/utilities"; +import { Constants } from "../../../constants"; +import { TextUtils } from "../../../utilities"; /** * Handler that allows creation of a profile from command line arguments. Intended for usage with the automatically diff --git a/packages/imperative/src/imperative/profiles/handlers/ListProfilesHandler.ts b/packages/imperative/src/imperative/profiles/handlers/ListProfilesHandler.ts index 1bfdaa103f..3b46fa468b 100644 --- a/packages/imperative/src/imperative/profiles/handlers/ListProfilesHandler.ts +++ b/packages/imperative/src/imperative/profiles/handlers/ListProfilesHandler.ts @@ -10,8 +10,8 @@ */ import { Imperative } from "../../../"; -import { ProfilesConstants } from "../../../../src/profiles/constants/ProfilesConstants"; -import { CliProfileManager, ICommandHandler, IHandlerParameters } from "../../../../src/cmd"; +import { ProfilesConstants } from "../../../profiles/constants/ProfilesConstants"; +import { CliProfileManager, ICommandHandler, IHandlerParameters } from "../../../cmd"; import { IProfileLoaded } from "../../../"; /** diff --git a/packages/imperative/src/imperative/profiles/handlers/NewDeleteProfilesHandler.ts b/packages/imperative/src/imperative/profiles/handlers/NewDeleteProfilesHandler.ts index 6848b989a0..a14bcd3349 100644 --- a/packages/imperative/src/imperative/profiles/handlers/NewDeleteProfilesHandler.ts +++ b/packages/imperative/src/imperative/profiles/handlers/NewDeleteProfilesHandler.ts @@ -9,10 +9,10 @@ * */ -import { IHandlerParameters } from "../../../../src/cmd"; +import { IHandlerParameters } from "../../../cmd"; import { Imperative } from "../../Imperative"; -import { Constants } from "../../../../src/constants"; -import { IProfileDeleted, ProfilesConstants } from "../../../../src/profiles"; +import { Constants } from "../../../constants"; +import { IProfileDeleted, ProfilesConstants } from "../../../profiles"; export default class NewDeleteProfilesHandler { public async process(commandParameters: IHandlerParameters) { diff --git a/packages/imperative/src/imperative/profiles/handlers/SetDefaultProfilesHandler.ts b/packages/imperative/src/imperative/profiles/handlers/SetDefaultProfilesHandler.ts index 078ff3ad38..15428509fb 100644 --- a/packages/imperative/src/imperative/profiles/handlers/SetDefaultProfilesHandler.ts +++ b/packages/imperative/src/imperative/profiles/handlers/SetDefaultProfilesHandler.ts @@ -10,9 +10,9 @@ */ import { Imperative } from "../../Imperative"; -import { ProfilesConstants } from "../../../../src/profiles"; -import { ICommandHandler, IHandlerParameters } from "../../../../src/cmd"; -import { Constants } from "../../../../src/constants"; +import { ProfilesConstants } from "../../../profiles"; +import { ICommandHandler, IHandlerParameters } from "../../../cmd"; +import { Constants } from "../../../constants"; /** * Handler for the auto generated commands to set the default profile for a type * The default profile is loaded when no specific profile name is specified diff --git a/packages/imperative/src/imperative/profiles/handlers/ShowDependenciesProfilesHandler.ts b/packages/imperative/src/imperative/profiles/handlers/ShowDependenciesProfilesHandler.ts index 616ca9d929..f6954e82d6 100644 --- a/packages/imperative/src/imperative/profiles/handlers/ShowDependenciesProfilesHandler.ts +++ b/packages/imperative/src/imperative/profiles/handlers/ShowDependenciesProfilesHandler.ts @@ -9,7 +9,7 @@ * */ -import { ICommandHandler, IHandlerParameters } from "../../../../src/cmd"; +import { ICommandHandler, IHandlerParameters } from "../../../cmd"; /** * Handler for the auto-generated show dependencies command diff --git a/packages/imperative/src/imperative/profiles/handlers/UpdateProfilesHandler.ts b/packages/imperative/src/imperative/profiles/handlers/UpdateProfilesHandler.ts index f7187d03b5..e1f3eb30a4 100644 --- a/packages/imperative/src/imperative/profiles/handlers/UpdateProfilesHandler.ts +++ b/packages/imperative/src/imperative/profiles/handlers/UpdateProfilesHandler.ts @@ -9,12 +9,12 @@ * */ -import { overroteProfileMessage, profileUpdatedSuccessfullyAndPath, profileReviewMessage } from "../../../../src/messages"; +import { overroteProfileMessage, profileUpdatedSuccessfullyAndPath, profileReviewMessage } from "../../../messages"; import { Imperative } from "../../Imperative"; -import { IProfileUpdated, ProfilesConstants } from "../../../../src/profiles"; -import { ICommandHandler, IHandlerParameters } from "../../../../src/cmd"; -import { Constants } from "../../../../src/constants"; -import { TextUtils } from "../../../../src/utilities"; +import { IProfileUpdated, ProfilesConstants } from "../../../profiles"; +import { ICommandHandler, IHandlerParameters } from "../../../cmd"; +import { Constants } from "../../../constants"; +import { TextUtils } from "../../../utilities"; /** * Handler for the auto-generated update profile commands diff --git a/packages/imperative/src/imperative/profiles/handlers/ValidateProfileHandler.ts b/packages/imperative/src/imperative/profiles/handlers/ValidateProfileHandler.ts index 06f4af51d3..c8d4e3f12b 100644 --- a/packages/imperative/src/imperative/profiles/handlers/ValidateProfileHandler.ts +++ b/packages/imperative/src/imperative/profiles/handlers/ValidateProfileHandler.ts @@ -10,8 +10,8 @@ */ import { isNullOrUndefined } from "util"; -import { CliProfileManager, ICommandHandler, IHandlerParameters } from "../../../../src/cmd"; -import { IImperativeError, ImperativeError } from "../../../../src/error"; +import { CliProfileManager, ICommandHandler, IHandlerParameters } from "../../../cmd"; +import { IImperativeError, ImperativeError } from "../../../error"; import { Imperative } from "../../../index"; import { IProfileValidationPlan, @@ -19,9 +19,9 @@ import { IProfileValidationTask, ProfilesConstants, ProfileValidator -} from "../../../../src/profiles"; -import { Logger } from "../../../../src/logger"; -import { ImperativeConfig } from "../../../../src/utilities"; +} from "../../../profiles"; +import { Logger } from "../../../logger"; +import { ImperativeConfig } from "../../../utilities"; /** * Generic handler for validating a profile and printing a report in response diff --git a/packages/imperative/src/rest/__mocks__/RestClient.ts b/packages/imperative/src/rest/__mocks__/RestClient.ts index 1c4bc0b50b..c213f5a2fb 100644 --- a/packages/imperative/src/rest/__mocks__/RestClient.ts +++ b/packages/imperative/src/rest/__mocks__/RestClient.ts @@ -9,7 +9,7 @@ * */ -import { AbstractSession } from "../../src/session/AbstractSession"; +import { AbstractSession } from "../session/AbstractSession"; export class RestClient { public static getExpectString(session: AbstractSession, resource: string, reqHeaders?: any[]) { return new Promise((resolve, reject) => { diff --git a/packages/imperative/src/security/CredentialManagerFactory.ts b/packages/imperative/src/security/CredentialManagerFactory.ts index eacc01b4da..65734fefda 100644 --- a/packages/imperative/src/security/CredentialManagerFactory.ts +++ b/packages/imperative/src/security/CredentialManagerFactory.ts @@ -129,14 +129,14 @@ export class CredentialManagerFactory { if (this.mManager.initialize) { await this.mManager.initialize(); - const { Logger } = await import("../../src/logger"); + const { Logger } = await import("../logger"); Logger.getImperativeLogger().debug(`Initialized the "${displayName}" credential manager for "${params.service}".`); } } catch (error) { // Perform dynamic requires when an error happens const { InvalidCredentialManager } = await import("./InvalidCredentialManager"); - const { Logger } = await import("../../src/logger"); + const { Logger } = await import("../logger"); // Log appropriate error messages if (Manager !== DefaultCredentialManager) { diff --git a/packages/imperative/src/utilities/diff/WebDiffGenerator.ts b/packages/imperative/src/utilities/diff/WebDiffGenerator.ts index 67312ae9f1..28bf87cfed 100644 --- a/packages/imperative/src/utilities/diff/WebDiffGenerator.ts +++ b/packages/imperative/src/utilities/diff/WebDiffGenerator.ts @@ -13,7 +13,7 @@ import * as fs from "fs"; import * as path from "path"; -import { ImperativeConfig } from "..//ImperativeConfig"; +import { ImperativeConfig } from "../ImperativeConfig"; import { ImperativeError } from "../../error/ImperativeError"; import { IWebDiffGenerator } from "./doc/IWebDiffGenerator"; From 2f8a529bcdeca6101e3961014f342ac28cfb29b0 Mon Sep 17 00:00:00 2001 From: Amber Torrise Date: Wed, 17 Jan 2024 16:06:41 -0500 Subject: [PATCH 123/138] fix post install script import Signed-off-by: Amber Torrise --- .../__packages__/cli-test-utils/tsconfig.json | 20 ------------------- packages/cli/scripts/printSuccessMessage.js | 2 +- 2 files changed, 1 insertion(+), 21 deletions(-) diff --git a/__tests__/__packages__/cli-test-utils/tsconfig.json b/__tests__/__packages__/cli-test-utils/tsconfig.json index 4254df1842..7312a46372 100644 --- a/__tests__/__packages__/cli-test-utils/tsconfig.json +++ b/__tests__/__packages__/cli-test-utils/tsconfig.json @@ -9,23 +9,3 @@ "target": "es5", } } - -// Standardize the tsconfig to match any other SDK package -// { -// "compilerOptions": { -// /* Visit https://aka.ms/tsconfig.json to read more about this file */ -// "target": "es5", -// "module": "commonjs", -// "declaration": true, -// "outDir": "./lib", -// "rootDir": "./src", -// // "strict": true, // We do not enable strict on other dependencies (like @zowe/imperative) -// "esModuleInterop": true, -// "skipLibCheck": true, -// "forceConsistentCasingInFileNames": true, -// "types": [ -// "node", -// "jest" -// ] -// } -// } diff --git a/packages/cli/scripts/printSuccessMessage.js b/packages/cli/scripts/printSuccessMessage.js index 673e2d0d18..195fc75965 100644 --- a/packages/cli/scripts/printSuccessMessage.js +++ b/packages/cli/scripts/printSuccessMessage.js @@ -15,7 +15,7 @@ function getImperative() { } catch (err) { if (err.code === "ERR_MODULE_NOT_FOUND" || err.code === "MODULE_NOT_FOUND") { require("ts-node/register"); - return require(require("path").resolve(__dirname, "../../imperative/src/utilities/src/TextUtils")); + return require(require("path").resolve(__dirname, "../../imperative/src/utilities/TextUtils")); } else { throw err; } From f8e22e011591496d4d8f332972ccfbe22931ffb3 Mon Sep 17 00:00:00 2001 From: Amber Torrise Date: Wed, 17 Jan 2024 16:38:45 -0500 Subject: [PATCH 124/138] adding back in operations tests Signed-off-by: Amber Torrise --- .../operations/Operations.integration.spec.ts | 333 ++++++++++++++++++ .../__unit__/logger/LoggerUtils.unit.test.ts | 2 +- .../__unit__/operations/TestOperations1.ts | 28 ++ .../__unit__/operations/TestOperations2.ts | 27 ++ .../__unit__/operations/TestOperations3.ts | 29 ++ .../__unit__/operations/TestOperations4.ts | 29 ++ .../__unit__/operations/TestOperations5.ts | 27 ++ .../__unit__/operations/subops/TestSubOp1.ts | 38 ++ .../__unit__/operations/subops/TestSubOp2.ts | 40 +++ .../__unit__/operations/subops/TestSubOp4.ts | 41 +++ .../__unit__/operations/subops/TestSubOp5.ts | 41 +++ .../__unit__/operations/subops/TestSubOp6.ts | 41 +++ .../operations/subops/TestSubOpDiverge.ts | 43 +++ .../operations/subops/TestSubOpFail.ts | 39 ++ .../operations/subops/TestSubOpNoUndo.ts | 40 +++ 15 files changed, 797 insertions(+), 1 deletion(-) create mode 100644 packages/imperative/__tests__/__integration__/operations/Operations.integration.spec.ts create mode 100644 packages/imperative/__tests__/__unit__/operations/TestOperations1.ts create mode 100644 packages/imperative/__tests__/__unit__/operations/TestOperations2.ts create mode 100644 packages/imperative/__tests__/__unit__/operations/TestOperations3.ts create mode 100644 packages/imperative/__tests__/__unit__/operations/TestOperations4.ts create mode 100644 packages/imperative/__tests__/__unit__/operations/TestOperations5.ts create mode 100644 packages/imperative/__tests__/__unit__/operations/subops/TestSubOp1.ts create mode 100644 packages/imperative/__tests__/__unit__/operations/subops/TestSubOp2.ts create mode 100644 packages/imperative/__tests__/__unit__/operations/subops/TestSubOp4.ts create mode 100644 packages/imperative/__tests__/__unit__/operations/subops/TestSubOp5.ts create mode 100644 packages/imperative/__tests__/__unit__/operations/subops/TestSubOp6.ts create mode 100644 packages/imperative/__tests__/__unit__/operations/subops/TestSubOpDiverge.ts create mode 100644 packages/imperative/__tests__/__unit__/operations/subops/TestSubOpFail.ts create mode 100644 packages/imperative/__tests__/__unit__/operations/subops/TestSubOpNoUndo.ts diff --git a/packages/imperative/__tests__/__integration__/operations/Operations.integration.spec.ts b/packages/imperative/__tests__/__integration__/operations/Operations.integration.spec.ts new file mode 100644 index 0000000000..c6f6e947e7 --- /dev/null +++ b/packages/imperative/__tests__/__integration__/operations/Operations.integration.spec.ts @@ -0,0 +1,333 @@ +/* +* 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. +* +*/ + +/* eslint-disable jest/expect-expect */ +import { TestOperations1 } from "../../__unit__/operations/TestOperations1"; +import { TestOperations3 } from "../../__unit__/operations/TestOperations3"; +import { TestOperations4 } from "../../__unit__/operations/TestOperations4"; +import { isNullOrUndefined } from "util"; +import { IOperationResult, Operation, Operations } from "../../../../imperative/src/operations/index"; +import { TestLogger } from "../../../__tests__/src/TestLogger"; + +const logger = TestLogger.getTestLogger(); + +class OperationTestConstants { + public static OPER_TEST1_RESULTS: Array> = [{ + operationName: "Initialize Test Sub Op 1", + resultMessage: "", + operationFailed: false, + diverge: false, + divergeTo: null, + continuePath: true, + nextOperationResult: null, + operationObject: null, + operationUndoPossible: true, + operationUndoFailed: false, + operationUndoAttempted: false, + critical: true, + output: null, + infoMessages: [], + errorMessages: [] + }, { + operationName: "Initialize Test Sub Op 2", + resultMessage: "", + operationFailed: false, + diverge: false, + divergeTo: null, + continuePath: true, + nextOperationResult: null, + operationObject: null, + operationUndoPossible: true, + operationUndoFailed: false, + operationUndoAttempted: false, + critical: true, + output: null, + infoMessages: [], + errorMessages: [] + }, { + operationName: "Initialize Test Sub Op No Undo", + resultMessage: "", + operationFailed: false, + diverge: false, + divergeTo: null, + continuePath: true, + nextOperationResult: null, + operationObject: null, + operationUndoPossible: false, + operationUndoFailed: false, + operationUndoAttempted: false, + critical: true, + output: null, + infoMessages: [], + errorMessages: [] + }]; + + public static OPER_TEST2_RESULTS: Array> = [{ + operationName: "Initialize Test Sub Op 1", + resultMessage: "", + operationFailed: false, + diverge: false, + divergeTo: null, + continuePath: true, + nextOperationResult: null, + operationObject: null, + operationUndoPossible: true, + operationUndoFailed: false, + operationUndoAttempted: true, + critical: true, + output: null, + infoMessages: [], + errorMessages: [] + }, { + operationName: "Initialize Test Sub Op 2", + resultMessage: "", + operationFailed: false, + diverge: false, + divergeTo: null, + continuePath: true, + nextOperationResult: null, + operationObject: null, + operationUndoPossible: true, + operationUndoFailed: false, + operationUndoAttempted: true, + critical: true, + output: null, + infoMessages: [], + errorMessages: [] + }, { + operationName: "Initialize Test Sub Op No Undo", + resultMessage: "", + operationFailed: false, + diverge: false, + divergeTo: null, + continuePath: true, + nextOperationResult: null, + operationObject: null, + operationUndoPossible: false, + operationUndoFailed: false, + operationUndoAttempted: false, + critical: true, + output: null, + infoMessages: [], + errorMessages: [] + }, { + operationName: "Initialize Test Sub Op 4", + resultMessage: "", + operationFailed: false, + diverge: false, + divergeTo: null, + continuePath: true, + nextOperationResult: null, + operationObject: null, + operationUndoPossible: true, + operationUndoFailed: false, + operationUndoAttempted: true, + critical: true, + output: null, + infoMessages: [], + errorMessages: [] + }, { + operationName: "Initialize Test Sub Op 5", + resultMessage: "", + operationFailed: false, + diverge: false, + divergeTo: null, + continuePath: true, + nextOperationResult: null, + operationObject: null, + operationUndoPossible: true, + operationUndoFailed: false, + operationUndoAttempted: true, + critical: true, + output: null, + infoMessages: [], + errorMessages: [] + }, { + operationName: "Initialize Test Sub Op fail", + resultMessage: "", + operationFailed: true, + diverge: false, + divergeTo: null, + continuePath: true, + nextOperationResult: null, + operationObject: null, + operationUndoPossible: true, + operationUndoFailed: true, + operationUndoAttempted: true, + critical: true, + output: null, + infoMessages: [], + errorMessages: [] + }]; + + public static OPER_TEST3_RESULTS: Array> = [{ + operationName: "Initialize Test Sub Op 1", + resultMessage: "", + operationFailed: false, + diverge: false, + divergeTo: null, + continuePath: true, + nextOperationResult: null, + operationObject: null, + operationUndoPossible: true, + operationUndoFailed: false, + operationUndoAttempted: false, + critical: true, + output: null, + infoMessages: [], + errorMessages: [] + }, { + operationName: "Initialize Test Sub Op 2", + resultMessage: "", + operationFailed: false, + diverge: false, + divergeTo: null, + continuePath: true, + nextOperationResult: null, + operationObject: null, + operationUndoPossible: true, + operationUndoFailed: false, + operationUndoAttempted: false, + critical: true, + output: null, + infoMessages: [], + errorMessages: [] + }, { + operationName: "Initialize Test Sub Op No Undo", + resultMessage: "", + operationFailed: false, + diverge: false, + divergeTo: null, + continuePath: true, + nextOperationResult: null, + operationObject: null, + operationUndoPossible: false, + operationUndoFailed: false, + operationUndoAttempted: false, + critical: true, + output: null, + infoMessages: [], + errorMessages: [] + }, { + operationName: "Initialize Test Sub Op 4", + resultMessage: "", + operationFailed: false, + diverge: false, + divergeTo: null, + continuePath: true, + nextOperationResult: null, + operationObject: null, + operationUndoPossible: true, + operationUndoFailed: false, + operationUndoAttempted: false, + critical: true, + output: null, + infoMessages: [], + errorMessages: [] + }, { + operationName: "Initialize Test Sub Op 5", + resultMessage: "", + operationFailed: false, + diverge: false, + divergeTo: null, + continuePath: true, + nextOperationResult: null, + operationObject: null, + operationUndoPossible: true, + operationUndoFailed: false, + operationUndoAttempted: false, + critical: true, + output: null, + infoMessages: [], + errorMessages: [] + }, { + operationName: "Initialize Test Sub Op 6", + resultMessage: "", + operationFailed: false, + diverge: false, + divergeTo: null, + continuePath: true, + nextOperationResult: null, + operationObject: null, + operationUndoPossible: true, + operationUndoFailed: false, + operationUndoAttempted: false, + critical: true, + output: null, + infoMessages: [], + errorMessages: [] + }]; +} + +describe("Operation Infrastructure", () => { + it("Operations: Test a simple set of operations", () => { + logger.debug("Starting simple operations test."); + const testOperation: Operations = new TestOperations1(); + let operationResults: IOperationResult = null; + testOperation.executeOperation(Operation.NO_PARMS, (output: any, opResults: IOperationResult) => { + logger.debug("All operations have completed"); + operationResults = opResults; + checkResults(operationResults, OperationTestConstants.OPER_TEST1_RESULTS); + }); + }); + it("Operations: Test for complex set of operations", () => { + logger.debug("Starting complex operations tests."); + const testOperation: Operations = new TestOperations3(); + let operationResults: IOperationResult = null; + testOperation.executeOperation(Operation.NO_PARMS, (output: any, opResults: IOperationResult) => { + logger.debug("All operations have completed"); + operationResults = opResults; + checkResults(operationResults, OperationTestConstants.OPER_TEST3_RESULTS); + }); + }); + it("Operations: Test for complex set of undo operations", () => { + logger.debug("Starting simple undo test"); + const testOperation: Operations = new TestOperations4(); + let operationResults: IOperationResult = null; + testOperation.executeOperation(Operation.NO_PARMS, (output: any, opResults: IOperationResult) => { + logger.debug("All operations have completed"); + operationResults = opResults; + checkResults(operationResults, OperationTestConstants.OPER_TEST2_RESULTS); + }); + }); +}); + +function checkResults(operationActualResults: IOperationResult, + operationExpectedResults: Array>) { + + if (isNullOrUndefined(operationActualResults)) { + expect(0).toEqual(1); + let currentOperationResults: IOperationResult = operationActualResults; + for (const result of operationExpectedResults) { + logger.debug("Result operation name: " + currentOperationResults.operationName); + logger.debug("Result expected name: " + result.operationName); + + /** + * Test all the operation result properties agaisnt the set of expected properties + */ + logger.debug("Checking operation name match..."); + expect(currentOperationResults.operationName).toEqual(result.operationName); + logger.debug("Checking operation failed match..."); + expect(currentOperationResults.operationFailed).toEqual(result.operationFailed); + logger.debug("Checking operation undo possible match..."); + expect(currentOperationResults.operationUndoPossible).toEqual(result.operationUndoPossible); + logger.debug("Checking operation undo attempted match..."); + expect(currentOperationResults.operationUndoAttempted).toEqual(result.operationUndoAttempted); + + currentOperationResults = currentOperationResults.nextOperationResult; + } + + if (!isNullOrUndefined(currentOperationResults)) { + // more results than expected - fail + expect(0).toEqual(1); + } + } +} diff --git a/packages/imperative/__tests__/__unit__/logger/LoggerUtils.unit.test.ts b/packages/imperative/__tests__/__unit__/logger/LoggerUtils.unit.test.ts index b3d4e8780f..33f5cc9233 100644 --- a/packages/imperative/__tests__/__unit__/logger/LoggerUtils.unit.test.ts +++ b/packages/imperative/__tests__/__unit__/logger/LoggerUtils.unit.test.ts @@ -11,7 +11,7 @@ import { EnvironmentalVariableSettings } from "../../../src/imperative/env/EnvironmentalVariableSettings"; import { LoggerUtils } from "../../../src/logger"; -import { ImperativeConfig } from "../../../src/utilities/ImperativeConfigImperativeConfig"; +import { ImperativeConfig } from "../../../src/utilities/ImperativeConfig"; describe("LoggerUtils tests", () => { diff --git a/packages/imperative/__tests__/__unit__/operations/TestOperations1.ts b/packages/imperative/__tests__/__unit__/operations/TestOperations1.ts new file mode 100644 index 0000000000..a56482a68f --- /dev/null +++ b/packages/imperative/__tests__/__unit__/operations/TestOperations1.ts @@ -0,0 +1,28 @@ +/* +* 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 { TestSubOp1 } from "./subops/TestSubOp1"; +import { TestSubOp2 } from "./subops/TestSubOp2"; +import { TestSubOpNoUndo } from "./subops/TestSubOpNoUndo"; +import { Operations } from "../../../index"; +export class TestOperations1 extends Operations { + + constructor() { + super("Test Operations 1", true); + this.defineOperations(); + } + + protected defineOperations(): void { + this.addNextOperation(new TestSubOp1()); + this.addNextOperation(new TestSubOp2()); + this.addNextOperation(new TestSubOpNoUndo()); + } +} diff --git a/packages/imperative/__tests__/__unit__/operations/TestOperations2.ts b/packages/imperative/__tests__/__unit__/operations/TestOperations2.ts new file mode 100644 index 0000000000..c3b5c231be --- /dev/null +++ b/packages/imperative/__tests__/__unit__/operations/TestOperations2.ts @@ -0,0 +1,27 @@ +/* +* 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 { TestSubOp4 } from "./subops/TestSubOp4"; +import { TestSubOp5 } from "./subops/TestSubOp5"; +import { Operations } from "../../../../imperative/src/operations/index"; + +export class TestOperations2 extends Operations { + + constructor() { + super("Test Operations 2", true); + this.defineOperations(); + } + + protected defineOperations(): void { + this.addNextOperation(new TestSubOp4()); + this.addNextOperation(new TestSubOp5()); + } +} diff --git a/packages/imperative/__tests__/__unit__/operations/TestOperations3.ts b/packages/imperative/__tests__/__unit__/operations/TestOperations3.ts new file mode 100644 index 0000000000..d7430fb0df --- /dev/null +++ b/packages/imperative/__tests__/__unit__/operations/TestOperations3.ts @@ -0,0 +1,29 @@ +/* +* 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 { TestSubOp6 } from "./subops/TestSubOp6"; +import { TestOperations1 } from "./TestOperations1"; +import { TestOperations2 } from "./TestOperations2"; +import { Operations } from "../../../../imperative/src/operations/index"; + +export class TestOperations3 extends Operations { + + constructor() { + super("Test Operations 3", true); + this.defineOperations(); + } + + protected defineOperations(): void { + this.addNextOperation(new TestOperations1()); + this.addNextOperation(new TestOperations2()); + this.addNextOperation(new TestSubOp6()); + } +} diff --git a/packages/imperative/__tests__/__unit__/operations/TestOperations4.ts b/packages/imperative/__tests__/__unit__/operations/TestOperations4.ts new file mode 100644 index 0000000000..f7a17d3816 --- /dev/null +++ b/packages/imperative/__tests__/__unit__/operations/TestOperations4.ts @@ -0,0 +1,29 @@ +/* +* 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 { TestOperations1 } from "./TestOperations1"; +import { TestOperations2 } from "./TestOperations2"; +import { TestSubOpFail } from "./subops/TestSubOpFail"; +import { Operations } from "../../../../imperative/src/operations/index"; + +export class TestOperations4 extends Operations { + + constructor() { + super("Test Operations 4: Fail Test", true); + this.defineOperations(); + } + + protected defineOperations(): void { + this.addNextOperation(new TestOperations1()); + this.addNextOperation(new TestOperations2()); + this.addNextOperation(new TestSubOpFail()); + } +} diff --git a/packages/imperative/__tests__/__unit__/operations/TestOperations5.ts b/packages/imperative/__tests__/__unit__/operations/TestOperations5.ts new file mode 100644 index 0000000000..2ff821d41c --- /dev/null +++ b/packages/imperative/__tests__/__unit__/operations/TestOperations5.ts @@ -0,0 +1,27 @@ +/* +* 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 { TestOperations1 } from "./TestOperations1"; +import { TestSubOpDiverge } from "./subops/TestSubOpDiverge"; +import { Operations } from "../../../../imperative/src/operations/index"; + +export class TestOperation5 extends Operations { + + constructor() { + super("Test Operations 5: Diverge Test", true); + this.defineOperations(); + } + + protected defineOperations(): void { + this.addNextOperation(new TestOperations1()); + this.addNextOperation(new TestSubOpDiverge()); + } +} diff --git a/packages/imperative/__tests__/__unit__/operations/subops/TestSubOp1.ts b/packages/imperative/__tests__/__unit__/operations/subops/TestSubOp1.ts new file mode 100644 index 0000000000..903fd94a7a --- /dev/null +++ b/packages/imperative/__tests__/__unit__/operations/subops/TestSubOp1.ts @@ -0,0 +1,38 @@ +/* +* 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 { IOperationCompleted, IOperationUndoCompleted, Operation } from "../../../../src/operations"; + +export class TestSubOp1 extends Operation { + + constructor() { + super("Initialize Test Sub Op 1", true); + } + + public logOperationResults(): void { + this.log.info("Test sub operation 1 has ended."); + } + + protected execute(inputParameters: any, operationCompletedCallback: IOperationCompleted) { + this.operationResultMessage = "The test sub op 1 is executing."; + this.setOperationUndoable(); + operationCompletedCallback(Operation.NO_OUTPUT); + } + + protected undo(undoCompletedCallback: IOperationUndoCompleted): void { + this.log.info("Performing undo action for test sub op 1."); + undoCompletedCallback(); + } + + protected logOperationBeginMessages(): void { + this.log.info("Test sub operation 1 is beginning."); + } +} diff --git a/packages/imperative/__tests__/__unit__/operations/subops/TestSubOp2.ts b/packages/imperative/__tests__/__unit__/operations/subops/TestSubOp2.ts new file mode 100644 index 0000000000..44f382a57e --- /dev/null +++ b/packages/imperative/__tests__/__unit__/operations/subops/TestSubOp2.ts @@ -0,0 +1,40 @@ +/* +* 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 { IOperationCompleted, IOperationUndoCompleted, Operation } from "../../../../src/operations"; + +export class TestSubOp2 extends Operation { + + constructor() { + super("Initialize Test Sub Op 2", true); + } + + public logOperationResults(): void { + this.log.info("Test sub operation 2 has ended."); + } + + protected execute(inputParameters: any, operationCompletedCallback: IOperationCompleted) { + this.operationResultMessage = "The test sub op 2 was executed."; + this.setOperationUndoable(); + operationCompletedCallback(Operation.NO_OUTPUT); + } + + protected undo(undoCompletedCallback: IOperationUndoCompleted): void { + this.log.info("Performing undo action for test sub op 2."); + undoCompletedCallback(); + } + + protected logOperationBeginMessages(): void { + this.log.info("Test sub operation 2 is beginning."); + } + + +} diff --git a/packages/imperative/__tests__/__unit__/operations/subops/TestSubOp4.ts b/packages/imperative/__tests__/__unit__/operations/subops/TestSubOp4.ts new file mode 100644 index 0000000000..32ac65678a --- /dev/null +++ b/packages/imperative/__tests__/__unit__/operations/subops/TestSubOp4.ts @@ -0,0 +1,41 @@ +/* +* 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 { IOperationCompleted, IOperationUndoCompleted, Operation } from "../../../../src/operations"; +import { TestLogger } from "../../../../__tests__/src/TestLogger"; + +const logger = TestLogger.getTestLogger(); + +export class TestSubOp4 extends Operation { + + constructor() { + super("Initialize Test Sub Op 4", true); + } + + public logOperationResults(): void { + logger.info("Test sub operation 4 has ended."); + } + + protected execute(inputParameters: any, operationCompletedCallback: IOperationCompleted) { + this.operationResultMessage = "The test sub op 4 was executed."; + this.setOperationUndoable(); + operationCompletedCallback(Operation.NO_OUTPUT); + } + + protected undo(undoCompletedCallback: IOperationUndoCompleted): void { + logger.info("Performing undo action for test sub op 4."); + undoCompletedCallback(); + } + + protected logOperationBeginMessages(): void { + logger.info("Test sub operation 4 is beginning."); + } +} diff --git a/packages/imperative/__tests__/__unit__/operations/subops/TestSubOp5.ts b/packages/imperative/__tests__/__unit__/operations/subops/TestSubOp5.ts new file mode 100644 index 0000000000..2631a866b6 --- /dev/null +++ b/packages/imperative/__tests__/__unit__/operations/subops/TestSubOp5.ts @@ -0,0 +1,41 @@ +/* +* 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 { IOperationCompleted, IOperationUndoCompleted, Operation } from "../../../../src/operations"; +import { TestLogger } from "../../../../__tests__/src/TestLogger"; + +const logger = TestLogger.getTestLogger(); + +export class TestSubOp5 extends Operation { + + constructor() { + super("Initialize Test Sub Op 5", true); + } + + public logOperationResults(): void { + logger.debug("Test sub operation 5 has ended."); + } + + protected execute(inputParameters: any, operationCompletedCallback: IOperationCompleted) { + this.operationResultMessage = "The test sub op 5 was executed."; + this.setOperationUndoable(); + operationCompletedCallback(Operation.NO_OUTPUT); + } + + protected undo(undoCompletedCallback: IOperationUndoCompleted): void { + logger.debug("Performing undo action for test sub op 5."); + undoCompletedCallback(); + } + + protected logOperationBeginMessages(): void { + logger.debug("Test sub operation 5 is beginning."); + } +} diff --git a/packages/imperative/__tests__/__unit__/operations/subops/TestSubOp6.ts b/packages/imperative/__tests__/__unit__/operations/subops/TestSubOp6.ts new file mode 100644 index 0000000000..abb170a0fb --- /dev/null +++ b/packages/imperative/__tests__/__unit__/operations/subops/TestSubOp6.ts @@ -0,0 +1,41 @@ +/* +* 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 { IOperationCompleted, IOperationUndoCompleted, Operation } from "../../../../src/operations"; +import { TestLogger } from "../../../../__tests__/src/TestLogger"; + +const logger = TestLogger.getTestLogger(); + +export class TestSubOp6 extends Operation { + + constructor() { + super("Initialize Test Sub Op 6", true); + } + + public logOperationResults(): void { + logger.debug("Test sub operation 6 has ended."); + } + + protected execute(inputParameters: any, operationCompletedCallback: IOperationCompleted) { + this.operationResultMessage = "The test sub op 6 was executed."; + this.setOperationUndoable(); + operationCompletedCallback(Operation.NO_OUTPUT); + } + + protected undo(undoCompletedCallback: IOperationUndoCompleted): void { + logger.debug("Performing undo action for test sub op 6."); + undoCompletedCallback(); + } + + protected logOperationBeginMessages(): void { + logger.debug("Test sub operation 6 is beginning."); + } +} diff --git a/packages/imperative/__tests__/__unit__/operations/subops/TestSubOpDiverge.ts b/packages/imperative/__tests__/__unit__/operations/subops/TestSubOpDiverge.ts new file mode 100644 index 0000000000..7d3dc1cfc6 --- /dev/null +++ b/packages/imperative/__tests__/__unit__/operations/subops/TestSubOpDiverge.ts @@ -0,0 +1,43 @@ +/* +* 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 { TestOperations2 } from "../TestOperations2"; +import { IOperationCompleted, IOperationUndoCompleted, Operation } from "../../../../src/operations"; +import { TestLogger } from "../../../../__tests__/src/TestLogger"; + +const logger = TestLogger.getTestLogger(); + +export class TestSubOpDiverge extends Operation { + + constructor() { + super("Initialize Test Sub Op diverge", true); + } + + public logOperationResults(): void { + logger.debug("Test sub operation diverge has ended."); + } + + protected execute(inputParameters: any, operationCompletedCallback: IOperationCompleted) { + this.operationResultMessage = "The test sub op diverge was executed."; + this.setOperationUndoable(); + this.setOperationDiverge(new TestOperations2(), true); + operationCompletedCallback(Operation.NO_OUTPUT); + } + + protected undo(undoCompletedCallback: IOperationUndoCompleted): void { + logger.debug("Performing undo action for test sub op diverge."); + undoCompletedCallback(); + } + + protected logOperationBeginMessages(): void { + logger.debug("Test sub operation diverge is beginning."); + } +} diff --git a/packages/imperative/__tests__/__unit__/operations/subops/TestSubOpFail.ts b/packages/imperative/__tests__/__unit__/operations/subops/TestSubOpFail.ts new file mode 100644 index 0000000000..023e8aef48 --- /dev/null +++ b/packages/imperative/__tests__/__unit__/operations/subops/TestSubOpFail.ts @@ -0,0 +1,39 @@ +/* +* 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 { IOperationCompleted, IOperationUndoCompleted, Operation } from "../../../../src/operations"; + +export class TestSubOpFail extends Operation { + + constructor() { + super("Initialize Test Sub Op fail", true); + } + + public logOperationResults(): void { + this.log.info("Test sub operation failed has ended."); + } + + protected execute(inputParameters: any, operationCompletedCallback: IOperationCompleted) { + this.operationResultMessage = "The test sub op diverge was fail."; + this.setOperationUndoable(); + this.setOperationFailed(); + operationCompletedCallback(Operation.NO_OUTPUT); + } + + protected undo(undoCompleteCallback: IOperationUndoCompleted): void { + this.log.info("Performing undo action for test sub op fail."); + undoCompleteCallback(); + } + + protected logOperationBeginMessages(): void { + this.log.info("Test sub operation failed is beginning."); + } +} diff --git a/packages/imperative/__tests__/__unit__/operations/subops/TestSubOpNoUndo.ts b/packages/imperative/__tests__/__unit__/operations/subops/TestSubOpNoUndo.ts new file mode 100644 index 0000000000..5092da9b50 --- /dev/null +++ b/packages/imperative/__tests__/__unit__/operations/subops/TestSubOpNoUndo.ts @@ -0,0 +1,40 @@ +/* +* 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 { IOperationCompleted, IOperationUndoCompleted, Operation } from "../../../../src/operations"; +import { TestLogger } from "../../../../__tests__/src/TestLogger"; + +const logger = TestLogger.getTestLogger(); + +export class TestSubOpNoUndo extends Operation { + + constructor() { + super("Initialize Test Sub Op No Undo", false); + } + + public logOperationResults(): void { + logger.debug("Test sub operation no undo has ended."); + } + + protected execute(inputParameters: any, operationCompletedCallback: IOperationCompleted) { + this.operationResultMessage = "The test sub op No Undo was executed."; + operationCompletedCallback(Operation.NO_OUTPUT); + } + + protected undo(undoCompletedCallback: IOperationUndoCompleted): void { + logger.debug("Performing undo action for test sub op No Undo."); + undoCompletedCallback(); + } + + protected logOperationBeginMessages(): void { + logger.debug("Test sub operation no undo is beginning."); + } +} From f725187c75eafbd734371119fcb60e7b42593f30 Mon Sep 17 00:00:00 2001 From: Timothy Johnson Date: Wed, 17 Jan 2024 18:02:16 -0500 Subject: [PATCH 125/138] Fix pretest:integration script to ignore non-package dirs Signed-off-by: Timothy Johnson --- scripts/sampleCliTool.js | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/scripts/sampleCliTool.js b/scripts/sampleCliTool.js index 3e97f9f93e..c52e91f6c6 100644 --- a/scripts/sampleCliTool.js +++ b/scripts/sampleCliTool.js @@ -18,12 +18,13 @@ const npmPrefix = path.join(process.cwd(), ".npm-global"); function runAll(callback, parallel=false) { if (!parallel) { - glob.sync("packages/imperative/__tests__/__integration__/*").forEach((dir) => { - const command = callback(dir); + glob.sync("packages/imperative/__tests__/__integration__/*/package.json").forEach((pkgJson) => { + const command = callback(path.dirname(pkgJson)); childProcess.execSync(command.command, { cwd: command.cwd, stdio: "inherit" }); }); } else { - require("concurrently")(glob.sync("packages/imperative/__tests__/__integration__/*").map((dir) => callback(dir))); + require("concurrently")(glob.sync("packages/imperative/__tests__/__integration__/*/package.json") + .map((pkgJson) => callback(path.dirname(pkgJson)))); } } From 99296d5c432e9174bc22b9db00b89a9f789edb84 Mon Sep 17 00:00:00 2001 From: "Andrew W. Harn" Date: Thu, 18 Jan 2024 13:52:21 +0000 Subject: [PATCH 126/138] Update Jest Configuration to run more tests in GHA Signed-off-by: Andrew W. Harn --- jest.config.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/jest.config.js b/jest.config.js index a68db0a2a0..bce0456113 100644 --- a/jest.config.js +++ b/jest.config.js @@ -149,5 +149,7 @@ module.exports = { "!**/node_modules/**", "!**/lib/**" ], - "maxWorkers": "67%", // You may need to specify maxWorkers if you run out of RAM + // You may need to specify maxWorkers if you run out of RAM + // GHA should use 75% due to high ram, low core count, end user systems ~67% + "maxWorkers": process.env.GITHUB_ACTIONS != null ? "75%" : "67%", } From 905853e3608f12272a5e9ea983d53827ba1e04ad Mon Sep 17 00:00:00 2001 From: "Andrew W. Harn" Date: Thu, 18 Jan 2024 14:50:08 +0000 Subject: [PATCH 127/138] Restore changelog entry Signed-off-by: Andrew W. Harn --- packages/cli/CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/packages/cli/CHANGELOG.md b/packages/cli/CHANGELOG.md index b33cc424a9..88d4d549e1 100644 --- a/packages/cli/CHANGELOG.md +++ b/packages/cli/CHANGELOG.md @@ -10,6 +10,10 @@ All notable changes to the Zowe CLI package will be documented in this file. - LTS Breaking: Replaced the `ZOWE_EDITOR` environment variable with `ZOWE_OPT_EDITOR` and `--editor` option on commands [#1867](https://github.com/zowe/zowe-cli/issues/1867) +## `8.0.0-next.202311282012` + +- LTS Breaking: Moved `getDataSet` from the `zosfiles` command group to the `zosfiles` SDK as `ZosFilesUtils.getDataSetFromName` [#1696](https://github.com/zowe/zowe-cli/issues/1696) + ## `8.0.0-next.202311141517` - LTS Breaking: Alter the format of error messages to be more clear and actionable. From a4ffd89910ddcb287195f307c4c4a16c4c2b4223 Mon Sep 17 00:00:00 2001 From: Gene Johnston Date: Thu, 18 Jan 2024 15:32:43 -0500 Subject: [PATCH 128/138] Use baseCertKey variable, not hard-coded file name Signed-off-by: Gene Johnston --- .../cli/auth/__scripts__/auth_login_cmd_line_cert.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/imperative/__tests__/__integration__/cmd/__tests__/integration/cli/auth/__scripts__/auth_login_cmd_line_cert.sh b/packages/imperative/__tests__/__integration__/cmd/__tests__/integration/cli/auth/__scripts__/auth_login_cmd_line_cert.sh index 3e0ab84fb9..28214cb99d 100644 --- a/packages/imperative/__tests__/__integration__/cmd/__tests__/integration/cli/auth/__scripts__/auth_login_cmd_line_cert.sh +++ b/packages/imperative/__tests__/__integration__/cmd/__tests__/integration/cli/auth/__scripts__/auth_login_cmd_line_cert.sh @@ -16,7 +16,7 @@ exitOnFailure "Failed to copy config file." $? cp $resourceDir/$baseCertFile . exitOnFailure "Failed to copy certificate file." $? -cp $resourceDir/fakeKey.key . +cp $resourceDir/$baseCertKey . exitOnFailure "Failed to copy certificate key file." $? # remove existing cert from our config file From b687cb8415eb23fdbdafaad9669504b552f05c1d Mon Sep 17 00:00:00 2001 From: Gene Johnston Date: Thu, 18 Jan 2024 15:36:11 -0500 Subject: [PATCH 129/138] Switch order of tests for stderr and stdout Signed-off-by: Gene Johnston --- ...tive-test-cli.config.convert-profiles.integration.subtest.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/imperative/__tests__/__integration__/imperative/__tests__/__integration__/cli/config/convert-profiles/cli.imperative-test-cli.config.convert-profiles.integration.subtest.ts b/packages/imperative/__tests__/__integration__/imperative/__tests__/__integration__/cli/config/convert-profiles/cli.imperative-test-cli.config.convert-profiles.integration.subtest.ts index b6de408423..4078dce115 100644 --- a/packages/imperative/__tests__/__integration__/imperative/__tests__/__integration__/cli/config/convert-profiles/cli.imperative-test-cli.config.convert-profiles.integration.subtest.ts +++ b/packages/imperative/__tests__/__integration__/imperative/__tests__/__integration__/cli/config/convert-profiles/cli.imperative-test-cli.config.convert-profiles.integration.subtest.ts @@ -163,8 +163,8 @@ describe("imperative-test-cli config convert-profiles", () => { it("should not delete profiles if prompt is rejected", () => { // delete profiles previously created, but leave the profile type definitions let response = runCliScript(__dirname + "/__scripts__/delete_profiles.sh", TEST_ENVIRONMENT.workingDir); - expect(response.stdout.toString()).toEqual(""); expect(response.stderr.toString()).toEqual(""); + expect(response.stdout.toString()).toEqual(""); response = runCliScript(__dirname + "/__scripts__/convert_profiles_delete.sh", TEST_ENVIRONMENT.workingDir, ["n"]); expect(response.status).toBe(0); From 80d26e1b7eb7a63f6a66986dc59831ae917c8250 Mon Sep 17 00:00:00 2001 From: zowe-robot Date: Fri, 19 Jan 2024 15:48:39 +0000 Subject: [PATCH 130/138] Bump version to 8.1.0-next.202401191548 [ci skip] Signed-off-by: zowe-robot --- .../__packages__/cli-test-utils/package.json | 4 +- lerna.json | 2 +- npm-shrinkwrap.json | 122 +++++++++--------- packages/cli/CHANGELOG.md | 2 +- packages/cli/package.json | 28 ++-- packages/core/CHANGELOG.md | 2 +- packages/core/package.json | 6 +- packages/imperative/CHANGELOG.md | 2 +- packages/imperative/package.json | 4 +- packages/provisioning/package.json | 8 +- packages/secrets/package.json | 2 +- packages/workflows/package.json | 10 +- packages/zosconsole/package.json | 8 +- packages/zosfiles/package.json | 10 +- packages/zosjobs/package.json | 10 +- packages/zoslogs/package.json | 8 +- packages/zosmf/package.json | 8 +- packages/zostso/package.json | 10 +- packages/zosuss/package.json | 6 +- 19 files changed, 126 insertions(+), 126 deletions(-) diff --git a/__tests__/__packages__/cli-test-utils/package.json b/__tests__/__packages__/cli-test-utils/package.json index b69c7a6c55..564ecb1857 100644 --- a/__tests__/__packages__/cli-test-utils/package.json +++ b/__tests__/__packages__/cli-test-utils/package.json @@ -1,6 +1,6 @@ { "name": "@zowe/cli-test-utils", - "version": "8.0.0-next.202401162202", + "version": "8.1.0-next.202401191548", "description": "Test utilities package for Zowe CLI plug-ins", "author": "Zowe", "license": "EPL-2.0", @@ -43,7 +43,7 @@ "devDependencies": { "@types/js-yaml": "^4.0.0", "@types/uuid": "^8.3.0", - "@zowe/imperative": "8.0.0-next.202401162202" + "@zowe/imperative": "8.1.0-next.202401191548" }, "peerDependencies": { "@zowe/imperative": "^8.0.0-next" diff --git a/lerna.json b/lerna.json index 044cd0678d..dee6432a15 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "8.0.0-next.202401162202", + "version": "8.1.0-next.202401191548", "command": { "publish": { "ignoreChanges": [ diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json index 78f95daf90..c702113a2d 100644 --- a/npm-shrinkwrap.json +++ b/npm-shrinkwrap.json @@ -51,7 +51,7 @@ }, "__tests__/__packages__/cli-test-utils": { "name": "@zowe/cli-test-utils", - "version": "8.0.0-next.202401162202", + "version": "8.1.0-next.202401191548", "license": "EPL-2.0", "dependencies": { "find-up": "^5.0.0", @@ -62,7 +62,7 @@ "devDependencies": { "@types/js-yaml": "^4.0.0", "@types/uuid": "^8.3.0", - "@zowe/imperative": "8.0.0-next.202401162202" + "@zowe/imperative": "8.1.0-next.202401191548" }, "peerDependencies": { "@zowe/imperative": "^8.0.0-next" @@ -21291,21 +21291,21 @@ }, "packages/cli": { "name": "@zowe/cli", - "version": "8.0.0-next.202401162202", + "version": "8.1.0-next.202401191548", "hasInstallScript": true, "license": "EPL-2.0", "dependencies": { - "@zowe/core-for-zowe-sdk": "8.0.0-next.202401162202", - "@zowe/imperative": "8.0.0-next.202401162202", - "@zowe/provisioning-for-zowe-sdk": "8.0.0-next.202401162202", - "@zowe/zos-console-for-zowe-sdk": "8.0.0-next.202401162202", - "@zowe/zos-files-for-zowe-sdk": "8.0.0-next.202401162202", - "@zowe/zos-jobs-for-zowe-sdk": "8.0.0-next.202401162202", - "@zowe/zos-logs-for-zowe-sdk": "8.0.0-next.202401162202", - "@zowe/zos-tso-for-zowe-sdk": "8.0.0-next.202401162202", - "@zowe/zos-uss-for-zowe-sdk": "8.0.0-next.202401162202", - "@zowe/zos-workflows-for-zowe-sdk": "8.0.0-next.202401162202", - "@zowe/zosmf-for-zowe-sdk": "8.0.0-next.202401162202", + "@zowe/core-for-zowe-sdk": "8.1.0-next.202401191548", + "@zowe/imperative": "8.1.0-next.202401191548", + "@zowe/provisioning-for-zowe-sdk": "8.1.0-next.202401191548", + "@zowe/zos-console-for-zowe-sdk": "8.1.0-next.202401191548", + "@zowe/zos-files-for-zowe-sdk": "8.1.0-next.202401191548", + "@zowe/zos-jobs-for-zowe-sdk": "8.1.0-next.202401191548", + "@zowe/zos-logs-for-zowe-sdk": "8.1.0-next.202401191548", + "@zowe/zos-tso-for-zowe-sdk": "8.1.0-next.202401191548", + "@zowe/zos-uss-for-zowe-sdk": "8.1.0-next.202401191548", + "@zowe/zos-workflows-for-zowe-sdk": "8.1.0-next.202401191548", + "@zowe/zosmf-for-zowe-sdk": "8.1.0-next.202401191548", "find-process": "1.4.7", "get-stream": "6.0.1", "lodash": "4.17.21", @@ -21319,7 +21319,7 @@ "@types/diff": "^5.0.2", "@types/lodash": "^4.14.175", "@types/tar": "^6.1.2", - "@zowe/cli-test-utils": "8.0.0-next.202401162202", + "@zowe/cli-test-utils": "8.1.0-next.202401191548", "comment-json": "^4.1.1", "strip-ansi": "^6.0.1", "which": "^2.0.2" @@ -21328,7 +21328,7 @@ "node": ">=14.0.0" }, "optionalDependencies": { - "@zowe/secrets-for-zowe-sdk": "8.0.0-next.202401162202" + "@zowe/secrets-for-zowe-sdk": "8.1.0-next.202401191548" } }, "packages/cli/node_modules/brace-expansion": { @@ -21350,15 +21350,15 @@ }, "packages/core": { "name": "@zowe/core-for-zowe-sdk", - "version": "8.0.0-next.202401162202", + "version": "8.1.0-next.202401191548", "license": "EPL-2.0", "dependencies": { "comment-json": "^4.1.1", "string-width": "^4.2.3" }, "devDependencies": { - "@zowe/cli-test-utils": "8.0.0-next.202401162202", - "@zowe/imperative": "8.0.0-next.202401162202" + "@zowe/cli-test-utils": "8.1.0-next.202401191548", + "@zowe/imperative": "8.1.0-next.202401191548" }, "peerDependencies": { "@zowe/imperative": "^8.0.0-next" @@ -21366,7 +21366,7 @@ }, "packages/imperative": { "name": "@zowe/imperative", - "version": "8.0.0-next.202401162202", + "version": "8.1.0-next.202401191548", "license": "EPL-2.0", "dependencies": { "@types/yargs": "^13.0.4", @@ -21422,7 +21422,7 @@ "@types/readline-sync": "^1.4.3", "@types/rimraf": "^3.0.2", "@types/stack-trace": "^0.0.29", - "@zowe/secrets-for-zowe-sdk": "8.0.0-next.202401162202", + "@zowe/secrets-for-zowe-sdk": "8.1.0-next.202401191548", "concurrently": "^7.5.0", "cowsay": "^1.2.1", "deep-diff": "^0.3.8", @@ -21689,16 +21689,16 @@ }, "packages/provisioning": { "name": "@zowe/provisioning-for-zowe-sdk", - "version": "8.0.0-next.202401162202", + "version": "8.1.0-next.202401191548", "license": "EPL-2.0", "dependencies": { "js-yaml": "^4.1.0" }, "devDependencies": { "@types/js-yaml": "^4.0.5", - "@zowe/cli-test-utils": "8.0.0-next.202401162202", - "@zowe/core-for-zowe-sdk": "8.0.0-next.202401162202", - "@zowe/imperative": "8.0.0-next.202401162202" + "@zowe/cli-test-utils": "8.1.0-next.202401191548", + "@zowe/core-for-zowe-sdk": "8.1.0-next.202401191548", + "@zowe/imperative": "8.1.0-next.202401191548" }, "peerDependencies": { "@zowe/core-for-zowe-sdk": "^8.0.0-next", @@ -21707,7 +21707,7 @@ }, "packages/secrets": { "name": "@zowe/secrets-for-zowe-sdk", - "version": "8.0.0-next.202401162202", + "version": "8.1.0-next.202401191548", "hasInstallScript": true, "license": "EPL-2.0", "devDependencies": { @@ -21720,15 +21720,15 @@ }, "packages/workflows": { "name": "@zowe/zos-workflows-for-zowe-sdk", - "version": "8.0.0-next.202401162202", + "version": "8.1.0-next.202401191548", "license": "EPL-2.0", "dependencies": { - "@zowe/zos-files-for-zowe-sdk": "8.0.0-next.202401162202" + "@zowe/zos-files-for-zowe-sdk": "8.1.0-next.202401191548" }, "devDependencies": { - "@zowe/cli-test-utils": "8.0.0-next.202401162202", - "@zowe/core-for-zowe-sdk": "8.0.0-next.202401162202", - "@zowe/imperative": "8.0.0-next.202401162202" + "@zowe/cli-test-utils": "8.1.0-next.202401191548", + "@zowe/core-for-zowe-sdk": "8.1.0-next.202401191548", + "@zowe/imperative": "8.1.0-next.202401191548" }, "peerDependencies": { "@zowe/core-for-zowe-sdk": "^8.0.0-next", @@ -21737,12 +21737,12 @@ }, "packages/zosconsole": { "name": "@zowe/zos-console-for-zowe-sdk", - "version": "8.0.0-next.202401162202", + "version": "8.1.0-next.202401191548", "license": "EPL-2.0", "devDependencies": { - "@zowe/cli-test-utils": "8.0.0-next.202401162202", - "@zowe/core-for-zowe-sdk": "8.0.0-next.202401162202", - "@zowe/imperative": "8.0.0-next.202401162202" + "@zowe/cli-test-utils": "8.1.0-next.202401191548", + "@zowe/core-for-zowe-sdk": "8.1.0-next.202401191548", + "@zowe/imperative": "8.1.0-next.202401191548" }, "peerDependencies": { "@zowe/core-for-zowe-sdk": "^8.0.0-next", @@ -21751,17 +21751,17 @@ }, "packages/zosfiles": { "name": "@zowe/zos-files-for-zowe-sdk", - "version": "8.0.0-next.202401162202", + "version": "8.1.0-next.202401191548", "license": "EPL-2.0", "dependencies": { "get-stream": "^6.0.1", "minimatch": "^5.0.1" }, "devDependencies": { - "@zowe/cli-test-utils": "8.0.0-next.202401162202", - "@zowe/core-for-zowe-sdk": "8.0.0-next.202401162202", - "@zowe/imperative": "8.0.0-next.202401162202", - "@zowe/zos-uss-for-zowe-sdk": "8.0.0-next.202401162202" + "@zowe/cli-test-utils": "8.1.0-next.202401191548", + "@zowe/core-for-zowe-sdk": "8.1.0-next.202401191548", + "@zowe/imperative": "8.1.0-next.202401191548", + "@zowe/zos-uss-for-zowe-sdk": "8.1.0-next.202401191548" }, "peerDependencies": { "@zowe/core-for-zowe-sdk": "^8.0.0-next", @@ -21787,15 +21787,15 @@ }, "packages/zosjobs": { "name": "@zowe/zos-jobs-for-zowe-sdk", - "version": "8.0.0-next.202401162202", + "version": "8.1.0-next.202401191548", "license": "EPL-2.0", "dependencies": { - "@zowe/zos-files-for-zowe-sdk": "8.0.0-next.202401162202" + "@zowe/zos-files-for-zowe-sdk": "8.1.0-next.202401191548" }, "devDependencies": { - "@zowe/cli-test-utils": "8.0.0-next.202401162202", - "@zowe/core-for-zowe-sdk": "8.0.0-next.202401162202", - "@zowe/imperative": "8.0.0-next.202401162202" + "@zowe/cli-test-utils": "8.1.0-next.202401191548", + "@zowe/core-for-zowe-sdk": "8.1.0-next.202401191548", + "@zowe/imperative": "8.1.0-next.202401191548" }, "peerDependencies": { "@zowe/core-for-zowe-sdk": "^8.0.0-next", @@ -21804,12 +21804,12 @@ }, "packages/zoslogs": { "name": "@zowe/zos-logs-for-zowe-sdk", - "version": "8.0.0-next.202401162202", + "version": "8.1.0-next.202401191548", "license": "EPL-2.0", "devDependencies": { - "@zowe/cli-test-utils": "8.0.0-next.202401162202", - "@zowe/core-for-zowe-sdk": "8.0.0-next.202401162202", - "@zowe/imperative": "8.0.0-next.202401162202" + "@zowe/cli-test-utils": "8.1.0-next.202401191548", + "@zowe/core-for-zowe-sdk": "8.1.0-next.202401191548", + "@zowe/imperative": "8.1.0-next.202401191548" }, "peerDependencies": { "@zowe/core-for-zowe-sdk": "^8.0.0-next", @@ -21818,12 +21818,12 @@ }, "packages/zosmf": { "name": "@zowe/zosmf-for-zowe-sdk", - "version": "8.0.0-next.202401162202", + "version": "8.1.0-next.202401191548", "license": "EPL-2.0", "devDependencies": { - "@zowe/cli-test-utils": "8.0.0-next.202401162202", - "@zowe/core-for-zowe-sdk": "8.0.0-next.202401162202", - "@zowe/imperative": "8.0.0-next.202401162202" + "@zowe/cli-test-utils": "8.1.0-next.202401191548", + "@zowe/core-for-zowe-sdk": "8.1.0-next.202401191548", + "@zowe/imperative": "8.1.0-next.202401191548" }, "peerDependencies": { "@zowe/core-for-zowe-sdk": "^8.0.0-next", @@ -21832,15 +21832,15 @@ }, "packages/zostso": { "name": "@zowe/zos-tso-for-zowe-sdk", - "version": "8.0.0-next.202401162202", + "version": "8.1.0-next.202401191548", "license": "EPL-2.0", "dependencies": { - "@zowe/zosmf-for-zowe-sdk": "8.0.0-next.202401162202" + "@zowe/zosmf-for-zowe-sdk": "8.1.0-next.202401191548" }, "devDependencies": { - "@zowe/cli-test-utils": "8.0.0-next.202401162202", - "@zowe/core-for-zowe-sdk": "8.0.0-next.202401162202", - "@zowe/imperative": "8.0.0-next.202401162202" + "@zowe/cli-test-utils": "8.1.0-next.202401191548", + "@zowe/core-for-zowe-sdk": "8.1.0-next.202401191548", + "@zowe/imperative": "8.1.0-next.202401191548" }, "peerDependencies": { "@zowe/core-for-zowe-sdk": "^8.0.0-next", @@ -21849,15 +21849,15 @@ }, "packages/zosuss": { "name": "@zowe/zos-uss-for-zowe-sdk", - "version": "8.0.0-next.202401162202", + "version": "8.1.0-next.202401191548", "license": "EPL-2.0", "dependencies": { "ssh2": "^1.15.0" }, "devDependencies": { "@types/ssh2": "^1.11.0", - "@zowe/cli-test-utils": "8.0.0-next.202401162202", - "@zowe/imperative": "8.0.0-next.202401162202" + "@zowe/cli-test-utils": "8.1.0-next.202401191548", + "@zowe/imperative": "8.1.0-next.202401191548" }, "peerDependencies": { "@zowe/imperative": "^8.0.0-next" diff --git a/packages/cli/CHANGELOG.md b/packages/cli/CHANGELOG.md index 3f44f4df6b..cb4258b76d 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 +## `8.1.0-next.202401191548` - LTS Breaking: Removed all 'profiles' commands, since they only worked with now-obsolete V1 profiles. - BugFix: Properly construct workflow error messages to display properly with V3 error formatting. diff --git a/packages/cli/package.json b/packages/cli/package.json index 842da65ed6..5bc9d8180f 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -1,6 +1,6 @@ { "name": "@zowe/cli", - "version": "8.0.0-next.202401162202", + "version": "8.1.0-next.202401191548", "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", @@ -57,17 +57,17 @@ "preshrinkwrap": "node ../../scripts/rewriteShrinkwrap.js" }, "dependencies": { - "@zowe/core-for-zowe-sdk": "8.0.0-next.202401162202", - "@zowe/imperative": "8.0.0-next.202401162202", - "@zowe/provisioning-for-zowe-sdk": "8.0.0-next.202401162202", - "@zowe/zos-console-for-zowe-sdk": "8.0.0-next.202401162202", - "@zowe/zos-files-for-zowe-sdk": "8.0.0-next.202401162202", - "@zowe/zos-jobs-for-zowe-sdk": "8.0.0-next.202401162202", - "@zowe/zos-logs-for-zowe-sdk": "8.0.0-next.202401162202", - "@zowe/zos-tso-for-zowe-sdk": "8.0.0-next.202401162202", - "@zowe/zos-uss-for-zowe-sdk": "8.0.0-next.202401162202", - "@zowe/zos-workflows-for-zowe-sdk": "8.0.0-next.202401162202", - "@zowe/zosmf-for-zowe-sdk": "8.0.0-next.202401162202", + "@zowe/core-for-zowe-sdk": "8.1.0-next.202401191548", + "@zowe/imperative": "8.1.0-next.202401191548", + "@zowe/provisioning-for-zowe-sdk": "8.1.0-next.202401191548", + "@zowe/zos-console-for-zowe-sdk": "8.1.0-next.202401191548", + "@zowe/zos-files-for-zowe-sdk": "8.1.0-next.202401191548", + "@zowe/zos-jobs-for-zowe-sdk": "8.1.0-next.202401191548", + "@zowe/zos-logs-for-zowe-sdk": "8.1.0-next.202401191548", + "@zowe/zos-tso-for-zowe-sdk": "8.1.0-next.202401191548", + "@zowe/zos-uss-for-zowe-sdk": "8.1.0-next.202401191548", + "@zowe/zos-workflows-for-zowe-sdk": "8.1.0-next.202401191548", + "@zowe/zosmf-for-zowe-sdk": "8.1.0-next.202401191548", "find-process": "1.4.7", "get-stream": "6.0.1", "lodash": "4.17.21", @@ -78,13 +78,13 @@ "@types/diff": "^5.0.2", "@types/lodash": "^4.14.175", "@types/tar": "^6.1.2", - "@zowe/cli-test-utils": "8.0.0-next.202401162202", + "@zowe/cli-test-utils": "8.1.0-next.202401191548", "comment-json": "^4.1.1", "strip-ansi": "^6.0.1", "which": "^2.0.2" }, "optionalDependencies": { - "@zowe/secrets-for-zowe-sdk": "8.0.0-next.202401162202" + "@zowe/secrets-for-zowe-sdk": "8.1.0-next.202401191548" }, "engines": { "node": ">=14.0.0" diff --git a/packages/core/CHANGELOG.md b/packages/core/CHANGELOG.md index 905e442b16..8b0c5cf277 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 +## `8.1.0-next.202401191548` - LTS Breaking: Removed all 'profiles' commands, since they only worked with now-obsolete V1 profiles. - BugFix: Include text from a REST response's causeErrors.message property in error messages. diff --git a/packages/core/package.json b/packages/core/package.json index 4ca44dff3f..a5e388f512 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -1,6 +1,6 @@ { "name": "@zowe/core-for-zowe-sdk", - "version": "8.0.0-next.202401162202", + "version": "8.1.0-next.202401191548", "description": "Core libraries shared by Zowe SDK packages", "author": "Zowe", "license": "EPL-2.0", @@ -49,8 +49,8 @@ "string-width": "^4.2.3" }, "devDependencies": { - "@zowe/cli-test-utils": "8.0.0-next.202401162202", - "@zowe/imperative": "8.0.0-next.202401162202" + "@zowe/cli-test-utils": "8.1.0-next.202401191548", + "@zowe/imperative": "8.1.0-next.202401191548" }, "peerDependencies": { "@zowe/imperative": "^8.0.0-next" diff --git a/packages/imperative/CHANGELOG.md b/packages/imperative/CHANGELOG.md index 4e0ba9d5f1..281ac6f442 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 +## `8.1.0-next.202401191548` - LTS Breaking: Removed the following: - All 'profiles' commands, since they only worked with now-obsolete V1 profiles. diff --git a/packages/imperative/package.json b/packages/imperative/package.json index c4cc6b0c6e..9df72bf96f 100644 --- a/packages/imperative/package.json +++ b/packages/imperative/package.json @@ -1,6 +1,6 @@ { "name": "@zowe/imperative", - "version": "8.0.0-next.202401162202", + "version": "8.1.0-next.202401191548", "description": "framework for building configurable CLIs", "author": "Zowe", "license": "EPL-2.0", @@ -96,7 +96,7 @@ "@types/readline-sync": "^1.4.3", "@types/rimraf": "^3.0.2", "@types/stack-trace": "^0.0.29", - "@zowe/secrets-for-zowe-sdk": "8.0.0-next.202401162202", + "@zowe/secrets-for-zowe-sdk": "8.1.0-next.202401191548", "concurrently": "^7.5.0", "cowsay": "^1.2.1", "deep-diff": "^0.3.8", diff --git a/packages/provisioning/package.json b/packages/provisioning/package.json index 23051f21f5..d35aef7e4b 100644 --- a/packages/provisioning/package.json +++ b/packages/provisioning/package.json @@ -1,6 +1,6 @@ { "name": "@zowe/provisioning-for-zowe-sdk", - "version": "8.0.0-next.202401162202", + "version": "8.1.0-next.202401191548", "description": "Zowe SDK to interact with the z/OS provisioning APIs", "author": "Zowe", "license": "EPL-2.0", @@ -49,9 +49,9 @@ }, "devDependencies": { "@types/js-yaml": "^4.0.5", - "@zowe/cli-test-utils": "8.0.0-next.202401162202", - "@zowe/core-for-zowe-sdk": "8.0.0-next.202401162202", - "@zowe/imperative": "8.0.0-next.202401162202" + "@zowe/cli-test-utils": "8.1.0-next.202401191548", + "@zowe/core-for-zowe-sdk": "8.1.0-next.202401191548", + "@zowe/imperative": "8.1.0-next.202401191548" }, "peerDependencies": { "@zowe/core-for-zowe-sdk": "^8.0.0-next", diff --git a/packages/secrets/package.json b/packages/secrets/package.json index fca1c48c8e..90eb8732c5 100644 --- a/packages/secrets/package.json +++ b/packages/secrets/package.json @@ -3,7 +3,7 @@ "description": "Credential management facilities for Imperative, Zowe CLI, and extenders.", "repository": "https://github.com/zowe/zowe-cli.git", "author": "Zowe", - "version": "8.0.0-next.202401162202", + "version": "8.1.0-next.202401191548", "homepage": "https://github.com/zowe/zowe-cli/tree/master/packages/secrets#readme", "bugs": { "url": "https://github.com/zowe/zowe-cli/issues" diff --git a/packages/workflows/package.json b/packages/workflows/package.json index 23ae6f6c5f..de80c4d41c 100644 --- a/packages/workflows/package.json +++ b/packages/workflows/package.json @@ -1,6 +1,6 @@ { "name": "@zowe/zos-workflows-for-zowe-sdk", - "version": "8.0.0-next.202401162202", + "version": "8.1.0-next.202401191548", "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": "8.0.0-next.202401162202" + "@zowe/zos-files-for-zowe-sdk": "8.1.0-next.202401191548" }, "devDependencies": { - "@zowe/cli-test-utils": "8.0.0-next.202401162202", - "@zowe/core-for-zowe-sdk": "8.0.0-next.202401162202", - "@zowe/imperative": "8.0.0-next.202401162202" + "@zowe/cli-test-utils": "8.1.0-next.202401191548", + "@zowe/core-for-zowe-sdk": "8.1.0-next.202401191548", + "@zowe/imperative": "8.1.0-next.202401191548" }, "peerDependencies": { "@zowe/core-for-zowe-sdk": "^8.0.0-next", diff --git a/packages/zosconsole/package.json b/packages/zosconsole/package.json index fb6c5cac7e..77557cc8dc 100644 --- a/packages/zosconsole/package.json +++ b/packages/zosconsole/package.json @@ -1,6 +1,6 @@ { "name": "@zowe/zos-console-for-zowe-sdk", - "version": "8.0.0-next.202401162202", + "version": "8.1.0-next.202401191548", "description": "Zowe SDK to interact with the z/OS console", "author": "Zowe", "license": "EPL-2.0", @@ -45,9 +45,9 @@ "prepack": "node ../../scripts/prepareLicenses.js" }, "devDependencies": { - "@zowe/cli-test-utils": "8.0.0-next.202401162202", - "@zowe/core-for-zowe-sdk": "8.0.0-next.202401162202", - "@zowe/imperative": "8.0.0-next.202401162202" + "@zowe/cli-test-utils": "8.1.0-next.202401191548", + "@zowe/core-for-zowe-sdk": "8.1.0-next.202401191548", + "@zowe/imperative": "8.1.0-next.202401191548" }, "peerDependencies": { "@zowe/core-for-zowe-sdk": "^8.0.0-next", diff --git a/packages/zosfiles/package.json b/packages/zosfiles/package.json index 30d2bd9936..789355d89c 100644 --- a/packages/zosfiles/package.json +++ b/packages/zosfiles/package.json @@ -1,6 +1,6 @@ { "name": "@zowe/zos-files-for-zowe-sdk", - "version": "8.0.0-next.202401162202", + "version": "8.1.0-next.202401191548", "description": "Zowe SDK to interact with files and data sets on z/OS", "author": "Zowe", "license": "EPL-2.0", @@ -50,10 +50,10 @@ "minimatch": "^5.0.1" }, "devDependencies": { - "@zowe/cli-test-utils": "8.0.0-next.202401162202", - "@zowe/core-for-zowe-sdk": "8.0.0-next.202401162202", - "@zowe/imperative": "8.0.0-next.202401162202", - "@zowe/zos-uss-for-zowe-sdk": "8.0.0-next.202401162202" + "@zowe/cli-test-utils": "8.1.0-next.202401191548", + "@zowe/core-for-zowe-sdk": "8.1.0-next.202401191548", + "@zowe/imperative": "8.1.0-next.202401191548", + "@zowe/zos-uss-for-zowe-sdk": "8.1.0-next.202401191548" }, "peerDependencies": { "@zowe/core-for-zowe-sdk": "^8.0.0-next", diff --git a/packages/zosjobs/package.json b/packages/zosjobs/package.json index ce71a4ba16..80ab5c15f3 100644 --- a/packages/zosjobs/package.json +++ b/packages/zosjobs/package.json @@ -1,6 +1,6 @@ { "name": "@zowe/zos-jobs-for-zowe-sdk", - "version": "8.0.0-next.202401162202", + "version": "8.1.0-next.202401191548", "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": "8.0.0-next.202401162202" + "@zowe/zos-files-for-zowe-sdk": "8.1.0-next.202401191548" }, "devDependencies": { - "@zowe/cli-test-utils": "8.0.0-next.202401162202", - "@zowe/core-for-zowe-sdk": "8.0.0-next.202401162202", - "@zowe/imperative": "8.0.0-next.202401162202" + "@zowe/cli-test-utils": "8.1.0-next.202401191548", + "@zowe/core-for-zowe-sdk": "8.1.0-next.202401191548", + "@zowe/imperative": "8.1.0-next.202401191548" }, "peerDependencies": { "@zowe/core-for-zowe-sdk": "^8.0.0-next", diff --git a/packages/zoslogs/package.json b/packages/zoslogs/package.json index 300eaa34c4..1f6f573a3a 100644 --- a/packages/zoslogs/package.json +++ b/packages/zoslogs/package.json @@ -1,6 +1,6 @@ { "name": "@zowe/zos-logs-for-zowe-sdk", - "version": "8.0.0-next.202401162202", + "version": "8.1.0-next.202401191548", "description": "Zowe SDK to interact with the z/OS logs", "author": "Zowe", "license": "EPL-2.0", @@ -45,9 +45,9 @@ "prepack": "node ../../scripts/prepareLicenses.js" }, "devDependencies": { - "@zowe/cli-test-utils": "8.0.0-next.202401162202", - "@zowe/core-for-zowe-sdk": "8.0.0-next.202401162202", - "@zowe/imperative": "8.0.0-next.202401162202" + "@zowe/cli-test-utils": "8.1.0-next.202401191548", + "@zowe/core-for-zowe-sdk": "8.1.0-next.202401191548", + "@zowe/imperative": "8.1.0-next.202401191548" }, "peerDependencies": { "@zowe/core-for-zowe-sdk": "^8.0.0-next", diff --git a/packages/zosmf/package.json b/packages/zosmf/package.json index 2f59f306a1..0752aede6c 100644 --- a/packages/zosmf/package.json +++ b/packages/zosmf/package.json @@ -1,6 +1,6 @@ { "name": "@zowe/zosmf-for-zowe-sdk", - "version": "8.0.0-next.202401162202", + "version": "8.1.0-next.202401191548", "description": "Zowe SDK to interact with the z/OS Management Facility", "author": "Zowe", "license": "EPL-2.0", @@ -44,9 +44,9 @@ "prepack": "node ../../scripts/prepareLicenses.js" }, "devDependencies": { - "@zowe/cli-test-utils": "8.0.0-next.202401162202", - "@zowe/core-for-zowe-sdk": "8.0.0-next.202401162202", - "@zowe/imperative": "8.0.0-next.202401162202" + "@zowe/cli-test-utils": "8.1.0-next.202401191548", + "@zowe/core-for-zowe-sdk": "8.1.0-next.202401191548", + "@zowe/imperative": "8.1.0-next.202401191548" }, "peerDependencies": { "@zowe/core-for-zowe-sdk": "^8.0.0-next", diff --git a/packages/zostso/package.json b/packages/zostso/package.json index aea2c3e0cf..8bc8a2f20d 100644 --- a/packages/zostso/package.json +++ b/packages/zostso/package.json @@ -1,6 +1,6 @@ { "name": "@zowe/zos-tso-for-zowe-sdk", - "version": "8.0.0-next.202401162202", + "version": "8.1.0-next.202401191548", "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": "8.0.0-next.202401162202" + "@zowe/zosmf-for-zowe-sdk": "8.1.0-next.202401191548" }, "devDependencies": { - "@zowe/cli-test-utils": "8.0.0-next.202401162202", - "@zowe/core-for-zowe-sdk": "8.0.0-next.202401162202", - "@zowe/imperative": "8.0.0-next.202401162202" + "@zowe/cli-test-utils": "8.1.0-next.202401191548", + "@zowe/core-for-zowe-sdk": "8.1.0-next.202401191548", + "@zowe/imperative": "8.1.0-next.202401191548" }, "peerDependencies": { "@zowe/core-for-zowe-sdk": "^8.0.0-next", diff --git a/packages/zosuss/package.json b/packages/zosuss/package.json index a403489be1..b99404da3d 100644 --- a/packages/zosuss/package.json +++ b/packages/zosuss/package.json @@ -1,6 +1,6 @@ { "name": "@zowe/zos-uss-for-zowe-sdk", - "version": "8.0.0-next.202401162202", + "version": "8.1.0-next.202401191548", "description": "Zowe SDK to interact with USS on z/OS", "author": "Zowe", "license": "EPL-2.0", @@ -49,8 +49,8 @@ }, "devDependencies": { "@types/ssh2": "^1.11.0", - "@zowe/cli-test-utils": "8.0.0-next.202401162202", - "@zowe/imperative": "8.0.0-next.202401162202" + "@zowe/cli-test-utils": "8.1.0-next.202401191548", + "@zowe/imperative": "8.1.0-next.202401191548" }, "peerDependencies": { "@zowe/imperative": "^8.0.0-next" From e99347a68c2ea37312a833d9c581bfd222093e78 Mon Sep 17 00:00:00 2001 From: "Andrew W. Harn" Date: Fri, 19 Jan 2024 17:29:40 +0000 Subject: [PATCH 131/138] Revert "Bump version to 8.1.0-next.202401191548" This reverts commit 80d26e1b7eb7a63f6a66986dc59831ae917c8250. Signed-off-by: Andrew W. Harn --- .../__packages__/cli-test-utils/package.json | 4 +- lerna.json | 2 +- npm-shrinkwrap.json | 122 +++++++++--------- packages/cli/CHANGELOG.md | 2 +- packages/cli/package.json | 28 ++-- packages/core/CHANGELOG.md | 2 +- packages/core/package.json | 6 +- packages/imperative/CHANGELOG.md | 2 +- packages/imperative/package.json | 4 +- packages/provisioning/package.json | 8 +- packages/secrets/package.json | 2 +- packages/workflows/package.json | 10 +- packages/zosconsole/package.json | 8 +- packages/zosfiles/package.json | 10 +- packages/zosjobs/package.json | 10 +- packages/zoslogs/package.json | 8 +- packages/zosmf/package.json | 8 +- packages/zostso/package.json | 10 +- packages/zosuss/package.json | 6 +- 19 files changed, 126 insertions(+), 126 deletions(-) diff --git a/__tests__/__packages__/cli-test-utils/package.json b/__tests__/__packages__/cli-test-utils/package.json index 564ecb1857..b69c7a6c55 100644 --- a/__tests__/__packages__/cli-test-utils/package.json +++ b/__tests__/__packages__/cli-test-utils/package.json @@ -1,6 +1,6 @@ { "name": "@zowe/cli-test-utils", - "version": "8.1.0-next.202401191548", + "version": "8.0.0-next.202401162202", "description": "Test utilities package for Zowe CLI plug-ins", "author": "Zowe", "license": "EPL-2.0", @@ -43,7 +43,7 @@ "devDependencies": { "@types/js-yaml": "^4.0.0", "@types/uuid": "^8.3.0", - "@zowe/imperative": "8.1.0-next.202401191548" + "@zowe/imperative": "8.0.0-next.202401162202" }, "peerDependencies": { "@zowe/imperative": "^8.0.0-next" diff --git a/lerna.json b/lerna.json index dee6432a15..044cd0678d 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "8.1.0-next.202401191548", + "version": "8.0.0-next.202401162202", "command": { "publish": { "ignoreChanges": [ diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json index 0230203993..2e4508fa06 100644 --- a/npm-shrinkwrap.json +++ b/npm-shrinkwrap.json @@ -51,7 +51,7 @@ }, "__tests__/__packages__/cli-test-utils": { "name": "@zowe/cli-test-utils", - "version": "8.1.0-next.202401191548", + "version": "8.0.0-next.202401162202", "license": "EPL-2.0", "dependencies": { "find-up": "^5.0.0", @@ -62,7 +62,7 @@ "devDependencies": { "@types/js-yaml": "^4.0.0", "@types/uuid": "^8.3.0", - "@zowe/imperative": "8.1.0-next.202401191548" + "@zowe/imperative": "8.0.0-next.202401162202" }, "peerDependencies": { "@zowe/imperative": "^8.0.0-next" @@ -21284,21 +21284,21 @@ }, "packages/cli": { "name": "@zowe/cli", - "version": "8.1.0-next.202401191548", + "version": "8.0.0-next.202401162202", "hasInstallScript": true, "license": "EPL-2.0", "dependencies": { - "@zowe/core-for-zowe-sdk": "8.1.0-next.202401191548", - "@zowe/imperative": "8.1.0-next.202401191548", - "@zowe/provisioning-for-zowe-sdk": "8.1.0-next.202401191548", - "@zowe/zos-console-for-zowe-sdk": "8.1.0-next.202401191548", - "@zowe/zos-files-for-zowe-sdk": "8.1.0-next.202401191548", - "@zowe/zos-jobs-for-zowe-sdk": "8.1.0-next.202401191548", - "@zowe/zos-logs-for-zowe-sdk": "8.1.0-next.202401191548", - "@zowe/zos-tso-for-zowe-sdk": "8.1.0-next.202401191548", - "@zowe/zos-uss-for-zowe-sdk": "8.1.0-next.202401191548", - "@zowe/zos-workflows-for-zowe-sdk": "8.1.0-next.202401191548", - "@zowe/zosmf-for-zowe-sdk": "8.1.0-next.202401191548", + "@zowe/core-for-zowe-sdk": "8.0.0-next.202401162202", + "@zowe/imperative": "8.0.0-next.202401162202", + "@zowe/provisioning-for-zowe-sdk": "8.0.0-next.202401162202", + "@zowe/zos-console-for-zowe-sdk": "8.0.0-next.202401162202", + "@zowe/zos-files-for-zowe-sdk": "8.0.0-next.202401162202", + "@zowe/zos-jobs-for-zowe-sdk": "8.0.0-next.202401162202", + "@zowe/zos-logs-for-zowe-sdk": "8.0.0-next.202401162202", + "@zowe/zos-tso-for-zowe-sdk": "8.0.0-next.202401162202", + "@zowe/zos-uss-for-zowe-sdk": "8.0.0-next.202401162202", + "@zowe/zos-workflows-for-zowe-sdk": "8.0.0-next.202401162202", + "@zowe/zosmf-for-zowe-sdk": "8.0.0-next.202401162202", "find-process": "1.4.7", "get-stream": "6.0.1", "lodash": "4.17.21", @@ -21312,7 +21312,7 @@ "@types/diff": "^5.0.2", "@types/lodash": "^4.14.175", "@types/tar": "^6.1.2", - "@zowe/cli-test-utils": "8.1.0-next.202401191548", + "@zowe/cli-test-utils": "8.0.0-next.202401162202", "comment-json": "^4.1.1", "strip-ansi": "^6.0.1", "which": "^2.0.2" @@ -21321,7 +21321,7 @@ "node": ">=14.0.0" }, "optionalDependencies": { - "@zowe/secrets-for-zowe-sdk": "8.1.0-next.202401191548" + "@zowe/secrets-for-zowe-sdk": "8.0.0-next.202401162202" } }, "packages/cli/node_modules/brace-expansion": { @@ -21343,15 +21343,15 @@ }, "packages/core": { "name": "@zowe/core-for-zowe-sdk", - "version": "8.1.0-next.202401191548", + "version": "8.0.0-next.202401162202", "license": "EPL-2.0", "dependencies": { "comment-json": "^4.1.1", "string-width": "^4.2.3" }, "devDependencies": { - "@zowe/cli-test-utils": "8.1.0-next.202401191548", - "@zowe/imperative": "8.1.0-next.202401191548" + "@zowe/cli-test-utils": "8.0.0-next.202401162202", + "@zowe/imperative": "8.0.0-next.202401162202" }, "peerDependencies": { "@zowe/imperative": "^8.0.0-next" @@ -21359,7 +21359,7 @@ }, "packages/imperative": { "name": "@zowe/imperative", - "version": "8.1.0-next.202401191548", + "version": "8.0.0-next.202401162202", "license": "EPL-2.0", "dependencies": { "@types/yargs": "^13.0.4", @@ -21415,7 +21415,7 @@ "@types/readline-sync": "^1.4.3", "@types/rimraf": "^3.0.2", "@types/stack-trace": "^0.0.29", - "@zowe/secrets-for-zowe-sdk": "8.1.0-next.202401191548", + "@zowe/secrets-for-zowe-sdk": "8.0.0-next.202401162202", "concurrently": "^7.5.0", "cowsay": "^1.2.1", "deep-diff": "^0.3.8", @@ -21682,16 +21682,16 @@ }, "packages/provisioning": { "name": "@zowe/provisioning-for-zowe-sdk", - "version": "8.1.0-next.202401191548", + "version": "8.0.0-next.202401162202", "license": "EPL-2.0", "dependencies": { "js-yaml": "^4.1.0" }, "devDependencies": { "@types/js-yaml": "^4.0.5", - "@zowe/cli-test-utils": "8.1.0-next.202401191548", - "@zowe/core-for-zowe-sdk": "8.1.0-next.202401191548", - "@zowe/imperative": "8.1.0-next.202401191548" + "@zowe/cli-test-utils": "8.0.0-next.202401162202", + "@zowe/core-for-zowe-sdk": "8.0.0-next.202401162202", + "@zowe/imperative": "8.0.0-next.202401162202" }, "peerDependencies": { "@zowe/core-for-zowe-sdk": "^8.0.0-next", @@ -21700,7 +21700,7 @@ }, "packages/secrets": { "name": "@zowe/secrets-for-zowe-sdk", - "version": "8.1.0-next.202401191548", + "version": "8.0.0-next.202401162202", "hasInstallScript": true, "license": "EPL-2.0", "devDependencies": { @@ -21713,15 +21713,15 @@ }, "packages/workflows": { "name": "@zowe/zos-workflows-for-zowe-sdk", - "version": "8.1.0-next.202401191548", + "version": "8.0.0-next.202401162202", "license": "EPL-2.0", "dependencies": { - "@zowe/zos-files-for-zowe-sdk": "8.1.0-next.202401191548" + "@zowe/zos-files-for-zowe-sdk": "8.0.0-next.202401162202" }, "devDependencies": { - "@zowe/cli-test-utils": "8.1.0-next.202401191548", - "@zowe/core-for-zowe-sdk": "8.1.0-next.202401191548", - "@zowe/imperative": "8.1.0-next.202401191548" + "@zowe/cli-test-utils": "8.0.0-next.202401162202", + "@zowe/core-for-zowe-sdk": "8.0.0-next.202401162202", + "@zowe/imperative": "8.0.0-next.202401162202" }, "peerDependencies": { "@zowe/core-for-zowe-sdk": "^8.0.0-next", @@ -21730,12 +21730,12 @@ }, "packages/zosconsole": { "name": "@zowe/zos-console-for-zowe-sdk", - "version": "8.1.0-next.202401191548", + "version": "8.0.0-next.202401162202", "license": "EPL-2.0", "devDependencies": { - "@zowe/cli-test-utils": "8.1.0-next.202401191548", - "@zowe/core-for-zowe-sdk": "8.1.0-next.202401191548", - "@zowe/imperative": "8.1.0-next.202401191548" + "@zowe/cli-test-utils": "8.0.0-next.202401162202", + "@zowe/core-for-zowe-sdk": "8.0.0-next.202401162202", + "@zowe/imperative": "8.0.0-next.202401162202" }, "peerDependencies": { "@zowe/core-for-zowe-sdk": "^8.0.0-next", @@ -21744,17 +21744,17 @@ }, "packages/zosfiles": { "name": "@zowe/zos-files-for-zowe-sdk", - "version": "8.1.0-next.202401191548", + "version": "8.0.0-next.202401162202", "license": "EPL-2.0", "dependencies": { "get-stream": "^6.0.1", "minimatch": "^5.0.1" }, "devDependencies": { - "@zowe/cli-test-utils": "8.1.0-next.202401191548", - "@zowe/core-for-zowe-sdk": "8.1.0-next.202401191548", - "@zowe/imperative": "8.1.0-next.202401191548", - "@zowe/zos-uss-for-zowe-sdk": "8.1.0-next.202401191548" + "@zowe/cli-test-utils": "8.0.0-next.202401162202", + "@zowe/core-for-zowe-sdk": "8.0.0-next.202401162202", + "@zowe/imperative": "8.0.0-next.202401162202", + "@zowe/zos-uss-for-zowe-sdk": "8.0.0-next.202401162202" }, "peerDependencies": { "@zowe/core-for-zowe-sdk": "^8.0.0-next", @@ -21780,15 +21780,15 @@ }, "packages/zosjobs": { "name": "@zowe/zos-jobs-for-zowe-sdk", - "version": "8.1.0-next.202401191548", + "version": "8.0.0-next.202401162202", "license": "EPL-2.0", "dependencies": { - "@zowe/zos-files-for-zowe-sdk": "8.1.0-next.202401191548" + "@zowe/zos-files-for-zowe-sdk": "8.0.0-next.202401162202" }, "devDependencies": { - "@zowe/cli-test-utils": "8.1.0-next.202401191548", - "@zowe/core-for-zowe-sdk": "8.1.0-next.202401191548", - "@zowe/imperative": "8.1.0-next.202401191548" + "@zowe/cli-test-utils": "8.0.0-next.202401162202", + "@zowe/core-for-zowe-sdk": "8.0.0-next.202401162202", + "@zowe/imperative": "8.0.0-next.202401162202" }, "peerDependencies": { "@zowe/core-for-zowe-sdk": "^8.0.0-next", @@ -21797,12 +21797,12 @@ }, "packages/zoslogs": { "name": "@zowe/zos-logs-for-zowe-sdk", - "version": "8.1.0-next.202401191548", + "version": "8.0.0-next.202401162202", "license": "EPL-2.0", "devDependencies": { - "@zowe/cli-test-utils": "8.1.0-next.202401191548", - "@zowe/core-for-zowe-sdk": "8.1.0-next.202401191548", - "@zowe/imperative": "8.1.0-next.202401191548" + "@zowe/cli-test-utils": "8.0.0-next.202401162202", + "@zowe/core-for-zowe-sdk": "8.0.0-next.202401162202", + "@zowe/imperative": "8.0.0-next.202401162202" }, "peerDependencies": { "@zowe/core-for-zowe-sdk": "^8.0.0-next", @@ -21811,12 +21811,12 @@ }, "packages/zosmf": { "name": "@zowe/zosmf-for-zowe-sdk", - "version": "8.1.0-next.202401191548", + "version": "8.0.0-next.202401162202", "license": "EPL-2.0", "devDependencies": { - "@zowe/cli-test-utils": "8.1.0-next.202401191548", - "@zowe/core-for-zowe-sdk": "8.1.0-next.202401191548", - "@zowe/imperative": "8.1.0-next.202401191548" + "@zowe/cli-test-utils": "8.0.0-next.202401162202", + "@zowe/core-for-zowe-sdk": "8.0.0-next.202401162202", + "@zowe/imperative": "8.0.0-next.202401162202" }, "peerDependencies": { "@zowe/core-for-zowe-sdk": "^8.0.0-next", @@ -21825,15 +21825,15 @@ }, "packages/zostso": { "name": "@zowe/zos-tso-for-zowe-sdk", - "version": "8.1.0-next.202401191548", + "version": "8.0.0-next.202401162202", "license": "EPL-2.0", "dependencies": { - "@zowe/zosmf-for-zowe-sdk": "8.1.0-next.202401191548" + "@zowe/zosmf-for-zowe-sdk": "8.0.0-next.202401162202" }, "devDependencies": { - "@zowe/cli-test-utils": "8.1.0-next.202401191548", - "@zowe/core-for-zowe-sdk": "8.1.0-next.202401191548", - "@zowe/imperative": "8.1.0-next.202401191548" + "@zowe/cli-test-utils": "8.0.0-next.202401162202", + "@zowe/core-for-zowe-sdk": "8.0.0-next.202401162202", + "@zowe/imperative": "8.0.0-next.202401162202" }, "peerDependencies": { "@zowe/core-for-zowe-sdk": "^8.0.0-next", @@ -21842,15 +21842,15 @@ }, "packages/zosuss": { "name": "@zowe/zos-uss-for-zowe-sdk", - "version": "8.1.0-next.202401191548", + "version": "8.0.0-next.202401162202", "license": "EPL-2.0", "dependencies": { "ssh2": "^1.15.0" }, "devDependencies": { "@types/ssh2": "^1.11.0", - "@zowe/cli-test-utils": "8.1.0-next.202401191548", - "@zowe/imperative": "8.1.0-next.202401191548" + "@zowe/cli-test-utils": "8.0.0-next.202401162202", + "@zowe/imperative": "8.0.0-next.202401162202" }, "peerDependencies": { "@zowe/imperative": "^8.0.0-next" diff --git a/packages/cli/CHANGELOG.md b/packages/cli/CHANGELOG.md index 32706bcb22..502906e152 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. -## `8.1.0-next.202401191548` +## Recent Changes - LTS Breaking: Removed all 'profiles' commands, since they only worked with now-obsolete V1 profiles. - BugFix: Properly construct workflow error messages to display properly with V3 error formatting. diff --git a/packages/cli/package.json b/packages/cli/package.json index 5bc9d8180f..842da65ed6 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -1,6 +1,6 @@ { "name": "@zowe/cli", - "version": "8.1.0-next.202401191548", + "version": "8.0.0-next.202401162202", "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", @@ -57,17 +57,17 @@ "preshrinkwrap": "node ../../scripts/rewriteShrinkwrap.js" }, "dependencies": { - "@zowe/core-for-zowe-sdk": "8.1.0-next.202401191548", - "@zowe/imperative": "8.1.0-next.202401191548", - "@zowe/provisioning-for-zowe-sdk": "8.1.0-next.202401191548", - "@zowe/zos-console-for-zowe-sdk": "8.1.0-next.202401191548", - "@zowe/zos-files-for-zowe-sdk": "8.1.0-next.202401191548", - "@zowe/zos-jobs-for-zowe-sdk": "8.1.0-next.202401191548", - "@zowe/zos-logs-for-zowe-sdk": "8.1.0-next.202401191548", - "@zowe/zos-tso-for-zowe-sdk": "8.1.0-next.202401191548", - "@zowe/zos-uss-for-zowe-sdk": "8.1.0-next.202401191548", - "@zowe/zos-workflows-for-zowe-sdk": "8.1.0-next.202401191548", - "@zowe/zosmf-for-zowe-sdk": "8.1.0-next.202401191548", + "@zowe/core-for-zowe-sdk": "8.0.0-next.202401162202", + "@zowe/imperative": "8.0.0-next.202401162202", + "@zowe/provisioning-for-zowe-sdk": "8.0.0-next.202401162202", + "@zowe/zos-console-for-zowe-sdk": "8.0.0-next.202401162202", + "@zowe/zos-files-for-zowe-sdk": "8.0.0-next.202401162202", + "@zowe/zos-jobs-for-zowe-sdk": "8.0.0-next.202401162202", + "@zowe/zos-logs-for-zowe-sdk": "8.0.0-next.202401162202", + "@zowe/zos-tso-for-zowe-sdk": "8.0.0-next.202401162202", + "@zowe/zos-uss-for-zowe-sdk": "8.0.0-next.202401162202", + "@zowe/zos-workflows-for-zowe-sdk": "8.0.0-next.202401162202", + "@zowe/zosmf-for-zowe-sdk": "8.0.0-next.202401162202", "find-process": "1.4.7", "get-stream": "6.0.1", "lodash": "4.17.21", @@ -78,13 +78,13 @@ "@types/diff": "^5.0.2", "@types/lodash": "^4.14.175", "@types/tar": "^6.1.2", - "@zowe/cli-test-utils": "8.1.0-next.202401191548", + "@zowe/cli-test-utils": "8.0.0-next.202401162202", "comment-json": "^4.1.1", "strip-ansi": "^6.0.1", "which": "^2.0.2" }, "optionalDependencies": { - "@zowe/secrets-for-zowe-sdk": "8.1.0-next.202401191548" + "@zowe/secrets-for-zowe-sdk": "8.0.0-next.202401162202" }, "engines": { "node": ">=14.0.0" diff --git a/packages/core/CHANGELOG.md b/packages/core/CHANGELOG.md index f198c83487..146ba9a0ca 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. -## `8.1.0-next.202401191548` +## Recent Changes - LTS Breaking: Removed all 'profiles' commands, since they only worked with now-obsolete V1 profiles. - BugFix: Include text from a REST response's causeErrors.message property in error messages. diff --git a/packages/core/package.json b/packages/core/package.json index a5e388f512..4ca44dff3f 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -1,6 +1,6 @@ { "name": "@zowe/core-for-zowe-sdk", - "version": "8.1.0-next.202401191548", + "version": "8.0.0-next.202401162202", "description": "Core libraries shared by Zowe SDK packages", "author": "Zowe", "license": "EPL-2.0", @@ -49,8 +49,8 @@ "string-width": "^4.2.3" }, "devDependencies": { - "@zowe/cli-test-utils": "8.1.0-next.202401191548", - "@zowe/imperative": "8.1.0-next.202401191548" + "@zowe/cli-test-utils": "8.0.0-next.202401162202", + "@zowe/imperative": "8.0.0-next.202401162202" }, "peerDependencies": { "@zowe/imperative": "^8.0.0-next" diff --git a/packages/imperative/CHANGELOG.md b/packages/imperative/CHANGELOG.md index 1a31bc8ac4..373afd5630 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. -## `8.1.0-next.202401191548` +## Recent Changes - LTS Breaking: Removed the following: - All 'profiles' commands, since they only worked with now-obsolete V1 profiles. diff --git a/packages/imperative/package.json b/packages/imperative/package.json index 9df72bf96f..c4cc6b0c6e 100644 --- a/packages/imperative/package.json +++ b/packages/imperative/package.json @@ -1,6 +1,6 @@ { "name": "@zowe/imperative", - "version": "8.1.0-next.202401191548", + "version": "8.0.0-next.202401162202", "description": "framework for building configurable CLIs", "author": "Zowe", "license": "EPL-2.0", @@ -96,7 +96,7 @@ "@types/readline-sync": "^1.4.3", "@types/rimraf": "^3.0.2", "@types/stack-trace": "^0.0.29", - "@zowe/secrets-for-zowe-sdk": "8.1.0-next.202401191548", + "@zowe/secrets-for-zowe-sdk": "8.0.0-next.202401162202", "concurrently": "^7.5.0", "cowsay": "^1.2.1", "deep-diff": "^0.3.8", diff --git a/packages/provisioning/package.json b/packages/provisioning/package.json index d35aef7e4b..23051f21f5 100644 --- a/packages/provisioning/package.json +++ b/packages/provisioning/package.json @@ -1,6 +1,6 @@ { "name": "@zowe/provisioning-for-zowe-sdk", - "version": "8.1.0-next.202401191548", + "version": "8.0.0-next.202401162202", "description": "Zowe SDK to interact with the z/OS provisioning APIs", "author": "Zowe", "license": "EPL-2.0", @@ -49,9 +49,9 @@ }, "devDependencies": { "@types/js-yaml": "^4.0.5", - "@zowe/cli-test-utils": "8.1.0-next.202401191548", - "@zowe/core-for-zowe-sdk": "8.1.0-next.202401191548", - "@zowe/imperative": "8.1.0-next.202401191548" + "@zowe/cli-test-utils": "8.0.0-next.202401162202", + "@zowe/core-for-zowe-sdk": "8.0.0-next.202401162202", + "@zowe/imperative": "8.0.0-next.202401162202" }, "peerDependencies": { "@zowe/core-for-zowe-sdk": "^8.0.0-next", diff --git a/packages/secrets/package.json b/packages/secrets/package.json index 90eb8732c5..fca1c48c8e 100644 --- a/packages/secrets/package.json +++ b/packages/secrets/package.json @@ -3,7 +3,7 @@ "description": "Credential management facilities for Imperative, Zowe CLI, and extenders.", "repository": "https://github.com/zowe/zowe-cli.git", "author": "Zowe", - "version": "8.1.0-next.202401191548", + "version": "8.0.0-next.202401162202", "homepage": "https://github.com/zowe/zowe-cli/tree/master/packages/secrets#readme", "bugs": { "url": "https://github.com/zowe/zowe-cli/issues" diff --git a/packages/workflows/package.json b/packages/workflows/package.json index de80c4d41c..23ae6f6c5f 100644 --- a/packages/workflows/package.json +++ b/packages/workflows/package.json @@ -1,6 +1,6 @@ { "name": "@zowe/zos-workflows-for-zowe-sdk", - "version": "8.1.0-next.202401191548", + "version": "8.0.0-next.202401162202", "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": "8.1.0-next.202401191548" + "@zowe/zos-files-for-zowe-sdk": "8.0.0-next.202401162202" }, "devDependencies": { - "@zowe/cli-test-utils": "8.1.0-next.202401191548", - "@zowe/core-for-zowe-sdk": "8.1.0-next.202401191548", - "@zowe/imperative": "8.1.0-next.202401191548" + "@zowe/cli-test-utils": "8.0.0-next.202401162202", + "@zowe/core-for-zowe-sdk": "8.0.0-next.202401162202", + "@zowe/imperative": "8.0.0-next.202401162202" }, "peerDependencies": { "@zowe/core-for-zowe-sdk": "^8.0.0-next", diff --git a/packages/zosconsole/package.json b/packages/zosconsole/package.json index 77557cc8dc..fb6c5cac7e 100644 --- a/packages/zosconsole/package.json +++ b/packages/zosconsole/package.json @@ -1,6 +1,6 @@ { "name": "@zowe/zos-console-for-zowe-sdk", - "version": "8.1.0-next.202401191548", + "version": "8.0.0-next.202401162202", "description": "Zowe SDK to interact with the z/OS console", "author": "Zowe", "license": "EPL-2.0", @@ -45,9 +45,9 @@ "prepack": "node ../../scripts/prepareLicenses.js" }, "devDependencies": { - "@zowe/cli-test-utils": "8.1.0-next.202401191548", - "@zowe/core-for-zowe-sdk": "8.1.0-next.202401191548", - "@zowe/imperative": "8.1.0-next.202401191548" + "@zowe/cli-test-utils": "8.0.0-next.202401162202", + "@zowe/core-for-zowe-sdk": "8.0.0-next.202401162202", + "@zowe/imperative": "8.0.0-next.202401162202" }, "peerDependencies": { "@zowe/core-for-zowe-sdk": "^8.0.0-next", diff --git a/packages/zosfiles/package.json b/packages/zosfiles/package.json index 789355d89c..30d2bd9936 100644 --- a/packages/zosfiles/package.json +++ b/packages/zosfiles/package.json @@ -1,6 +1,6 @@ { "name": "@zowe/zos-files-for-zowe-sdk", - "version": "8.1.0-next.202401191548", + "version": "8.0.0-next.202401162202", "description": "Zowe SDK to interact with files and data sets on z/OS", "author": "Zowe", "license": "EPL-2.0", @@ -50,10 +50,10 @@ "minimatch": "^5.0.1" }, "devDependencies": { - "@zowe/cli-test-utils": "8.1.0-next.202401191548", - "@zowe/core-for-zowe-sdk": "8.1.0-next.202401191548", - "@zowe/imperative": "8.1.0-next.202401191548", - "@zowe/zos-uss-for-zowe-sdk": "8.1.0-next.202401191548" + "@zowe/cli-test-utils": "8.0.0-next.202401162202", + "@zowe/core-for-zowe-sdk": "8.0.0-next.202401162202", + "@zowe/imperative": "8.0.0-next.202401162202", + "@zowe/zos-uss-for-zowe-sdk": "8.0.0-next.202401162202" }, "peerDependencies": { "@zowe/core-for-zowe-sdk": "^8.0.0-next", diff --git a/packages/zosjobs/package.json b/packages/zosjobs/package.json index 80ab5c15f3..ce71a4ba16 100644 --- a/packages/zosjobs/package.json +++ b/packages/zosjobs/package.json @@ -1,6 +1,6 @@ { "name": "@zowe/zos-jobs-for-zowe-sdk", - "version": "8.1.0-next.202401191548", + "version": "8.0.0-next.202401162202", "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": "8.1.0-next.202401191548" + "@zowe/zos-files-for-zowe-sdk": "8.0.0-next.202401162202" }, "devDependencies": { - "@zowe/cli-test-utils": "8.1.0-next.202401191548", - "@zowe/core-for-zowe-sdk": "8.1.0-next.202401191548", - "@zowe/imperative": "8.1.0-next.202401191548" + "@zowe/cli-test-utils": "8.0.0-next.202401162202", + "@zowe/core-for-zowe-sdk": "8.0.0-next.202401162202", + "@zowe/imperative": "8.0.0-next.202401162202" }, "peerDependencies": { "@zowe/core-for-zowe-sdk": "^8.0.0-next", diff --git a/packages/zoslogs/package.json b/packages/zoslogs/package.json index 1f6f573a3a..300eaa34c4 100644 --- a/packages/zoslogs/package.json +++ b/packages/zoslogs/package.json @@ -1,6 +1,6 @@ { "name": "@zowe/zos-logs-for-zowe-sdk", - "version": "8.1.0-next.202401191548", + "version": "8.0.0-next.202401162202", "description": "Zowe SDK to interact with the z/OS logs", "author": "Zowe", "license": "EPL-2.0", @@ -45,9 +45,9 @@ "prepack": "node ../../scripts/prepareLicenses.js" }, "devDependencies": { - "@zowe/cli-test-utils": "8.1.0-next.202401191548", - "@zowe/core-for-zowe-sdk": "8.1.0-next.202401191548", - "@zowe/imperative": "8.1.0-next.202401191548" + "@zowe/cli-test-utils": "8.0.0-next.202401162202", + "@zowe/core-for-zowe-sdk": "8.0.0-next.202401162202", + "@zowe/imperative": "8.0.0-next.202401162202" }, "peerDependencies": { "@zowe/core-for-zowe-sdk": "^8.0.0-next", diff --git a/packages/zosmf/package.json b/packages/zosmf/package.json index 0752aede6c..2f59f306a1 100644 --- a/packages/zosmf/package.json +++ b/packages/zosmf/package.json @@ -1,6 +1,6 @@ { "name": "@zowe/zosmf-for-zowe-sdk", - "version": "8.1.0-next.202401191548", + "version": "8.0.0-next.202401162202", "description": "Zowe SDK to interact with the z/OS Management Facility", "author": "Zowe", "license": "EPL-2.0", @@ -44,9 +44,9 @@ "prepack": "node ../../scripts/prepareLicenses.js" }, "devDependencies": { - "@zowe/cli-test-utils": "8.1.0-next.202401191548", - "@zowe/core-for-zowe-sdk": "8.1.0-next.202401191548", - "@zowe/imperative": "8.1.0-next.202401191548" + "@zowe/cli-test-utils": "8.0.0-next.202401162202", + "@zowe/core-for-zowe-sdk": "8.0.0-next.202401162202", + "@zowe/imperative": "8.0.0-next.202401162202" }, "peerDependencies": { "@zowe/core-for-zowe-sdk": "^8.0.0-next", diff --git a/packages/zostso/package.json b/packages/zostso/package.json index 8bc8a2f20d..aea2c3e0cf 100644 --- a/packages/zostso/package.json +++ b/packages/zostso/package.json @@ -1,6 +1,6 @@ { "name": "@zowe/zos-tso-for-zowe-sdk", - "version": "8.1.0-next.202401191548", + "version": "8.0.0-next.202401162202", "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": "8.1.0-next.202401191548" + "@zowe/zosmf-for-zowe-sdk": "8.0.0-next.202401162202" }, "devDependencies": { - "@zowe/cli-test-utils": "8.1.0-next.202401191548", - "@zowe/core-for-zowe-sdk": "8.1.0-next.202401191548", - "@zowe/imperative": "8.1.0-next.202401191548" + "@zowe/cli-test-utils": "8.0.0-next.202401162202", + "@zowe/core-for-zowe-sdk": "8.0.0-next.202401162202", + "@zowe/imperative": "8.0.0-next.202401162202" }, "peerDependencies": { "@zowe/core-for-zowe-sdk": "^8.0.0-next", diff --git a/packages/zosuss/package.json b/packages/zosuss/package.json index b99404da3d..a403489be1 100644 --- a/packages/zosuss/package.json +++ b/packages/zosuss/package.json @@ -1,6 +1,6 @@ { "name": "@zowe/zos-uss-for-zowe-sdk", - "version": "8.1.0-next.202401191548", + "version": "8.0.0-next.202401162202", "description": "Zowe SDK to interact with USS on z/OS", "author": "Zowe", "license": "EPL-2.0", @@ -49,8 +49,8 @@ }, "devDependencies": { "@types/ssh2": "^1.11.0", - "@zowe/cli-test-utils": "8.1.0-next.202401191548", - "@zowe/imperative": "8.1.0-next.202401191548" + "@zowe/cli-test-utils": "8.0.0-next.202401162202", + "@zowe/imperative": "8.0.0-next.202401162202" }, "peerDependencies": { "@zowe/imperative": "^8.0.0-next" From 7847dfb0bd634779c8b1b47fbccf85b7369f3c86 Mon Sep 17 00:00:00 2001 From: zowe-robot Date: Fri, 19 Jan 2024 19:54:56 +0000 Subject: [PATCH 132/138] Bump version to 8.0.0-next.202401191954 [ci skip] Signed-off-by: zowe-robot --- .../__packages__/cli-test-utils/package.json | 4 +- lerna.json | 2 +- npm-shrinkwrap.json | 122 +++++++++--------- packages/cli/CHANGELOG.md | 2 +- packages/cli/package.json | 28 ++-- packages/core/CHANGELOG.md | 2 +- packages/core/package.json | 6 +- packages/imperative/CHANGELOG.md | 2 +- packages/imperative/package.json | 4 +- packages/provisioning/package.json | 8 +- packages/secrets/package.json | 2 +- packages/workflows/package.json | 10 +- packages/zosconsole/package.json | 8 +- packages/zosfiles/package.json | 10 +- packages/zosjobs/package.json | 10 +- packages/zoslogs/package.json | 8 +- packages/zosmf/package.json | 8 +- packages/zostso/package.json | 10 +- packages/zosuss/package.json | 6 +- 19 files changed, 126 insertions(+), 126 deletions(-) diff --git a/__tests__/__packages__/cli-test-utils/package.json b/__tests__/__packages__/cli-test-utils/package.json index b69c7a6c55..fd4ba2e5e3 100644 --- a/__tests__/__packages__/cli-test-utils/package.json +++ b/__tests__/__packages__/cli-test-utils/package.json @@ -1,6 +1,6 @@ { "name": "@zowe/cli-test-utils", - "version": "8.0.0-next.202401162202", + "version": "8.0.0-next.202401191954", "description": "Test utilities package for Zowe CLI plug-ins", "author": "Zowe", "license": "EPL-2.0", @@ -43,7 +43,7 @@ "devDependencies": { "@types/js-yaml": "^4.0.0", "@types/uuid": "^8.3.0", - "@zowe/imperative": "8.0.0-next.202401162202" + "@zowe/imperative": "8.0.0-next.202401191954" }, "peerDependencies": { "@zowe/imperative": "^8.0.0-next" diff --git a/lerna.json b/lerna.json index 044cd0678d..07e4e8da51 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "8.0.0-next.202401162202", + "version": "8.0.0-next.202401191954", "command": { "publish": { "ignoreChanges": [ diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json index 2e4508fa06..661fe3831c 100644 --- a/npm-shrinkwrap.json +++ b/npm-shrinkwrap.json @@ -51,7 +51,7 @@ }, "__tests__/__packages__/cli-test-utils": { "name": "@zowe/cli-test-utils", - "version": "8.0.0-next.202401162202", + "version": "8.0.0-next.202401191954", "license": "EPL-2.0", "dependencies": { "find-up": "^5.0.0", @@ -62,7 +62,7 @@ "devDependencies": { "@types/js-yaml": "^4.0.0", "@types/uuid": "^8.3.0", - "@zowe/imperative": "8.0.0-next.202401162202" + "@zowe/imperative": "8.0.0-next.202401191954" }, "peerDependencies": { "@zowe/imperative": "^8.0.0-next" @@ -21284,21 +21284,21 @@ }, "packages/cli": { "name": "@zowe/cli", - "version": "8.0.0-next.202401162202", + "version": "8.0.0-next.202401191954", "hasInstallScript": true, "license": "EPL-2.0", "dependencies": { - "@zowe/core-for-zowe-sdk": "8.0.0-next.202401162202", - "@zowe/imperative": "8.0.0-next.202401162202", - "@zowe/provisioning-for-zowe-sdk": "8.0.0-next.202401162202", - "@zowe/zos-console-for-zowe-sdk": "8.0.0-next.202401162202", - "@zowe/zos-files-for-zowe-sdk": "8.0.0-next.202401162202", - "@zowe/zos-jobs-for-zowe-sdk": "8.0.0-next.202401162202", - "@zowe/zos-logs-for-zowe-sdk": "8.0.0-next.202401162202", - "@zowe/zos-tso-for-zowe-sdk": "8.0.0-next.202401162202", - "@zowe/zos-uss-for-zowe-sdk": "8.0.0-next.202401162202", - "@zowe/zos-workflows-for-zowe-sdk": "8.0.0-next.202401162202", - "@zowe/zosmf-for-zowe-sdk": "8.0.0-next.202401162202", + "@zowe/core-for-zowe-sdk": "8.0.0-next.202401191954", + "@zowe/imperative": "8.0.0-next.202401191954", + "@zowe/provisioning-for-zowe-sdk": "8.0.0-next.202401191954", + "@zowe/zos-console-for-zowe-sdk": "8.0.0-next.202401191954", + "@zowe/zos-files-for-zowe-sdk": "8.0.0-next.202401191954", + "@zowe/zos-jobs-for-zowe-sdk": "8.0.0-next.202401191954", + "@zowe/zos-logs-for-zowe-sdk": "8.0.0-next.202401191954", + "@zowe/zos-tso-for-zowe-sdk": "8.0.0-next.202401191954", + "@zowe/zos-uss-for-zowe-sdk": "8.0.0-next.202401191954", + "@zowe/zos-workflows-for-zowe-sdk": "8.0.0-next.202401191954", + "@zowe/zosmf-for-zowe-sdk": "8.0.0-next.202401191954", "find-process": "1.4.7", "get-stream": "6.0.1", "lodash": "4.17.21", @@ -21312,7 +21312,7 @@ "@types/diff": "^5.0.2", "@types/lodash": "^4.14.175", "@types/tar": "^6.1.2", - "@zowe/cli-test-utils": "8.0.0-next.202401162202", + "@zowe/cli-test-utils": "8.0.0-next.202401191954", "comment-json": "^4.1.1", "strip-ansi": "^6.0.1", "which": "^2.0.2" @@ -21321,7 +21321,7 @@ "node": ">=14.0.0" }, "optionalDependencies": { - "@zowe/secrets-for-zowe-sdk": "8.0.0-next.202401162202" + "@zowe/secrets-for-zowe-sdk": "8.0.0-next.202401191954" } }, "packages/cli/node_modules/brace-expansion": { @@ -21343,15 +21343,15 @@ }, "packages/core": { "name": "@zowe/core-for-zowe-sdk", - "version": "8.0.0-next.202401162202", + "version": "8.0.0-next.202401191954", "license": "EPL-2.0", "dependencies": { "comment-json": "^4.1.1", "string-width": "^4.2.3" }, "devDependencies": { - "@zowe/cli-test-utils": "8.0.0-next.202401162202", - "@zowe/imperative": "8.0.0-next.202401162202" + "@zowe/cli-test-utils": "8.0.0-next.202401191954", + "@zowe/imperative": "8.0.0-next.202401191954" }, "peerDependencies": { "@zowe/imperative": "^8.0.0-next" @@ -21359,7 +21359,7 @@ }, "packages/imperative": { "name": "@zowe/imperative", - "version": "8.0.0-next.202401162202", + "version": "8.0.0-next.202401191954", "license": "EPL-2.0", "dependencies": { "@types/yargs": "^13.0.4", @@ -21415,7 +21415,7 @@ "@types/readline-sync": "^1.4.3", "@types/rimraf": "^3.0.2", "@types/stack-trace": "^0.0.29", - "@zowe/secrets-for-zowe-sdk": "8.0.0-next.202401162202", + "@zowe/secrets-for-zowe-sdk": "8.0.0-next.202401191954", "concurrently": "^7.5.0", "cowsay": "^1.2.1", "deep-diff": "^0.3.8", @@ -21682,16 +21682,16 @@ }, "packages/provisioning": { "name": "@zowe/provisioning-for-zowe-sdk", - "version": "8.0.0-next.202401162202", + "version": "8.0.0-next.202401191954", "license": "EPL-2.0", "dependencies": { "js-yaml": "^4.1.0" }, "devDependencies": { "@types/js-yaml": "^4.0.5", - "@zowe/cli-test-utils": "8.0.0-next.202401162202", - "@zowe/core-for-zowe-sdk": "8.0.0-next.202401162202", - "@zowe/imperative": "8.0.0-next.202401162202" + "@zowe/cli-test-utils": "8.0.0-next.202401191954", + "@zowe/core-for-zowe-sdk": "8.0.0-next.202401191954", + "@zowe/imperative": "8.0.0-next.202401191954" }, "peerDependencies": { "@zowe/core-for-zowe-sdk": "^8.0.0-next", @@ -21700,7 +21700,7 @@ }, "packages/secrets": { "name": "@zowe/secrets-for-zowe-sdk", - "version": "8.0.0-next.202401162202", + "version": "8.0.0-next.202401191954", "hasInstallScript": true, "license": "EPL-2.0", "devDependencies": { @@ -21713,15 +21713,15 @@ }, "packages/workflows": { "name": "@zowe/zos-workflows-for-zowe-sdk", - "version": "8.0.0-next.202401162202", + "version": "8.0.0-next.202401191954", "license": "EPL-2.0", "dependencies": { - "@zowe/zos-files-for-zowe-sdk": "8.0.0-next.202401162202" + "@zowe/zos-files-for-zowe-sdk": "8.0.0-next.202401191954" }, "devDependencies": { - "@zowe/cli-test-utils": "8.0.0-next.202401162202", - "@zowe/core-for-zowe-sdk": "8.0.0-next.202401162202", - "@zowe/imperative": "8.0.0-next.202401162202" + "@zowe/cli-test-utils": "8.0.0-next.202401191954", + "@zowe/core-for-zowe-sdk": "8.0.0-next.202401191954", + "@zowe/imperative": "8.0.0-next.202401191954" }, "peerDependencies": { "@zowe/core-for-zowe-sdk": "^8.0.0-next", @@ -21730,12 +21730,12 @@ }, "packages/zosconsole": { "name": "@zowe/zos-console-for-zowe-sdk", - "version": "8.0.0-next.202401162202", + "version": "8.0.0-next.202401191954", "license": "EPL-2.0", "devDependencies": { - "@zowe/cli-test-utils": "8.0.0-next.202401162202", - "@zowe/core-for-zowe-sdk": "8.0.0-next.202401162202", - "@zowe/imperative": "8.0.0-next.202401162202" + "@zowe/cli-test-utils": "8.0.0-next.202401191954", + "@zowe/core-for-zowe-sdk": "8.0.0-next.202401191954", + "@zowe/imperative": "8.0.0-next.202401191954" }, "peerDependencies": { "@zowe/core-for-zowe-sdk": "^8.0.0-next", @@ -21744,17 +21744,17 @@ }, "packages/zosfiles": { "name": "@zowe/zos-files-for-zowe-sdk", - "version": "8.0.0-next.202401162202", + "version": "8.0.0-next.202401191954", "license": "EPL-2.0", "dependencies": { "get-stream": "^6.0.1", "minimatch": "^5.0.1" }, "devDependencies": { - "@zowe/cli-test-utils": "8.0.0-next.202401162202", - "@zowe/core-for-zowe-sdk": "8.0.0-next.202401162202", - "@zowe/imperative": "8.0.0-next.202401162202", - "@zowe/zos-uss-for-zowe-sdk": "8.0.0-next.202401162202" + "@zowe/cli-test-utils": "8.0.0-next.202401191954", + "@zowe/core-for-zowe-sdk": "8.0.0-next.202401191954", + "@zowe/imperative": "8.0.0-next.202401191954", + "@zowe/zos-uss-for-zowe-sdk": "8.0.0-next.202401191954" }, "peerDependencies": { "@zowe/core-for-zowe-sdk": "^8.0.0-next", @@ -21780,15 +21780,15 @@ }, "packages/zosjobs": { "name": "@zowe/zos-jobs-for-zowe-sdk", - "version": "8.0.0-next.202401162202", + "version": "8.0.0-next.202401191954", "license": "EPL-2.0", "dependencies": { - "@zowe/zos-files-for-zowe-sdk": "8.0.0-next.202401162202" + "@zowe/zos-files-for-zowe-sdk": "8.0.0-next.202401191954" }, "devDependencies": { - "@zowe/cli-test-utils": "8.0.0-next.202401162202", - "@zowe/core-for-zowe-sdk": "8.0.0-next.202401162202", - "@zowe/imperative": "8.0.0-next.202401162202" + "@zowe/cli-test-utils": "8.0.0-next.202401191954", + "@zowe/core-for-zowe-sdk": "8.0.0-next.202401191954", + "@zowe/imperative": "8.0.0-next.202401191954" }, "peerDependencies": { "@zowe/core-for-zowe-sdk": "^8.0.0-next", @@ -21797,12 +21797,12 @@ }, "packages/zoslogs": { "name": "@zowe/zos-logs-for-zowe-sdk", - "version": "8.0.0-next.202401162202", + "version": "8.0.0-next.202401191954", "license": "EPL-2.0", "devDependencies": { - "@zowe/cli-test-utils": "8.0.0-next.202401162202", - "@zowe/core-for-zowe-sdk": "8.0.0-next.202401162202", - "@zowe/imperative": "8.0.0-next.202401162202" + "@zowe/cli-test-utils": "8.0.0-next.202401191954", + "@zowe/core-for-zowe-sdk": "8.0.0-next.202401191954", + "@zowe/imperative": "8.0.0-next.202401191954" }, "peerDependencies": { "@zowe/core-for-zowe-sdk": "^8.0.0-next", @@ -21811,12 +21811,12 @@ }, "packages/zosmf": { "name": "@zowe/zosmf-for-zowe-sdk", - "version": "8.0.0-next.202401162202", + "version": "8.0.0-next.202401191954", "license": "EPL-2.0", "devDependencies": { - "@zowe/cli-test-utils": "8.0.0-next.202401162202", - "@zowe/core-for-zowe-sdk": "8.0.0-next.202401162202", - "@zowe/imperative": "8.0.0-next.202401162202" + "@zowe/cli-test-utils": "8.0.0-next.202401191954", + "@zowe/core-for-zowe-sdk": "8.0.0-next.202401191954", + "@zowe/imperative": "8.0.0-next.202401191954" }, "peerDependencies": { "@zowe/core-for-zowe-sdk": "^8.0.0-next", @@ -21825,15 +21825,15 @@ }, "packages/zostso": { "name": "@zowe/zos-tso-for-zowe-sdk", - "version": "8.0.0-next.202401162202", + "version": "8.0.0-next.202401191954", "license": "EPL-2.0", "dependencies": { - "@zowe/zosmf-for-zowe-sdk": "8.0.0-next.202401162202" + "@zowe/zosmf-for-zowe-sdk": "8.0.0-next.202401191954" }, "devDependencies": { - "@zowe/cli-test-utils": "8.0.0-next.202401162202", - "@zowe/core-for-zowe-sdk": "8.0.0-next.202401162202", - "@zowe/imperative": "8.0.0-next.202401162202" + "@zowe/cli-test-utils": "8.0.0-next.202401191954", + "@zowe/core-for-zowe-sdk": "8.0.0-next.202401191954", + "@zowe/imperative": "8.0.0-next.202401191954" }, "peerDependencies": { "@zowe/core-for-zowe-sdk": "^8.0.0-next", @@ -21842,15 +21842,15 @@ }, "packages/zosuss": { "name": "@zowe/zos-uss-for-zowe-sdk", - "version": "8.0.0-next.202401162202", + "version": "8.0.0-next.202401191954", "license": "EPL-2.0", "dependencies": { "ssh2": "^1.15.0" }, "devDependencies": { "@types/ssh2": "^1.11.0", - "@zowe/cli-test-utils": "8.0.0-next.202401162202", - "@zowe/imperative": "8.0.0-next.202401162202" + "@zowe/cli-test-utils": "8.0.0-next.202401191954", + "@zowe/imperative": "8.0.0-next.202401191954" }, "peerDependencies": { "@zowe/imperative": "^8.0.0-next" diff --git a/packages/cli/CHANGELOG.md b/packages/cli/CHANGELOG.md index 502906e152..b9c4d4b8e2 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 +## `8.0.0-next.202401191954` - LTS Breaking: Removed all 'profiles' commands, since they only worked with now-obsolete V1 profiles. - BugFix: Properly construct workflow error messages to display properly with V3 error formatting. diff --git a/packages/cli/package.json b/packages/cli/package.json index 842da65ed6..dbd783ac36 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -1,6 +1,6 @@ { "name": "@zowe/cli", - "version": "8.0.0-next.202401162202", + "version": "8.0.0-next.202401191954", "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", @@ -57,17 +57,17 @@ "preshrinkwrap": "node ../../scripts/rewriteShrinkwrap.js" }, "dependencies": { - "@zowe/core-for-zowe-sdk": "8.0.0-next.202401162202", - "@zowe/imperative": "8.0.0-next.202401162202", - "@zowe/provisioning-for-zowe-sdk": "8.0.0-next.202401162202", - "@zowe/zos-console-for-zowe-sdk": "8.0.0-next.202401162202", - "@zowe/zos-files-for-zowe-sdk": "8.0.0-next.202401162202", - "@zowe/zos-jobs-for-zowe-sdk": "8.0.0-next.202401162202", - "@zowe/zos-logs-for-zowe-sdk": "8.0.0-next.202401162202", - "@zowe/zos-tso-for-zowe-sdk": "8.0.0-next.202401162202", - "@zowe/zos-uss-for-zowe-sdk": "8.0.0-next.202401162202", - "@zowe/zos-workflows-for-zowe-sdk": "8.0.0-next.202401162202", - "@zowe/zosmf-for-zowe-sdk": "8.0.0-next.202401162202", + "@zowe/core-for-zowe-sdk": "8.0.0-next.202401191954", + "@zowe/imperative": "8.0.0-next.202401191954", + "@zowe/provisioning-for-zowe-sdk": "8.0.0-next.202401191954", + "@zowe/zos-console-for-zowe-sdk": "8.0.0-next.202401191954", + "@zowe/zos-files-for-zowe-sdk": "8.0.0-next.202401191954", + "@zowe/zos-jobs-for-zowe-sdk": "8.0.0-next.202401191954", + "@zowe/zos-logs-for-zowe-sdk": "8.0.0-next.202401191954", + "@zowe/zos-tso-for-zowe-sdk": "8.0.0-next.202401191954", + "@zowe/zos-uss-for-zowe-sdk": "8.0.0-next.202401191954", + "@zowe/zos-workflows-for-zowe-sdk": "8.0.0-next.202401191954", + "@zowe/zosmf-for-zowe-sdk": "8.0.0-next.202401191954", "find-process": "1.4.7", "get-stream": "6.0.1", "lodash": "4.17.21", @@ -78,13 +78,13 @@ "@types/diff": "^5.0.2", "@types/lodash": "^4.14.175", "@types/tar": "^6.1.2", - "@zowe/cli-test-utils": "8.0.0-next.202401162202", + "@zowe/cli-test-utils": "8.0.0-next.202401191954", "comment-json": "^4.1.1", "strip-ansi": "^6.0.1", "which": "^2.0.2" }, "optionalDependencies": { - "@zowe/secrets-for-zowe-sdk": "8.0.0-next.202401162202" + "@zowe/secrets-for-zowe-sdk": "8.0.0-next.202401191954" }, "engines": { "node": ">=14.0.0" diff --git a/packages/core/CHANGELOG.md b/packages/core/CHANGELOG.md index 146ba9a0ca..7d4393584b 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 +## `8.0.0-next.202401191954` - LTS Breaking: Removed all 'profiles' commands, since they only worked with now-obsolete V1 profiles. - BugFix: Include text from a REST response's causeErrors.message property in error messages. diff --git a/packages/core/package.json b/packages/core/package.json index 4ca44dff3f..378dee1611 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -1,6 +1,6 @@ { "name": "@zowe/core-for-zowe-sdk", - "version": "8.0.0-next.202401162202", + "version": "8.0.0-next.202401191954", "description": "Core libraries shared by Zowe SDK packages", "author": "Zowe", "license": "EPL-2.0", @@ -49,8 +49,8 @@ "string-width": "^4.2.3" }, "devDependencies": { - "@zowe/cli-test-utils": "8.0.0-next.202401162202", - "@zowe/imperative": "8.0.0-next.202401162202" + "@zowe/cli-test-utils": "8.0.0-next.202401191954", + "@zowe/imperative": "8.0.0-next.202401191954" }, "peerDependencies": { "@zowe/imperative": "^8.0.0-next" diff --git a/packages/imperative/CHANGELOG.md b/packages/imperative/CHANGELOG.md index 373afd5630..ea983dc831 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 +## `8.0.0-next.202401191954` - LTS Breaking: Removed the following: - All 'profiles' commands, since they only worked with now-obsolete V1 profiles. diff --git a/packages/imperative/package.json b/packages/imperative/package.json index c4cc6b0c6e..dd3ce90e6a 100644 --- a/packages/imperative/package.json +++ b/packages/imperative/package.json @@ -1,6 +1,6 @@ { "name": "@zowe/imperative", - "version": "8.0.0-next.202401162202", + "version": "8.0.0-next.202401191954", "description": "framework for building configurable CLIs", "author": "Zowe", "license": "EPL-2.0", @@ -96,7 +96,7 @@ "@types/readline-sync": "^1.4.3", "@types/rimraf": "^3.0.2", "@types/stack-trace": "^0.0.29", - "@zowe/secrets-for-zowe-sdk": "8.0.0-next.202401162202", + "@zowe/secrets-for-zowe-sdk": "8.0.0-next.202401191954", "concurrently": "^7.5.0", "cowsay": "^1.2.1", "deep-diff": "^0.3.8", diff --git a/packages/provisioning/package.json b/packages/provisioning/package.json index 23051f21f5..3f2d9b10b1 100644 --- a/packages/provisioning/package.json +++ b/packages/provisioning/package.json @@ -1,6 +1,6 @@ { "name": "@zowe/provisioning-for-zowe-sdk", - "version": "8.0.0-next.202401162202", + "version": "8.0.0-next.202401191954", "description": "Zowe SDK to interact with the z/OS provisioning APIs", "author": "Zowe", "license": "EPL-2.0", @@ -49,9 +49,9 @@ }, "devDependencies": { "@types/js-yaml": "^4.0.5", - "@zowe/cli-test-utils": "8.0.0-next.202401162202", - "@zowe/core-for-zowe-sdk": "8.0.0-next.202401162202", - "@zowe/imperative": "8.0.0-next.202401162202" + "@zowe/cli-test-utils": "8.0.0-next.202401191954", + "@zowe/core-for-zowe-sdk": "8.0.0-next.202401191954", + "@zowe/imperative": "8.0.0-next.202401191954" }, "peerDependencies": { "@zowe/core-for-zowe-sdk": "^8.0.0-next", diff --git a/packages/secrets/package.json b/packages/secrets/package.json index fca1c48c8e..e6a0d29255 100644 --- a/packages/secrets/package.json +++ b/packages/secrets/package.json @@ -3,7 +3,7 @@ "description": "Credential management facilities for Imperative, Zowe CLI, and extenders.", "repository": "https://github.com/zowe/zowe-cli.git", "author": "Zowe", - "version": "8.0.0-next.202401162202", + "version": "8.0.0-next.202401191954", "homepage": "https://github.com/zowe/zowe-cli/tree/master/packages/secrets#readme", "bugs": { "url": "https://github.com/zowe/zowe-cli/issues" diff --git a/packages/workflows/package.json b/packages/workflows/package.json index 23ae6f6c5f..18361dbec0 100644 --- a/packages/workflows/package.json +++ b/packages/workflows/package.json @@ -1,6 +1,6 @@ { "name": "@zowe/zos-workflows-for-zowe-sdk", - "version": "8.0.0-next.202401162202", + "version": "8.0.0-next.202401191954", "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": "8.0.0-next.202401162202" + "@zowe/zos-files-for-zowe-sdk": "8.0.0-next.202401191954" }, "devDependencies": { - "@zowe/cli-test-utils": "8.0.0-next.202401162202", - "@zowe/core-for-zowe-sdk": "8.0.0-next.202401162202", - "@zowe/imperative": "8.0.0-next.202401162202" + "@zowe/cli-test-utils": "8.0.0-next.202401191954", + "@zowe/core-for-zowe-sdk": "8.0.0-next.202401191954", + "@zowe/imperative": "8.0.0-next.202401191954" }, "peerDependencies": { "@zowe/core-for-zowe-sdk": "^8.0.0-next", diff --git a/packages/zosconsole/package.json b/packages/zosconsole/package.json index fb6c5cac7e..386ce77efb 100644 --- a/packages/zosconsole/package.json +++ b/packages/zosconsole/package.json @@ -1,6 +1,6 @@ { "name": "@zowe/zos-console-for-zowe-sdk", - "version": "8.0.0-next.202401162202", + "version": "8.0.0-next.202401191954", "description": "Zowe SDK to interact with the z/OS console", "author": "Zowe", "license": "EPL-2.0", @@ -45,9 +45,9 @@ "prepack": "node ../../scripts/prepareLicenses.js" }, "devDependencies": { - "@zowe/cli-test-utils": "8.0.0-next.202401162202", - "@zowe/core-for-zowe-sdk": "8.0.0-next.202401162202", - "@zowe/imperative": "8.0.0-next.202401162202" + "@zowe/cli-test-utils": "8.0.0-next.202401191954", + "@zowe/core-for-zowe-sdk": "8.0.0-next.202401191954", + "@zowe/imperative": "8.0.0-next.202401191954" }, "peerDependencies": { "@zowe/core-for-zowe-sdk": "^8.0.0-next", diff --git a/packages/zosfiles/package.json b/packages/zosfiles/package.json index 30d2bd9936..64427f90f3 100644 --- a/packages/zosfiles/package.json +++ b/packages/zosfiles/package.json @@ -1,6 +1,6 @@ { "name": "@zowe/zos-files-for-zowe-sdk", - "version": "8.0.0-next.202401162202", + "version": "8.0.0-next.202401191954", "description": "Zowe SDK to interact with files and data sets on z/OS", "author": "Zowe", "license": "EPL-2.0", @@ -50,10 +50,10 @@ "minimatch": "^5.0.1" }, "devDependencies": { - "@zowe/cli-test-utils": "8.0.0-next.202401162202", - "@zowe/core-for-zowe-sdk": "8.0.0-next.202401162202", - "@zowe/imperative": "8.0.0-next.202401162202", - "@zowe/zos-uss-for-zowe-sdk": "8.0.0-next.202401162202" + "@zowe/cli-test-utils": "8.0.0-next.202401191954", + "@zowe/core-for-zowe-sdk": "8.0.0-next.202401191954", + "@zowe/imperative": "8.0.0-next.202401191954", + "@zowe/zos-uss-for-zowe-sdk": "8.0.0-next.202401191954" }, "peerDependencies": { "@zowe/core-for-zowe-sdk": "^8.0.0-next", diff --git a/packages/zosjobs/package.json b/packages/zosjobs/package.json index ce71a4ba16..fc0937f9e1 100644 --- a/packages/zosjobs/package.json +++ b/packages/zosjobs/package.json @@ -1,6 +1,6 @@ { "name": "@zowe/zos-jobs-for-zowe-sdk", - "version": "8.0.0-next.202401162202", + "version": "8.0.0-next.202401191954", "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": "8.0.0-next.202401162202" + "@zowe/zos-files-for-zowe-sdk": "8.0.0-next.202401191954" }, "devDependencies": { - "@zowe/cli-test-utils": "8.0.0-next.202401162202", - "@zowe/core-for-zowe-sdk": "8.0.0-next.202401162202", - "@zowe/imperative": "8.0.0-next.202401162202" + "@zowe/cli-test-utils": "8.0.0-next.202401191954", + "@zowe/core-for-zowe-sdk": "8.0.0-next.202401191954", + "@zowe/imperative": "8.0.0-next.202401191954" }, "peerDependencies": { "@zowe/core-for-zowe-sdk": "^8.0.0-next", diff --git a/packages/zoslogs/package.json b/packages/zoslogs/package.json index 300eaa34c4..f6772f0f30 100644 --- a/packages/zoslogs/package.json +++ b/packages/zoslogs/package.json @@ -1,6 +1,6 @@ { "name": "@zowe/zos-logs-for-zowe-sdk", - "version": "8.0.0-next.202401162202", + "version": "8.0.0-next.202401191954", "description": "Zowe SDK to interact with the z/OS logs", "author": "Zowe", "license": "EPL-2.0", @@ -45,9 +45,9 @@ "prepack": "node ../../scripts/prepareLicenses.js" }, "devDependencies": { - "@zowe/cli-test-utils": "8.0.0-next.202401162202", - "@zowe/core-for-zowe-sdk": "8.0.0-next.202401162202", - "@zowe/imperative": "8.0.0-next.202401162202" + "@zowe/cli-test-utils": "8.0.0-next.202401191954", + "@zowe/core-for-zowe-sdk": "8.0.0-next.202401191954", + "@zowe/imperative": "8.0.0-next.202401191954" }, "peerDependencies": { "@zowe/core-for-zowe-sdk": "^8.0.0-next", diff --git a/packages/zosmf/package.json b/packages/zosmf/package.json index 2f59f306a1..e6862ad2d0 100644 --- a/packages/zosmf/package.json +++ b/packages/zosmf/package.json @@ -1,6 +1,6 @@ { "name": "@zowe/zosmf-for-zowe-sdk", - "version": "8.0.0-next.202401162202", + "version": "8.0.0-next.202401191954", "description": "Zowe SDK to interact with the z/OS Management Facility", "author": "Zowe", "license": "EPL-2.0", @@ -44,9 +44,9 @@ "prepack": "node ../../scripts/prepareLicenses.js" }, "devDependencies": { - "@zowe/cli-test-utils": "8.0.0-next.202401162202", - "@zowe/core-for-zowe-sdk": "8.0.0-next.202401162202", - "@zowe/imperative": "8.0.0-next.202401162202" + "@zowe/cli-test-utils": "8.0.0-next.202401191954", + "@zowe/core-for-zowe-sdk": "8.0.0-next.202401191954", + "@zowe/imperative": "8.0.0-next.202401191954" }, "peerDependencies": { "@zowe/core-for-zowe-sdk": "^8.0.0-next", diff --git a/packages/zostso/package.json b/packages/zostso/package.json index aea2c3e0cf..a448f4bd80 100644 --- a/packages/zostso/package.json +++ b/packages/zostso/package.json @@ -1,6 +1,6 @@ { "name": "@zowe/zos-tso-for-zowe-sdk", - "version": "8.0.0-next.202401162202", + "version": "8.0.0-next.202401191954", "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": "8.0.0-next.202401162202" + "@zowe/zosmf-for-zowe-sdk": "8.0.0-next.202401191954" }, "devDependencies": { - "@zowe/cli-test-utils": "8.0.0-next.202401162202", - "@zowe/core-for-zowe-sdk": "8.0.0-next.202401162202", - "@zowe/imperative": "8.0.0-next.202401162202" + "@zowe/cli-test-utils": "8.0.0-next.202401191954", + "@zowe/core-for-zowe-sdk": "8.0.0-next.202401191954", + "@zowe/imperative": "8.0.0-next.202401191954" }, "peerDependencies": { "@zowe/core-for-zowe-sdk": "^8.0.0-next", diff --git a/packages/zosuss/package.json b/packages/zosuss/package.json index a403489be1..a4f1a94aeb 100644 --- a/packages/zosuss/package.json +++ b/packages/zosuss/package.json @@ -1,6 +1,6 @@ { "name": "@zowe/zos-uss-for-zowe-sdk", - "version": "8.0.0-next.202401162202", + "version": "8.0.0-next.202401191954", "description": "Zowe SDK to interact with USS on z/OS", "author": "Zowe", "license": "EPL-2.0", @@ -49,8 +49,8 @@ }, "devDependencies": { "@types/ssh2": "^1.11.0", - "@zowe/cli-test-utils": "8.0.0-next.202401162202", - "@zowe/imperative": "8.0.0-next.202401162202" + "@zowe/cli-test-utils": "8.0.0-next.202401191954", + "@zowe/imperative": "8.0.0-next.202401191954" }, "peerDependencies": { "@zowe/imperative": "^8.0.0-next" From 9de3a1db13ef315d28ea8b4c645e8ba560fe5daf Mon Sep 17 00:00:00 2001 From: Amber Torrise Date: Mon, 22 Jan 2024 13:57:40 -0500 Subject: [PATCH 133/138] changes after merge Signed-off-by: Amber Torrise --- .../__unit__/config/ConfigUtils.unit.test.ts | 2 +- .../imperative/src/cmd/CommandProcessor.ts | 29 ++++++++++--------- packages/imperative/src/config/ConfigUtils.ts | 4 +-- .../config/cmd/init/init.handler.ts | 2 +- 4 files changed, 19 insertions(+), 18 deletions(-) diff --git a/packages/imperative/__tests__/__unit__/config/ConfigUtils.unit.test.ts b/packages/imperative/__tests__/__unit__/config/ConfigUtils.unit.test.ts index aa1f0c10f9..f7ad2e004d 100644 --- a/packages/imperative/__tests__/__unit__/config/ConfigUtils.unit.test.ts +++ b/packages/imperative/__tests__/__unit__/config/ConfigUtils.unit.test.ts @@ -11,7 +11,7 @@ import { ConfigUtils } from "../../../src/config/ConfigUtils"; import { CredentialManagerFactory } from "../../../src/security"; -import { ImperativeConfig } from "../../../src/utilities"; +import { ImperativeConfig } from "../../../src/utilities/ImperativeConfig"; describe("Config Utils", () => { describe("coercePropValue", () => { diff --git a/packages/imperative/src/cmd/CommandProcessor.ts b/packages/imperative/src/cmd/CommandProcessor.ts index d5e2007d50..f7b9663417 100644 --- a/packages/imperative/src/cmd/CommandProcessor.ts +++ b/packages/imperative/src/cmd/CommandProcessor.ts @@ -14,10 +14,10 @@ import { CommandUtils } from "./utils/CommandUtils"; import { Arguments } from "yargs"; import { ICommandValidatorResponse } from "./doc/response/response/ICommandValidatorResponse"; import { ICommandHandler } from "./doc/handler/ICommandHandler"; -import { couldNotInstantiateCommandHandler, unexpectedCommandError } from "./../messages"; +import { couldNotInstantiateCommandHandler, unexpectedCommandError } from "../messages"; import { SharedOptions } from "./utils/SharedOptions"; -import { IImperativeError, ImperativeError } from "./../error"; -import { IProfileManagerFactory, ProfileUtils } from "./../profiles"; +import { IImperativeError, ImperativeError } from "../error"; +import { IProfileManagerFactory, ProfileUtils } from "../profiles"; import { SyntaxValidator } from "./syntax/SyntaxValidator"; import { CommandProfileLoader } from "./profiles/CommandProfileLoader"; import { ICommandProfileTypeConfiguration } from "./doc/profiles/definition/ICommandProfileTypeConfiguration"; @@ -25,28 +25,29 @@ import { IHelpGenerator } from "./help/doc/IHelpGenerator"; import { ICommandPrepared } from "./doc/response/response/ICommandPrepared"; import { CommandResponse } from "./response/CommandResponse"; import { ICommandResponse } from "./doc/response/response/ICommandResponse"; -import { Logger, LoggerUtils } from "./../logger"; +import { Logger, LoggerUtils } from "../logger"; import { IInvokeCommandParms } from "./doc/parms/IInvokeCommandParms"; import { ICommandProcessorParms } from "./doc/processor/ICommandProcessorParms"; -import { ImperativeExpect } from "./../expect"; +import { ImperativeExpect } from "../expect"; import { inspect } from "util"; -import { EnvFileUtils, ImperativeConfig, TextUtils } from "./../utilities"; +import { ImperativeConfig } from "../utilities/ImperativeConfig"; +import { TextUtils } from "../utilities/TextUtils"; +import { EnvFileUtils } from "../utilities/EnvFileUtils"; import * as nodePath from "path"; import * as os from "os"; import * as stream from "stream"; import { ICommandHandlerRequire } from "./doc/handler/ICommandHandlerRequire"; -import { IHandlerParameters } from "./../cmd"; +import { IHandlerParameters, IHandlerResponseApi } from "../cmd"; import { ChainedHandlerService } from "./ChainedHandlerUtils"; -import { Constants } from "./../constants"; +import { Constants } from "../constants"; import { ICommandArguments } from "./doc/args/ICommandArguments"; -import { CliUtils } from "./../utilities/CliUtils"; +import { CliUtils } from "../utilities/CliUtils"; import { WebHelpManager } from "./help/WebHelpManager"; import { ICommandProfile } from "./doc/profiles/definition/ICommandProfile"; -import { Config } from "./../config/Config"; -import { ConfigUtils } from "./../config/ConfigUtils"; -import { ConfigConstants } from "./../config/ConfigConstants"; -import { IDaemonContext } from "./../imperative/doc/IDaemonContext"; -import { IHandlerResponseApi } from "../.."; +import { Config } from "../config/Config"; +import { ConfigUtils } from "../config/ConfigUtils"; +import { ConfigConstants } from "../config/ConfigConstants"; +import { IDaemonContext } from "../imperative/doc/IDaemonContext"; /** diff --git a/packages/imperative/src/config/ConfigUtils.ts b/packages/imperative/src/config/ConfigUtils.ts index f539e628d7..fe75b189c0 100644 --- a/packages/imperative/src/config/ConfigUtils.ts +++ b/packages/imperative/src/config/ConfigUtils.ts @@ -11,7 +11,7 @@ import { CredentialManagerFactory } from "../security"; import { ICommandArguments } from "../cmd"; -import { ImperativeConfig } from "../utilities/ImperativeConfig"; +import { ImperativeConfig } from "../utilities"; import { ImperativeError } from "../error"; export class ConfigUtils { @@ -80,4 +80,4 @@ export class ConfigUtils { additionalDetails: details }); } -} +} \ No newline at end of file diff --git a/packages/imperative/src/imperative/config/cmd/init/init.handler.ts b/packages/imperative/src/imperative/config/cmd/init/init.handler.ts index ae9afb525f..301d638279 100644 --- a/packages/imperative/src/imperative/config/cmd/init/init.handler.ts +++ b/packages/imperative/src/imperative/config/cmd/init/init.handler.ts @@ -195,7 +195,7 @@ export default class InitHandler implements ICommandHandler { `Enter ${propDesc} ${ConfigConstants.SKIP_PROMPT}`, { hideText: property.secure }); // coerce to correct type - if (propValue && propValue.trim().length > 0) { + if (propValue && propValue.trim().length > 0) { return ConfigUtils.coercePropValue(propValue); } From 06079ece6e7653dfaabcfd1103b1b27cd112ca00 Mon Sep 17 00:00:00 2001 From: Amber Torrise Date: Mon, 22 Jan 2024 14:08:57 -0500 Subject: [PATCH 134/138] linting Signed-off-by: Amber Torrise --- .../CliProfileManager.credentials.integration.subtest.ts | 3 --- .../imperative/src/rest/session/ConnectionPropsForSessCfg.ts | 2 +- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/packages/imperative/__tests__/src/packages/profiles/__integration__/CliProfileManager.credentials.integration.subtest.ts b/packages/imperative/__tests__/src/packages/profiles/__integration__/CliProfileManager.credentials.integration.subtest.ts index 52fa649d7e..e4dbc06258 100644 --- a/packages/imperative/__tests__/src/packages/profiles/__integration__/CliProfileManager.credentials.integration.subtest.ts +++ b/packages/imperative/__tests__/src/packages/profiles/__integration__/CliProfileManager.credentials.integration.subtest.ts @@ -14,9 +14,6 @@ import * as path from "path"; import * as fs from "fs"; import { IImperativeConfig } from "../../../../../src/imperative"; import { keyring } from "@zowe/secrets-for-zowe-sdk"; -import { CliProfileManager } from "../../../../../src/cmd"; -import { ProfileIO } from "../../../../../src/profiles/utils"; -import { IProfile } from "../../../../../src/profiles/doc/definition"; describe("Cli Profile Manager", () => { const cliBin = path.join(__dirname, "../test_cli/TestCLI.ts"); diff --git a/packages/imperative/src/rest/session/ConnectionPropsForSessCfg.ts b/packages/imperative/src/rest/session/ConnectionPropsForSessCfg.ts index 8e12c3a00f..dd17bb1978 100644 --- a/packages/imperative/src/rest/session/ConnectionPropsForSessCfg.ts +++ b/packages/imperative/src/rest/session/ConnectionPropsForSessCfg.ts @@ -20,7 +20,7 @@ import { IPromptOptions } from "../../cmd/doc/response/api/handler/IPromptOption import { ISession } from "./doc/ISession"; import { IProfileProperty } from "../../profiles"; import { ConfigAutoStore } from "../../config/ConfigAutoStore"; -import * as ConfigUtils from "../../config/ConfigUtils"; +import { ConfigUtils } from "../../config/ConfigUtils"; /** * Extend options for IPromptOptions for internal wrapper method From 9f8a0105ef74d05f65ff9451ebf92441ad414979 Mon Sep 17 00:00:00 2001 From: Amber Torrise Date: Mon, 22 Jan 2024 15:51:01 -0500 Subject: [PATCH 135/138] fixing unit test errors Signed-off-by: Amber Torrise --- .../__unit__/cmd/CommandPreparer.unit.test.ts | 2 +- .../__unit__/cmd/CommandProcessor.unit.test.ts | 4 ++-- .../cmd/help/DefaultHelpGenerator.unit.test.ts | 4 ++-- .../CliProfileManager.credentials.unit.test.ts | 4 ++-- .../profiles/CliProfileManager.unit.test.ts | 4 ++-- .../profiles/CommandProfileLoader.unit.test.ts | 8 ++++---- .../config/ConfigAutoStore.unit.test.ts | 2 +- .../imperative/Imperative.unit.test.ts | 2 +- .../convert-profiles.handler.unit.test.ts | 4 ++-- .../PluginManagementFacility.unit.test.ts | 4 ++-- .../plugins/PluginRequireProvider.unit.test.ts | 2 +- .../npm-interface/install.unit.test.ts | 18 +++++++++--------- .../BasicProfileManager.save.unit.test.ts | 2 +- .../ConnectionPropsForSessCfg.unit.test.ts | 3 ++- .../__tests__/SyntaxValidator.unit.test.ts | 2 +- .../auth/__tests__/__data__/FakeAuthHandler.ts | 4 ++-- .../utils/__tests__/ProfileIO.unit.test.ts | 4 ++-- .../__tests__/ProfileValidation.unit.test.ts | 2 +- 18 files changed, 38 insertions(+), 37 deletions(-) diff --git a/packages/imperative/__tests__/__unit__/cmd/CommandPreparer.unit.test.ts b/packages/imperative/__tests__/__unit__/cmd/CommandPreparer.unit.test.ts index 2dd61fe879..8e89a6fd7b 100644 --- a/packages/imperative/__tests__/__unit__/cmd/CommandPreparer.unit.test.ts +++ b/packages/imperative/__tests__/__unit__/cmd/CommandPreparer.unit.test.ts @@ -23,7 +23,7 @@ import { VALID_COMMANDS_WITH_PROFILES, SAMPLE_BASE_PROFILE } from "./__resources__/CommandDefinitions"; -import { ImperativeError } from "../../error/src/ImperativeError"; +import { ImperativeError } from "../../../src/error/ImperativeError"; // UnitTestUtils.replaceIt(); diff --git a/packages/imperative/__tests__/__unit__/cmd/CommandProcessor.unit.test.ts b/packages/imperative/__tests__/__unit__/cmd/CommandProcessor.unit.test.ts index 4867b70d38..b73b12964e 100644 --- a/packages/imperative/__tests__/__unit__/cmd/CommandProcessor.unit.test.ts +++ b/packages/imperative/__tests__/__unit__/cmd/CommandProcessor.unit.test.ts @@ -15,7 +15,7 @@ import { CommandProcessor } from "../../../src/cmd/CommandProcessor"; import { ICommandResponse } from "../../../src/cmd/doc/response/response/ICommandResponse"; import { CommandResponse } from "../../../src/cmd/response/CommandResponse"; import { IHelpGenerator } from "../../../src/cmd/help/doc/IHelpGenerator"; -import { BasicProfileManager, IProfileManagerFactory, IProfileTypeConfiguration } from "../../profiles"; +import { BasicProfileManager, IProfileManagerFactory, IProfileTypeConfiguration } from "../../../src/profiles"; import { ImperativeError } from "../../../src/error"; import { ICommandValidatorResponse } from "../../../src/cmd/doc/response/response/ICommandValidatorResponse"; import { SharedOptions } from "../../../src/cmd/utils/SharedOptions"; @@ -29,7 +29,7 @@ import { join } from "path"; jest.mock("../../../src/cmd/syntax/SyntaxValidator"); jest.mock("../../../src/cmd/utils/SharedOptions"); -jest.mock("../../utilities/ImperativeConfig"); +jest.mock("../../../src/utilities/ImperativeConfig"); // Persist the original definitions of process.write const ORIGINAL_STDOUT_WRITE = process.stdout.write; diff --git a/packages/imperative/__tests__/__unit__/cmd/help/DefaultHelpGenerator.unit.test.ts b/packages/imperative/__tests__/__unit__/cmd/help/DefaultHelpGenerator.unit.test.ts index 4d837dd165..563a1f161d 100644 --- a/packages/imperative/__tests__/__unit__/cmd/help/DefaultHelpGenerator.unit.test.ts +++ b/packages/imperative/__tests__/__unit__/cmd/help/DefaultHelpGenerator.unit.test.ts @@ -9,8 +9,8 @@ * */ -jest.mock("../../../imperative/src/Imperative"); -jest.mock("../../../utilities/ImperativeConfig"); +jest.mock("../../../../src/imperative/Imperative"); +jest.mock("../../../../src/utilities/ImperativeConfig"); import { IHelpGeneratorFactoryParms } from "../../../../src/cmd/help/doc/IHelpGeneratorFactoryParms"; import { ICommandDefinition } from "../../../../src/cmd/doc/ICommandDefinition"; diff --git a/packages/imperative/__tests__/__unit__/cmd/profiles/CliProfileManager.credentials.unit.test.ts b/packages/imperative/__tests__/__unit__/cmd/profiles/CliProfileManager.credentials.unit.test.ts index d6e9de5a93..e29ed15f61 100644 --- a/packages/imperative/__tests__/__unit__/cmd/profiles/CliProfileManager.credentials.unit.test.ts +++ b/packages/imperative/__tests__/__unit__/cmd/profiles/CliProfileManager.credentials.unit.test.ts @@ -22,8 +22,8 @@ import { CredentialManagerFactory, DefaultCredentialManager } from "../../../../ import { BasicProfileManager } from "../../../../src/profiles/BasicProfileManager"; import { ProfilesConstants, ISaveProfile, IProfileSaved } from "../../../../src/profiles"; -jest.mock("../../../profiles/src/utils/ProfileIO"); -jest.mock("../../../security/src/DefaultCredentialManager"); +jest.mock("../../../../src/profiles/utils/ProfileIO"); +jest.mock("../../../../src/profiles/security/DefaultCredentialManager"); // TODO: Some of these tests are not completely isolated, some may cause others to fail depending on mocks diff --git a/packages/imperative/__tests__/__unit__/cmd/profiles/CliProfileManager.unit.test.ts b/packages/imperative/__tests__/__unit__/cmd/profiles/CliProfileManager.unit.test.ts index fa7dfc1f15..0639f56481 100644 --- a/packages/imperative/__tests__/__unit__/cmd/profiles/CliProfileManager.unit.test.ts +++ b/packages/imperative/__tests__/__unit__/cmd/profiles/CliProfileManager.unit.test.ts @@ -22,8 +22,8 @@ import { STRAWBERRY_PROFILE_TYPE } from "../../../../__tests__/__unit__/profiles import { TEST_PROFILE_ROOT_DIR } from "../../../../__tests__/__unit__/profiles/TestConstants"; import { IProfileLoaded } from "../../../.."; -jest.mock("../../../profiles/utils/ProfileIO"); -jest.mock("../../../security/DefaultCredentialManager"); +jest.mock("../../../../src/profiles/utils/ProfileIO"); +jest.mock("../../../../src/security/DefaultCredentialManager"); describe("Cli Profile Manager", () => { let writtenProfile: any; diff --git a/packages/imperative/__tests__/__unit__/cmd/profiles/CommandProfileLoader.unit.test.ts b/packages/imperative/__tests__/__unit__/cmd/profiles/CommandProfileLoader.unit.test.ts index e09dbc091a..718b9e5b61 100644 --- a/packages/imperative/__tests__/__unit__/cmd/profiles/CommandProfileLoader.unit.test.ts +++ b/packages/imperative/__tests__/__unit__/cmd/profiles/CommandProfileLoader.unit.test.ts @@ -9,10 +9,10 @@ * */ -jest.mock("../../../profiles/src/BasicProfileManager"); -jest.mock("../../../profiles/src/BasicProfileManagerFactory"); -jest.mock("../../../utilities/ImperativeConfig"); -jest.mock("../../../logger/src/LoggerUtils"); +jest.mock("../../../../src/profiles/BasicProfileManager"); +jest.mock("../../../../src/profiles/BasicProfileManagerFactory"); +jest.mock("../../../../src/utilities/ImperativeConfig"); +jest.mock("../../../../src/logger/LoggerUtils"); import { CommandProfileLoader } from "../../../../src/cmd/profiles/CommandProfileLoader"; import { ICommandDefinition } from "../../../../src/cmd/doc/ICommandDefinition"; import { BasicProfileManager } from "../../../../src/profiles/BasicProfileManager"; diff --git a/packages/imperative/__tests__/__unit__/config/ConfigAutoStore.unit.test.ts b/packages/imperative/__tests__/__unit__/config/ConfigAutoStore.unit.test.ts index aa419d3be0..7f52b48c79 100644 --- a/packages/imperative/__tests__/__unit__/config/ConfigAutoStore.unit.test.ts +++ b/packages/imperative/__tests__/__unit__/config/ConfigAutoStore.unit.test.ts @@ -9,7 +9,7 @@ * */ -jest.mock("../../logger/src/LoggerUtils"); +jest.mock("../../../src/logger/LoggerUtils"); import { AbstractAuthHandler } from "../../../src/imperative"; import { SessConstants } from "../../../src/rest"; import { ImperativeConfig } from "../../../src/utilities/ImperativeConfig"; diff --git a/packages/imperative/__tests__/__unit__/imperative/Imperative.unit.test.ts b/packages/imperative/__tests__/__unit__/imperative/Imperative.unit.test.ts index 72e0314e87..fd1688f3bb 100644 --- a/packages/imperative/__tests__/__unit__/imperative/Imperative.unit.test.ts +++ b/packages/imperative/__tests__/__unit__/imperative/Imperative.unit.test.ts @@ -100,7 +100,7 @@ describe("Imperative", () => { // If we error here, jest silently fails and says the test is empty. So let's make sure // that doesn't happen! - const { Logger } = (jest as any).requireActual("../../logger/src/Logger"); + const { Logger } = (jest as any).requireActual("../src/logger/Logger"); Logger.getConsoleLogger().fatal("Imperative.test.ts test execution error!"); Logger.getConsoleLogger().fatal(error); diff --git a/packages/imperative/__tests__/__unit__/imperative/config/cmd/convert-profiles/convert-profiles.handler.unit.test.ts b/packages/imperative/__tests__/__unit__/imperative/config/cmd/convert-profiles/convert-profiles.handler.unit.test.ts index 120e92e5ad..e6ff679a4d 100644 --- a/packages/imperative/__tests__/__unit__/imperative/config/cmd/convert-profiles/convert-profiles.handler.unit.test.ts +++ b/packages/imperative/__tests__/__unit__/imperative/config/cmd/convert-profiles/convert-profiles.handler.unit.test.ts @@ -21,8 +21,8 @@ import * as npmInterface from "../../../../../../src/imperative/plugins/utilitie import { PluginIssues } from "../../../../../../src/imperative/plugins/utilities/PluginIssues"; import ConvertProfilesHandler from "../../../../../../src/imperative/config/cmd/convert-profiles/convert-profiles.handler"; -jest.mock("../../../../src/plugins/utilities/npm-interface"); -jest.mock("../../../../../../src/imperative/src/OverridesLoader"); +jest.mock("../../../../../../src/plugins/utilities/npm-interface"); +jest.mock("../../../../../../src/imperative/OverridesLoader"); let stdout: string; let stderr: string; diff --git a/packages/imperative/__tests__/__unit__/imperative/plugins/PluginManagementFacility.unit.test.ts b/packages/imperative/__tests__/__unit__/imperative/plugins/PluginManagementFacility.unit.test.ts index ac19d2d6a7..731d86b86d 100644 --- a/packages/imperative/__tests__/__unit__/imperative/plugins/PluginManagementFacility.unit.test.ts +++ b/packages/imperative/__tests__/__unit__/imperative/plugins/PluginManagementFacility.unit.test.ts @@ -13,8 +13,8 @@ import Mock = jest.MockedFunction; jest.mock("fs"); jest.mock("jsonfile"); -jest.mock("../../src/plugins/utilities/PMFConstants"); -jest.mock("../../src/plugins/PluginRequireProvider"); +jest.mock("../../../../src/imperative/plugins/utilities/PMFConstants"); +jest.mock("../../../../src/imperative/plugins/PluginRequireProvider"); import * as fs from "fs"; import { AppSettings } from "../../../../src/settings"; diff --git a/packages/imperative/__tests__/__unit__/imperative/plugins/PluginRequireProvider.unit.test.ts b/packages/imperative/__tests__/__unit__/imperative/plugins/PluginRequireProvider.unit.test.ts index 971d3b7e17..17759227f8 100644 --- a/packages/imperative/__tests__/__unit__/imperative/plugins/PluginRequireProvider.unit.test.ts +++ b/packages/imperative/__tests__/__unit__/imperative/plugins/PluginRequireProvider.unit.test.ts @@ -11,7 +11,7 @@ import { getMockWrapper } from "../../../../__tests__/__src__/types/MockWrapper"; -jest.mock("../../../../../src/utilities/ImperativeConfig"); +jest.mock("../../../../src/utilities/ImperativeConfig"); jest.mock("find-up"); jest.mock("path"); diff --git a/packages/imperative/__tests__/__unit__/imperative/plugins/utilities/npm-interface/install.unit.test.ts b/packages/imperative/__tests__/__unit__/imperative/plugins/utilities/npm-interface/install.unit.test.ts index ece39f672a..96702aa1fd 100644 --- a/packages/imperative/__tests__/__unit__/imperative/plugins/utilities/npm-interface/install.unit.test.ts +++ b/packages/imperative/__tests__/__unit__/imperative/plugins/utilities/npm-interface/install.unit.test.ts @@ -17,15 +17,15 @@ let returnedVal: any; jest.mock("cross-spawn"); jest.mock("jsonfile"); jest.mock("find-up"); -jest.mock("../../../../src/plugins/utilities/PMFConstants"); -jest.mock("../../../../src/plugins/PluginManagementFacility"); -jest.mock("../../../../src/ConfigurationLoader"); -jest.mock("../../../../src/UpdateImpConfig"); -jest.mock("../../../../../config/src/ConfigSchema"); -jest.mock("../../../../../logger"); -jest.mock("../../../../../cmd/src/response/CommandResponse"); -jest.mock("../../../../../cmd/src/response/HandlerResponse"); -jest.mock("../../../../src/plugins/utilities/NpmFunctions"); +jest.mock("../../../../../../src/plugins/utilities/PMFConstants"); +jest.mock("../../../../../../src/plugins/PluginManagementFacility"); +jest.mock("../../../../../../src/ConfigurationLoader"); +jest.mock("../../../../../../src/UpdateImpConfig"); +jest.mock("../../../../../../src/config/ConfigSchema"); +jest.mock("../../../../../../src/logger"); +jest.mock("../../../../../../src/cmd/response/CommandResponse"); +jest.mock("../../../../../../src/cmd/response/HandlerResponse"); +jest.mock("../../../../../../src/plugins/utilities/NpmFunctions"); jest.doMock("path", () => { const originalPath = jest.requireActual("path"); return { diff --git a/packages/imperative/__tests__/__unit__/profiles/BasicProfileManager.save.unit.test.ts b/packages/imperative/__tests__/__unit__/profiles/BasicProfileManager.save.unit.test.ts index 401713860b..59dc1407d5 100644 --- a/packages/imperative/__tests__/__unit__/profiles/BasicProfileManager.save.unit.test.ts +++ b/packages/imperative/__tests__/__unit__/profiles/BasicProfileManager.save.unit.test.ts @@ -28,7 +28,7 @@ import { STRAWBERRY_WITH_REQUIRED_APPLE_DEPENDENCY, TEST_PROFILE_ROOT_DIR } from "./TestConstants"; -import { BasicProfileManager } from "../src/BasicProfileManager"; +import { BasicProfileManager } from "../../../src/profiles/BasicProfileManager"; const BAD_SAMPLE_SAVE_PARMS: ISaveProfile = { name: "bad_apple", diff --git a/packages/imperative/__tests__/__unit__/rest/session/ConnectionPropsForSessCfg.unit.test.ts b/packages/imperative/__tests__/__unit__/rest/session/ConnectionPropsForSessCfg.unit.test.ts index 048030f23e..610b131162 100644 --- a/packages/imperative/__tests__/__unit__/rest/session/ConnectionPropsForSessCfg.unit.test.ts +++ b/packages/imperative/__tests__/__unit__/rest/session/ConnectionPropsForSessCfg.unit.test.ts @@ -9,7 +9,8 @@ * */ -jest.mock("../../../logger/src/LoggerUtils"); +jest.mock("../../../../src/LoggerUtils"); + import { ConnectionPropsForSessCfg } from "../../../../src/rest/session/ConnectionPropsForSessCfg"; import { CliUtils } from "../../../../src/utilities/CliUtils"; import { ImperativeError } from "../../../../src/error"; diff --git a/packages/imperative/src/cmd/syntax/__tests__/SyntaxValidator.unit.test.ts b/packages/imperative/src/cmd/syntax/__tests__/SyntaxValidator.unit.test.ts index 178ac356bc..b0f967eecb 100644 --- a/packages/imperative/src/cmd/syntax/__tests__/SyntaxValidator.unit.test.ts +++ b/packages/imperative/src/cmd/syntax/__tests__/SyntaxValidator.unit.test.ts @@ -12,7 +12,7 @@ /* eslint-disable jest/expect-expect */ import { TextUtils } from "../../../utilities/TextUtils"; -jest.mock("../../../../imperative/src/Imperative"); +jest.mock("../../../../src/imperative/Imperative"); import { inspect, isNullOrUndefined } from "util"; import { TestLogger } from "../../../../__tests__/src/TestLogger"; import { CommandResponse, ICommandDefinition, ICommandValidatorResponse } from "../../../"; diff --git a/packages/imperative/src/imperative/auth/__tests__/__data__/FakeAuthHandler.ts b/packages/imperative/src/imperative/auth/__tests__/__data__/FakeAuthHandler.ts index cb3cf08431..4586208305 100644 --- a/packages/imperative/src/imperative/auth/__tests__/__data__/FakeAuthHandler.ts +++ b/packages/imperative/src/imperative/auth/__tests__/__data__/FakeAuthHandler.ts @@ -10,8 +10,8 @@ */ import { BaseAuthHandler } from "../../handlers/BaseAuthHandler"; -import { ICommandArguments } from "../../../../../cmd"; -import { ISession, AbstractSession, SessConstants } from "../../../../../rest"; +import { ICommandArguments } from "../../../../cmd"; +import { ISession, AbstractSession, SessConstants } from "../../../../rest"; export default class FakeAuthHandler extends BaseAuthHandler { public mProfileType: string = "fruit"; diff --git a/packages/imperative/src/profiles/utils/__tests__/ProfileIO.unit.test.ts b/packages/imperative/src/profiles/utils/__tests__/ProfileIO.unit.test.ts index cb57be6d89..521fe4a6d3 100644 --- a/packages/imperative/src/profiles/utils/__tests__/ProfileIO.unit.test.ts +++ b/packages/imperative/src/profiles/utils/__tests__/ProfileIO.unit.test.ts @@ -12,10 +12,10 @@ import Mock = jest.Mock; jest.mock("fs"); -jest.mock("../../../../io/src/IO"); +jest.mock("../../../io/IO"); jest.mock("js-yaml"); jest.mock("yamljs"); -jest.mock("../../../../utilities/ImperativeConfig"); +jest.mock("../../../utilities/ImperativeConfig"); import * as fs from "fs"; import { IO } from "../../../io/IO"; diff --git a/packages/imperative/src/profiles/validation/__tests__/ProfileValidation.unit.test.ts b/packages/imperative/src/profiles/validation/__tests__/ProfileValidation.unit.test.ts index 91678e5340..327239577b 100644 --- a/packages/imperative/src/profiles/validation/__tests__/ProfileValidation.unit.test.ts +++ b/packages/imperative/src/profiles/validation/__tests__/ProfileValidation.unit.test.ts @@ -18,7 +18,7 @@ import { IProfileValidationTaskResult } from "../doc/IProfileValidationTaskResul import { ProfileValidator } from "../api/ProfileValidator"; import { IProfileValidationTask } from "../../.."; -jest.mock("../../../../imperative/src/Imperative"); +jest.mock("../../../imperative/Imperative"); const oldForceColorOption = process.env.FORCE_COLOR; From 3b176e971d9db3cb86989909f6c0fa4a8f813e03 Mon Sep 17 00:00:00 2001 From: Amber Torrise Date: Mon, 29 Jan 2024 14:29:12 -0500 Subject: [PATCH 136/138] updating some snaps Signed-off-by: Amber Torrise --- ...ileManager.constructor.integration.test.ts | 2 +- ...anager.initialize.integration.test.ts.snap | 72 +++++++++++++++++++ 2 files changed, 73 insertions(+), 1 deletion(-) create mode 100644 packages/imperative/__tests__/src/packages/profiles/__integration__/__snapshots__/BasicProfileManager.initialize.integration.test.ts.snap diff --git a/packages/imperative/__tests__/src/packages/profiles/__integration__/BasicProfileManager.constructor.integration.test.ts b/packages/imperative/__tests__/src/packages/profiles/__integration__/BasicProfileManager.constructor.integration.test.ts index 2c26f2a4b0..f5085c3093 100644 --- a/packages/imperative/__tests__/src/packages/profiles/__integration__/BasicProfileManager.constructor.integration.test.ts +++ b/packages/imperative/__tests__/src/packages/profiles/__integration__/BasicProfileManager.constructor.integration.test.ts @@ -9,7 +9,7 @@ * */ -jest.mock("../../../../../src/utilities/src/ImperativeConfig"); +jest.mock("../../../../../imperative/src/utilities/ImperativeConfig.ts"); import * as TestUtil from "../../../TestUtil"; import { BasicProfileManager } from "../../../../../src/index"; diff --git a/packages/imperative/__tests__/src/packages/profiles/__integration__/__snapshots__/BasicProfileManager.initialize.integration.test.ts.snap b/packages/imperative/__tests__/src/packages/profiles/__integration__/__snapshots__/BasicProfileManager.initialize.integration.test.ts.snap new file mode 100644 index 0000000000..a1175cb2c3 --- /dev/null +++ b/packages/imperative/__tests__/src/packages/profiles/__integration__/__snapshots__/BasicProfileManager.initialize.integration.test.ts.snap @@ -0,0 +1,72 @@ +// Jest Snapshot v1, https://goo.gl/fbAQLP + +exports[`Basic Profile Manager Initialize Should allow us to initialize the environment and create a profile manager 1`] = ` +"defaultProfile: null +configuration: + type: banana + schema: + type: object + title: 'The Banana command profile schema' + description: 'The Banana command profile schema' + properties: + age: + optionDefinition: + description: 'The age of the Banana' + type: number + name: age + aliases: + - a + required: true + type: number + required: + - age +" +`; + +exports[`Basic Profile Manager Initialize Should allow us to initialize the environment and create a profile manager 2`] = ` +"defaultProfile: null +configuration: + type: secure_orange + schema: + type: object + title: 'The secure_orange command profile schema' + description: 'The secure_orange command profile schema' + properties: + username: + optionDefinition: + description: 'The username of the secure_orange' + type: string + name: username + type: string + password: + optionDefinition: + description: 'The password of the secure_orange' + type: string + name: password + type: string + required: [] +" +`; + +exports[`Basic Profile Manager Initialize Should allow us to initialize the environment and create a profile manager 3`] = ` +"defaultProfile: null +configuration: + type: strawberry + schema: + type: object + title: 'The strawberry command profile schema' + description: 'The strawberry command profile schema' + properties: + age: + optionDefinition: + description: 'The age of the strawberry' + type: number + name: age + aliases: + - a + required: true + type: number + required: + - age +" +`; From 5645717ce1650907cf46a345933f76698a36c65c Mon Sep 17 00:00:00 2001 From: Amber Torrise Date: Tue, 30 Jan 2024 15:40:45 -0500 Subject: [PATCH 137/138] reorganizing file structure a bit -removing cmd from __unit__/imperative/config/cmd- and fixing files Signed-off-by: Amber Torrise --- .../operations/Operations.integration.spec.ts | 2 +- .../AutoInitCommandBuilder.unit.test.ts | 8 ++-- .../BaseAutoInitHandler.unit.test.ts | 14 +++---- ...ompleteAutoInitCommandBuilder.unit.test.ts | 6 +-- .../auto-init/__data__/FakeAutoInitHandler.ts | 6 +-- .../__data__/SampleAutoInitConfig.ts | 4 +- ...teAutoInitCommandBuilder.unit.test.ts.snap | 0 .../convert-profiles.handler.unit.test.ts | 22 +++++----- .../{cmd => }/edit/edit.handler.unit.test.ts | 8 ++-- .../import/import.handler.unit.test.ts | 12 +++--- .../{cmd => }/init/init.handler.unit.test.ts | 24 +++++------ .../{cmd => }/list/list.handler.unit.test.ts | 6 +-- .../profiles/profiles.handler.unit.test.ts | 6 +-- .../report-env/EnvQuery.unit.test.ts | 16 ++++---- .../Report-env.handler.unit.test.ts | 6 +-- .../schema/schema.handler.unit.test.ts | 6 +-- .../secure/secure.handler.unit.test.ts | 40 +++++++++---------- .../{cmd => }/set/set.handler.unit.test.ts | 0 .../updateSchema.handler.unit.test.ts | 0 .../AbstractPluginLifeCycle.unit.test.ts | 2 +- .../__unit__/operations/TestOperations1.ts | 2 +- ...ileManager.constructor.integration.test.ts | 2 +- .../BasicProfileManager.integration.test.ts | 6 +-- 23 files changed, 99 insertions(+), 99 deletions(-) rename packages/imperative/__tests__/__unit__/imperative/config/{cmd => }/auto-init/AutoInitCommandBuilder.unit.test.ts (84%) rename packages/imperative/__tests__/__unit__/imperative/config/{cmd => }/auto-init/BaseAutoInitHandler.unit.test.ts (97%) rename packages/imperative/__tests__/__unit__/imperative/config/{cmd => }/auto-init/CompleteAutoInitCommandBuilder.unit.test.ts (73%) rename packages/imperative/__tests__/__unit__/imperative/config/{cmd => }/auto-init/__data__/FakeAutoInitHandler.ts (79%) rename packages/imperative/__tests__/__unit__/imperative/config/{cmd => }/auto-init/__data__/SampleAutoInitConfig.ts (88%) rename packages/imperative/__tests__/__unit__/imperative/config/{cmd => }/auto-init/__snapshots__/CompleteAutoInitCommandBuilder.unit.test.ts.snap (100%) rename packages/imperative/__tests__/__unit__/imperative/config/{cmd => }/convert-profiles/convert-profiles.handler.unit.test.ts (98%) rename packages/imperative/__tests__/__unit__/imperative/config/{cmd => }/edit/edit.handler.unit.test.ts (89%) rename packages/imperative/__tests__/__unit__/imperative/config/{cmd => }/import/import.handler.unit.test.ts (96%) rename packages/imperative/__tests__/__unit__/imperative/config/{cmd => }/init/init.handler.unit.test.ts (97%) rename packages/imperative/__tests__/__unit__/imperative/config/{cmd => }/list/list.handler.unit.test.ts (96%) rename packages/imperative/__tests__/__unit__/imperative/config/{cmd => }/profiles/profiles.handler.unit.test.ts (91%) rename packages/imperative/__tests__/__unit__/imperative/config/{cmd => }/report-env/EnvQuery.unit.test.ts (97%) rename packages/imperative/__tests__/__unit__/imperative/config/{cmd => }/report-env/Report-env.handler.unit.test.ts (92%) rename packages/imperative/__tests__/__unit__/imperative/config/{cmd => }/schema/schema.handler.unit.test.ts (92%) rename packages/imperative/__tests__/__unit__/imperative/config/{cmd => }/secure/secure.handler.unit.test.ts (96%) rename packages/imperative/__tests__/__unit__/imperative/config/{cmd => }/set/set.handler.unit.test.ts (100%) rename packages/imperative/__tests__/__unit__/imperative/config/{cmd => }/update-schema/updateSchema.handler.unit.test.ts (100%) diff --git a/packages/imperative/__tests__/__integration__/operations/Operations.integration.spec.ts b/packages/imperative/__tests__/__integration__/operations/Operations.integration.spec.ts index c6f6e947e7..25bc818f66 100644 --- a/packages/imperative/__tests__/__integration__/operations/Operations.integration.spec.ts +++ b/packages/imperative/__tests__/__integration__/operations/Operations.integration.spec.ts @@ -14,7 +14,7 @@ import { TestOperations1 } from "../../__unit__/operations/TestOperations1"; import { TestOperations3 } from "../../__unit__/operations/TestOperations3"; import { TestOperations4 } from "../../__unit__/operations/TestOperations4"; import { isNullOrUndefined } from "util"; -import { IOperationResult, Operation, Operations } from "../../../../imperative/src/operations/index"; +import { IOperationResult, Operation, Operations } from "../../../src/operations/index"; import { TestLogger } from "../../../__tests__/src/TestLogger"; const logger = TestLogger.getTestLogger(); diff --git a/packages/imperative/__tests__/__unit__/imperative/config/cmd/auto-init/AutoInitCommandBuilder.unit.test.ts b/packages/imperative/__tests__/__unit__/imperative/config/auto-init/AutoInitCommandBuilder.unit.test.ts similarity index 84% rename from packages/imperative/__tests__/__unit__/imperative/config/cmd/auto-init/AutoInitCommandBuilder.unit.test.ts rename to packages/imperative/__tests__/__unit__/imperative/config/auto-init/AutoInitCommandBuilder.unit.test.ts index 2e48a191bc..8c6ac8fc11 100644 --- a/packages/imperative/__tests__/__unit__/imperative/config/cmd/auto-init/AutoInitCommandBuilder.unit.test.ts +++ b/packages/imperative/__tests__/__unit__/imperative/config/auto-init/AutoInitCommandBuilder.unit.test.ts @@ -9,11 +9,11 @@ * */ -import { AutoInitCommandBuilder } from "../../../../../../src/imperative/config/cmd/auto-init/builders/AutoInitCommandBuilder"; -import { Logger } from "../../../../../../src/logger"; -import { Constants } from "../../../../../../src/constants"; +import { AutoInitCommandBuilder } from "../../../../../src/imperative/config/cmd/auto-init/builders/AutoInitCommandBuilder"; +import { Logger } from "../../../../../src/logger"; +import { Constants } from "../../../../../src/constants"; import { minimalAutoInitConfig } from "./__data__/SampleAutoInitConfig"; -import { ICommandDefinition } from "../../../../../../src/cmd"; +import { ICommandDefinition } from "../../../../../src/cmd"; describe("AutoInitCommandBuilder", () => { it("should build command successfully if valid auto init config supplied with buildFull", () => { diff --git a/packages/imperative/__tests__/__unit__/imperative/config/cmd/auto-init/BaseAutoInitHandler.unit.test.ts b/packages/imperative/__tests__/__unit__/imperative/config/auto-init/BaseAutoInitHandler.unit.test.ts similarity index 97% rename from packages/imperative/__tests__/__unit__/imperative/config/cmd/auto-init/BaseAutoInitHandler.unit.test.ts rename to packages/imperative/__tests__/__unit__/imperative/config/auto-init/BaseAutoInitHandler.unit.test.ts index 11e222f9ac..4556878069 100644 --- a/packages/imperative/__tests__/__unit__/imperative/config/cmd/auto-init/BaseAutoInitHandler.unit.test.ts +++ b/packages/imperative/__tests__/__unit__/imperative/config/auto-init/BaseAutoInitHandler.unit.test.ts @@ -9,17 +9,17 @@ * */ -import { IHandlerParameters } from "../../../../../../src/cmd"; -import { ImperativeConfig } from "../../../../../../src/utilities/ImperativeConfig"; -import { ProcessUtils } from "../../../../../../src/utilities/ProcessUtils"; +import { IHandlerParameters } from "../../../../../src/cmd"; +import { ImperativeConfig } from "../../../../../src/utilities/ImperativeConfig"; +import { ProcessUtils } from "../../../../../src/utilities/ProcessUtils"; import { FakeAutoInitHandler } from "./__data__/FakeAutoInitHandler"; import * as lodash from "lodash"; import * as jestDiff from "jest-diff"; import stripAnsi = require("strip-ansi"); -import { ConfigSchema } from "../../../../../../src/config"; -import { CredentialManagerFactory } from "../../../../../../src/security"; -import { SessConstants, Session } from "../../../../../../src/rest"; -import { OverridesLoader } from "../../../../../../src/imperative/OverridesLoader"; +import { ConfigSchema } from "../../../../../src/config"; +import { CredentialManagerFactory } from "../../../../../src/security"; +import { SessConstants, Session } from "../../../../../src/rest"; +import { OverridesLoader } from "../../../../../src/imperative/OverridesLoader"; jest.mock("strip-ansi"); diff --git a/packages/imperative/__tests__/__unit__/imperative/config/cmd/auto-init/CompleteAutoInitCommandBuilder.unit.test.ts b/packages/imperative/__tests__/__unit__/imperative/config/auto-init/CompleteAutoInitCommandBuilder.unit.test.ts similarity index 73% rename from packages/imperative/__tests__/__unit__/imperative/config/cmd/auto-init/CompleteAutoInitCommandBuilder.unit.test.ts rename to packages/imperative/__tests__/__unit__/imperative/config/auto-init/CompleteAutoInitCommandBuilder.unit.test.ts index 8bb4f90d8f..3793a3dd48 100644 --- a/packages/imperative/__tests__/__unit__/imperative/config/cmd/auto-init/CompleteAutoInitCommandBuilder.unit.test.ts +++ b/packages/imperative/__tests__/__unit__/imperative/config/auto-init/CompleteAutoInitCommandBuilder.unit.test.ts @@ -9,9 +9,9 @@ * */ -import { CompleteAutoInitCommandBuilder } from "../../../../../../src/imperative/config/cmd/auto-init/builders/CompleteAutoInitCommandBuilder"; -import { Logger } from "../../../../../../src/logger"; -import { ICommandDefinition } from "../../../../../../src/cmd"; +import { CompleteAutoInitCommandBuilder } from "../../../../../src/imperative/config/cmd/auto-init/builders/CompleteAutoInitCommandBuilder"; +import { Logger } from "../../../../../src/logger"; +import { ICommandDefinition } from "../../../../../src/cmd"; import { fakeAutoInitConfig } from "./__data__/SampleAutoInitConfig"; describe("CompleteAutoInitCommandBuilder", () => { diff --git a/packages/imperative/__tests__/__unit__/imperative/config/cmd/auto-init/__data__/FakeAutoInitHandler.ts b/packages/imperative/__tests__/__unit__/imperative/config/auto-init/__data__/FakeAutoInitHandler.ts similarity index 79% rename from packages/imperative/__tests__/__unit__/imperative/config/cmd/auto-init/__data__/FakeAutoInitHandler.ts rename to packages/imperative/__tests__/__unit__/imperative/config/auto-init/__data__/FakeAutoInitHandler.ts index 246d5a00c3..1cb98c7e6a 100644 --- a/packages/imperative/__tests__/__unit__/imperative/config/cmd/auto-init/__data__/FakeAutoInitHandler.ts +++ b/packages/imperative/__tests__/__unit__/imperative/config/auto-init/__data__/FakeAutoInitHandler.ts @@ -9,9 +9,9 @@ * */ -import { BaseAutoInitHandler } from "../../../../../../../src/imperative/config/cmd/auto-init/handlers/BaseAutoInitHandler"; -import { ICommandArguments, IHandlerResponseApi } from "../../../../../../../src/cmd"; -import { ISession, AbstractSession } from "../../../../../../../src/rest"; +import { BaseAutoInitHandler } from "../../../../../../src/imperative/config/cmd/auto-init/handlers/BaseAutoInitHandler"; +import { ICommandArguments, IHandlerResponseApi } from "../../../../../../src/cmd"; +import { ISession, AbstractSession } from "../../../../../../src/rest"; export class FakeAutoInitHandler extends BaseAutoInitHandler { public mProfileType: string = "fruit"; diff --git a/packages/imperative/__tests__/__unit__/imperative/config/cmd/auto-init/__data__/SampleAutoInitConfig.ts b/packages/imperative/__tests__/__unit__/imperative/config/auto-init/__data__/SampleAutoInitConfig.ts similarity index 88% rename from packages/imperative/__tests__/__unit__/imperative/config/cmd/auto-init/__data__/SampleAutoInitConfig.ts rename to packages/imperative/__tests__/__unit__/imperative/config/auto-init/__data__/SampleAutoInitConfig.ts index f66575df42..81be5eea2b 100644 --- a/packages/imperative/__tests__/__unit__/imperative/config/cmd/auto-init/__data__/SampleAutoInitConfig.ts +++ b/packages/imperative/__tests__/__unit__/imperative/config/auto-init/__data__/SampleAutoInitConfig.ts @@ -9,8 +9,8 @@ * */ -import { ICommandProfileAutoInitConfig } from "../../../../../../../src/cmd/doc/profiles/definition/ICommandProfileAutoInitConfig"; -import { ICommandOptionDefinition } from "../../../../../../../src/cmd"; +import { ICommandProfileAutoInitConfig } from "../../../../../../src/cmd/doc/profiles/definition/ICommandProfileAutoInitConfig"; +import { ICommandOptionDefinition } from "../../../../../../src/cmd"; const fakeOption: ICommandOptionDefinition = { name: "fake", diff --git a/packages/imperative/__tests__/__unit__/imperative/config/cmd/auto-init/__snapshots__/CompleteAutoInitCommandBuilder.unit.test.ts.snap b/packages/imperative/__tests__/__unit__/imperative/config/auto-init/__snapshots__/CompleteAutoInitCommandBuilder.unit.test.ts.snap similarity index 100% rename from packages/imperative/__tests__/__unit__/imperative/config/cmd/auto-init/__snapshots__/CompleteAutoInitCommandBuilder.unit.test.ts.snap rename to packages/imperative/__tests__/__unit__/imperative/config/auto-init/__snapshots__/CompleteAutoInitCommandBuilder.unit.test.ts.snap diff --git a/packages/imperative/__tests__/__unit__/imperative/config/cmd/convert-profiles/convert-profiles.handler.unit.test.ts b/packages/imperative/__tests__/__unit__/imperative/config/convert-profiles/convert-profiles.handler.unit.test.ts similarity index 98% rename from packages/imperative/__tests__/__unit__/imperative/config/cmd/convert-profiles/convert-profiles.handler.unit.test.ts rename to packages/imperative/__tests__/__unit__/imperative/config/convert-profiles/convert-profiles.handler.unit.test.ts index e6ff679a4d..e96b4a17b9 100644 --- a/packages/imperative/__tests__/__unit__/imperative/config/cmd/convert-profiles/convert-profiles.handler.unit.test.ts +++ b/packages/imperative/__tests__/__unit__/imperative/config/convert-profiles/convert-profiles.handler.unit.test.ts @@ -12,17 +12,17 @@ import * as fs from "fs"; import * as fsExtra from "fs-extra"; import { keyring as keytar } from "@zowe/secrets-for-zowe-sdk"; -import { Config, ConfigBuilder, ConfigSchema } from "../../../../../../src/config"; -import { IHandlerParameters } from "../../../../../../src/cmd"; -import { ProfileIO } from "../../../../../../src/profiles"; -import { AppSettings } from "../../../../../../src/settings"; -import { ImperativeConfig } from "../../../../../../src/utilities/ImperativeConfig"; -import * as npmInterface from "../../../../../../src/imperative/plugins/utilities/npm-interface"; -import { PluginIssues } from "../../../../../../src/imperative/plugins/utilities/PluginIssues"; -import ConvertProfilesHandler from "../../../../../../src/imperative/config/cmd/convert-profiles/convert-profiles.handler"; - -jest.mock("../../../../../../src/plugins/utilities/npm-interface"); -jest.mock("../../../../../../src/imperative/OverridesLoader"); +import { Config, ConfigBuilder, ConfigSchema } from "../../../../../src/config"; +import { IHandlerParameters } from "../../../../../src/cmd"; +import { ProfileIO } from "../../../../../src/profiles"; +import { AppSettings } from "../../../../../src/settings"; +import { ImperativeConfig } from "../../../../../src/utilities/ImperativeConfig"; +import * as npmInterface from "../../../../../src/imperative/plugins/utilities/npm-interface"; +import { PluginIssues } from "../../../../../src/imperative/plugins/utilities/PluginIssues"; +import ConvertProfilesHandler from "../../../../../src/imperative/config/cmd/convert-profiles/convert-profiles.handler"; + +jest.mock("../../../../../src/plugins/utilities/npm-interface"); +jest.mock("../../../../../src/imperative/OverridesLoader"); let stdout: string; let stderr: string; diff --git a/packages/imperative/__tests__/__unit__/imperative/config/cmd/edit/edit.handler.unit.test.ts b/packages/imperative/__tests__/__unit__/imperative/config/edit/edit.handler.unit.test.ts similarity index 89% rename from packages/imperative/__tests__/__unit__/imperative/config/cmd/edit/edit.handler.unit.test.ts rename to packages/imperative/__tests__/__unit__/imperative/config/edit/edit.handler.unit.test.ts index f2163fc412..2101bfae68 100644 --- a/packages/imperative/__tests__/__unit__/imperative/config/cmd/edit/edit.handler.unit.test.ts +++ b/packages/imperative/__tests__/__unit__/imperative/config/edit/edit.handler.unit.test.ts @@ -9,10 +9,10 @@ * */ -import EditHandler from "../../../../../../src/imperative/config/cmd/edit/edit.handler"; -import { IHandlerParameters } from "../../../../../../src/cmd"; -import { ImperativeConfig } from "../../../../../../src/utilities/ImperativeConfig"; -import { ProcessUtils } from "../../../../../../src/utilities/ProcessUtils"; +import EditHandler from "../../../../../src/imperative/config/cmd/edit/edit.handler"; +import { IHandlerParameters } from "../../../../../src/cmd"; +import { ImperativeConfig } from "../../../../../src/utilities/ImperativeConfig"; +import { ProcessUtils } from "../../../../../src/utilities/ProcessUtils"; const getIHandlerParametersObject = (): IHandlerParameters => { const x: any = { diff --git a/packages/imperative/__tests__/__unit__/imperative/config/cmd/import/import.handler.unit.test.ts b/packages/imperative/__tests__/__unit__/imperative/config/import/import.handler.unit.test.ts similarity index 96% rename from packages/imperative/__tests__/__unit__/imperative/config/cmd/import/import.handler.unit.test.ts rename to packages/imperative/__tests__/__unit__/imperative/config/import/import.handler.unit.test.ts index f5762be40c..89592eff5b 100644 --- a/packages/imperative/__tests__/__unit__/imperative/config/cmd/import/import.handler.unit.test.ts +++ b/packages/imperative/__tests__/__unit__/imperative/config/import/import.handler.unit.test.ts @@ -14,13 +14,13 @@ import * as path from "path"; import * as url from "url"; import * as JSONC from "comment-json"; import * as lodash from "lodash"; -import ImportHandler from "../../../../../../src/imperative/config/cmd/import/import.handler"; -import { IHandlerParameters } from "../../../../../../src/cmd"; -import { Config, ConfigConstants, IConfig } from "../../../../../../src/config"; -import { ISession, RestClient } from "../../../../../../src/rest"; -import { ImperativeConfig } from "../../../../../../src/utilities/ImperativeConfig"; +import ImportHandler from "../../../../../src/imperative/config/cmd/import/import.handler"; +import { IHandlerParameters } from "../../../../../src/cmd"; +import { Config, ConfigConstants, IConfig } from "../../../../../src/config"; +import { ISession, RestClient } from "../../../../../src/rest"; +import { ImperativeConfig } from "../../../../../src/utilities/ImperativeConfig"; import { expectedConfigObject, expectedSchemaObject } from - "../../../../../../__tests__/__integration__/imperative/__tests__/__integration__/cli/config/__resources__/expectedObjects"; + "../../../../../__tests__/__integration__/imperative/__tests__/__integration__/cli/config/__resources__/expectedObjects"; jest.mock("fs"); diff --git a/packages/imperative/__tests__/__unit__/imperative/config/cmd/init/init.handler.unit.test.ts b/packages/imperative/__tests__/__unit__/imperative/config/init/init.handler.unit.test.ts similarity index 97% rename from packages/imperative/__tests__/__unit__/imperative/config/cmd/init/init.handler.unit.test.ts rename to packages/imperative/__tests__/__unit__/imperative/config/init/init.handler.unit.test.ts index da9fb89710..a687985abf 100644 --- a/packages/imperative/__tests__/__unit__/imperative/config/cmd/init/init.handler.unit.test.ts +++ b/packages/imperative/__tests__/__unit__/imperative/config/init/init.handler.unit.test.ts @@ -9,22 +9,22 @@ * */ -import { IHandlerParameters } from "../../../../../../"; -import { Config } from "../../../../../../src/config/Config"; -import { ConfigConstants } from "../../../../../../src/config/ConfigConstants"; -import { ProcessUtils } from "../../../../../../src/utilities/ProcessUtils"; -import { ImperativeConfig } from "../../../../../../src/utilities/ImperativeConfig"; -import { IImperativeConfig } from "../../../../../../src/imperative/doc/IImperativeConfig"; +import { IHandlerParameters } from "../../../../../"; +import { Config } from "../../../../../src/config/Config"; +import { ConfigConstants } from "../../../../../src/config/ConfigConstants"; +import { ProcessUtils } from "../../../../../src/utilities/ProcessUtils"; +import { ImperativeConfig } from "../../../../../src/utilities/ImperativeConfig"; +import { IImperativeConfig } from "../../../../../src/imperative/doc/IImperativeConfig"; import { expectedSchemaObject } from - "../../../../../../__tests__/__integration__/imperative/__tests__/__integration__/cli/config/__resources__/expectedObjects"; -import InitHandler from "../../../../../../src/imperative/config/cmd/init/init.handler"; -import * as config from "../../../../../../__tests__/__integration__/imperative/src/imperative"; + "../../../../../__tests__/__integration__/imperative/__tests__/__integration__/cli/config/__resources__/expectedObjects"; +import InitHandler from "../../../../../src/imperative/config/cmd/init/init.handler"; +import * as config from "../../../../../__tests__/__integration__/imperative/src/imperative"; import * as path from "path"; import * as lodash from "lodash"; import * as fs from "fs"; -import { CredentialManagerFactory } from "../../../../../../src/security"; -import { setupConfigToLoad } from "../../../../../../__tests__/src/TestUtil"; -import { OverridesLoader } from "../../../../../../src/imperative/OverridesLoader"; +import { CredentialManagerFactory } from "../../../../../src/security"; +import { setupConfigToLoad } from "../../../../../__tests__/src/TestUtil"; +import { OverridesLoader } from "../../../../../src/imperative/OverridesLoader"; jest.mock("fs"); diff --git a/packages/imperative/__tests__/__unit__/imperative/config/cmd/list/list.handler.unit.test.ts b/packages/imperative/__tests__/__unit__/imperative/config/list/list.handler.unit.test.ts similarity index 96% rename from packages/imperative/__tests__/__unit__/imperative/config/cmd/list/list.handler.unit.test.ts rename to packages/imperative/__tests__/__unit__/imperative/config/list/list.handler.unit.test.ts index 3623ead9a2..c888413bef 100644 --- a/packages/imperative/__tests__/__unit__/imperative/config/cmd/list/list.handler.unit.test.ts +++ b/packages/imperative/__tests__/__unit__/imperative/config/list/list.handler.unit.test.ts @@ -11,10 +11,10 @@ jest.mock("../../../../../utilities/ImperativeConfig"); -import { Config, ConfigConstants, IConfig, IConfigLayer } from "../../../../../../src/config"; -import { ImperativeConfig } from "../../../../../../src/utilities/ImperativeConfig"; +import { Config, ConfigConstants, IConfig, IConfigLayer } from "../../../../../src/config"; +import { ImperativeConfig } from "../../../../../src/utilities/ImperativeConfig"; import { cloneDeep } from "lodash"; -import ListHandler from "../../../../../../src/imperative/config/cmd/list/list.handler"; +import ListHandler from "../../../../../src/imperative/config/cmd/list/list.handler"; let dataObj: any; let formatObj: any; diff --git a/packages/imperative/__tests__/__unit__/imperative/config/cmd/profiles/profiles.handler.unit.test.ts b/packages/imperative/__tests__/__unit__/imperative/config/profiles/profiles.handler.unit.test.ts similarity index 91% rename from packages/imperative/__tests__/__unit__/imperative/config/cmd/profiles/profiles.handler.unit.test.ts rename to packages/imperative/__tests__/__unit__/imperative/config/profiles/profiles.handler.unit.test.ts index ab0a5a95cb..16541124d6 100644 --- a/packages/imperative/__tests__/__unit__/imperative/config/cmd/profiles/profiles.handler.unit.test.ts +++ b/packages/imperative/__tests__/__unit__/imperative/config/profiles/profiles.handler.unit.test.ts @@ -11,9 +11,9 @@ jest.mock("../../../../../utilities/ImperativeConfig"); -import { IConfig } from "../../../../../../src/config"; -import { ImperativeConfig } from "../../../../../../src/utilities/ImperativeConfig"; -import ProfilesHandler from "../../../../../../src/imperative/config/cmd/profiles/profiles.handler"; +import { IConfig } from "../../../../../src/config/doc/IConfig"; +import { ImperativeConfig } from "../../../../../src/utilities/ImperativeConfig"; +import ProfilesHandler from "../../../../../src/imperative/config/cmd/profiles/profiles.handler"; let dataObj: any; let formatObj: any; diff --git a/packages/imperative/__tests__/__unit__/imperative/config/cmd/report-env/EnvQuery.unit.test.ts b/packages/imperative/__tests__/__unit__/imperative/config/report-env/EnvQuery.unit.test.ts similarity index 97% rename from packages/imperative/__tests__/__unit__/imperative/config/cmd/report-env/EnvQuery.unit.test.ts rename to packages/imperative/__tests__/__unit__/imperative/config/report-env/EnvQuery.unit.test.ts index 44385be761..38a3c1f264 100644 --- a/packages/imperative/__tests__/__unit__/imperative/config/cmd/report-env/EnvQuery.unit.test.ts +++ b/packages/imperative/__tests__/__unit__/imperative/config/report-env/EnvQuery.unit.test.ts @@ -13,13 +13,13 @@ import * as fs from "fs"; import * as os from "os"; import * as path from "path"; -import { CommandResponse } from "../../../../../../src/cmd/response/CommandResponse"; -import { IO } from "../../../../../../src/io"; -import { ImperativeConfig } from "../../../../../../src/utilities/ImperativeConfig"; -import { PluginIssues } from "../../../../../../src/imperative/plugins/utilities/PluginIssues"; +import { CommandResponse } from "../../../../../src/cmd/response/CommandResponse"; +import { IO } from "../../../../../src/io"; +import { ImperativeConfig } from "../../../../../src/utilities/ImperativeConfig"; +import { PluginIssues } from "../../../../../src/imperative/plugins/utilities/PluginIssues"; -import { EnvQuery, IGetItemOpts, IGetItemVal } from "../../../../../../src/imperative/config/cmd/report-env/EnvQuery"; -import { ItemId } from "../../../../../../src/imperative/config/cmd/report-env/EnvItems"; +import { EnvQuery, IGetItemOpts, IGetItemVal } from "../../../../../src/imperative/config/cmd/report-env/EnvQuery"; +import { ItemId } from "../../../../../src/imperative/config/cmd/report-env/EnvItems"; describe("Tests for EnvQuery module", () => { const fakeCliHomeDir = "this_is_a_fake_cli_home_dir"; @@ -120,7 +120,7 @@ describe("Tests for EnvQuery module", () => { Object.defineProperty(impCfg, "callerLocation", { configurable: true, get: jest.fn(() => { - return path.normalize(__dirname + "/../../../../../../../cli"); + return path.normalize(__dirname + "../../../../../cli"); }) }); const itemObj: IGetItemVal = await EnvQuery.getEnvItemVal(ItemId.ZOWE_VER); @@ -283,7 +283,7 @@ describe("Tests for EnvQuery module", () => { }); it("should report an unknown item id", async () => { - const itemObj: IGetItemVal = await EnvQuery.getEnvItemVal(999); + const itemObj: IGetItemVal = await EnvQuery.getEnvItemVal(999 as any); expect(itemObj.itemProbMsg).toBe("An unknown item ID was supplied = 999"); }); diff --git a/packages/imperative/__tests__/__unit__/imperative/config/cmd/report-env/Report-env.handler.unit.test.ts b/packages/imperative/__tests__/__unit__/imperative/config/report-env/Report-env.handler.unit.test.ts similarity index 92% rename from packages/imperative/__tests__/__unit__/imperative/config/cmd/report-env/Report-env.handler.unit.test.ts rename to packages/imperative/__tests__/__unit__/imperative/config/report-env/Report-env.handler.unit.test.ts index 46ac861cee..ff3c382d90 100644 --- a/packages/imperative/__tests__/__unit__/imperative/config/cmd/report-env/Report-env.handler.unit.test.ts +++ b/packages/imperative/__tests__/__unit__/imperative/config/report-env/Report-env.handler.unit.test.ts @@ -9,9 +9,9 @@ * */ -import ReportEnvHandler from "../../../../../../src/imperative/config/cmd/report-env/Report-env.handler"; -import { EnvQuery, IGetItemVal } from "../../../../../../src/imperative/config/cmd/report-env/EnvQuery"; -import { ItemId } from "../../../../../../src/imperative/config/cmd/report-env/EnvItems"; +import ReportEnvHandler from "../../../../../src/imperative/config/cmd/report-env/Report-env.handler"; +import { EnvQuery, IGetItemVal } from "../../../../../src/imperative/config/cmd/report-env/EnvQuery"; +import { ItemId } from "../../../../../src/imperative/config/cmd/report-env/EnvItems"; describe("Handler for config report-env", () => { diff --git a/packages/imperative/__tests__/__unit__/imperative/config/cmd/schema/schema.handler.unit.test.ts b/packages/imperative/__tests__/__unit__/imperative/config/schema/schema.handler.unit.test.ts similarity index 92% rename from packages/imperative/__tests__/__unit__/imperative/config/cmd/schema/schema.handler.unit.test.ts rename to packages/imperative/__tests__/__unit__/imperative/config/schema/schema.handler.unit.test.ts index 0cefc66c4e..249f384028 100644 --- a/packages/imperative/__tests__/__unit__/imperative/config/cmd/schema/schema.handler.unit.test.ts +++ b/packages/imperative/__tests__/__unit__/imperative/config/schema/schema.handler.unit.test.ts @@ -11,9 +11,9 @@ jest.mock("../../../../../utilities/ImperativeConfig"); -import { ImperativeConfig } from "../../../../../../src/utilities/ImperativeConfig"; -import { IProfileTypeConfiguration } from "../../../../../../src/profiles"; -import SchemaHandler from "../../../../../../src/imperative/config/cmd/schema/schema.handler"; +import { ImperativeConfig } from "../../../../../src/utilities/ImperativeConfig"; +import { IProfileTypeConfiguration } from "../../../../../src/profiles"; +import SchemaHandler from "../../../../../src/imperative/config/cmd/schema/schema.handler"; let dataObj: any; let errorText: string; diff --git a/packages/imperative/__tests__/__unit__/imperative/config/cmd/secure/secure.handler.unit.test.ts b/packages/imperative/__tests__/__unit__/imperative/config/secure/secure.handler.unit.test.ts similarity index 96% rename from packages/imperative/__tests__/__unit__/imperative/config/cmd/secure/secure.handler.unit.test.ts rename to packages/imperative/__tests__/__unit__/imperative/config/secure/secure.handler.unit.test.ts index 84905948d7..79a9769a81 100644 --- a/packages/imperative/__tests__/__unit__/imperative/config/cmd/secure/secure.handler.unit.test.ts +++ b/packages/imperative/__tests__/__unit__/imperative/config/secure/secure.handler.unit.test.ts @@ -9,23 +9,24 @@ * */ -import { IHandlerParameters, Logger } from "../../../../../../"; -import { Config } from "../../../../../../src/config/Config"; -import { IConfig, IConfigOpts, IConfigProfile } from "../../../../../../src/config"; -import { ImperativeConfig } from "../../../../../../src/utilities/ImperativeConfig"; -import { IImperativeConfig } from "../../../../../../src/imperative/doc/IImperativeConfig"; -import { ICredentialManagerInit } from "../../../../../../src/security/doc/ICredentialManagerInit"; -import { CredentialManagerFactory } from "../../../../../../src/security"; +import { IHandlerParameters, Logger } from "../../../../../"; +import { Config } from "../../../../../src/config/Config"; +import { IConfig, IConfigOpts, IConfigProfile } from "../../../../../src/config"; +import { ImperativeConfig } from "../../../../../src/utilities/ImperativeConfig"; +import { IImperativeConfig } from "../../../../../src/imperative/doc/IImperativeConfig"; +import { ICredentialManagerInit } from "../../../../../src/security/doc/ICredentialManagerInit"; +import { CredentialManagerFactory } from "../../../../../src/security"; import { expectedConfigObject } from - "../../../../../../__tests__/__integration__/imperative/__tests__/__integration__/cli/config/__resources__/expectedObjects"; -import SecureHandler from "../../../../../../src/imperative/config/cmd/secure/secure.handler"; -import * as config from "../../../../../../__tests__/__integration__/imperative/src/imperative"; + "../../../../../__tests__/__integration__/imperative/__tests__/__integration__/cli/config/__resources__/expectedObjects"; +import SecureHandler from "../../../../../src/imperative/config/cmd/secure/secure.handler"; +import * as config from "../../../../../__tests__/__integration__/imperative/src/imperative"; import { keyring as keytar } from "@zowe/secrets-for-zowe-sdk"; import * as path from "path"; import * as lodash from "lodash"; import * as fs from "fs"; -import { SessConstants } from "../../../../../../src/rest"; -import { setupConfigToLoad } from "../../../../../../__tests__/src/TestUtil"; +import { SessConstants } from "../../../../../src/rest"; +import { setupConfigToLoad } from "../../../../../__tests__/src/TestUtil"; +import { IHandlerFormatOutputApi } from "../../../../../src"; let readPromptSpy: any; const getIHandlerParametersObject = (): IHandlerParameters => { @@ -130,7 +131,7 @@ describe("Configuration Secure command handler", () => { it("should attempt to secure the project configuration", async () => { const handler = new SecureHandler(); - const params = getIHandlerParametersObject(); + const params: IHandlerParameters = getIHandlerParametersObject(); params.arguments.userConfig = false; params.arguments.globalConfig = false; @@ -192,8 +193,7 @@ describe("Configuration Secure command handler", () => { it("should attempt to secure the user configuration", async () => { const handler = new SecureHandler(); - const params = getIHandlerParametersObject(); - + const params: IHandlerParameters = getIHandlerParametersObject(); params.arguments.userConfig = true; params.arguments.globalConfig = false; @@ -252,7 +252,7 @@ describe("Configuration Secure command handler", () => { it("should attempt to secure the global project configuration", async () => { const handler = new SecureHandler(); - const params = getIHandlerParametersObject(); + const params: IHandlerParameters = getIHandlerParametersObject(); params.arguments.userConfig = false; params.arguments.globalConfig = true; @@ -314,7 +314,7 @@ describe("Configuration Secure command handler", () => { it("should attempt to secure the global user configuration", async () => { const handler = new SecureHandler(); - const params = getIHandlerParametersObject(); + const params: IHandlerParameters = getIHandlerParametersObject(); params.arguments.userConfig = true; params.arguments.globalConfig = true; @@ -376,7 +376,7 @@ describe("Configuration Secure command handler", () => { it("should fail to secure the project configuration if there is no project configuration", async () => { const handler = new SecureHandler(); - const params = getIHandlerParametersObject(); + const params: IHandlerParameters = getIHandlerParametersObject(); params.arguments.userConfig = false; params.arguments.globalConfig = false; @@ -420,7 +420,7 @@ describe("Configuration Secure command handler", () => { it("should secure the project configuration and prune unused properties", async () => { const handler = new SecureHandler(); - const params = getIHandlerParametersObject(); + const params: IHandlerParameters = getIHandlerParametersObject(); params.arguments.userConfig = false; params.arguments.globalConfig = false; @@ -505,7 +505,7 @@ describe("Configuration Secure command handler", () => { const authHandlerPath = __dirname + "/../../../../src/auth/handlers/AbstractAuthHandler"; const handler = new SecureHandler(); - const params = getIHandlerParametersObject(); + const params: IHandlerParameters = getIHandlerParametersObject(); let mockAuthHandlerApi: any; beforeAll(() => { diff --git a/packages/imperative/__tests__/__unit__/imperative/config/cmd/set/set.handler.unit.test.ts b/packages/imperative/__tests__/__unit__/imperative/config/set/set.handler.unit.test.ts similarity index 100% rename from packages/imperative/__tests__/__unit__/imperative/config/cmd/set/set.handler.unit.test.ts rename to packages/imperative/__tests__/__unit__/imperative/config/set/set.handler.unit.test.ts diff --git a/packages/imperative/__tests__/__unit__/imperative/config/cmd/update-schema/updateSchema.handler.unit.test.ts b/packages/imperative/__tests__/__unit__/imperative/config/update-schema/updateSchema.handler.unit.test.ts similarity index 100% rename from packages/imperative/__tests__/__unit__/imperative/config/cmd/update-schema/updateSchema.handler.unit.test.ts rename to packages/imperative/__tests__/__unit__/imperative/config/update-schema/updateSchema.handler.unit.test.ts diff --git a/packages/imperative/__tests__/__unit__/imperative/plugins/AbstractPluginLifeCycle.unit.test.ts b/packages/imperative/__tests__/__unit__/imperative/plugins/AbstractPluginLifeCycle.unit.test.ts index 4f48d45160..6e3c183a6b 100644 --- a/packages/imperative/__tests__/__unit__/imperative/plugins/AbstractPluginLifeCycle.unit.test.ts +++ b/packages/imperative/__tests__/__unit__/imperative/plugins/AbstractPluginLifeCycle.unit.test.ts @@ -15,7 +15,7 @@ import { join } from "path"; describe("AbstractPluginLifeCycle", () => { it("should have the right class definition", () => { const absLifeCycleClass: string = fs.readFileSync( - join(__dirname, "../../src/plugins/AbstractPluginLifeCycle.ts"), + join(__dirname, "../../../../src/imperative/plugins/AbstractPluginLifeCycle.ts"), "utf8" ); expect(absLifeCycleClass).toContain("export abstract class AbstractPluginLifeCycle"); diff --git a/packages/imperative/__tests__/__unit__/operations/TestOperations1.ts b/packages/imperative/__tests__/__unit__/operations/TestOperations1.ts index a56482a68f..23d2877a64 100644 --- a/packages/imperative/__tests__/__unit__/operations/TestOperations1.ts +++ b/packages/imperative/__tests__/__unit__/operations/TestOperations1.ts @@ -12,7 +12,7 @@ import { TestSubOp1 } from "./subops/TestSubOp1"; import { TestSubOp2 } from "./subops/TestSubOp2"; import { TestSubOpNoUndo } from "./subops/TestSubOpNoUndo"; -import { Operations } from "../../../index"; +import { Operations } from "../../../../imperative/src/operations/index"; export class TestOperations1 extends Operations { constructor() { diff --git a/packages/imperative/__tests__/src/packages/profiles/__integration__/BasicProfileManager.constructor.integration.test.ts b/packages/imperative/__tests__/src/packages/profiles/__integration__/BasicProfileManager.constructor.integration.test.ts index f5085c3093..488028fc7f 100644 --- a/packages/imperative/__tests__/src/packages/profiles/__integration__/BasicProfileManager.constructor.integration.test.ts +++ b/packages/imperative/__tests__/src/packages/profiles/__integration__/BasicProfileManager.constructor.integration.test.ts @@ -9,7 +9,7 @@ * */ -jest.mock("../../../../../imperative/src/utilities/ImperativeConfig.ts"); +jest.mock("../../../../src/imperative/utilities/ImperativeConfig.ts"); import * as TestUtil from "../../../TestUtil"; import { BasicProfileManager } from "../../../../../src/index"; diff --git a/packages/imperative/__tests__/src/packages/profiles/__integration__/BasicProfileManager.integration.test.ts b/packages/imperative/__tests__/src/packages/profiles/__integration__/BasicProfileManager.integration.test.ts index 92c7fbaf6b..7c368c8bcb 100644 --- a/packages/imperative/__tests__/src/packages/profiles/__integration__/BasicProfileManager.integration.test.ts +++ b/packages/imperative/__tests__/src/packages/profiles/__integration__/BasicProfileManager.integration.test.ts @@ -23,9 +23,9 @@ describe("Imperative should allow CLI implementations to read their own profiles const mainModule = process.mainModule; const loadChangingDependencies = () => { return { - Imperative: require("../../../../../src/imperative/src/Imperative").Imperative, - ImperativeConfig: require("../../../../../src/utilities/ImperativeConfig").ImperativeConfig, - ImperativeError: require("../../../../../src/error/src/ImperativeError").ImperativeError + Imperative: require("../../../../src/imperative/Imperative").Imperative, + ImperativeConfig: require("../../../../src/utilities/ImperativeConfig").ImperativeConfig, + ImperativeError: require("../../../../src/error/ImperativeError").ImperativeError }; }; From e5b1edbcda19459b0221a98c9239ff3b9dfc88ac Mon Sep 17 00:00:00 2001 From: Amber Torrise Date: Wed, 31 Jan 2024 13:23:22 -0500 Subject: [PATCH 138/138] subset of import fixes left to make Signed-off-by: Amber Torrise --- .../__tests__/__unit__/config/ProfileCredentials.unit.test.ts | 2 +- .../__unit__/profiles/BasicProfileManager.merge.unit.test.ts | 2 +- .../__unit__/profiles/BasicProfileManager.unit.test.ts | 2 +- .../__unit__/security/CredentialManagerFactory.unit.test.ts | 4 ++-- .../__unit__/security/DefaultCredentialManager.unit.test.ts | 2 +- .../__tests__/__unit__/settings/AppSettings.unit.test.ts | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/packages/imperative/__tests__/__unit__/config/ProfileCredentials.unit.test.ts b/packages/imperative/__tests__/__unit__/config/ProfileCredentials.unit.test.ts index c00835e3a2..c52513da57 100644 --- a/packages/imperative/__tests__/__unit__/config/ProfileCredentials.unit.test.ts +++ b/packages/imperative/__tests__/__unit__/config/ProfileCredentials.unit.test.ts @@ -10,7 +10,7 @@ */ import * as fs from "fs"; -import { CredentialManagerFactory, DefaultCredentialManager, ICredentialManagerInit } from "../../security"; +import { CredentialManagerFactory, DefaultCredentialManager, ICredentialManagerInit } from "../../../src/security"; import { ConfigSecure } from "../../../src/config/api/ConfigSecure"; import { ProfileCredentials } from "../../../src/config/ProfileCredentials"; diff --git a/packages/imperative/__tests__/__unit__/profiles/BasicProfileManager.merge.unit.test.ts b/packages/imperative/__tests__/__unit__/profiles/BasicProfileManager.merge.unit.test.ts index 1ab5f411f5..563f7adbb5 100644 --- a/packages/imperative/__tests__/__unit__/profiles/BasicProfileManager.merge.unit.test.ts +++ b/packages/imperative/__tests__/__unit__/profiles/BasicProfileManager.merge.unit.test.ts @@ -21,7 +21,7 @@ import { TEST_PROFILE_ROOT_DIR } from "./TestConstants"; import { TestLogger } from "../../../__tests__/src/TestLogger"; -import { IProfile, ProfileIO } from "../"; +import { IProfile, ProfileIO } from "../../../src/profiles"; import { inspect } from "util"; // UnitTestUtils.replaceIt(); diff --git a/packages/imperative/__tests__/__unit__/profiles/BasicProfileManager.unit.test.ts b/packages/imperative/__tests__/__unit__/profiles/BasicProfileManager.unit.test.ts index 2c531af93c..2a5d0e12f3 100644 --- a/packages/imperative/__tests__/__unit__/profiles/BasicProfileManager.unit.test.ts +++ b/packages/imperative/__tests__/__unit__/profiles/BasicProfileManager.unit.test.ts @@ -23,7 +23,7 @@ import { STRAWBERRY_AND_APPLE_NO_DEP, TEST_PROFILE_ROOT_DIR } from "./TestConstants"; -import { BasicProfileManager } from "../src/BasicProfileManager"; +import { BasicProfileManager } from "../../../src/profiles/BasicProfileManager"; // UnitTestUtils.replaceIt(); describe("Basic Profile Manager", () => { diff --git a/packages/imperative/__tests__/__unit__/security/CredentialManagerFactory.unit.test.ts b/packages/imperative/__tests__/__unit__/security/CredentialManagerFactory.unit.test.ts index c98e9eaee4..bc053d7c19 100644 --- a/packages/imperative/__tests__/__unit__/security/CredentialManagerFactory.unit.test.ts +++ b/packages/imperative/__tests__/__unit__/security/CredentialManagerFactory.unit.test.ts @@ -28,8 +28,8 @@ describe("CredentialManagerFactory", () => { // reload our modules. So we will clear the module registry and import again jest.resetModules(); jest.doMock("../src/DefaultCredentialManager"); - ({ CredentialManagerFactory, DefaultCredentialManager, BadCredentialManagerError } = await import("..")); - ({ InvalidCredentialManager } = await import("../src/InvalidCredentialManager")); + ({ CredentialManagerFactory, DefaultCredentialManager, BadCredentialManagerError } = await import("../../../src/security")); + ({ InvalidCredentialManager } = await import("../../../src/security/InvalidCredentialManager")); }); it("should throw an error if no service name was provided", () => { diff --git a/packages/imperative/__tests__/__unit__/security/DefaultCredentialManager.unit.test.ts b/packages/imperative/__tests__/__unit__/security/DefaultCredentialManager.unit.test.ts index 6821a9c8c4..c5621cbf7c 100644 --- a/packages/imperative/__tests__/__unit__/security/DefaultCredentialManager.unit.test.ts +++ b/packages/imperative/__tests__/__unit__/security/DefaultCredentialManager.unit.test.ts @@ -12,7 +12,7 @@ jest.mock("@zowe/secrets-for-zowe-sdk"); import * as path from "path"; -import { DefaultCredentialManager } from ".."; +import { DefaultCredentialManager } from "../../../src/security"; import { keyring as keytar } from "@zowe/secrets-for-zowe-sdk"; import { ImperativeError } from "../../../src/error"; diff --git a/packages/imperative/__tests__/__unit__/settings/AppSettings.unit.test.ts b/packages/imperative/__tests__/__unit__/settings/AppSettings.unit.test.ts index 326235b87e..ec9d432894 100644 --- a/packages/imperative/__tests__/__unit__/settings/AppSettings.unit.test.ts +++ b/packages/imperative/__tests__/__unit__/settings/AppSettings.unit.test.ts @@ -16,7 +16,7 @@ jest.mock("jsonfile"); import { AppSettings } from "../../../"; import { existsSync } from "fs"; -import { SettingsAlreadyInitialized, SettingsNotInitialized } from "../../../src/errors"; +import { SettingsAlreadyInitialized, SettingsNotInitialized } from "../../../src/settings/errors"; import { readFileSync, writeFile, writeFileSync } from "jsonfile"; import { ISettingsFile } from "../../../src/settings/doc/ISettingsFile"; import * as DeepMerge from "deepmerge";