From 0b1cb204fdead7ce1b18459487e89235c08abdb1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pavel=20Jare=C5=A1?= Date: Tue, 28 Mar 2023 17:36:57 +0200 Subject: [PATCH 001/168] working unit tests --- .gitignore | 2 + bin/commands/components/conda.ts | 4 +- bin/commands/components/disable/cli.ts | 2 +- bin/commands/components/disable/index.ts | 2 +- bin/commands/components/enable/cli.ts | 2 +- bin/commands/components/enable/index.ts | 2 +- bin/commands/components/handlerutils.ts | 2 +- bin/commands/components/install/cli.ts | 4 +- .../components/install/extract/cli.ts | 2 +- .../components/install/extract/index.ts | 4 +- bin/commands/components/install/index.ts | 2 +- .../components/install/process-hook/cli.ts | 2 +- .../components/install/process-hook/index.ts | 2 +- bin/commands/components/npm.ts | 4 +- bin/commands/components/search/cli.ts | 2 +- bin/commands/components/search/index.ts | 2 +- bin/commands/components/uninstall/cli.ts | 2 +- bin/commands/components/uninstall/index.ts | 4 +- bin/commands/components/upgrade/cli.ts | 2 +- bin/commands/config/get/cli.ts | 2 +- bin/commands/config/validate/cli.ts | 2 +- bin/commands/config/validate/index.ts | 2 +- bin/commands/internal/config/get/cli.ts | 2 +- bin/commands/internal/config/set/cli.ts | 2 +- bin/commands/internal/config/set/index.ts | 2 +- bin/commands/internal/container/init/index.ts | 2 +- .../internal/get-launch-components/index.ts | 2 +- bin/commands/internal/start/component/cli.ts | 2 +- .../internal/start/component/index.ts | 4 +- bin/commands/internal/start/index.ts | 4 +- bin/commands/internal/start/prepare/index.ts | 4 +- bin/commands/start/index.ts | 2 +- bin/commands/stop/index.ts | 2 +- bin/libs/common.ts | 4 +- bin/libs/component.ts | 4 +- bin/libs/config.ts | 4 +- bin/libs/configmgr.ts | 4 +- bin/libs/container.ts | 4 +- bin/libs/fs.ts | 4 +- bin/libs/index.ts | 4 +- bin/libs/java.ts | 4 +- bin/libs/json.ts | 4 +- bin/libs/logging.ts | 4 +- bin/libs/network.ts | 4 +- bin/libs/node.ts | 4 +- bin/libs/pathoid.ts | 2 +- bin/libs/shell.ts | 4 +- bin/libs/string.ts | 4 +- bin/libs/sys.ts | 4 +- bin/libs/var.ts | 4 +- bin/libs/zos-dataset.ts | 2 +- bin/libs/zos-fs.ts | 4 +- bin/libs/zos.ts | 2 +- bin/libs/zosmf.ts | 4 +- build/zwe/jest.config.js | 15 + build/zwe/models/__mocks__/Configuration.js | 59 + build/zwe/models/__mocks__/cm_os.js | 125 + build/zwe/models/__mocks__/cm_std.js | 87 + build/zwe/models/__mocks__/posix.js | 15 + build/zwe/models/__mocks__/xplatform.js | 53 + build/zwe/models/__mocks__/zos.js | 35 + build/zwe/package-lock.json | 6238 ++++++++++++++++- build/zwe/package.json | 5 +- .../types/@qjstypes/{os.d.ts => cm_os.d.ts} | 0 .../types/@qjstypes/{std.d.ts => cm_std.d.ts} | 0 tests/zwe/libs/configmgr.test.ts | 14 + 66 files changed, 6716 insertions(+), 90 deletions(-) create mode 100644 build/zwe/jest.config.js create mode 100644 build/zwe/models/__mocks__/Configuration.js create mode 100644 build/zwe/models/__mocks__/cm_os.js create mode 100644 build/zwe/models/__mocks__/cm_std.js create mode 100644 build/zwe/models/__mocks__/posix.js create mode 100644 build/zwe/models/__mocks__/xplatform.js create mode 100644 build/zwe/models/__mocks__/zos.js rename build/zwe/types/@qjstypes/{os.d.ts => cm_os.d.ts} (100%) rename build/zwe/types/@qjstypes/{std.d.ts => cm_std.d.ts} (100%) create mode 100644 tests/zwe/libs/configmgr.test.ts diff --git a/.gitignore b/.gitignore index 0f955ef035..e740da7bb7 100644 --- a/.gitignore +++ b/.gitignore @@ -3,6 +3,8 @@ tmp/ .vscode/ .pytest_cache/ *.pyc +*.iml +.idea # emacs save files *~ diff --git a/bin/commands/components/conda.ts b/bin/commands/components/conda.ts index 680dcef5a5..08f3f0f84d 100644 --- a/bin/commands/components/conda.ts +++ b/bin/commands/components/conda.ts @@ -20,8 +20,8 @@ * */ -import * as std from 'std'; -import * as os from 'os'; +import * as std from 'cm_std'; +import * as os from 'cm_os'; import * as xplatform from 'xplatform'; import * as common from '../../libs/common'; import * as shell from '../../libs/shell'; diff --git a/bin/commands/components/disable/cli.ts b/bin/commands/components/disable/cli.ts index 76d425aab6..97603c6c4b 100644 --- a/bin/commands/components/disable/cli.ts +++ b/bin/commands/components/disable/cli.ts @@ -9,7 +9,7 @@ Copyright Contributors to the Zowe Project. */ -import * as std from 'std'; +import * as std from 'cm_std'; import * as index from './index'; import * as configmgr from '../../../libs/configmgr'; diff --git a/bin/commands/components/disable/index.ts b/bin/commands/components/disable/index.ts index 1144607d77..372ffec182 100644 --- a/bin/commands/components/disable/index.ts +++ b/bin/commands/components/disable/index.ts @@ -9,7 +9,7 @@ // Copyright Contributors to the Zowe Project. */ -import * as std from 'std'; +import * as std from 'cm_std'; import * as common from '../../../libs/common'; import * as component from '../../../libs/component'; import * as jsonlib from '../../../libs/json'; diff --git a/bin/commands/components/enable/cli.ts b/bin/commands/components/enable/cli.ts index 76d425aab6..97603c6c4b 100644 --- a/bin/commands/components/enable/cli.ts +++ b/bin/commands/components/enable/cli.ts @@ -9,7 +9,7 @@ Copyright Contributors to the Zowe Project. */ -import * as std from 'std'; +import * as std from 'cm_std'; import * as index from './index'; import * as configmgr from '../../../libs/configmgr'; diff --git a/bin/commands/components/enable/index.ts b/bin/commands/components/enable/index.ts index 46dc35a68c..12e1b0d75c 100644 --- a/bin/commands/components/enable/index.ts +++ b/bin/commands/components/enable/index.ts @@ -9,7 +9,7 @@ // Copyright Contributors to the Zowe Project. */ -import * as std from 'std'; +import * as std from 'cm_std'; import * as common from '../../../libs/common'; import * as component from '../../../libs/component'; import * as jsonlib from '../../../libs/json'; diff --git a/bin/commands/components/handlerutils.ts b/bin/commands/components/handlerutils.ts index 57459b2689..805690a1f4 100644 --- a/bin/commands/components/handlerutils.ts +++ b/bin/commands/components/handlerutils.ts @@ -9,7 +9,7 @@ Copyright Contributors to the Zowe Project. */ -import * as std from 'std'; +import * as std from 'cm_std'; import * as common from '../../libs/common'; import * as configlib from '../../libs/config'; import * as shell from '../../libs/shell'; diff --git a/bin/commands/components/install/cli.ts b/bin/commands/components/install/cli.ts index d528e84d50..cc57890cdc 100644 --- a/bin/commands/components/install/cli.ts +++ b/bin/commands/components/install/cli.ts @@ -10,8 +10,8 @@ */ import * as index from './index'; -import * as std from 'std'; -import * as os from 'os'; +import * as std from 'cm_std'; +import * as os from 'cm_os'; import * as configmgr from '../../../libs/configmgr'; const upgrade = false; //would be true for upgrade.ts diff --git a/bin/commands/components/install/extract/cli.ts b/bin/commands/components/install/extract/cli.ts index a205969861..b0f9ca2a69 100644 --- a/bin/commands/components/install/extract/cli.ts +++ b/bin/commands/components/install/extract/cli.ts @@ -9,6 +9,6 @@ Copyright Contributors to the Zowe Project. */ -import * as std from 'std'; +import * as std from 'cm_std'; import * as index from './index'; index.execute(std.getenv('ZWE_CLI_PARAMETER_COMPONENT_FILE'), std.getenv('ZWE_CLI_PARAMETER_AUTO_ENCODING')); diff --git a/bin/commands/components/install/extract/index.ts b/bin/commands/components/install/extract/index.ts index 58d311dc2f..af5724fcd6 100644 --- a/bin/commands/components/install/extract/index.ts +++ b/bin/commands/components/install/extract/index.ts @@ -9,8 +9,8 @@ Copyright Contributors to the Zowe Project. */ -import * as std from 'std'; -import * as os from 'os'; +import * as std from 'cm_std'; +import * as os from 'cm_os'; import * as zos from 'zos'; import * as xplatform from 'xplatform'; diff --git a/bin/commands/components/install/index.ts b/bin/commands/components/install/index.ts index 56ac2bbe0c..275b1e18c8 100644 --- a/bin/commands/components/install/index.ts +++ b/bin/commands/components/install/index.ts @@ -9,7 +9,7 @@ Copyright Contributors to the Zowe Project. */ -import * as std from 'std'; +import * as std from 'cm_std'; import * as extract from './extract/index'; import * as installHook from './process-hook/index'; import * as componentEnable from '../enable/index'; diff --git a/bin/commands/components/install/process-hook/cli.ts b/bin/commands/components/install/process-hook/cli.ts index f920099322..036c7a45a3 100644 --- a/bin/commands/components/install/process-hook/cli.ts +++ b/bin/commands/components/install/process-hook/cli.ts @@ -9,6 +9,6 @@ Copyright Contributors to the Zowe Project. */ -import * as std from 'std'; +import * as std from 'cm_std'; import * as index from './index'; index.execute(std.getenv('ZWE_CLI_PARAMETER_COMPONENT_NAME')); diff --git a/bin/commands/components/install/process-hook/index.ts b/bin/commands/components/install/process-hook/index.ts index d6bf483b51..59deb800c9 100644 --- a/bin/commands/components/install/process-hook/index.ts +++ b/bin/commands/components/install/process-hook/index.ts @@ -9,7 +9,7 @@ Copyright Contributors to the Zowe Project. */ -import * as std from 'std'; +import * as std from 'cm_std'; import * as common from '../../../../libs/common'; import * as stringlib from '../../../../libs/string'; import * as shell from '../../../../libs/shell'; diff --git a/bin/commands/components/npm.ts b/bin/commands/components/npm.ts index 14d49ad53e..ed6e346403 100644 --- a/bin/commands/components/npm.ts +++ b/bin/commands/components/npm.ts @@ -9,8 +9,8 @@ // Copyright Contributors to the Zowe Project. */ -import * as std from 'std'; -import * as os from 'os'; +import * as std from 'cm_std'; +import * as os from 'cm_os'; import * as xplatform from 'xplatform'; import * as common from '../../libs/common'; import * as shell from '../../libs/shell'; diff --git a/bin/commands/components/search/cli.ts b/bin/commands/components/search/cli.ts index 1f511d88c5..c4104bea02 100644 --- a/bin/commands/components/search/cli.ts +++ b/bin/commands/components/search/cli.ts @@ -9,7 +9,7 @@ Copyright Contributors to the Zowe Project. */ -import * as std from 'std'; +import * as std from 'cm_std'; import * as index from './index'; import * as configmgr from '../../../libs/configmgr'; diff --git a/bin/commands/components/search/index.ts b/bin/commands/components/search/index.ts index 9c24f2d940..02354ea794 100644 --- a/bin/commands/components/search/index.ts +++ b/bin/commands/components/search/index.ts @@ -9,7 +9,7 @@ // Copyright Contributors to the Zowe Project. */ -import * as std from 'std'; +import * as std from 'cm_std'; import * as common from '../../../libs/common'; import * as config from '../../../libs/config'; import * as component from '../../../libs/component'; diff --git a/bin/commands/components/uninstall/cli.ts b/bin/commands/components/uninstall/cli.ts index fec59654fa..ca558a2e21 100644 --- a/bin/commands/components/uninstall/cli.ts +++ b/bin/commands/components/uninstall/cli.ts @@ -10,7 +10,7 @@ */ import * as index from './index'; -import * as std from 'std'; +import * as std from 'cm_std'; import * as configmgr from '../../../libs/configmgr'; index.execute(std.getenv('ZWE_CLI_PARAMETER_COMPONENT_NAME'), std.getenv('ZWE_CLI_PARAMETER_HANDLER'), std.getenv('ZWE_CLI_PARAMETER_REGISTRY'), (std.getenv('ZWE_CLI_PARAMETER_DRY_RUN') === 'true')); diff --git a/bin/commands/components/uninstall/index.ts b/bin/commands/components/uninstall/index.ts index 0d08bfbff7..baf53e806e 100644 --- a/bin/commands/components/uninstall/index.ts +++ b/bin/commands/components/uninstall/index.ts @@ -9,8 +9,8 @@ Copyright Contributors to the Zowe Project. */ -import * as std from 'std'; -import * as os from 'os'; +import * as std from 'cm_std'; +import * as os from 'cm_os'; import * as config from '../../../libs/config'; import * as common from '../../../libs/common'; import * as fs from '../../../libs/fs'; diff --git a/bin/commands/components/upgrade/cli.ts b/bin/commands/components/upgrade/cli.ts index e2d1fd434a..6d1f2fefd2 100644 --- a/bin/commands/components/upgrade/cli.ts +++ b/bin/commands/components/upgrade/cli.ts @@ -10,7 +10,7 @@ */ import * as index from '../install/index'; -import * as std from 'std'; +import * as std from 'cm_std'; import * as configmgr from '../../../libs/configmgr'; const skipEnable = true; //because its already done. diff --git a/bin/commands/config/get/cli.ts b/bin/commands/config/get/cli.ts index 4c7549cfdd..e584f29768 100644 --- a/bin/commands/config/get/cli.ts +++ b/bin/commands/config/get/cli.ts @@ -8,7 +8,7 @@ Copyright Contributors to the Zowe Project. */ -import * as std from 'std'; +import * as std from 'cm_std'; import * as index from './../../internal/config/get/index'; import * as configmgr from '../../../libs/configmgr'; diff --git a/bin/commands/config/validate/cli.ts b/bin/commands/config/validate/cli.ts index 50dbac255f..069dd6f967 100644 --- a/bin/commands/config/validate/cli.ts +++ b/bin/commands/config/validate/cli.ts @@ -8,7 +8,7 @@ Copyright Contributors to the Zowe Project. */ -import * as std from 'std'; +import * as std from 'cm_std'; import * as index from './index'; import * as configmgr from '../../../libs/configmgr'; diff --git a/bin/commands/config/validate/index.ts b/bin/commands/config/validate/index.ts index 2bfcb114c3..c973cab922 100644 --- a/bin/commands/config/validate/index.ts +++ b/bin/commands/config/validate/index.ts @@ -9,7 +9,7 @@ Copyright Contributors to the Zowe Project. */ -import * as std from 'std'; +import * as std from 'cm_std'; import * as xplatform from 'xplatform'; import * as common from '../../../libs/common'; diff --git a/bin/commands/internal/config/get/cli.ts b/bin/commands/internal/config/get/cli.ts index f3ce6fb611..2bf8ef0f5a 100644 --- a/bin/commands/internal/config/get/cli.ts +++ b/bin/commands/internal/config/get/cli.ts @@ -8,6 +8,6 @@ Copyright Contributors to the Zowe Project. */ -import * as std from 'std'; +import * as std from 'cm_std'; import * as index from './index'; index.execute(std.getenv('ZWE_CLI_PARAMETER_PATH'), std.getenv('ZWE_CLI_PARAMETER_HA_INSTANCE')); diff --git a/bin/commands/internal/config/set/cli.ts b/bin/commands/internal/config/set/cli.ts index 6495e93477..f9724c219f 100644 --- a/bin/commands/internal/config/set/cli.ts +++ b/bin/commands/internal/config/set/cli.ts @@ -8,6 +8,6 @@ Copyright Contributors to the Zowe Project. */ -import * as std from 'std'; +import * as std from 'cm_std'; import * as index from './index'; index.execute(std.getenv('ZWE_CLI_PARAMETER_PATH'), std.getenv('ZWE_CLI_PARAMETER_VALUE'), std.getenv('ZWE_CLI_PARAMETER_HA_INSTANCE'), std.getenv('ZWE_CLI_PARAMETER_STRING') == 'true'); diff --git a/bin/commands/internal/config/set/index.ts b/bin/commands/internal/config/set/index.ts index 2a236d8727..a933254ca6 100644 --- a/bin/commands/internal/config/set/index.ts +++ b/bin/commands/internal/config/set/index.ts @@ -9,7 +9,7 @@ Copyright Contributors to the Zowe Project. */ -import * as std from 'std'; +import * as std from 'cm_std'; import * as common from '../../../../libs/common'; import * as config from '../../../../libs/config'; import * as json from '../../../../libs/json'; diff --git a/bin/commands/internal/container/init/index.ts b/bin/commands/internal/container/init/index.ts index 182f06401f..723d061b2d 100644 --- a/bin/commands/internal/container/init/index.ts +++ b/bin/commands/internal/container/init/index.ts @@ -9,7 +9,7 @@ Copyright Contributors to the Zowe Project. */ -import * as std from 'std'; +import * as std from 'cm_std'; import * as common from '../../../../libs/common'; import * as shell from '../../../../libs/shell'; import * as fs from '../../../../libs/fs'; diff --git a/bin/commands/internal/get-launch-components/index.ts b/bin/commands/internal/get-launch-components/index.ts index 72c2418e30..60782ee175 100644 --- a/bin/commands/internal/get-launch-components/index.ts +++ b/bin/commands/internal/get-launch-components/index.ts @@ -9,7 +9,7 @@ Copyright Contributors to the Zowe Project. */ -import * as std from 'std'; +import * as std from 'cm_std'; import * as common from '../../../libs/common'; import * as config from '../../../libs/config'; diff --git a/bin/commands/internal/start/component/cli.ts b/bin/commands/internal/start/component/cli.ts index ce6afc4f9e..00cb0ab5d6 100644 --- a/bin/commands/internal/start/component/cli.ts +++ b/bin/commands/internal/start/component/cli.ts @@ -10,5 +10,5 @@ */ import * as index from './index'; -import * as std from 'std'; +import * as std from 'cm_std'; index.execute(std.getenv("ZWE_CLI_PARAMETER_COMPONENT"), false); diff --git a/bin/commands/internal/start/component/index.ts b/bin/commands/internal/start/component/index.ts index 766dbbcaf5..8e4a9a2351 100644 --- a/bin/commands/internal/start/component/index.ts +++ b/bin/commands/internal/start/component/index.ts @@ -9,8 +9,8 @@ Copyright Contributors to the Zowe Project. */ -import * as std from 'std'; -import * as os from 'os'; +import * as std from 'cm_std'; +import * as os from 'cm_os'; import * as zos from 'zos'; import * as common from '../../../../libs/common'; import * as config from '../../../../libs/config'; diff --git a/bin/commands/internal/start/index.ts b/bin/commands/internal/start/index.ts index c8d92891ea..0474c2c55f 100644 --- a/bin/commands/internal/start/index.ts +++ b/bin/commands/internal/start/index.ts @@ -9,8 +9,8 @@ Copyright Contributors to the Zowe Project. */ -import * as std from 'std'; -import * as os from 'os'; +import * as std from 'cm_std'; +import * as os from 'cm_os'; import * as zos from 'zos'; import * as common from '../../../libs/common'; import * as internalStartPrepare from './prepare/index'; diff --git a/bin/commands/internal/start/prepare/index.ts b/bin/commands/internal/start/prepare/index.ts index 3a745aa8e8..ba472f7ba8 100644 --- a/bin/commands/internal/start/prepare/index.ts +++ b/bin/commands/internal/start/prepare/index.ts @@ -10,8 +10,8 @@ */ -import * as std from 'std'; -import * as os from 'os'; +import * as std from 'cm_std'; +import * as os from 'cm_os'; import * as zos from 'zos'; import * as xplatform from 'xplatform'; diff --git a/bin/commands/start/index.ts b/bin/commands/start/index.ts index f4e240c835..8c147b749b 100644 --- a/bin/commands/start/index.ts +++ b/bin/commands/start/index.ts @@ -9,7 +9,7 @@ Copyright Contributors to the Zowe Project. */ -import * as std from 'std'; +import * as std from 'cm_std'; import * as zoslib from '../../libs/zos'; import * as common from '../../libs/common'; import * as stringlib from '../../libs/string'; diff --git a/bin/commands/stop/index.ts b/bin/commands/stop/index.ts index fa0cec6314..1ed12fc5a0 100644 --- a/bin/commands/stop/index.ts +++ b/bin/commands/stop/index.ts @@ -9,7 +9,7 @@ Copyright Contributors to the Zowe Project. */ -import * as std from 'std'; +import * as std from 'cm_std'; import * as zoslib from '../../libs/zos'; import * as common from '../../libs/common'; import * as stringlib from '../../libs/string'; diff --git a/bin/libs/common.ts b/bin/libs/common.ts index 7f96065387..7eabf33f5f 100644 --- a/bin/libs/common.ts +++ b/bin/libs/common.ts @@ -9,8 +9,8 @@ Copyright Contributors to the Zowe Project. */ -import * as std from 'std'; -import * as os from 'os'; +import * as std from 'cm_std'; +import * as os from 'cm_os'; import * as xplatform from 'xplatform'; import * as fs from './fs'; diff --git a/bin/libs/component.ts b/bin/libs/component.ts index 7bf374bcb8..7318c3b4ff 100644 --- a/bin/libs/component.ts +++ b/bin/libs/component.ts @@ -9,8 +9,8 @@ Copyright Contributors to the Zowe Project. */ -import * as std from 'std'; -import * as os from 'os'; +import * as std from 'cm_std'; +import * as os from 'cm_os'; import * as zos from 'zos'; import * as xplatform from 'xplatform'; import { ConfigManager } from 'Configuration'; diff --git a/bin/libs/config.ts b/bin/libs/config.ts index a187554a61..c306305648 100644 --- a/bin/libs/config.ts +++ b/bin/libs/config.ts @@ -9,8 +9,8 @@ Copyright Contributors to the Zowe Project. */ -import * as std from 'std'; -import * as os from 'os'; +import * as std from 'cm_std'; +import * as os from 'cm_os'; import * as zos from 'zos'; import * as xplatform from 'xplatform'; diff --git a/bin/libs/configmgr.ts b/bin/libs/configmgr.ts index ba064bf362..d24078b1d4 100644 --- a/bin/libs/configmgr.ts +++ b/bin/libs/configmgr.ts @@ -9,8 +9,8 @@ Copyright Contributors to the Zowe Project. */ -import * as std from 'std'; -import * as os from 'os'; +import * as std from 'cm_std'; +import * as os from 'cm_os'; import * as xplatform from 'xplatform'; import { ConfigManager } from 'Configuration'; import * as fs from './fs'; diff --git a/bin/libs/container.ts b/bin/libs/container.ts index a6489e87a9..58fbe46a5c 100644 --- a/bin/libs/container.ts +++ b/bin/libs/container.ts @@ -9,8 +9,8 @@ // Copyright Contributors to the Zowe Project. */ -import * as std from 'std'; -import * as os from 'os'; +import * as std from 'cm_std'; +import * as os from 'cm_os'; import * as fs from './fs'; import * as shell from './shell'; import * as sys from './sys'; diff --git a/bin/libs/fs.ts b/bin/libs/fs.ts index 22a324fa99..10724ca470 100644 --- a/bin/libs/fs.ts +++ b/bin/libs/fs.ts @@ -9,8 +9,8 @@ Copyright Contributors to the Zowe Project. */ -import * as std from 'std'; -import * as os from 'os'; +import * as std from 'cm_std'; +import * as os from 'cm_os'; import * as zos from 'zos'; import * as common from './common'; diff --git a/bin/libs/index.ts b/bin/libs/index.ts index 946af9236a..eaf415ff07 100644 --- a/bin/libs/index.ts +++ b/bin/libs/index.ts @@ -9,8 +9,8 @@ Copyright Contributors to the Zowe Project. */ -import * as std from 'std'; -import * as os from 'os'; +import * as std from 'cm_std'; +import * as os from 'cm_os'; if (!std.getenv("ZWE_zowe_runtimeDirectory")) { std.err.printf("Error ZWEL0101E: ZWE_zowe_runtimeDirectory is not defined.\n"); diff --git a/bin/libs/java.ts b/bin/libs/java.ts index 0561663c8b..c729d1b245 100644 --- a/bin/libs/java.ts +++ b/bin/libs/java.ts @@ -9,8 +9,8 @@ Copyright Contributors to the Zowe Project. */ -import * as std from 'std'; -import * as os from 'os'; +import * as std from 'cm_std'; +import * as os from 'cm_os'; import * as fs from './fs'; import * as common from './common'; import * as shell from './shell'; diff --git a/bin/libs/json.ts b/bin/libs/json.ts index d153717028..c4f5f77bb1 100644 --- a/bin/libs/json.ts +++ b/bin/libs/json.ts @@ -9,8 +9,8 @@ Copyright Contributors to the Zowe Project. */ -import * as std from 'std'; -import * as os from 'os'; +import * as std from 'cm_std'; +import * as os from 'cm_os'; import * as zos from 'zos'; import * as common from './common'; import * as stringlib from './string'; diff --git a/bin/libs/logging.ts b/bin/libs/logging.ts index 6a1f2d3309..757077af07 100644 --- a/bin/libs/logging.ts +++ b/bin/libs/logging.ts @@ -9,8 +9,8 @@ Copyright Contributors to the Zowe Project. */ -import * as std from 'std'; -import * as os from 'os'; +import * as std from 'cm_std'; +import * as os from 'cm_os'; import * as common from './common'; import * as fs from './fs'; diff --git a/bin/libs/network.ts b/bin/libs/network.ts index 210ead1ea5..f6395fc7a7 100644 --- a/bin/libs/network.ts +++ b/bin/libs/network.ts @@ -9,8 +9,8 @@ // Copyright Contributors to the Zowe Project. */ -import * as std from 'std'; -import * as os from 'os'; +import * as std from 'cm_std'; +import * as os from 'cm_os'; import * as common from './common'; import * as shell from './shell'; diff --git a/bin/libs/node.ts b/bin/libs/node.ts index 01ce00016b..a4a54711a6 100644 --- a/bin/libs/node.ts +++ b/bin/libs/node.ts @@ -9,8 +9,8 @@ Copyright Contributors to the Zowe Project. */ -import * as std from 'std'; -import * as os from 'os'; +import * as std from 'cm_std'; +import * as os from 'cm_os'; import * as fs from './fs'; import * as common from './common'; diff --git a/bin/libs/pathoid.ts b/bin/libs/pathoid.ts index cc6b4aad4d..23476109ed 100644 --- a/bin/libs/pathoid.ts +++ b/bin/libs/pathoid.ts @@ -9,7 +9,7 @@ Copyright Contributors to the Zowe Project. */ -import * as os from 'os'; +import * as os from 'cm_os'; import * as xplatform from 'xplatform'; declare namespace console { diff --git a/bin/libs/shell.ts b/bin/libs/shell.ts index fe9d2e46a8..dc29b57e0a 100644 --- a/bin/libs/shell.ts +++ b/bin/libs/shell.ts @@ -9,8 +9,8 @@ Copyright Contributors to the Zowe Project. */ -import * as std from 'std'; -import * as os from 'os'; +import * as std from 'cm_std'; +import * as os from 'cm_os'; import * as xplatform from 'xplatform'; import * as fs from './fs'; diff --git a/bin/libs/string.ts b/bin/libs/string.ts index 1843bb6600..7fa5c6020f 100644 --- a/bin/libs/string.ts +++ b/bin/libs/string.ts @@ -9,8 +9,8 @@ Copyright Contributors to the Zowe Project. */ -import * as std from 'std'; -import * as os from 'os'; +import * as std from 'cm_std'; +import * as os from 'cm_os'; export const ENCODING_NAME_TO_CCSID:any = { 'IBM-037': 37, diff --git a/bin/libs/sys.ts b/bin/libs/sys.ts index 412cd37f6a..06ace6bd10 100644 --- a/bin/libs/sys.ts +++ b/bin/libs/sys.ts @@ -9,8 +9,8 @@ Copyright Contributors to the Zowe Project. */ -import * as std from 'std'; -import * as os from 'os'; +import * as std from 'cm_std'; +import * as os from 'cm_os'; import * as common from './common'; import * as shell from './shell'; diff --git a/bin/libs/var.ts b/bin/libs/var.ts index 20d89b2ab5..2069f17e52 100644 --- a/bin/libs/var.ts +++ b/bin/libs/var.ts @@ -9,8 +9,8 @@ Copyright Contributors to the Zowe Project. */ -import * as std from 'std'; -import * as os from 'os'; +import * as std from 'cm_std'; +import * as os from 'cm_os'; import * as xplatform from 'xplatform'; import * as common from './common'; diff --git a/bin/libs/zos-dataset.ts b/bin/libs/zos-dataset.ts index eec62bcd4a..33ebd3208e 100644 --- a/bin/libs/zos-dataset.ts +++ b/bin/libs/zos-dataset.ts @@ -10,7 +10,7 @@ Copyright Contributors to the Zowe Project. */ -import * as std from 'std'; +import * as std from 'cm_std'; import * as common from './common'; import * as stringlib from './string'; diff --git a/bin/libs/zos-fs.ts b/bin/libs/zos-fs.ts index 7677b23b0d..99305bc4b9 100644 --- a/bin/libs/zos-fs.ts +++ b/bin/libs/zos-fs.ts @@ -9,8 +9,8 @@ Copyright Contributors to the Zowe Project. */ -import * as std from 'std'; -import * as os from 'os'; +import * as std from 'cm_std'; +import * as os from 'cm_os'; import * as zos from 'zos'; import * as common from './common'; diff --git a/bin/libs/zos.ts b/bin/libs/zos.ts index 44c3f8096a..94370a5f29 100644 --- a/bin/libs/zos.ts +++ b/bin/libs/zos.ts @@ -9,7 +9,7 @@ Copyright Contributors to the Zowe Project. */ -import * as std from 'std'; +import * as std from 'cm_std'; import * as common from './common'; import * as shell from './shell'; diff --git a/bin/libs/zosmf.ts b/bin/libs/zosmf.ts index 283197013b..89bddfa108 100644 --- a/bin/libs/zosmf.ts +++ b/bin/libs/zosmf.ts @@ -9,8 +9,8 @@ Copyright Contributors to the Zowe Project. */ -import * as std from 'std'; -import * as os from 'os'; +import * as std from 'cm_std'; +import * as os from 'cm_os'; import * as zos from 'zos'; import * as common from './common'; diff --git a/build/zwe/jest.config.js b/build/zwe/jest.config.js new file mode 100644 index 0000000000..542c6f53ad --- /dev/null +++ b/build/zwe/jest.config.js @@ -0,0 +1,15 @@ +module.exports = { + globals: { + 'ts-jest': { + tsconfig: 'tsconfig.dev.json' + } + }, + roots: [ + './', + '../../tests/zwe/' + ], + transform: {'^.+\\.ts?$': 'ts-jest'}, + testEnvironment: 'node', + testRegex: '.*\\.(test|spec)?\\.(ts|tsx)$', + moduleFileExtensions: ['ts', 'tsx', 'js', 'jsx', 'json', 'node', 'd.ts'] +}; \ No newline at end of file diff --git a/build/zwe/models/__mocks__/Configuration.js b/build/zwe/models/__mocks__/Configuration.js new file mode 100644 index 0000000000..6c1dfa022d --- /dev/null +++ b/build/zwe/models/__mocks__/Configuration.js @@ -0,0 +1,59 @@ +/* + 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. +*/ + +class ConfigManager { + constructor() { + this.zowe = { + workspaceDirectory: '.', + externalDomains: [] + } + } + setTraceLevel(level) { + } + getTraceLevel() { + return 0; + } + addConfig(name) { + return 0; + } + setConfigPath(configName, configPath) { + return 0; + } + loadSchemas(configName,schemaList) { + return 0; + } + getConfigData(configName) { + return { + zowe: { + workspaceDirectory: '.', + externalDomains: [] + } + } + } + setParmlibMemberName(configName,parmlibMemberName) { + return 0; + } + loadConfiguration(configName) { + return 0; + } + makeModifiedConfiguration(oldConfigName, newConfigName, updateObject, arrayMergeStrategy) { + return 0; + } + validate(configName) { + return { + ok: true + }; + } + writeYAML(configName) { + return [0, null]; + } +} + +exports.ConfigManager = ConfigManager; diff --git a/build/zwe/models/__mocks__/cm_os.js b/build/zwe/models/__mocks__/cm_os.js new file mode 100644 index 0000000000..b175def18b --- /dev/null +++ b/build/zwe/models/__mocks__/cm_os.js @@ -0,0 +1,125 @@ +/* + 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. +*/ + +function exec(a, options) { + return 0; +} + +var O_CREAT = 0; +var O_WRONLY = 0; +var O_RDONLY = 0; +var S_IFMT = 0; +var S_IFIFO = 0; +var S_IFCHR = 0; +var S_IFDIR = 0; +var S_IFBLK = 0; +var S_IFREG = 0; +var S_IFSOCK = 0; +var S_IFLNK = 0; +var S_IFGID = 0; +var S_IFUID = 0; +var ENOENT = 0; + +var SIGINT = 0; +var SIGABRT = 0; +var SIGFPE = 0; +var SIGILL = 0; +var SIGSEGV = 0; +var SIGTERM = 0; + +function open(filename, flags, mode) { + return 0; +} +function close(fd) { + return 0; +} +function read(fd, buffer, offset, length) { + return 0; +} +function write(fd, buffer, offset, length) { + return 0; +} + +function remove(filename) { + return 0; +} +function rename(oldname, newname) { + return 0; +} + +function stat(path) { + return [{ + mode: 0 + }, 0]; +} +function lstat(path){ + return [null, 0]; +} + +function signal(signal, fun) { + +} +function kill(pid, signal) { + +} +function waitpid(pid, options) { + return [0, 0]; +} + +function readdir(path){ + return [[''], 0]; +} +function realpath(path){ + return ['', 0]; +} +function getcwd() { + return ['', 0]; +} +function chdir(path) { + return 0; +} + +function symlink(target, linkpath) { + return 0; +} +function mkdir(path, mode) { + return 0; +} +function dup2(oldfd, newfd) { +} +function sleep(millis) { +} +function pipe() { + return null; +} + +var platform = "test"; + +exports.exec = exec; +exports.open = open; +exports.close = close; +exports.read = read; +exports.write = write; +exports.remove = remove; +exports.rename = rename; +exports.stat = stat; +exports.lstat = lstat; +exports.signal = signal; +exports.kill = kill; +exports.waitpid = waitpid; +exports.readdir = readdir; +exports.realpath = realpath; +exports.getcwd = getcwd; +exports.chdir = chdir; +exports.symlink = symlink; +exports.mkdir = mkdir; +exports.dup2 = dup2; +exports.sleep = sleep; +exports.pipe = pipe; diff --git a/build/zwe/models/__mocks__/cm_std.js b/build/zwe/models/__mocks__/cm_std.js new file mode 100644 index 0000000000..e77b9ca21c --- /dev/null +++ b/build/zwe/models/__mocks__/cm_std.js @@ -0,0 +1,87 @@ +/* + 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. +*/ + +const environment = new Map(); + +function getenv(varName) { + return environment.get(varName); +} + +function setenv(varName, value) { + environment.set(varName, value); +} + +function unsetenv(varName) { + environment.delete(varName); +} + +/** + really key-value pairs, but no strong type for return yet +*/ +function getenviron() { + return environment; +} + +function exit(status) { + +} + +function loadFile(filename) { + return null; +} + +function fdopen(fd, fopenMode, errorObj) { + return null; +} +function open(command, fopenMode, errorObj) { + return null; +} +function popen(command, fopenMode, errorObj) { + return null; +} + +/* STDOUT convenience functions */ +function puts(s) { + +} +function printf(formatString, args) { + +} + +/* builds a new string */ +function sprintf(formatString, args) { + +} + +function parseExtJSON(s) { + +} + +var out = null; +var err = null; +var frog = null; + +var Error = null; + +exports.getenv = getenv; +exports.setenv = setenv; +exports.unsetenv = unsetenv; +exports.getenviron = getenviron; +exports.exit = exit; +exports.loadFile = loadFile; +exports.fdopen = fdopen; +exports.open = open; +exports.popen = popen; +exports.puts = puts; +exports.printf = printf; +exports.sprintf = sprintf; +exports.parseExtJSON = parseExtJSON; + +setenv('ZWE_CLI_PARAMETER_CONFIG', './test-zowe.yaml'); diff --git a/build/zwe/models/__mocks__/posix.js b/build/zwe/models/__mocks__/posix.js new file mode 100644 index 0000000000..d05b64f5d8 --- /dev/null +++ b/build/zwe/models/__mocks__/posix.js @@ -0,0 +1,15 @@ +/* + 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. +*/ + +function chmod(path, mode) { + return 0; +} + +exports.chmod = chmod; diff --git a/build/zwe/models/__mocks__/xplatform.js b/build/zwe/models/__mocks__/xplatform.js new file mode 100644 index 0000000000..ef4fd312fb --- /dev/null +++ b/build/zwe/models/__mocks__/xplatform.js @@ -0,0 +1,53 @@ +/* + 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. +*/ + +function fileCopy(source, destination) { + return [0, 0, 0]; +} +function fileCopyConverted(source, sourceCCSID, destination, destinationCCSID) { + return [0, 0, 0]; +} +function dirname(path) { + return ['', 0]; +} + +function getpid() { + return 0; +} + +/** + sourceCCSID == -1, means apply default charset conversion if necessary. + + sourceCCSID == 0, mean don't translate bytes, trust that they are UTF8, even if they aren't! +*/ +function stringFromBytes(data, offset, length, sourceCCSID) { + return ''; +} + +/** + sourceCCSID as above +*/ +function loadFileUTF8(path, sourceCCSID) { + return ''; +} +function storeFileUTF8(path, targetCCSID, content) { + return 0; +} + +var AUTO_DETECT = 0; +var NO_CONVERT = 0; + +exports.fileCopy = fileCopy; +exports.fileCopyConverted = fileCopyConverted; +exports.dirname = dirname; +exports.getpid = getpid; +exports.stringFromBytes = stringFromBytes; +exports.loadFileUTF8 = loadFileUTF8; +exports.storeFileUTF8 = storeFileUTF8; diff --git a/build/zwe/models/__mocks__/zos.js b/build/zwe/models/__mocks__/zos.js new file mode 100644 index 0000000000..bb5876c56f --- /dev/null +++ b/build/zwe/models/__mocks__/zos.js @@ -0,0 +1,35 @@ +/* + 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. +*/ + +var EXTATTR_SHARELIB = 0; +var EXTATTR_PROGCTL = 0; + +function changeTag(path, ccsid) { + return 0; +} + +function changeExtAttr(path, extattr, onOff) { + return 0; +} + +function zstat(path) { + return [{ + dev: null, + ino: null, + uid: null, + gid: null, + atime: null, + mtime: null, + ctime: null, + extattrs: null, + isText: null, + ccsid: null + }, 0]; +} diff --git a/build/zwe/package-lock.json b/build/zwe/package-lock.json index 8381af1921..be384cecb9 100644 --- a/build/zwe/package-lock.json +++ b/build/zwe/package-lock.json @@ -9,29 +9,6247 @@ "version": "2.0.0", "license": "EPL-2.0", "devDependencies": { + "@types/jest": "^29.5.0", + "jest": "^29.5.0", + "ts-jest": "^29.0.5", "typescript": "4.6.4" } }, + "node_modules/@ampproject/remapping": { + "version": "2.2.0", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/@ampproject/remapping/-/remapping-2.2.0.tgz", + "integrity": "sha512-qRmjj8nj9qmLTQXXmaR1cck3UXSRMPrbsLJAasZpF+t3riI71BXed5ebIOYwQntykeZuhjsdweEc9BxH5Jc26w==", + "dev": true, + "dependencies": { + "@jridgewell/gen-mapping": "^0.1.0", + "@jridgewell/trace-mapping": "^0.3.9" + }, + "engines": { + "node": ">=6.0.0" + } + }, + "node_modules/@babel/code-frame": { + "version": "7.18.6", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/@babel/code-frame/-/code-frame-7.18.6.tgz", + "integrity": "sha512-TDCmlK5eOvH+eH7cdAFlNXeVJqWIQ7gW9tY1GJIpUtFb6CmjVyq2VM3u71bOyR8CRihcCgMUYoDNyLXao3+70Q==", + "dev": true, + "dependencies": { + "@babel/highlight": "^7.18.6" + }, + "engines": { + "node": ">=6.9.0" + } + }, + "node_modules/@babel/compat-data": { + "version": "7.21.0", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/@babel/compat-data/-/compat-data-7.21.0.tgz", + "integrity": "sha512-gMuZsmsgxk/ENC3O/fRw5QY8A9/uxQbbCEypnLIiYYc/qVJtEV7ouxC3EllIIwNzMqAQee5tanFabWsUOutS7g==", + "dev": true, + "engines": { + "node": ">=6.9.0" + } + }, + "node_modules/@babel/core": { + "version": "7.21.3", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/@babel/core/-/core-7.21.3.tgz", + "integrity": "sha512-qIJONzoa/qiHghnm0l1n4i/6IIziDpzqc36FBs4pzMhDUraHqponwJLiAKm1hGLP3OSB/TVNz6rMwVGpwxxySw==", + "dev": true, + "dependencies": { + "@ampproject/remapping": "^2.2.0", + "@babel/code-frame": "^7.18.6", + "@babel/generator": "^7.21.3", + "@babel/helper-compilation-targets": "^7.20.7", + "@babel/helper-module-transforms": "^7.21.2", + "@babel/helpers": "^7.21.0", + "@babel/parser": "^7.21.3", + "@babel/template": "^7.20.7", + "@babel/traverse": "^7.21.3", + "@babel/types": "^7.21.3", + "convert-source-map": "^1.7.0", + "debug": "^4.1.0", + "gensync": "^1.0.0-beta.2", + "json5": "^2.2.2", + "semver": "^6.3.0" + }, + "engines": { + "node": ">=6.9.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/babel" + } + }, + "node_modules/@babel/core/node_modules/convert-source-map": { + "version": "1.9.0", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/convert-source-map/-/convert-source-map-1.9.0.tgz", + "integrity": "sha512-ASFBup0Mz1uyiIjANan1jzLQami9z1PoYSZCiiYW2FczPbenXc45FZdBZLzOT+r6+iciuEModtmCti+hjaAk0A==", + "dev": true + }, + "node_modules/@babel/generator": { + "version": "7.21.3", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/@babel/generator/-/generator-7.21.3.tgz", + "integrity": "sha512-QS3iR1GYC/YGUnW7IdggFeN5c1poPUurnGttOV/bZgPGV+izC/D8HnD6DLwod0fsatNyVn1G3EVWMYIF0nHbeA==", + "dev": true, + "dependencies": { + "@babel/types": "^7.21.3", + "@jridgewell/gen-mapping": "^0.3.2", + "@jridgewell/trace-mapping": "^0.3.17", + "jsesc": "^2.5.1" + }, + "engines": { + "node": ">=6.9.0" + } + }, + "node_modules/@babel/generator/node_modules/@jridgewell/gen-mapping": { + "version": "0.3.2", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/@jridgewell/gen-mapping/-/gen-mapping-0.3.2.tgz", + "integrity": "sha512-mh65xKQAzI6iBcFzwv28KVWSmCkdRBWoOh+bYQGW3+6OZvbbN3TqMGo5hqYxQniRcH9F2VZIoJCm4pa3BPDK/A==", + "dev": true, + "dependencies": { + "@jridgewell/set-array": "^1.0.1", + "@jridgewell/sourcemap-codec": "^1.4.10", + "@jridgewell/trace-mapping": "^0.3.9" + }, + "engines": { + "node": ">=6.0.0" + } + }, + "node_modules/@babel/helper-compilation-targets": { + "version": "7.20.7", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.20.7.tgz", + "integrity": "sha512-4tGORmfQcrc+bvrjb5y3dG9Mx1IOZjsHqQVUz7XCNHO+iTmqxWnVg3KRygjGmpRLJGdQSKuvFinbIb0CnZwHAQ==", + "dev": true, + "dependencies": { + "@babel/compat-data": "^7.20.5", + "@babel/helper-validator-option": "^7.18.6", + "browserslist": "^4.21.3", + "lru-cache": "^5.1.1", + "semver": "^6.3.0" + }, + "engines": { + "node": ">=6.9.0" + }, + "peerDependencies": { + "@babel/core": "^7.0.0" + } + }, + "node_modules/@babel/helper-environment-visitor": { + "version": "7.18.9", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/@babel/helper-environment-visitor/-/helper-environment-visitor-7.18.9.tgz", + "integrity": "sha512-3r/aACDJ3fhQ/EVgFy0hpj8oHyHpQc+LPtJoY9SzTThAsStm4Ptegq92vqKoE3vD706ZVFWITnMnxucw+S9Ipg==", + "dev": true, + "engines": { + "node": ">=6.9.0" + } + }, + "node_modules/@babel/helper-function-name": { + "version": "7.21.0", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/@babel/helper-function-name/-/helper-function-name-7.21.0.tgz", + "integrity": "sha512-HfK1aMRanKHpxemaY2gqBmL04iAPOPRj7DxtNbiDOrJK+gdwkiNRVpCpUJYbUT+aZyemKN8brqTOxzCaG6ExRg==", + "dev": true, + "dependencies": { + "@babel/template": "^7.20.7", + "@babel/types": "^7.21.0" + }, + "engines": { + "node": ">=6.9.0" + } + }, + "node_modules/@babel/helper-hoist-variables": { + "version": "7.18.6", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.18.6.tgz", + "integrity": "sha512-UlJQPkFqFULIcyW5sbzgbkxn2FKRgwWiRexcuaR8RNJRy8+LLveqPjwZV/bwrLZCN0eUHD/x8D0heK1ozuoo6Q==", + "dev": true, + "dependencies": { + "@babel/types": "^7.18.6" + }, + "engines": { + "node": ">=6.9.0" + } + }, + "node_modules/@babel/helper-module-imports": { + "version": "7.18.6", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/@babel/helper-module-imports/-/helper-module-imports-7.18.6.tgz", + "integrity": "sha512-0NFvs3VkuSYbFi1x2Vd6tKrywq+z/cLeYC/RJNFrIX/30Bf5aiGYbtvGXolEktzJH8o5E5KJ3tT+nkxuuZFVlA==", + "dev": true, + "dependencies": { + "@babel/types": "^7.18.6" + }, + "engines": { + "node": ">=6.9.0" + } + }, + "node_modules/@babel/helper-module-transforms": { + "version": "7.21.2", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/@babel/helper-module-transforms/-/helper-module-transforms-7.21.2.tgz", + "integrity": "sha512-79yj2AR4U/Oqq/WOV7Lx6hUjau1Zfo4cI+JLAVYeMV5XIlbOhmjEk5ulbTc9fMpmlojzZHkUUxAiK+UKn+hNQQ==", + "dev": true, + "dependencies": { + "@babel/helper-environment-visitor": "^7.18.9", + "@babel/helper-module-imports": "^7.18.6", + "@babel/helper-simple-access": "^7.20.2", + "@babel/helper-split-export-declaration": "^7.18.6", + "@babel/helper-validator-identifier": "^7.19.1", + "@babel/template": "^7.20.7", + "@babel/traverse": "^7.21.2", + "@babel/types": "^7.21.2" + }, + "engines": { + "node": ">=6.9.0" + } + }, + "node_modules/@babel/helper-plugin-utils": { + "version": "7.20.2", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.20.2.tgz", + "integrity": "sha512-8RvlJG2mj4huQ4pZ+rU9lqKi9ZKiRmuvGuM2HlWmkmgOhbs6zEAw6IEiJ5cQqGbDzGZOhwuOQNtZMi/ENLjZoQ==", + "dev": true, + "engines": { + "node": ">=6.9.0" + } + }, + "node_modules/@babel/helper-simple-access": { + "version": "7.20.2", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/@babel/helper-simple-access/-/helper-simple-access-7.20.2.tgz", + "integrity": "sha512-+0woI/WPq59IrqDYbVGfshjT5Dmk/nnbdpcF8SnMhhXObpTq2KNBdLFRFrkVdbDOyUmHBCxzm5FHV1rACIkIbA==", + "dev": true, + "dependencies": { + "@babel/types": "^7.20.2" + }, + "engines": { + "node": ">=6.9.0" + } + }, + "node_modules/@babel/helper-split-export-declaration": { + "version": "7.18.6", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.18.6.tgz", + "integrity": "sha512-bde1etTx6ZyTmobl9LLMMQsaizFVZrquTEHOqKeQESMKo4PlObf+8+JA25ZsIpZhT/WEd39+vOdLXAFG/nELpA==", + "dev": true, + "dependencies": { + "@babel/types": "^7.18.6" + }, + "engines": { + "node": ">=6.9.0" + } + }, + "node_modules/@babel/helper-string-parser": { + "version": "7.19.4", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/@babel/helper-string-parser/-/helper-string-parser-7.19.4.tgz", + "integrity": "sha512-nHtDoQcuqFmwYNYPz3Rah5ph2p8PFeFCsZk9A/48dPc/rGocJ5J3hAAZ7pb76VWX3fZKu+uEr/FhH5jLx7umrw==", + "dev": true, + "engines": { + "node": ">=6.9.0" + } + }, + "node_modules/@babel/helper-validator-identifier": { + "version": "7.19.1", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.19.1.tgz", + "integrity": "sha512-awrNfaMtnHUr653GgGEs++LlAvW6w+DcPrOliSMXWCKo597CwL5Acf/wWdNkf/tfEQE3mjkeD1YOVZOUV/od1w==", + "dev": true, + "engines": { + "node": ">=6.9.0" + } + }, + "node_modules/@babel/helper-validator-option": { + "version": "7.21.0", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/@babel/helper-validator-option/-/helper-validator-option-7.21.0.tgz", + "integrity": "sha512-rmL/B8/f0mKS2baE9ZpyTcTavvEuWhTTW8amjzXNvYG4AwBsqTLikfXsEofsJEfKHf+HQVQbFOHy6o+4cnC/fQ==", + "dev": true, + "engines": { + "node": ">=6.9.0" + } + }, + "node_modules/@babel/helpers": { + "version": "7.21.0", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/@babel/helpers/-/helpers-7.21.0.tgz", + "integrity": "sha512-XXve0CBtOW0pd7MRzzmoyuSj0e3SEzj8pgyFxnTT1NJZL38BD1MK7yYrm8yefRPIDvNNe14xR4FdbHwpInD4rA==", + "dev": true, + "dependencies": { + "@babel/template": "^7.20.7", + "@babel/traverse": "^7.21.0", + "@babel/types": "^7.21.0" + }, + "engines": { + "node": ">=6.9.0" + } + }, + "node_modules/@babel/highlight": { + "version": "7.18.6", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/@babel/highlight/-/highlight-7.18.6.tgz", + "integrity": "sha512-u7stbOuYjaPezCuLj29hNW1v64M2Md2qupEKP1fHc7WdOA3DgLh37suiSrZYY7haUB7iBeQZ9P1uiRF359do3g==", + "dev": true, + "dependencies": { + "@babel/helper-validator-identifier": "^7.18.6", + "chalk": "^2.0.0", + "js-tokens": "^4.0.0" + }, + "engines": { + "node": ">=6.9.0" + } + }, + "node_modules/@babel/highlight/node_modules/ansi-styles": { + "version": "3.2.1", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/ansi-styles/-/ansi-styles-3.2.1.tgz", + "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==", + "dev": true, + "dependencies": { + "color-convert": "^1.9.0" + }, + "engines": { + "node": ">=4" + } + }, + "node_modules/@babel/highlight/node_modules/chalk": { + "version": "2.4.2", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/chalk/-/chalk-2.4.2.tgz", + "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==", + "dev": true, + "dependencies": { + "ansi-styles": "^3.2.1", + "escape-string-regexp": "^1.0.5", + "supports-color": "^5.3.0" + }, + "engines": { + "node": ">=4" + } + }, + "node_modules/@babel/highlight/node_modules/color-convert": { + "version": "1.9.3", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/color-convert/-/color-convert-1.9.3.tgz", + "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==", + "dev": true, + "dependencies": { + "color-name": "1.1.3" + } + }, + "node_modules/@babel/highlight/node_modules/color-name": { + "version": "1.1.3", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/color-name/-/color-name-1.1.3.tgz", + "integrity": "sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw==", + "dev": true + }, + "node_modules/@babel/highlight/node_modules/escape-string-regexp": { + "version": "1.0.5", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz", + "integrity": "sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==", + "dev": true, + "engines": { + "node": ">=0.8.0" + } + }, + "node_modules/@babel/highlight/node_modules/has-flag": { + "version": "3.0.0", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/has-flag/-/has-flag-3.0.0.tgz", + "integrity": "sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==", + "dev": true, + "engines": { + "node": ">=4" + } + }, + "node_modules/@babel/highlight/node_modules/supports-color": { + "version": "5.5.0", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/supports-color/-/supports-color-5.5.0.tgz", + "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==", + "dev": true, + "dependencies": { + "has-flag": "^3.0.0" + }, + "engines": { + "node": ">=4" + } + }, + "node_modules/@babel/parser": { + "version": "7.21.3", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/@babel/parser/-/parser-7.21.3.tgz", + "integrity": "sha512-lobG0d7aOfQRXh8AyklEAgZGvA4FShxo6xQbUrrT/cNBPUdIDojlokwJsQyCC/eKia7ifqM0yP+2DRZ4WKw2RQ==", + "dev": true, + "bin": { + "parser": "bin/babel-parser.js" + }, + "engines": { + "node": ">=6.0.0" + } + }, + "node_modules/@babel/plugin-syntax-async-generators": { + "version": "7.8.4", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/@babel/plugin-syntax-async-generators/-/plugin-syntax-async-generators-7.8.4.tgz", + "integrity": "sha512-tycmZxkGfZaxhMRbXlPXuVFpdWlXpir2W4AMhSJgRKzk/eDlIXOhb2LHWoLpDF7TEHylV5zNhykX6KAgHJmTNw==", + "dev": true, + "dependencies": { + "@babel/helper-plugin-utils": "^7.8.0" + }, + "peerDependencies": { + "@babel/core": "^7.0.0-0" + } + }, + "node_modules/@babel/plugin-syntax-bigint": { + "version": "7.8.3", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/@babel/plugin-syntax-bigint/-/plugin-syntax-bigint-7.8.3.tgz", + "integrity": "sha512-wnTnFlG+YxQm3vDxpGE57Pj0srRU4sHE/mDkt1qv2YJJSeUAec2ma4WLUnUPeKjyrfntVwe/N6dCXpU+zL3Npg==", + "dev": true, + "dependencies": { + "@babel/helper-plugin-utils": "^7.8.0" + }, + "peerDependencies": { + "@babel/core": "^7.0.0-0" + } + }, + "node_modules/@babel/plugin-syntax-class-properties": { + "version": "7.12.13", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/@babel/plugin-syntax-class-properties/-/plugin-syntax-class-properties-7.12.13.tgz", + "integrity": "sha512-fm4idjKla0YahUNgFNLCB0qySdsoPiZP3iQE3rky0mBUtMZ23yDJ9SJdg6dXTSDnulOVqiF3Hgr9nbXvXTQZYA==", + "dev": true, + "dependencies": { + "@babel/helper-plugin-utils": "^7.12.13" + }, + "peerDependencies": { + "@babel/core": "^7.0.0-0" + } + }, + "node_modules/@babel/plugin-syntax-import-meta": { + "version": "7.10.4", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/@babel/plugin-syntax-import-meta/-/plugin-syntax-import-meta-7.10.4.tgz", + "integrity": "sha512-Yqfm+XDx0+Prh3VSeEQCPU81yC+JWZ2pDPFSS4ZdpfZhp4MkFMaDC1UqseovEKwSUpnIL7+vK+Clp7bfh0iD7g==", + "dev": true, + "dependencies": { + "@babel/helper-plugin-utils": "^7.10.4" + }, + "peerDependencies": { + "@babel/core": "^7.0.0-0" + } + }, + "node_modules/@babel/plugin-syntax-json-strings": { + "version": "7.8.3", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/@babel/plugin-syntax-json-strings/-/plugin-syntax-json-strings-7.8.3.tgz", + "integrity": "sha512-lY6kdGpWHvjoe2vk4WrAapEuBR69EMxZl+RoGRhrFGNYVK8mOPAW8VfbT/ZgrFbXlDNiiaxQnAtgVCZ6jv30EA==", + "dev": true, + "dependencies": { + "@babel/helper-plugin-utils": "^7.8.0" + }, + "peerDependencies": { + "@babel/core": "^7.0.0-0" + } + }, + "node_modules/@babel/plugin-syntax-jsx": { + "version": "7.18.6", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.18.6.tgz", + "integrity": "sha512-6mmljtAedFGTWu2p/8WIORGwy+61PLgOMPOdazc7YoJ9ZCWUyFy3A6CpPkRKLKD1ToAesxX8KGEViAiLo9N+7Q==", + "dev": true, + "dependencies": { + "@babel/helper-plugin-utils": "^7.18.6" + }, + "engines": { + "node": ">=6.9.0" + }, + "peerDependencies": { + "@babel/core": "^7.0.0-0" + } + }, + "node_modules/@babel/plugin-syntax-logical-assignment-operators": { + "version": "7.10.4", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/@babel/plugin-syntax-logical-assignment-operators/-/plugin-syntax-logical-assignment-operators-7.10.4.tgz", + "integrity": "sha512-d8waShlpFDinQ5MtvGU9xDAOzKH47+FFoney2baFIoMr952hKOLp1HR7VszoZvOsV/4+RRszNY7D17ba0te0ig==", + "dev": true, + "dependencies": { + "@babel/helper-plugin-utils": "^7.10.4" + }, + "peerDependencies": { + "@babel/core": "^7.0.0-0" + } + }, + "node_modules/@babel/plugin-syntax-nullish-coalescing-operator": { + "version": "7.8.3", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/@babel/plugin-syntax-nullish-coalescing-operator/-/plugin-syntax-nullish-coalescing-operator-7.8.3.tgz", + "integrity": "sha512-aSff4zPII1u2QD7y+F8oDsz19ew4IGEJg9SVW+bqwpwtfFleiQDMdzA/R+UlWDzfnHFCxxleFT0PMIrR36XLNQ==", + "dev": true, + "dependencies": { + "@babel/helper-plugin-utils": "^7.8.0" + }, + "peerDependencies": { + "@babel/core": "^7.0.0-0" + } + }, + "node_modules/@babel/plugin-syntax-numeric-separator": { + "version": "7.10.4", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/@babel/plugin-syntax-numeric-separator/-/plugin-syntax-numeric-separator-7.10.4.tgz", + "integrity": "sha512-9H6YdfkcK/uOnY/K7/aA2xpzaAgkQn37yzWUMRK7OaPOqOpGS1+n0H5hxT9AUw9EsSjPW8SVyMJwYRtWs3X3ug==", + "dev": true, + "dependencies": { + "@babel/helper-plugin-utils": "^7.10.4" + }, + "peerDependencies": { + "@babel/core": "^7.0.0-0" + } + }, + "node_modules/@babel/plugin-syntax-object-rest-spread": { + "version": "7.8.3", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/@babel/plugin-syntax-object-rest-spread/-/plugin-syntax-object-rest-spread-7.8.3.tgz", + "integrity": "sha512-XoqMijGZb9y3y2XskN+P1wUGiVwWZ5JmoDRwx5+3GmEplNyVM2s2Dg8ILFQm8rWM48orGy5YpI5Bl8U1y7ydlA==", + "dev": true, + "dependencies": { + "@babel/helper-plugin-utils": "^7.8.0" + }, + "peerDependencies": { + "@babel/core": "^7.0.0-0" + } + }, + "node_modules/@babel/plugin-syntax-optional-catch-binding": { + "version": "7.8.3", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/@babel/plugin-syntax-optional-catch-binding/-/plugin-syntax-optional-catch-binding-7.8.3.tgz", + "integrity": "sha512-6VPD0Pc1lpTqw0aKoeRTMiB+kWhAoT24PA+ksWSBrFtl5SIRVpZlwN3NNPQjehA2E/91FV3RjLWoVTglWcSV3Q==", + "dev": true, + "dependencies": { + "@babel/helper-plugin-utils": "^7.8.0" + }, + "peerDependencies": { + "@babel/core": "^7.0.0-0" + } + }, + "node_modules/@babel/plugin-syntax-optional-chaining": { + "version": "7.8.3", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/@babel/plugin-syntax-optional-chaining/-/plugin-syntax-optional-chaining-7.8.3.tgz", + "integrity": "sha512-KoK9ErH1MBlCPxV0VANkXW2/dw4vlbGDrFgz8bmUsBGYkFRcbRwMh6cIJubdPrkxRwuGdtCk0v/wPTKbQgBjkg==", + "dev": true, + "dependencies": { + "@babel/helper-plugin-utils": "^7.8.0" + }, + "peerDependencies": { + "@babel/core": "^7.0.0-0" + } + }, + "node_modules/@babel/plugin-syntax-top-level-await": { + "version": "7.14.5", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.14.5.tgz", + "integrity": "sha512-hx++upLv5U1rgYfwe1xBQUhRmU41NEvpUvrp8jkrSCdvGSnM5/qdRMtylJ6PG5OFkBaHkbTAKTnd3/YyESRHFw==", + "dev": true, + "dependencies": { + "@babel/helper-plugin-utils": "^7.14.5" + }, + "engines": { + "node": ">=6.9.0" + }, + "peerDependencies": { + "@babel/core": "^7.0.0-0" + } + }, + "node_modules/@babel/plugin-syntax-typescript": { + "version": "7.20.0", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.20.0.tgz", + "integrity": "sha512-rd9TkG+u1CExzS4SM1BlMEhMXwFLKVjOAFFCDx9PbX5ycJWDoWMcwdJH9RhkPu1dOgn5TrxLot/Gx6lWFuAUNQ==", + "dev": true, + "dependencies": { + "@babel/helper-plugin-utils": "^7.19.0" + }, + "engines": { + "node": ">=6.9.0" + }, + "peerDependencies": { + "@babel/core": "^7.0.0-0" + } + }, + "node_modules/@babel/template": { + "version": "7.20.7", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/@babel/template/-/template-7.20.7.tgz", + "integrity": "sha512-8SegXApWe6VoNw0r9JHpSteLKTpTiLZ4rMlGIm9JQ18KiCtyQiAMEazujAHrUS5flrcqYZa75ukev3P6QmUwUw==", + "dev": true, + "dependencies": { + "@babel/code-frame": "^7.18.6", + "@babel/parser": "^7.20.7", + "@babel/types": "^7.20.7" + }, + "engines": { + "node": ">=6.9.0" + } + }, + "node_modules/@babel/traverse": { + "version": "7.21.3", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/@babel/traverse/-/traverse-7.21.3.tgz", + "integrity": "sha512-XLyopNeaTancVitYZe2MlUEvgKb6YVVPXzofHgqHijCImG33b/uTurMS488ht/Hbsb2XK3U2BnSTxKVNGV3nGQ==", + "dev": true, + "dependencies": { + "@babel/code-frame": "^7.18.6", + "@babel/generator": "^7.21.3", + "@babel/helper-environment-visitor": "^7.18.9", + "@babel/helper-function-name": "^7.21.0", + "@babel/helper-hoist-variables": "^7.18.6", + "@babel/helper-split-export-declaration": "^7.18.6", + "@babel/parser": "^7.21.3", + "@babel/types": "^7.21.3", + "debug": "^4.1.0", + "globals": "^11.1.0" + }, + "engines": { + "node": ">=6.9.0" + } + }, + "node_modules/@babel/types": { + "version": "7.21.3", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/@babel/types/-/types-7.21.3.tgz", + "integrity": "sha512-sBGdETxC+/M4o/zKC0sl6sjWv62WFR/uzxrJ6uYyMLZOUlPnwzw0tKgVHOXxaAd5l2g8pEDM5RZ495GPQI77kg==", + "dev": true, + "dependencies": { + "@babel/helper-string-parser": "^7.19.4", + "@babel/helper-validator-identifier": "^7.19.1", + "to-fast-properties": "^2.0.0" + }, + "engines": { + "node": ">=6.9.0" + } + }, + "node_modules/@bcoe/v8-coverage": { + "version": "0.2.3", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz", + "integrity": "sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==", + "dev": true + }, + "node_modules/@istanbuljs/load-nyc-config": { + "version": "1.1.0", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/@istanbuljs/load-nyc-config/-/load-nyc-config-1.1.0.tgz", + "integrity": "sha512-VjeHSlIzpv/NyD3N0YuHfXOPDIixcA1q2ZV98wsMqcYlPmv2n3Yb2lYP9XMElnaFVXg5A7YLTeLu6V84uQDjmQ==", + "dev": true, + "dependencies": { + "camelcase": "^5.3.1", + "find-up": "^4.1.0", + "get-package-type": "^0.1.0", + "js-yaml": "^3.13.1", + "resolve-from": "^5.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/@istanbuljs/schema": { + "version": "0.1.3", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/@istanbuljs/schema/-/schema-0.1.3.tgz", + "integrity": "sha512-ZXRY4jNvVgSVQ8DL3LTcakaAtXwTVUxE81hslsyD2AtoXW/wVob10HkOJ1X/pAlcI7D+2YoZKg5do8G/w6RYgA==", + "dev": true, + "engines": { + "node": ">=8" + } + }, + "node_modules/@jest/console": { + "version": "29.5.0", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/@jest/console/-/console-29.5.0.tgz", + "integrity": "sha512-NEpkObxPwyw/XxZVLPmAGKE89IQRp4puc6IQRPru6JKd1M3fW9v1xM1AnzIJE65hbCkzQAdnL8P47e9hzhiYLQ==", + "dev": true, + "dependencies": { + "@jest/types": "^29.5.0", + "@types/node": "*", + "chalk": "^4.0.0", + "jest-message-util": "^29.5.0", + "jest-util": "^29.5.0", + "slash": "^3.0.0" + }, + "engines": { + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" + } + }, + "node_modules/@jest/core": { + "version": "29.5.0", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/@jest/core/-/core-29.5.0.tgz", + "integrity": "sha512-28UzQc7ulUrOQw1IsN/kv1QES3q2kkbl/wGslyhAclqZ/8cMdB5M68BffkIdSJgKBUt50d3hbwJ92XESlE7LiQ==", + "dev": true, + "dependencies": { + "@jest/console": "^29.5.0", + "@jest/reporters": "^29.5.0", + "@jest/test-result": "^29.5.0", + "@jest/transform": "^29.5.0", + "@jest/types": "^29.5.0", + "@types/node": "*", + "ansi-escapes": "^4.2.1", + "chalk": "^4.0.0", + "ci-info": "^3.2.0", + "exit": "^0.1.2", + "graceful-fs": "^4.2.9", + "jest-changed-files": "^29.5.0", + "jest-config": "^29.5.0", + "jest-haste-map": "^29.5.0", + "jest-message-util": "^29.5.0", + "jest-regex-util": "^29.4.3", + "jest-resolve": "^29.5.0", + "jest-resolve-dependencies": "^29.5.0", + "jest-runner": "^29.5.0", + "jest-runtime": "^29.5.0", + "jest-snapshot": "^29.5.0", + "jest-util": "^29.5.0", + "jest-validate": "^29.5.0", + "jest-watcher": "^29.5.0", + "micromatch": "^4.0.4", + "pretty-format": "^29.5.0", + "slash": "^3.0.0", + "strip-ansi": "^6.0.0" + }, + "engines": { + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" + }, + "peerDependencies": { + "node-notifier": "^8.0.1 || ^9.0.0 || ^10.0.0" + }, + "peerDependenciesMeta": { + "node-notifier": { + "optional": true + } + } + }, + "node_modules/@jest/environment": { + "version": "29.5.0", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/@jest/environment/-/environment-29.5.0.tgz", + "integrity": "sha512-5FXw2+wD29YU1d4I2htpRX7jYnAyTRjP2CsXQdo9SAM8g3ifxWPSV0HnClSn71xwctr0U3oZIIH+dtbfmnbXVQ==", + "dev": true, + "dependencies": { + "@jest/fake-timers": "^29.5.0", + "@jest/types": "^29.5.0", + "@types/node": "*", + "jest-mock": "^29.5.0" + }, + "engines": { + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" + } + }, + "node_modules/@jest/expect": { + "version": "29.5.0", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/@jest/expect/-/expect-29.5.0.tgz", + "integrity": "sha512-PueDR2HGihN3ciUNGr4uelropW7rqUfTiOn+8u0leg/42UhblPxHkfoh0Ruu3I9Y1962P3u2DY4+h7GVTSVU6g==", + "dev": true, + "dependencies": { + "expect": "^29.5.0", + "jest-snapshot": "^29.5.0" + }, + "engines": { + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" + } + }, + "node_modules/@jest/expect-utils": { + "version": "29.5.0", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/@jest/expect-utils/-/expect-utils-29.5.0.tgz", + "integrity": "sha512-fmKzsidoXQT2KwnrwE0SQq3uj8Z763vzR8LnLBwC2qYWEFpjX8daRsk6rHUM1QvNlEW/UJXNXm59ztmJJWs2Mg==", + "dev": true, + "dependencies": { + "jest-get-type": "^29.4.3" + }, + "engines": { + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" + } + }, + "node_modules/@jest/fake-timers": { + "version": "29.5.0", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/@jest/fake-timers/-/fake-timers-29.5.0.tgz", + "integrity": "sha512-9ARvuAAQcBwDAqOnglWq2zwNIRUDtk/SCkp/ToGEhFv5r86K21l+VEs0qNTaXtyiY0lEePl3kylijSYJQqdbDg==", + "dev": true, + "dependencies": { + "@jest/types": "^29.5.0", + "@sinonjs/fake-timers": "^10.0.2", + "@types/node": "*", + "jest-message-util": "^29.5.0", + "jest-mock": "^29.5.0", + "jest-util": "^29.5.0" + }, + "engines": { + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" + } + }, + "node_modules/@jest/globals": { + "version": "29.5.0", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/@jest/globals/-/globals-29.5.0.tgz", + "integrity": "sha512-S02y0qMWGihdzNbUiqSAiKSpSozSuHX5UYc7QbnHP+D9Lyw8DgGGCinrN9uSuHPeKgSSzvPom2q1nAtBvUsvPQ==", + "dev": true, + "dependencies": { + "@jest/environment": "^29.5.0", + "@jest/expect": "^29.5.0", + "@jest/types": "^29.5.0", + "jest-mock": "^29.5.0" + }, + "engines": { + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" + } + }, + "node_modules/@jest/reporters": { + "version": "29.5.0", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/@jest/reporters/-/reporters-29.5.0.tgz", + "integrity": "sha512-D05STXqj/M8bP9hQNSICtPqz97u7ffGzZu+9XLucXhkOFBqKcXe04JLZOgIekOxdb73MAoBUFnqvf7MCpKk5OA==", + "dev": true, + "dependencies": { + "@bcoe/v8-coverage": "^0.2.3", + "@jest/console": "^29.5.0", + "@jest/test-result": "^29.5.0", + "@jest/transform": "^29.5.0", + "@jest/types": "^29.5.0", + "@jridgewell/trace-mapping": "^0.3.15", + "@types/node": "*", + "chalk": "^4.0.0", + "collect-v8-coverage": "^1.0.0", + "exit": "^0.1.2", + "glob": "^7.1.3", + "graceful-fs": "^4.2.9", + "istanbul-lib-coverage": "^3.0.0", + "istanbul-lib-instrument": "^5.1.0", + "istanbul-lib-report": "^3.0.0", + "istanbul-lib-source-maps": "^4.0.0", + "istanbul-reports": "^3.1.3", + "jest-message-util": "^29.5.0", + "jest-util": "^29.5.0", + "jest-worker": "^29.5.0", + "slash": "^3.0.0", + "string-length": "^4.0.1", + "strip-ansi": "^6.0.0", + "v8-to-istanbul": "^9.0.1" + }, + "engines": { + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" + }, + "peerDependencies": { + "node-notifier": "^8.0.1 || ^9.0.0 || ^10.0.0" + }, + "peerDependenciesMeta": { + "node-notifier": { + "optional": true + } + } + }, + "node_modules/@jest/schemas": { + "version": "29.4.3", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/@jest/schemas/-/schemas-29.4.3.tgz", + "integrity": "sha512-VLYKXQmtmuEz6IxJsrZwzG9NvtkQsWNnWMsKxqWNu3+CnfzJQhp0WDDKWLVV9hLKr0l3SLLFRqcYHjhtyuDVxg==", + "dev": true, + "dependencies": { + "@sinclair/typebox": "^0.25.16" + }, + "engines": { + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" + } + }, + "node_modules/@jest/source-map": { + "version": "29.4.3", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/@jest/source-map/-/source-map-29.4.3.tgz", + "integrity": "sha512-qyt/mb6rLyd9j1jUts4EQncvS6Yy3PM9HghnNv86QBlV+zdL2inCdK1tuVlL+J+lpiw2BI67qXOrX3UurBqQ1w==", + "dev": true, + "dependencies": { + "@jridgewell/trace-mapping": "^0.3.15", + "callsites": "^3.0.0", + "graceful-fs": "^4.2.9" + }, + "engines": { + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" + } + }, + "node_modules/@jest/test-result": { + "version": "29.5.0", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/@jest/test-result/-/test-result-29.5.0.tgz", + "integrity": "sha512-fGl4rfitnbfLsrfx1uUpDEESS7zM8JdgZgOCQuxQvL1Sn/I6ijeAVQWGfXI9zb1i9Mzo495cIpVZhA0yr60PkQ==", + "dev": true, + "dependencies": { + "@jest/console": "^29.5.0", + "@jest/types": "^29.5.0", + "@types/istanbul-lib-coverage": "^2.0.0", + "collect-v8-coverage": "^1.0.0" + }, + "engines": { + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" + } + }, + "node_modules/@jest/test-sequencer": { + "version": "29.5.0", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/@jest/test-sequencer/-/test-sequencer-29.5.0.tgz", + "integrity": "sha512-yPafQEcKjkSfDXyvtgiV4pevSeyuA6MQr6ZIdVkWJly9vkqjnFfcfhRQqpD5whjoU8EORki752xQmjaqoFjzMQ==", + "dev": true, + "dependencies": { + "@jest/test-result": "^29.5.0", + "graceful-fs": "^4.2.9", + "jest-haste-map": "^29.5.0", + "slash": "^3.0.0" + }, + "engines": { + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" + } + }, + "node_modules/@jest/transform": { + "version": "29.5.0", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/@jest/transform/-/transform-29.5.0.tgz", + "integrity": "sha512-8vbeZWqLJOvHaDfeMuoHITGKSz5qWc9u04lnWrQE3VyuSw604PzQM824ZeX9XSjUCeDiE3GuxZe5UKa8J61NQw==", + "dev": true, + "dependencies": { + "@babel/core": "^7.11.6", + "@jest/types": "^29.5.0", + "@jridgewell/trace-mapping": "^0.3.15", + "babel-plugin-istanbul": "^6.1.1", + "chalk": "^4.0.0", + "convert-source-map": "^2.0.0", + "fast-json-stable-stringify": "^2.1.0", + "graceful-fs": "^4.2.9", + "jest-haste-map": "^29.5.0", + "jest-regex-util": "^29.4.3", + "jest-util": "^29.5.0", + "micromatch": "^4.0.4", + "pirates": "^4.0.4", + "slash": "^3.0.0", + "write-file-atomic": "^4.0.2" + }, + "engines": { + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" + } + }, + "node_modules/@jest/types": { + "version": "29.5.0", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/@jest/types/-/types-29.5.0.tgz", + "integrity": "sha512-qbu7kN6czmVRc3xWFQcAN03RAUamgppVUdXrvl1Wr3jlNF93o9mJbGcDWrwGB6ht44u7efB1qCFgVQmca24Uog==", + "dev": true, + "dependencies": { + "@jest/schemas": "^29.4.3", + "@types/istanbul-lib-coverage": "^2.0.0", + "@types/istanbul-reports": "^3.0.0", + "@types/node": "*", + "@types/yargs": "^17.0.8", + "chalk": "^4.0.0" + }, + "engines": { + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" + } + }, + "node_modules/@jridgewell/gen-mapping": { + "version": "0.1.1", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/@jridgewell/gen-mapping/-/gen-mapping-0.1.1.tgz", + "integrity": "sha512-sQXCasFk+U8lWYEe66WxRDOE9PjVz4vSM51fTu3Hw+ClTpUSQb718772vH3pyS5pShp6lvQM7SxgIDXXXmOX7w==", + "dev": true, + "dependencies": { + "@jridgewell/set-array": "^1.0.0", + "@jridgewell/sourcemap-codec": "^1.4.10" + }, + "engines": { + "node": ">=6.0.0" + } + }, + "node_modules/@jridgewell/resolve-uri": { + "version": "3.1.0", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/@jridgewell/resolve-uri/-/resolve-uri-3.1.0.tgz", + "integrity": "sha512-F2msla3tad+Mfht5cJq7LSXcdudKTWCVYUgw6pLFOOHSTtZlj6SWNYAp+AhuqLmWdBO2X5hPrLcu8cVP8fy28w==", + "dev": true, + "engines": { + "node": ">=6.0.0" + } + }, + "node_modules/@jridgewell/set-array": { + "version": "1.1.2", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/@jridgewell/set-array/-/set-array-1.1.2.tgz", + "integrity": "sha512-xnkseuNADM0gt2bs+BvhO0p78Mk762YnZdsuzFV018NoG1Sj1SCQvpSqa7XUaTam5vAGasABV9qXASMKnFMwMw==", + "dev": true, + "engines": { + "node": ">=6.0.0" + } + }, + "node_modules/@jridgewell/sourcemap-codec": { + "version": "1.4.14", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.14.tgz", + "integrity": "sha512-XPSJHWmi394fuUuzDnGz1wiKqWfo1yXecHQMRf2l6hztTO+nPru658AyDngaBe7isIxEkRsPR3FZh+s7iVa4Uw==", + "dev": true + }, + "node_modules/@jridgewell/trace-mapping": { + "version": "0.3.17", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/@jridgewell/trace-mapping/-/trace-mapping-0.3.17.tgz", + "integrity": "sha512-MCNzAp77qzKca9+W/+I0+sEpaUnZoeasnghNeVc41VZCEKaCH73Vq3BZZ/SzWIgrqE4H4ceI+p+b6C0mHf9T4g==", + "dev": true, + "dependencies": { + "@jridgewell/resolve-uri": "3.1.0", + "@jridgewell/sourcemap-codec": "1.4.14" + } + }, + "node_modules/@sinclair/typebox": { + "version": "0.25.24", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/@sinclair/typebox/-/typebox-0.25.24.tgz", + "integrity": "sha512-XJfwUVUKDHF5ugKwIcxEgc9k8b7HbznCp6eUfWgu710hMPNIO4aw4/zB5RogDQz8nd6gyCDpU9O/m6qYEWY6yQ==", + "dev": true + }, + "node_modules/@sinonjs/commons": { + "version": "2.0.0", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/@sinonjs/commons/-/commons-2.0.0.tgz", + "integrity": "sha512-uLa0j859mMrg2slwQYdO/AkrOfmH+X6LTVmNTS9CqexuE2IvVORIkSpJLqePAbEnKJ77aMmCwr1NUZ57120Xcg==", + "dev": true, + "dependencies": { + "type-detect": "4.0.8" + } + }, + "node_modules/@sinonjs/fake-timers": { + "version": "10.0.2", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/@sinonjs/fake-timers/-/fake-timers-10.0.2.tgz", + "integrity": "sha512-SwUDyjWnah1AaNl7kxsa7cfLhlTYoiyhDAIgyh+El30YvXs/o7OLXpYH88Zdhyx9JExKrmHDJ+10bwIcY80Jmw==", + "dev": true, + "dependencies": { + "@sinonjs/commons": "^2.0.0" + } + }, + "node_modules/@types/babel__core": { + "version": "7.20.0", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/@types/babel__core/-/babel__core-7.20.0.tgz", + "integrity": "sha512-+n8dL/9GWblDO0iU6eZAwEIJVr5DWigtle+Q6HLOrh/pdbXOhOtqzq8VPPE2zvNJzSKY4vH/z3iT3tn0A3ypiQ==", + "dev": true, + "dependencies": { + "@babel/parser": "^7.20.7", + "@babel/types": "^7.20.7", + "@types/babel__generator": "*", + "@types/babel__template": "*", + "@types/babel__traverse": "*" + } + }, + "node_modules/@types/babel__generator": { + "version": "7.6.4", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/@types/babel__generator/-/babel__generator-7.6.4.tgz", + "integrity": "sha512-tFkciB9j2K755yrTALxD44McOrk+gfpIpvC3sxHjRawj6PfnQxrse4Clq5y/Rq+G3mrBurMax/lG8Qn2t9mSsg==", + "dev": true, + "dependencies": { + "@babel/types": "^7.0.0" + } + }, + "node_modules/@types/babel__template": { + "version": "7.4.1", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/@types/babel__template/-/babel__template-7.4.1.tgz", + "integrity": "sha512-azBFKemX6kMg5Io+/rdGT0dkGreboUVR0Cdm3fz9QJWpaQGJRQXl7C+6hOTCZcMll7KFyEQpgbYI2lHdsS4U7g==", + "dev": true, + "dependencies": { + "@babel/parser": "^7.1.0", + "@babel/types": "^7.0.0" + } + }, + "node_modules/@types/babel__traverse": { + "version": "7.18.3", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/@types/babel__traverse/-/babel__traverse-7.18.3.tgz", + "integrity": "sha512-1kbcJ40lLB7MHsj39U4Sh1uTd2E7rLEa79kmDpI6cy+XiXsteB3POdQomoq4FxszMrO3ZYchkhYJw7A2862b3w==", + "dev": true, + "dependencies": { + "@babel/types": "^7.3.0" + } + }, + "node_modules/@types/graceful-fs": { + "version": "4.1.6", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/@types/graceful-fs/-/graceful-fs-4.1.6.tgz", + "integrity": "sha512-Sig0SNORX9fdW+bQuTEovKj3uHcUL6LQKbCrrqb1X7J6/ReAbhCXRAhc+SMejhLELFj2QcyuxmUooZ4bt5ReSw==", + "dev": true, + "dependencies": { + "@types/node": "*" + } + }, + "node_modules/@types/istanbul-lib-coverage": { + "version": "2.0.4", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.4.tgz", + "integrity": "sha512-z/QT1XN4K4KYuslS23k62yDIDLwLFkzxOuMplDtObz0+y7VqJCaO2o+SPwHCvLFZh7xazvvoor2tA/hPz9ee7g==", + "dev": true + }, + "node_modules/@types/istanbul-lib-report": { + "version": "3.0.0", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/@types/istanbul-lib-report/-/istanbul-lib-report-3.0.0.tgz", + "integrity": "sha512-plGgXAPfVKFoYfa9NpYDAkseG+g6Jr294RqeqcqDixSbU34MZVJRi/P+7Y8GDpzkEwLaGZZOpKIEmeVZNtKsrg==", + "dev": true, + "dependencies": { + "@types/istanbul-lib-coverage": "*" + } + }, + "node_modules/@types/istanbul-reports": { + "version": "3.0.1", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/@types/istanbul-reports/-/istanbul-reports-3.0.1.tgz", + "integrity": "sha512-c3mAZEuK0lvBp8tmuL74XRKn1+y2dcwOUpH7x4WrF6gk1GIgiluDRgMYQtw2OFcBvAJWlt6ASU3tSqxp0Uu0Aw==", + "dev": true, + "dependencies": { + "@types/istanbul-lib-report": "*" + } + }, + "node_modules/@types/jest": { + "version": "29.5.0", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/@types/jest/-/jest-29.5.0.tgz", + "integrity": "sha512-3Emr5VOl/aoBwnWcH/EFQvlSAmjV+XtV9GGu5mwdYew5vhQh0IUZx/60x0TzHDu09Bi7HMx10t/namdJw5QIcg==", + "dev": true, + "dependencies": { + "expect": "^29.0.0", + "pretty-format": "^29.0.0" + } + }, + "node_modules/@types/node": { + "version": "18.15.10", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/@types/node/-/node-18.15.10.tgz", + "integrity": "sha512-9avDaQJczATcXgfmMAW3MIWArOO7A+m90vuCFLr8AotWf8igO/mRoYukrk2cqZVtv38tHs33retzHEilM7FpeQ==", + "dev": true + }, + "node_modules/@types/prettier": { + "version": "2.7.2", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/@types/prettier/-/prettier-2.7.2.tgz", + "integrity": "sha512-KufADq8uQqo1pYKVIYzfKbJfBAc0sOeXqGbFaSpv8MRmC/zXgowNZmFcbngndGk922QDmOASEXUZCaY48gs4cg==", + "dev": true + }, + "node_modules/@types/stack-utils": { + "version": "2.0.1", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/@types/stack-utils/-/stack-utils-2.0.1.tgz", + "integrity": "sha512-Hl219/BT5fLAaz6NDkSuhzasy49dwQS/DSdu4MdggFB8zcXv7vflBI3xp7FEmkmdDkBUI2bPUNeMttp2knYdxw==", + "dev": true + }, + "node_modules/@types/yargs": { + "version": "17.0.24", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/@types/yargs/-/yargs-17.0.24.tgz", + "integrity": "sha512-6i0aC7jV6QzQB8ne1joVZ0eSFIstHsCrobmOtghM11yGlH0j43FKL2UhWdELkyps0zuf7qVTUVCCR+tgSlyLLw==", + "dev": true, + "dependencies": { + "@types/yargs-parser": "*" + } + }, + "node_modules/@types/yargs-parser": { + "version": "21.0.0", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/@types/yargs-parser/-/yargs-parser-21.0.0.tgz", + "integrity": "sha512-iO9ZQHkZxHn4mSakYV0vFHAVDyEOIJQrV2uZ06HxEPcx+mt8swXoZHIbaaJ2crJYFfErySgktuTZ3BeLz+XmFA==", + "dev": true + }, + "node_modules/ansi-escapes": { + "version": "4.3.2", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/ansi-escapes/-/ansi-escapes-4.3.2.tgz", + "integrity": "sha512-gKXj5ALrKWQLsYG9jlTRmR/xKluxHV+Z9QEwNIgCfM1/uwPMCuzVVnh5mwTd+OuBZcwSIMbqssNWRm1lE51QaQ==", + "dev": true, + "dependencies": { + "type-fest": "^0.21.3" + }, + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/ansi-regex": { + "version": "5.0.1", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/ansi-regex/-/ansi-regex-5.0.1.tgz", + "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==", + "dev": true, + "engines": { + "node": ">=8" + } + }, + "node_modules/ansi-styles": { + "version": "4.3.0", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/ansi-styles/-/ansi-styles-4.3.0.tgz", + "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", + "dev": true, + "dependencies": { + "color-convert": "^2.0.1" + }, + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/chalk/ansi-styles?sponsor=1" + } + }, + "node_modules/anymatch": { + "version": "3.1.3", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/anymatch/-/anymatch-3.1.3.tgz", + "integrity": "sha512-KMReFUr0B4t+D+OBkjR3KYqvocp2XaSzO55UcB6mgQMd3KbcE+mWTyvVV7D/zsdEbNnV6acZUutkiHQXvTr1Rw==", + "dev": true, + "dependencies": { + "normalize-path": "^3.0.0", + "picomatch": "^2.0.4" + }, + "engines": { + "node": ">= 8" + } + }, + "node_modules/argparse": { + "version": "1.0.10", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/argparse/-/argparse-1.0.10.tgz", + "integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==", + "dev": true, + "dependencies": { + "sprintf-js": "~1.0.2" + } + }, + "node_modules/babel-jest": { + "version": "29.5.0", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/babel-jest/-/babel-jest-29.5.0.tgz", + "integrity": "sha512-mA4eCDh5mSo2EcA9xQjVTpmbbNk32Zb3Q3QFQsNhaK56Q+yoXowzFodLux30HRgyOho5rsQ6B0P9QpMkvvnJ0Q==", + "dev": true, + "dependencies": { + "@jest/transform": "^29.5.0", + "@types/babel__core": "^7.1.14", + "babel-plugin-istanbul": "^6.1.1", + "babel-preset-jest": "^29.5.0", + "chalk": "^4.0.0", + "graceful-fs": "^4.2.9", + "slash": "^3.0.0" + }, + "engines": { + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" + }, + "peerDependencies": { + "@babel/core": "^7.8.0" + } + }, + "node_modules/babel-plugin-istanbul": { + "version": "6.1.1", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/babel-plugin-istanbul/-/babel-plugin-istanbul-6.1.1.tgz", + "integrity": "sha512-Y1IQok9821cC9onCx5otgFfRm7Lm+I+wwxOx738M/WLPZ9Q42m4IG5W0FNX8WLL2gYMZo3JkuXIH2DOpWM+qwA==", + "dev": true, + "dependencies": { + "@babel/helper-plugin-utils": "^7.0.0", + "@istanbuljs/load-nyc-config": "^1.0.0", + "@istanbuljs/schema": "^0.1.2", + "istanbul-lib-instrument": "^5.0.4", + "test-exclude": "^6.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/babel-plugin-jest-hoist": { + "version": "29.5.0", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-29.5.0.tgz", + "integrity": "sha512-zSuuuAlTMT4mzLj2nPnUm6fsE6270vdOfnpbJ+RmruU75UhLFvL0N2NgI7xpeS7NaB6hGqmd5pVpGTDYvi4Q3w==", + "dev": true, + "dependencies": { + "@babel/template": "^7.3.3", + "@babel/types": "^7.3.3", + "@types/babel__core": "^7.1.14", + "@types/babel__traverse": "^7.0.6" + }, + "engines": { + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" + } + }, + "node_modules/babel-preset-current-node-syntax": { + "version": "1.0.1", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/babel-preset-current-node-syntax/-/babel-preset-current-node-syntax-1.0.1.tgz", + "integrity": "sha512-M7LQ0bxarkxQoN+vz5aJPsLBn77n8QgTFmo8WK0/44auK2xlCXrYcUxHFxgU7qW5Yzw/CjmLRK2uJzaCd7LvqQ==", + "dev": true, + "dependencies": { + "@babel/plugin-syntax-async-generators": "^7.8.4", + "@babel/plugin-syntax-bigint": "^7.8.3", + "@babel/plugin-syntax-class-properties": "^7.8.3", + "@babel/plugin-syntax-import-meta": "^7.8.3", + "@babel/plugin-syntax-json-strings": "^7.8.3", + "@babel/plugin-syntax-logical-assignment-operators": "^7.8.3", + "@babel/plugin-syntax-nullish-coalescing-operator": "^7.8.3", + "@babel/plugin-syntax-numeric-separator": "^7.8.3", + "@babel/plugin-syntax-object-rest-spread": "^7.8.3", + "@babel/plugin-syntax-optional-catch-binding": "^7.8.3", + "@babel/plugin-syntax-optional-chaining": "^7.8.3", + "@babel/plugin-syntax-top-level-await": "^7.8.3" + }, + "peerDependencies": { + "@babel/core": "^7.0.0" + } + }, + "node_modules/babel-preset-jest": { + "version": "29.5.0", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/babel-preset-jest/-/babel-preset-jest-29.5.0.tgz", + "integrity": "sha512-JOMloxOqdiBSxMAzjRaH023/vvcaSaec49zvg+2LmNsktC7ei39LTJGw02J+9uUtTZUq6xbLyJ4dxe9sSmIuAg==", + "dev": true, + "dependencies": { + "babel-plugin-jest-hoist": "^29.5.0", + "babel-preset-current-node-syntax": "^1.0.0" + }, + "engines": { + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" + }, + "peerDependencies": { + "@babel/core": "^7.0.0" + } + }, + "node_modules/balanced-match": { + "version": "1.0.2", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/balanced-match/-/balanced-match-1.0.2.tgz", + "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==", + "dev": true + }, + "node_modules/brace-expansion": { + "version": "1.1.11", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/brace-expansion/-/brace-expansion-1.1.11.tgz", + "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", + "dev": true, + "dependencies": { + "balanced-match": "^1.0.0", + "concat-map": "0.0.1" + } + }, + "node_modules/braces": { + "version": "3.0.2", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/braces/-/braces-3.0.2.tgz", + "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==", + "dev": true, + "dependencies": { + "fill-range": "^7.0.1" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/browserslist": { + "version": "4.21.5", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/browserslist/-/browserslist-4.21.5.tgz", + "integrity": "sha512-tUkiguQGW7S3IhB7N+c2MV/HZPSCPAAiYBZXLsBhFB/PCy6ZKKsZrmBayHV9fdGV/ARIfJ14NkxKzRDjvp7L6w==", + "dev": true, + "funding": [ + { + "type": "opencollective", + "url": "https://opencollective.com/browserslist" + }, + { + "type": "tidelift", + "url": "https://tidelift.com/funding/github/npm/browserslist" + } + ], + "dependencies": { + "caniuse-lite": "^1.0.30001449", + "electron-to-chromium": "^1.4.284", + "node-releases": "^2.0.8", + "update-browserslist-db": "^1.0.10" + }, + "bin": { + "browserslist": "cli.js" + }, + "engines": { + "node": "^6 || ^7 || ^8 || ^9 || ^10 || ^11 || ^12 || >=13.7" + } + }, + "node_modules/bs-logger": { + "version": "0.2.6", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/bs-logger/-/bs-logger-0.2.6.tgz", + "integrity": "sha512-pd8DCoxmbgc7hyPKOvxtqNcjYoOsABPQdcCUjGp3d42VR2CX1ORhk2A87oqqu5R1kk+76nsxZupkmyd+MVtCog==", + "dev": true, + "dependencies": { + "fast-json-stable-stringify": "2.x" + }, + "engines": { + "node": ">= 6" + } + }, + "node_modules/bser": { + "version": "2.1.1", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/bser/-/bser-2.1.1.tgz", + "integrity": "sha512-gQxTNE/GAfIIrmHLUE3oJyp5FO6HRBfhjnw4/wMmA63ZGDJnWBmgY/lyQBpnDUkGmAhbSe39tx2d/iTOAfglwQ==", + "dev": true, + "dependencies": { + "node-int64": "^0.4.0" + } + }, + "node_modules/buffer-from": { + "version": "1.1.2", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/buffer-from/-/buffer-from-1.1.2.tgz", + "integrity": "sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==", + "dev": true + }, + "node_modules/callsites": { + "version": "3.1.0", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/callsites/-/callsites-3.1.0.tgz", + "integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==", + "dev": true, + "engines": { + "node": ">=6" + } + }, + "node_modules/camelcase": { + "version": "5.3.1", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/camelcase/-/camelcase-5.3.1.tgz", + "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==", + "dev": true, + "engines": { + "node": ">=6" + } + }, + "node_modules/caniuse-lite": { + "version": "1.0.30001472", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/caniuse-lite/-/caniuse-lite-1.0.30001472.tgz", + "integrity": "sha512-xWC/0+hHHQgj3/vrKYY0AAzeIUgr7L9wlELIcAvZdDUHlhL/kNxMdnQLOSOQfP8R51ZzPhmHdyMkI0MMpmxCfg==", + "dev": true, + "funding": [ + { + "type": "opencollective", + "url": "https://opencollective.com/browserslist" + }, + { + "type": "tidelift", + "url": "https://tidelift.com/funding/github/npm/caniuse-lite" + }, + { + "type": "github", + "url": "https://github.com/sponsors/ai" + } + ] + }, + "node_modules/chalk": { + "version": "4.1.2", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/chalk/-/chalk-4.1.2.tgz", + "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", + "dev": true, + "dependencies": { + "ansi-styles": "^4.1.0", + "supports-color": "^7.1.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/chalk/chalk?sponsor=1" + } + }, + "node_modules/char-regex": { + "version": "1.0.2", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/char-regex/-/char-regex-1.0.2.tgz", + "integrity": "sha512-kWWXztvZ5SBQV+eRgKFeh8q5sLuZY2+8WUIzlxWVTg+oGwY14qylx1KbKzHd8P6ZYkAg0xyIDU9JMHhyJMZ1jw==", + "dev": true, + "engines": { + "node": ">=10" + } + }, + "node_modules/ci-info": { + "version": "3.8.0", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/ci-info/-/ci-info-3.8.0.tgz", + "integrity": "sha512-eXTggHWSooYhq49F2opQhuHWgzucfF2YgODK4e1566GQs5BIfP30B0oenwBJHfWxAs2fyPB1s7Mg949zLf61Yw==", + "dev": true, + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/sibiraj-s" + } + ], + "engines": { + "node": ">=8" + } + }, + "node_modules/cjs-module-lexer": { + "version": "1.2.2", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/cjs-module-lexer/-/cjs-module-lexer-1.2.2.tgz", + "integrity": "sha512-cOU9usZw8/dXIXKtwa8pM0OTJQuJkxMN6w30csNRUerHfeQ5R6U3kkU/FtJeIf3M202OHfY2U8ccInBG7/xogA==", + "dev": true + }, + "node_modules/cliui": { + "version": "8.0.1", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/cliui/-/cliui-8.0.1.tgz", + "integrity": "sha512-BSeNnyus75C4//NQ9gQt1/csTXyo/8Sb+afLAkzAptFuMsod9HFokGNudZpi/oQV73hnVK+sR+5PVRMd+Dr7YQ==", + "dev": true, + "dependencies": { + "string-width": "^4.2.0", + "strip-ansi": "^6.0.1", + "wrap-ansi": "^7.0.0" + }, + "engines": { + "node": ">=12" + } + }, + "node_modules/co": { + "version": "4.6.0", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/co/-/co-4.6.0.tgz", + "integrity": "sha512-QVb0dM5HvG+uaxitm8wONl7jltx8dqhfU33DcqtOZcLSVIKSDDLDi7+0LbAKiyI8hD9u42m2YxXSkMGWThaecQ==", + "dev": true, + "engines": { + "iojs": ">= 1.0.0", + "node": ">= 0.12.0" + } + }, + "node_modules/collect-v8-coverage": { + "version": "1.0.1", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/collect-v8-coverage/-/collect-v8-coverage-1.0.1.tgz", + "integrity": "sha512-iBPtljfCNcTKNAto0KEtDfZ3qzjJvqE3aTGZsbhjSBlorqpXJlaWWtPO35D+ZImoC3KWejX64o+yPGxhWSTzfg==", + "dev": true + }, + "node_modules/color-convert": { + "version": "2.0.1", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/color-convert/-/color-convert-2.0.1.tgz", + "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", + "dev": true, + "dependencies": { + "color-name": "~1.1.4" + }, + "engines": { + "node": ">=7.0.0" + } + }, + "node_modules/color-name": { + "version": "1.1.4", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/color-name/-/color-name-1.1.4.tgz", + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", + "dev": true + }, + "node_modules/concat-map": { + "version": "0.0.1", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/concat-map/-/concat-map-0.0.1.tgz", + "integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==", + "dev": true + }, + "node_modules/convert-source-map": { + "version": "2.0.0", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/convert-source-map/-/convert-source-map-2.0.0.tgz", + "integrity": "sha512-Kvp459HrV2FEJ1CAsi1Ku+MY3kasH19TFykTz2xWmMeq6bk2NU3XXvfJ+Q61m0xktWwt+1HSYf3JZsTms3aRJg==", + "dev": true + }, + "node_modules/cross-spawn": { + "version": "7.0.3", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/cross-spawn/-/cross-spawn-7.0.3.tgz", + "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==", + "dev": true, + "dependencies": { + "path-key": "^3.1.0", + "shebang-command": "^2.0.0", + "which": "^2.0.1" + }, + "engines": { + "node": ">= 8" + } + }, + "node_modules/debug": { + "version": "4.3.4", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/debug/-/debug-4.3.4.tgz", + "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==", + "dev": true, + "dependencies": { + "ms": "2.1.2" + }, + "engines": { + "node": ">=6.0" + }, + "peerDependenciesMeta": { + "supports-color": { + "optional": true + } + } + }, + "node_modules/dedent": { + "version": "0.7.0", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/dedent/-/dedent-0.7.0.tgz", + "integrity": "sha512-Q6fKUPqnAHAyhiUgFU7BUzLiv0kd8saH9al7tnu5Q/okj6dnupxyTgFIBjVzJATdfIAm9NAsvXNzjaKa+bxVyA==", + "dev": true + }, + "node_modules/deepmerge": { + "version": "4.3.1", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/deepmerge/-/deepmerge-4.3.1.tgz", + "integrity": "sha512-3sUqbMEc77XqpdNO7FRyRog+eW3ph+GYCbj+rK+uYyRMuwsVy0rMiVtPn+QJlKFvWP/1PYpapqYn0Me2knFn+A==", + "dev": true, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/detect-newline": { + "version": "3.1.0", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/detect-newline/-/detect-newline-3.1.0.tgz", + "integrity": "sha512-TLz+x/vEXm/Y7P7wn1EJFNLxYpUD4TgMosxY6fAVJUnJMbupHBOncxyWUG9OpTaH9EBD7uFI5LfEgmMOc54DsA==", + "dev": true, + "engines": { + "node": ">=8" + } + }, + "node_modules/diff-sequences": { + "version": "29.4.3", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/diff-sequences/-/diff-sequences-29.4.3.tgz", + "integrity": "sha512-ofrBgwpPhCD85kMKtE9RYFFq6OC1A89oW2vvgWZNCwxrUpRUILopY7lsYyMDSjc8g6U6aiO0Qubg6r4Wgt5ZnA==", + "dev": true, + "engines": { + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" + } + }, + "node_modules/electron-to-chromium": { + "version": "1.4.341", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/electron-to-chromium/-/electron-to-chromium-1.4.341.tgz", + "integrity": "sha512-R4A8VfUBQY9WmAhuqY5tjHRf5fH2AAf6vqitBOE0y6u2PgHgqHSrhZmu78dIX3fVZtjqlwJNX1i2zwC3VpHtQQ==", + "dev": true + }, + "node_modules/emittery": { + "version": "0.13.1", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/emittery/-/emittery-0.13.1.tgz", + "integrity": "sha512-DeWwawk6r5yR9jFgnDKYt4sLS0LmHJJi3ZOnb5/JdbYwj3nW+FxQnHIjhBKz8YLC7oRNPVM9NQ47I3CVx34eqQ==", + "dev": true, + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/sindresorhus/emittery?sponsor=1" + } + }, + "node_modules/emoji-regex": { + "version": "8.0.0", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/emoji-regex/-/emoji-regex-8.0.0.tgz", + "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==", + "dev": true + }, + "node_modules/error-ex": { + "version": "1.3.2", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/error-ex/-/error-ex-1.3.2.tgz", + "integrity": "sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==", + "dev": true, + "dependencies": { + "is-arrayish": "^0.2.1" + } + }, + "node_modules/escalade": { + "version": "3.1.1", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/escalade/-/escalade-3.1.1.tgz", + "integrity": "sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==", + "dev": true, + "engines": { + "node": ">=6" + } + }, + "node_modules/escape-string-regexp": { + "version": "2.0.0", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/escape-string-regexp/-/escape-string-regexp-2.0.0.tgz", + "integrity": "sha512-UpzcLCXolUWcNu5HtVMHYdXJjArjsF9C0aNnquZYY4uW/Vu0miy5YoWvbV345HauVvcAUnpRuhMMcqTcGOY2+w==", + "dev": true, + "engines": { + "node": ">=8" + } + }, + "node_modules/esprima": { + "version": "4.0.1", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/esprima/-/esprima-4.0.1.tgz", + "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==", + "dev": true, + "bin": { + "esparse": "bin/esparse.js", + "esvalidate": "bin/esvalidate.js" + }, + "engines": { + "node": ">=4" + } + }, + "node_modules/execa": { + "version": "5.1.1", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/execa/-/execa-5.1.1.tgz", + "integrity": "sha512-8uSpZZocAZRBAPIEINJj3Lo9HyGitllczc27Eh5YYojjMFMn8yHMDMaUHE2Jqfq05D/wucwI4JGURyXt1vchyg==", + "dev": true, + "dependencies": { + "cross-spawn": "^7.0.3", + "get-stream": "^6.0.0", + "human-signals": "^2.1.0", + "is-stream": "^2.0.0", + "merge-stream": "^2.0.0", + "npm-run-path": "^4.0.1", + "onetime": "^5.1.2", + "signal-exit": "^3.0.3", + "strip-final-newline": "^2.0.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sindresorhus/execa?sponsor=1" + } + }, + "node_modules/exit": { + "version": "0.1.2", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/exit/-/exit-0.1.2.tgz", + "integrity": "sha512-Zk/eNKV2zbjpKzrsQ+n1G6poVbErQxJ0LBOJXaKZ1EViLzH+hrLu9cdXI4zw9dBQJslwBEpbQ2P1oS7nDxs6jQ==", + "dev": true, + "engines": { + "node": ">= 0.8.0" + } + }, + "node_modules/expect": { + "version": "29.5.0", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/expect/-/expect-29.5.0.tgz", + "integrity": "sha512-yM7xqUrCO2JdpFo4XpM82t+PJBFybdqoQuJLDGeDX2ij8NZzqRHyu3Hp188/JX7SWqud+7t4MUdvcgGBICMHZg==", + "dev": true, + "dependencies": { + "@jest/expect-utils": "^29.5.0", + "jest-get-type": "^29.4.3", + "jest-matcher-utils": "^29.5.0", + "jest-message-util": "^29.5.0", + "jest-util": "^29.5.0" + }, + "engines": { + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" + } + }, + "node_modules/fast-json-stable-stringify": { + "version": "2.1.0", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz", + "integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==", + "dev": true + }, + "node_modules/fb-watchman": { + "version": "2.0.2", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/fb-watchman/-/fb-watchman-2.0.2.tgz", + "integrity": "sha512-p5161BqbuCaSnB8jIbzQHOlpgsPmK5rJVDfDKO91Axs5NC1uu3HRQm6wt9cd9/+GtQQIO53JdGXXoyDpTAsgYA==", + "dev": true, + "dependencies": { + "bser": "2.1.1" + } + }, + "node_modules/fill-range": { + "version": "7.0.1", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/fill-range/-/fill-range-7.0.1.tgz", + "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==", + "dev": true, + "dependencies": { + "to-regex-range": "^5.0.1" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/find-up": { + "version": "4.1.0", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/find-up/-/find-up-4.1.0.tgz", + "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==", + "dev": true, + "dependencies": { + "locate-path": "^5.0.0", + "path-exists": "^4.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/fs.realpath": { + "version": "1.0.0", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/fs.realpath/-/fs.realpath-1.0.0.tgz", + "integrity": "sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==", + "dev": true + }, + "node_modules/fsevents": { + "version": "2.3.2", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/fsevents/-/fsevents-2.3.2.tgz", + "integrity": "sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==", + "dev": true, + "hasInstallScript": true, + "optional": true, + "os": [ + "darwin" + ], + "engines": { + "node": "^8.16.0 || ^10.6.0 || >=11.0.0" + } + }, + "node_modules/function-bind": { + "version": "1.1.1", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/function-bind/-/function-bind-1.1.1.tgz", + "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==", + "dev": true + }, + "node_modules/gensync": { + "version": "1.0.0-beta.2", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/gensync/-/gensync-1.0.0-beta.2.tgz", + "integrity": "sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg==", + "dev": true, + "engines": { + "node": ">=6.9.0" + } + }, + "node_modules/get-caller-file": { + "version": "2.0.5", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/get-caller-file/-/get-caller-file-2.0.5.tgz", + "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==", + "dev": true, + "engines": { + "node": "6.* || 8.* || >= 10.*" + } + }, + "node_modules/get-package-type": { + "version": "0.1.0", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/get-package-type/-/get-package-type-0.1.0.tgz", + "integrity": "sha512-pjzuKtY64GYfWizNAJ0fr9VqttZkNiK2iS430LtIHzjBEr6bX8Am2zm4sW4Ro5wjWW5cAlRL1qAMTcXbjNAO2Q==", + "dev": true, + "engines": { + "node": ">=8.0.0" + } + }, + "node_modules/get-stream": { + "version": "6.0.1", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/get-stream/-/get-stream-6.0.1.tgz", + "integrity": "sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg==", + "dev": true, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/glob": { + "version": "7.2.3", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/glob/-/glob-7.2.3.tgz", + "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==", + "dev": true, + "dependencies": { + "fs.realpath": "^1.0.0", + "inflight": "^1.0.4", + "inherits": "2", + "minimatch": "^3.1.1", + "once": "^1.3.0", + "path-is-absolute": "^1.0.0" + }, + "engines": { + "node": "*" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + } + }, + "node_modules/globals": { + "version": "11.12.0", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/globals/-/globals-11.12.0.tgz", + "integrity": "sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==", + "dev": true, + "engines": { + "node": ">=4" + } + }, + "node_modules/graceful-fs": { + "version": "4.2.11", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/graceful-fs/-/graceful-fs-4.2.11.tgz", + "integrity": "sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==", + "dev": true + }, + "node_modules/has": { + "version": "1.0.3", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/has/-/has-1.0.3.tgz", + "integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==", + "dev": true, + "dependencies": { + "function-bind": "^1.1.1" + }, + "engines": { + "node": ">= 0.4.0" + } + }, + "node_modules/has-flag": { + "version": "4.0.0", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/has-flag/-/has-flag-4.0.0.tgz", + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", + "dev": true, + "engines": { + "node": ">=8" + } + }, + "node_modules/html-escaper": { + "version": "2.0.2", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/html-escaper/-/html-escaper-2.0.2.tgz", + "integrity": "sha512-H2iMtd0I4Mt5eYiapRdIDjp+XzelXQ0tFE4JS7YFwFevXXMmOp9myNrUvCg0D6ws8iqkRPBfKHgbwig1SmlLfg==", + "dev": true + }, + "node_modules/human-signals": { + "version": "2.1.0", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/human-signals/-/human-signals-2.1.0.tgz", + "integrity": "sha512-B4FFZ6q/T2jhhksgkbEW3HBvWIfDW85snkQgawt07S7J5QXTk6BkNV+0yAeZrM5QpMAdYlocGoljn0sJ/WQkFw==", + "dev": true, + "engines": { + "node": ">=10.17.0" + } + }, + "node_modules/import-local": { + "version": "3.1.0", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/import-local/-/import-local-3.1.0.tgz", + "integrity": "sha512-ASB07uLtnDs1o6EHjKpX34BKYDSqnFerfTOJL2HvMqF70LnxpjkzDB8J44oT9pu4AMPkQwf8jl6szgvNd2tRIg==", + "dev": true, + "dependencies": { + "pkg-dir": "^4.2.0", + "resolve-cwd": "^3.0.0" + }, + "bin": { + "import-local-fixture": "fixtures/cli.js" + }, + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/imurmurhash": { + "version": "0.1.4", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/imurmurhash/-/imurmurhash-0.1.4.tgz", + "integrity": "sha512-JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA==", + "dev": true, + "engines": { + "node": ">=0.8.19" + } + }, + "node_modules/inflight": { + "version": "1.0.6", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/inflight/-/inflight-1.0.6.tgz", + "integrity": "sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==", + "dev": true, + "dependencies": { + "once": "^1.3.0", + "wrappy": "1" + } + }, + "node_modules/inherits": { + "version": "2.0.4", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/inherits/-/inherits-2.0.4.tgz", + "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==", + "dev": true + }, + "node_modules/is-arrayish": { + "version": "0.2.1", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/is-arrayish/-/is-arrayish-0.2.1.tgz", + "integrity": "sha512-zz06S8t0ozoDXMG+ube26zeCTNXcKIPJZJi8hBrF4idCLms4CG9QtK7qBl1boi5ODzFpjswb5JPmHCbMpjaYzg==", + "dev": true + }, + "node_modules/is-core-module": { + "version": "2.11.0", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/is-core-module/-/is-core-module-2.11.0.tgz", + "integrity": "sha512-RRjxlvLDkD1YJwDbroBHMb+cukurkDWNyHx7D3oNB5x9rb5ogcksMC5wHCadcXoo67gVr/+3GFySh3134zi6rw==", + "dev": true, + "dependencies": { + "has": "^1.0.3" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/is-fullwidth-code-point": { + "version": "3.0.0", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz", + "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==", + "dev": true, + "engines": { + "node": ">=8" + } + }, + "node_modules/is-generator-fn": { + "version": "2.1.0", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/is-generator-fn/-/is-generator-fn-2.1.0.tgz", + "integrity": "sha512-cTIB4yPYL/Grw0EaSzASzg6bBy9gqCofvWN8okThAYIxKJZC+udlRAmGbM0XLeniEJSs8uEgHPGuHSe1XsOLSQ==", + "dev": true, + "engines": { + "node": ">=6" + } + }, + "node_modules/is-number": { + "version": "7.0.0", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/is-number/-/is-number-7.0.0.tgz", + "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==", + "dev": true, + "engines": { + "node": ">=0.12.0" + } + }, + "node_modules/is-stream": { + "version": "2.0.1", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/is-stream/-/is-stream-2.0.1.tgz", + "integrity": "sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg==", + "dev": true, + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/isexe": { + "version": "2.0.0", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/isexe/-/isexe-2.0.0.tgz", + "integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==", + "dev": true + }, + "node_modules/istanbul-lib-coverage": { + "version": "3.2.0", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/istanbul-lib-coverage/-/istanbul-lib-coverage-3.2.0.tgz", + "integrity": "sha512-eOeJ5BHCmHYvQK7xt9GkdHuzuCGS1Y6g9Gvnx3Ym33fz/HpLRYxiS0wHNr+m/MBC8B647Xt608vCDEvhl9c6Mw==", + "dev": true, + "engines": { + "node": ">=8" + } + }, + "node_modules/istanbul-lib-instrument": { + "version": "5.2.1", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/istanbul-lib-instrument/-/istanbul-lib-instrument-5.2.1.tgz", + "integrity": "sha512-pzqtp31nLv/XFOzXGuvhCb8qhjmTVo5vjVk19XE4CRlSWz0KoeJ3bw9XsA7nOp9YBf4qHjwBxkDzKcME/J29Yg==", + "dev": true, + "dependencies": { + "@babel/core": "^7.12.3", + "@babel/parser": "^7.14.7", + "@istanbuljs/schema": "^0.1.2", + "istanbul-lib-coverage": "^3.2.0", + "semver": "^6.3.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/istanbul-lib-report": { + "version": "3.0.0", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/istanbul-lib-report/-/istanbul-lib-report-3.0.0.tgz", + "integrity": "sha512-wcdi+uAKzfiGT2abPpKZ0hSU1rGQjUQnLvtY5MpQ7QCTahD3VODhcu4wcfY1YtkGaDD5yuydOLINXsfbus9ROw==", + "dev": true, + "dependencies": { + "istanbul-lib-coverage": "^3.0.0", + "make-dir": "^3.0.0", + "supports-color": "^7.1.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/istanbul-lib-source-maps": { + "version": "4.0.1", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/istanbul-lib-source-maps/-/istanbul-lib-source-maps-4.0.1.tgz", + "integrity": "sha512-n3s8EwkdFIJCG3BPKBYvskgXGoy88ARzvegkitk60NxRdwltLOTaH7CUiMRXvwYorl0Q712iEjcWB+fK/MrWVw==", + "dev": true, + "dependencies": { + "debug": "^4.1.1", + "istanbul-lib-coverage": "^3.0.0", + "source-map": "^0.6.1" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/istanbul-reports": { + "version": "3.1.5", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/istanbul-reports/-/istanbul-reports-3.1.5.tgz", + "integrity": "sha512-nUsEMa9pBt/NOHqbcbeJEgqIlY/K7rVWUX6Lql2orY5e9roQOthbR3vtY4zzf2orPELg80fnxxk9zUyPlgwD1w==", + "dev": true, + "dependencies": { + "html-escaper": "^2.0.0", + "istanbul-lib-report": "^3.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/jest": { + "version": "29.5.0", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/jest/-/jest-29.5.0.tgz", + "integrity": "sha512-juMg3he2uru1QoXX078zTa7pO85QyB9xajZc6bU+d9yEGwrKX6+vGmJQ3UdVZsvTEUARIdObzH68QItim6OSSQ==", + "dev": true, + "dependencies": { + "@jest/core": "^29.5.0", + "@jest/types": "^29.5.0", + "import-local": "^3.0.2", + "jest-cli": "^29.5.0" + }, + "bin": { + "jest": "bin/jest.js" + }, + "engines": { + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" + }, + "peerDependencies": { + "node-notifier": "^8.0.1 || ^9.0.0 || ^10.0.0" + }, + "peerDependenciesMeta": { + "node-notifier": { + "optional": true + } + } + }, + "node_modules/jest-changed-files": { + "version": "29.5.0", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/jest-changed-files/-/jest-changed-files-29.5.0.tgz", + "integrity": "sha512-IFG34IUMUaNBIxjQXF/iu7g6EcdMrGRRxaUSw92I/2g2YC6vCdTltl4nHvt7Ci5nSJwXIkCu8Ka1DKF+X7Z1Ag==", + "dev": true, + "dependencies": { + "execa": "^5.0.0", + "p-limit": "^3.1.0" + }, + "engines": { + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" + } + }, + "node_modules/jest-circus": { + "version": "29.5.0", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/jest-circus/-/jest-circus-29.5.0.tgz", + "integrity": "sha512-gq/ongqeQKAplVxqJmbeUOJJKkW3dDNPY8PjhJ5G0lBRvu0e3EWGxGy5cI4LAGA7gV2UHCtWBI4EMXK8c9nQKA==", + "dev": true, + "dependencies": { + "@jest/environment": "^29.5.0", + "@jest/expect": "^29.5.0", + "@jest/test-result": "^29.5.0", + "@jest/types": "^29.5.0", + "@types/node": "*", + "chalk": "^4.0.0", + "co": "^4.6.0", + "dedent": "^0.7.0", + "is-generator-fn": "^2.0.0", + "jest-each": "^29.5.0", + "jest-matcher-utils": "^29.5.0", + "jest-message-util": "^29.5.0", + "jest-runtime": "^29.5.0", + "jest-snapshot": "^29.5.0", + "jest-util": "^29.5.0", + "p-limit": "^3.1.0", + "pretty-format": "^29.5.0", + "pure-rand": "^6.0.0", + "slash": "^3.0.0", + "stack-utils": "^2.0.3" + }, + "engines": { + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" + } + }, + "node_modules/jest-cli": { + "version": "29.5.0", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/jest-cli/-/jest-cli-29.5.0.tgz", + "integrity": "sha512-L1KcP1l4HtfwdxXNFCL5bmUbLQiKrakMUriBEcc1Vfz6gx31ORKdreuWvmQVBit+1ss9NNR3yxjwfwzZNdQXJw==", + "dev": true, + "dependencies": { + "@jest/core": "^29.5.0", + "@jest/test-result": "^29.5.0", + "@jest/types": "^29.5.0", + "chalk": "^4.0.0", + "exit": "^0.1.2", + "graceful-fs": "^4.2.9", + "import-local": "^3.0.2", + "jest-config": "^29.5.0", + "jest-util": "^29.5.0", + "jest-validate": "^29.5.0", + "prompts": "^2.0.1", + "yargs": "^17.3.1" + }, + "bin": { + "jest": "bin/jest.js" + }, + "engines": { + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" + }, + "peerDependencies": { + "node-notifier": "^8.0.1 || ^9.0.0 || ^10.0.0" + }, + "peerDependenciesMeta": { + "node-notifier": { + "optional": true + } + } + }, + "node_modules/jest-config": { + "version": "29.5.0", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/jest-config/-/jest-config-29.5.0.tgz", + "integrity": "sha512-kvDUKBnNJPNBmFFOhDbm59iu1Fii1Q6SxyhXfvylq3UTHbg6o7j/g8k2dZyXWLvfdKB1vAPxNZnMgtKJcmu3kA==", + "dev": true, + "dependencies": { + "@babel/core": "^7.11.6", + "@jest/test-sequencer": "^29.5.0", + "@jest/types": "^29.5.0", + "babel-jest": "^29.5.0", + "chalk": "^4.0.0", + "ci-info": "^3.2.0", + "deepmerge": "^4.2.2", + "glob": "^7.1.3", + "graceful-fs": "^4.2.9", + "jest-circus": "^29.5.0", + "jest-environment-node": "^29.5.0", + "jest-get-type": "^29.4.3", + "jest-regex-util": "^29.4.3", + "jest-resolve": "^29.5.0", + "jest-runner": "^29.5.0", + "jest-util": "^29.5.0", + "jest-validate": "^29.5.0", + "micromatch": "^4.0.4", + "parse-json": "^5.2.0", + "pretty-format": "^29.5.0", + "slash": "^3.0.0", + "strip-json-comments": "^3.1.1" + }, + "engines": { + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" + }, + "peerDependencies": { + "@types/node": "*", + "ts-node": ">=9.0.0" + }, + "peerDependenciesMeta": { + "@types/node": { + "optional": true + }, + "ts-node": { + "optional": true + } + } + }, + "node_modules/jest-diff": { + "version": "29.5.0", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/jest-diff/-/jest-diff-29.5.0.tgz", + "integrity": "sha512-LtxijLLZBduXnHSniy0WMdaHjmQnt3g5sa16W4p0HqukYTTsyTW3GD1q41TyGl5YFXj/5B2U6dlh5FM1LIMgxw==", + "dev": true, + "dependencies": { + "chalk": "^4.0.0", + "diff-sequences": "^29.4.3", + "jest-get-type": "^29.4.3", + "pretty-format": "^29.5.0" + }, + "engines": { + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" + } + }, + "node_modules/jest-docblock": { + "version": "29.4.3", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/jest-docblock/-/jest-docblock-29.4.3.tgz", + "integrity": "sha512-fzdTftThczeSD9nZ3fzA/4KkHtnmllawWrXO69vtI+L9WjEIuXWs4AmyME7lN5hU7dB0sHhuPfcKofRsUb/2Fg==", + "dev": true, + "dependencies": { + "detect-newline": "^3.0.0" + }, + "engines": { + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" + } + }, + "node_modules/jest-each": { + "version": "29.5.0", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/jest-each/-/jest-each-29.5.0.tgz", + "integrity": "sha512-HM5kIJ1BTnVt+DQZ2ALp3rzXEl+g726csObrW/jpEGl+CDSSQpOJJX2KE/vEg8cxcMXdyEPu6U4QX5eruQv5hA==", + "dev": true, + "dependencies": { + "@jest/types": "^29.5.0", + "chalk": "^4.0.0", + "jest-get-type": "^29.4.3", + "jest-util": "^29.5.0", + "pretty-format": "^29.5.0" + }, + "engines": { + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" + } + }, + "node_modules/jest-environment-node": { + "version": "29.5.0", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/jest-environment-node/-/jest-environment-node-29.5.0.tgz", + "integrity": "sha512-ExxuIK/+yQ+6PRGaHkKewYtg6hto2uGCgvKdb2nfJfKXgZ17DfXjvbZ+jA1Qt9A8EQSfPnt5FKIfnOO3u1h9qw==", + "dev": true, + "dependencies": { + "@jest/environment": "^29.5.0", + "@jest/fake-timers": "^29.5.0", + "@jest/types": "^29.5.0", + "@types/node": "*", + "jest-mock": "^29.5.0", + "jest-util": "^29.5.0" + }, + "engines": { + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" + } + }, + "node_modules/jest-get-type": { + "version": "29.4.3", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/jest-get-type/-/jest-get-type-29.4.3.tgz", + "integrity": "sha512-J5Xez4nRRMjk8emnTpWrlkyb9pfRQQanDrvWHhsR1+VUfbwxi30eVcZFlcdGInRibU4G5LwHXpI7IRHU0CY+gg==", + "dev": true, + "engines": { + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" + } + }, + "node_modules/jest-haste-map": { + "version": "29.5.0", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/jest-haste-map/-/jest-haste-map-29.5.0.tgz", + "integrity": "sha512-IspOPnnBro8YfVYSw6yDRKh/TiCdRngjxeacCps1cQ9cgVN6+10JUcuJ1EabrgYLOATsIAigxA0rLR9x/YlrSA==", + "dev": true, + "dependencies": { + "@jest/types": "^29.5.0", + "@types/graceful-fs": "^4.1.3", + "@types/node": "*", + "anymatch": "^3.0.3", + "fb-watchman": "^2.0.0", + "graceful-fs": "^4.2.9", + "jest-regex-util": "^29.4.3", + "jest-util": "^29.5.0", + "jest-worker": "^29.5.0", + "micromatch": "^4.0.4", + "walker": "^1.0.8" + }, + "engines": { + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" + }, + "optionalDependencies": { + "fsevents": "^2.3.2" + } + }, + "node_modules/jest-leak-detector": { + "version": "29.5.0", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/jest-leak-detector/-/jest-leak-detector-29.5.0.tgz", + "integrity": "sha512-u9YdeeVnghBUtpN5mVxjID7KbkKE1QU4f6uUwuxiY0vYRi9BUCLKlPEZfDGR67ofdFmDz9oPAy2G92Ujrntmow==", + "dev": true, + "dependencies": { + "jest-get-type": "^29.4.3", + "pretty-format": "^29.5.0" + }, + "engines": { + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" + } + }, + "node_modules/jest-matcher-utils": { + "version": "29.5.0", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/jest-matcher-utils/-/jest-matcher-utils-29.5.0.tgz", + "integrity": "sha512-lecRtgm/rjIK0CQ7LPQwzCs2VwW6WAahA55YBuI+xqmhm7LAaxokSB8C97yJeYyT+HvQkH741StzpU41wohhWw==", + "dev": true, + "dependencies": { + "chalk": "^4.0.0", + "jest-diff": "^29.5.0", + "jest-get-type": "^29.4.3", + "pretty-format": "^29.5.0" + }, + "engines": { + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" + } + }, + "node_modules/jest-message-util": { + "version": "29.5.0", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/jest-message-util/-/jest-message-util-29.5.0.tgz", + "integrity": "sha512-Kijeg9Dag6CKtIDA7O21zNTACqD5MD/8HfIV8pdD94vFyFuer52SigdC3IQMhab3vACxXMiFk+yMHNdbqtyTGA==", + "dev": true, + "dependencies": { + "@babel/code-frame": "^7.12.13", + "@jest/types": "^29.5.0", + "@types/stack-utils": "^2.0.0", + "chalk": "^4.0.0", + "graceful-fs": "^4.2.9", + "micromatch": "^4.0.4", + "pretty-format": "^29.5.0", + "slash": "^3.0.0", + "stack-utils": "^2.0.3" + }, + "engines": { + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" + } + }, + "node_modules/jest-mock": { + "version": "29.5.0", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/jest-mock/-/jest-mock-29.5.0.tgz", + "integrity": "sha512-GqOzvdWDE4fAV2bWQLQCkujxYWL7RxjCnj71b5VhDAGOevB3qj3Ovg26A5NI84ZpODxyzaozXLOh2NCgkbvyaw==", + "dev": true, + "dependencies": { + "@jest/types": "^29.5.0", + "@types/node": "*", + "jest-util": "^29.5.0" + }, + "engines": { + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" + } + }, + "node_modules/jest-pnp-resolver": { + "version": "1.2.3", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/jest-pnp-resolver/-/jest-pnp-resolver-1.2.3.tgz", + "integrity": "sha512-+3NpwQEnRoIBtx4fyhblQDPgJI0H1IEIkX7ShLUjPGA7TtUTvI1oiKi3SR4oBR0hQhQR80l4WAe5RrXBwWMA8w==", + "dev": true, + "engines": { + "node": ">=6" + }, + "peerDependencies": { + "jest-resolve": "*" + }, + "peerDependenciesMeta": { + "jest-resolve": { + "optional": true + } + } + }, + "node_modules/jest-regex-util": { + "version": "29.4.3", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/jest-regex-util/-/jest-regex-util-29.4.3.tgz", + "integrity": "sha512-O4FglZaMmWXbGHSQInfXewIsd1LMn9p3ZXB/6r4FOkyhX2/iP/soMG98jGvk/A3HAN78+5VWcBGO0BJAPRh4kg==", + "dev": true, + "engines": { + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" + } + }, + "node_modules/jest-resolve": { + "version": "29.5.0", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/jest-resolve/-/jest-resolve-29.5.0.tgz", + "integrity": "sha512-1TzxJ37FQq7J10jPtQjcc+MkCkE3GBpBecsSUWJ0qZNJpmg6m0D9/7II03yJulm3H/fvVjgqLh/k2eYg+ui52w==", + "dev": true, + "dependencies": { + "chalk": "^4.0.0", + "graceful-fs": "^4.2.9", + "jest-haste-map": "^29.5.0", + "jest-pnp-resolver": "^1.2.2", + "jest-util": "^29.5.0", + "jest-validate": "^29.5.0", + "resolve": "^1.20.0", + "resolve.exports": "^2.0.0", + "slash": "^3.0.0" + }, + "engines": { + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" + } + }, + "node_modules/jest-resolve-dependencies": { + "version": "29.5.0", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/jest-resolve-dependencies/-/jest-resolve-dependencies-29.5.0.tgz", + "integrity": "sha512-sjV3GFr0hDJMBpYeUuGduP+YeCRbd7S/ck6IvL3kQ9cpySYKqcqhdLLC2rFwrcL7tz5vYibomBrsFYWkIGGjOg==", + "dev": true, + "dependencies": { + "jest-regex-util": "^29.4.3", + "jest-snapshot": "^29.5.0" + }, + "engines": { + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" + } + }, + "node_modules/jest-runner": { + "version": "29.5.0", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/jest-runner/-/jest-runner-29.5.0.tgz", + "integrity": "sha512-m7b6ypERhFghJsslMLhydaXBiLf7+jXy8FwGRHO3BGV1mcQpPbwiqiKUR2zU2NJuNeMenJmlFZCsIqzJCTeGLQ==", + "dev": true, + "dependencies": { + "@jest/console": "^29.5.0", + "@jest/environment": "^29.5.0", + "@jest/test-result": "^29.5.0", + "@jest/transform": "^29.5.0", + "@jest/types": "^29.5.0", + "@types/node": "*", + "chalk": "^4.0.0", + "emittery": "^0.13.1", + "graceful-fs": "^4.2.9", + "jest-docblock": "^29.4.3", + "jest-environment-node": "^29.5.0", + "jest-haste-map": "^29.5.0", + "jest-leak-detector": "^29.5.0", + "jest-message-util": "^29.5.0", + "jest-resolve": "^29.5.0", + "jest-runtime": "^29.5.0", + "jest-util": "^29.5.0", + "jest-watcher": "^29.5.0", + "jest-worker": "^29.5.0", + "p-limit": "^3.1.0", + "source-map-support": "0.5.13" + }, + "engines": { + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" + } + }, + "node_modules/jest-runtime": { + "version": "29.5.0", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/jest-runtime/-/jest-runtime-29.5.0.tgz", + "integrity": "sha512-1Hr6Hh7bAgXQP+pln3homOiEZtCDZFqwmle7Ew2j8OlbkIu6uE3Y/etJQG8MLQs3Zy90xrp2C0BRrtPHG4zryw==", + "dev": true, + "dependencies": { + "@jest/environment": "^29.5.0", + "@jest/fake-timers": "^29.5.0", + "@jest/globals": "^29.5.0", + "@jest/source-map": "^29.4.3", + "@jest/test-result": "^29.5.0", + "@jest/transform": "^29.5.0", + "@jest/types": "^29.5.0", + "@types/node": "*", + "chalk": "^4.0.0", + "cjs-module-lexer": "^1.0.0", + "collect-v8-coverage": "^1.0.0", + "glob": "^7.1.3", + "graceful-fs": "^4.2.9", + "jest-haste-map": "^29.5.0", + "jest-message-util": "^29.5.0", + "jest-mock": "^29.5.0", + "jest-regex-util": "^29.4.3", + "jest-resolve": "^29.5.0", + "jest-snapshot": "^29.5.0", + "jest-util": "^29.5.0", + "slash": "^3.0.0", + "strip-bom": "^4.0.0" + }, + "engines": { + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" + } + }, + "node_modules/jest-snapshot": { + "version": "29.5.0", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/jest-snapshot/-/jest-snapshot-29.5.0.tgz", + "integrity": "sha512-x7Wolra5V0tt3wRs3/ts3S6ciSQVypgGQlJpz2rsdQYoUKxMxPNaoHMGJN6qAuPJqS+2iQ1ZUn5kl7HCyls84g==", + "dev": true, + "dependencies": { + "@babel/core": "^7.11.6", + "@babel/generator": "^7.7.2", + "@babel/plugin-syntax-jsx": "^7.7.2", + "@babel/plugin-syntax-typescript": "^7.7.2", + "@babel/traverse": "^7.7.2", + "@babel/types": "^7.3.3", + "@jest/expect-utils": "^29.5.0", + "@jest/transform": "^29.5.0", + "@jest/types": "^29.5.0", + "@types/babel__traverse": "^7.0.6", + "@types/prettier": "^2.1.5", + "babel-preset-current-node-syntax": "^1.0.0", + "chalk": "^4.0.0", + "expect": "^29.5.0", + "graceful-fs": "^4.2.9", + "jest-diff": "^29.5.0", + "jest-get-type": "^29.4.3", + "jest-matcher-utils": "^29.5.0", + "jest-message-util": "^29.5.0", + "jest-util": "^29.5.0", + "natural-compare": "^1.4.0", + "pretty-format": "^29.5.0", + "semver": "^7.3.5" + }, + "engines": { + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" + } + }, + "node_modules/jest-snapshot/node_modules/lru-cache": { + "version": "6.0.0", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/lru-cache/-/lru-cache-6.0.0.tgz", + "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==", + "dev": true, + "dependencies": { + "yallist": "^4.0.0" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/jest-snapshot/node_modules/semver": { + "version": "7.3.8", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/semver/-/semver-7.3.8.tgz", + "integrity": "sha512-NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A==", + "dev": true, + "dependencies": { + "lru-cache": "^6.0.0" + }, + "bin": { + "semver": "bin/semver.js" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/jest-snapshot/node_modules/yallist": { + "version": "4.0.0", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/yallist/-/yallist-4.0.0.tgz", + "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==", + "dev": true + }, + "node_modules/jest-util": { + "version": "29.5.0", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/jest-util/-/jest-util-29.5.0.tgz", + "integrity": "sha512-RYMgG/MTadOr5t8KdhejfvUU82MxsCu5MF6KuDUHl+NuwzUt+Sm6jJWxTJVrDR1j5M/gJVCPKQEpWXY+yIQ6lQ==", + "dev": true, + "dependencies": { + "@jest/types": "^29.5.0", + "@types/node": "*", + "chalk": "^4.0.0", + "ci-info": "^3.2.0", + "graceful-fs": "^4.2.9", + "picomatch": "^2.2.3" + }, + "engines": { + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" + } + }, + "node_modules/jest-validate": { + "version": "29.5.0", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/jest-validate/-/jest-validate-29.5.0.tgz", + "integrity": "sha512-pC26etNIi+y3HV8A+tUGr/lph9B18GnzSRAkPaaZJIE1eFdiYm6/CewuiJQ8/RlfHd1u/8Ioi8/sJ+CmbA+zAQ==", + "dev": true, + "dependencies": { + "@jest/types": "^29.5.0", + "camelcase": "^6.2.0", + "chalk": "^4.0.0", + "jest-get-type": "^29.4.3", + "leven": "^3.1.0", + "pretty-format": "^29.5.0" + }, + "engines": { + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" + } + }, + "node_modules/jest-validate/node_modules/camelcase": { + "version": "6.3.0", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/camelcase/-/camelcase-6.3.0.tgz", + "integrity": "sha512-Gmy6FhYlCY7uOElZUSbxo2UCDH8owEk996gkbrpsgGtrJLM3J7jGxl9Ic7Qwwj4ivOE5AWZWRMecDdF7hqGjFA==", + "dev": true, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/jest-watcher": { + "version": "29.5.0", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/jest-watcher/-/jest-watcher-29.5.0.tgz", + "integrity": "sha512-KmTojKcapuqYrKDpRwfqcQ3zjMlwu27SYext9pt4GlF5FUgB+7XE1mcCnSm6a4uUpFyQIkb6ZhzZvHl+jiBCiA==", + "dev": true, + "dependencies": { + "@jest/test-result": "^29.5.0", + "@jest/types": "^29.5.0", + "@types/node": "*", + "ansi-escapes": "^4.2.1", + "chalk": "^4.0.0", + "emittery": "^0.13.1", + "jest-util": "^29.5.0", + "string-length": "^4.0.1" + }, + "engines": { + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" + } + }, + "node_modules/jest-worker": { + "version": "29.5.0", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/jest-worker/-/jest-worker-29.5.0.tgz", + "integrity": "sha512-NcrQnevGoSp4b5kg+akIpthoAFHxPBcb5P6mYPY0fUNT+sSvmtu6jlkEle3anczUKIKEbMxFimk9oTP/tpIPgA==", + "dev": true, + "dependencies": { + "@types/node": "*", + "jest-util": "^29.5.0", + "merge-stream": "^2.0.0", + "supports-color": "^8.0.0" + }, + "engines": { + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" + } + }, + "node_modules/jest-worker/node_modules/supports-color": { + "version": "8.1.1", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/supports-color/-/supports-color-8.1.1.tgz", + "integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==", + "dev": true, + "dependencies": { + "has-flag": "^4.0.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/chalk/supports-color?sponsor=1" + } + }, + "node_modules/js-tokens": { + "version": "4.0.0", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/js-tokens/-/js-tokens-4.0.0.tgz", + "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==", + "dev": true + }, + "node_modules/js-yaml": { + "version": "3.14.1", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/js-yaml/-/js-yaml-3.14.1.tgz", + "integrity": "sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==", + "dev": true, + "dependencies": { + "argparse": "^1.0.7", + "esprima": "^4.0.0" + }, + "bin": { + "js-yaml": "bin/js-yaml.js" + } + }, + "node_modules/jsesc": { + "version": "2.5.2", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/jsesc/-/jsesc-2.5.2.tgz", + "integrity": "sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA==", + "dev": true, + "bin": { + "jsesc": "bin/jsesc" + }, + "engines": { + "node": ">=4" + } + }, + "node_modules/json-parse-even-better-errors": { + "version": "2.3.1", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz", + "integrity": "sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w==", + "dev": true + }, + "node_modules/json5": { + "version": "2.2.3", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/json5/-/json5-2.2.3.tgz", + "integrity": "sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg==", + "dev": true, + "bin": { + "json5": "lib/cli.js" + }, + "engines": { + "node": ">=6" + } + }, + "node_modules/kleur": { + "version": "3.0.3", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/kleur/-/kleur-3.0.3.tgz", + "integrity": "sha512-eTIzlVOSUR+JxdDFepEYcBMtZ9Qqdef+rnzWdRZuMbOywu5tO2w2N7rqjoANZ5k9vywhL6Br1VRjUIgTQx4E8w==", + "dev": true, + "engines": { + "node": ">=6" + } + }, + "node_modules/leven": { + "version": "3.1.0", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/leven/-/leven-3.1.0.tgz", + "integrity": "sha512-qsda+H8jTaUaN/x5vzW2rzc+8Rw4TAQ/4KjB46IwK5VH+IlVeeeje/EoZRpiXvIqjFgK84QffqPztGI3VBLG1A==", + "dev": true, + "engines": { + "node": ">=6" + } + }, + "node_modules/lines-and-columns": { + "version": "1.2.4", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/lines-and-columns/-/lines-and-columns-1.2.4.tgz", + "integrity": "sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg==", + "dev": true + }, + "node_modules/locate-path": { + "version": "5.0.0", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/locate-path/-/locate-path-5.0.0.tgz", + "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==", + "dev": true, + "dependencies": { + "p-locate": "^4.1.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/lodash.memoize": { + "version": "4.1.2", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/lodash.memoize/-/lodash.memoize-4.1.2.tgz", + "integrity": "sha512-t7j+NzmgnQzTAYXcsHYLgimltOV1MXHtlOWf6GjL9Kj8GK5FInw5JotxvbOs+IvV1/Dzo04/fCGfLVs7aXb4Ag==", + "dev": true + }, + "node_modules/lru-cache": { + "version": "5.1.1", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/lru-cache/-/lru-cache-5.1.1.tgz", + "integrity": "sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==", + "dev": true, + "dependencies": { + "yallist": "^3.0.2" + } + }, + "node_modules/make-dir": { + "version": "3.1.0", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/make-dir/-/make-dir-3.1.0.tgz", + "integrity": "sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw==", + "dev": true, + "dependencies": { + "semver": "^6.0.0" + }, + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/make-error": { + "version": "1.3.6", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/make-error/-/make-error-1.3.6.tgz", + "integrity": "sha512-s8UhlNe7vPKomQhC1qFelMokr/Sc3AgNbso3n74mVPA5LTZwkB9NlXf4XPamLxJE8h0gh73rM94xvwRT2CVInw==", + "dev": true + }, + "node_modules/makeerror": { + "version": "1.0.12", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/makeerror/-/makeerror-1.0.12.tgz", + "integrity": "sha512-JmqCvUhmt43madlpFzG4BQzG2Z3m6tvQDNKdClZnO3VbIudJYmxsT0FNJMeiB2+JTSlTQTSbU8QdesVmwJcmLg==", + "dev": true, + "dependencies": { + "tmpl": "1.0.5" + } + }, + "node_modules/merge-stream": { + "version": "2.0.0", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/merge-stream/-/merge-stream-2.0.0.tgz", + "integrity": "sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==", + "dev": true + }, + "node_modules/micromatch": { + "version": "4.0.5", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/micromatch/-/micromatch-4.0.5.tgz", + "integrity": "sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA==", + "dev": true, + "dependencies": { + "braces": "^3.0.2", + "picomatch": "^2.3.1" + }, + "engines": { + "node": ">=8.6" + } + }, + "node_modules/mimic-fn": { + "version": "2.1.0", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/mimic-fn/-/mimic-fn-2.1.0.tgz", + "integrity": "sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==", + "dev": true, + "engines": { + "node": ">=6" + } + }, + "node_modules/minimatch": { + "version": "3.1.2", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/minimatch/-/minimatch-3.1.2.tgz", + "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", + "dev": true, + "dependencies": { + "brace-expansion": "^1.1.7" + }, + "engines": { + "node": "*" + } + }, + "node_modules/ms": { + "version": "2.1.2", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/ms/-/ms-2.1.2.tgz", + "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==", + "dev": true + }, + "node_modules/natural-compare": { + "version": "1.4.0", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/natural-compare/-/natural-compare-1.4.0.tgz", + "integrity": "sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw==", + "dev": true + }, + "node_modules/node-int64": { + "version": "0.4.0", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/node-int64/-/node-int64-0.4.0.tgz", + "integrity": "sha512-O5lz91xSOeoXP6DulyHfllpq+Eg00MWitZIbtPfoSEvqIHdl5gfcY6hYzDWnj0qD5tz52PI08u9qUvSVeUBeHw==", + "dev": true + }, + "node_modules/node-releases": { + "version": "2.0.10", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/node-releases/-/node-releases-2.0.10.tgz", + "integrity": "sha512-5GFldHPXVG/YZmFzJvKK2zDSzPKhEp0+ZR5SVaoSag9fsL5YgHbUHDfnG5494ISANDcK4KwPXAx2xqVEydmd7w==", + "dev": true + }, + "node_modules/normalize-path": { + "version": "3.0.0", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/normalize-path/-/normalize-path-3.0.0.tgz", + "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==", + "dev": true, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/npm-run-path": { + "version": "4.0.1", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/npm-run-path/-/npm-run-path-4.0.1.tgz", + "integrity": "sha512-S48WzZW777zhNIrn7gxOlISNAqi9ZC/uQFnRdbeIHhZhCA6UqpkOT8T1G7BvfdgP4Er8gF4sUbaS0i7QvIfCWw==", + "dev": true, + "dependencies": { + "path-key": "^3.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/once": { + "version": "1.4.0", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/once/-/once-1.4.0.tgz", + "integrity": "sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==", + "dev": true, + "dependencies": { + "wrappy": "1" + } + }, + "node_modules/onetime": { + "version": "5.1.2", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/onetime/-/onetime-5.1.2.tgz", + "integrity": "sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg==", + "dev": true, + "dependencies": { + "mimic-fn": "^2.1.0" + }, + "engines": { + "node": ">=6" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/p-limit": { + "version": "3.1.0", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/p-limit/-/p-limit-3.1.0.tgz", + "integrity": "sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==", + "dev": true, + "dependencies": { + "yocto-queue": "^0.1.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/p-locate": { + "version": "4.1.0", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/p-locate/-/p-locate-4.1.0.tgz", + "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==", + "dev": true, + "dependencies": { + "p-limit": "^2.2.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/p-locate/node_modules/p-limit": { + "version": "2.3.0", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/p-limit/-/p-limit-2.3.0.tgz", + "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==", + "dev": true, + "dependencies": { + "p-try": "^2.0.0" + }, + "engines": { + "node": ">=6" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/p-try": { + "version": "2.2.0", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/p-try/-/p-try-2.2.0.tgz", + "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==", + "dev": true, + "engines": { + "node": ">=6" + } + }, + "node_modules/parse-json": { + "version": "5.2.0", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/parse-json/-/parse-json-5.2.0.tgz", + "integrity": "sha512-ayCKvm/phCGxOkYRSCM82iDwct8/EonSEgCSxWxD7ve6jHggsFl4fZVQBPRNgQoKiuV/odhFrGzQXZwbifC8Rg==", + "dev": true, + "dependencies": { + "@babel/code-frame": "^7.0.0", + "error-ex": "^1.3.1", + "json-parse-even-better-errors": "^2.3.0", + "lines-and-columns": "^1.1.6" + }, + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/path-exists": { + "version": "4.0.0", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/path-exists/-/path-exists-4.0.0.tgz", + "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==", + "dev": true, + "engines": { + "node": ">=8" + } + }, + "node_modules/path-is-absolute": { + "version": "1.0.1", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/path-is-absolute/-/path-is-absolute-1.0.1.tgz", + "integrity": "sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==", + "dev": true, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/path-key": { + "version": "3.1.1", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/path-key/-/path-key-3.1.1.tgz", + "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==", + "dev": true, + "engines": { + "node": ">=8" + } + }, + "node_modules/path-parse": { + "version": "1.0.7", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/path-parse/-/path-parse-1.0.7.tgz", + "integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==", + "dev": true + }, + "node_modules/picocolors": { + "version": "1.0.0", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/picocolors/-/picocolors-1.0.0.tgz", + "integrity": "sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ==", + "dev": true + }, + "node_modules/picomatch": { + "version": "2.3.1", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/picomatch/-/picomatch-2.3.1.tgz", + "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==", + "dev": true, + "engines": { + "node": ">=8.6" + }, + "funding": { + "url": "https://github.com/sponsors/jonschlinkert" + } + }, + "node_modules/pirates": { + "version": "4.0.5", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/pirates/-/pirates-4.0.5.tgz", + "integrity": "sha512-8V9+HQPupnaXMA23c5hvl69zXvTwTzyAYasnkb0Tts4XvO4CliqONMOnvlq26rkhLC3nWDFBJf73LU1e1VZLaQ==", + "dev": true, + "engines": { + "node": ">= 6" + } + }, + "node_modules/pkg-dir": { + "version": "4.2.0", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/pkg-dir/-/pkg-dir-4.2.0.tgz", + "integrity": "sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ==", + "dev": true, + "dependencies": { + "find-up": "^4.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/pretty-format": { + "version": "29.5.0", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/pretty-format/-/pretty-format-29.5.0.tgz", + "integrity": "sha512-V2mGkI31qdttvTFX7Mt4efOqHXqJWMu4/r66Xh3Z3BwZaPfPJgp6/gbwoujRpPUtfEF6AUUWx3Jim3GCw5g/Qw==", + "dev": true, + "dependencies": { + "@jest/schemas": "^29.4.3", + "ansi-styles": "^5.0.0", + "react-is": "^18.0.0" + }, + "engines": { + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" + } + }, + "node_modules/pretty-format/node_modules/ansi-styles": { + "version": "5.2.0", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/ansi-styles/-/ansi-styles-5.2.0.tgz", + "integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==", + "dev": true, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/chalk/ansi-styles?sponsor=1" + } + }, + "node_modules/prompts": { + "version": "2.4.2", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/prompts/-/prompts-2.4.2.tgz", + "integrity": "sha512-NxNv/kLguCA7p3jE8oL2aEBsrJWgAakBpgmgK6lpPWV+WuOmY6r2/zbAVnP+T8bQlA0nzHXSJSJW0Hq7ylaD2Q==", + "dev": true, + "dependencies": { + "kleur": "^3.0.3", + "sisteransi": "^1.0.5" + }, + "engines": { + "node": ">= 6" + } + }, + "node_modules/pure-rand": { + "version": "6.0.1", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/pure-rand/-/pure-rand-6.0.1.tgz", + "integrity": "sha512-t+x1zEHDjBwkDGY5v5ApnZ/utcd4XYDiJsaQQoptTXgUXX95sDg1elCdJghzicm7n2mbCBJ3uYWr6M22SO19rg==", + "dev": true, + "funding": [ + { + "type": "individual", + "url": "https://github.com/sponsors/dubzzz" + }, + { + "type": "opencollective", + "url": "https://opencollective.com/fast-check" + } + ] + }, + "node_modules/react-is": { + "version": "18.2.0", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/react-is/-/react-is-18.2.0.tgz", + "integrity": "sha512-xWGDIW6x921xtzPkhiULtthJHoJvBbF3q26fzloPCK0hsvxtPVelvftw3zjbHWSkR2km9Z+4uxbDDK/6Zw9B8w==", + "dev": true + }, + "node_modules/require-directory": { + "version": "2.1.1", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/require-directory/-/require-directory-2.1.1.tgz", + "integrity": "sha512-fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q==", + "dev": true, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/resolve": { + "version": "1.22.1", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/resolve/-/resolve-1.22.1.tgz", + "integrity": "sha512-nBpuuYuY5jFsli/JIs1oldw6fOQCBioohqWZg/2hiaOybXOft4lonv85uDOKXdf8rhyK159cxU5cDcK/NKk8zw==", + "dev": true, + "dependencies": { + "is-core-module": "^2.9.0", + "path-parse": "^1.0.7", + "supports-preserve-symlinks-flag": "^1.0.0" + }, + "bin": { + "resolve": "bin/resolve" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/resolve-cwd": { + "version": "3.0.0", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/resolve-cwd/-/resolve-cwd-3.0.0.tgz", + "integrity": "sha512-OrZaX2Mb+rJCpH/6CpSqt9xFVpN++x01XnN2ie9g6P5/3xelLAkXWVADpdz1IHD/KFfEXyE6V0U01OQ3UO2rEg==", + "dev": true, + "dependencies": { + "resolve-from": "^5.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/resolve-from": { + "version": "5.0.0", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/resolve-from/-/resolve-from-5.0.0.tgz", + "integrity": "sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==", + "dev": true, + "engines": { + "node": ">=8" + } + }, + "node_modules/resolve.exports": { + "version": "2.0.2", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/resolve.exports/-/resolve.exports-2.0.2.tgz", + "integrity": "sha512-X2UW6Nw3n/aMgDVy+0rSqgHlv39WZAlZrXCdnbyEiKm17DSqHX4MmQMaST3FbeWR5FTuRcUwYAziZajji0Y7mg==", + "dev": true, + "engines": { + "node": ">=10" + } + }, + "node_modules/semver": { + "version": "6.3.0", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/semver/-/semver-6.3.0.tgz", + "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==", + "dev": true, + "bin": { + "semver": "bin/semver.js" + } + }, + "node_modules/shebang-command": { + "version": "2.0.0", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/shebang-command/-/shebang-command-2.0.0.tgz", + "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==", + "dev": true, + "dependencies": { + "shebang-regex": "^3.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/shebang-regex": { + "version": "3.0.0", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/shebang-regex/-/shebang-regex-3.0.0.tgz", + "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==", + "dev": true, + "engines": { + "node": ">=8" + } + }, + "node_modules/signal-exit": { + "version": "3.0.7", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/signal-exit/-/signal-exit-3.0.7.tgz", + "integrity": "sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==", + "dev": true + }, + "node_modules/sisteransi": { + "version": "1.0.5", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/sisteransi/-/sisteransi-1.0.5.tgz", + "integrity": "sha512-bLGGlR1QxBcynn2d5YmDX4MGjlZvy2MRBDRNHLJ8VI6l6+9FUiyTFNJ0IveOSP0bcXgVDPRcfGqA0pjaqUpfVg==", + "dev": true + }, + "node_modules/slash": { + "version": "3.0.0", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/slash/-/slash-3.0.0.tgz", + "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==", + "dev": true, + "engines": { + "node": ">=8" + } + }, + "node_modules/source-map": { + "version": "0.6.1", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/source-map/-/source-map-0.6.1.tgz", + "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", + "dev": true, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/source-map-support": { + "version": "0.5.13", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/source-map-support/-/source-map-support-0.5.13.tgz", + "integrity": "sha512-SHSKFHadjVA5oR4PPqhtAVdcBWwRYVd6g6cAXnIbRiIwc2EhPrTuKUBdSLvlEKyIP3GCf89fltvcZiP9MMFA1w==", + "dev": true, + "dependencies": { + "buffer-from": "^1.0.0", + "source-map": "^0.6.0" + } + }, + "node_modules/sprintf-js": { + "version": "1.0.3", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/sprintf-js/-/sprintf-js-1.0.3.tgz", + "integrity": "sha512-D9cPgkvLlV3t3IzL0D0YLvGA9Ahk4PcvVwUbN0dSGr1aP0Nrt4AEnTUbuGvquEC0mA64Gqt1fzirlRs5ibXx8g==", + "dev": true + }, + "node_modules/stack-utils": { + "version": "2.0.6", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/stack-utils/-/stack-utils-2.0.6.tgz", + "integrity": "sha512-XlkWvfIm6RmsWtNJx+uqtKLS8eqFbxUg0ZzLXqY0caEy9l7hruX8IpiDnjsLavoBgqCCR71TqWO8MaXYheJ3RQ==", + "dev": true, + "dependencies": { + "escape-string-regexp": "^2.0.0" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/string-length": { + "version": "4.0.2", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/string-length/-/string-length-4.0.2.tgz", + "integrity": "sha512-+l6rNN5fYHNhZZy41RXsYptCjA2Igmq4EG7kZAYFQI1E1VTXarr6ZPXBg6eq7Y6eK4FEhY6AJlyuFIb/v/S0VQ==", + "dev": true, + "dependencies": { + "char-regex": "^1.0.2", + "strip-ansi": "^6.0.0" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/string-width": { + "version": "4.2.3", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/string-width/-/string-width-4.2.3.tgz", + "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==", + "dev": true, + "dependencies": { + "emoji-regex": "^8.0.0", + "is-fullwidth-code-point": "^3.0.0", + "strip-ansi": "^6.0.1" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/strip-ansi": { + "version": "6.0.1", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/strip-ansi/-/strip-ansi-6.0.1.tgz", + "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==", + "dev": true, + "dependencies": { + "ansi-regex": "^5.0.1" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/strip-bom": { + "version": "4.0.0", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/strip-bom/-/strip-bom-4.0.0.tgz", + "integrity": "sha512-3xurFv5tEgii33Zi8Jtp55wEIILR9eh34FAW00PZf+JnSsTmV/ioewSgQl97JHvgjoRGwPShsWm+IdrxB35d0w==", + "dev": true, + "engines": { + "node": ">=8" + } + }, + "node_modules/strip-final-newline": { + "version": "2.0.0", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/strip-final-newline/-/strip-final-newline-2.0.0.tgz", + "integrity": "sha512-BrpvfNAE3dcvq7ll3xVumzjKjZQ5tI1sEUIKr3Uoks0XUl45St3FlatVqef9prk4jRDzhW6WZg+3bk93y6pLjA==", + "dev": true, + "engines": { + "node": ">=6" + } + }, + "node_modules/strip-json-comments": { + "version": "3.1.1", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/strip-json-comments/-/strip-json-comments-3.1.1.tgz", + "integrity": "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==", + "dev": true, + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/supports-color": { + "version": "7.2.0", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/supports-color/-/supports-color-7.2.0.tgz", + "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", + "dev": true, + "dependencies": { + "has-flag": "^4.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/supports-preserve-symlinks-flag": { + "version": "1.0.0", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz", + "integrity": "sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==", + "dev": true, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/test-exclude": { + "version": "6.0.0", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/test-exclude/-/test-exclude-6.0.0.tgz", + "integrity": "sha512-cAGWPIyOHU6zlmg88jwm7VRyXnMN7iV68OGAbYDk/Mh/xC/pzVPlQtY6ngoIH/5/tciuhGfvESU8GrHrcxD56w==", + "dev": true, + "dependencies": { + "@istanbuljs/schema": "^0.1.2", + "glob": "^7.1.4", + "minimatch": "^3.0.4" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/tmpl": { + "version": "1.0.5", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/tmpl/-/tmpl-1.0.5.tgz", + "integrity": "sha512-3f0uOEAQwIqGuWW2MVzYg8fV/QNnc/IpuJNG837rLuczAaLVHslWHZQj4IGiEl5Hs3kkbhwL9Ab7Hrsmuj+Smw==", + "dev": true + }, + "node_modules/to-fast-properties": { + "version": "2.0.0", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/to-fast-properties/-/to-fast-properties-2.0.0.tgz", + "integrity": "sha512-/OaKK0xYrs3DmxRYqL/yDc+FxFUVYhDlXMhRmv3z915w2HF1tnN1omB354j8VUGO/hbRzyD6Y3sA7v7GS/ceog==", + "dev": true, + "engines": { + "node": ">=4" + } + }, + "node_modules/to-regex-range": { + "version": "5.0.1", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/to-regex-range/-/to-regex-range-5.0.1.tgz", + "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==", + "dev": true, + "dependencies": { + "is-number": "^7.0.0" + }, + "engines": { + "node": ">=8.0" + } + }, + "node_modules/ts-jest": { + "version": "29.0.5", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/ts-jest/-/ts-jest-29.0.5.tgz", + "integrity": "sha512-PL3UciSgIpQ7f6XjVOmbi96vmDHUqAyqDr8YxzopDqX3kfgYtX1cuNeBjP+L9sFXi6nzsGGA6R3fP3DDDJyrxA==", + "dev": true, + "dependencies": { + "bs-logger": "0.x", + "fast-json-stable-stringify": "2.x", + "jest-util": "^29.0.0", + "json5": "^2.2.3", + "lodash.memoize": "4.x", + "make-error": "1.x", + "semver": "7.x", + "yargs-parser": "^21.0.1" + }, + "bin": { + "ts-jest": "cli.js" + }, + "engines": { + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" + }, + "peerDependencies": { + "@babel/core": ">=7.0.0-beta.0 <8", + "@jest/types": "^29.0.0", + "babel-jest": "^29.0.0", + "jest": "^29.0.0", + "typescript": ">=4.3" + }, + "peerDependenciesMeta": { + "@babel/core": { + "optional": true + }, + "@jest/types": { + "optional": true + }, + "babel-jest": { + "optional": true + }, + "esbuild": { + "optional": true + } + } + }, + "node_modules/ts-jest/node_modules/lru-cache": { + "version": "6.0.0", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/lru-cache/-/lru-cache-6.0.0.tgz", + "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==", + "dev": true, + "dependencies": { + "yallist": "^4.0.0" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/ts-jest/node_modules/semver": { + "version": "7.3.8", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/semver/-/semver-7.3.8.tgz", + "integrity": "sha512-NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A==", + "dev": true, + "dependencies": { + "lru-cache": "^6.0.0" + }, + "bin": { + "semver": "bin/semver.js" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/ts-jest/node_modules/yallist": { + "version": "4.0.0", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/yallist/-/yallist-4.0.0.tgz", + "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==", + "dev": true + }, + "node_modules/type-detect": { + "version": "4.0.8", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/type-detect/-/type-detect-4.0.8.tgz", + "integrity": "sha512-0fr/mIH1dlO+x7TlcMy+bIDqKPsw/70tVyeHW787goQjhmqaZe10uwLujubK9q9Lg6Fiho1KUKDYz0Z7k7g5/g==", + "dev": true, + "engines": { + "node": ">=4" + } + }, + "node_modules/type-fest": { + "version": "0.21.3", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/type-fest/-/type-fest-0.21.3.tgz", + "integrity": "sha512-t0rzBq87m3fVcduHDUFhKmyyX+9eo6WQjZvf51Ea/M0Q7+T374Jp1aUiyUl0GKxp8M/OETVHSDvmkyPgvX+X2w==", + "dev": true, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, "node_modules/typescript": { "version": "4.6.4", - "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.6.4.tgz", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/typescript/-/typescript-4.6.4.tgz", "integrity": "sha512-9ia/jWHIEbo49HfjrLGfKbZSuWo9iTMwXO+Ca3pRsSpbsMbc7/IU8NKdCZVRRBafVPGnoJeFL76ZOAA84I9fEg==", "dev": true, - "bin": { - "tsc": "bin/tsc", - "tsserver": "bin/tsserver" + "bin": { + "tsc": "bin/tsc", + "tsserver": "bin/tsserver" + }, + "engines": { + "node": ">=4.2.0" + } + }, + "node_modules/update-browserslist-db": { + "version": "1.0.10", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/update-browserslist-db/-/update-browserslist-db-1.0.10.tgz", + "integrity": "sha512-OztqDenkfFkbSG+tRxBeAnCVPckDBcvibKd35yDONx6OU8N7sqgwc7rCbkJ/WcYtVRZ4ba68d6byhC21GFh7sQ==", + "dev": true, + "funding": [ + { + "type": "opencollective", + "url": "https://opencollective.com/browserslist" + }, + { + "type": "tidelift", + "url": "https://tidelift.com/funding/github/npm/browserslist" + } + ], + "dependencies": { + "escalade": "^3.1.1", + "picocolors": "^1.0.0" + }, + "bin": { + "browserslist-lint": "cli.js" + }, + "peerDependencies": { + "browserslist": ">= 4.21.0" + } + }, + "node_modules/v8-to-istanbul": { + "version": "9.1.0", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/v8-to-istanbul/-/v8-to-istanbul-9.1.0.tgz", + "integrity": "sha512-6z3GW9x8G1gd+JIIgQQQxXuiJtCXeAjp6RaPEPLv62mH3iPHPxV6W3robxtCzNErRo6ZwTmzWhsbNvjyEBKzKA==", + "dev": true, + "dependencies": { + "@jridgewell/trace-mapping": "^0.3.12", + "@types/istanbul-lib-coverage": "^2.0.1", + "convert-source-map": "^1.6.0" + }, + "engines": { + "node": ">=10.12.0" + } + }, + "node_modules/v8-to-istanbul/node_modules/convert-source-map": { + "version": "1.9.0", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/convert-source-map/-/convert-source-map-1.9.0.tgz", + "integrity": "sha512-ASFBup0Mz1uyiIjANan1jzLQami9z1PoYSZCiiYW2FczPbenXc45FZdBZLzOT+r6+iciuEModtmCti+hjaAk0A==", + "dev": true + }, + "node_modules/walker": { + "version": "1.0.8", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/walker/-/walker-1.0.8.tgz", + "integrity": "sha512-ts/8E8l5b7kY0vlWLewOkDXMmPdLcVV4GmOQLyxuSswIJsweeFZtAsMF7k1Nszz+TYBQrlYRmzOnr398y1JemQ==", + "dev": true, + "dependencies": { + "makeerror": "1.0.12" + } + }, + "node_modules/which": { + "version": "2.0.2", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/which/-/which-2.0.2.tgz", + "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==", + "dev": true, + "dependencies": { + "isexe": "^2.0.0" + }, + "bin": { + "node-which": "bin/node-which" + }, + "engines": { + "node": ">= 8" + } + }, + "node_modules/wrap-ansi": { + "version": "7.0.0", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/wrap-ansi/-/wrap-ansi-7.0.0.tgz", + "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==", + "dev": true, + "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", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/wrappy/-/wrappy-1.0.2.tgz", + "integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==", + "dev": true + }, + "node_modules/write-file-atomic": { + "version": "4.0.2", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/write-file-atomic/-/write-file-atomic-4.0.2.tgz", + "integrity": "sha512-7KxauUdBmSdWnmpaGFg+ppNjKF8uNLry8LyzjauQDOVONfFLNKrKvQOxZ/VuTIcS/gge/YNahf5RIIQWTSarlg==", + "dev": true, + "dependencies": { + "imurmurhash": "^0.1.4", + "signal-exit": "^3.0.7" + }, + "engines": { + "node": "^12.13.0 || ^14.15.0 || >=16.0.0" + } + }, + "node_modules/y18n": { + "version": "5.0.8", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/y18n/-/y18n-5.0.8.tgz", + "integrity": "sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==", + "dev": true, + "engines": { + "node": ">=10" + } + }, + "node_modules/yallist": { + "version": "3.1.1", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/yallist/-/yallist-3.1.1.tgz", + "integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==", + "dev": true + }, + "node_modules/yargs": { + "version": "17.7.1", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/yargs/-/yargs-17.7.1.tgz", + "integrity": "sha512-cwiTb08Xuv5fqF4AovYacTFNxk62th7LKJ6BL9IGUpTJrWoU7/7WdQGTP2SjKf1dUNBGzDd28p/Yfs/GI6JrLw==", + "dev": true, + "dependencies": { + "cliui": "^8.0.1", + "escalade": "^3.1.1", + "get-caller-file": "^2.0.5", + "require-directory": "^2.1.1", + "string-width": "^4.2.3", + "y18n": "^5.0.5", + "yargs-parser": "^21.1.1" + }, + "engines": { + "node": ">=12" + } + }, + "node_modules/yargs-parser": { + "version": "21.1.1", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/yargs-parser/-/yargs-parser-21.1.1.tgz", + "integrity": "sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw==", + "dev": true, + "engines": { + "node": ">=12" + } + }, + "node_modules/yocto-queue": { + "version": "0.1.0", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/yocto-queue/-/yocto-queue-0.1.0.tgz", + "integrity": "sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==", + "dev": true, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + } + }, + "dependencies": { + "@ampproject/remapping": { + "version": "2.2.0", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/@ampproject/remapping/-/remapping-2.2.0.tgz", + "integrity": "sha512-qRmjj8nj9qmLTQXXmaR1cck3UXSRMPrbsLJAasZpF+t3riI71BXed5ebIOYwQntykeZuhjsdweEc9BxH5Jc26w==", + "dev": true, + "requires": { + "@jridgewell/gen-mapping": "^0.1.0", + "@jridgewell/trace-mapping": "^0.3.9" + } + }, + "@babel/code-frame": { + "version": "7.18.6", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/@babel/code-frame/-/code-frame-7.18.6.tgz", + "integrity": "sha512-TDCmlK5eOvH+eH7cdAFlNXeVJqWIQ7gW9tY1GJIpUtFb6CmjVyq2VM3u71bOyR8CRihcCgMUYoDNyLXao3+70Q==", + "dev": true, + "requires": { + "@babel/highlight": "^7.18.6" + } + }, + "@babel/compat-data": { + "version": "7.21.0", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/@babel/compat-data/-/compat-data-7.21.0.tgz", + "integrity": "sha512-gMuZsmsgxk/ENC3O/fRw5QY8A9/uxQbbCEypnLIiYYc/qVJtEV7ouxC3EllIIwNzMqAQee5tanFabWsUOutS7g==", + "dev": true + }, + "@babel/core": { + "version": "7.21.3", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/@babel/core/-/core-7.21.3.tgz", + "integrity": "sha512-qIJONzoa/qiHghnm0l1n4i/6IIziDpzqc36FBs4pzMhDUraHqponwJLiAKm1hGLP3OSB/TVNz6rMwVGpwxxySw==", + "dev": true, + "requires": { + "@ampproject/remapping": "^2.2.0", + "@babel/code-frame": "^7.18.6", + "@babel/generator": "^7.21.3", + "@babel/helper-compilation-targets": "^7.20.7", + "@babel/helper-module-transforms": "^7.21.2", + "@babel/helpers": "^7.21.0", + "@babel/parser": "^7.21.3", + "@babel/template": "^7.20.7", + "@babel/traverse": "^7.21.3", + "@babel/types": "^7.21.3", + "convert-source-map": "^1.7.0", + "debug": "^4.1.0", + "gensync": "^1.0.0-beta.2", + "json5": "^2.2.2", + "semver": "^6.3.0" + }, + "dependencies": { + "convert-source-map": { + "version": "1.9.0", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/convert-source-map/-/convert-source-map-1.9.0.tgz", + "integrity": "sha512-ASFBup0Mz1uyiIjANan1jzLQami9z1PoYSZCiiYW2FczPbenXc45FZdBZLzOT+r6+iciuEModtmCti+hjaAk0A==", + "dev": true + } + } + }, + "@babel/generator": { + "version": "7.21.3", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/@babel/generator/-/generator-7.21.3.tgz", + "integrity": "sha512-QS3iR1GYC/YGUnW7IdggFeN5c1poPUurnGttOV/bZgPGV+izC/D8HnD6DLwod0fsatNyVn1G3EVWMYIF0nHbeA==", + "dev": true, + "requires": { + "@babel/types": "^7.21.3", + "@jridgewell/gen-mapping": "^0.3.2", + "@jridgewell/trace-mapping": "^0.3.17", + "jsesc": "^2.5.1" + }, + "dependencies": { + "@jridgewell/gen-mapping": { + "version": "0.3.2", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/@jridgewell/gen-mapping/-/gen-mapping-0.3.2.tgz", + "integrity": "sha512-mh65xKQAzI6iBcFzwv28KVWSmCkdRBWoOh+bYQGW3+6OZvbbN3TqMGo5hqYxQniRcH9F2VZIoJCm4pa3BPDK/A==", + "dev": true, + "requires": { + "@jridgewell/set-array": "^1.0.1", + "@jridgewell/sourcemap-codec": "^1.4.10", + "@jridgewell/trace-mapping": "^0.3.9" + } + } + } + }, + "@babel/helper-compilation-targets": { + "version": "7.20.7", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.20.7.tgz", + "integrity": "sha512-4tGORmfQcrc+bvrjb5y3dG9Mx1IOZjsHqQVUz7XCNHO+iTmqxWnVg3KRygjGmpRLJGdQSKuvFinbIb0CnZwHAQ==", + "dev": true, + "requires": { + "@babel/compat-data": "^7.20.5", + "@babel/helper-validator-option": "^7.18.6", + "browserslist": "^4.21.3", + "lru-cache": "^5.1.1", + "semver": "^6.3.0" + } + }, + "@babel/helper-environment-visitor": { + "version": "7.18.9", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/@babel/helper-environment-visitor/-/helper-environment-visitor-7.18.9.tgz", + "integrity": "sha512-3r/aACDJ3fhQ/EVgFy0hpj8oHyHpQc+LPtJoY9SzTThAsStm4Ptegq92vqKoE3vD706ZVFWITnMnxucw+S9Ipg==", + "dev": true + }, + "@babel/helper-function-name": { + "version": "7.21.0", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/@babel/helper-function-name/-/helper-function-name-7.21.0.tgz", + "integrity": "sha512-HfK1aMRanKHpxemaY2gqBmL04iAPOPRj7DxtNbiDOrJK+gdwkiNRVpCpUJYbUT+aZyemKN8brqTOxzCaG6ExRg==", + "dev": true, + "requires": { + "@babel/template": "^7.20.7", + "@babel/types": "^7.21.0" + } + }, + "@babel/helper-hoist-variables": { + "version": "7.18.6", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.18.6.tgz", + "integrity": "sha512-UlJQPkFqFULIcyW5sbzgbkxn2FKRgwWiRexcuaR8RNJRy8+LLveqPjwZV/bwrLZCN0eUHD/x8D0heK1ozuoo6Q==", + "dev": true, + "requires": { + "@babel/types": "^7.18.6" + } + }, + "@babel/helper-module-imports": { + "version": "7.18.6", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/@babel/helper-module-imports/-/helper-module-imports-7.18.6.tgz", + "integrity": "sha512-0NFvs3VkuSYbFi1x2Vd6tKrywq+z/cLeYC/RJNFrIX/30Bf5aiGYbtvGXolEktzJH8o5E5KJ3tT+nkxuuZFVlA==", + "dev": true, + "requires": { + "@babel/types": "^7.18.6" + } + }, + "@babel/helper-module-transforms": { + "version": "7.21.2", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/@babel/helper-module-transforms/-/helper-module-transforms-7.21.2.tgz", + "integrity": "sha512-79yj2AR4U/Oqq/WOV7Lx6hUjau1Zfo4cI+JLAVYeMV5XIlbOhmjEk5ulbTc9fMpmlojzZHkUUxAiK+UKn+hNQQ==", + "dev": true, + "requires": { + "@babel/helper-environment-visitor": "^7.18.9", + "@babel/helper-module-imports": "^7.18.6", + "@babel/helper-simple-access": "^7.20.2", + "@babel/helper-split-export-declaration": "^7.18.6", + "@babel/helper-validator-identifier": "^7.19.1", + "@babel/template": "^7.20.7", + "@babel/traverse": "^7.21.2", + "@babel/types": "^7.21.2" + } + }, + "@babel/helper-plugin-utils": { + "version": "7.20.2", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.20.2.tgz", + "integrity": "sha512-8RvlJG2mj4huQ4pZ+rU9lqKi9ZKiRmuvGuM2HlWmkmgOhbs6zEAw6IEiJ5cQqGbDzGZOhwuOQNtZMi/ENLjZoQ==", + "dev": true + }, + "@babel/helper-simple-access": { + "version": "7.20.2", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/@babel/helper-simple-access/-/helper-simple-access-7.20.2.tgz", + "integrity": "sha512-+0woI/WPq59IrqDYbVGfshjT5Dmk/nnbdpcF8SnMhhXObpTq2KNBdLFRFrkVdbDOyUmHBCxzm5FHV1rACIkIbA==", + "dev": true, + "requires": { + "@babel/types": "^7.20.2" + } + }, + "@babel/helper-split-export-declaration": { + "version": "7.18.6", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.18.6.tgz", + "integrity": "sha512-bde1etTx6ZyTmobl9LLMMQsaizFVZrquTEHOqKeQESMKo4PlObf+8+JA25ZsIpZhT/WEd39+vOdLXAFG/nELpA==", + "dev": true, + "requires": { + "@babel/types": "^7.18.6" + } + }, + "@babel/helper-string-parser": { + "version": "7.19.4", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/@babel/helper-string-parser/-/helper-string-parser-7.19.4.tgz", + "integrity": "sha512-nHtDoQcuqFmwYNYPz3Rah5ph2p8PFeFCsZk9A/48dPc/rGocJ5J3hAAZ7pb76VWX3fZKu+uEr/FhH5jLx7umrw==", + "dev": true + }, + "@babel/helper-validator-identifier": { + "version": "7.19.1", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.19.1.tgz", + "integrity": "sha512-awrNfaMtnHUr653GgGEs++LlAvW6w+DcPrOliSMXWCKo597CwL5Acf/wWdNkf/tfEQE3mjkeD1YOVZOUV/od1w==", + "dev": true + }, + "@babel/helper-validator-option": { + "version": "7.21.0", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/@babel/helper-validator-option/-/helper-validator-option-7.21.0.tgz", + "integrity": "sha512-rmL/B8/f0mKS2baE9ZpyTcTavvEuWhTTW8amjzXNvYG4AwBsqTLikfXsEofsJEfKHf+HQVQbFOHy6o+4cnC/fQ==", + "dev": true + }, + "@babel/helpers": { + "version": "7.21.0", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/@babel/helpers/-/helpers-7.21.0.tgz", + "integrity": "sha512-XXve0CBtOW0pd7MRzzmoyuSj0e3SEzj8pgyFxnTT1NJZL38BD1MK7yYrm8yefRPIDvNNe14xR4FdbHwpInD4rA==", + "dev": true, + "requires": { + "@babel/template": "^7.20.7", + "@babel/traverse": "^7.21.0", + "@babel/types": "^7.21.0" + } + }, + "@babel/highlight": { + "version": "7.18.6", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/@babel/highlight/-/highlight-7.18.6.tgz", + "integrity": "sha512-u7stbOuYjaPezCuLj29hNW1v64M2Md2qupEKP1fHc7WdOA3DgLh37suiSrZYY7haUB7iBeQZ9P1uiRF359do3g==", + "dev": true, + "requires": { + "@babel/helper-validator-identifier": "^7.18.6", + "chalk": "^2.0.0", + "js-tokens": "^4.0.0" + }, + "dependencies": { + "ansi-styles": { + "version": "3.2.1", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/ansi-styles/-/ansi-styles-3.2.1.tgz", + "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==", + "dev": true, + "requires": { + "color-convert": "^1.9.0" + } + }, + "chalk": { + "version": "2.4.2", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/chalk/-/chalk-2.4.2.tgz", + "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==", + "dev": true, + "requires": { + "ansi-styles": "^3.2.1", + "escape-string-regexp": "^1.0.5", + "supports-color": "^5.3.0" + } + }, + "color-convert": { + "version": "1.9.3", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/color-convert/-/color-convert-1.9.3.tgz", + "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==", + "dev": true, + "requires": { + "color-name": "1.1.3" + } + }, + "color-name": { + "version": "1.1.3", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/color-name/-/color-name-1.1.3.tgz", + "integrity": "sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw==", + "dev": true + }, + "escape-string-regexp": { + "version": "1.0.5", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz", + "integrity": "sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==", + "dev": true + }, + "has-flag": { + "version": "3.0.0", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/has-flag/-/has-flag-3.0.0.tgz", + "integrity": "sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==", + "dev": true + }, + "supports-color": { + "version": "5.5.0", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/supports-color/-/supports-color-5.5.0.tgz", + "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==", + "dev": true, + "requires": { + "has-flag": "^3.0.0" + } + } + } + }, + "@babel/parser": { + "version": "7.21.3", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/@babel/parser/-/parser-7.21.3.tgz", + "integrity": "sha512-lobG0d7aOfQRXh8AyklEAgZGvA4FShxo6xQbUrrT/cNBPUdIDojlokwJsQyCC/eKia7ifqM0yP+2DRZ4WKw2RQ==", + "dev": true + }, + "@babel/plugin-syntax-async-generators": { + "version": "7.8.4", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/@babel/plugin-syntax-async-generators/-/plugin-syntax-async-generators-7.8.4.tgz", + "integrity": "sha512-tycmZxkGfZaxhMRbXlPXuVFpdWlXpir2W4AMhSJgRKzk/eDlIXOhb2LHWoLpDF7TEHylV5zNhykX6KAgHJmTNw==", + "dev": true, + "requires": { + "@babel/helper-plugin-utils": "^7.8.0" + } + }, + "@babel/plugin-syntax-bigint": { + "version": "7.8.3", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/@babel/plugin-syntax-bigint/-/plugin-syntax-bigint-7.8.3.tgz", + "integrity": "sha512-wnTnFlG+YxQm3vDxpGE57Pj0srRU4sHE/mDkt1qv2YJJSeUAec2ma4WLUnUPeKjyrfntVwe/N6dCXpU+zL3Npg==", + "dev": true, + "requires": { + "@babel/helper-plugin-utils": "^7.8.0" + } + }, + "@babel/plugin-syntax-class-properties": { + "version": "7.12.13", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/@babel/plugin-syntax-class-properties/-/plugin-syntax-class-properties-7.12.13.tgz", + "integrity": "sha512-fm4idjKla0YahUNgFNLCB0qySdsoPiZP3iQE3rky0mBUtMZ23yDJ9SJdg6dXTSDnulOVqiF3Hgr9nbXvXTQZYA==", + "dev": true, + "requires": { + "@babel/helper-plugin-utils": "^7.12.13" + } + }, + "@babel/plugin-syntax-import-meta": { + "version": "7.10.4", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/@babel/plugin-syntax-import-meta/-/plugin-syntax-import-meta-7.10.4.tgz", + "integrity": "sha512-Yqfm+XDx0+Prh3VSeEQCPU81yC+JWZ2pDPFSS4ZdpfZhp4MkFMaDC1UqseovEKwSUpnIL7+vK+Clp7bfh0iD7g==", + "dev": true, + "requires": { + "@babel/helper-plugin-utils": "^7.10.4" + } + }, + "@babel/plugin-syntax-json-strings": { + "version": "7.8.3", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/@babel/plugin-syntax-json-strings/-/plugin-syntax-json-strings-7.8.3.tgz", + "integrity": "sha512-lY6kdGpWHvjoe2vk4WrAapEuBR69EMxZl+RoGRhrFGNYVK8mOPAW8VfbT/ZgrFbXlDNiiaxQnAtgVCZ6jv30EA==", + "dev": true, + "requires": { + "@babel/helper-plugin-utils": "^7.8.0" + } + }, + "@babel/plugin-syntax-jsx": { + "version": "7.18.6", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.18.6.tgz", + "integrity": "sha512-6mmljtAedFGTWu2p/8WIORGwy+61PLgOMPOdazc7YoJ9ZCWUyFy3A6CpPkRKLKD1ToAesxX8KGEViAiLo9N+7Q==", + "dev": true, + "requires": { + "@babel/helper-plugin-utils": "^7.18.6" + } + }, + "@babel/plugin-syntax-logical-assignment-operators": { + "version": "7.10.4", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/@babel/plugin-syntax-logical-assignment-operators/-/plugin-syntax-logical-assignment-operators-7.10.4.tgz", + "integrity": "sha512-d8waShlpFDinQ5MtvGU9xDAOzKH47+FFoney2baFIoMr952hKOLp1HR7VszoZvOsV/4+RRszNY7D17ba0te0ig==", + "dev": true, + "requires": { + "@babel/helper-plugin-utils": "^7.10.4" + } + }, + "@babel/plugin-syntax-nullish-coalescing-operator": { + "version": "7.8.3", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/@babel/plugin-syntax-nullish-coalescing-operator/-/plugin-syntax-nullish-coalescing-operator-7.8.3.tgz", + "integrity": "sha512-aSff4zPII1u2QD7y+F8oDsz19ew4IGEJg9SVW+bqwpwtfFleiQDMdzA/R+UlWDzfnHFCxxleFT0PMIrR36XLNQ==", + "dev": true, + "requires": { + "@babel/helper-plugin-utils": "^7.8.0" + } + }, + "@babel/plugin-syntax-numeric-separator": { + "version": "7.10.4", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/@babel/plugin-syntax-numeric-separator/-/plugin-syntax-numeric-separator-7.10.4.tgz", + "integrity": "sha512-9H6YdfkcK/uOnY/K7/aA2xpzaAgkQn37yzWUMRK7OaPOqOpGS1+n0H5hxT9AUw9EsSjPW8SVyMJwYRtWs3X3ug==", + "dev": true, + "requires": { + "@babel/helper-plugin-utils": "^7.10.4" + } + }, + "@babel/plugin-syntax-object-rest-spread": { + "version": "7.8.3", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/@babel/plugin-syntax-object-rest-spread/-/plugin-syntax-object-rest-spread-7.8.3.tgz", + "integrity": "sha512-XoqMijGZb9y3y2XskN+P1wUGiVwWZ5JmoDRwx5+3GmEplNyVM2s2Dg8ILFQm8rWM48orGy5YpI5Bl8U1y7ydlA==", + "dev": true, + "requires": { + "@babel/helper-plugin-utils": "^7.8.0" + } + }, + "@babel/plugin-syntax-optional-catch-binding": { + "version": "7.8.3", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/@babel/plugin-syntax-optional-catch-binding/-/plugin-syntax-optional-catch-binding-7.8.3.tgz", + "integrity": "sha512-6VPD0Pc1lpTqw0aKoeRTMiB+kWhAoT24PA+ksWSBrFtl5SIRVpZlwN3NNPQjehA2E/91FV3RjLWoVTglWcSV3Q==", + "dev": true, + "requires": { + "@babel/helper-plugin-utils": "^7.8.0" + } + }, + "@babel/plugin-syntax-optional-chaining": { + "version": "7.8.3", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/@babel/plugin-syntax-optional-chaining/-/plugin-syntax-optional-chaining-7.8.3.tgz", + "integrity": "sha512-KoK9ErH1MBlCPxV0VANkXW2/dw4vlbGDrFgz8bmUsBGYkFRcbRwMh6cIJubdPrkxRwuGdtCk0v/wPTKbQgBjkg==", + "dev": true, + "requires": { + "@babel/helper-plugin-utils": "^7.8.0" + } + }, + "@babel/plugin-syntax-top-level-await": { + "version": "7.14.5", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.14.5.tgz", + "integrity": "sha512-hx++upLv5U1rgYfwe1xBQUhRmU41NEvpUvrp8jkrSCdvGSnM5/qdRMtylJ6PG5OFkBaHkbTAKTnd3/YyESRHFw==", + "dev": true, + "requires": { + "@babel/helper-plugin-utils": "^7.14.5" + } + }, + "@babel/plugin-syntax-typescript": { + "version": "7.20.0", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.20.0.tgz", + "integrity": "sha512-rd9TkG+u1CExzS4SM1BlMEhMXwFLKVjOAFFCDx9PbX5ycJWDoWMcwdJH9RhkPu1dOgn5TrxLot/Gx6lWFuAUNQ==", + "dev": true, + "requires": { + "@babel/helper-plugin-utils": "^7.19.0" + } + }, + "@babel/template": { + "version": "7.20.7", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/@babel/template/-/template-7.20.7.tgz", + "integrity": "sha512-8SegXApWe6VoNw0r9JHpSteLKTpTiLZ4rMlGIm9JQ18KiCtyQiAMEazujAHrUS5flrcqYZa75ukev3P6QmUwUw==", + "dev": true, + "requires": { + "@babel/code-frame": "^7.18.6", + "@babel/parser": "^7.20.7", + "@babel/types": "^7.20.7" + } + }, + "@babel/traverse": { + "version": "7.21.3", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/@babel/traverse/-/traverse-7.21.3.tgz", + "integrity": "sha512-XLyopNeaTancVitYZe2MlUEvgKb6YVVPXzofHgqHijCImG33b/uTurMS488ht/Hbsb2XK3U2BnSTxKVNGV3nGQ==", + "dev": true, + "requires": { + "@babel/code-frame": "^7.18.6", + "@babel/generator": "^7.21.3", + "@babel/helper-environment-visitor": "^7.18.9", + "@babel/helper-function-name": "^7.21.0", + "@babel/helper-hoist-variables": "^7.18.6", + "@babel/helper-split-export-declaration": "^7.18.6", + "@babel/parser": "^7.21.3", + "@babel/types": "^7.21.3", + "debug": "^4.1.0", + "globals": "^11.1.0" + } + }, + "@babel/types": { + "version": "7.21.3", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/@babel/types/-/types-7.21.3.tgz", + "integrity": "sha512-sBGdETxC+/M4o/zKC0sl6sjWv62WFR/uzxrJ6uYyMLZOUlPnwzw0tKgVHOXxaAd5l2g8pEDM5RZ495GPQI77kg==", + "dev": true, + "requires": { + "@babel/helper-string-parser": "^7.19.4", + "@babel/helper-validator-identifier": "^7.19.1", + "to-fast-properties": "^2.0.0" + } + }, + "@bcoe/v8-coverage": { + "version": "0.2.3", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz", + "integrity": "sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==", + "dev": true + }, + "@istanbuljs/load-nyc-config": { + "version": "1.1.0", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/@istanbuljs/load-nyc-config/-/load-nyc-config-1.1.0.tgz", + "integrity": "sha512-VjeHSlIzpv/NyD3N0YuHfXOPDIixcA1q2ZV98wsMqcYlPmv2n3Yb2lYP9XMElnaFVXg5A7YLTeLu6V84uQDjmQ==", + "dev": true, + "requires": { + "camelcase": "^5.3.1", + "find-up": "^4.1.0", + "get-package-type": "^0.1.0", + "js-yaml": "^3.13.1", + "resolve-from": "^5.0.0" + } + }, + "@istanbuljs/schema": { + "version": "0.1.3", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/@istanbuljs/schema/-/schema-0.1.3.tgz", + "integrity": "sha512-ZXRY4jNvVgSVQ8DL3LTcakaAtXwTVUxE81hslsyD2AtoXW/wVob10HkOJ1X/pAlcI7D+2YoZKg5do8G/w6RYgA==", + "dev": true + }, + "@jest/console": { + "version": "29.5.0", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/@jest/console/-/console-29.5.0.tgz", + "integrity": "sha512-NEpkObxPwyw/XxZVLPmAGKE89IQRp4puc6IQRPru6JKd1M3fW9v1xM1AnzIJE65hbCkzQAdnL8P47e9hzhiYLQ==", + "dev": true, + "requires": { + "@jest/types": "^29.5.0", + "@types/node": "*", + "chalk": "^4.0.0", + "jest-message-util": "^29.5.0", + "jest-util": "^29.5.0", + "slash": "^3.0.0" + } + }, + "@jest/core": { + "version": "29.5.0", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/@jest/core/-/core-29.5.0.tgz", + "integrity": "sha512-28UzQc7ulUrOQw1IsN/kv1QES3q2kkbl/wGslyhAclqZ/8cMdB5M68BffkIdSJgKBUt50d3hbwJ92XESlE7LiQ==", + "dev": true, + "requires": { + "@jest/console": "^29.5.0", + "@jest/reporters": "^29.5.0", + "@jest/test-result": "^29.5.0", + "@jest/transform": "^29.5.0", + "@jest/types": "^29.5.0", + "@types/node": "*", + "ansi-escapes": "^4.2.1", + "chalk": "^4.0.0", + "ci-info": "^3.2.0", + "exit": "^0.1.2", + "graceful-fs": "^4.2.9", + "jest-changed-files": "^29.5.0", + "jest-config": "^29.5.0", + "jest-haste-map": "^29.5.0", + "jest-message-util": "^29.5.0", + "jest-regex-util": "^29.4.3", + "jest-resolve": "^29.5.0", + "jest-resolve-dependencies": "^29.5.0", + "jest-runner": "^29.5.0", + "jest-runtime": "^29.5.0", + "jest-snapshot": "^29.5.0", + "jest-util": "^29.5.0", + "jest-validate": "^29.5.0", + "jest-watcher": "^29.5.0", + "micromatch": "^4.0.4", + "pretty-format": "^29.5.0", + "slash": "^3.0.0", + "strip-ansi": "^6.0.0" + } + }, + "@jest/environment": { + "version": "29.5.0", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/@jest/environment/-/environment-29.5.0.tgz", + "integrity": "sha512-5FXw2+wD29YU1d4I2htpRX7jYnAyTRjP2CsXQdo9SAM8g3ifxWPSV0HnClSn71xwctr0U3oZIIH+dtbfmnbXVQ==", + "dev": true, + "requires": { + "@jest/fake-timers": "^29.5.0", + "@jest/types": "^29.5.0", + "@types/node": "*", + "jest-mock": "^29.5.0" + } + }, + "@jest/expect": { + "version": "29.5.0", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/@jest/expect/-/expect-29.5.0.tgz", + "integrity": "sha512-PueDR2HGihN3ciUNGr4uelropW7rqUfTiOn+8u0leg/42UhblPxHkfoh0Ruu3I9Y1962P3u2DY4+h7GVTSVU6g==", + "dev": true, + "requires": { + "expect": "^29.5.0", + "jest-snapshot": "^29.5.0" + } + }, + "@jest/expect-utils": { + "version": "29.5.0", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/@jest/expect-utils/-/expect-utils-29.5.0.tgz", + "integrity": "sha512-fmKzsidoXQT2KwnrwE0SQq3uj8Z763vzR8LnLBwC2qYWEFpjX8daRsk6rHUM1QvNlEW/UJXNXm59ztmJJWs2Mg==", + "dev": true, + "requires": { + "jest-get-type": "^29.4.3" + } + }, + "@jest/fake-timers": { + "version": "29.5.0", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/@jest/fake-timers/-/fake-timers-29.5.0.tgz", + "integrity": "sha512-9ARvuAAQcBwDAqOnglWq2zwNIRUDtk/SCkp/ToGEhFv5r86K21l+VEs0qNTaXtyiY0lEePl3kylijSYJQqdbDg==", + "dev": true, + "requires": { + "@jest/types": "^29.5.0", + "@sinonjs/fake-timers": "^10.0.2", + "@types/node": "*", + "jest-message-util": "^29.5.0", + "jest-mock": "^29.5.0", + "jest-util": "^29.5.0" + } + }, + "@jest/globals": { + "version": "29.5.0", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/@jest/globals/-/globals-29.5.0.tgz", + "integrity": "sha512-S02y0qMWGihdzNbUiqSAiKSpSozSuHX5UYc7QbnHP+D9Lyw8DgGGCinrN9uSuHPeKgSSzvPom2q1nAtBvUsvPQ==", + "dev": true, + "requires": { + "@jest/environment": "^29.5.0", + "@jest/expect": "^29.5.0", + "@jest/types": "^29.5.0", + "jest-mock": "^29.5.0" + } + }, + "@jest/reporters": { + "version": "29.5.0", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/@jest/reporters/-/reporters-29.5.0.tgz", + "integrity": "sha512-D05STXqj/M8bP9hQNSICtPqz97u7ffGzZu+9XLucXhkOFBqKcXe04JLZOgIekOxdb73MAoBUFnqvf7MCpKk5OA==", + "dev": true, + "requires": { + "@bcoe/v8-coverage": "^0.2.3", + "@jest/console": "^29.5.0", + "@jest/test-result": "^29.5.0", + "@jest/transform": "^29.5.0", + "@jest/types": "^29.5.0", + "@jridgewell/trace-mapping": "^0.3.15", + "@types/node": "*", + "chalk": "^4.0.0", + "collect-v8-coverage": "^1.0.0", + "exit": "^0.1.2", + "glob": "^7.1.3", + "graceful-fs": "^4.2.9", + "istanbul-lib-coverage": "^3.0.0", + "istanbul-lib-instrument": "^5.1.0", + "istanbul-lib-report": "^3.0.0", + "istanbul-lib-source-maps": "^4.0.0", + "istanbul-reports": "^3.1.3", + "jest-message-util": "^29.5.0", + "jest-util": "^29.5.0", + "jest-worker": "^29.5.0", + "slash": "^3.0.0", + "string-length": "^4.0.1", + "strip-ansi": "^6.0.0", + "v8-to-istanbul": "^9.0.1" + } + }, + "@jest/schemas": { + "version": "29.4.3", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/@jest/schemas/-/schemas-29.4.3.tgz", + "integrity": "sha512-VLYKXQmtmuEz6IxJsrZwzG9NvtkQsWNnWMsKxqWNu3+CnfzJQhp0WDDKWLVV9hLKr0l3SLLFRqcYHjhtyuDVxg==", + "dev": true, + "requires": { + "@sinclair/typebox": "^0.25.16" + } + }, + "@jest/source-map": { + "version": "29.4.3", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/@jest/source-map/-/source-map-29.4.3.tgz", + "integrity": "sha512-qyt/mb6rLyd9j1jUts4EQncvS6Yy3PM9HghnNv86QBlV+zdL2inCdK1tuVlL+J+lpiw2BI67qXOrX3UurBqQ1w==", + "dev": true, + "requires": { + "@jridgewell/trace-mapping": "^0.3.15", + "callsites": "^3.0.0", + "graceful-fs": "^4.2.9" + } + }, + "@jest/test-result": { + "version": "29.5.0", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/@jest/test-result/-/test-result-29.5.0.tgz", + "integrity": "sha512-fGl4rfitnbfLsrfx1uUpDEESS7zM8JdgZgOCQuxQvL1Sn/I6ijeAVQWGfXI9zb1i9Mzo495cIpVZhA0yr60PkQ==", + "dev": true, + "requires": { + "@jest/console": "^29.5.0", + "@jest/types": "^29.5.0", + "@types/istanbul-lib-coverage": "^2.0.0", + "collect-v8-coverage": "^1.0.0" + } + }, + "@jest/test-sequencer": { + "version": "29.5.0", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/@jest/test-sequencer/-/test-sequencer-29.5.0.tgz", + "integrity": "sha512-yPafQEcKjkSfDXyvtgiV4pevSeyuA6MQr6ZIdVkWJly9vkqjnFfcfhRQqpD5whjoU8EORki752xQmjaqoFjzMQ==", + "dev": true, + "requires": { + "@jest/test-result": "^29.5.0", + "graceful-fs": "^4.2.9", + "jest-haste-map": "^29.5.0", + "slash": "^3.0.0" + } + }, + "@jest/transform": { + "version": "29.5.0", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/@jest/transform/-/transform-29.5.0.tgz", + "integrity": "sha512-8vbeZWqLJOvHaDfeMuoHITGKSz5qWc9u04lnWrQE3VyuSw604PzQM824ZeX9XSjUCeDiE3GuxZe5UKa8J61NQw==", + "dev": true, + "requires": { + "@babel/core": "^7.11.6", + "@jest/types": "^29.5.0", + "@jridgewell/trace-mapping": "^0.3.15", + "babel-plugin-istanbul": "^6.1.1", + "chalk": "^4.0.0", + "convert-source-map": "^2.0.0", + "fast-json-stable-stringify": "^2.1.0", + "graceful-fs": "^4.2.9", + "jest-haste-map": "^29.5.0", + "jest-regex-util": "^29.4.3", + "jest-util": "^29.5.0", + "micromatch": "^4.0.4", + "pirates": "^4.0.4", + "slash": "^3.0.0", + "write-file-atomic": "^4.0.2" + } + }, + "@jest/types": { + "version": "29.5.0", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/@jest/types/-/types-29.5.0.tgz", + "integrity": "sha512-qbu7kN6czmVRc3xWFQcAN03RAUamgppVUdXrvl1Wr3jlNF93o9mJbGcDWrwGB6ht44u7efB1qCFgVQmca24Uog==", + "dev": true, + "requires": { + "@jest/schemas": "^29.4.3", + "@types/istanbul-lib-coverage": "^2.0.0", + "@types/istanbul-reports": "^3.0.0", + "@types/node": "*", + "@types/yargs": "^17.0.8", + "chalk": "^4.0.0" + } + }, + "@jridgewell/gen-mapping": { + "version": "0.1.1", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/@jridgewell/gen-mapping/-/gen-mapping-0.1.1.tgz", + "integrity": "sha512-sQXCasFk+U8lWYEe66WxRDOE9PjVz4vSM51fTu3Hw+ClTpUSQb718772vH3pyS5pShp6lvQM7SxgIDXXXmOX7w==", + "dev": true, + "requires": { + "@jridgewell/set-array": "^1.0.0", + "@jridgewell/sourcemap-codec": "^1.4.10" + } + }, + "@jridgewell/resolve-uri": { + "version": "3.1.0", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/@jridgewell/resolve-uri/-/resolve-uri-3.1.0.tgz", + "integrity": "sha512-F2msla3tad+Mfht5cJq7LSXcdudKTWCVYUgw6pLFOOHSTtZlj6SWNYAp+AhuqLmWdBO2X5hPrLcu8cVP8fy28w==", + "dev": true + }, + "@jridgewell/set-array": { + "version": "1.1.2", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/@jridgewell/set-array/-/set-array-1.1.2.tgz", + "integrity": "sha512-xnkseuNADM0gt2bs+BvhO0p78Mk762YnZdsuzFV018NoG1Sj1SCQvpSqa7XUaTam5vAGasABV9qXASMKnFMwMw==", + "dev": true + }, + "@jridgewell/sourcemap-codec": { + "version": "1.4.14", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.14.tgz", + "integrity": "sha512-XPSJHWmi394fuUuzDnGz1wiKqWfo1yXecHQMRf2l6hztTO+nPru658AyDngaBe7isIxEkRsPR3FZh+s7iVa4Uw==", + "dev": true + }, + "@jridgewell/trace-mapping": { + "version": "0.3.17", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/@jridgewell/trace-mapping/-/trace-mapping-0.3.17.tgz", + "integrity": "sha512-MCNzAp77qzKca9+W/+I0+sEpaUnZoeasnghNeVc41VZCEKaCH73Vq3BZZ/SzWIgrqE4H4ceI+p+b6C0mHf9T4g==", + "dev": true, + "requires": { + "@jridgewell/resolve-uri": "3.1.0", + "@jridgewell/sourcemap-codec": "1.4.14" + } + }, + "@sinclair/typebox": { + "version": "0.25.24", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/@sinclair/typebox/-/typebox-0.25.24.tgz", + "integrity": "sha512-XJfwUVUKDHF5ugKwIcxEgc9k8b7HbznCp6eUfWgu710hMPNIO4aw4/zB5RogDQz8nd6gyCDpU9O/m6qYEWY6yQ==", + "dev": true + }, + "@sinonjs/commons": { + "version": "2.0.0", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/@sinonjs/commons/-/commons-2.0.0.tgz", + "integrity": "sha512-uLa0j859mMrg2slwQYdO/AkrOfmH+X6LTVmNTS9CqexuE2IvVORIkSpJLqePAbEnKJ77aMmCwr1NUZ57120Xcg==", + "dev": true, + "requires": { + "type-detect": "4.0.8" + } + }, + "@sinonjs/fake-timers": { + "version": "10.0.2", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/@sinonjs/fake-timers/-/fake-timers-10.0.2.tgz", + "integrity": "sha512-SwUDyjWnah1AaNl7kxsa7cfLhlTYoiyhDAIgyh+El30YvXs/o7OLXpYH88Zdhyx9JExKrmHDJ+10bwIcY80Jmw==", + "dev": true, + "requires": { + "@sinonjs/commons": "^2.0.0" + } + }, + "@types/babel__core": { + "version": "7.20.0", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/@types/babel__core/-/babel__core-7.20.0.tgz", + "integrity": "sha512-+n8dL/9GWblDO0iU6eZAwEIJVr5DWigtle+Q6HLOrh/pdbXOhOtqzq8VPPE2zvNJzSKY4vH/z3iT3tn0A3ypiQ==", + "dev": true, + "requires": { + "@babel/parser": "^7.20.7", + "@babel/types": "^7.20.7", + "@types/babel__generator": "*", + "@types/babel__template": "*", + "@types/babel__traverse": "*" + } + }, + "@types/babel__generator": { + "version": "7.6.4", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/@types/babel__generator/-/babel__generator-7.6.4.tgz", + "integrity": "sha512-tFkciB9j2K755yrTALxD44McOrk+gfpIpvC3sxHjRawj6PfnQxrse4Clq5y/Rq+G3mrBurMax/lG8Qn2t9mSsg==", + "dev": true, + "requires": { + "@babel/types": "^7.0.0" + } + }, + "@types/babel__template": { + "version": "7.4.1", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/@types/babel__template/-/babel__template-7.4.1.tgz", + "integrity": "sha512-azBFKemX6kMg5Io+/rdGT0dkGreboUVR0Cdm3fz9QJWpaQGJRQXl7C+6hOTCZcMll7KFyEQpgbYI2lHdsS4U7g==", + "dev": true, + "requires": { + "@babel/parser": "^7.1.0", + "@babel/types": "^7.0.0" + } + }, + "@types/babel__traverse": { + "version": "7.18.3", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/@types/babel__traverse/-/babel__traverse-7.18.3.tgz", + "integrity": "sha512-1kbcJ40lLB7MHsj39U4Sh1uTd2E7rLEa79kmDpI6cy+XiXsteB3POdQomoq4FxszMrO3ZYchkhYJw7A2862b3w==", + "dev": true, + "requires": { + "@babel/types": "^7.3.0" + } + }, + "@types/graceful-fs": { + "version": "4.1.6", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/@types/graceful-fs/-/graceful-fs-4.1.6.tgz", + "integrity": "sha512-Sig0SNORX9fdW+bQuTEovKj3uHcUL6LQKbCrrqb1X7J6/ReAbhCXRAhc+SMejhLELFj2QcyuxmUooZ4bt5ReSw==", + "dev": true, + "requires": { + "@types/node": "*" + } + }, + "@types/istanbul-lib-coverage": { + "version": "2.0.4", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.4.tgz", + "integrity": "sha512-z/QT1XN4K4KYuslS23k62yDIDLwLFkzxOuMplDtObz0+y7VqJCaO2o+SPwHCvLFZh7xazvvoor2tA/hPz9ee7g==", + "dev": true + }, + "@types/istanbul-lib-report": { + "version": "3.0.0", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/@types/istanbul-lib-report/-/istanbul-lib-report-3.0.0.tgz", + "integrity": "sha512-plGgXAPfVKFoYfa9NpYDAkseG+g6Jr294RqeqcqDixSbU34MZVJRi/P+7Y8GDpzkEwLaGZZOpKIEmeVZNtKsrg==", + "dev": true, + "requires": { + "@types/istanbul-lib-coverage": "*" + } + }, + "@types/istanbul-reports": { + "version": "3.0.1", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/@types/istanbul-reports/-/istanbul-reports-3.0.1.tgz", + "integrity": "sha512-c3mAZEuK0lvBp8tmuL74XRKn1+y2dcwOUpH7x4WrF6gk1GIgiluDRgMYQtw2OFcBvAJWlt6ASU3tSqxp0Uu0Aw==", + "dev": true, + "requires": { + "@types/istanbul-lib-report": "*" + } + }, + "@types/jest": { + "version": "29.5.0", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/@types/jest/-/jest-29.5.0.tgz", + "integrity": "sha512-3Emr5VOl/aoBwnWcH/EFQvlSAmjV+XtV9GGu5mwdYew5vhQh0IUZx/60x0TzHDu09Bi7HMx10t/namdJw5QIcg==", + "dev": true, + "requires": { + "expect": "^29.0.0", + "pretty-format": "^29.0.0" + } + }, + "@types/node": { + "version": "18.15.10", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/@types/node/-/node-18.15.10.tgz", + "integrity": "sha512-9avDaQJczATcXgfmMAW3MIWArOO7A+m90vuCFLr8AotWf8igO/mRoYukrk2cqZVtv38tHs33retzHEilM7FpeQ==", + "dev": true + }, + "@types/prettier": { + "version": "2.7.2", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/@types/prettier/-/prettier-2.7.2.tgz", + "integrity": "sha512-KufADq8uQqo1pYKVIYzfKbJfBAc0sOeXqGbFaSpv8MRmC/zXgowNZmFcbngndGk922QDmOASEXUZCaY48gs4cg==", + "dev": true + }, + "@types/stack-utils": { + "version": "2.0.1", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/@types/stack-utils/-/stack-utils-2.0.1.tgz", + "integrity": "sha512-Hl219/BT5fLAaz6NDkSuhzasy49dwQS/DSdu4MdggFB8zcXv7vflBI3xp7FEmkmdDkBUI2bPUNeMttp2knYdxw==", + "dev": true + }, + "@types/yargs": { + "version": "17.0.24", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/@types/yargs/-/yargs-17.0.24.tgz", + "integrity": "sha512-6i0aC7jV6QzQB8ne1joVZ0eSFIstHsCrobmOtghM11yGlH0j43FKL2UhWdELkyps0zuf7qVTUVCCR+tgSlyLLw==", + "dev": true, + "requires": { + "@types/yargs-parser": "*" + } + }, + "@types/yargs-parser": { + "version": "21.0.0", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/@types/yargs-parser/-/yargs-parser-21.0.0.tgz", + "integrity": "sha512-iO9ZQHkZxHn4mSakYV0vFHAVDyEOIJQrV2uZ06HxEPcx+mt8swXoZHIbaaJ2crJYFfErySgktuTZ3BeLz+XmFA==", + "dev": true + }, + "ansi-escapes": { + "version": "4.3.2", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/ansi-escapes/-/ansi-escapes-4.3.2.tgz", + "integrity": "sha512-gKXj5ALrKWQLsYG9jlTRmR/xKluxHV+Z9QEwNIgCfM1/uwPMCuzVVnh5mwTd+OuBZcwSIMbqssNWRm1lE51QaQ==", + "dev": true, + "requires": { + "type-fest": "^0.21.3" + } + }, + "ansi-regex": { + "version": "5.0.1", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/ansi-regex/-/ansi-regex-5.0.1.tgz", + "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==", + "dev": true + }, + "ansi-styles": { + "version": "4.3.0", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/ansi-styles/-/ansi-styles-4.3.0.tgz", + "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", + "dev": true, + "requires": { + "color-convert": "^2.0.1" + } + }, + "anymatch": { + "version": "3.1.3", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/anymatch/-/anymatch-3.1.3.tgz", + "integrity": "sha512-KMReFUr0B4t+D+OBkjR3KYqvocp2XaSzO55UcB6mgQMd3KbcE+mWTyvVV7D/zsdEbNnV6acZUutkiHQXvTr1Rw==", + "dev": true, + "requires": { + "normalize-path": "^3.0.0", + "picomatch": "^2.0.4" + } + }, + "argparse": { + "version": "1.0.10", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/argparse/-/argparse-1.0.10.tgz", + "integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==", + "dev": true, + "requires": { + "sprintf-js": "~1.0.2" + } + }, + "babel-jest": { + "version": "29.5.0", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/babel-jest/-/babel-jest-29.5.0.tgz", + "integrity": "sha512-mA4eCDh5mSo2EcA9xQjVTpmbbNk32Zb3Q3QFQsNhaK56Q+yoXowzFodLux30HRgyOho5rsQ6B0P9QpMkvvnJ0Q==", + "dev": true, + "requires": { + "@jest/transform": "^29.5.0", + "@types/babel__core": "^7.1.14", + "babel-plugin-istanbul": "^6.1.1", + "babel-preset-jest": "^29.5.0", + "chalk": "^4.0.0", + "graceful-fs": "^4.2.9", + "slash": "^3.0.0" + } + }, + "babel-plugin-istanbul": { + "version": "6.1.1", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/babel-plugin-istanbul/-/babel-plugin-istanbul-6.1.1.tgz", + "integrity": "sha512-Y1IQok9821cC9onCx5otgFfRm7Lm+I+wwxOx738M/WLPZ9Q42m4IG5W0FNX8WLL2gYMZo3JkuXIH2DOpWM+qwA==", + "dev": true, + "requires": { + "@babel/helper-plugin-utils": "^7.0.0", + "@istanbuljs/load-nyc-config": "^1.0.0", + "@istanbuljs/schema": "^0.1.2", + "istanbul-lib-instrument": "^5.0.4", + "test-exclude": "^6.0.0" + } + }, + "babel-plugin-jest-hoist": { + "version": "29.5.0", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-29.5.0.tgz", + "integrity": "sha512-zSuuuAlTMT4mzLj2nPnUm6fsE6270vdOfnpbJ+RmruU75UhLFvL0N2NgI7xpeS7NaB6hGqmd5pVpGTDYvi4Q3w==", + "dev": true, + "requires": { + "@babel/template": "^7.3.3", + "@babel/types": "^7.3.3", + "@types/babel__core": "^7.1.14", + "@types/babel__traverse": "^7.0.6" + } + }, + "babel-preset-current-node-syntax": { + "version": "1.0.1", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/babel-preset-current-node-syntax/-/babel-preset-current-node-syntax-1.0.1.tgz", + "integrity": "sha512-M7LQ0bxarkxQoN+vz5aJPsLBn77n8QgTFmo8WK0/44auK2xlCXrYcUxHFxgU7qW5Yzw/CjmLRK2uJzaCd7LvqQ==", + "dev": true, + "requires": { + "@babel/plugin-syntax-async-generators": "^7.8.4", + "@babel/plugin-syntax-bigint": "^7.8.3", + "@babel/plugin-syntax-class-properties": "^7.8.3", + "@babel/plugin-syntax-import-meta": "^7.8.3", + "@babel/plugin-syntax-json-strings": "^7.8.3", + "@babel/plugin-syntax-logical-assignment-operators": "^7.8.3", + "@babel/plugin-syntax-nullish-coalescing-operator": "^7.8.3", + "@babel/plugin-syntax-numeric-separator": "^7.8.3", + "@babel/plugin-syntax-object-rest-spread": "^7.8.3", + "@babel/plugin-syntax-optional-catch-binding": "^7.8.3", + "@babel/plugin-syntax-optional-chaining": "^7.8.3", + "@babel/plugin-syntax-top-level-await": "^7.8.3" + } + }, + "babel-preset-jest": { + "version": "29.5.0", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/babel-preset-jest/-/babel-preset-jest-29.5.0.tgz", + "integrity": "sha512-JOMloxOqdiBSxMAzjRaH023/vvcaSaec49zvg+2LmNsktC7ei39LTJGw02J+9uUtTZUq6xbLyJ4dxe9sSmIuAg==", + "dev": true, + "requires": { + "babel-plugin-jest-hoist": "^29.5.0", + "babel-preset-current-node-syntax": "^1.0.0" + } + }, + "balanced-match": { + "version": "1.0.2", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/balanced-match/-/balanced-match-1.0.2.tgz", + "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==", + "dev": true + }, + "brace-expansion": { + "version": "1.1.11", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/brace-expansion/-/brace-expansion-1.1.11.tgz", + "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", + "dev": true, + "requires": { + "balanced-match": "^1.0.0", + "concat-map": "0.0.1" + } + }, + "braces": { + "version": "3.0.2", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/braces/-/braces-3.0.2.tgz", + "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==", + "dev": true, + "requires": { + "fill-range": "^7.0.1" + } + }, + "browserslist": { + "version": "4.21.5", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/browserslist/-/browserslist-4.21.5.tgz", + "integrity": "sha512-tUkiguQGW7S3IhB7N+c2MV/HZPSCPAAiYBZXLsBhFB/PCy6ZKKsZrmBayHV9fdGV/ARIfJ14NkxKzRDjvp7L6w==", + "dev": true, + "requires": { + "caniuse-lite": "^1.0.30001449", + "electron-to-chromium": "^1.4.284", + "node-releases": "^2.0.8", + "update-browserslist-db": "^1.0.10" + } + }, + "bs-logger": { + "version": "0.2.6", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/bs-logger/-/bs-logger-0.2.6.tgz", + "integrity": "sha512-pd8DCoxmbgc7hyPKOvxtqNcjYoOsABPQdcCUjGp3d42VR2CX1ORhk2A87oqqu5R1kk+76nsxZupkmyd+MVtCog==", + "dev": true, + "requires": { + "fast-json-stable-stringify": "2.x" + } + }, + "bser": { + "version": "2.1.1", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/bser/-/bser-2.1.1.tgz", + "integrity": "sha512-gQxTNE/GAfIIrmHLUE3oJyp5FO6HRBfhjnw4/wMmA63ZGDJnWBmgY/lyQBpnDUkGmAhbSe39tx2d/iTOAfglwQ==", + "dev": true, + "requires": { + "node-int64": "^0.4.0" + } + }, + "buffer-from": { + "version": "1.1.2", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/buffer-from/-/buffer-from-1.1.2.tgz", + "integrity": "sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==", + "dev": true + }, + "callsites": { + "version": "3.1.0", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/callsites/-/callsites-3.1.0.tgz", + "integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==", + "dev": true + }, + "camelcase": { + "version": "5.3.1", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/camelcase/-/camelcase-5.3.1.tgz", + "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==", + "dev": true + }, + "caniuse-lite": { + "version": "1.0.30001472", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/caniuse-lite/-/caniuse-lite-1.0.30001472.tgz", + "integrity": "sha512-xWC/0+hHHQgj3/vrKYY0AAzeIUgr7L9wlELIcAvZdDUHlhL/kNxMdnQLOSOQfP8R51ZzPhmHdyMkI0MMpmxCfg==", + "dev": true + }, + "chalk": { + "version": "4.1.2", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/chalk/-/chalk-4.1.2.tgz", + "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", + "dev": true, + "requires": { + "ansi-styles": "^4.1.0", + "supports-color": "^7.1.0" + } + }, + "char-regex": { + "version": "1.0.2", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/char-regex/-/char-regex-1.0.2.tgz", + "integrity": "sha512-kWWXztvZ5SBQV+eRgKFeh8q5sLuZY2+8WUIzlxWVTg+oGwY14qylx1KbKzHd8P6ZYkAg0xyIDU9JMHhyJMZ1jw==", + "dev": true + }, + "ci-info": { + "version": "3.8.0", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/ci-info/-/ci-info-3.8.0.tgz", + "integrity": "sha512-eXTggHWSooYhq49F2opQhuHWgzucfF2YgODK4e1566GQs5BIfP30B0oenwBJHfWxAs2fyPB1s7Mg949zLf61Yw==", + "dev": true + }, + "cjs-module-lexer": { + "version": "1.2.2", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/cjs-module-lexer/-/cjs-module-lexer-1.2.2.tgz", + "integrity": "sha512-cOU9usZw8/dXIXKtwa8pM0OTJQuJkxMN6w30csNRUerHfeQ5R6U3kkU/FtJeIf3M202OHfY2U8ccInBG7/xogA==", + "dev": true + }, + "cliui": { + "version": "8.0.1", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/cliui/-/cliui-8.0.1.tgz", + "integrity": "sha512-BSeNnyus75C4//NQ9gQt1/csTXyo/8Sb+afLAkzAptFuMsod9HFokGNudZpi/oQV73hnVK+sR+5PVRMd+Dr7YQ==", + "dev": true, + "requires": { + "string-width": "^4.2.0", + "strip-ansi": "^6.0.1", + "wrap-ansi": "^7.0.0" + } + }, + "co": { + "version": "4.6.0", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/co/-/co-4.6.0.tgz", + "integrity": "sha512-QVb0dM5HvG+uaxitm8wONl7jltx8dqhfU33DcqtOZcLSVIKSDDLDi7+0LbAKiyI8hD9u42m2YxXSkMGWThaecQ==", + "dev": true + }, + "collect-v8-coverage": { + "version": "1.0.1", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/collect-v8-coverage/-/collect-v8-coverage-1.0.1.tgz", + "integrity": "sha512-iBPtljfCNcTKNAto0KEtDfZ3qzjJvqE3aTGZsbhjSBlorqpXJlaWWtPO35D+ZImoC3KWejX64o+yPGxhWSTzfg==", + "dev": true + }, + "color-convert": { + "version": "2.0.1", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/color-convert/-/color-convert-2.0.1.tgz", + "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", + "dev": true, + "requires": { + "color-name": "~1.1.4" + } + }, + "color-name": { + "version": "1.1.4", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/color-name/-/color-name-1.1.4.tgz", + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", + "dev": true + }, + "concat-map": { + "version": "0.0.1", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/concat-map/-/concat-map-0.0.1.tgz", + "integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==", + "dev": true + }, + "convert-source-map": { + "version": "2.0.0", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/convert-source-map/-/convert-source-map-2.0.0.tgz", + "integrity": "sha512-Kvp459HrV2FEJ1CAsi1Ku+MY3kasH19TFykTz2xWmMeq6bk2NU3XXvfJ+Q61m0xktWwt+1HSYf3JZsTms3aRJg==", + "dev": true + }, + "cross-spawn": { + "version": "7.0.3", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/cross-spawn/-/cross-spawn-7.0.3.tgz", + "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==", + "dev": true, + "requires": { + "path-key": "^3.1.0", + "shebang-command": "^2.0.0", + "which": "^2.0.1" + } + }, + "debug": { + "version": "4.3.4", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/debug/-/debug-4.3.4.tgz", + "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==", + "dev": true, + "requires": { + "ms": "2.1.2" + } + }, + "dedent": { + "version": "0.7.0", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/dedent/-/dedent-0.7.0.tgz", + "integrity": "sha512-Q6fKUPqnAHAyhiUgFU7BUzLiv0kd8saH9al7tnu5Q/okj6dnupxyTgFIBjVzJATdfIAm9NAsvXNzjaKa+bxVyA==", + "dev": true + }, + "deepmerge": { + "version": "4.3.1", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/deepmerge/-/deepmerge-4.3.1.tgz", + "integrity": "sha512-3sUqbMEc77XqpdNO7FRyRog+eW3ph+GYCbj+rK+uYyRMuwsVy0rMiVtPn+QJlKFvWP/1PYpapqYn0Me2knFn+A==", + "dev": true + }, + "detect-newline": { + "version": "3.1.0", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/detect-newline/-/detect-newline-3.1.0.tgz", + "integrity": "sha512-TLz+x/vEXm/Y7P7wn1EJFNLxYpUD4TgMosxY6fAVJUnJMbupHBOncxyWUG9OpTaH9EBD7uFI5LfEgmMOc54DsA==", + "dev": true + }, + "diff-sequences": { + "version": "29.4.3", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/diff-sequences/-/diff-sequences-29.4.3.tgz", + "integrity": "sha512-ofrBgwpPhCD85kMKtE9RYFFq6OC1A89oW2vvgWZNCwxrUpRUILopY7lsYyMDSjc8g6U6aiO0Qubg6r4Wgt5ZnA==", + "dev": true + }, + "electron-to-chromium": { + "version": "1.4.341", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/electron-to-chromium/-/electron-to-chromium-1.4.341.tgz", + "integrity": "sha512-R4A8VfUBQY9WmAhuqY5tjHRf5fH2AAf6vqitBOE0y6u2PgHgqHSrhZmu78dIX3fVZtjqlwJNX1i2zwC3VpHtQQ==", + "dev": true + }, + "emittery": { + "version": "0.13.1", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/emittery/-/emittery-0.13.1.tgz", + "integrity": "sha512-DeWwawk6r5yR9jFgnDKYt4sLS0LmHJJi3ZOnb5/JdbYwj3nW+FxQnHIjhBKz8YLC7oRNPVM9NQ47I3CVx34eqQ==", + "dev": true + }, + "emoji-regex": { + "version": "8.0.0", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/emoji-regex/-/emoji-regex-8.0.0.tgz", + "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==", + "dev": true + }, + "error-ex": { + "version": "1.3.2", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/error-ex/-/error-ex-1.3.2.tgz", + "integrity": "sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==", + "dev": true, + "requires": { + "is-arrayish": "^0.2.1" + } + }, + "escalade": { + "version": "3.1.1", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/escalade/-/escalade-3.1.1.tgz", + "integrity": "sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==", + "dev": true + }, + "escape-string-regexp": { + "version": "2.0.0", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/escape-string-regexp/-/escape-string-regexp-2.0.0.tgz", + "integrity": "sha512-UpzcLCXolUWcNu5HtVMHYdXJjArjsF9C0aNnquZYY4uW/Vu0miy5YoWvbV345HauVvcAUnpRuhMMcqTcGOY2+w==", + "dev": true + }, + "esprima": { + "version": "4.0.1", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/esprima/-/esprima-4.0.1.tgz", + "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==", + "dev": true + }, + "execa": { + "version": "5.1.1", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/execa/-/execa-5.1.1.tgz", + "integrity": "sha512-8uSpZZocAZRBAPIEINJj3Lo9HyGitllczc27Eh5YYojjMFMn8yHMDMaUHE2Jqfq05D/wucwI4JGURyXt1vchyg==", + "dev": true, + "requires": { + "cross-spawn": "^7.0.3", + "get-stream": "^6.0.0", + "human-signals": "^2.1.0", + "is-stream": "^2.0.0", + "merge-stream": "^2.0.0", + "npm-run-path": "^4.0.1", + "onetime": "^5.1.2", + "signal-exit": "^3.0.3", + "strip-final-newline": "^2.0.0" + } + }, + "exit": { + "version": "0.1.2", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/exit/-/exit-0.1.2.tgz", + "integrity": "sha512-Zk/eNKV2zbjpKzrsQ+n1G6poVbErQxJ0LBOJXaKZ1EViLzH+hrLu9cdXI4zw9dBQJslwBEpbQ2P1oS7nDxs6jQ==", + "dev": true + }, + "expect": { + "version": "29.5.0", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/expect/-/expect-29.5.0.tgz", + "integrity": "sha512-yM7xqUrCO2JdpFo4XpM82t+PJBFybdqoQuJLDGeDX2ij8NZzqRHyu3Hp188/JX7SWqud+7t4MUdvcgGBICMHZg==", + "dev": true, + "requires": { + "@jest/expect-utils": "^29.5.0", + "jest-get-type": "^29.4.3", + "jest-matcher-utils": "^29.5.0", + "jest-message-util": "^29.5.0", + "jest-util": "^29.5.0" + } + }, + "fast-json-stable-stringify": { + "version": "2.1.0", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz", + "integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==", + "dev": true + }, + "fb-watchman": { + "version": "2.0.2", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/fb-watchman/-/fb-watchman-2.0.2.tgz", + "integrity": "sha512-p5161BqbuCaSnB8jIbzQHOlpgsPmK5rJVDfDKO91Axs5NC1uu3HRQm6wt9cd9/+GtQQIO53JdGXXoyDpTAsgYA==", + "dev": true, + "requires": { + "bser": "2.1.1" + } + }, + "fill-range": { + "version": "7.0.1", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/fill-range/-/fill-range-7.0.1.tgz", + "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==", + "dev": true, + "requires": { + "to-regex-range": "^5.0.1" + } + }, + "find-up": { + "version": "4.1.0", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/find-up/-/find-up-4.1.0.tgz", + "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==", + "dev": true, + "requires": { + "locate-path": "^5.0.0", + "path-exists": "^4.0.0" + } + }, + "fs.realpath": { + "version": "1.0.0", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/fs.realpath/-/fs.realpath-1.0.0.tgz", + "integrity": "sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==", + "dev": true + }, + "fsevents": { + "version": "2.3.2", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/fsevents/-/fsevents-2.3.2.tgz", + "integrity": "sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==", + "dev": true, + "optional": true + }, + "function-bind": { + "version": "1.1.1", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/function-bind/-/function-bind-1.1.1.tgz", + "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==", + "dev": true + }, + "gensync": { + "version": "1.0.0-beta.2", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/gensync/-/gensync-1.0.0-beta.2.tgz", + "integrity": "sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg==", + "dev": true + }, + "get-caller-file": { + "version": "2.0.5", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/get-caller-file/-/get-caller-file-2.0.5.tgz", + "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==", + "dev": true + }, + "get-package-type": { + "version": "0.1.0", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/get-package-type/-/get-package-type-0.1.0.tgz", + "integrity": "sha512-pjzuKtY64GYfWizNAJ0fr9VqttZkNiK2iS430LtIHzjBEr6bX8Am2zm4sW4Ro5wjWW5cAlRL1qAMTcXbjNAO2Q==", + "dev": true + }, + "get-stream": { + "version": "6.0.1", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/get-stream/-/get-stream-6.0.1.tgz", + "integrity": "sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg==", + "dev": true + }, + "glob": { + "version": "7.2.3", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/glob/-/glob-7.2.3.tgz", + "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==", + "dev": true, + "requires": { + "fs.realpath": "^1.0.0", + "inflight": "^1.0.4", + "inherits": "2", + "minimatch": "^3.1.1", + "once": "^1.3.0", + "path-is-absolute": "^1.0.0" + } + }, + "globals": { + "version": "11.12.0", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/globals/-/globals-11.12.0.tgz", + "integrity": "sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==", + "dev": true + }, + "graceful-fs": { + "version": "4.2.11", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/graceful-fs/-/graceful-fs-4.2.11.tgz", + "integrity": "sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==", + "dev": true + }, + "has": { + "version": "1.0.3", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/has/-/has-1.0.3.tgz", + "integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==", + "dev": true, + "requires": { + "function-bind": "^1.1.1" + } + }, + "has-flag": { + "version": "4.0.0", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/has-flag/-/has-flag-4.0.0.tgz", + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", + "dev": true + }, + "html-escaper": { + "version": "2.0.2", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/html-escaper/-/html-escaper-2.0.2.tgz", + "integrity": "sha512-H2iMtd0I4Mt5eYiapRdIDjp+XzelXQ0tFE4JS7YFwFevXXMmOp9myNrUvCg0D6ws8iqkRPBfKHgbwig1SmlLfg==", + "dev": true + }, + "human-signals": { + "version": "2.1.0", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/human-signals/-/human-signals-2.1.0.tgz", + "integrity": "sha512-B4FFZ6q/T2jhhksgkbEW3HBvWIfDW85snkQgawt07S7J5QXTk6BkNV+0yAeZrM5QpMAdYlocGoljn0sJ/WQkFw==", + "dev": true + }, + "import-local": { + "version": "3.1.0", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/import-local/-/import-local-3.1.0.tgz", + "integrity": "sha512-ASB07uLtnDs1o6EHjKpX34BKYDSqnFerfTOJL2HvMqF70LnxpjkzDB8J44oT9pu4AMPkQwf8jl6szgvNd2tRIg==", + "dev": true, + "requires": { + "pkg-dir": "^4.2.0", + "resolve-cwd": "^3.0.0" + } + }, + "imurmurhash": { + "version": "0.1.4", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/imurmurhash/-/imurmurhash-0.1.4.tgz", + "integrity": "sha512-JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA==", + "dev": true + }, + "inflight": { + "version": "1.0.6", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/inflight/-/inflight-1.0.6.tgz", + "integrity": "sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==", + "dev": true, + "requires": { + "once": "^1.3.0", + "wrappy": "1" + } + }, + "inherits": { + "version": "2.0.4", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/inherits/-/inherits-2.0.4.tgz", + "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==", + "dev": true + }, + "is-arrayish": { + "version": "0.2.1", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/is-arrayish/-/is-arrayish-0.2.1.tgz", + "integrity": "sha512-zz06S8t0ozoDXMG+ube26zeCTNXcKIPJZJi8hBrF4idCLms4CG9QtK7qBl1boi5ODzFpjswb5JPmHCbMpjaYzg==", + "dev": true + }, + "is-core-module": { + "version": "2.11.0", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/is-core-module/-/is-core-module-2.11.0.tgz", + "integrity": "sha512-RRjxlvLDkD1YJwDbroBHMb+cukurkDWNyHx7D3oNB5x9rb5ogcksMC5wHCadcXoo67gVr/+3GFySh3134zi6rw==", + "dev": true, + "requires": { + "has": "^1.0.3" + } + }, + "is-fullwidth-code-point": { + "version": "3.0.0", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz", + "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==", + "dev": true + }, + "is-generator-fn": { + "version": "2.1.0", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/is-generator-fn/-/is-generator-fn-2.1.0.tgz", + "integrity": "sha512-cTIB4yPYL/Grw0EaSzASzg6bBy9gqCofvWN8okThAYIxKJZC+udlRAmGbM0XLeniEJSs8uEgHPGuHSe1XsOLSQ==", + "dev": true + }, + "is-number": { + "version": "7.0.0", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/is-number/-/is-number-7.0.0.tgz", + "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==", + "dev": true + }, + "is-stream": { + "version": "2.0.1", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/is-stream/-/is-stream-2.0.1.tgz", + "integrity": "sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg==", + "dev": true + }, + "isexe": { + "version": "2.0.0", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/isexe/-/isexe-2.0.0.tgz", + "integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==", + "dev": true + }, + "istanbul-lib-coverage": { + "version": "3.2.0", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/istanbul-lib-coverage/-/istanbul-lib-coverage-3.2.0.tgz", + "integrity": "sha512-eOeJ5BHCmHYvQK7xt9GkdHuzuCGS1Y6g9Gvnx3Ym33fz/HpLRYxiS0wHNr+m/MBC8B647Xt608vCDEvhl9c6Mw==", + "dev": true + }, + "istanbul-lib-instrument": { + "version": "5.2.1", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/istanbul-lib-instrument/-/istanbul-lib-instrument-5.2.1.tgz", + "integrity": "sha512-pzqtp31nLv/XFOzXGuvhCb8qhjmTVo5vjVk19XE4CRlSWz0KoeJ3bw9XsA7nOp9YBf4qHjwBxkDzKcME/J29Yg==", + "dev": true, + "requires": { + "@babel/core": "^7.12.3", + "@babel/parser": "^7.14.7", + "@istanbuljs/schema": "^0.1.2", + "istanbul-lib-coverage": "^3.2.0", + "semver": "^6.3.0" + } + }, + "istanbul-lib-report": { + "version": "3.0.0", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/istanbul-lib-report/-/istanbul-lib-report-3.0.0.tgz", + "integrity": "sha512-wcdi+uAKzfiGT2abPpKZ0hSU1rGQjUQnLvtY5MpQ7QCTahD3VODhcu4wcfY1YtkGaDD5yuydOLINXsfbus9ROw==", + "dev": true, + "requires": { + "istanbul-lib-coverage": "^3.0.0", + "make-dir": "^3.0.0", + "supports-color": "^7.1.0" + } + }, + "istanbul-lib-source-maps": { + "version": "4.0.1", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/istanbul-lib-source-maps/-/istanbul-lib-source-maps-4.0.1.tgz", + "integrity": "sha512-n3s8EwkdFIJCG3BPKBYvskgXGoy88ARzvegkitk60NxRdwltLOTaH7CUiMRXvwYorl0Q712iEjcWB+fK/MrWVw==", + "dev": true, + "requires": { + "debug": "^4.1.1", + "istanbul-lib-coverage": "^3.0.0", + "source-map": "^0.6.1" + } + }, + "istanbul-reports": { + "version": "3.1.5", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/istanbul-reports/-/istanbul-reports-3.1.5.tgz", + "integrity": "sha512-nUsEMa9pBt/NOHqbcbeJEgqIlY/K7rVWUX6Lql2orY5e9roQOthbR3vtY4zzf2orPELg80fnxxk9zUyPlgwD1w==", + "dev": true, + "requires": { + "html-escaper": "^2.0.0", + "istanbul-lib-report": "^3.0.0" + } + }, + "jest": { + "version": "29.5.0", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/jest/-/jest-29.5.0.tgz", + "integrity": "sha512-juMg3he2uru1QoXX078zTa7pO85QyB9xajZc6bU+d9yEGwrKX6+vGmJQ3UdVZsvTEUARIdObzH68QItim6OSSQ==", + "dev": true, + "requires": { + "@jest/core": "^29.5.0", + "@jest/types": "^29.5.0", + "import-local": "^3.0.2", + "jest-cli": "^29.5.0" + } + }, + "jest-changed-files": { + "version": "29.5.0", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/jest-changed-files/-/jest-changed-files-29.5.0.tgz", + "integrity": "sha512-IFG34IUMUaNBIxjQXF/iu7g6EcdMrGRRxaUSw92I/2g2YC6vCdTltl4nHvt7Ci5nSJwXIkCu8Ka1DKF+X7Z1Ag==", + "dev": true, + "requires": { + "execa": "^5.0.0", + "p-limit": "^3.1.0" + } + }, + "jest-circus": { + "version": "29.5.0", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/jest-circus/-/jest-circus-29.5.0.tgz", + "integrity": "sha512-gq/ongqeQKAplVxqJmbeUOJJKkW3dDNPY8PjhJ5G0lBRvu0e3EWGxGy5cI4LAGA7gV2UHCtWBI4EMXK8c9nQKA==", + "dev": true, + "requires": { + "@jest/environment": "^29.5.0", + "@jest/expect": "^29.5.0", + "@jest/test-result": "^29.5.0", + "@jest/types": "^29.5.0", + "@types/node": "*", + "chalk": "^4.0.0", + "co": "^4.6.0", + "dedent": "^0.7.0", + "is-generator-fn": "^2.0.0", + "jest-each": "^29.5.0", + "jest-matcher-utils": "^29.5.0", + "jest-message-util": "^29.5.0", + "jest-runtime": "^29.5.0", + "jest-snapshot": "^29.5.0", + "jest-util": "^29.5.0", + "p-limit": "^3.1.0", + "pretty-format": "^29.5.0", + "pure-rand": "^6.0.0", + "slash": "^3.0.0", + "stack-utils": "^2.0.3" + } + }, + "jest-cli": { + "version": "29.5.0", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/jest-cli/-/jest-cli-29.5.0.tgz", + "integrity": "sha512-L1KcP1l4HtfwdxXNFCL5bmUbLQiKrakMUriBEcc1Vfz6gx31ORKdreuWvmQVBit+1ss9NNR3yxjwfwzZNdQXJw==", + "dev": true, + "requires": { + "@jest/core": "^29.5.0", + "@jest/test-result": "^29.5.0", + "@jest/types": "^29.5.0", + "chalk": "^4.0.0", + "exit": "^0.1.2", + "graceful-fs": "^4.2.9", + "import-local": "^3.0.2", + "jest-config": "^29.5.0", + "jest-util": "^29.5.0", + "jest-validate": "^29.5.0", + "prompts": "^2.0.1", + "yargs": "^17.3.1" + } + }, + "jest-config": { + "version": "29.5.0", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/jest-config/-/jest-config-29.5.0.tgz", + "integrity": "sha512-kvDUKBnNJPNBmFFOhDbm59iu1Fii1Q6SxyhXfvylq3UTHbg6o7j/g8k2dZyXWLvfdKB1vAPxNZnMgtKJcmu3kA==", + "dev": true, + "requires": { + "@babel/core": "^7.11.6", + "@jest/test-sequencer": "^29.5.0", + "@jest/types": "^29.5.0", + "babel-jest": "^29.5.0", + "chalk": "^4.0.0", + "ci-info": "^3.2.0", + "deepmerge": "^4.2.2", + "glob": "^7.1.3", + "graceful-fs": "^4.2.9", + "jest-circus": "^29.5.0", + "jest-environment-node": "^29.5.0", + "jest-get-type": "^29.4.3", + "jest-regex-util": "^29.4.3", + "jest-resolve": "^29.5.0", + "jest-runner": "^29.5.0", + "jest-util": "^29.5.0", + "jest-validate": "^29.5.0", + "micromatch": "^4.0.4", + "parse-json": "^5.2.0", + "pretty-format": "^29.5.0", + "slash": "^3.0.0", + "strip-json-comments": "^3.1.1" + } + }, + "jest-diff": { + "version": "29.5.0", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/jest-diff/-/jest-diff-29.5.0.tgz", + "integrity": "sha512-LtxijLLZBduXnHSniy0WMdaHjmQnt3g5sa16W4p0HqukYTTsyTW3GD1q41TyGl5YFXj/5B2U6dlh5FM1LIMgxw==", + "dev": true, + "requires": { + "chalk": "^4.0.0", + "diff-sequences": "^29.4.3", + "jest-get-type": "^29.4.3", + "pretty-format": "^29.5.0" + } + }, + "jest-docblock": { + "version": "29.4.3", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/jest-docblock/-/jest-docblock-29.4.3.tgz", + "integrity": "sha512-fzdTftThczeSD9nZ3fzA/4KkHtnmllawWrXO69vtI+L9WjEIuXWs4AmyME7lN5hU7dB0sHhuPfcKofRsUb/2Fg==", + "dev": true, + "requires": { + "detect-newline": "^3.0.0" + } + }, + "jest-each": { + "version": "29.5.0", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/jest-each/-/jest-each-29.5.0.tgz", + "integrity": "sha512-HM5kIJ1BTnVt+DQZ2ALp3rzXEl+g726csObrW/jpEGl+CDSSQpOJJX2KE/vEg8cxcMXdyEPu6U4QX5eruQv5hA==", + "dev": true, + "requires": { + "@jest/types": "^29.5.0", + "chalk": "^4.0.0", + "jest-get-type": "^29.4.3", + "jest-util": "^29.5.0", + "pretty-format": "^29.5.0" + } + }, + "jest-environment-node": { + "version": "29.5.0", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/jest-environment-node/-/jest-environment-node-29.5.0.tgz", + "integrity": "sha512-ExxuIK/+yQ+6PRGaHkKewYtg6hto2uGCgvKdb2nfJfKXgZ17DfXjvbZ+jA1Qt9A8EQSfPnt5FKIfnOO3u1h9qw==", + "dev": true, + "requires": { + "@jest/environment": "^29.5.0", + "@jest/fake-timers": "^29.5.0", + "@jest/types": "^29.5.0", + "@types/node": "*", + "jest-mock": "^29.5.0", + "jest-util": "^29.5.0" + } + }, + "jest-get-type": { + "version": "29.4.3", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/jest-get-type/-/jest-get-type-29.4.3.tgz", + "integrity": "sha512-J5Xez4nRRMjk8emnTpWrlkyb9pfRQQanDrvWHhsR1+VUfbwxi30eVcZFlcdGInRibU4G5LwHXpI7IRHU0CY+gg==", + "dev": true + }, + "jest-haste-map": { + "version": "29.5.0", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/jest-haste-map/-/jest-haste-map-29.5.0.tgz", + "integrity": "sha512-IspOPnnBro8YfVYSw6yDRKh/TiCdRngjxeacCps1cQ9cgVN6+10JUcuJ1EabrgYLOATsIAigxA0rLR9x/YlrSA==", + "dev": true, + "requires": { + "@jest/types": "^29.5.0", + "@types/graceful-fs": "^4.1.3", + "@types/node": "*", + "anymatch": "^3.0.3", + "fb-watchman": "^2.0.0", + "fsevents": "^2.3.2", + "graceful-fs": "^4.2.9", + "jest-regex-util": "^29.4.3", + "jest-util": "^29.5.0", + "jest-worker": "^29.5.0", + "micromatch": "^4.0.4", + "walker": "^1.0.8" + } + }, + "jest-leak-detector": { + "version": "29.5.0", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/jest-leak-detector/-/jest-leak-detector-29.5.0.tgz", + "integrity": "sha512-u9YdeeVnghBUtpN5mVxjID7KbkKE1QU4f6uUwuxiY0vYRi9BUCLKlPEZfDGR67ofdFmDz9oPAy2G92Ujrntmow==", + "dev": true, + "requires": { + "jest-get-type": "^29.4.3", + "pretty-format": "^29.5.0" + } + }, + "jest-matcher-utils": { + "version": "29.5.0", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/jest-matcher-utils/-/jest-matcher-utils-29.5.0.tgz", + "integrity": "sha512-lecRtgm/rjIK0CQ7LPQwzCs2VwW6WAahA55YBuI+xqmhm7LAaxokSB8C97yJeYyT+HvQkH741StzpU41wohhWw==", + "dev": true, + "requires": { + "chalk": "^4.0.0", + "jest-diff": "^29.5.0", + "jest-get-type": "^29.4.3", + "pretty-format": "^29.5.0" + } + }, + "jest-message-util": { + "version": "29.5.0", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/jest-message-util/-/jest-message-util-29.5.0.tgz", + "integrity": "sha512-Kijeg9Dag6CKtIDA7O21zNTACqD5MD/8HfIV8pdD94vFyFuer52SigdC3IQMhab3vACxXMiFk+yMHNdbqtyTGA==", + "dev": true, + "requires": { + "@babel/code-frame": "^7.12.13", + "@jest/types": "^29.5.0", + "@types/stack-utils": "^2.0.0", + "chalk": "^4.0.0", + "graceful-fs": "^4.2.9", + "micromatch": "^4.0.4", + "pretty-format": "^29.5.0", + "slash": "^3.0.0", + "stack-utils": "^2.0.3" + } + }, + "jest-mock": { + "version": "29.5.0", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/jest-mock/-/jest-mock-29.5.0.tgz", + "integrity": "sha512-GqOzvdWDE4fAV2bWQLQCkujxYWL7RxjCnj71b5VhDAGOevB3qj3Ovg26A5NI84ZpODxyzaozXLOh2NCgkbvyaw==", + "dev": true, + "requires": { + "@jest/types": "^29.5.0", + "@types/node": "*", + "jest-util": "^29.5.0" + } + }, + "jest-pnp-resolver": { + "version": "1.2.3", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/jest-pnp-resolver/-/jest-pnp-resolver-1.2.3.tgz", + "integrity": "sha512-+3NpwQEnRoIBtx4fyhblQDPgJI0H1IEIkX7ShLUjPGA7TtUTvI1oiKi3SR4oBR0hQhQR80l4WAe5RrXBwWMA8w==", + "dev": true, + "requires": {} + }, + "jest-regex-util": { + "version": "29.4.3", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/jest-regex-util/-/jest-regex-util-29.4.3.tgz", + "integrity": "sha512-O4FglZaMmWXbGHSQInfXewIsd1LMn9p3ZXB/6r4FOkyhX2/iP/soMG98jGvk/A3HAN78+5VWcBGO0BJAPRh4kg==", + "dev": true + }, + "jest-resolve": { + "version": "29.5.0", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/jest-resolve/-/jest-resolve-29.5.0.tgz", + "integrity": "sha512-1TzxJ37FQq7J10jPtQjcc+MkCkE3GBpBecsSUWJ0qZNJpmg6m0D9/7II03yJulm3H/fvVjgqLh/k2eYg+ui52w==", + "dev": true, + "requires": { + "chalk": "^4.0.0", + "graceful-fs": "^4.2.9", + "jest-haste-map": "^29.5.0", + "jest-pnp-resolver": "^1.2.2", + "jest-util": "^29.5.0", + "jest-validate": "^29.5.0", + "resolve": "^1.20.0", + "resolve.exports": "^2.0.0", + "slash": "^3.0.0" + } + }, + "jest-resolve-dependencies": { + "version": "29.5.0", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/jest-resolve-dependencies/-/jest-resolve-dependencies-29.5.0.tgz", + "integrity": "sha512-sjV3GFr0hDJMBpYeUuGduP+YeCRbd7S/ck6IvL3kQ9cpySYKqcqhdLLC2rFwrcL7tz5vYibomBrsFYWkIGGjOg==", + "dev": true, + "requires": { + "jest-regex-util": "^29.4.3", + "jest-snapshot": "^29.5.0" + } + }, + "jest-runner": { + "version": "29.5.0", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/jest-runner/-/jest-runner-29.5.0.tgz", + "integrity": "sha512-m7b6ypERhFghJsslMLhydaXBiLf7+jXy8FwGRHO3BGV1mcQpPbwiqiKUR2zU2NJuNeMenJmlFZCsIqzJCTeGLQ==", + "dev": true, + "requires": { + "@jest/console": "^29.5.0", + "@jest/environment": "^29.5.0", + "@jest/test-result": "^29.5.0", + "@jest/transform": "^29.5.0", + "@jest/types": "^29.5.0", + "@types/node": "*", + "chalk": "^4.0.0", + "emittery": "^0.13.1", + "graceful-fs": "^4.2.9", + "jest-docblock": "^29.4.3", + "jest-environment-node": "^29.5.0", + "jest-haste-map": "^29.5.0", + "jest-leak-detector": "^29.5.0", + "jest-message-util": "^29.5.0", + "jest-resolve": "^29.5.0", + "jest-runtime": "^29.5.0", + "jest-util": "^29.5.0", + "jest-watcher": "^29.5.0", + "jest-worker": "^29.5.0", + "p-limit": "^3.1.0", + "source-map-support": "0.5.13" + } + }, + "jest-runtime": { + "version": "29.5.0", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/jest-runtime/-/jest-runtime-29.5.0.tgz", + "integrity": "sha512-1Hr6Hh7bAgXQP+pln3homOiEZtCDZFqwmle7Ew2j8OlbkIu6uE3Y/etJQG8MLQs3Zy90xrp2C0BRrtPHG4zryw==", + "dev": true, + "requires": { + "@jest/environment": "^29.5.0", + "@jest/fake-timers": "^29.5.0", + "@jest/globals": "^29.5.0", + "@jest/source-map": "^29.4.3", + "@jest/test-result": "^29.5.0", + "@jest/transform": "^29.5.0", + "@jest/types": "^29.5.0", + "@types/node": "*", + "chalk": "^4.0.0", + "cjs-module-lexer": "^1.0.0", + "collect-v8-coverage": "^1.0.0", + "glob": "^7.1.3", + "graceful-fs": "^4.2.9", + "jest-haste-map": "^29.5.0", + "jest-message-util": "^29.5.0", + "jest-mock": "^29.5.0", + "jest-regex-util": "^29.4.3", + "jest-resolve": "^29.5.0", + "jest-snapshot": "^29.5.0", + "jest-util": "^29.5.0", + "slash": "^3.0.0", + "strip-bom": "^4.0.0" + } + }, + "jest-snapshot": { + "version": "29.5.0", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/jest-snapshot/-/jest-snapshot-29.5.0.tgz", + "integrity": "sha512-x7Wolra5V0tt3wRs3/ts3S6ciSQVypgGQlJpz2rsdQYoUKxMxPNaoHMGJN6qAuPJqS+2iQ1ZUn5kl7HCyls84g==", + "dev": true, + "requires": { + "@babel/core": "^7.11.6", + "@babel/generator": "^7.7.2", + "@babel/plugin-syntax-jsx": "^7.7.2", + "@babel/plugin-syntax-typescript": "^7.7.2", + "@babel/traverse": "^7.7.2", + "@babel/types": "^7.3.3", + "@jest/expect-utils": "^29.5.0", + "@jest/transform": "^29.5.0", + "@jest/types": "^29.5.0", + "@types/babel__traverse": "^7.0.6", + "@types/prettier": "^2.1.5", + "babel-preset-current-node-syntax": "^1.0.0", + "chalk": "^4.0.0", + "expect": "^29.5.0", + "graceful-fs": "^4.2.9", + "jest-diff": "^29.5.0", + "jest-get-type": "^29.4.3", + "jest-matcher-utils": "^29.5.0", + "jest-message-util": "^29.5.0", + "jest-util": "^29.5.0", + "natural-compare": "^1.4.0", + "pretty-format": "^29.5.0", + "semver": "^7.3.5" }, - "engines": { - "node": ">=4.2.0" + "dependencies": { + "lru-cache": { + "version": "6.0.0", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/lru-cache/-/lru-cache-6.0.0.tgz", + "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==", + "dev": true, + "requires": { + "yallist": "^4.0.0" + } + }, + "semver": { + "version": "7.3.8", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/semver/-/semver-7.3.8.tgz", + "integrity": "sha512-NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A==", + "dev": true, + "requires": { + "lru-cache": "^6.0.0" + } + }, + "yallist": { + "version": "4.0.0", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/yallist/-/yallist-4.0.0.tgz", + "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==", + "dev": true + } } - } - }, - "dependencies": { + }, + "jest-util": { + "version": "29.5.0", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/jest-util/-/jest-util-29.5.0.tgz", + "integrity": "sha512-RYMgG/MTadOr5t8KdhejfvUU82MxsCu5MF6KuDUHl+NuwzUt+Sm6jJWxTJVrDR1j5M/gJVCPKQEpWXY+yIQ6lQ==", + "dev": true, + "requires": { + "@jest/types": "^29.5.0", + "@types/node": "*", + "chalk": "^4.0.0", + "ci-info": "^3.2.0", + "graceful-fs": "^4.2.9", + "picomatch": "^2.2.3" + } + }, + "jest-validate": { + "version": "29.5.0", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/jest-validate/-/jest-validate-29.5.0.tgz", + "integrity": "sha512-pC26etNIi+y3HV8A+tUGr/lph9B18GnzSRAkPaaZJIE1eFdiYm6/CewuiJQ8/RlfHd1u/8Ioi8/sJ+CmbA+zAQ==", + "dev": true, + "requires": { + "@jest/types": "^29.5.0", + "camelcase": "^6.2.0", + "chalk": "^4.0.0", + "jest-get-type": "^29.4.3", + "leven": "^3.1.0", + "pretty-format": "^29.5.0" + }, + "dependencies": { + "camelcase": { + "version": "6.3.0", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/camelcase/-/camelcase-6.3.0.tgz", + "integrity": "sha512-Gmy6FhYlCY7uOElZUSbxo2UCDH8owEk996gkbrpsgGtrJLM3J7jGxl9Ic7Qwwj4ivOE5AWZWRMecDdF7hqGjFA==", + "dev": true + } + } + }, + "jest-watcher": { + "version": "29.5.0", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/jest-watcher/-/jest-watcher-29.5.0.tgz", + "integrity": "sha512-KmTojKcapuqYrKDpRwfqcQ3zjMlwu27SYext9pt4GlF5FUgB+7XE1mcCnSm6a4uUpFyQIkb6ZhzZvHl+jiBCiA==", + "dev": true, + "requires": { + "@jest/test-result": "^29.5.0", + "@jest/types": "^29.5.0", + "@types/node": "*", + "ansi-escapes": "^4.2.1", + "chalk": "^4.0.0", + "emittery": "^0.13.1", + "jest-util": "^29.5.0", + "string-length": "^4.0.1" + } + }, + "jest-worker": { + "version": "29.5.0", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/jest-worker/-/jest-worker-29.5.0.tgz", + "integrity": "sha512-NcrQnevGoSp4b5kg+akIpthoAFHxPBcb5P6mYPY0fUNT+sSvmtu6jlkEle3anczUKIKEbMxFimk9oTP/tpIPgA==", + "dev": true, + "requires": { + "@types/node": "*", + "jest-util": "^29.5.0", + "merge-stream": "^2.0.0", + "supports-color": "^8.0.0" + }, + "dependencies": { + "supports-color": { + "version": "8.1.1", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/supports-color/-/supports-color-8.1.1.tgz", + "integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==", + "dev": true, + "requires": { + "has-flag": "^4.0.0" + } + } + } + }, + "js-tokens": { + "version": "4.0.0", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/js-tokens/-/js-tokens-4.0.0.tgz", + "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==", + "dev": true + }, + "js-yaml": { + "version": "3.14.1", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/js-yaml/-/js-yaml-3.14.1.tgz", + "integrity": "sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==", + "dev": true, + "requires": { + "argparse": "^1.0.7", + "esprima": "^4.0.0" + } + }, + "jsesc": { + "version": "2.5.2", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/jsesc/-/jsesc-2.5.2.tgz", + "integrity": "sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA==", + "dev": true + }, + "json-parse-even-better-errors": { + "version": "2.3.1", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz", + "integrity": "sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w==", + "dev": true + }, + "json5": { + "version": "2.2.3", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/json5/-/json5-2.2.3.tgz", + "integrity": "sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg==", + "dev": true + }, + "kleur": { + "version": "3.0.3", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/kleur/-/kleur-3.0.3.tgz", + "integrity": "sha512-eTIzlVOSUR+JxdDFepEYcBMtZ9Qqdef+rnzWdRZuMbOywu5tO2w2N7rqjoANZ5k9vywhL6Br1VRjUIgTQx4E8w==", + "dev": true + }, + "leven": { + "version": "3.1.0", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/leven/-/leven-3.1.0.tgz", + "integrity": "sha512-qsda+H8jTaUaN/x5vzW2rzc+8Rw4TAQ/4KjB46IwK5VH+IlVeeeje/EoZRpiXvIqjFgK84QffqPztGI3VBLG1A==", + "dev": true + }, + "lines-and-columns": { + "version": "1.2.4", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/lines-and-columns/-/lines-and-columns-1.2.4.tgz", + "integrity": "sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg==", + "dev": true + }, + "locate-path": { + "version": "5.0.0", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/locate-path/-/locate-path-5.0.0.tgz", + "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==", + "dev": true, + "requires": { + "p-locate": "^4.1.0" + } + }, + "lodash.memoize": { + "version": "4.1.2", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/lodash.memoize/-/lodash.memoize-4.1.2.tgz", + "integrity": "sha512-t7j+NzmgnQzTAYXcsHYLgimltOV1MXHtlOWf6GjL9Kj8GK5FInw5JotxvbOs+IvV1/Dzo04/fCGfLVs7aXb4Ag==", + "dev": true + }, + "lru-cache": { + "version": "5.1.1", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/lru-cache/-/lru-cache-5.1.1.tgz", + "integrity": "sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==", + "dev": true, + "requires": { + "yallist": "^3.0.2" + } + }, + "make-dir": { + "version": "3.1.0", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/make-dir/-/make-dir-3.1.0.tgz", + "integrity": "sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw==", + "dev": true, + "requires": { + "semver": "^6.0.0" + } + }, + "make-error": { + "version": "1.3.6", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/make-error/-/make-error-1.3.6.tgz", + "integrity": "sha512-s8UhlNe7vPKomQhC1qFelMokr/Sc3AgNbso3n74mVPA5LTZwkB9NlXf4XPamLxJE8h0gh73rM94xvwRT2CVInw==", + "dev": true + }, + "makeerror": { + "version": "1.0.12", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/makeerror/-/makeerror-1.0.12.tgz", + "integrity": "sha512-JmqCvUhmt43madlpFzG4BQzG2Z3m6tvQDNKdClZnO3VbIudJYmxsT0FNJMeiB2+JTSlTQTSbU8QdesVmwJcmLg==", + "dev": true, + "requires": { + "tmpl": "1.0.5" + } + }, + "merge-stream": { + "version": "2.0.0", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/merge-stream/-/merge-stream-2.0.0.tgz", + "integrity": "sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==", + "dev": true + }, + "micromatch": { + "version": "4.0.5", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/micromatch/-/micromatch-4.0.5.tgz", + "integrity": "sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA==", + "dev": true, + "requires": { + "braces": "^3.0.2", + "picomatch": "^2.3.1" + } + }, + "mimic-fn": { + "version": "2.1.0", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/mimic-fn/-/mimic-fn-2.1.0.tgz", + "integrity": "sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==", + "dev": true + }, + "minimatch": { + "version": "3.1.2", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/minimatch/-/minimatch-3.1.2.tgz", + "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", + "dev": true, + "requires": { + "brace-expansion": "^1.1.7" + } + }, + "ms": { + "version": "2.1.2", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/ms/-/ms-2.1.2.tgz", + "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==", + "dev": true + }, + "natural-compare": { + "version": "1.4.0", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/natural-compare/-/natural-compare-1.4.0.tgz", + "integrity": "sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw==", + "dev": true + }, + "node-int64": { + "version": "0.4.0", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/node-int64/-/node-int64-0.4.0.tgz", + "integrity": "sha512-O5lz91xSOeoXP6DulyHfllpq+Eg00MWitZIbtPfoSEvqIHdl5gfcY6hYzDWnj0qD5tz52PI08u9qUvSVeUBeHw==", + "dev": true + }, + "node-releases": { + "version": "2.0.10", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/node-releases/-/node-releases-2.0.10.tgz", + "integrity": "sha512-5GFldHPXVG/YZmFzJvKK2zDSzPKhEp0+ZR5SVaoSag9fsL5YgHbUHDfnG5494ISANDcK4KwPXAx2xqVEydmd7w==", + "dev": true + }, + "normalize-path": { + "version": "3.0.0", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/normalize-path/-/normalize-path-3.0.0.tgz", + "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==", + "dev": true + }, + "npm-run-path": { + "version": "4.0.1", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/npm-run-path/-/npm-run-path-4.0.1.tgz", + "integrity": "sha512-S48WzZW777zhNIrn7gxOlISNAqi9ZC/uQFnRdbeIHhZhCA6UqpkOT8T1G7BvfdgP4Er8gF4sUbaS0i7QvIfCWw==", + "dev": true, + "requires": { + "path-key": "^3.0.0" + } + }, + "once": { + "version": "1.4.0", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/once/-/once-1.4.0.tgz", + "integrity": "sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==", + "dev": true, + "requires": { + "wrappy": "1" + } + }, + "onetime": { + "version": "5.1.2", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/onetime/-/onetime-5.1.2.tgz", + "integrity": "sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg==", + "dev": true, + "requires": { + "mimic-fn": "^2.1.0" + } + }, + "p-limit": { + "version": "3.1.0", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/p-limit/-/p-limit-3.1.0.tgz", + "integrity": "sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==", + "dev": true, + "requires": { + "yocto-queue": "^0.1.0" + } + }, + "p-locate": { + "version": "4.1.0", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/p-locate/-/p-locate-4.1.0.tgz", + "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==", + "dev": true, + "requires": { + "p-limit": "^2.2.0" + }, + "dependencies": { + "p-limit": { + "version": "2.3.0", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/p-limit/-/p-limit-2.3.0.tgz", + "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==", + "dev": true, + "requires": { + "p-try": "^2.0.0" + } + } + } + }, + "p-try": { + "version": "2.2.0", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/p-try/-/p-try-2.2.0.tgz", + "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==", + "dev": true + }, + "parse-json": { + "version": "5.2.0", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/parse-json/-/parse-json-5.2.0.tgz", + "integrity": "sha512-ayCKvm/phCGxOkYRSCM82iDwct8/EonSEgCSxWxD7ve6jHggsFl4fZVQBPRNgQoKiuV/odhFrGzQXZwbifC8Rg==", + "dev": true, + "requires": { + "@babel/code-frame": "^7.0.0", + "error-ex": "^1.3.1", + "json-parse-even-better-errors": "^2.3.0", + "lines-and-columns": "^1.1.6" + } + }, + "path-exists": { + "version": "4.0.0", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/path-exists/-/path-exists-4.0.0.tgz", + "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==", + "dev": true + }, + "path-is-absolute": { + "version": "1.0.1", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/path-is-absolute/-/path-is-absolute-1.0.1.tgz", + "integrity": "sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==", + "dev": true + }, + "path-key": { + "version": "3.1.1", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/path-key/-/path-key-3.1.1.tgz", + "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==", + "dev": true + }, + "path-parse": { + "version": "1.0.7", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/path-parse/-/path-parse-1.0.7.tgz", + "integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==", + "dev": true + }, + "picocolors": { + "version": "1.0.0", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/picocolors/-/picocolors-1.0.0.tgz", + "integrity": "sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ==", + "dev": true + }, + "picomatch": { + "version": "2.3.1", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/picomatch/-/picomatch-2.3.1.tgz", + "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==", + "dev": true + }, + "pirates": { + "version": "4.0.5", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/pirates/-/pirates-4.0.5.tgz", + "integrity": "sha512-8V9+HQPupnaXMA23c5hvl69zXvTwTzyAYasnkb0Tts4XvO4CliqONMOnvlq26rkhLC3nWDFBJf73LU1e1VZLaQ==", + "dev": true + }, + "pkg-dir": { + "version": "4.2.0", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/pkg-dir/-/pkg-dir-4.2.0.tgz", + "integrity": "sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ==", + "dev": true, + "requires": { + "find-up": "^4.0.0" + } + }, + "pretty-format": { + "version": "29.5.0", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/pretty-format/-/pretty-format-29.5.0.tgz", + "integrity": "sha512-V2mGkI31qdttvTFX7Mt4efOqHXqJWMu4/r66Xh3Z3BwZaPfPJgp6/gbwoujRpPUtfEF6AUUWx3Jim3GCw5g/Qw==", + "dev": true, + "requires": { + "@jest/schemas": "^29.4.3", + "ansi-styles": "^5.0.0", + "react-is": "^18.0.0" + }, + "dependencies": { + "ansi-styles": { + "version": "5.2.0", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/ansi-styles/-/ansi-styles-5.2.0.tgz", + "integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==", + "dev": true + } + } + }, + "prompts": { + "version": "2.4.2", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/prompts/-/prompts-2.4.2.tgz", + "integrity": "sha512-NxNv/kLguCA7p3jE8oL2aEBsrJWgAakBpgmgK6lpPWV+WuOmY6r2/zbAVnP+T8bQlA0nzHXSJSJW0Hq7ylaD2Q==", + "dev": true, + "requires": { + "kleur": "^3.0.3", + "sisteransi": "^1.0.5" + } + }, + "pure-rand": { + "version": "6.0.1", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/pure-rand/-/pure-rand-6.0.1.tgz", + "integrity": "sha512-t+x1zEHDjBwkDGY5v5ApnZ/utcd4XYDiJsaQQoptTXgUXX95sDg1elCdJghzicm7n2mbCBJ3uYWr6M22SO19rg==", + "dev": true + }, + "react-is": { + "version": "18.2.0", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/react-is/-/react-is-18.2.0.tgz", + "integrity": "sha512-xWGDIW6x921xtzPkhiULtthJHoJvBbF3q26fzloPCK0hsvxtPVelvftw3zjbHWSkR2km9Z+4uxbDDK/6Zw9B8w==", + "dev": true + }, + "require-directory": { + "version": "2.1.1", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/require-directory/-/require-directory-2.1.1.tgz", + "integrity": "sha512-fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q==", + "dev": true + }, + "resolve": { + "version": "1.22.1", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/resolve/-/resolve-1.22.1.tgz", + "integrity": "sha512-nBpuuYuY5jFsli/JIs1oldw6fOQCBioohqWZg/2hiaOybXOft4lonv85uDOKXdf8rhyK159cxU5cDcK/NKk8zw==", + "dev": true, + "requires": { + "is-core-module": "^2.9.0", + "path-parse": "^1.0.7", + "supports-preserve-symlinks-flag": "^1.0.0" + } + }, + "resolve-cwd": { + "version": "3.0.0", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/resolve-cwd/-/resolve-cwd-3.0.0.tgz", + "integrity": "sha512-OrZaX2Mb+rJCpH/6CpSqt9xFVpN++x01XnN2ie9g6P5/3xelLAkXWVADpdz1IHD/KFfEXyE6V0U01OQ3UO2rEg==", + "dev": true, + "requires": { + "resolve-from": "^5.0.0" + } + }, + "resolve-from": { + "version": "5.0.0", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/resolve-from/-/resolve-from-5.0.0.tgz", + "integrity": "sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==", + "dev": true + }, + "resolve.exports": { + "version": "2.0.2", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/resolve.exports/-/resolve.exports-2.0.2.tgz", + "integrity": "sha512-X2UW6Nw3n/aMgDVy+0rSqgHlv39WZAlZrXCdnbyEiKm17DSqHX4MmQMaST3FbeWR5FTuRcUwYAziZajji0Y7mg==", + "dev": true + }, + "semver": { + "version": "6.3.0", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/semver/-/semver-6.3.0.tgz", + "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==", + "dev": true + }, + "shebang-command": { + "version": "2.0.0", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/shebang-command/-/shebang-command-2.0.0.tgz", + "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==", + "dev": true, + "requires": { + "shebang-regex": "^3.0.0" + } + }, + "shebang-regex": { + "version": "3.0.0", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/shebang-regex/-/shebang-regex-3.0.0.tgz", + "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==", + "dev": true + }, + "signal-exit": { + "version": "3.0.7", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/signal-exit/-/signal-exit-3.0.7.tgz", + "integrity": "sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==", + "dev": true + }, + "sisteransi": { + "version": "1.0.5", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/sisteransi/-/sisteransi-1.0.5.tgz", + "integrity": "sha512-bLGGlR1QxBcynn2d5YmDX4MGjlZvy2MRBDRNHLJ8VI6l6+9FUiyTFNJ0IveOSP0bcXgVDPRcfGqA0pjaqUpfVg==", + "dev": true + }, + "slash": { + "version": "3.0.0", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/slash/-/slash-3.0.0.tgz", + "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==", + "dev": true + }, + "source-map": { + "version": "0.6.1", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/source-map/-/source-map-0.6.1.tgz", + "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", + "dev": true + }, + "source-map-support": { + "version": "0.5.13", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/source-map-support/-/source-map-support-0.5.13.tgz", + "integrity": "sha512-SHSKFHadjVA5oR4PPqhtAVdcBWwRYVd6g6cAXnIbRiIwc2EhPrTuKUBdSLvlEKyIP3GCf89fltvcZiP9MMFA1w==", + "dev": true, + "requires": { + "buffer-from": "^1.0.0", + "source-map": "^0.6.0" + } + }, + "sprintf-js": { + "version": "1.0.3", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/sprintf-js/-/sprintf-js-1.0.3.tgz", + "integrity": "sha512-D9cPgkvLlV3t3IzL0D0YLvGA9Ahk4PcvVwUbN0dSGr1aP0Nrt4AEnTUbuGvquEC0mA64Gqt1fzirlRs5ibXx8g==", + "dev": true + }, + "stack-utils": { + "version": "2.0.6", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/stack-utils/-/stack-utils-2.0.6.tgz", + "integrity": "sha512-XlkWvfIm6RmsWtNJx+uqtKLS8eqFbxUg0ZzLXqY0caEy9l7hruX8IpiDnjsLavoBgqCCR71TqWO8MaXYheJ3RQ==", + "dev": true, + "requires": { + "escape-string-regexp": "^2.0.0" + } + }, + "string-length": { + "version": "4.0.2", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/string-length/-/string-length-4.0.2.tgz", + "integrity": "sha512-+l6rNN5fYHNhZZy41RXsYptCjA2Igmq4EG7kZAYFQI1E1VTXarr6ZPXBg6eq7Y6eK4FEhY6AJlyuFIb/v/S0VQ==", + "dev": true, + "requires": { + "char-regex": "^1.0.2", + "strip-ansi": "^6.0.0" + } + }, + "string-width": { + "version": "4.2.3", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/string-width/-/string-width-4.2.3.tgz", + "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==", + "dev": true, + "requires": { + "emoji-regex": "^8.0.0", + "is-fullwidth-code-point": "^3.0.0", + "strip-ansi": "^6.0.1" + } + }, + "strip-ansi": { + "version": "6.0.1", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/strip-ansi/-/strip-ansi-6.0.1.tgz", + "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==", + "dev": true, + "requires": { + "ansi-regex": "^5.0.1" + } + }, + "strip-bom": { + "version": "4.0.0", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/strip-bom/-/strip-bom-4.0.0.tgz", + "integrity": "sha512-3xurFv5tEgii33Zi8Jtp55wEIILR9eh34FAW00PZf+JnSsTmV/ioewSgQl97JHvgjoRGwPShsWm+IdrxB35d0w==", + "dev": true + }, + "strip-final-newline": { + "version": "2.0.0", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/strip-final-newline/-/strip-final-newline-2.0.0.tgz", + "integrity": "sha512-BrpvfNAE3dcvq7ll3xVumzjKjZQ5tI1sEUIKr3Uoks0XUl45St3FlatVqef9prk4jRDzhW6WZg+3bk93y6pLjA==", + "dev": true + }, + "strip-json-comments": { + "version": "3.1.1", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/strip-json-comments/-/strip-json-comments-3.1.1.tgz", + "integrity": "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==", + "dev": true + }, + "supports-color": { + "version": "7.2.0", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/supports-color/-/supports-color-7.2.0.tgz", + "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", + "dev": true, + "requires": { + "has-flag": "^4.0.0" + } + }, + "supports-preserve-symlinks-flag": { + "version": "1.0.0", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz", + "integrity": "sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==", + "dev": true + }, + "test-exclude": { + "version": "6.0.0", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/test-exclude/-/test-exclude-6.0.0.tgz", + "integrity": "sha512-cAGWPIyOHU6zlmg88jwm7VRyXnMN7iV68OGAbYDk/Mh/xC/pzVPlQtY6ngoIH/5/tciuhGfvESU8GrHrcxD56w==", + "dev": true, + "requires": { + "@istanbuljs/schema": "^0.1.2", + "glob": "^7.1.4", + "minimatch": "^3.0.4" + } + }, + "tmpl": { + "version": "1.0.5", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/tmpl/-/tmpl-1.0.5.tgz", + "integrity": "sha512-3f0uOEAQwIqGuWW2MVzYg8fV/QNnc/IpuJNG837rLuczAaLVHslWHZQj4IGiEl5Hs3kkbhwL9Ab7Hrsmuj+Smw==", + "dev": true + }, + "to-fast-properties": { + "version": "2.0.0", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/to-fast-properties/-/to-fast-properties-2.0.0.tgz", + "integrity": "sha512-/OaKK0xYrs3DmxRYqL/yDc+FxFUVYhDlXMhRmv3z915w2HF1tnN1omB354j8VUGO/hbRzyD6Y3sA7v7GS/ceog==", + "dev": true + }, + "to-regex-range": { + "version": "5.0.1", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/to-regex-range/-/to-regex-range-5.0.1.tgz", + "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==", + "dev": true, + "requires": { + "is-number": "^7.0.0" + } + }, + "ts-jest": { + "version": "29.0.5", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/ts-jest/-/ts-jest-29.0.5.tgz", + "integrity": "sha512-PL3UciSgIpQ7f6XjVOmbi96vmDHUqAyqDr8YxzopDqX3kfgYtX1cuNeBjP+L9sFXi6nzsGGA6R3fP3DDDJyrxA==", + "dev": true, + "requires": { + "bs-logger": "0.x", + "fast-json-stable-stringify": "2.x", + "jest-util": "^29.0.0", + "json5": "^2.2.3", + "lodash.memoize": "4.x", + "make-error": "1.x", + "semver": "7.x", + "yargs-parser": "^21.0.1" + }, + "dependencies": { + "lru-cache": { + "version": "6.0.0", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/lru-cache/-/lru-cache-6.0.0.tgz", + "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==", + "dev": true, + "requires": { + "yallist": "^4.0.0" + } + }, + "semver": { + "version": "7.3.8", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/semver/-/semver-7.3.8.tgz", + "integrity": "sha512-NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A==", + "dev": true, + "requires": { + "lru-cache": "^6.0.0" + } + }, + "yallist": { + "version": "4.0.0", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/yallist/-/yallist-4.0.0.tgz", + "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==", + "dev": true + } + } + }, + "type-detect": { + "version": "4.0.8", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/type-detect/-/type-detect-4.0.8.tgz", + "integrity": "sha512-0fr/mIH1dlO+x7TlcMy+bIDqKPsw/70tVyeHW787goQjhmqaZe10uwLujubK9q9Lg6Fiho1KUKDYz0Z7k7g5/g==", + "dev": true + }, + "type-fest": { + "version": "0.21.3", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/type-fest/-/type-fest-0.21.3.tgz", + "integrity": "sha512-t0rzBq87m3fVcduHDUFhKmyyX+9eo6WQjZvf51Ea/M0Q7+T374Jp1aUiyUl0GKxp8M/OETVHSDvmkyPgvX+X2w==", + "dev": true + }, "typescript": { "version": "4.6.4", - "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.6.4.tgz", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/typescript/-/typescript-4.6.4.tgz", "integrity": "sha512-9ia/jWHIEbo49HfjrLGfKbZSuWo9iTMwXO+Ca3pRsSpbsMbc7/IU8NKdCZVRRBafVPGnoJeFL76ZOAA84I9fEg==", "dev": true + }, + "update-browserslist-db": { + "version": "1.0.10", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/update-browserslist-db/-/update-browserslist-db-1.0.10.tgz", + "integrity": "sha512-OztqDenkfFkbSG+tRxBeAnCVPckDBcvibKd35yDONx6OU8N7sqgwc7rCbkJ/WcYtVRZ4ba68d6byhC21GFh7sQ==", + "dev": true, + "requires": { + "escalade": "^3.1.1", + "picocolors": "^1.0.0" + } + }, + "v8-to-istanbul": { + "version": "9.1.0", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/v8-to-istanbul/-/v8-to-istanbul-9.1.0.tgz", + "integrity": "sha512-6z3GW9x8G1gd+JIIgQQQxXuiJtCXeAjp6RaPEPLv62mH3iPHPxV6W3robxtCzNErRo6ZwTmzWhsbNvjyEBKzKA==", + "dev": true, + "requires": { + "@jridgewell/trace-mapping": "^0.3.12", + "@types/istanbul-lib-coverage": "^2.0.1", + "convert-source-map": "^1.6.0" + }, + "dependencies": { + "convert-source-map": { + "version": "1.9.0", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/convert-source-map/-/convert-source-map-1.9.0.tgz", + "integrity": "sha512-ASFBup0Mz1uyiIjANan1jzLQami9z1PoYSZCiiYW2FczPbenXc45FZdBZLzOT+r6+iciuEModtmCti+hjaAk0A==", + "dev": true + } + } + }, + "walker": { + "version": "1.0.8", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/walker/-/walker-1.0.8.tgz", + "integrity": "sha512-ts/8E8l5b7kY0vlWLewOkDXMmPdLcVV4GmOQLyxuSswIJsweeFZtAsMF7k1Nszz+TYBQrlYRmzOnr398y1JemQ==", + "dev": true, + "requires": { + "makeerror": "1.0.12" + } + }, + "which": { + "version": "2.0.2", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/which/-/which-2.0.2.tgz", + "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==", + "dev": true, + "requires": { + "isexe": "^2.0.0" + } + }, + "wrap-ansi": { + "version": "7.0.0", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/wrap-ansi/-/wrap-ansi-7.0.0.tgz", + "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==", + "dev": true, + "requires": { + "ansi-styles": "^4.0.0", + "string-width": "^4.1.0", + "strip-ansi": "^6.0.0" + } + }, + "wrappy": { + "version": "1.0.2", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/wrappy/-/wrappy-1.0.2.tgz", + "integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==", + "dev": true + }, + "write-file-atomic": { + "version": "4.0.2", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/write-file-atomic/-/write-file-atomic-4.0.2.tgz", + "integrity": "sha512-7KxauUdBmSdWnmpaGFg+ppNjKF8uNLry8LyzjauQDOVONfFLNKrKvQOxZ/VuTIcS/gge/YNahf5RIIQWTSarlg==", + "dev": true, + "requires": { + "imurmurhash": "^0.1.4", + "signal-exit": "^3.0.7" + } + }, + "y18n": { + "version": "5.0.8", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/y18n/-/y18n-5.0.8.tgz", + "integrity": "sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==", + "dev": true + }, + "yallist": { + "version": "3.1.1", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/yallist/-/yallist-3.1.1.tgz", + "integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==", + "dev": true + }, + "yargs": { + "version": "17.7.1", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/yargs/-/yargs-17.7.1.tgz", + "integrity": "sha512-cwiTb08Xuv5fqF4AovYacTFNxk62th7LKJ6BL9IGUpTJrWoU7/7WdQGTP2SjKf1dUNBGzDd28p/Yfs/GI6JrLw==", + "dev": true, + "requires": { + "cliui": "^8.0.1", + "escalade": "^3.1.1", + "get-caller-file": "^2.0.5", + "require-directory": "^2.1.1", + "string-width": "^4.2.3", + "y18n": "^5.0.5", + "yargs-parser": "^21.1.1" + } + }, + "yargs-parser": { + "version": "21.1.1", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/yargs-parser/-/yargs-parser-21.1.1.tgz", + "integrity": "sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw==", + "dev": true + }, + "yocto-queue": { + "version": "0.1.0", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/yocto-queue/-/yocto-queue-0.1.0.tgz", + "integrity": "sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==", + "dev": true } } } diff --git a/build/zwe/package.json b/build/zwe/package.json index fe727addbf..eab511c832 100644 --- a/build/zwe/package.json +++ b/build/zwe/package.json @@ -7,7 +7,7 @@ "dev": "tsc --build tsconfig.dev.json --force", "start": "tsc --build tsconfig.dev.json --force --watch", "prod": "tsc --build tsconfig.prod.json --force", - "test": "echo \"Error: no test specified\" && exit 1" + "test": "jest" }, "repository": { "type": "git", @@ -23,6 +23,9 @@ }, "homepage": "https://github.com/zowe/zowe-install-packaging#readme", "devDependencies": { + "@types/jest": "^29.5.0", + "jest": "^29.5.0", + "ts-jest": "^29.0.5", "typescript": "4.6.4" } } diff --git a/build/zwe/types/@qjstypes/os.d.ts b/build/zwe/types/@qjstypes/cm_os.d.ts similarity index 100% rename from build/zwe/types/@qjstypes/os.d.ts rename to build/zwe/types/@qjstypes/cm_os.d.ts diff --git a/build/zwe/types/@qjstypes/std.d.ts b/build/zwe/types/@qjstypes/cm_std.d.ts similarity index 100% rename from build/zwe/types/@qjstypes/std.d.ts rename to build/zwe/types/@qjstypes/cm_std.d.ts diff --git a/tests/zwe/libs/configmgr.test.ts b/tests/zwe/libs/configmgr.test.ts new file mode 100644 index 0000000000..00112435e9 --- /dev/null +++ b/tests/zwe/libs/configmgr.test.ts @@ -0,0 +1,14 @@ +import * as std from "cm_std"; + +std.setenv('ZWE_zowe_runtimeDirectory', "/var/product/zowe"); + +import * as configmgr from '../../../bin/libs/configmgr'; + +describe('tests of config manager', () => { + + it('getZoweBaseSchemas returns the schema location', () => { + expect(configmgr.getZoweBaseSchemas()) + .toBe("/var/product/zowe/schemas/zowe-yaml-schema.json:/var/product/zowe/schemas/server-common.json"); + }); + +}); \ No newline at end of file From 836bd81c010297099c2587eb6615df8f0e73f97a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pavel=20Jare=C5=A1?= Date: Wed, 29 Mar 2023 13:36:20 +0200 Subject: [PATCH 002/168] fix versions in package.json --- build/zwe/package.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/build/zwe/package.json b/build/zwe/package.json index eab511c832..8803845f2f 100644 --- a/build/zwe/package.json +++ b/build/zwe/package.json @@ -23,9 +23,9 @@ }, "homepage": "https://github.com/zowe/zowe-install-packaging#readme", "devDependencies": { - "@types/jest": "^29.5.0", - "jest": "^29.5.0", - "ts-jest": "^29.0.5", + "@types/jest": "29.5.0", + "jest": "29.5.0", + "ts-jest": "29.0.5", "typescript": "4.6.4" } } From 5666ae980c35a048c49d3bec80f3ca12daec8bc0 Mon Sep 17 00:00:00 2001 From: ojcelis Date: Tue, 25 Apr 2023 09:57:34 -0400 Subject: [PATCH 003/168] Update org.zowe.license to latest version Signed-off-by: ojcelis --- manifest.json.template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.json.template b/manifest.json.template index 5090f74e7f..5e8dcc4c20 100644 --- a/manifest.json.template +++ b/manifest.json.template @@ -131,7 +131,7 @@ "version": "2.0.2" }, "org.zowe.licenses": { - "version": "2.7.0", + "version": "2.8.0", "artifact": "zowe_licenses_full.zip" } }, From 16de1877b410f708e8d8c1edebbb822341d6d47e Mon Sep 17 00:00:00 2001 From: Onno Van den Troost Date: Mon, 1 May 2023 09:42:16 -0400 Subject: [PATCH 004/168] update blksize Signed-off-by: Onno Van den Troost --- smpe/bld/ptf.readme.htm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/smpe/bld/ptf.readme.htm b/smpe/bld/ptf.readme.htm index 25a18e59af..095356772f 100644 --- a/smpe/bld/ptf.readme.htm +++ b/smpe/bld/ptf.readme.htm @@ -95,7 +95,7 @@

Allocate host data sets for the ##type

// LRECL=80, // UNIT=SYSALLDA, //* VOL=SER=#volser, -//* BLKSIZE=6160, +//* BLKSIZE=27920, // SPACE=(TRK,(##pri,15)) //* From bd1ca31070cbe6fecd29aebd90b9a57d4caa0ca2 Mon Sep 17 00:00:00 2001 From: vlameli <75256335+vlameli@users.noreply.github.com> Date: Wed, 10 May 2023 12:42:26 +0200 Subject: [PATCH 005/168] Fixed too long text in wf ZWECONF that break it. Signed-off-by: vlameli <75256335+vlameli@users.noreply.github.com> --- workflows/files/ZWECONF.properties | 2 +- workflows/files/ZWECONF.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/workflows/files/ZWECONF.properties b/workflows/files/ZWECONF.properties index cbac0939f1..1e1efb1f38 100644 --- a/workflows/files/ZWECONF.properties +++ b/workflows/files/ZWECONF.properties @@ -48,7 +48,7 @@ zowe_setup_dataset_authPluginLib=IBMUSER.ZWEV2.CUST.ZWESAPL # zowe_setup_certificate_type # Label: Zowe setup certificate type -# Abstract: Type of certificate storage. Valid values are: PKCS12, JCEKS, JCECCAKS, JCERACFKS, JCECCARACFKS, or JCEHYBRIDRACFKS +# Abstract: Type of certificate storage. # Category: zowe # Description: # Type of certificate storage. Valid values are: PKCS12, JCEKS, JCECCAKS, JCERACFKS, JCECCARACFKS, or JCEHYBRIDRACFKS diff --git a/workflows/files/ZWECONF.xml b/workflows/files/ZWECONF.xml index caf8fa86cc..3f581d300b 100644 --- a/workflows/files/ZWECONF.xml +++ b/workflows/files/ZWECONF.xml @@ -78,7 +78,7 @@ - Type of certificate storage. Valid values are: PKCS12, JCEKS, JCECCAKS, JCERACFKS, JCECCARACFKS, or JCEHYBRIDRACFKS + Type of certificate storage. Type of certificate storage. Valid values are: PKCS12, JCEKS, JCECCAKS, JCERACFKS, JCECCARACFKS, or JCEHYBRIDRACFKS zowe From 50027d912558ed0f994a6711cbcb11d75dd41540 Mon Sep 17 00:00:00 2001 From: MarkAckert Date: Fri, 19 May 2023 15:05:47 -0400 Subject: [PATCH 006/168] build: replace set-output with GITHUB_OUTPUT Signed-off-by: MarkAckert --- .github/scripts/cicd_test/make_matrix.sh | 2 +- .../prep7_more_test_prep/06_process_outputs.sh | 16 ++++++++-------- .github/workflows/build-packaging.yml | 14 +++++++------- .github/workflows/snyk-analysis.yml | 2 +- .github/workflows/zwe-doc-generation.yml | 4 ++-- 5 files changed, 19 insertions(+), 19 deletions(-) diff --git a/.github/scripts/cicd_test/make_matrix.sh b/.github/scripts/cicd_test/make_matrix.sh index f378aca208..ac4dfc146b 100644 --- a/.github/scripts/cicd_test/make_matrix.sh +++ b/.github/scripts/cicd_test/make_matrix.sh @@ -123,4 +123,4 @@ done MATRIX_JSON_STRING=$(echo $MATRIX_JSON_STRING | sed 's/,$//g') MATRIX_JSON_STRING="$MATRIX_JSON_STRING]}" -echo "::set-output name=matrix::$MATRIX_JSON_STRING" +echo "matrix=$MATRIX_JSON_STRING" >>$GITHUB_OUTPUT diff --git a/.github/scripts/cicd_test/prep7_more_test_prep/06_process_outputs.sh b/.github/scripts/cicd_test/prep7_more_test_prep/06_process_outputs.sh index 92166be157..bce1d40594 100644 --- a/.github/scripts/cicd_test/prep7_more_test_prep/06_process_outputs.sh +++ b/.github/scripts/cicd_test/prep7_more_test_prep/06_process_outputs.sh @@ -11,13 +11,13 @@ ################################################################################ # Set outputs -echo ::set-output name=ZOWE_ARTIFACTORY_FINAL::$ZOWE_ARTIFACTORY_FINAL -echo ::set-output name=ZOWE_ARTIFACTORY_FINAL_FILENAME::$ZOWE_ARTIFACTORY_FINAL_FILENAME -echo ::set-output name=NODE_HOME_PATTERN::/ZOWE/node/node-$ZOS_NODE_VERSION-os390-s390x -echo ::set-output name=TEST_SERVER::$TEST_SERVER -echo ::set-output name=TEST_SERVER_NICKNAME::$TEST_SERVER_NICKNAME -echo ::set-output name=EXTENSION_LIST::$EXTENSION_LIST -echo ::set-output name=ZOWE_CLI_ARTIFACTORY_FINAL::$ZOWE_CLI_ARTIFACTORY_FINAL +echo ZOWE_ARTIFACTORY_FINAL=$ZOWE_ARTIFACTORY_FINAL >>$GITHUB_OUTPUT +echo ZOWE_ARTIFACTORY_FINAL_FILENAME=$ZOWE_ARTIFACTORY_FINAL_FILENAME >>$GITHUB_OUTPUT +echo NODE_HOME_PATTERN=/ZOWE/node/node-$ZOS_NODE_VERSION-os390-s390x >>$GITHUB_OUTPUT +echo TEST_SERVER=$TEST_SERVER >>$GITHUB_OUTPUT +echo TEST_SERVER_NICKNAME=$TEST_SERVER_NICKNAME >>$GITHUB_OUTPUT +echo EXTENSION_LIST=$EXTENSION_LIST >>$GITHUB_OUTPUT +echo ZOWE_CLI_ARTIFACTORY_FINAL=$ZOWE_CLI_ARTIFACTORY_FINAL >>$GITHUB_OUTPUT # Echo all processed outputs echo @@ -28,4 +28,4 @@ printf "Zowe CLI artifactory path: ${CYAN}$ZOWE_CLI_ARTIFACTORY_FINAL${NC}\n" printf "Zowe extension list: ${CYAN}$EXTENSION_LIST${NC}\n" printf "Test server: ${CYAN}$TEST_SERVER${NC}\n" printf "Test server nickname: ${CYAN}$TEST_SERVER_NICKNAME${NC}\n" -printf "Node home pattern on z/OS: ${CYAN}/ZOWE/node/node-$ZOS_NODE_VERSION-os390-s390x${NC}\n" \ No newline at end of file +printf "Node home pattern on z/OS: ${CYAN}/ZOWE/node/node-$ZOS_NODE_VERSION-os390-s390x${NC}\n" diff --git a/.github/workflows/build-packaging.yml b/.github/workflows/build-packaging.yml index 9324b79291..66d21b9395 100644 --- a/.github/workflows/build-packaging.yml +++ b/.github/workflows/build-packaging.yml @@ -128,7 +128,7 @@ jobs: echo INPUTS_KEEP_TEMP_PAX_FOLDER=${{ github.event.inputs.KEEP_TEMP_PAX_FOLDER }} >> $GITHUB_ENV - echo ::set-output name=BUILD_WHAT::$BUILD_WHAT + echo BUILD_WHAT=$BUILD_WHAT >> $GITHUB_OUTPUT - name: '[Prep 7] Comment on PR to indicate build is started' uses: actions/github-script@v5 @@ -194,17 +194,17 @@ jobs: id: pax-prep run: | if [ "${{ env.INPUTS_BUILD_SMPE }}" == "true" ] || [ "${{ env.INPUTS_BUILD_PSWI }}" == "true" ] ; then - echo ::set-output name=EXTRA_FILES::zowe-smpe.zip,fmid.zip,pd.htm,smpe-promote.tar,smpe-build-logs.pax.Z,rename-back.sh - echo ::set-output name=BUILD_SMPE::yes + echo EXTRA_FILES=zowe-smpe.zip,fmid.zip,pd.htm,smpe-promote.tar,smpe-build-logs.pax.Z,rename-back.sh >> $GITHUB_OUTPUT + echo BUILD_SMPE=yes >> $GITHUB_OUTPUT else - echo ::set-output name=EXTRA_FILES:: - echo ::set-output name=BUILD_SMPE:: + echo EXTRA_FILES= >> $GITHUB_OUTPUT + echo BUILD_SMPE= >> $GITHUB_OUTPUT fi if [ "${{ env.INPUTS_KEEP_TEMP_PAX_FOLDER }}" == "true" ] ; then - echo ::set-output name=KEEP_TEMP_FOLDER::yes + echo KEEP_TEMP_FOLDER=yes >> $GITHUB_OUTPUT else - echo ::set-output name=KEEP_TEMP_FOLDER:: + echo KEEP_TEMP_FOLDER= >> $GITHUB_OUTPUT fi - name: '[PAX/SMPE Pax 2] Packaging' diff --git a/.github/workflows/snyk-analysis.yml b/.github/workflows/snyk-analysis.yml index 35b4290aa1..24e9211808 100644 --- a/.github/workflows/snyk-analysis.yml +++ b/.github/workflows/snyk-analysis.yml @@ -36,7 +36,7 @@ jobs: UBI_ARRAY=$(echo "${image_list}" | sed -e 's/-ubuntu/-ubi/' | sed -e 's/^\(.*\)$/{"images":"\1"},/') echo ">>>>> UBI images:" echo "${UBI_ARRAY}" - echo ::set-output name=image-matrix::{\"include\":[${UBUNTU_ARRAY}${UBI_ARRAY}]} + echo image-matrix={\"include\":[${UBUNTU_ARRAY}${UBI_ARRAY}]} >> $GITHUB_OUTPUT outputs: image-matrix: ${{ steps.setup-image-matrix.outputs.image-matrix }} diff --git a/.github/workflows/zwe-doc-generation.yml b/.github/workflows/zwe-doc-generation.yml index 5a54d9b7dd..23a42c9e49 100644 --- a/.github/workflows/zwe-doc-generation.yml +++ b/.github/workflows/zwe-doc-generation.yml @@ -58,10 +58,10 @@ jobs: then echo ">>>>>Changes committed to ${{ env.DOCS_SITE_COMMIT_BRANCH }}, now pushing"; git push origin ${{ env.DOCS_SITE_COMMIT_BRANCH }} - echo "::set-output name=createPr::true" + echo "createPr=true" >> $GITHUB_OUTPUT else echo ">>>>>No update to documentation"; - echo "::set-output name=createPr::false" + echo "createPr=false" >> $GITHUB_OUTPUT fi - name: Create PR if doesn't exist From 9daa362bc885ed8b380bc05cdaa63d3b5d6b306f Mon Sep 17 00:00:00 2001 From: Jiri Aichler Date: Tue, 23 May 2023 15:25:50 +0200 Subject: [PATCH 007/168] Add permissions for distributed identity mapping --- workflows/templates/ZWESECUR.vtl | 56 +++++++++++++++++++++++++------- 1 file changed, 45 insertions(+), 11 deletions(-) diff --git a/workflows/templates/ZWESECUR.vtl b/workflows/templates/ZWESECUR.vtl index 46b56e8277..ce05c56422 100644 --- a/workflows/templates/ZWESECUR.vtl +++ b/workflows/templates/ZWESECUR.vtl @@ -344,6 +344,12 @@ RDEFINE FACILITY BPX.SERVER UACC(NONE) PERMIT BPX.SERVER CLASS(FACILITY) ACCESS(UPDATE) ID(&ZOWEUSER.) +/* permit Zowe main server to create a user's security environment */ +/* comment out the following 2 lines if the OMVSAPPL is not defined */ +/* in your environment */ + PERMIT OMVSAPPL CLASS(APPL) ID(&ZOWEUSER.) ACCESS(READ) + SETROPTS RACLIST(APPL) REFRESH + /* permit Zowe main server to set job name */ RLIST FACILITY BPX.JOBNAME ALL RDEFINE FACILITY BPX.JOBNAME UACC(NONE) @@ -351,21 +357,27 @@ SETROPTS RACLIST(FACILITY) REFRESH -/** comment out to not use SUPERUSER.FILESYS, see JCL comments */ -/** permit Zowe main server to write persistent data */ +/* comment out to not use SUPERUSER.FILESYS, see JCL comments */ +/* permit Zowe main server to write persistent data */ RLIST UNIXPRIV SUPERUSER.FILESYS ALL RDEFINE UNIXPRIV SUPERUSER.FILESYS UACC(NONE) PERMIT SUPERUSER.FILESYS CLASS(UNIXPRIV) ACCESS(CONTROL) - ID(&ZOWEUSER.) - SETROPTS RACLIST(UNIXPRIV) REFRESH + SETROPTS RACLIST(UNIXPRIV) REFRESH -/** permit Zowe main server to use identity mapping service */ +/* permit Zowe main server to use client certificate mapping service */ RLIST FACILITY IRR.RUSERMAP ALL RDEFINE FACILITY IRR.RUSERMAP UACC(NONE) PERMIT IRR.RUSERMAP CLASS(FACILITY) ACCESS(READ) ID(&ZOWEUSER.) -/** permit Zowe main server to cut SMF records */ +/* permit Zowe main server to use distributed identity mapping */ +/* service + RLIST FACILITY IRR.IDIDMAP.QUERY ALL + RDEFINE FACILITY IRR.IDIDMAP.QUERY UACC(NONE) + PERMIT IRR.IDIDMAP.QUERY CLASS(FACILITY) ACCESS(READ) ID(&ZOWEUSER.) + +/* permit Zowe main server to cut SMF records */ RLIST FACILITY IRR.RAUDITX ALL RDEFINE FACILITY IRR.RAUDITX UACC(NONE) PERMIT IRR.RAUDITX CLASS(FACILITY) ACCESS(READ) ID(&ZOWEUSER.) @@ -563,6 +575,13 @@ SET RESOURCE(FAC) RECKEY BPX ADD(DAEMON SERVICE(UPDATE) ROLE(&STCGRP.) ALLOW) RECKEY BPX ADD(SERVER SERVICE(UPDATE) ROLE(&STCGRP.) ALLOW) * +* permit Zowe main server to create a user's security environment +* comment out the following 3 lines if the OMVSAPPL is not defined +* in your environment +SET RESOURCE(APL) +RECKEY OMVSAPPL ADD(SERVICE(READ) ROLE(&STCGRP.) ALLOW) +F ACF2,REBUILD(APL) +* * Allow STCGRP role access to BPX.JOBNAME RECKEY BPX ADD(JOBNAME SERVICE(READ) ROLE(&STCGRP.) ALLOW) F ACF2,REBUILD(FAC) @@ -583,12 +602,17 @@ STORE F ACF2,REBUILD(UNI) -/** Allow STCGRP role to use identity mapping service */ +* allow STCGRP role to use client certificate mapping service SET RESOURCE(FAC) RECKEY IRR ADD(RUSERMAP ROLE(&STCGRP.) SERVICE(READ) ALLOW) F ACF2,REBUILD(FAC) -/** permit Zowe main server to cut SMF records */ +* allow STCGRP role to use distributed identity mapping service +SET RESOURCE(FAC) +RECKEY IRR ADD(IDIDMAP.QUERY ROLE(&STCGRP.) SERVICE(READ) ALLOW) +F ACF2,REBUILD(FAC) + +* permit Zowe main server to cut SMF records SET RESOURCE(FAC) RECKEY IRR ADD(RAUDITX ROLE(&STCGRP.) SERVICE(READ) ALLOW) F ACF2,REBUILD(FAC) @@ -768,21 +792,31 @@ $$ TSS WHOHAS IBMFAC(BPX.SERVER) TSS PER(&ZOWEUSER.) IBMFAC(BPX.SERVER) ACCESS(UPDATE) +/* permit Zowe main server to create a user's security environment */ +/* comment out the following line if the OMVSAPPL is not defined */ +/* in your environment */ +TSS PERMIT(&ZOWEUSER.) APPL(OMVSAPPL) + /* Allow ZOWEUSER access to BPX.JOBNAME */ TSS WHOHAS IBMFAC(BPX.JOBNAME) TSS PER(&ZOWEUSER.) IBMFAC(BPX.JOBNAME) ACCESS(READ) -/** comment out to not use SUPERUSER.FILESYS, see JCL comments */ -/** permit Zowe main server to write persistent data */ +/* comment out to not use SUPERUSER.FILESYS, see JCL comments */ +/* permit Zowe main server to write persistent data */ TSS ADD(&FACACID.) UNIXPRIV(SUPERUSE) TSS WHOHAS UNIXPRIV(SUPERUSER.FILESYS) TSS PER(&ZOWEUSER.) UNIXPRIV(SUPERUSER.FILESYS) ACCESS(CONTROL) -/** permit Zowe main server to use identity mapping service */ +/* permit Zowe main server to use client certificate mapping service */ TSS WHOHAS IBMFAC(IRR.RUSERMAP) TSS PER(&ZOWEUSER.) IBMFAC(IRR.RUSERMAP) ACCESS(READ) -/** permit Zowe main server to cut SMF records */ +/* permit Zowe main server to use distributed identity mapping */ +/* service + TSS WHOHAS IBMFAC(IRR.IDIDMAP.QUERY) + TSS PER(&ZOWEUSER.) IBMFAC(IRR.IDIDMAP.QUERY) ACCESS(READ) + +/* permit Zowe main server to cut SMF records */ TSS WHOHAS IBMFAC(IRR.RAUDITX) TSS PER(&ZOWEUSER.) IBMFAC(IRR.RAUDITX) ACCESS(READ) From 51a41a033901fa4549fd81c175f72cebc4d97d4e Mon Sep 17 00:00:00 2001 From: Jiri Aichler Date: Tue, 23 May 2023 15:40:26 +0200 Subject: [PATCH 008/168] Add permissions for distributed identity mapping --- workflows/templates/ZWESECUR.vtl | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/workflows/templates/ZWESECUR.vtl b/workflows/templates/ZWESECUR.vtl index ce05c56422..d32ecb48dc 100644 --- a/workflows/templates/ZWESECUR.vtl +++ b/workflows/templates/ZWESECUR.vtl @@ -231,7 +231,7 @@ /* enabled. */ /* group for administrators */ -/* replace AUTOGID with GID(&ADMINGID.) if AUTOGID not enabled */ +/* replace AUTOGID with GID(&ADMINGID.) if AUTOGID not enabled */ LISTGRP &ADMINGRP. OMVS ADDGROUP &ADMINGRP. OMVS(AUTOGID) - DATA('ZOWE ADMINISTRATORS') @@ -375,7 +375,8 @@ /* service RLIST FACILITY IRR.IDIDMAP.QUERY ALL RDEFINE FACILITY IRR.IDIDMAP.QUERY UACC(NONE) - PERMIT IRR.IDIDMAP.QUERY CLASS(FACILITY) ACCESS(READ) ID(&ZOWEUSER.) + PERMIT IRR.IDIDMAP.QUERY CLASS(FACILITY) ACCESS(READ) - + ID(&ZOWEUSER.) /* permit Zowe main server to cut SMF records */ RLIST FACILITY IRR.RAUDITX ALL From bc49540d9967e98689b81af378d7b979ca28e31a Mon Sep 17 00:00:00 2001 From: Jiri Aichler Date: Thu, 25 May 2023 15:53:46 +0200 Subject: [PATCH 009/168] Add permissions for distributed identity mapping --- files/SZWESAMP/ZWENOSEC | 42 ++++++++++++++++++++++++++++++++++++++--- 1 file changed, 39 insertions(+), 3 deletions(-) diff --git a/files/SZWESAMP/ZWENOSEC b/files/SZWESAMP/ZWENOSEC index f452f06f2c..ed23a934cc 100644 --- a/files/SZWESAMP/ZWENOSEC +++ b/files/SZWESAMP/ZWENOSEC @@ -135,6 +135,8 @@ RLIST FACILITY BPX.SERVER ALL PERMIT BPX.SERVER CLASS(FACILITY) DELETE ID(&ZOWEUSER.) + PERMIT OMVSAPPL CLASS(APPL) DELETE ID(&ZOWEUSER.) + /* remove permit to set jobname */ RLIST FACILITY BPX.JOBNAME ALL PERMIT BPX.JOBNAME CLASS(FACILITY) DELETE ID(&ZOWEUSER.) @@ -143,9 +145,15 @@ RLIST UNIXPRIV SUPERUSER.FILESYS ALL PERMIT SUPERUSER.FILESYS CLASS(UNIXPRIV) DELETE ID(&ZOWEUSER.) -/* remove permit to use identity mapping service */ +/* remove permit to use client certificate mapping service */ PERMIT IRR.RUSERMAP CLASS(FACILITY) DELETE ID(&ZOWEUSER.) +/* remove permit to use distributed identity mapping service */ + PERMIT IRR.IDIDMAP.QUERY CLASS(FACILITY) DELETE ID(&ZOWEUSER.) + +/* remove permit Zowe main server to cut SMF records */ + PERMIT IRR.RAUDITX CLASS(FACILITY) DELETE ID(&ZOWEUSER.) + SETROPTS RACLIST(FACILITY) REFRESH SETROPTS RACLIST(UNIXPRIV) REFRESH @@ -281,6 +289,9 @@ RECKEY BPX DEL(DAEMON ROLE(&STCGRP.) SERVICE(UPDATE) ALLOW) RECKEY BPX DEL(SERVER ROLE(&STCGRP.) SERVICE(UPDATE) ALLOW) RECKEY BPX DEL(JOBNAME ROLE(&STCGRP.) SERVICE(READ) ALLOW) F ACF2,REBUILD(FAC) +SET RESOURCE(APL) +RECKEY OMVSAPPL DEL(SERVICE(READ) ROLE(&STCGRP.) ALLOW) +F ACF2,REBUILD(APL) * Remove UNI * SET RESOURCE(UNI) @@ -289,11 +300,23 @@ DELETE SUPERUSER.FILESYS F ACF2,REBUILD(UNI) -/* Remove STCGRP role permission to use identity mapping service */ +* Remove STCGRP role permission to use client certificate mapping +* service SET RESOURCE(FAC) RECKEY IRR DEL(RUSERMAP ROLE(&STCGRP.) SERVICE(READ) ALLOW) F ACF2,REBUILD(FAC) +* Remove STCGRP role permission to use distributed certificate mapping +* service +SET RESOURCE(FAC) +RECKEY IRR DEL(IDIDMAP.QUERY ROLE(&STCGRP.) SERVICE(READ) ALLOW) +F ACF2,REBUILD(FAC) + +* Remove STCGRP role permission to cut SMF records +SET RESOURCE(FAC) +RECKEY IRR DEL(RAUDITX ROLE(&STCGRP.) SERVICE(READ) ALLOW) +F ACF2,REBUILD(FAC) + * Remove data set protection SET RULE LIST &HLQ. @@ -337,6 +360,8 @@ TSS WHOHAS IBMFAC(BPX.DAEMON) TSS REVOKE(&ZOWEUSER) IBMFAC(BPX.DAEMON) TSS WHOHAS IBMFAC(BPX.SERVER) TSS REVOKE(&ZOWEUSER) IBMFAC(BPX.SERVER) +TSS WHOHAS APPL(OMVSAPPL) +TSS REVOKE(&ZOWEUSER) APPL(OMVSAPPL) /* remove permit to set jobname */ TSS WHOHAS IBMFAC(BPX.JOBNAME) @@ -346,9 +371,20 @@ TSS REVOKE(&ZOWEUSER) IBMFAC(BPX.JOBNAME) TSS WHOHAS UNIXPRIV(SUPERUSER.FILESYS) TSS REVOKE(&ZOWEUSER) UNIXPRIV(SUPERUSER.FILESYS) -/* remove permit Zowe main server to use identity mapping service */ +/* remove permit Zowe main server to use client certificate mapping */ +/* service */ +TSS WHOHAS IBMFAC(IRR.RUSERMAP) TSS REVOKE(&ZOWEUSER.) IBMFAC(IRR.RUSERMAP) +/* remove permit Zowe main server to use distributed identity */ +/* mapping service */ +TSS WHOHAS IBMFAC(IRR.IDIDMAP.QUERY) +TSS REVOKE(&ZOWEUSER.) IBMFAC(IRR.IDIDMAP.QUERY) + +/* remove permit Zowe main server to cut SMF records */ +TSS WHOHAS IBMFAC(IRR.RAUDITX) +TSS REVOKE(&ZOWEUSER.) IBMFAC(IRR.RAUDITX) + /* REMOVE AUX SERVER PERMISIONS .................................... */ /* remove permit to use ZIS */ From c9655cf447b508fbe78f67311b7b8d253077cd3c Mon Sep 17 00:00:00 2001 From: AdarshdeepCheema <57364561+AdarshdeepCheema@users.noreply.github.com> Date: Tue, 30 May 2023 14:24:19 -0400 Subject: [PATCH 010/168] Update Explorer versions Signed-off-by: AdarshdeepCheema <57364561+AdarshdeepCheema@users.noreply.github.com> --- manifest.json.template | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/manifest.json.template b/manifest.json.template index 5e8dcc4c20..b701518c87 100644 --- a/manifest.json.template +++ b/manifest.json.template @@ -60,13 +60,13 @@ "artifact": "files-api-package-*.zip" }, "org.zowe.explorer-jes": { - "version": "2.0.6" + "version": "2.0.7" }, "org.zowe.explorer-mvs": { - "version": "2.0.6" + "version": "2.0.7" }, "org.zowe.explorer-uss": { - "version": "2.0.6" + "version": "2.0.7" }, "org.zowe.explorer-ip": { "version": "2.0.0", @@ -275,21 +275,21 @@ "componentGroup": "Zowe Desktop Data Sets UI Plugin", "entries": [{ "repository": "explorer-mvs", - "tag": "v2.0.6", + "tag": "v2.0.7", "destinations": ["Zowe PAX"] }] }, { "componentGroup": "Zowe Desktop JES UI Plugin", "entries": [{ "repository": "explorer-jes", - "tag": "v2.0.6", + "tag": "v2.0.7", "destinations": ["Zowe PAX"] }] }, { "componentGroup": "Zowe Desktop z/OS Unix Files UI Plugin", "entries": [{ "repository": "explorer-uss", - "tag": "v2.0.6", + "tag": "v2.0.7", "destinations": ["Zowe PAX"] }] }, { @@ -444,19 +444,19 @@ "kind": "job", "registry": "zowe-docker-release.jfrog.io", "name": "ompzowe/explorer-jes", - "tag" : "2.0.6-ubuntu" + "tag" : "2.0.7-ubuntu" }, "explorer-mvs": { "kind": "job", "registry": "zowe-docker-release.jfrog.io", "name": "ompzowe/explorer-mvs", - "tag" : "2.0.6-ubuntu" + "tag" : "2.0.7-ubuntu" }, "explorer-uss": { "kind": "job", "registry": "zowe-docker-release.jfrog.io", "name": "ompzowe/explorer-uss", - "tag" : "2.0.6-ubuntu" + "tag" : "2.0.7-ubuntu" }, "files-api": { "registry": "zowe-docker-release.jfrog.io", From ba614bc0267593e1be878c1e16e423dde84be828 Mon Sep 17 00:00:00 2001 From: 1000TurquoisePogs Date: Tue, 30 May 2023 19:09:47 +0000 Subject: [PATCH 011/168] Default to using configmgr (#3423) * Update common.sh Default to using configmgr unless explicitly set false Signed-off-by: 1000TurquoisePogs * Update CHANGELOG.md Signed-off-by: 1000TurquoisePogs * Update pre-packaging.sh Signed-off-by: 1000TurquoisePogs --------- Signed-off-by: 1000TurquoisePogs --- .pax/pre-packaging.sh | 1 + CHANGELOG.md | 5 +++++ bin/libs/common.sh | 6 +++++- 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/.pax/pre-packaging.sh b/.pax/pre-packaging.sh index a106be6a70..eccbd2d66a 100755 --- a/.pax/pre-packaging.sh +++ b/.pax/pre-packaging.sh @@ -226,6 +226,7 @@ echo "[$SCRIPT_NAME] create dummy zowe.yaml for install" cat <> "${BASE_DIR}/zowe.yaml" zowe: extensionDirectory: "${ZOWE_ROOT_DIR}/components" + useConfigmgr: false EOT echo "[$SCRIPT_NAME] extract components" diff --git a/CHANGELOG.md b/CHANGELOG.md index 0aaf7b1f43..60a5e3c4b7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,11 @@ All notable changes to the Zowe Installer will be documented in this file. +## `2.9.0` + +### New features and enhancements +- Users who have not set the value of "zowe.useConfimgr" will have the behavior now set to "true" rather than the previous "false". If you wish to use false still, just set "zowe.useConfigmgr=false" explicitly. + ## `2.8.0` ### New features and enhancements diff --git a/bin/libs/common.sh b/bin/libs/common.sh index 8a59d278ce..5db74cc256 100644 --- a/bin/libs/common.sh +++ b/bin/libs/common.sh @@ -36,7 +36,11 @@ check_configmgr_enabled() { echo "true" else USE_CONFIGMGR=$(shell_read_yaml_config "${ZWE_CLI_PARAMETER_CONFIG}" 'zowe' 'useConfigmgr') - echo $USE_CONFIGMGR + if [ "${USE_CONFIGMGR}" = "false" ]; then + echo "false" + else + echo "true" + fi fi fi } From cdd6fac6aa587614004c7f3dea15534a5a317f39 Mon Sep 17 00:00:00 2001 From: mm667937 Date: Wed, 31 May 2023 11:26:47 +0200 Subject: [PATCH 012/168] Disabled cleanups and test to find out what's wrong Signed-off-by: mm667937 --- pswi/PSWI-marist.sh | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pswi/PSWI-marist.sh b/pswi/PSWI-marist.sh index 4c135e83eb..07a0dc5e6f 100644 --- a/pswi/PSWI-marist.sh +++ b/pswi/PSWI-marist.sh @@ -121,25 +121,25 @@ sh 03_create.sh create=$? # Cleanup after the creation of PSWI -sh 04_create_cleanup.sh +#sh 04_create_cleanup.sh if [ $create -eq 0 ];then # Test PSWI -sh 05_test.sh +#sh 05_test.sh test=$? # Cleanup after the test -sh 06_test_cleanup.sh +#sh 06_test_cleanup.sh fi fi fi # Cleanup of SMP/E -sh 07_smpe_cleanup.sh +#sh 07_smpe_cleanup.sh fi # Clean RELFILEs and PTFs -sh 08_presmpe_cleanup.sh +#sh 08_presmpe_cleanup.sh echo "" echo "" From 8d6e9223663ba967c4d3954932b680c1e1a3ab6a Mon Sep 17 00:00:00 2001 From: mm667937 Date: Wed, 31 May 2023 14:35:35 +0200 Subject: [PATCH 013/168] Increased sizes, added test back Signed-off-by: mm667937 --- pswi/PSWI-marist.sh | 2 +- pswi/workflows/SMPE20 | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pswi/PSWI-marist.sh b/pswi/PSWI-marist.sh index 07a0dc5e6f..5c0aaf6643 100644 --- a/pswi/PSWI-marist.sh +++ b/pswi/PSWI-marist.sh @@ -125,7 +125,7 @@ create=$? if [ $create -eq 0 ];then # Test PSWI -#sh 05_test.sh +sh 05_test.sh test=$? # Cleanup after the test diff --git a/pswi/workflows/SMPE20 b/pswi/workflows/SMPE20 index 47a5e5e409..e63fabca2b 100644 --- a/pswi/workflows/SMPE20 +++ b/pswi/workflows/SMPE20 @@ -465,7 +465,7 @@ // MGMTCLAS=&MGCLAS, #end // DSNTYPE=LIBRARY, -// SPACE=(TRK,(12000,3000,80)) +// SPACE=(TRK,(5250,5250,80)) //* //SMPSCDS DD DSN=&DSPREFIX..SMPSCDS, // DISP=(NEW,CATLG,DELETE), @@ -1142,7 +1142,7 @@ MANAGEMENTCLASS(&MGCLAS) - #end LINEAR - - TRACKS(21000 2100) - + TRACKS(27900 2100) - SHAREOPTIONS(3) - ) //* From af32d4e46a3f9007dadfed9363f275848fea1dca Mon Sep 17 00:00:00 2001 From: 1000TurquoisePogs Date: Wed, 31 May 2023 14:17:36 +0000 Subject: [PATCH 014/168] no pem required for keyring (#3408) * Update manifest.json.template Signed-off-by: 1000TurquoisePogs * Update zowe-yaml-schema.json Update schema to separate keyring from pkcs12 Signed-off-by: 1000TurquoisePogs * Update zowe-yaml-schema.json Signed-off-by: 1000TurquoisePogs * Update manifest.json.template revert manifest to normal Signed-off-by: 1000TurquoisePogs --------- Signed-off-by: 1000TurquoisePogs --- schemas/zowe-yaml-schema.json | 104 ++++++++++++++++++++++++++++++++-- 1 file changed, 99 insertions(+), 5 deletions(-) diff --git a/schemas/zowe-yaml-schema.json b/schemas/zowe-yaml-schema.json index 54767256ff..52b6dcb0df 100644 --- a/schemas/zowe-yaml-schema.json +++ b/schemas/zowe-yaml-schema.json @@ -628,6 +628,12 @@ "maximum": 65535 }, "certificate": { + "oneOf": [ + { "$ref": "#/$defs/pkcs12-certificate" }, + { "$ref": "#/$defs/keyring-certificate" } + ] + }, + "pkcs12-certificate": { "type": "object", "additionalProperties": false, "required": ["keystore", "truststore", "pem"], @@ -641,11 +647,11 @@ "type": { "type": "string", "description": "Keystore type.", - "enum": ["PKCS12", "JCEKS", "JCECCAKS", "JCERACFKS", "JCECCARACFKS", "JCEHYBRIDRACFKS"] + "const": "PKCS12" }, "file": { "type": "string", - "description": "Path to your PKCS#12 keystore or z/OS keyring." + "description": "Path to your PKCS#12 keystore." }, "password": { "type": "string", @@ -653,7 +659,7 @@ }, "alias": { "type": "string", - "description": "Certificate alias name of defined in your PKCS#12 keystore, or certificate label of z/OS keyring." + "description": "Certificate alias name of defined in your PKCS#12 keystore" } } }, @@ -666,11 +672,11 @@ "type": { "type": "string", "description": "Truststore type.", - "enum": ["PKCS12", "JCEKS", "JCECCAKS", "JCERACFKS", "JCECCARACFKS", "JCEHYBRIDRACFKS"] + "const": "PKCS12" }, "file": { "type": "string", - "description": "Path to your PKCS#12 keystore or z/OS keyring." + "description": "Path to your PKCS#12 keystore." }, "password": { "type": "string", @@ -711,6 +717,94 @@ } } }, + "keyring-certificate": { + "type": "object", + "additionalProperties": false, + "required": ["keystore", "truststore"], + "properties": { + "keystore": { + "type": "object", + "additionalProperties": false, + "description": "Certificate keystore.", + "required": ["type", "file", "alias"], + "properties": { + "type": { + "type": "string", + "description": "Keystore type.", + "enum": ["JCEKS", "JCECCAKS", "JCERACFKS", "JCECCARACFKS", "JCEHYBRIDRACFKS"] + }, + "file": { + "type": "string", + "description": "Path of your z/OS keyring, including ring owner and ring name. Case sensitivity and spaces matter.", + "pattern": "^safkeyring:\/\/.*" + }, + "password": { + "type": "string", + "description": "Literally 'password' may be needed when using keyrings for compatibility with java servers.", + "enum": ["", "password"] + }, + "alias": { + "type": "string", + "description": "Certificate label of z/OS keyring. Case sensitivity and spaces matter." + } + } + }, + "truststore": { + "type": "object", + "additionalProperties": false, + "description": "Certificate truststore.", + "required": ["type", "file"], + "properties": { + "type": { + "type": "string", + "description": "Truststore type.", + "enum": ["JCEKS", "JCECCAKS", "JCERACFKS", "JCECCARACFKS", "JCEHYBRIDRACFKS"] + }, + "file": { + "type": "string", + "description": "Path of your z/OS keyring, including ring owner and ring name. Case sensitivity and spaces matter.", + "pattern": "^safkeyring:\/\/.*" + }, + "password": { + "type": "string", + "description": "Literally 'password' may be needed when using keyrings for compatibility with java servers.", + "enum": ["", "password"] + } + } + }, + "pem": { + "type": "object", + "additionalProperties": false, + "description": "Certificate in PEM format.", + "required": ["key", "certificate"], + "properties": { + "key": { + "type": "string", + "description": "Path to the certificate private key stored in PEM format." + }, + "certificate": { + "type": "string", + "description": "Path to the certificate stored in PEM format." + }, + "certificateAuthorities": { + "description": "List of paths to the certificate authorities stored in PEM format.", + "oneOf": [{ + "type": "string", + "description": "Paths to the certificate authorities stored in PEM format. You can separate multiple certificate authorities by comma." + }, + { + "type": "array", + "description": "Path to the certificate authority stored in PEM format.", + "items": { + "type": "string" + } + } + ] + } + } + } + } + }, "component": { "$anchor": "zoweComponent", "type": "object", From d27ad9adc809eb9f3d7117dfc8404135e6f3616d Mon Sep 17 00:00:00 2001 From: mm667937 Date: Wed, 31 May 2023 17:15:25 +0200 Subject: [PATCH 015/168] Increased tmp zfs Signed-off-by: mm667937 --- pswi/PSWI-marist.sh | 6 +++--- pswi/scripts/tmp_mounts.sh | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pswi/PSWI-marist.sh b/pswi/PSWI-marist.sh index 5c0aaf6643..c6483ca70f 100644 --- a/pswi/PSWI-marist.sh +++ b/pswi/PSWI-marist.sh @@ -121,7 +121,7 @@ sh 03_create.sh create=$? # Cleanup after the creation of PSWI -#sh 04_create_cleanup.sh +sh 04_create_cleanup.sh if [ $create -eq 0 ];then # Test PSWI @@ -135,11 +135,11 @@ fi fi # Cleanup of SMP/E -#sh 07_smpe_cleanup.sh +sh 07_smpe_cleanup.sh fi # Clean RELFILEs and PTFs -#sh 08_presmpe_cleanup.sh +sh 08_presmpe_cleanup.sh echo "" echo "" diff --git a/pswi/scripts/tmp_mounts.sh b/pswi/scripts/tmp_mounts.sh index 99e45c7480..c2e5f89370 100644 --- a/pswi/scripts/tmp_mounts.sh +++ b/pswi/scripts/tmp_mounts.sh @@ -9,7 +9,7 @@ echo "Checking if file system ${ZFS} is mounted." RESP=`curl -s "${BASE_URL}/zosmf/restfiles/mfs?fsname=${ZFS}" -k -X "GET" -H "Content-Type: application/json" -H "X-CSRF-ZOSMF-HEADER: A" --user $ZOSMF_USER:$ZOSMF_PASS` MOUNTP=`echo $RESP | grep -o '"mountpoint":".*"' | cut -f4 -d\"` -NEW_ZFS_JSON='{"cylsPri":1160,"cylsSec": 116,"volumes":[ "'${VOLUME}'" ]}' +NEW_ZFS_JSON='{"cylsPri":2000,"cylsSec": 140,"volumes":[ "'${VOLUME}'" ]}' if [ -n "$MOUNTP" ] From bfab487690173b077d2c75fc2e3363005dd095f9 Mon Sep 17 00:00:00 2001 From: Amanda D'Errico Date: Wed, 31 May 2023 11:42:26 -0400 Subject: [PATCH 016/168] bump explorer api versions 2.9 Signed-off-by: Amanda D'Errico --- manifest.json.template | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/manifest.json.template b/manifest.json.template index 5e8dcc4c20..a38308dda8 100644 --- a/manifest.json.template +++ b/manifest.json.template @@ -52,11 +52,11 @@ "artifact": "zss-2.8.0-rc-832-20230413175321.pax" }, "org.zowe.explorer.jobs.jobs-api-package": { - "version": "2.0.16", + "version": "2.0.17", "artifact": "jobs-api-package-*.zip" }, "org.zowe.explorer.files.files-api-package": { - "version": "2.0.16", + "version": "2.0.17", "artifact": "files-api-package-*.zip" }, "org.zowe.explorer-jes": { @@ -296,21 +296,21 @@ "componentGroup": "Zowe Explorer Common REST Server", "entries": [{ "repository": "explorer-api-common", - "tag": "2.0.20", + "tag": "2.0.21", "destinations": ["Zowe PAX"] }] }, { "componentGroup": "Zowe Explorer Data Sets REST Server", "entries": [{ "repository": "data-sets", - "tag": "2.0.16", + "tag": "2.0.17", "destinations": ["Zowe PAX"] }] }, { "componentGroup": "Zowe Explorer Jobs REST Server", "entries": [{ "repository": "jobs", - "tag": "2.0.16", + "tag": "2.0.17", "destinations": ["Zowe PAX"] }] }, @@ -461,12 +461,12 @@ "files-api": { "registry": "zowe-docker-release.jfrog.io", "name": "ompzowe/files-api", - "tag" : "2.0.16-ubuntu" + "tag" : "2.0.17-ubuntu" }, "jobs-api": { "registry": "zowe-docker-release.jfrog.io", "name": "ompzowe/jobs-api", - "tag" : "2.0.16-ubuntu" + "tag" : "2.0.17-ubuntu" }, "base": { "registry": "zowe-docker-release.jfrog.io", From 37ee642c5e9e02ded43abb378f7e0e617761baed Mon Sep 17 00:00:00 2001 From: Timothy Johnson Date: Wed, 31 May 2023 12:36:20 -0400 Subject: [PATCH 017/168] Update CLI component versions for Zowe 2.9.0 Signed-off-by: Timothy Johnson --- manifest.json.template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/manifest.json.template b/manifest.json.template index 5e8dcc4c20..3ab9b2ff8b 100644 --- a/manifest.json.template +++ b/manifest.json.template @@ -140,7 +140,7 @@ "componentGroup": "Imperative CLI Framework for Zowe", "entries": [{ "repository": "imperative", - "tag": "v5.12.0", + "tag": "v5.14.1", "destinations": ["Zowe CLI Package"] }] }, { @@ -219,7 +219,7 @@ "componentGroup": "Zowe CLI", "entries": [{ "repository": "zowe-cli", - "tag": "v7.13.0", + "tag": "v7.16.4", "destinations": ["Zowe CLI Package"] }] }, { @@ -233,7 +233,7 @@ "componentGroup": "IBM® Db2® Plug-in for Zowe CLI", "entries": [{ "repository": "zowe-cli-db2-plugin", - "tag": "v5.0.2", + "tag": "v5.0.3", "destinations": ["Zowe CLI Package"] }] }, { From 6266317e3dc90b5b7e9fd800d531cb679c10b1c9 Mon Sep 17 00:00:00 2001 From: mm667937 Date: Wed, 31 May 2023 18:39:05 +0200 Subject: [PATCH 018/168] cleaning up everything before testing Signed-off-by: mm667937 --- pswi/PSWI-marist.sh | 22 +++++++++++++++------- 1 file changed, 15 insertions(+), 7 deletions(-) diff --git a/pswi/PSWI-marist.sh b/pswi/PSWI-marist.sh index c6483ca70f..ab3f30b677 100644 --- a/pswi/PSWI-marist.sh +++ b/pswi/PSWI-marist.sh @@ -122,6 +122,10 @@ create=$? # Cleanup after the creation of PSWI sh 04_create_cleanup.sh +# Cleanup of SMP/E +sh 07_smpe_cleanup.sh +# Clean RELFILEs and PTFs +sh 08_presmpe_cleanup.sh if [ $create -eq 0 ];then # Test PSWI @@ -129,18 +133,22 @@ sh 05_test.sh test=$? # Cleanup after the test -#sh 06_test_cleanup.sh +sh 06_test_cleanup.sh fi +else + # Cleanup of SMP/E if PTF weren't successful - because the earlier cleanup runs only it it was success + sh 07_smpe_cleanup.sh + # Clean RELFILEs and PTFs +sh 08_presmpe_cleanup.sh fi +else + # Cleanup of SMP/E if SMPE weren't successful - because the earlier cleanup runs only it it was success + sh 07_smpe_cleanup.sh + # Clean RELFILEs and PTFs +sh 08_presmpe_cleanup.sh fi - -# Cleanup of SMP/E -sh 07_smpe_cleanup.sh fi -# Clean RELFILEs and PTFs -sh 08_presmpe_cleanup.sh - echo "" echo "" From 50ba1068f2de2c028198098e1d1a32512c8c923c Mon Sep 17 00:00:00 2001 From: James Struga Date: Wed, 31 May 2023 12:51:24 -0400 Subject: [PATCH 019/168] WebUI RC1 for 2.9.0 Signed-off-by: James Struga --- manifest.json.template | 76 +++++++++++++++++++++--------------------- 1 file changed, 38 insertions(+), 38 deletions(-) diff --git a/manifest.json.template b/manifest.json.template index 5e8dcc4c20..5a9425b66f 100644 --- a/manifest.json.template +++ b/manifest.json.template @@ -1,6 +1,6 @@ { "name": "Zowe", - "version": "2.8.0", + "version": "2.9.0", "description": "Zowe is an open source project created to host technologies that benefit the Z platform from all members of the Z community (Integrated Software Vendors, System Integrators and z/OS consumers). Zowe, like Mac or Windows, comes with a set of APIs and OS capabilities that applications build on and also includes some applications out of the box. Zowe offers modern interfaces to interact with z/OS and allows you to work with z/OS in a way that is similar to what you experience on cloud platforms today. You can use these interfaces as delivered or through plug-ins and extensions that are created by clients or third-party vendors.", "license": "EPL-2.0", "homepage": "https://zowe.org", @@ -12,44 +12,44 @@ }, "binaryDependencies": { "org.zowe.zlux.zlux-core": { - "version": "2.8.0-RC", + "version": "2.9.0-RC", "repository": "libs-snapshot-local", - "artifact": "zlux-core-2.8.0-20230413.174954.pax" + "artifact": "zlux-core-2.9.0-20230531.164603.pax" }, "org.zowe.zlux.sample-angular-app": { - "version": "2.8.0-V2.X-RC", + "version": "2.9.0-V2.X-RC", "repository": "libs-snapshot-local", - "artifact": "sample-angular-app-2.8.0-20230413.174748.pax" + "artifact": "sample-angular-app-2.9.0-20230531.164048.pax" }, "org.zowe.zlux.sample-iframe-app": { - "version": "2.8.0-V2.X-RC", + "version": "2.9.0-V2.X-RC", "repository": "libs-snapshot-local", - "artifact": "sample-iframe-app-2.8.0-20230413.174603.pax" + "artifact": "sample-iframe-app-2.9.0-20230531.163947.pax" }, "org.zowe.zlux.sample-react-app": { - "version": "2.8.0-V2.X-RC", + "version": "2.9.0-V2.X-RC", "repository": "libs-snapshot-local", - "artifact": "sample-react-app-2.8.0-20230413.174743.pax" + "artifact": "sample-react-app-2.9.0-20230531.164112.pax" }, "org.zowe.zlux.tn3270-ng2": { - "version": "2.8.0-V2.X-RC", + "version": "2.9.0-V2.X-RC", "repository": "libs-snapshot-local", - "artifact": "tn3270-ng2-2.8.0-20230413.174837.pax" + "artifact": "tn3270-ng2-2.9.0-20230531.164056.pax" }, "org.zowe.zlux.vt-ng2": { - "version": "2.8.0-V2.X-RC", + "version": "2.9.0-V2.X-RC", "repository": "libs-snapshot-local", - "artifact": "vt-ng2-2.8.0-20230413.174946.pax" + "artifact": "vt-ng2-2.9.0-20230531.164117.pax" }, "org.zowe.zlux.zlux-editor": { - "version": "2.8.0-V2.X-RC", + "version": "2.9.0-V2.X-RC", "repository": "libs-snapshot-local", - "artifact": "zlux-editor-2.8.0-20230413.175234.pax" + "artifact": "zlux-editor-2.9.0-20230531.164506.pax" }, "org.zowe.zss": { - "version": "2.8.0-RC", + "version": "2.9.0-RC", "repository": "libs-snapshot-local", - "artifact": "zss-2.8.0-rc-832-20230413175321.pax" + "artifact": "zss-2.9.0-rc-877-20230531164613.pax" }, "org.zowe.explorer.jobs.jobs-api-package": { "version": "2.0.16", @@ -109,17 +109,17 @@ "artifact": "cloud-gateway-*.zip" }, "org.zowe.configmgr-rexx": { - "version": "2.8.0-V2.X-RC", + "version": "2.9.0-V2.X-RC", "repository": "libs-snapshot-local", - "artifact": "configmgr-rexx-2.8.0-2023041311.pax" + "artifact": "configmgr-rexx-2.9.0-2023053149.pax" }, "org.zowe.configmgr": { - "version": "2.8.0-V2.X-RC", + "version": "2.9.0-V2.X-RC", "repository": "libs-snapshot-local", - "artifact": "configmgr-2.8.0-2023041307.pax" + "artifact": "configmgr-2.9.0-2023053117.pax" }, "org.zowe.launcher": { - "version": "2.0.10" + "version": "2.0.11" }, "org.zowe.keyring-utilities": { "version": "1.0.4", @@ -161,12 +161,12 @@ "componentGroup": "Zowe Application Framework", "entries": [{ "repository": "zlux-app-manager", - "tag": "v2.8.0-RC1", + "tag": "v2.9.0-RC1", "destinations": ["Zowe PAX"] }, { "repository": "zlux-app-server", - "tag": "v2.8.0-RC1", + "tag": "v2.9.0-RC1", "destinations": ["Zowe PAX"] }, { @@ -181,17 +181,17 @@ }, { "repository": "zlux-platform", - "tag": "v2.8.0-RC1", + "tag": "v2.9.0-RC1", "destinations": ["Zowe PAX"] }, { "repository": "zlux-server-framework", - "tag": "v2.8.0-RC1", + "tag": "v2.9.0-RC1", "destinations": ["Zowe PAX"] }, { "repository": "zlux-shared", - "tag": "v2.8.0-RC1", + "tag": "v2.9.0-RC1", "destinations": ["Zowe PAX"] }, { @@ -201,17 +201,17 @@ }, { "repository": "zlux-build", - "tag": "v2.8.0-RC1", + "tag": "v2.9.0-RC1", "destinations": ["Zowe PAX"] }, { "repository": "zss", - "tag": "v2.8.0-RC1", + "tag": "v2.9.0-RC1", "destinations": ["Zowe PAX"] }, { "repository": "zowe-common-c", - "tag": "zss-v2.8.0-RC1", + "tag": "zss-v2.9.0-RC1", "destinations": ["Zowe PAX"] } ] @@ -318,14 +318,14 @@ "componentGroup": "Zowe Desktop TN3270 Emulator Plug-in", "entries": [{ "repository": "tn3270-ng2", - "tag": "v2.8.0-RC1", + "tag": "v2.9.0-RC1", "destinations": ["Zowe PAX"] }] }, { "componentGroup": "Zowe Desktop Sample Angular Application", "entries": [{ "repository": "sample-angular-app", - "tag": "v2.8.0-RC1", + "tag": "v2.9.0-RC1", "destinations": ["Zowe PAX"] }] }, @@ -333,7 +333,7 @@ "componentGroup": "Zowe Desktop Sample iFrame Application", "entries": [{ "repository": "sample-iframe-app", - "tag": "v2.8.0-RC1", + "tag": "v2.9.0-RC1", "destinations": ["Zowe PAX"] }] }, @@ -341,7 +341,7 @@ "componentGroup": "Zowe Desktop Sample React Application", "entries": [{ "repository": "sample-react-app", - "tag": "v2.8.0-RC1", + "tag": "v2.9.0-RC1", "destinations": ["Zowe PAX"] }] }, @@ -349,7 +349,7 @@ "componentGroup": "Zowe Desktop VT Emulator Plugin-in", "entries": [{ "repository": "vt-ng2", - "tag": "v2.8.0-RC1", + "tag": "v2.9.0-RC1", "destinations": ["Zowe PAX"] }] }, @@ -357,7 +357,7 @@ "componentGroup": "Zowe Desktop Editor Plugin-in", "entries": [{ "repository": "zlux-editor", - "tag": "v2.8.0-RC2", + "tag": "v2.9.0-RC1", "destinations": ["Zowe PAX"] }] }, @@ -397,7 +397,7 @@ "componentGroup": "Configmgr", "entries": [{ "repository": "zowe-common-c", - "tag": "configmgr-v2.8.0-RC1", + "tag": "configmgr-v2.9.0-RC1", "destinations": ["Zowe PAX"] }] } @@ -432,7 +432,7 @@ "app-server": { "registry": "zowe-docker-release.jfrog.io", "name": "ompzowe/app-server", - "tag" : "2.8.0-ubuntu" + "tag" : "2.9.0-ubuntu" }, "explorer-ip": { "kind": "job", From c9fc05036e8c932d86837385dea836c61974ef62 Mon Sep 17 00:00:00 2001 From: James Struga Date: Wed, 31 May 2023 14:17:20 -0400 Subject: [PATCH 020/168] fix build Signed-off-by: James Struga --- manifest.json.template | 1 + 1 file changed, 1 insertion(+) diff --git a/manifest.json.template b/manifest.json.template index 5a9425b66f..90bf7aaa4f 100644 --- a/manifest.json.template +++ b/manifest.json.template @@ -488,3 +488,4 @@ "rel": ".dependency/doc/dependency_decisions.yml" } } + \ No newline at end of file From a7d5d7c0a05913a5e806f02db82b0776fad44047 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pablo=20Hern=C3=A1n=20Carle?= Date: Thu, 1 Jun 2023 09:55:59 +0200 Subject: [PATCH 021/168] apiml versions for 2.9.0-rc1 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Pablo Hernán Carle --- manifest.json.template | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/manifest.json.template b/manifest.json.template index 5e8dcc4c20..13a7cc82cf 100644 --- a/manifest.json.template +++ b/manifest.json.template @@ -73,27 +73,27 @@ "artifact": "explorer-ip*.pax" }, "org.zowe.apiml.api-catalog-package": { - "version": "2.8.13", + "version": "2.9.1", "artifact": "api-catalog*.zip" }, "org.zowe.apiml.discovery-package": { - "version": "2.8.13", + "version": "2.9.1", "artifact": "discovery*.zip" }, "org.zowe.apiml.gateway-package": { - "version": "2.8.13", + "version": "2.9.1", "artifact": "gateway*.zip" }, "org.zowe.apiml.caching-service-package": { - "version": "2.8.13", + "version": "2.9.1", "artifact": "caching-service*.zip" }, "org.zowe.apiml.metrics-service-package": { - "version": "2.8.13", + "version": "2.9.1", "artifact": "metrics-service*.zip" }, "org.zowe.apiml.apiml-common-lib-package": { - "version": "2.8.13", + "version": "2.9.1", "artifact": "apiml-common-lib-*.zip" }, "org.zowe.apiml.sdk.common-java-lib-package": { @@ -101,11 +101,11 @@ "artifact": "common-java-lib-*.zip" }, "org.zowe.apiml.sdk.apiml-sample-extension-package": { - "version": "2.8.13", + "version": "2.9.1", "artifact": "apiml-sample-extension-*.zip" }, "org.zowe.apiml.cloud-gateway-package": { - "version": "2.8.13", + "version": "2.9.1", "artifact": "cloud-gateway-*.zip" }, "org.zowe.configmgr-rexx": { @@ -147,7 +147,7 @@ "componentGroup": "Zowe API Mediation Layer", "entries": [{ "repository": "api-layer", - "tag": "v2.8.13", + "tag": "v2.9.1", "destinations": ["Zowe PAX"] }] }, { @@ -411,23 +411,23 @@ "api-catalog": { "registry": "zowe-docker-release.jfrog.io", "name": "ompzowe/api-catalog-services", - "tag" : "2.8.13-ubuntu" + "tag" : "2.9.1-ubuntu" }, "caching": { "registry": "zowe-docker-release.jfrog.io", "name": "ompzowe/caching-service", - "tag" : "2.8.13-ubuntu" + "tag" : "2.9.1-ubuntu" }, "discovery": { "kind": "statefulset", "registry": "zowe-docker-release.jfrog.io", "name": "ompzowe/discovery-service", - "tag" : "2.8.13-ubuntu" + "tag" : "2.9.1-ubuntu" }, "gateway": { "registry": "zowe-docker-release.jfrog.io", "name": "ompzowe/gateway-service", - "tag" : "2.8.13-ubuntu" + "tag" : "2.9.1-ubuntu" }, "app-server": { "registry": "zowe-docker-release.jfrog.io", From 11fc8877d16f6794ae7a51938e9f0449a985e4dd Mon Sep 17 00:00:00 2001 From: achmelo Date: Thu, 1 Jun 2023 10:29:06 +0200 Subject: [PATCH 022/168] renew certificate for client auth and issuer Signed-off-by: achmelo --- .../APIML_External_Certificate_Authority.cer | 43 ++++++++------- .../APIML_External_Certificate_Authority.p12 | Bin 1346 -> 1378 bytes .../custom_for_test/files/USER-PRIVATEKEY.key | 52 +++++++++--------- .../roles/custom_for_test/files/USER-cert.cer | 44 +++++++-------- 4 files changed, 70 insertions(+), 69 deletions(-) diff --git a/playbooks/roles/custom_for_test/files/APIML_External_Certificate_Authority.cer b/playbooks/roles/custom_for_test/files/APIML_External_Certificate_Authority.cer index dc456826e8..ed0a0eeea3 100644 --- a/playbooks/roles/custom_for_test/files/APIML_External_Certificate_Authority.cer +++ b/playbooks/roles/custom_for_test/files/APIML_External_Certificate_Authority.cer @@ -1,23 +1,24 @@ -----BEGIN CERTIFICATE----- -MIID3zCCAsegAwIBAgIUFhpJdn8dPLOj9FkPP2PIkzfwRLwwDQYJKoZIhvcNAQEL -BQAwfzELMAkGA1UEBhMCQ1oxDzANBgNVBAgMBlByYWd1ZTEPMA0GA1UEBwwGUHJh -Z3VlMREwDwYDVQQKDAhCcm9hZGNvbTEMMAoGA1UECwwDTUZEMS0wKwYDVQQDDCRB -UElNTCBFeHRlcm5hbCBDZXJ0aWZpY2F0ZSBBdXRob3JpdHkwHhcNMjAwODIxMTAw -MTIzWhcNMjMwNTE4MTAwMTIzWjB/MQswCQYDVQQGEwJDWjEPMA0GA1UECAwGUHJh -Z3VlMQ8wDQYDVQQHDAZQcmFndWUxETAPBgNVBAoMCEJyb2FkY29tMQwwCgYDVQQL -DANNRkQxLTArBgNVBAMMJEFQSU1MIEV4dGVybmFsIENlcnRpZmljYXRlIEF1dGhv -cml0eTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANxBIK3rQgHi0Aig -5/azMjPZcKFZx0Kihv3JBdQ0z+oUMHimykc1wheDplnNtmLzqL6c/Bsa/X2zLT3c -nhFZrvdYZeb5sFZQIlDrmZ90D9fAedkTSfK6bET7vw6x9NGAuhXTZ/r27E+a2tY/ -wvFaw8IWNe5lthidXdRfiPOdf6RPM0Fssj+aU42+y7dHlvvDbmMusy+j5SxEP6dx -Oh6p9cUUr6i9mOXZUN7RTo2cHjgLjGm9uokjv3sR/Fh7whoyjyWfOFRYAUZvWqiq -v8vV1dEhcoVefwUxxvyYjPeE/V1NlIlA3mL0Z9dx5Fp+U60H9brkxCizTxD1jLEx -ixne5Y8CAwEAAaNTMFEwHQYDVR0OBBYEFHGB79eApQnqoGh4OZ+C2I5ZoI93MB8G -A1UdIwQYMBaAFHGB79eApQnqoGh4OZ+C2I5ZoI93MA8GA1UdEwEB/wQFMAMBAf8w -DQYJKoZIhvcNAQELBQADggEBAAaimjQxE1LXZoi71zC86cGWXjydAgXwHQE9GpLq -1LQvdfRciAWwOURBP9k2SNtVQR7UmfDpVJOtIwA5PcFAIklvx1g7S6FuCzuSLX7k -4fhOv9pcsNCHfP+Hju6TvNGHQKKkJDQt7IDUHAkW/xPE3idEpBi8q/SI8LCXW3en -AwfJE+evrcOWdt17IVh8TcBMDgHQYlg9pYu5fvf1GiVAlok0dIhvf3OwBX5ND3fu -0fLIBgx9/3T2PXxK9eLJTDnSLCSa9w/aDoSQNVjJtBOt3XKnXsGpgIzJPg2IXIEf -h9GozrCPF9ceSUD2o8wqDkE7UjTLL3k3gDhss7HPJo3nkao= +MIID+zCCAuOgAwIBAgIES2Kd2TANBgkqhkiG9w0BAQsFADCBnjELMAkGA1UEBhMC +Q1oxDzANBgNVBAgTBlByYWd1ZTEPMA0GA1UEBxMGUHJhZ3VlMRQwEgYDVQQKEwta +b3dlIFNhbXBsZTEcMBoGA1UECxMTQVBJIE1lZGlhdGlvbiBMYXllcjE5MDcGA1UE +AxMwWm93ZSBEZXZlbG9wbWVudCBJbnN0YW5jZXMgQ2VydGlmaWNhdGUgQXV0aG9y +aXR5MB4XDTIwMTAyMDA3MzkyOVoXDTMwMTAxODA3MzkyOVowgZ4xCzAJBgNVBAYT +AkNaMQ8wDQYDVQQIEwZQcmFndWUxDzANBgNVBAcTBlByYWd1ZTEUMBIGA1UEChML +Wm93ZSBTYW1wbGUxHDAaBgNVBAsTE0FQSSBNZWRpYXRpb24gTGF5ZXIxOTA3BgNV +BAMTMFpvd2UgRGV2ZWxvcG1lbnQgSW5zdGFuY2VzIENlcnRpZmljYXRlIEF1dGhv +cml0eTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANHkJhhd/rrtmm4B +XCU/ZMq/4F8T3QYXGnDfmRLSN2GzGpb1YEK2RaEVBBKh8QI5baiD3vSzhK1VoO3L +qEMOpPxgwoUTz8wDzf4u18i7qSREdSDTJIo9Qj5DT8w4wHpGBpFtNVU/5bTwNAPw +khg5CdRJpiOQV3O4MFmnt94VLcMQnywISja2Mv+RC3eZjr86OepDLpyfi2UuQ/Us +hKvVvUM+Bxcl9TkWzFJ6lqYvVBPo5Epa3v8qIeOfmkOzO8id5LT/AWqgOYUGFhox +4Lsvj8txOc3SYTXbY9IOrKXggX5NwhTW038j+1n1zXlVeAr5xhASymAzwbV/QQ3l +GsWig1ECAwEAAaM/MD0wDwYDVR0TAQH/BAUwAwEB/zALBgNVHQ8EBAMCAgQwHQYD +VR0OBBYEFCRpLjbYx589Li1EfWKwGmQxiLA2MA0GCSqGSIb3DQEBCwUAA4IBAQCt +0YxLl4u7RZkntKSBjDiQXoFL6xkzvvoEAGtNztCVW78NHgA86MkuWmQ+eBSBxHda +NzjtLHHSwFfzHaaXoc/kNS2iTyHbntKheJ6YHi6mCA71nA5m+AUS3yV+iO5qFusc +jeYXXuwbP06i2v5J/yYtEyEARl2Wo9mOCOTOAl7e+V9qhYgRh1EbWO0pYTeRpya+ +MCHI+xEPSmUaguEtxvGTdtmhDuKuS1Ndo5j72ceevy0uP5el3scsJnB1puGhQCh1 +waG/jp8kndRbB3V3YjIqbA9MxxpMzpiOC5S0uQQ3t2sqV6p4q7Dj5o4GgfDu+RK3 +EDOis6zm74HV4CIcw9Ka -----END CERTIFICATE----- diff --git a/playbooks/roles/custom_for_test/files/APIML_External_Certificate_Authority.p12 b/playbooks/roles/custom_for_test/files/APIML_External_Certificate_Authority.p12 index 84b44db107d7bb4ea4a673c6d0db36fffa4525a1..10e5da1e81e3efa6e22705fab10829e84935d767 100644 GIT binary patch delta 1368 zcmV-e1*iJL3gQYtFoFeM0s#Xsf&~`_2`Yw2hW8Bt2LYgh1qcL!1q3jH1pqLD1pEdG zDuzgg_YDCD2B3lj?J$A_=>h=&FoFc)kw6`Ph3H@1J+giEFXQgUBPf$+wtGBQ0s{cU zP=JC2sOYVACkYqHS^Sf>Pm-s={o>QK4%gL9wdT|Gb^r}?Q+{cX1X(K&G+=iCG<&nu zl{FZYtzkiX0Et2~CWz3rO#M_Ry|vAhEkk2PpJ+`*{j*Yt$8qi>*vyWC`1U zw8jOzV`K03^Cm#g#S$BOMdymDo==V*NMB0svVp8*$OtL9HC9q^4W_+}edG@GWHSa; z8GAv0K2P;^tr(dDjW6Vhol5ctm<><>;*;qvnr%E=D7>zR+0Z$A3xjdC^s38y8-A;Y zqBNs1?cTZ_0=6q$;QECaEZk0d-jY*8?IsR1Y zqnG#NXvxS%Z%`kh^%K8r%QDew9tCZ(QCtxl?e);DK9zLlBKnvx1I^TEoGoa7MIRwr z_rT$2FD3iTL<}>VyOp0B8pBfc{U&AS-KDmAHmTF=+)ly$jqClr7{5*entzNn8M4H$ z>5Yvc&-C0Rw|J-Q{AbNUaN*_8{w*=K`32W>!F!UZxFhzt^gSyguh!f8EORp44XsR zDE1yAbJe^}HkYl>lpKriU+g;}Udsow^819hJQaP54ZkvJnl^V6_lAi(paCbGzEeEh zcNQA-vaD|q%HFz1j?v29*(f8u*$}IkYbnvoAK~Axe7_e8GkJBO{mKyyC263u?VEQ_P{Q=U_GSl6$GE*Vqat(b6b9n7m>34Xl5;@RXuX#GY zB3kY}IZgvm#(<7vuRGZ;WHb-H(-ff7r!=(jWSM8`{d$HklKd|B)gnS!nv1!Jk@wa-e2M$*NY+7y{n zv!dMYyhI~O1&S!?JAyfo7@YwHSMvKa=xZmDX9B{j3Z!sv4C8)H5UMNw(x!uG+EV_T zpuagPE60fwM2Fp>5E delta 1335 zcmV-71<3m13c?CNFoFd>0s#Xsf&}*l2`Yw2hW8Bt2LYgh1n2~U1mrM+1mG}&1l$G* zDuzgg_YDCD2B3lj%`k!l$pQfYFoFcakw6`P8-a5d4c76}`o$!#or17VpvqO}0s{cU zP=JC2h%(XovUedobny52n#(?XLXQ(Umh>sEwl9YC@X1q6&^IW@1$8x2bi1oW6lyF6 zEV%?kA?eYQDF}70Hlz+3HQX;&0+>dYp!?;h;1M~7r^I&A#Ywt_98}lJS4rWnTi5`9 zB$`7B0X~|mWHL=7w+6CEK5}%0DAZ%;s0G2XH5@lvu`t=j(xmj=Sp5s+WIC&hs`4-{ zRktX!eP^w&5E$U9x{SipRSu{)-l8QEWHcG+76@>lEOgjp!WY2014~I>TP{HTB*|j2 z=y<*KSZzcnMxboWK43;e*Tm;yQJNxu$jC@;7`p>a09AcN&fYjg;#DW1^Rffw)gMPo zn?;)3T?b|}e7GetzOkRZ8%$JD5#5h>eS7w-K4Re15DvjvR`W}e>-p9k1B&mB1Hdx?M$=!eXhhb?`cA%;+9^K$wC|w-Rx#C>(7Vq+l_SOnK zt5n&XG;RthQ(3n^mU5MISzkP};2+P=!OPv~ZH-&)kd_SR%iYSp$}0S-jn)P@ylyd% zRpB@V#oTD~cG;Hpjz$;{PPO6UDOi5;=R5vwa z?c2<1v}YL@d_hlt(HK+%oCrv&i?FotPw2NynNu)Us@usGk%`4rgwn6$1p)WsVd`4k zqMPnW?tioVjAKTqth&C&2hBWQ{%ARn$g!k_w5l%K=BZg+f6!GNIwin=vyK7qrW7>kvPi&*8)q!E+{&_hW5obUQ{qO=hdta ze9RzU*CrT53MRub7`Yic$5#`dzari4*$Z!7!zG7y{D@#xuX7VKZNw&w;ut{k3EYE% zyg31Nf_;R0YfBZ5C5tJ4rIq~1>Ma|Eu-~~M5zTORWC#z|dQKekeLolm4e$tCK&sLL zja#wejF%S@A=anMlncrCL5hN2Q^F2!8rgnLU;oI5W)o?I(vXpDm3mp!E=3n4{(+fK z7cAJJR+Co=RY>jhv(t|3+A?$9m;iQuHD-3m-Er89Zvf)q9!?CUkC@0xD#(o( zX3{F>pJu41u~gz9w`peS_5RI0Vd1P{vCRsmXs3rj4#Y{ZJ-TJ3X%P&5O#U`533(no zU;?6oH}El32ec}G@afCF{Jf*Ei{<8|s0k20`wKfAKKa=r4L*nh5qt;YEr6Ba@W`1z zq>^WeAwIIh(%^aLEWy9EoCni6bGl~a`fX^HG60QCtubhEwZCbyKI>@824MkW2W=&L zHrx|>K0RfS2MNwV48G}Wu^b_9-By3dJA{Bdo@ySt1~CC{$Kq=Fo&n1fKn+(reJ=gL zI^1(9a1Vqbv}9!&r(G@`k9gpGUD^Kw&GGb?Y}GJ6Fd;Ar1_dh)0|FWa00b2Il>G3H tgf<-Af0-UI>bCF2MBZ diff --git a/playbooks/roles/custom_for_test/files/USER-PRIVATEKEY.key b/playbooks/roles/custom_for_test/files/USER-PRIVATEKEY.key index 28d82ba7db..da75dbc711 100644 --- a/playbooks/roles/custom_for_test/files/USER-PRIVATEKEY.key +++ b/playbooks/roles/custom_for_test/files/USER-PRIVATEKEY.key @@ -1,28 +1,28 @@ -----BEGIN PRIVATE KEY----- -MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQDN0NIJjuRJPE43 -CRvIVEg2hfIUWpos6lNs4ZNEyCxOPU0b6kyNxpTmaSX8LUX0JQ9c5N1Yie6F7k2J -JzfkhoHh/x67CsoHYvaV60gJGuhO1PPM/QsGFrXH7Po0fS5jsqmJWnn+B8mUoNWF -SqKUuusyuMT+Y8d8cr67g4MmnA7YEDag7F7i2s7xyrBMiU5IcLChMmWsZiar/vl0 -ykDb5Fsjt8pCFAPeuwT+nLUxCcqY5N5t11qxuS2aroZvM2PHdVkCQagB9dKlIYEt -JeD6ZkYS0C/CHiJBqujx9dxAate/WJc5r6rdCkfBRGN0nZQaE7AupgDi4BqoZQzb -eyU+DRutAgMBAAECggEBAIh6Sm0wJc0ygiMYlSW4TdJp6+b3VXknQX7X7lIT8t1G -5RT3vx/caOyJGTkpxFNrJ87PrL+DZ3nEVgH20admUkZMaFJbizBuvVkYlcID57wu -liR+P4sgEBas3BVmVRajaKy+JFsBSviV1kD3BuxdLo2J3IdcHvI1HKk3QgaeQXGf -za1D3eR1V5eeaHaXF/DMmW9538AB5pzHM4q5qxFjY+LNNLDYEJZf+iBslV4gqrfU -0xWk9EJVFk+xtIUqM4fNrxwSUzvoCa5ThXSESn+RMHxJu0E2k5d+EII0TucMI0LU -omTiAdkqonUxZepB8AeADy9b5uThoj6rHM6ilmper0ECgYEA9LpG78k+HUz9to4i -KgPrESO8qMKRI55RdFlQF/XbcZV6Nin62UvEZTRCFunsu0wzZc6+JS4wqIicdWz6 -/QeCXpljVIUBX+JbwHSTVhZ5hCNmlD9s570lfYx1LAUJeBMW2Ns5X+WWGYTltkqS -qmAAJ6mUjfOUs4UrEgqvbfL31CkCgYEA10u15c71EQtq3uBG/KKnI9TDy3zhAHgi -7rGH6PRGo8vZ7wL4OoYMK2kX9bc/4YCCzJ7o5MqOUwSpw349ZILj6oGN08mD6fa7 -yXZuwZSyNwvaDX2pn/Gww3wwZBqQEuAbloPaqrU3J5qWVmJAw7YX+IqocGWo+gQC -Ys/zeOqcG+UCgYB312R3def590LjC9VFF+gb25E+XxEuDRA8VqQ3J4lPpPBU59fU -YxsIqD+Y8vKfgaBFwakxkd34GfXsNvLtx6ia5KhUslFLABEIPM4NwTG+eIt6G1kc -Xm6mfYq/hLPvXgG5Lhl5kXcghgjrbLdHwX0x7wQ1Q0vVYWgHDL59rBaaiQKBgGKJ -YVAz35AUhK5LQdIg85R/rbk1h5l6YqqSkFy7aJVRGIa++jN25Jz9tZydaVxhP/w9 -AuSsHGW8raIu5hRZn8zVzL7Q7VIovhvf26M31jVBdGRWTktJCBkAfvlh+uzYq2fB -I1ScKgkzRHl28KNidSgo9hyzOpprOVhWSt3dquNNAoGBAM+f9msPvmqinHLvtaFB -sacZgcviGCASQdMIIoW7r/VPfJQzJaJ0kWpG6Bgo1T+KC5YQBaScnjgFna5moz7H -k0l8wdFOe/d3p33brqvm2IB7FVSdw+jw2O/bD4M51kg9naYjMNCjlMKZrnEschjI -kx3w2bgtP+z6No7Me6Oow+V5 +MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQCwrEtJar+w8mjk +RgmeVmK/tFv6sXkocA6UD92L9+YXl531TVZllJpyMEVISpstZXnSGi9V4oU7Qqec +y1eQpyKtwYlgRFt4yTyS/xOxgcuPWnleNSMEWCTAdJsuuzakZ1y4G5DsEBG0psPM +siqI3IYfNCqQohVTqp/oZyPIbbmO0e5IqohqUK/Ht1grtzQC4S3T4eEV9LzIzc3k +CbYu9Ujsohkd7xiF/8tLmvhsGTN+f8KOHhidAlBrU/iGks+ZR2+KnB1Hq3SjMx3B +2MfJVw4YceJ0DOtvtNCe1Y+DlOLIbp3Oela7bdB2tjvE+IylYpFz4jfvYcaA6fos +mOJipKcxAgMBAAECggEABi3sjzOS41lDNnLFrNpYJ1zjV7Qj6PhsZhzc8qOX0mzs +6zLKihCFy2cpUTM81LxnI6RjUfVzlARLkQYiuK5D3gB2Md4KNgIR4pFV6sA/srKn +KpagtCryFCIv+FU3fs4Xtd/O9JbGS8OGdy8nIjTWYxqDv53Psaa2453R6FWAJ0Dd +FICAQKm2+RmlYDCMEgn+QLfEbfZk+XsOPYxTP4g0NUOJ5jma8AMcVwlsjPxcZg82 +A1cGUdRwqTPs5BYlW/ZFXKOCvHgzmAkLN9gSbZ2fzB3A1YIH3Oj6KDAwGp4TWUrl +GJ8XxhZYMDxCFvI9sTTlzDAGKEYeqo7HE8E3kkRm0QKBgQDi4mgzdJ+zw0MPR5M1 +a9x/qpyJKvt9G9FHuMONkqFTO+P/Q5onBMi94uqzKB/h0TlcKEf+7eyCclk5/C96 +u4RK2JuRXjAJvDl4iOFtTAkJe4CT+TG0zu9St6CnTFyLod3jDsxXTv141CKIsl1H +YivHChzRlqU6D1C5wz+tPd0jyQKBgQDHWFiHJFJZCka4wfmVJ1vCNlXT6eBg/5lM +juLJHJk7E1tijjFpKE/VhjLX6Yzj2QqkitqweBTUEjWsXPxXD1V+GxR3szZWBPlW +gAvmddD5KrcurXZ2xGpaV6FtlYrSA5wpSGlakBRl+iP7h9WUj8n8PbulIju7TUfg +jtceeWiMKQKBgG5oZvTDSAQefT+uQQC6IG8wA0Ts2b0kEE+qpd76/+6VMnpB134t +YdKl3jiYygsF2bfzEjYIahOAudLx2dkL73DMv8eZ4h6argzt72VUnwEyTHu1xG6M +VQIXweIn0tFQT73ysZW7JrXp5XRH+ASIzWzqiuOjP3xlf48maJJRjI+hAoGBAK1e +a1fVQf0IT+t9X/fVTBtDMC/mNmuFwChyGFB6G9XiBtdW/SgMlCoK1YssJok+iOAD +lyBkvxCVabKnCBsbTeon2Qwlg3saRlNxd2gOTRl2iewBlobCWhCKJ+3rYdk2pIjO +3jmSFvt9qe+m+hyDVVKXyetbM4G5O2rUL8jkJAXJAoGAK0vd2gYO1irQfDAYxz87 +ywuv7u7akrSrfs3AdE6CfH31F+ERXQJsXsJZg8xaFXOq/P6394juqi3ulgMyKs2B +XcjNIjojJ1Jle+9UgD7+VKvtC3IfI1+5Xz2EqYPYP0Vf4Tvs3dX5tkJW57+OmVwD +1j5Ym1QI+TtqrScAPY6Zf6k= -----END PRIVATE KEY----- diff --git a/playbooks/roles/custom_for_test/files/USER-cert.cer b/playbooks/roles/custom_for_test/files/USER-cert.cer index 527f4cafd5..65f84eb6e8 100644 --- a/playbooks/roles/custom_for_test/files/USER-cert.cer +++ b/playbooks/roles/custom_for_test/files/USER-cert.cer @@ -1,24 +1,24 @@ -----BEGIN CERTIFICATE----- -MIID8TCCAtmgAwIBAgIUVyBCWfHF/ZwZKVsBEpTNIBj9mQcwDQYJKoZIhvcNAQEL -BQAwfzELMAkGA1UEBhMCQ1oxDzANBgNVBAgMBlByYWd1ZTEPMA0GA1UEBwwGUHJh -Z3VlMREwDwYDVQQKDAhCcm9hZGNvbTEMMAoGA1UECwwDTUZEMS0wKwYDVQQDDCRB -UElNTCBFeHRlcm5hbCBDZXJ0aWZpY2F0ZSBBdXRob3JpdHkwHhcNMjAwOTA0MTE0 -MzM2WhcNMjMwNjAxMTE0MzM2WjBiMQswCQYDVQQGEwJDWjEQMA4GA1UECAwHQ3pl -Y2hpYTEPMA0GA1UEBwwGUHJhZ3VlMREwDwYDVQQKDAhCcm9hZGNvbTEOMAwGA1UE -CwwFQ0EgQ1oxDTALBgNVBAMMBFVTRVIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw -ggEKAoIBAQDN0NIJjuRJPE43CRvIVEg2hfIUWpos6lNs4ZNEyCxOPU0b6kyNxpTm -aSX8LUX0JQ9c5N1Yie6F7k2JJzfkhoHh/x67CsoHYvaV60gJGuhO1PPM/QsGFrXH -7Po0fS5jsqmJWnn+B8mUoNWFSqKUuusyuMT+Y8d8cr67g4MmnA7YEDag7F7i2s7x -yrBMiU5IcLChMmWsZiar/vl0ykDb5Fsjt8pCFAPeuwT+nLUxCcqY5N5t11qxuS2a -roZvM2PHdVkCQagB9dKlIYEtJeD6ZkYS0C/CHiJBqujx9dxAate/WJc5r6rdCkfB -RGN0nZQaE7AupgDi4BqoZQzbeyU+DRutAgMBAAGjgYEwfzALBgNVHQ8EBAMCBeAw -HQYDVR0lBBYwFAYIKwYBBQUHAwIGCCsGAQUFBwMBMB0GA1UdDgQWBBRbQ4fcpM8i -paU2mwI4Fl/GRfNy/TARBglghkgBhvhCAQEEBAMCBeAwHwYDVR0jBBgwFoAUcYHv -14ClCeqgaHg5n4LYjlmgj3cwDQYJKoZIhvcNAQELBQADggEBANMyHteCcktXSloB -w3BrCYe0mup+BKe9lT2ARVoCuamxj/VqKq6IbNUBNqvIIbEK5wIEiSPvQ6VJqmks -yw+gr+Dch+2sd9jiCKYAPTeDeoBHzRo88j4L7y+w/FN+13y3QIUxSfzEdrcsSA5Z -VwTQsFF5zC6u2k7onDlE6NiYnuU5VUaM4jel1atSeA6xLdD+ePfI70B+m034Nhrk -aUUTK+iCCeM9heokpWqpA9bqlHcIP0fliG6Estnt9xaPwA4VpLkQR6t9E49yBDJ5 -C0lqInPB7xGphhYZ6cV9/c3u/B3r9iK1IHQffhdANStogiQrzGk2yvUg0/t0qmle -PzYuxfM= +MIID9zCCAt+gAwIBAgIUI7+pkytWp105jzUyz1KlXnZ/YREwDQYJKoZIhvcNAQEL +BQAwgZ4xCzAJBgNVBAYTAkNaMQ8wDQYDVQQIEwZQcmFndWUxDzANBgNVBAcTBlBy +YWd1ZTEUMBIGA1UEChMLWm93ZSBTYW1wbGUxHDAaBgNVBAsTE0FQSSBNZWRpYXRp +b24gTGF5ZXIxOTA3BgNVBAMTMFpvd2UgRGV2ZWxvcG1lbnQgSW5zdGFuY2VzIENl +cnRpZmljYXRlIEF1dGhvcml0eTAeFw0yMzA2MDEwODE5NTFaFw0yOTA1MzAwODE5 +NTFaMFwxCzAJBgNVBAYTAkNaMRAwDgYDVQQIDAdDemVjaGlhMQ8wDQYDVQQHDAZQ +cmFndWUxDTALBgNVBAoMBFpvd2UxDDAKBgNVBAsMA09NRjENMAsGA1UEAwwEVVNF +UjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALCsS0lqv7DyaORGCZ5W +Yr+0W/qxeShwDpQP3Yv35heXnfVNVmWUmnIwRUhKmy1ledIaL1XihTtCp5zLV5Cn +Iq3BiWBEW3jJPJL/E7GBy49aeV41IwRYJMB0my67NqRnXLgbkOwQEbSmw8yyKojc +hh80KpCiFVOqn+hnI8htuY7R7kiqiGpQr8e3WCu3NALhLdPh4RX0vMjNzeQJti71 +SOyiGR3vGIX/y0ua+GwZM35/wo4eGJ0CUGtT+IaSz5lHb4qcHUerdKMzHcHYx8lX +Dhhx4nQM62+00J7Vj4OU4shunc56Vrtt0Ha2O8T4jKVikXPiN+9hxoDp+iyY4mKk +pzECAwEAAaNuMGwwCwYDVR0PBAQDAgXgMB8GA1UdIwQYMBaAFCRpLjbYx589Li1E +fWKwGmQxiLA2MB0GA1UdJQQWMBQGCCsGAQUFBwMCBggrBgEFBQcDATAdBgNVHQ4E +FgQUeRColSbWTvvdqodl8UoX6UqrTHUwDQYJKoZIhvcNAQELBQADggEBAIPIMFKr +XTLuNXzOyxDH6Z3zIlPaLwAupJhVSf0m51dUUEM4rGidxFqvcXAPTFy66ebHQTYW +wLfPEbfcet235o1JiLgtbJ8y6jFbwJ7hMxynpFop9H+q7tsDcmEiy1t3XV6kyecL +YrLrugmMDGdDYut3RZ7XX1dzfgqIiIQm6ZUtl3F1U0NXi/jGvweybxHTMLrp+xxr +S9q4zUrq0DQhkK9SV0xWg0oOGcx8An7BHj54xpaSB+qLkrlU6nU+hWRAU04KXErB +90iRjy7sox6YpRslCHd58gbeUo5zIxnXbcFnJV9e1YvyANTbvHUyIMTWLEn9thev +MeyJPulkkY85hkk= -----END CERTIFICATE----- From 085f307c801f7a8f5ebca51a59993098697c3706 Mon Sep 17 00:00:00 2001 From: ojcelis Date: Thu, 1 Jun 2023 15:19:50 -0400 Subject: [PATCH 023/168] Update version for launch-scripts, vscode-extension and utility-tools Signed-off-by: ojcelis --- manifest.json.template | 316 +++++++++++++++++++++-------------------- 1 file changed, 161 insertions(+), 155 deletions(-) diff --git a/manifest.json.template b/manifest.json.template index d8b2346603..e2bc649c04 100644 --- a/manifest.json.template +++ b/manifest.json.template @@ -1,6 +1,6 @@ { "name": "Zowe", - "version": "2.9.0", + "version": "2.8.0", "description": "Zowe is an open source project created to host technologies that benefit the Z platform from all members of the Z community (Integrated Software Vendors, System Integrators and z/OS consumers). Zowe, like Mac or Windows, comes with a set of APIs and OS capabilities that applications build on and also includes some applications out of the box. Zowe offers modern interfaces to interact with z/OS and allows you to work with z/OS in a way that is similar to what you experience on cloud platforms today. You can use these interfaces as delivered or through plug-ins and extensions that are created by clients or third-party vendors.", "license": "EPL-2.0", "homepage": "https://zowe.org", @@ -12,128 +12,126 @@ }, "binaryDependencies": { "org.zowe.zlux.zlux-core": { - "version": "^2.0.0-V2.X-STAGING-ZLUX-CORE", - "artifact": "*.pax" + "version": "2.8.0-RC", + "repository": "libs-snapshot-local", + "artifact": "zlux-core-2.8.0-20230413.174954.pax" }, "org.zowe.zlux.sample-angular-app": { - "version": "^2.0.0-V2.X-STAGING", - "artifact": "*.pax" + "version": "2.8.0-V2.X-RC", + "repository": "libs-snapshot-local", + "artifact": "sample-angular-app-2.8.0-20230413.174748.pax" }, "org.zowe.zlux.sample-iframe-app": { - "version": "^2.0.0-V2.X-STAGING", - "artifact": "*.pax" + "version": "2.8.0-V2.X-RC", + "repository": "libs-snapshot-local", + "artifact": "sample-iframe-app-2.8.0-20230413.174603.pax" }, "org.zowe.zlux.sample-react-app": { - "version": "^2.0.0-V2.X-STAGING", - "artifact": "*.pax" + "version": "2.8.0-V2.X-RC", + "repository": "libs-snapshot-local", + "artifact": "sample-react-app-2.8.0-20230413.174743.pax" }, "org.zowe.zlux.tn3270-ng2": { - "version": "^2.0.0-V2.X-STAGING", - "artifact": "*.pax" + "version": "2.8.0-V2.X-RC", + "repository": "libs-snapshot-local", + "artifact": "tn3270-ng2-2.8.0-20230413.174837.pax" }, "org.zowe.zlux.vt-ng2": { - "version": "^2.0.0-V2.X-STAGING", - "artifact": "*.pax" + "version": "2.8.0-V2.X-RC", + "repository": "libs-snapshot-local", + "artifact": "vt-ng2-2.8.0-20230413.174946.pax" }, "org.zowe.zlux.zlux-editor": { - "version": "^2.0.0-V2.X-STAGING", - "artifact": "*.pax" + "version": "2.8.0-V2.X-RC", + "repository": "libs-snapshot-local", + "artifact": "zlux-editor-2.8.0-20230413.175234.pax" }, "org.zowe.zss": { - "version": "^2.0.0-STAGING", - "artifact": "*.pax" + "version": "2.8.0-RC", + "repository": "libs-snapshot-local", + "artifact": "zss-2.8.0-rc-832-20230413175321.pax" }, "org.zowe.explorer.jobs.jobs-api-package": { - "version": "^2.0.7-SNAPSHOT", - "artifact": "jobs-api-package-*.zip", - "exclusions": ["*PR*.zip","*BRANCH*"] + "version": "2.0.17", + "artifact": "jobs-api-package-*.zip" }, "org.zowe.explorer.files.files-api-package": { - "version": "^2.0.7-SNAPSHOT", - "artifact": "files-api-package-*.zip", - "exclusions": ["*PR*.zip","*BRANCH*"] + "version": "2.0.17", + "artifact": "files-api-package-*.zip" }, "org.zowe.explorer-jes": { - "version": "~2.0.2-SNAPSHOT" + "version": "2.0.6" }, "org.zowe.explorer-mvs": { - "version": "~2.0.2-SNAPSHOT" + "version": "2.0.6" }, "org.zowe.explorer-uss": { - "version": "~2.0.2-SNAPSHOT" + "version": "2.0.6" }, "org.zowe.explorer-ip": { - "version": "~2.0.0-SNAPSHOT", - "artifact": "*.pax" + "version": "2.0.0", + "artifact": "explorer-ip*.pax" }, "org.zowe.apiml.api-catalog-package": { - "version": "^2.1.1-SNAPSHOT", - "artifact": "api-catalog-*.zip", - "exclusions": ["*PR*.zip"] + "version": "2.8.13", + "artifact": "api-catalog*.zip" }, "org.zowe.apiml.discovery-package": { - "version": "^2.1.1-SNAPSHOT", - "artifact": "discovery-*.zip", - "exclusions": ["*PR*.zip"] + "version": "2.8.13", + "artifact": "discovery*.zip" }, "org.zowe.apiml.gateway-package": { - "version": "^2.1.1-SNAPSHOT", - "artifact": "gateway-*.zip", - "exclusions": ["*PR*.zip"] + "version": "2.8.13", + "artifact": "gateway*.zip" }, "org.zowe.apiml.caching-service-package": { - "version": "^2.1.1-SNAPSHOT", - "artifact": "caching-service-*.zip", - "exclusions": ["*PR*.zip"] + "version": "2.8.13", + "artifact": "caching-service*.zip" }, "org.zowe.apiml.metrics-service-package": { - "version": "^2.1.1-SNAPSHOT", - "artifact": "metrics-service-*.zip", - "exclusions": ["*PR*.zip"] + "version": "2.8.13", + "artifact": "metrics-service*.zip" }, "org.zowe.apiml.apiml-common-lib-package": { - "version": "^2.1.1-SNAPSHOT", - "artifact": "apiml-common-lib-*.zip", - "exclusions": ["*PR*.zip"] + "version": "2.8.13", + "artifact": "apiml-common-lib-*.zip" }, "org.zowe.apiml.sdk.common-java-lib-package": { - "version": "~2.0.0-SNAPSHOT", - "artifact": "common-java-lib-*.zip", - "exclusions": ["*PR*.zip"] + "version": "2.0.0", + "artifact": "common-java-lib-*.zip" }, "org.zowe.apiml.sdk.apiml-sample-extension-package": { - "version": "^2.1.1-SNAPSHOT", - "artifact": "apiml-sample-extension-*.zip", - "exclusions": ["*PR*.zip"] + "version": "2.8.13", + "artifact": "apiml-sample-extension-*.zip" }, "org.zowe.apiml.cloud-gateway-package": { - "version": "^2.4.4-SNAPSHOT", - "artifact": "cloud-gateway-*.zip", - "exclusions": ["*PR*.zip"] - }, - "org.zowe.configmgr": { - "version": "^2.0.0-V2.X-STAGING", - "artifact": "*.pax" + "version": "2.8.13", + "artifact": "cloud-gateway-*.zip" }, "org.zowe.configmgr-rexx": { - "version": "^2.0.0-V2.X-STAGING", - "artifact": "*.pax" + "version": "2.8.0-V2.X-RC", + "repository": "libs-snapshot-local", + "artifact": "configmgr-rexx-2.8.0-2023041311.pax" + }, + "org.zowe.configmgr": { + "version": "2.8.0-V2.X-RC", + "repository": "libs-snapshot-local", + "artifact": "configmgr-2.8.0-2023041307.pax" }, "org.zowe.launcher": { - "version": "^2.0.0-SNAPSHOT" + "version": "2.0.10" }, "org.zowe.keyring-utilities": { "version": "1.0.4", - "artifact": "keyring-util-*", + "artifact": "keyring-util-1.0.4", "explode": "false", - "flat": "true", - "exclusions": ["*PR*"] + "flat": "true" }, "org.zowe.utility-tools": { - "version": "~2.0.0-SNAPSHOT" + "version": "2.0.3" }, "org.zowe.licenses": { - "version": "2.3.0", + "version": "2.8.0", "artifact": "zowe_licenses_full.zip" } }, @@ -142,78 +140,78 @@ "componentGroup": "Imperative CLI Framework for Zowe", "entries": [{ "repository": "imperative", - "tag": "master", + "tag": "v5.12.0", "destinations": ["Zowe CLI Package"] }] }, { "componentGroup": "Zowe API Mediation Layer", "entries": [{ "repository": "api-layer", - "tag": "v2.x.x", + "tag": "v2.8.13", "destinations": ["Zowe PAX"] }] }, { "componentGroup": "Zowe common java libraries", "entries": [{ "repository": "common-java", - "tag": "v2.x.x", + "tag": "v1.21.3", "destinations": ["Zowe PAX"] }] }, { "componentGroup": "Zowe Application Framework", "entries": [{ "repository": "zlux-app-manager", - "tag": "v2.x/staging", + "tag": "v2.8.0-RC1", "destinations": ["Zowe PAX"] }, { "repository": "zlux-app-server", - "tag": "v2.x/staging", + "tag": "v2.8.0-RC1", "destinations": ["Zowe PAX"] }, { "repository": "zlux-file-explorer", - "tag": "v2.x/staging", + "tag": "v1.6.0-RC1", "destinations": ["Zowe PAX"] }, { "repository": "zlux-grid", - "tag": "v1.x/master", + "tag": "v0.0.6", "destinations": ["Zowe PAX"] }, { "repository": "zlux-platform", - "tag": "v2.x/staging", + "tag": "v2.8.0-RC1", "destinations": ["Zowe PAX"] }, { "repository": "zlux-server-framework", - "tag": "v2.x/staging", + "tag": "v2.8.0-RC1", "destinations": ["Zowe PAX"] }, { "repository": "zlux-shared", - "tag": "v2.x/staging", + "tag": "v2.8.0-RC1", "destinations": ["Zowe PAX"] }, { "repository": "zlux-widgets", - "tag": "v1.x/master", + "tag": "v0.0.4", "destinations": ["Zowe PAX"] }, { "repository": "zlux-build", - "tag": "v2.x/staging", + "tag": "v2.8.0-RC1", "destinations": ["Zowe PAX"] }, { "repository": "zss", - "tag": "v2.x/staging", + "tag": "v2.8.0-RC1", "destinations": ["Zowe PAX"] }, { "repository": "zowe-common-c", - "tag": "v2.x/staging", + "tag": "zss-v2.8.0-RC1", "destinations": ["Zowe PAX"] } ] @@ -221,98 +219,98 @@ "componentGroup": "Zowe CLI", "entries": [{ "repository": "zowe-cli", - "tag": "master", + "tag": "v7.13.0", "destinations": ["Zowe CLI Package"] }] }, { "componentGroup": "IBM® CICS® Plug-in for Zowe CLI", "entries": [{ "repository": "zowe-cli-cics-plugin", - "tag": "master", + "tag": "v5.0.1", "destinations": ["Zowe CLI Package"] }] }, { "componentGroup": "IBM® Db2® Plug-in for Zowe CLI", "entries": [{ "repository": "zowe-cli-db2-plugin", - "tag": "master", + "tag": "v5.0.2", "destinations": ["Zowe CLI Package"] }] }, { "componentGroup": "Performance Timing Utility", "entries": [{ "repository": "perf-timing", - "tag": "master", + "tag": "v1.0.7", "destinations": ["Zowe CLI Package"] }] }, { "componentGroup": "IBM® MQ Plug-in for Zowe CLI", "entries": [{ "repository": "zowe-cli-mq-plugin", - "tag": "master", + "tag": "v3.0.1", "destinations": ["Zowe CLI Package"] }] }, { "componentGroup": "z/OS® FTP Plug-in for Zowe CLI", "entries": [{ "repository": "zowe-cli-ftp-plugin", - "tag": "master", + "tag": "v2.1.3", "destinations": ["Zowe CLI Package"] }] }, { "componentGroup": "IBM® IMS® Plug-in for Zowe CLI", "entries": [{ "repository": "zowe-cli-ims-plugin", - "tag": "master", + "tag": "v3.0.0", "destinations": ["Zowe CLI Package"] }] }, { - "componentGroup": "Zowe Desktop Data Sets UI Plugin", + "componentGroup": "Zowe Desktop Eclipse Orion-based React Editor", "entries": [{ - "repository": "explorer-mvs", - "tag": "v2.x/master", + "repository": "orion-editor-component", + "tag": "v0.0.14", "destinations": ["Zowe PAX"] }] }, { - "componentGroup": "Zowe Desktop Eclipse Orion-based React Editor", + "componentGroup": "Zowe Desktop Data Sets UI Plugin", "entries": [{ - "repository": "orion-editor-component", - "tag": "master", + "repository": "explorer-mvs", + "tag": "v2.0.6", "destinations": ["Zowe PAX"] }] }, { "componentGroup": "Zowe Desktop JES UI Plugin", "entries": [{ "repository": "explorer-jes", - "tag": "v2.x/master", + "tag": "v2.0.6", "destinations": ["Zowe PAX"] }] }, { "componentGroup": "Zowe Desktop z/OS Unix Files UI Plugin", "entries": [{ "repository": "explorer-uss", - "tag": "v2.x/master", + "tag": "v2.0.6", "destinations": ["Zowe PAX"] }] }, { "componentGroup": "Zowe Explorer Common REST Server", "entries": [{ "repository": "explorer-api-common", - "tag": "v2.x/master", + "tag": "2.0.21", "destinations": ["Zowe PAX"] }] }, { "componentGroup": "Zowe Explorer Data Sets REST Server", "entries": [{ "repository": "data-sets", - "tag": "v2.x/master", + "tag": "2.0.17", "destinations": ["Zowe PAX"] }] }, { "componentGroup": "Zowe Explorer Jobs REST Server", "entries": [{ "repository": "jobs", - "tag": "v2.x/master", + "tag": "2.0.17", "destinations": ["Zowe PAX"] }] }, @@ -320,14 +318,14 @@ "componentGroup": "Zowe Desktop TN3270 Emulator Plug-in", "entries": [{ "repository": "tn3270-ng2", - "tag": "v2.x/staging", + "tag": "v2.8.0-RC1", "destinations": ["Zowe PAX"] }] }, { "componentGroup": "Zowe Desktop Sample Angular Application", "entries": [{ "repository": "sample-angular-app", - "tag": "v2.x/staging", + "tag": "v2.8.0-RC1", "destinations": ["Zowe PAX"] }] }, @@ -335,7 +333,7 @@ "componentGroup": "Zowe Desktop Sample iFrame Application", "entries": [{ "repository": "sample-iframe-app", - "tag": "v2.x/staging", + "tag": "v2.8.0-RC1", "destinations": ["Zowe PAX"] }] }, @@ -343,7 +341,7 @@ "componentGroup": "Zowe Desktop Sample React Application", "entries": [{ "repository": "sample-react-app", - "tag": "v2.x/staging", + "tag": "v2.8.0-RC1", "destinations": ["Zowe PAX"] }] }, @@ -351,15 +349,15 @@ "componentGroup": "Zowe Desktop VT Emulator Plugin-in", "entries": [{ "repository": "vt-ng2", - "tag": "v2.x/staging", - "destinations": ["Zowe PAX"] + "tag": "v2.8.0-RC1", + "destinations": ["Zowe PAX"] }] }, { "componentGroup": "Zowe Desktop Editor Plugin-in", "entries": [{ "repository": "zlux-editor", - "tag": "v2.x/staging", + "tag": "v2.8.0-RC2", "destinations": ["Zowe PAX"] }] }, @@ -367,15 +365,15 @@ "componentGroup": "Utilities", "entries": [{ "repository": "keyring-utilities", - "tag": "master", + "tag": "v1.1.0", "destinations": ["Zowe PAX"] }, { "repository": "zowe-install-packaging-tools", - "tag": "v2.x/master", + "tag": "v2.0.3", "destinations": ["Zowe PAX"] }, { "repository": "launcher", - "tag": "v2.x/master", + "tag": "v2.0.10", "destinations": ["Zowe PAX"] }] }, @@ -383,7 +381,7 @@ "componentGroup": "Zowe Visual Studio Code Extension", "entries": [{ "repository": "vscode-extension-for-zowe", - "tag": "master", + "tag": "v2.8.2", "destinations": ["Visual Studio Code Marketplace"] }] }, @@ -391,91 +389,99 @@ "componentGroup": "Zowe Desktop IP Explorer Plug-in", "entries": [{ "repository": "explorer-ip", - "tag": "v2.x/master", + "tag": "v2.0.0", + "destinations": ["Zowe PAX"] + }] + }, + { + "componentGroup": "Configmgr", + "entries": [{ + "repository": "zowe-common-c", + "tag": "configmgr-v2.8.0-RC1", "destinations": ["Zowe PAX"] }] } ], "imageDependencies": { "zowe-launch-scripts": { - "registry": "zowe-docker-snapshot.jfrog.io", + "registry": "zowe-docker-release.jfrog.io", "name": "ompzowe/zowe-launch-scripts", - "tag" : "2.1.0-ubuntu.v2-x-staging" + "tag" : "2.9.0-ubuntu" }, "api-catalog": { - "registry": "zowe-docker-snapshot.jfrog.io", + "registry": "zowe-docker-release.jfrog.io", "name": "ompzowe/api-catalog-services", - "tag" : "2.1.1-SNAPSHOT-ubuntu.v2-x-x" + "tag" : "2.8.13-ubuntu" }, "caching": { - "registry": "zowe-docker-snapshot.jfrog.io", + "registry": "zowe-docker-release.jfrog.io", "name": "ompzowe/caching-service", - "tag" : "2.1.1-SNAPSHOT-ubuntu.v2-x-x" + "tag" : "2.8.13-ubuntu" }, "discovery": { "kind": "statefulset", - "registry": "zowe-docker-snapshot.jfrog.io", + "registry": "zowe-docker-release.jfrog.io", "name": "ompzowe/discovery-service", - "tag" : "2.1.1-SNAPSHOT-ubuntu.v2-x-x" + "tag" : "2.8.13-ubuntu" }, "gateway": { - "registry": "zowe-docker-snapshot.jfrog.io", - "name": "ompzowe/gateway-service", - "tag" : "2.1.1-SNAPSHOT-ubuntu.v2-x-x" + "registry": "zowe-docker-release.jfrog.io", + "name": "ompzowe/gateway-service", + "tag" : "2.8.13-ubuntu" }, "app-server": { - "registry": "zowe-docker-snapshot.jfrog.io", + "registry": "zowe-docker-release.jfrog.io", "name": "ompzowe/app-server", - "tag" : "2.1.0-ubuntu.v2-x-staging" + "tag" : "2.8.0-ubuntu" }, "explorer-ip": { - "kind": "job", - "registry": "zowe-docker-snapshot.jfrog.io", - "name": "ompzowe/explorer-ip", - "tag" : "2.0.0-ubuntu.v2-x-master" + "kind": "job", + "registry": "zowe-docker-release.jfrog.io", + "name": "ompzowe/explorer-ip", + "tag" : "2.0.0-ubuntu" }, "explorer-jes": { - "kind": "job", - "registry": "zowe-docker-release.jfrog.io", - "name": "ompzowe/explorer-jes", - "tag" : "2-ubuntu" + "kind": "job", + "registry": "zowe-docker-release.jfrog.io", + "name": "ompzowe/explorer-jes", + "tag" : "2.0.6-ubuntu" }, "explorer-mvs": { - "kind": "job", - "registry": "zowe-docker-release.jfrog.io", - "name": "ompzowe/explorer-mvs", - "tag" : "2-ubuntu" + "kind": "job", + "registry": "zowe-docker-release.jfrog.io", + "name": "ompzowe/explorer-mvs", + "tag" : "2.0.6-ubuntu" }, "explorer-uss": { - "kind": "job", - "registry": "zowe-docker-release.jfrog.io", - "name": "ompzowe/explorer-uss", - "tag" : "2-ubuntu" + "kind": "job", + "registry": "zowe-docker-release.jfrog.io", + "name": "ompzowe/explorer-uss", + "tag" : "2.0.6-ubuntu" }, "files-api": { - "registry": "zowe-docker-release.jfrog.io", - "name": "ompzowe/files-api", - "tag" : "2-ubuntu" + "registry": "zowe-docker-release.jfrog.io", + "name": "ompzowe/files-api", + "tag" : "2.0.17-ubuntu" }, "jobs-api": { - "registry": "zowe-docker-release.jfrog.io", - "name": "ompzowe/jobs-api", - "tag" : "2-ubuntu" + "registry": "zowe-docker-release.jfrog.io", + "name": "ompzowe/jobs-api", + "tag" : "2.0.17-ubuntu" }, "base": { - "registry": "zowe-docker-release.jfrog.io", - "name": "ompzowe/base", - "tag" : "2.0-ubuntu" + "registry": "zowe-docker-release.jfrog.io", + "name": "ompzowe/base", + "tag" : "2.0.1-ubuntu" }, "base-jdk": { - "registry": "zowe-docker-release.jfrog.io", - "name": "ompzowe/base-jdk", - "tag" : "2.0-ubuntu" + "registry": "zowe-docker-release.jfrog.io", + "name": "ompzowe/base-jdk", + "tag" : "2.0.1-ubuntu" }, "base-node": { - "registry": "zowe-docker-release.jfrog.io", - "name": "ompzowe/base-node", - "tag" : "2.0-ubuntu" + "registry": "zowe-docker-release.jfrog.io", + "name": "ompzowe/base-node", + "tag" : "2.0.1-ubuntu" } }, "dependencyDecisions": { From d9a9ca73562c238c4147f513787609139757f289 Mon Sep 17 00:00:00 2001 From: Elena Kubantseva Date: Tue, 18 Apr 2023 17:14:32 +0200 Subject: [PATCH 024/168] Sanity test for OIDC Signed-off-by: Elena Kubantseva --- .github/workflows/cicd-test.yml | 6 ++ playbooks/all_host_vars_list.yml | 4 + playbooks/host_vars/marist-3.yml | 1 + playbooks/host_vars/marist-4.yml | 1 + playbooks/roles/configfmid/defaults/main.yml | 5 ++ playbooks/roles/configfmid/tasks/main.yml | 10 +++ playbooks/roles/configure/defaults/main.yml | 5 ++ playbooks/roles/configure/tasks/main.yml | 10 +++ .../roles/custom_for_test/defaults/main.yml | 5 ++ .../files/DigiCert_Global_Root_CA.cer | 22 +++++ .../roles/custom_for_test/tasks/main.yml | 27 ++++++ playbooks/roles/verify/defaults/main.yml | 2 +- .../src/__tests__/basic/install-fmid.ts | 4 + .../src/__tests__/basic/install-ptf.ts | 4 + .../src/__tests__/basic/install.ts | 4 + .../test/apiml/test-oidc-via-gateway.js | 45 ++++++++++ tests/sanity/test/http-helper.js | 84 +++++++++++++++++++ 17 files changed, 238 insertions(+), 1 deletion(-) create mode 100644 playbooks/roles/custom_for_test/files/DigiCert_Global_Root_CA.cer create mode 100644 tests/sanity/test/apiml/test-oidc-via-gateway.js diff --git a/.github/workflows/cicd-test.yml b/.github/workflows/cicd-test.yml index 486f6d474b..8f96a23a5f 100644 --- a/.github/workflows/cicd-test.yml +++ b/.github/workflows/cicd-test.yml @@ -365,6 +365,12 @@ jobs: SSH_PORT: ${{ secrets.SSH_PORT }} SSH_USER: ${{ secrets.SSH_USER }} SSH_PASSWORD: ${{ secrets.SSH_PASSWORD }} + OKTA_HOSTNAME: ${{ secrets.OKTA_HOSTNAME }} + OKTA_CLIENT_ID: ${{ secrets.OKTA_CLIENT_ID }} + OKTA_CLIENT_SECRET: ${{ secrets.OKTA_CLIENT_SECRET }} + OKTA_USER: ${{ secrets.OKTA_USER }} + OKTA_PASSWORD: ${{ secrets.OKTA_PASSWORD }} + OIDC_REGISTRY: ${{ secrets.OIDC_REGISTRY }} ZOS_NODE_HOME: ${{ steps.more-test-prep.outputs.NODE_HOME_PATTERN }} # # ANSIBLE_VERBOSE: -vvv diff --git a/playbooks/all_host_vars_list.yml b/playbooks/all_host_vars_list.yml index d0add3ea00..173bd4efcf 100644 --- a/playbooks/all_host_vars_list.yml +++ b/playbooks/all_host_vars_list.yml @@ -34,6 +34,10 @@ zowe_apiml_metrics_service_port: 7551 zowe_apiml_nonstrict_verify_certficates_of_services: true zowe_apiml_security_auth_provider: zosmf zowe_apiml_security_x509_enabled: false +zowe_apiml_security_oidc_enabled: false +zowe_apiml_security_oidc_client_id: +zowe_apiml_security_oidc_client_secret: +zowe_apiml_security_oidc_registry: zowe_apiml_security_zosmf_applid: IZUDFLT zowe_apiml_security_zosmf_jwt_autoconfiguration_mode: auto zowe_apiml_verify_certficates_of_services: true diff --git a/playbooks/host_vars/marist-3.yml b/playbooks/host_vars/marist-3.yml index 15d5cf768b..f14790f987 100644 --- a/playbooks/host_vars/marist-3.yml +++ b/playbooks/host_vars/marist-3.yml @@ -2,4 +2,5 @@ zos_security_system: TSS zowe_sanity_test_testcases: "./test/**/!(api-doc-gen).js" zowe_apiml_security_x509_enabled: true +zowe_apiml_security_oidc_enabled: true zos_zosmf_ca: ZOSMFCA diff --git a/playbooks/host_vars/marist-4.yml b/playbooks/host_vars/marist-4.yml index 03eae52b3a..68291d8f89 100644 --- a/playbooks/host_vars/marist-4.yml +++ b/playbooks/host_vars/marist-4.yml @@ -1,6 +1,7 @@ --- zowe_sanity_test_testcases: "./test/**/!(api-doc-gen).js" zowe_apiml_security_x509_enabled: true +zowe_apiml_security_oidc_enabled: true work_dir_remote: /ZOWE/ansible zowe_root_dir: /ZOWE/runtime diff --git a/playbooks/roles/configfmid/defaults/main.yml b/playbooks/roles/configfmid/defaults/main.yml index 82f0d56c04..aad0f019e2 100644 --- a/playbooks/roles/configfmid/defaults/main.yml +++ b/playbooks/roles/configfmid/defaults/main.yml @@ -66,6 +66,11 @@ zowe_apiml_security_x509_enabled: false zowe_apiml_security_zosmf_applid: IZUDFLT zowe_apiml_security_auth_provider: zosmf zowe_apiml_security_zosmf_jwt_autoconfiguration_mode: auto +zowe_apiml_security_oidc_enabled: false +zowe_apiml_security_oidc_client_id: +zowe_apiml_security_oidc_client_secret: +zowe_apiml_security_oidc_registry: +zowe_apiml_security_oidc_introspect_url: # explorer APIs/plugins ports zowe_jobs_api_port: 7558 zowe_mvs_api_port: 7559 diff --git a/playbooks/roles/configfmid/tasks/main.yml b/playbooks/roles/configfmid/tasks/main.yml index e259f49478..bd049e7cf9 100644 --- a/playbooks/roles/configfmid/tasks/main.yml +++ b/playbooks/roles/configfmid/tasks/main.yml @@ -35,6 +35,11 @@ - zowe_apiml_security_x509_enabled - zowe_apiml_security_zosmf_applid - zowe_apiml_security_auth_provider + - zowe_apiml_security_oidc_enabled + - zowe_apiml_security_oidc_client_id + - zowe_apiml_security_oidc_client_secret + - zowe_apiml_security_oidc_registry + - zowe_apiml_security_oidc_introspect_url - zowe_jobs_api_port - zowe_mvs_api_port - zowe_jobs_explorer_port @@ -290,6 +295,11 @@ "components.gateway.apiml.security.x509.enabled": "{{ zowe_apiml_security_x509_enabled|string|lower }}" "components.gateway.apiml.security.auth.provider": "{{ zowe_apiml_security_auth_provider|string|lower }}" "components.gateway.apiml.security.auth.zosmf.jwtAutoconfiguration": "{{ zowe_apiml_security_zosmf_jwt_autoconfiguration_mode }}" + "components.gateway.apiml.security.oidc.enabled": "{{ zowe_apiml_security_oidc_enabled|string|lower }}" + "components.gateway.apiml.security.oidc.clientId": "{{ zowe_apiml_security_oidc_client_id|string }}" + "components.gateway.apiml.security.oidc.clientSecret": "{{ zowe_apiml_security_oidc_client_secret|string }}" + "components.gateway.apiml.security.oidc.registry": "{{ zowe_apiml_security_oidc_registry|string }}" + "components.gateway.apiml.security.oidc.introspectUrl": "{{ zowe_apiml_security_oidc_introspect_url|string }}" # desktop customizations "zowe.environments.ZWED_SSH_PORT": "{{ zowe_zlux_terminal_ssh_port }}" "zowe.environments.ZWED_TN3270_PORT": "{{ zowe_zlux_terminal_telnet_port }}" diff --git a/playbooks/roles/configure/defaults/main.yml b/playbooks/roles/configure/defaults/main.yml index 4357e31371..37feba2654 100644 --- a/playbooks/roles/configure/defaults/main.yml +++ b/playbooks/roles/configure/defaults/main.yml @@ -67,6 +67,11 @@ zowe_apiml_security_x509_enabled: false zowe_apiml_security_zosmf_applid: IZUDFLT zowe_apiml_security_auth_provider: zosmf zowe_apiml_security_zosmf_jwt_autoconfiguration_mode: auto +zowe_apiml_security_oidc_enabled: false +zowe_apiml_security_oidc_client_id: +zowe_apiml_security_oidc_client_secret: +zowe_apiml_security_oidc_registry: +zowe_apiml_security_oidc_introspect_url: # explorer APIs/plugins ports zowe_jobs_api_port: 7558 zowe_mvs_api_port: 7559 diff --git a/playbooks/roles/configure/tasks/main.yml b/playbooks/roles/configure/tasks/main.yml index 4d46579261..e8fbfa267e 100644 --- a/playbooks/roles/configure/tasks/main.yml +++ b/playbooks/roles/configure/tasks/main.yml @@ -35,6 +35,11 @@ - zowe_apiml_security_x509_enabled - zowe_apiml_security_zosmf_applid - zowe_apiml_security_auth_provider + - zowe_apiml_security_oidc_enabled + - zowe_apiml_security_oidc_client_id + - zowe_apiml_security_oidc_client_secret + - zowe_apiml_security_oidc_registry + - zowe_apiml_security_oidc_introspect_url - zowe_jobs_api_port - zowe_mvs_api_port - zowe_jobs_explorer_port @@ -292,6 +297,11 @@ "components.gateway.apiml.security.x509.enabled": "{{ zowe_apiml_security_x509_enabled|string|lower }}" "components.gateway.apiml.security.auth.provider": "{{ zowe_apiml_security_auth_provider|string|lower }}" "components.gateway.apiml.security.auth.zosmf.jwtAutoconfiguration": "{{ zowe_apiml_security_zosmf_jwt_autoconfiguration_mode }}" + "components.gateway.apiml.security.oidc.enabled": "{{ zowe_apiml_security_oidc_enabled|string|lower }}" + "components.gateway.apiml.security.oidc.clientId": "{{ zowe_apiml_security_oidc_client_id|string }}" + "components.gateway.apiml.security.oidc.clientSecret": "{{ zowe_apiml_security_oidc_client_secret|string }}" + "components.gateway.apiml.security.oidc.registry": "{{ zowe_apiml_security_oidc_registry|string }}" + "components.gateway.apiml.security.oidc.introspectUrl": "{{ zowe_apiml_security_oidc_introspect_url|string }}" # desktop customizations "zowe.environments.ZWED_SSH_PORT": "{{ zowe_zlux_terminal_ssh_port }}" "zowe.environments.ZWED_TN3270_PORT": "{{ zowe_zlux_terminal_telnet_port }}" diff --git a/playbooks/roles/custom_for_test/defaults/main.yml b/playbooks/roles/custom_for_test/defaults/main.yml index 15f902f5b8..520be87041 100644 --- a/playbooks/roles/custom_for_test/defaults/main.yml +++ b/playbooks/roles/custom_for_test/defaults/main.yml @@ -64,6 +64,11 @@ zowe_apiml_nonstrict_verify_certficates_of_services: true # APIML configuration properties zowe_apiml_gateway_timeout_millis: 600000 zowe_apiml_security_x509_enabled: false +zowe_apiml_security_oidc_enabled: false +zowe_apiml_security_oidc_client_id: +zowe_apiml_security_oidc_client_secret: +zowe_apiml_security_oidc_registry: +zowe_apiml_security_oidc_introspect_url: zowe_apiml_security_zosmf_applid: IZUDFLT zowe_apiml_security_auth_provider: zosmf zowe_apiml_security_zosmf_jwt_autoconfiguration_mode: auto diff --git a/playbooks/roles/custom_for_test/files/DigiCert_Global_Root_CA.cer b/playbooks/roles/custom_for_test/files/DigiCert_Global_Root_CA.cer new file mode 100644 index 0000000000..fd4341df26 --- /dev/null +++ b/playbooks/roles/custom_for_test/files/DigiCert_Global_Root_CA.cer @@ -0,0 +1,22 @@ +-----BEGIN CERTIFICATE----- +MIIDrzCCApegAwIBAgIQCDvgVpBCRrGhdWrJWZHHSjANBgkqhkiG9w0BAQUFADBh +MQswCQYDVQQGEwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3 +d3cuZGlnaWNlcnQuY29tMSAwHgYDVQQDExdEaWdpQ2VydCBHbG9iYWwgUm9vdCBD +QTAeFw0wNjExMTAwMDAwMDBaFw0zMTExMTAwMDAwMDBaMGExCzAJBgNVBAYTAlVT +MRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3dy5kaWdpY2VydC5j +b20xIDAeBgNVBAMTF0RpZ2lDZXJ0IEdsb2JhbCBSb290IENBMIIBIjANBgkqhkiG +9w0BAQEFAAOCAQ8AMIIBCgKCAQEA4jvhEXLeqKTTo1eqUKKPC3eQyaKl7hLOllsB +CSDMAZOnTjC3U/dDxGkAV53ijSLdhwZAAIEJzs4bg7/fzTtxRuLWZscFs3YnFo97 +nh6Vfe63SKMI2tavegw5BmV/Sl0fvBf4q77uKNd0f3p4mVmFaG5cIzJLv07A6Fpt +43C/dxC//AH2hdmoRBBYMql1GNXRor5H4idq9Joz+EkIYIvUX7Q6hL+hqkpMfT7P +T19sdl6gSzeRntwi5m3OFBqOasv+zbMUZBfHWymeMr/y7vrTC0LUq7dBMtoM1O/4 +gdW7jVg/tRvoSSiicNoxBN33shbyTApOB6jtSj1etX+jkMOvJwIDAQABo2MwYTAO +BgNVHQ8BAf8EBAMCAYYwDwYDVR0TAQH/BAUwAwEB/zAdBgNVHQ4EFgQUA95QNVbR +TLtm8KPiGxvDl7I90VUwHwYDVR0jBBgwFoAUA95QNVbRTLtm8KPiGxvDl7I90VUw +DQYJKoZIhvcNAQEFBQADggEBAMucN6pIExIK+t1EnE9SsPTfrgT1eXkIoyQY/Esr +hMAtudXH/vTBH1jLuG2cenTnmCmrEbXjcKChzUyImZOMkXDiqw8cvpOp/2PV5Adg +06O/nVsJ8dWO41P0jmP6P6fbtGbfYmbW0W5BjfIttep3Sp+dWOIrWcBAI+0tKIJF +PnlUkiaY4IBIqDfv8NZ5YBberOgOzW6sRBc4L0na4UU+Krk2U886UAb3LujEV0ls +YSEY1QSteDwsOoBrp+uvFRTp2InBuThs4pFsiv9kuXclVzDAGySj4dzp30d8tbQk +CAUw7C29C79Fv1C5qfPrmAESrciIxpg0X40KPMbp1ZWVbd4= +-----END CERTIFICATE----- diff --git a/playbooks/roles/custom_for_test/tasks/main.yml b/playbooks/roles/custom_for_test/tasks/main.yml index d32f1675ec..2ca66723e5 100644 --- a/playbooks/roles/custom_for_test/tasks/main.yml +++ b/playbooks/roles/custom_for_test/tasks/main.yml @@ -58,6 +58,14 @@ vars: filename: USER-cert.cer method: scp +# Upload CA certificate +# This certificate will be configured in task Add DigiCert Global Root CA to the truststore +- include_role: + name: custom_for_test + tasks_from: upload_certificate + vars: + filename: DigiCert_Global_Root_CA.cer + method: scp # Upload client CA certificate # This certificate will be configured in task Add the external CA to the truststore - include_role: @@ -83,6 +91,25 @@ dataset: USER label: API ML Client +# ============================================================================ +# Add DigiCert Global Root CA to the truststore +- name: Add DigiCert Global Root CA to the truststore + include_role: + name: zos + tasks_from: run_script + vars: + script_chdir: "{{ zowe_root_dir }}/bin" + script_filename: keytool + script_parameters: >- + -importcert -v + -trustcacerts -noprompt + -file "{{ work_dir_remote }}/DigiCert_Global_Root_CA.cer" + -alias "digcerca" + -keystore "{{ zowe_keystore_dir }}/{{ zowe_keystore_alias }}/{{ zowe_keystore_alias }}.truststore.p12" + -storepass "{{ zowe_keystore_password }}" + -storetype "PKCS12" + when: zos_keystore_mode is undefined or zos_keystore_mode != 'KEYSTORE_MODE_KEYRING' + # ============================================================================ # Add external API ML CA to the truststore - name: Add the external CA to the truststore diff --git a/playbooks/roles/verify/defaults/main.yml b/playbooks/roles/verify/defaults/main.yml index 689c6e3b56..625b9cdc16 100644 --- a/playbooks/roles/verify/defaults/main.yml +++ b/playbooks/roles/verify/defaults/main.yml @@ -11,7 +11,7 @@ work_dir_local: .tmp # if run test in debug mode. for example, set to "test:*" zowe_sanity_test_debug_mode: "" # only run subset of test cases -zowe_sanity_test_testcases: "\"./test/**/!(api-doc-gen).js\" --exclude ./**/test-zss-via-gateway.js --exclude ./**/test-caching-service-apis-via-gateway.js " +zowe_sanity_test_testcases: "\"./test/**/!(api-doc-gen).js\" --exclude ./**/test-zss-via-gateway.js --exclude ./**/test-caching-service-apis-via-gateway.js --exclude ./**/test-oidc-via-gateway.js " # default folder of sanity test zowe_sanity_test_root_dir: ../tests/sanity diff --git a/tests/installation/src/__tests__/basic/install-fmid.ts b/tests/installation/src/__tests__/basic/install-fmid.ts index 0726f9f445..e6d74093e9 100644 --- a/tests/installation/src/__tests__/basic/install-fmid.ts +++ b/tests/installation/src/__tests__/basic/install-fmid.ts @@ -31,6 +31,10 @@ describe(testSuiteName, () => { process.env.TEST_SERVER, { 'zowe_build_local': process.env['ZOWE_BUILD_LOCAL'], + 'zowe_apiml_security_oidc_client_id': process.env['OKTA_CLIENT_ID'], + 'zowe_apiml_security_oidc_client_secret': process.env['OKTA_CLIENT_SECRET'], + 'zowe_apiml_security_oidc_registry': process.env['OIDC_REGISTRY'], + 'zowe_apiml_security_oidc_introspect_url': `https://${process.env['OKTA_HOSTNAME']}/oauth2/default/v1/introspect`, 'zowe_custom_for_test': 'true', 'zowe_lock_keystore': 'false', } diff --git a/tests/installation/src/__tests__/basic/install-ptf.ts b/tests/installation/src/__tests__/basic/install-ptf.ts index 60b83f2248..7ce7708a57 100644 --- a/tests/installation/src/__tests__/basic/install-ptf.ts +++ b/tests/installation/src/__tests__/basic/install-ptf.ts @@ -31,6 +31,10 @@ describe(testSuiteName, () => { process.env.TEST_SERVER, { 'zowe_build_local': process.env['ZOWE_BUILD_LOCAL'], + 'zowe_apiml_security_oidc_client_id': process.env['OKTA_CLIENT_ID'], + 'zowe_apiml_security_oidc_client_secret': process.env['OKTA_CLIENT_SECRET'], + 'zowe_apiml_security_oidc_registry': process.env['OIDC_REGISTRY'], + 'zowe_apiml_security_oidc_introspect_url': `https://${process.env['OKTA_HOSTNAME']}/oauth2/default/v1/introspect`, 'zowe_custom_for_test': 'true', 'zowe_lock_keystore': 'false', } diff --git a/tests/installation/src/__tests__/basic/install.ts b/tests/installation/src/__tests__/basic/install.ts index 9d49eddebb..f1ba3a6517 100644 --- a/tests/installation/src/__tests__/basic/install.ts +++ b/tests/installation/src/__tests__/basic/install.ts @@ -31,6 +31,10 @@ describe(testSuiteName, () => { process.env.TEST_SERVER, { 'zowe_build_local': process.env['ZOWE_BUILD_LOCAL'], + 'zowe_apiml_security_oidc_client_id': process.env['OKTA_CLIENT_ID'], + 'zowe_apiml_security_oidc_client_secret': process.env['OKTA_CLIENT_SECRET'], + 'zowe_apiml_security_oidc_registry': process.env['OIDC_REGISTRY'], + 'zowe_apiml_security_oidc_introspect_url': `https://${process.env['OKTA_HOSTNAME']}/oauth2/default/v1/introspect`, 'zowe_custom_for_test': 'true', 'zowe_lock_keystore': 'false', } diff --git a/tests/sanity/test/apiml/test-oidc-via-gateway.js b/tests/sanity/test/apiml/test-oidc-via-gateway.js new file mode 100644 index 0000000000..a9573d463b --- /dev/null +++ b/tests/sanity/test/apiml/test-oidc-via-gateway.js @@ -0,0 +1,45 @@ +/** + * 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. + */ + +const expect = require('chai').expect; +const { HTTPRequest, HTTP_STATUS, APIMLAuth } = require('../http-helper'); +const { APIML_AUTH_COOKIE } = require('../constants'); + +describe('test oidc mapping via gateway', function() { + + let hq; + let apiml; + let token; + + it('obtain Okta token', async function() { + hq = new HTTPRequest(); + apiml = new APIMLAuth(hq); + token = await apiml.loginViaOkta(); + }); + + it('call endpoint with valid Okta token', async function() { + if (!token) { + this.skip(); + } + + const res = await hq.request({ + url: `jobs/api/v2?owner=${process.env.SSH_USER.toUpperCase()}&prefix=*`, + headers: { + Cookie: `${APIML_AUTH_COOKIE}=${token}`, + 'X-CSRF-ZOSMF-HEADER': '*', + }, + }); + + expect(res).to.have.property('status'); + expect(res.status).to.equal(HTTP_STATUS.SUCCESS); + expect(res.data).to.not.be.empty; + }); + +}); diff --git a/tests/sanity/test/http-helper.js b/tests/sanity/test/http-helper.js index 1dd73149dc..a857869c82 100644 --- a/tests/sanity/test/http-helper.js +++ b/tests/sanity/test/http-helper.js @@ -165,6 +165,15 @@ class APIMLAuth { expect(res.data).to.be.empty; } + _validateResponse(res, property) { + // Validate the response at least basically + expect(res.status).to.be.oneOf([HTTP_STATUS.SUCCESS, HTTP_STATUS.NO_CONTENT]); + expect(res.headers).to.be.an('object'); + if (property) { + expect(res.data).to.have.property(property); + } + } + _extractAuthToken(res) { const authCookie = this.httpRequest.findCookieInResponse(res, APIML_AUTH_COOKIE); // Example: @@ -177,6 +186,28 @@ class APIMLAuth { return token; } + _extractSessionToken(res) { + const token = res.data['sessionToken']; + if (!token) { + throw new Error('The authentication was unsuccessful, failed to extract session token.'); + } + expect(token).to.be.an('string'); + return token; + } + + _extractAccessToken(res) { + let token; + // Example: + const matches = res.data.toString().match(/name="access_token" value="(.*)"/i); + if (matches.length > 1) { + token = matches[1]; + } + if (!token) { + throw new Error('The authentication was unsuccessful, failed to extract access token.'); + } + return token; + } + async login(username, password) { debug('================================= APIMLAuth.login'); @@ -223,6 +254,59 @@ class APIMLAuth { return this._extractAuthToken(res); } + async loginViaOkta(clientId, username, password) { + debug('================================= APIMLAuth.loginViaOkta'); + expect(process.env.OKTA_HOSTNAME, 'OKTA_HOSTNAME is empty').to.not.be.empty; + if (!clientId) { + expect(process.env.OKTA_CLIENT_ID, 'OKTA_CLIENT_ID is empty').to.not.be.empty; + clientId = process.env.OKTA_CLIENT_ID; + } + if (!username) { + expect(process.env.OKTA_USER, 'OKTA_USER is not defined').to.not.be.empty; + username = process.env.OKTA_USER; + } + if (!password) { + expect(process.env.OKTA_PASSWORD, 'OKTA_PASSWORD is not defined').to.not.be.empty; + password = process.env.OKTA_PASSWORD; + } + + const oktaHttpReq = new HTTPRequest(`https://${process.env.OKTA_HOSTNAME}`); + + const sessionRes = await oktaHttpReq.request({ + url: '/api/v1/authn', + method: 'post', + headers: { + Accept: 'application/json', + 'Content-Type': 'application/json', + }, + data: { + username, + password, + }, + }); + + this._validateResponse(sessionRes, 'sessionToken'); + const sessionToken = this._extractSessionToken(sessionRes); + const loginUri = 'https://oidcdebugger.com/debug'; + + const authRes = await oktaHttpReq.request({ + url: '/oauth2/default/v1/authorize', + method: 'get', + params: { + 'client_id': clientId, + 'redirect_uri': loginUri, + 'response_type': 'token', + 'response_mode': 'form_post', + 'sessionToken': sessionToken, + 'scope': 'openid', + 'state': 'SanityTest', + 'nonce': 'SanityTest', + }, + }); + + return this._extractAccessToken(authRes); + } + async logout(headers) { debug('================================= APIMLAuth.logout'); From c0df33a466703421ed091cd931dd59e0b615a5cc Mon Sep 17 00:00:00 2001 From: James Struga Date: Thu, 8 Jun 2023 11:46:35 -0400 Subject: [PATCH 025/168] WebUI RC2 for 2.9.0 Signed-off-by: James Struga --- manifest.json.template | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/manifest.json.template b/manifest.json.template index 027a68e02a..7398c08409 100644 --- a/manifest.json.template +++ b/manifest.json.template @@ -14,7 +14,7 @@ "org.zowe.zlux.zlux-core": { "version": "2.9.0-RC", "repository": "libs-snapshot-local", - "artifact": "zlux-core-2.9.0-20230531.164603.pax" + "artifact": "zlux-core-2.9.0-20230608.142940.pax" }, "org.zowe.zlux.sample-angular-app": { "version": "2.9.0-V2.X-RC", @@ -49,7 +49,7 @@ "org.zowe.zss": { "version": "2.9.0-RC", "repository": "libs-snapshot-local", - "artifact": "zss-2.9.0-rc-877-20230531164613.pax" + "artifact": "zss-2.9.0-rc-893-20230608154524.pax" }, "org.zowe.explorer.jobs.jobs-api-package": { "version": "2.0.17", @@ -111,12 +111,12 @@ "org.zowe.configmgr-rexx": { "version": "2.9.0-V2.X-RC", "repository": "libs-snapshot-local", - "artifact": "configmgr-rexx-2.9.0-2023053149.pax" + "artifact": "configmgr-rexx-2.9.0-2023060818.pax" }, "org.zowe.configmgr": { "version": "2.9.0-V2.X-RC", "repository": "libs-snapshot-local", - "artifact": "configmgr-2.9.0-2023053117.pax" + "artifact": "configmgr-2.9.0-2023060822.pax" }, "org.zowe.launcher": { "version": "2.0.11" @@ -166,7 +166,7 @@ }, { "repository": "zlux-app-server", - "tag": "v2.9.0-RC1", + "tag": "v2.9.0-RC2", "destinations": ["Zowe PAX"] }, { @@ -186,7 +186,7 @@ }, { "repository": "zlux-server-framework", - "tag": "v2.9.0-RC1", + "tag": "v2.9.0-RC2", "destinations": ["Zowe PAX"] }, { @@ -206,12 +206,12 @@ }, { "repository": "zss", - "tag": "v2.9.0-RC1", + "tag": "v2.9.0-RC2", "destinations": ["Zowe PAX"] }, { "repository": "zowe-common-c", - "tag": "zss-v2.9.0-RC1", + "tag": "zss-v2.9.0-RC2", "destinations": ["Zowe PAX"] } ] @@ -397,7 +397,7 @@ "componentGroup": "Configmgr", "entries": [{ "repository": "zowe-common-c", - "tag": "configmgr-v2.9.0-RC1", + "tag": "configmgr-v2.9.0-RC2", "destinations": ["Zowe PAX"] }] } From 127c31f5e4f6247ab880a181f1faab5d8de41174 Mon Sep 17 00:00:00 2001 From: Martin Zeithaml <66114686+Martin-Zeithaml@users.noreply.github.com> Date: Mon, 12 Jun 2023 17:22:28 +0200 Subject: [PATCH 026/168] Update ZWENOKYR Better description, might be confusing. Signed-off-by: Martin Zeithaml <66114686+Martin-Zeithaml@users.noreply.github.com> --- files/SZWESAMP/ZWENOKYR | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/files/SZWESAMP/ZWENOKYR b/files/SZWESAMP/ZWENOKYR index 875d281bfc..6f990e9fac 100644 --- a/files/SZWESAMP/ZWENOKYR +++ b/files/SZWESAMP/ZWENOKYR @@ -12,7 +12,7 @@ //********************************************************************* //* //* Zowe Open Source Project -//* This JCL can be used to define key ring and certificates for Zowe +//* This JCL can be used to remove key ring and certificates for Zowe //* //* //* CAUTION: This is neither a JCL procedure nor a complete job. From f92477da7b831a194c0b48a165e6f2759081fdb0 Mon Sep 17 00:00:00 2001 From: ojcelis Date: Tue, 13 Jun 2023 09:07:55 -0400 Subject: [PATCH 027/168] Update licenses to 2.9 Signed-off-by: ojcelis --- manifest.json.template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.json.template b/manifest.json.template index 7398c08409..d46218a44c 100644 --- a/manifest.json.template +++ b/manifest.json.template @@ -131,7 +131,7 @@ "version": "2.0.3" }, "org.zowe.licenses": { - "version": "2.8.0", + "version": "2.9.0", "artifact": "zowe_licenses_full.zip" } }, From 9af8f8a6edcbd742b153f295bc92e5a7dd603d30 Mon Sep 17 00:00:00 2001 From: zowe-robot Date: Tue, 13 Jun 2023 21:20:28 +0000 Subject: [PATCH 028/168] Promote PTF after release v2.9.0 Signed-off-by: zowe-robot --- smpe/bld/service/promoted-apar.txt | 3 ++ smpe/bld/service/promoted-close.txt | 45 +++++++++++++++++++++++++++++ smpe/bld/service/promoted-hold.txt | 25 ++++++++++++++++ smpe/bld/service/promoted-ptf.txt | 2 ++ smpe/bld/service/ptf-bucket.txt | 2 +- 5 files changed, 76 insertions(+), 1 deletion(-) diff --git a/smpe/bld/service/promoted-apar.txt b/smpe/bld/service/promoted-apar.txt index 7b4f8a51c3..ba5ef97143 100644 --- a/smpe/bld/service/promoted-apar.txt +++ b/smpe/bld/service/promoted-apar.txt @@ -1,3 +1,6 @@ +IO29182 +IO29183 +IO29184 IO29174 IO29175 IO29176 diff --git a/smpe/bld/service/promoted-close.txt b/smpe/bld/service/promoted-close.txt index ff1c5c7a1a..146d7ab471 100644 --- a/smpe/bld/service/promoted-close.txt +++ b/smpe/bld/service/promoted-close.txt @@ -1,3 +1,48 @@ + IO29182 - + PROBLEM SUMMARY: + **************************************************************** + * USERS AFFECTED: All Zowe users * + **************************************************************** + * PROBLEM DESCRIPTION: Update Zowe FMID AZWE002 to match the * + * community release * + **************************************************************** + * RECOMMENDATION: Apply provided service * + **************************************************************** + The Zowe community version was updated to 2.9.0. + This PTF provides the community changes in SMP/E format. + Follow this link for more details on the community changes: + https://docs.zowe.org/stable/ + + IO29183 - + PROBLEM SUMMARY: + **************************************************************** + * USERS AFFECTED: All Zowe users * + **************************************************************** + * PROBLEM DESCRIPTION: Update Zowe FMID AZWE002 to match the * + * community release * + **************************************************************** + * RECOMMENDATION: Apply provided service * + **************************************************************** + The Zowe community version was updated to 2.9.0. + This PTF provides the community changes in SMP/E format. + Follow this link for more details on the community changes: + https://docs.zowe.org/stable/ + + IO29184 - + PROBLEM SUMMARY: + **************************************************************** + * USERS AFFECTED: All Zowe users * + **************************************************************** + * PROBLEM DESCRIPTION: Update Zowe FMID AZWE002 to match the * + * community release * + **************************************************************** + * RECOMMENDATION: Apply provided service * + **************************************************************** + The Zowe community version was updated to 2.9.0. + This PTF provides the community changes in SMP/E format. + Follow this link for more details on the community changes: + https://docs.zowe.org/stable/ + IO29174 - PROBLEM SUMMARY: **************************************************************** diff --git a/smpe/bld/service/promoted-hold.txt b/smpe/bld/service/promoted-hold.txt index b67ea709d0..3cb9be11af 100644 --- a/smpe/bld/service/promoted-hold.txt +++ b/smpe/bld/service/promoted-hold.txt @@ -1,3 +1,28 @@ +++HOLD(UO90020) SYSTEM FMID(AZWE002) REASON(ACTION) DATE(23164) + COMMENT( + **************************************************************** + * Affected function: Zowe servers * + **************************************************************** + * Description: stop servers * + **************************************************************** + * Timing: pre-APPLY * + **************************************************************** + * Part: ZWESLSTC and ZWESISTC * + **************************************************************** + Stop the Zowe servers before installing this update. + + **************************************************************** + * Affected function: Zowe servers * + **************************************************************** + * Description: start servers * + **************************************************************** + * Timing: post-APPLY * + **************************************************************** + * Part: ZWESLSTC and ZWESISTC * + **************************************************************** + Start the Zowe servers after installing this update. + + ). ++HOLD(UO90018) SYSTEM FMID(AZWE002) REASON(ACTION) DATE(23116) COMMENT( **************************************************************** diff --git a/smpe/bld/service/promoted-ptf.txt b/smpe/bld/service/promoted-ptf.txt index c692557425..c1fb4a105e 100644 --- a/smpe/bld/service/promoted-ptf.txt +++ b/smpe/bld/service/promoted-ptf.txt @@ -1,3 +1,5 @@ +UO90020 +UO90021 UO90018 UO90019 UO02066 diff --git a/smpe/bld/service/ptf-bucket.txt b/smpe/bld/service/ptf-bucket.txt index 12eda0535c..1d52c1da24 100644 --- a/smpe/bld/service/ptf-bucket.txt +++ b/smpe/bld/service/ptf-bucket.txt @@ -15,5 +15,5 @@ #UO02064 UO02065 - IO29089 IO29090 IO29091 - Fri Feb 10 21:43:46 UTC 2023 v2r6m1 #UO02066 UO02067 - IO29092 IO29093 IO29094 - Thu Mar 16 00:39:46 UTC 2023 v2r7 #UO90018 UO90019 - IO29174 IO29175 IO29176 - Wed Apr 26 22:58:46 UTC 2023 -UO90020 UO90021 - IO29182 IO29183 IO29184 +#UO90020 UO90021 - IO29182 IO29183 IO29184 - Tue Jun 13 21:20:27 UTC 2023 UO90022 UO90023 - IO29185 IO29186 IO29187 \ No newline at end of file From a5040b278d43f3c3a70235beffa61c43a4d9c9a4 Mon Sep 17 00:00:00 2001 From: ojcelis Date: Tue, 13 Jun 2023 18:18:48 -0400 Subject: [PATCH 029/168] Update zowe to the next version Signed-off-by: ojcelis --- manifest.json.template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.json.template b/manifest.json.template index d8b2346603..311cd3cc53 100644 --- a/manifest.json.template +++ b/manifest.json.template @@ -1,6 +1,6 @@ { "name": "Zowe", - "version": "2.9.0", + "version": "2.10.0", "description": "Zowe is an open source project created to host technologies that benefit the Z platform from all members of the Z community (Integrated Software Vendors, System Integrators and z/OS consumers). Zowe, like Mac or Windows, comes with a set of APIs and OS capabilities that applications build on and also includes some applications out of the box. Zowe offers modern interfaces to interact with z/OS and allows you to work with z/OS in a way that is similar to what you experience on cloud platforms today. You can use these interfaces as delivered or through plug-ins and extensions that are created by clients or third-party vendors.", "license": "EPL-2.0", "homepage": "https://zowe.org", From b682b9c57997599ed73dc2ca98979e1a1796994c Mon Sep 17 00:00:00 2001 From: MarkAckert Date: Fri, 23 Jun 2023 10:27:40 -0400 Subject: [PATCH 030/168] build: add build for base docker images Signed-off-by: MarkAckert --- .../workflows/server-bundle-base-images.yml | 131 ++++++++++++++++++ 1 file changed, 131 insertions(+) create mode 100644 .github/workflows/server-bundle-base-images.yml diff --git a/.github/workflows/server-bundle-base-images.yml b/.github/workflows/server-bundle-base-images.yml new file mode 100644 index 0000000000..527d0634b5 --- /dev/null +++ b/.github/workflows/server-bundle-base-images.yml @@ -0,0 +1,131 @@ +name: Build ompzowe/zowecicd-node-java builder +on: + # push: + # pull_request: + workflow_dispatch: + inputs: + release: + description: 'Set to "true" if we want to release the base images' + required: false + default: '' + RANDOM_DISPATCH_EVENT_ID: + description: 'random dispatch event id' + required: false + type: string +env: + IMAGE_BASE_DIR: containers/server-bundle + +jobs: + display-dispatch-event-id: + if: github.event.inputs.RANDOM_DISPATCH_EVENT_ID != '' + runs-on: ubuntu-latest + steps: + - name: RANDOM_DISPATCH_EVENT_ID is ${{ github.event.inputs.RANDOM_DISPATCH_EVENT_ID }} + run: echo "prints random dispatch event id sent from workflow dispatch event" + + build-ubuntu-amd64: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 + + - uses: zowe-actions/shared-actions/prepare-workflow@main + + - uses: zowe-actions/shared-actions/docker-prepare@main + with: + registry-user: ${{ secrets.ARTIFACTORY_X_USERNAME }} + registry-password: ${{ secrets.ARTIFACTORY_X_PASSWORD }} + release: ${{ github.event.inputs.release }} + base-directory: ${{ env.IMAGE_BASE_DIR }} + image-name: zowecicd-node-java + linux-distro: ubuntu + cpu-arch: amd64 + + - uses: zowe-actions/shared-actions/docker-build-local@main + with: + build-arg-list: NODE_CPU_ARCH=x64 + dockerfile: Dockerfile.nodejava.amd64 + timeout-minutes: 5 + + - name: Run Snyk to check Docker image for vulnerabilities + env: + SNYK_TOKEN: ${{ secrets.SNYK_TOKEN }} + continue-on-error: true + uses: snyk/actions/docker@master + with: + image: ${{ env.IMAGE_NAME_FULL_REMOTE }} + args: --file=${{ env.IMAGE_DIRECTORY }}/Dockerfile.nodejava.amd64 + command: test + + - name: Upload result to GitHub Code Scanning + uses: github/codeql-action/upload-sarif@v1 + if: hashFiles('snyk.sarif') != '' + with: + sarif_file: snyk.sarif + + build-ubuntu-s390x: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 + + - uses: zowe-actions/shared-actions/prepare-workflow@main + + - uses: zowe-actions/shared-actions/docker-prepare@main + with: + registry-user: ${{ secrets.ARTIFACTORY_X_USERNAME }} + registry-password: ${{ secrets.ARTIFACTORY_X_PASSWORD }} + release: ${{ github.event.inputs.release }} + base-directory: ${{ env.IMAGE_BASE_DIR }} + image-name: zowecicd-node-java + linux-distro: ubuntu + cpu-arch: s390x + + - uses: zowe-actions/shared-actions/docker-build-zlinux@main + with: + zlinux-host: ${{ secrets.ZLINUX_HOST }} + zlinux-ssh-user: ${{ secrets.ZLINUX_SSH_USER }} + zlinux-ssh-key: ${{ secrets.ZLINUX_SSH_KEY }} + zlinux-ssh-passphrase: ${{ secrets.ZLINUX_SSH_PASSPHRASE }} + build-arg-list: NODE_CPU_ARCH=s390x + dockerfile: Dockerfile.nodejava.s390x + timeout-minutes: 10 + + - name: Run Snyk to check Docker image for vulnerabilities + env: + SNYK_TOKEN: ${{ secrets.SNYK_TOKEN }} + continue-on-error: true + uses: snyk/actions/docker@master + with: + image: ${{ env.IMAGE_NAME_FULL_REMOTE }} + args: --file=${{ env.IMAGE_DIRECTORY }}/Dockerfile.nodejava.s390x + command: test + + - name: Upload result to GitHub Code Scanning + uses: github/codeql-action/upload-sarif@v1 + if: hashFiles('snyk.sarif') != '' + with: + sarif_file: snyk.sarif + + define-ubuntu-manifest: + needs: + - build-ubuntu-amd64 + - build-ubuntu-s390x + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 + + - uses: zowe-actions/shared-actions/prepare-workflow@main + + - uses: zowe-actions/shared-actions/docker-prepare@main + with: + registry-user: ${{ secrets.ARTIFACTORY_X_USERNAME }} + registry-password: ${{ secrets.ARTIFACTORY_X_PASSWORD }} + release: ${{ github.event.inputs.release }} + base-directory: ${{ env.IMAGE_BASE_DIR }} + image-name: zowecicd-node-java + linux-distro: ubuntu + + - uses: zowe-actions/shared-actions/docker-manifest@main + with: + linux-distro: ubuntu + cpu-arch-list: "amd64 s390x" + timeout-minutes: 2 From 53676cfa5bb66da76857a2623ab3230c1a87e1cc Mon Sep 17 00:00:00 2001 From: Mark Ackert <35308966+MarkAckert@users.noreply.github.com> Date: Fri, 23 Jun 2023 12:00:29 -0400 Subject: [PATCH 031/168] Merge pull request #3470 from zowe/user/markackert/zlinux-docker-updates Create CICD build for docker images Signed-off-by: MarkAckert --- .../workflows/server-bundle-base-images.yml | 2 - containers/server-bundle/Dockerfile | 138 ------------------ .../server-bundle/Dockerfile.nodejava.amd64 | 102 ------------- .../server-bundle/Dockerfile.nodejava.s390x | 107 -------------- containers/server-bundle/prepare.sh | 42 ++++++ .../server-bundle/{ => ubuntu}/.gitignore | 0 containers/server-bundle/ubuntu/Dockerfile | 138 ++++++++++++++++++ .../ubuntu/Dockerfile.nodejava.amd64 | 104 +++++++++++++ .../ubuntu/Dockerfile.nodejava.s390x | 120 +++++++++++++++ .../{ => ubuntu}/Dockerfile.sources | 0 .../server-bundle/{ => ubuntu}/LICENSE.txt | 0 .../server-bundle/{ => ubuntu}/NOTICE.txt | 0 .../server-bundle/{ => ubuntu}/README.md | 4 +- .../server-bundle/{ => ubuntu}/build.sh | 0 containers/server-bundle/{ => ubuntu}/run.sh | 0 .../server-bundle/{ => ubuntu}/run_inner.sh | 0 .../server-bundle/{ => ubuntu}/start.sh | 0 17 files changed, 406 insertions(+), 351 deletions(-) delete mode 100644 containers/server-bundle/Dockerfile delete mode 100644 containers/server-bundle/Dockerfile.nodejava.amd64 delete mode 100644 containers/server-bundle/Dockerfile.nodejava.s390x create mode 100755 containers/server-bundle/prepare.sh rename containers/server-bundle/{ => ubuntu}/.gitignore (100%) create mode 100644 containers/server-bundle/ubuntu/Dockerfile create mode 100644 containers/server-bundle/ubuntu/Dockerfile.nodejava.amd64 create mode 100644 containers/server-bundle/ubuntu/Dockerfile.nodejava.s390x rename containers/server-bundle/{ => ubuntu}/Dockerfile.sources (100%) rename containers/server-bundle/{ => ubuntu}/LICENSE.txt (100%) rename containers/server-bundle/{ => ubuntu}/NOTICE.txt (100%) rename containers/server-bundle/{ => ubuntu}/README.md (98%) rename containers/server-bundle/{ => ubuntu}/build.sh (100%) rename containers/server-bundle/{ => ubuntu}/run.sh (100%) rename containers/server-bundle/{ => ubuntu}/run_inner.sh (100%) rename containers/server-bundle/{ => ubuntu}/start.sh (100%) diff --git a/.github/workflows/server-bundle-base-images.yml b/.github/workflows/server-bundle-base-images.yml index 527d0634b5..7959c13244 100644 --- a/.github/workflows/server-bundle-base-images.yml +++ b/.github/workflows/server-bundle-base-images.yml @@ -43,7 +43,6 @@ jobs: - uses: zowe-actions/shared-actions/docker-build-local@main with: build-arg-list: NODE_CPU_ARCH=x64 - dockerfile: Dockerfile.nodejava.amd64 timeout-minutes: 5 - name: Run Snyk to check Docker image for vulnerabilities @@ -86,7 +85,6 @@ jobs: zlinux-ssh-key: ${{ secrets.ZLINUX_SSH_KEY }} zlinux-ssh-passphrase: ${{ secrets.ZLINUX_SSH_PASSPHRASE }} build-arg-list: NODE_CPU_ARCH=s390x - dockerfile: Dockerfile.nodejava.s390x timeout-minutes: 10 - name: Run Snyk to check Docker image for vulnerabilities diff --git a/containers/server-bundle/Dockerfile b/containers/server-bundle/Dockerfile deleted file mode 100644 index f5ca7d8b92..0000000000 --- a/containers/server-bundle/Dockerfile +++ /dev/null @@ -1,138 +0,0 @@ -FROM ompzowe/zowecicd-node12-java8:v2.1 as builder - -# allow to customize which Zowe build to build from -# There are 3 possible values: -# 1. ZOWE_BUILD=: empty, which will try to find the local zowe.pax in same directory. The build has to be named as zowe.pax. -# 2. ZOWE_BUILD=latest: will download the most recent official release and use it as base build -# 3. ZOWE_BUILD=: will download Zowe build from this url and use it as base build -ARG ZOWE_BUILD= - -RUN apt-get update && apt-get install -y --no-install-recommends \ - ca-certificates curl wget \ - groff iproute2 moreutils pax && \ - rm -rf /var/lib/apt/lists/* - -EXPOSE 7553/tcp -EXPOSE 7554/tcp -EXPOSE 7556/tcp - -#ENV ZOWE_ZOSMF_HOST='zosmf.host.com' -#ENV ZOWE_ZSS_HOST='zss.host.com' -#ENV ZWED_agent_host='zwed.host.com' -ENV ZOWE_EXPLORER_HOST='localhost' -ENV ZOWE_IP_ADDRESS=0.0.0.0 - -ENV ZOWE_ZOSMF_PORT='443' -#ENV ZWES_SERVER_PORT='00000' - - -ENV LAUNCH_COMPONENT_GROUPS=DESKTOP,GATEWAY - -RUN mkdir /home/zowe/utils && \ - mkdir /home/zowe/samples -COPY utils/ /home/zowe/utils/ -COPY start.sh /home/zowe/samples/ -COPY NOTICE.txt LICENSE.txt /home/zowe/ - -RUN cd /home/zowe/utils/autoconv && \ - npm install && \ - npm run build && \ - rm -rf node_modules src samples *.js *.json .editorconfig *ignore *.md && \ - ln -s ./autoconv/bin/autoconv ../autoconv.sh - -# copy run.sh and optional zowe.pax -COPY run.sh run_inner.sh /home/zowe/ -COPY zowe.pax* /tmp - -# download zowe build if specified -RUN /home/zowe/utils/download-zowe-build.sh "${ZOWE_BUILD}" - -# 1. Convert content of pax files from ebcdic to ASCII -# 2. replace or remove some zos specific parameters -# 3. Install zowe, then remove installer files -RUN mv /home/zowe/run_inner.sh /home/zowe/.run_inner.sh && \ - mkdir -p /tmp/zowe-install && cd /tmp/zowe-install && \ - tar -xvf ../zowe.pax --strip 1 && \ - find . -type f -iregex '.*\.\(rexx\|js\|sh\|json\|jcl\|yaml\|clist\|env\)$' -exec sh -c "conv '{}' | sponge '{}'" \; && \ - find . -type f -name '*.sh' -exec sh -c "sed -i 's/-Xquickstart//' {}" \; && \ - find . -type f -name '*.sh' -exec sh -c "sed -i 's/-ppx/-pp/' {}" \; && \ - find . -type f -name '*.sh' -exec sh -c "sed -i 's/iconv -f IBM-1047 -t IBM-850/cat/' {}" \; && \ - find . -type f -name '*.sh' -exec sh -c "chmod +x {}" \; && \ - echo "exit 0" > scripts/opercmd && \ - sed -i 's/java version/openjdk version/' scripts/utils/validate-java.sh && \ - \ - \ - cd /tmp/zowe-install/files && \ - mv app-server-*.pax zlux && \ - for f in *.pax; do \ - echo "Processing ebcdic pax $f" && \ - cd /tmp/zowe-install/files &&\ - rm -rf tmp && \ - mkdir tmp && \ - cd tmp && \ - pax -rf ../$f && \ - rm ../$f && \ - find . -type f -iregex '.*\.\(rexx\|js\|sh\|json\|jcl\|yaml\|clist\|html\|template\|css\|svg\|map\|gz\|env\)$' -exec sh -c "conv '{}' | sponge '{}'" \; && \ - find . -type f -name '*.sh' -exec sh -c "sed -i 's/-Xquickstart//' {}" \; && \ - pax -wf ../$f . && \ - cd .. ; \ - done && \ - rm -f zss*.pax && \ - cd zlux && \ - for f in *.pax; do \ - echo "Processing tagged pax $f" &&\ - cd /tmp/zowe-install/files/zlux &&\ - rm -rf tmp &&\ - mkdir tmp &&\ - cd tmp &&\ - pax -rf ../$f &&\ - rm ../$f &&\ - find . -type f -iregex '.*\.\(sh\)$' -exec sh -c "conv '{}' | sponge '{}'" \; && \ - find . -type f -name '*.sh' -exec sh -c "sed -i 's/-Xquickstart//' {}" \; &&\ - find . -type f -name '*.sh' -exec sh -c "sed -i 's/-px //' {}" \; && \ - pax -wf ../$f . &&\ - cd .. ; \ - done && \ - mv app-server-*.pax .. && \ - \ - \ - /tmp/zowe-install/install/zowe-install.sh -i /home/zowe/install -l /home/zowe/logs && \ - bash -c "/home/zowe/install/bin/zowe-configure-instance.sh -c /home/zowe/instance" && \ - \ - \ - cd /home/zowe/install/components/explorer-ui-server && \ - rm -rf node_modules && \ - npm install --only=prod --ignore-scripts && \ - cd /home/zowe/install/components && \ - find */bin -type f -name '*.sh' -exec sh -c "sed -i 's/-Xquickstart//' {}" \; - -# Could be modified during runtime, back it up. -RUN cp /home/zowe/instance/instance.env /home/zowe/instance/instance.env.bkp \ - && cp /home/zowe/install/bin/zowe-setup-certificates.env /home/zowe/install/bin/zowe-setup-certificates.env.bkp - -FROM ompzowe/zowecicd-node12-java8:v2.1 - -EXPOSE 7553/tcp -EXPOSE 7554/tcp -EXPOSE 7556/tcp - -#ENV ZOWE_ZOSMF_HOST='zosmf.host.com' -#ENV ZOWE_ZSS_HOST='zss.host.com' -#ENV ZWED_agent_host='zwed.host.com' -ENV ZOWE_EXPLORER_HOST='localhost' -ENV ZOWE_IP_ADDRESS=0.0.0.0 - -ENV ZOWE_ZOSMF_PORT='443' -#ENV ZWES_SERVER_PORT='00000' -ENV ZWED_agent_https_port='7557' - -# authorization needs to point to zss endpoint -ENV APIML_SECURITY_AUTHORIZATION_PROVIDER=endpoint -ENV APIML_SECURITY_AUTHORIZATION_ENDPOINT_ENABLED=true - -ENV LAUNCH_COMPONENT_GROUPS=DESKTOP,GATEWAY - -COPY --chown=zowe:zowe --from=builder /home/zowe /home/zowe -RUN chmod a+x /home/zowe/*.sh /home/zowe/.run_inner.sh - -ENTRYPOINT ["/home/zowe/run.sh"] diff --git a/containers/server-bundle/Dockerfile.nodejava.amd64 b/containers/server-bundle/Dockerfile.nodejava.amd64 deleted file mode 100644 index d2a060455a..0000000000 --- a/containers/server-bundle/Dockerfile.nodejava.amd64 +++ /dev/null @@ -1,102 +0,0 @@ -FROM openjdk:8-jdk-slim as builder - -RUN apt-get update && apt-get install -y --no-install-recommends \ - ca-certificates curl wget \ - groff iproute2 moreutils pax && \ - apt-get dist-upgrade -y - -### -# node install code from loyaltyone/docker-slim-java-node -### - -RUN set -ex; \ - if ! command -v gpg > /dev/null; then \ - apt-get install -y --no-install-recommends gnupg dirmngr; \ - fi - -# gpg keys listed at https://github.com/nodejs/node#release-team -RUN set -ex \ - && for key in \ - 4ED778F539E3634C779C87C6D7062848A1AB005C \ - 94AE36675C464D64BAFA68DD7434390BDBE9B9C5 \ - 71DCFD284A79C3B38668286BC97EC7A07EDE3FC1 \ - 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \ - C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \ - C82FA3AE1CBEDC6BE46B9360C43CEC45C17AB93C \ - DD8F2338BAE7501E3DD5AC78C273792F7D83545D \ - A48C2BEE680E841632CD4E44F07496B3EB3C1762 \ - 108F52B48DB57BB0CC439B2997B01419BD92F80A \ - B9E2F5981AA6E0CD28160D9FF13993A75599653C \ - ; do \ - gpg --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys "$key" || \ - gpg --keyserver hkp://ipv4.pool.sks-keyservers.net --recv-keys "$key" || \ - gpg --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" || \ - gpg --keyserver pool.sks-keyservers.net --recv-keys "$key" ; \ - done - -ENV NODE_VERSION 16.18.1 - -RUN buildDeps='xz-utils' \ - && ARCH= && dpkgArch="$(dpkg --print-architecture)" \ - && case "${dpkgArch##*-}" in \ - amd64) ARCH='x64';; \ - ppc64el) ARCH='ppc64le';; \ - s390x) ARCH='s390x';; \ - arm64) ARCH='arm64';; \ - armhf) ARCH='armv7l';; \ - i386) ARCH='x86';; \ - *) echo "unsupported architecture"; exit 1 ;; \ - esac \ - && set -x \ - && apt-get install -y $buildDeps --no-install-recommends \ - && curl -SLO "https://nodejs.org/dist/v$NODE_VERSION/node-v$NODE_VERSION-linux-$ARCH.tar.xz" \ - && curl -SLO --compressed "https://nodejs.org/dist/v$NODE_VERSION/SHASUMS256.txt.asc" \ - && gpg --batch --decrypt --output SHASUMS256.txt SHASUMS256.txt.asc \ - && grep " node-v$NODE_VERSION-linux-$ARCH.tar.xz\$" SHASUMS256.txt | sha256sum -c - \ - && mkdir -p /usr/local/node \ - && tar -xJf "node-v$NODE_VERSION-linux-$ARCH.tar.xz" -C /usr/local/node --strip-components=1 --no-same-owner \ - && rm "node-v$NODE_VERSION-linux-$ARCH.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt \ - && apt-get purge -y $buildDeps - -### -# End of NodeJS Setup -### - -FROM openjdk:8-jdk-slim - -# Updates and Cleanup - -RUN apt-get update && apt-get dist-upgrade -y - -COPY --from=builder /usr/local/node /usr/local/node - -RUN ln -s /usr/local/node/bin/node /usr/local/bin/node \ - && ln -s /usr/local/node/bin/node /usr/local/bin/nodejs \ - && ln -s /usr/local/node/lib/node_modules/npm/bin/npm-cli.js /usr/local/bin/npm \ - && ln -s /usr/local/node/lib/node_modules/npm/bin/npx-cli.js /usr/local/bin/npx - -RUN apt-get purge -y --auto-remove gnupg dirmngr wget && \ - rm -rf /var/lib/apt/lists/* && \ - apt-get clean - -# set bash as default shell -RUN mkdir -p /usr/share/man/man1/ && touch /usr/share/man/man1/sh.distrib.1.gz && \ - echo "dash dash/sh boolean false" | debconf-set-selections && \ - DEBIAN_FRONTEND=noninteractive dpkg-reconfigure dash - -RUN groupadd --gid 7556 zowe \ - && useradd --uid 7556 --gid zowe --shell /bin/bash --create-home zowe \ - && mkdir /root/zowe && chown zowe:zowe /root/zowe \ - && mkdir /global && chown zowe:zowe /global \ - && cd /home/zowe && \ - ( echo '#!/bin/sh'; echo 'tr '"'"'\000\001\002\003\004\005\006\007\010\011\012\013\014\015\016\017\020\021\022\023\024\025\026\027\030\031\032\033\034\035\036\037\040\041\042\043\044\045\046\047\050\051\052\053\054\055\056\057\060\061\062\063\064\065\066\067\070\071\072\073\074\075\076\077\100\101\102\103\104\105\106\107\110\111\112\113\114\115\116\117\120\121\122\123\124\125\126\127\130\131\132\133\134\135\136\137\140\141\142\143\144\145\146\147\150\151\152\153\154\155\156\157\160\161\162\163\164\165\166\167\170\171\172\173\174\175\176\177\200\201\202\203\204\205\206\207\210\211\212\213\214\215\216\217\220\221\222\223\224\225\226\227\230\231\232\233\234\235\236\237\240\241\242\243\244\245\246\247\250\251\252\253\254\255\256\257\260\261\262\263\264\265\266\267\270\271\272\273\274\275\276\277\300\301\302\303\304\305\306\307\310\311\312\313\314\315\316\317\320\321\322\323\324\325\326\327\330\331\332\333\334\335\336\337\340\341\342\343\344\345\346\347\350\351\352\353\354\355\356\357\360\361\362\363\364\365\366\367\370\371\372\373\374\375\376\377'"'"' '"'"'\000\001\002\003\234\011\206\177\227\215\216\013\014\015\016\017\020\021\022\023\235\012\010\207\030\031\222\217\034\035\036\037\200\201\202\203\204\205\027\033\210\211\212\213\214\005\006\007\220\221\026\223\224\225\226\004\230\231\232\233\024\025\236\032\040\240\342\344\340\341\343\345\347\361\242\056\074\050\053\174\046\351\352\353\350\355\356\357\354\337\041\044\052\051\073\136\055\057\302\304\300\301\303\305\307\321\246\054\045\137\076\077\370\311\312\313\310\315\316\317\314\140\072\043\100\047\075\042\330\141\142\143\144\145\146\147\150\151\253\273\360\375\376\261\260\152\153\154\155\156\157\160\161\162\252\272\346\270\306\244\265\176\163\164\165\166\167\170\171\172\241\277\320\133\336\256\254\243\245\267\251\247\266\274\275\276\335\250\257\135\264\327\173\101\102\103\104\105\106\107\110\111\255\364\366\362\363\365\175\112\113\114\115\116\117\120\121\122\271\373\374\371\372\377\134\367\123\124\125\126\127\130\131\132\262\324\326\322\323\325\060\061\062\063\064\065\066\067\070\071\263\333\334\331\332\237'"'"' <$1' ) >conv && chmod +x conv && ln -s $(pwd)/conv /bin/conv && \ - rm -rf zowe && \ - echo "exit 0" > /bin/extattr && chmod +x /bin/extattr && \ - echo "exit 0" > /bin/ping && chmod +x /bin/ping && \ - echo "exit 0" > /bin/oping && chmod +x /bin/oping && \ - echo "exit 0" > /bin/onetstat && chmod +x /bin/onetstat && \ - echo "exit 0" > /bin/chtag && chmod +x /bin/chtag && \ - echo 'cat $5' > /bin/iconv && chmod +x /bin/iconv && \ - mv /usr/bin/iconv /usr/bin/iconv_ - -ENV NODE_HOME='/usr/local/node' \ No newline at end of file diff --git a/containers/server-bundle/Dockerfile.nodejava.s390x b/containers/server-bundle/Dockerfile.nodejava.s390x deleted file mode 100644 index 0e5a91832b..0000000000 --- a/containers/server-bundle/Dockerfile.nodejava.s390x +++ /dev/null @@ -1,107 +0,0 @@ -FROM s390x/debian:stretch as builder -#FROM s390x/ibmjava:sdk as builder - -### -# node install code from loyaltyone/docker-slim-java-node -### - -RUN apt-get update && apt-get install -y --no-install-recommends \ - ca-certificates curl wget \ - groff iproute2 moreutils pax - - -RUN set -ex; \ - if ! command -v gpg > /dev/null; then \ - apt-get install -y --no-install-recommends gnupg dirmngr; \ - fi - -# gpg keys listed at https://github.com/nodejs/node#release-team -RUN set -ex \ - && for key in \ - 4ED778F539E3634C779C87C6D7062848A1AB005C \ - 94AE36675C464D64BAFA68DD7434390BDBE9B9C5 \ - 71DCFD284A79C3B38668286BC97EC7A07EDE3FC1 \ - 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \ - C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \ - C82FA3AE1CBEDC6BE46B9360C43CEC45C17AB93C \ - DD8F2338BAE7501E3DD5AC78C273792F7D83545D \ - A48C2BEE680E841632CD4E44F07496B3EB3C1762 \ - 108F52B48DB57BB0CC439B2997B01419BD92F80A \ - B9E2F5981AA6E0CD28160D9FF13993A75599653C \ - ; do \ - gpg --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys "$key" || \ - gpg --keyserver hkp://ipv4.pool.sks-keyservers.net --recv-keys "$key" || \ - gpg --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" || \ - gpg --keyserver pool.sks-keyservers.net --recv-keys "$key" ; \ - done - -ENV NODE_VERSION 16.18.1 - -RUN buildDeps='xz-utils' \ - && ARCH= && dpkgArch="$(dpkg --print-architecture)" \ - && case "${dpkgArch##*-}" in \ - amd64) ARCH='x64';; \ - ppc64el) ARCH='ppc64le';; \ - s390x) ARCH='s390x';; \ - arm64) ARCH='arm64';; \ - armhf) ARCH='armv7l';; \ - i386) ARCH='x86';; \ - *) echo "unsupported architecture"; exit 1 ;; \ - esac \ - && set -x \ - && apt-get install -y $buildDeps --no-install-recommends \ - && curl -SLO "https://nodejs.org/dist/v$NODE_VERSION/node-v$NODE_VERSION-linux-$ARCH.tar.xz" \ - && curl -SLO --compressed "https://nodejs.org/dist/v$NODE_VERSION/SHASUMS256.txt.asc" \ - && gpg --batch --decrypt --output SHASUMS256.txt SHASUMS256.txt.asc \ - && grep " node-v$NODE_VERSION-linux-$ARCH.tar.xz\$" SHASUMS256.txt | sha256sum -c - \ - && mkdir -p /usr/local/node \ - && tar -xJf "node-v$NODE_VERSION-linux-$ARCH.tar.xz" -C /usr/local/node --strip-components=1 --no-same-owner \ - && rm "node-v$NODE_VERSION-linux-$ARCH.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt \ - && apt-get purge -y $buildDeps - -### -# End of NodeJS Setup -### - -FROM s390x/debian:stretch -#FROM s390x/ibmjava:sdk - -# Updates and Cleanup - -RUN apt-get update && apt-get install -y --no-install-recommends \ - openjdk-8-jdk-headless && \ - apt-get dist-upgrade -y - -COPY --from=builder /usr/local/node /usr/local/node - -RUN ln -s /usr/local/node/bin/node /usr/local/bin/node \ - && ln -s /usr/local/node/bin/node /usr/local/bin/nodejs \ - && ln -s /usr/local/node/lib/node_modules/npm/bin/npm-cli.js /usr/local/bin/npm \ - && ln -s /usr/local/node/lib/node_modules/npm/bin/npx-cli.js /usr/local/bin/npx - -RUN apt-get purge -y --auto-remove gnupg dirmngr wget && \ - rm -rf /var/lib/apt/lists/* && \ - apt-get clean - -# set bash as default shell -RUN mkdir -p /usr/share/man/man1/ && touch /usr/share/man/man1/sh.distrib.1.gz && \ - echo "dash dash/sh boolean false" | debconf-set-selections && \ - DEBIAN_FRONTEND=noninteractive dpkg-reconfigure dash - -RUN groupadd --gid 7556 zowe \ - && useradd --uid 7556 --gid zowe --shell /bin/bash --create-home zowe \ - && mkdir /root/zowe && chown zowe:zowe /root/zowe \ - && mkdir /global && chown zowe:zowe /global \ - && cd /home/zowe && \ - ( echo '#!/bin/sh'; echo 'tr '"'"'\000\001\002\003\004\005\006\007\010\011\012\013\014\015\016\017\020\021\022\023\024\025\026\027\030\031\032\033\034\035\036\037\040\041\042\043\044\045\046\047\050\051\052\053\054\055\056\057\060\061\062\063\064\065\066\067\070\071\072\073\074\075\076\077\100\101\102\103\104\105\106\107\110\111\112\113\114\115\116\117\120\121\122\123\124\125\126\127\130\131\132\133\134\135\136\137\140\141\142\143\144\145\146\147\150\151\152\153\154\155\156\157\160\161\162\163\164\165\166\167\170\171\172\173\174\175\176\177\200\201\202\203\204\205\206\207\210\211\212\213\214\215\216\217\220\221\222\223\224\225\226\227\230\231\232\233\234\235\236\237\240\241\242\243\244\245\246\247\250\251\252\253\254\255\256\257\260\261\262\263\264\265\266\267\270\271\272\273\274\275\276\277\300\301\302\303\304\305\306\307\310\311\312\313\314\315\316\317\320\321\322\323\324\325\326\327\330\331\332\333\334\335\336\337\340\341\342\343\344\345\346\347\350\351\352\353\354\355\356\357\360\361\362\363\364\365\366\367\370\371\372\373\374\375\376\377'"'"' '"'"'\000\001\002\003\234\011\206\177\227\215\216\013\014\015\016\017\020\021\022\023\235\012\010\207\030\031\222\217\034\035\036\037\200\201\202\203\204\205\027\033\210\211\212\213\214\005\006\007\220\221\026\223\224\225\226\004\230\231\232\233\024\025\236\032\040\240\342\344\340\341\343\345\347\361\242\056\074\050\053\174\046\351\352\353\350\355\356\357\354\337\041\044\052\051\073\136\055\057\302\304\300\301\303\305\307\321\246\054\045\137\076\077\370\311\312\313\310\315\316\317\314\140\072\043\100\047\075\042\330\141\142\143\144\145\146\147\150\151\253\273\360\375\376\261\260\152\153\154\155\156\157\160\161\162\252\272\346\270\306\244\265\176\163\164\165\166\167\170\171\172\241\277\320\133\336\256\254\243\245\267\251\247\266\274\275\276\335\250\257\135\264\327\173\101\102\103\104\105\106\107\110\111\255\364\366\362\363\365\175\112\113\114\115\116\117\120\121\122\271\373\374\371\372\377\134\367\123\124\125\126\127\130\131\132\262\324\326\322\323\325\060\061\062\063\064\065\066\067\070\071\263\333\334\331\332\237'"'"' <$1' ) >conv && chmod +x conv && ln -s $(pwd)/conv /bin/conv && \ - rm -rf zowe && \ - echo "exit 0" > /bin/extattr && chmod +x /bin/extattr && \ - echo "exit 0" > /bin/ping && chmod +x /bin/ping && \ - echo "exit 0" > /bin/oping && chmod +x /bin/oping && \ - echo "exit 0" > /bin/onetstat && chmod +x /bin/onetstat && \ - echo "exit 0" > /bin/chtag && chmod +x /bin/chtag && \ - echo 'cat $5' > /bin/iconv && chmod +x /bin/iconv && \ - mv /usr/bin/iconv /usr/bin/iconv_ - -ENV NODE_HOME='/usr/local/node' -ENV JAVA_HOME='/usr/lib/jvm/java-8-openjdk-s390x' diff --git a/containers/server-bundle/prepare.sh b/containers/server-bundle/prepare.sh new file mode 100755 index 0000000000..69da111301 --- /dev/null +++ b/containers/server-bundle/prepare.sh @@ -0,0 +1,42 @@ +#!/bin/bash + +################################################################################ +# 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. +################################################################################ + +################################################################################ +# prepare docker build context +# +# This script will be executed with 2 parameters: +# - linux-distro +# - cpu-arch + +############################### +# check parameters +linux_distro=$1 +cpu_arch=$2 +if [ -z "${linux_distro}" ]; then + echo "Error: linux-distro parameter is missing." + exit 1 +fi +if [ -z "${cpu_arch}" ]; then + echo "Error: cpu-arch parameter is missing." + exit 1 +fi + +############################### +# copy Dockerfile +mkdir -p "${linux_distro}/amd64" +mkdir -p "${linux_distro}/s390x" +cp "${linux_distro}/Dockerfile.nodejava.amd64" "${linux_distro}/amd64/Dockerfile" +cp "${linux_distro}/Dockerfile.nodejava.s390x" "${linux_distro}/s390x/Dockerfile" + +############################### +# done +echo ">>>>> all done" diff --git a/containers/server-bundle/.gitignore b/containers/server-bundle/ubuntu/.gitignore similarity index 100% rename from containers/server-bundle/.gitignore rename to containers/server-bundle/ubuntu/.gitignore diff --git a/containers/server-bundle/ubuntu/Dockerfile b/containers/server-bundle/ubuntu/Dockerfile new file mode 100644 index 0000000000..656e346199 --- /dev/null +++ b/containers/server-bundle/ubuntu/Dockerfile @@ -0,0 +1,138 @@ +FROM zowe-docker-release.jfrog.io/ompzowe/zowecicd-node-java:2.0.0 as builder + +# allow to customize which Zowe build to build from +# There are 3 possible values: +# 1. ZOWE_BUILD=: empty, which will try to find the local zowe.pax in same directory. The build has to be named as zowe.pax. +# 2. ZOWE_BUILD=latest: will download the most recent official release and use it as base build +# 3. ZOWE_BUILD=: will download Zowe build from this url and use it as base build +ARG ZOWE_BUILD= + +RUN apt-get update && apt-get install -y --no-install-recommends \ + ca-certificates curl wget \ + groff iproute2 moreutils pax && \ + rm -rf /var/lib/apt/lists/* + +EXPOSE 7553/tcp +EXPOSE 7554/tcp +EXPOSE 7556/tcp + +#ENV ZOWE_ZOSMF_HOST='zosmf.host.com' +#ENV ZOWE_ZSS_HOST='zss.host.com' +#ENV ZWED_agent_host='zwed.host.com' +ENV ZOWE_EXPLORER_HOST='localhost' +ENV ZOWE_IP_ADDRESS=0.0.0.0 + +ENV ZOWE_ZOSMF_PORT='443' +#ENV ZWES_SERVER_PORT='00000' + + +ENV LAUNCH_COMPONENT_GROUPS=DESKTOP,GATEWAY + +RUN mkdir /home/zowe/utils && \ + mkdir /home/zowe/samples +COPY utils/ /home/zowe/utils/ +COPY start.sh /home/zowe/samples/ +COPY NOTICE.txt LICENSE.txt /home/zowe/ + +RUN cd /home/zowe/utils/autoconv && \ + npm install && \ + npm run build && \ + rm -rf node_modules src samples *.js *.json .editorconfig *ignore *.md && \ + ln -s ./autoconv/bin/autoconv ../autoconv.sh + +# copy run.sh and optional zowe.pax +COPY run.sh run_inner.sh /home/zowe/ +COPY zowe.pax* /tmp + +# download zowe build if specified +RUN /home/zowe/utils/download-zowe-build.sh "${ZOWE_BUILD}" + +# 1. Convert content of pax files from ebcdic to ASCII +# 2. replace or remove some zos specific parameters +# 3. Install zowe, then remove installer files +RUN mv /home/zowe/run_inner.sh /home/zowe/.run_inner.sh && \ + mkdir -p /tmp/zowe-install && cd /tmp/zowe-install && \ + tar -xvf ../zowe.pax --strip 1 && \ + find . -type f -iregex '.*\.\(rexx\|js\|sh\|json\|jcl\|yaml\|clist\|env\)$' -exec sh -c "conv '{}' | sponge '{}'" \; && \ + find . -type f -name '*.sh' -exec sh -c "sed -i 's/-Xquickstart//' {}" \; && \ + find . -type f -name '*.sh' -exec sh -c "sed -i 's/-ppx/-pp/' {}" \; && \ + find . -type f -name '*.sh' -exec sh -c "sed -i 's/iconv -f IBM-1047 -t IBM-850/cat/' {}" \; && \ + find . -type f -name '*.sh' -exec sh -c "chmod +x {}" \; && \ + echo "exit 0" > scripts/opercmd && \ + sed -i 's/java version/openjdk version/' scripts/utils/validate-java.sh && \ + \ + \ + cd /tmp/zowe-install/files && \ + mv app-server-*.pax zlux && \ + for f in *.pax; do \ + echo "Processing ebcdic pax $f" && \ + cd /tmp/zowe-install/files &&\ + rm -rf tmp && \ + mkdir tmp && \ + cd tmp && \ + pax -rf ../$f && \ + rm ../$f && \ + find . -type f -iregex '.*\.\(rexx\|js\|sh\|json\|jcl\|yaml\|clist\|html\|template\|css\|svg\|map\|gz\|env\)$' -exec sh -c "conv '{}' | sponge '{}'" \; && \ + find . -type f -name '*.sh' -exec sh -c "sed -i 's/-Xquickstart//' {}" \; && \ + pax -wf ../$f . && \ + cd .. ; \ + done && \ + rm -f zss*.pax && \ + cd zlux && \ + for f in *.pax; do \ + echo "Processing tagged pax $f" &&\ + cd /tmp/zowe-install/files/zlux &&\ + rm -rf tmp &&\ + mkdir tmp &&\ + cd tmp &&\ + pax -rf ../$f &&\ + rm ../$f &&\ + find . -type f -iregex '.*\.\(sh\)$' -exec sh -c "conv '{}' | sponge '{}'" \; && \ + find . -type f -name '*.sh' -exec sh -c "sed -i 's/-Xquickstart//' {}" \; &&\ + find . -type f -name '*.sh' -exec sh -c "sed -i 's/-px //' {}" \; && \ + pax -wf ../$f . &&\ + cd .. ; \ + done && \ + mv app-server-*.pax .. && \ + \ + \ + /tmp/zowe-install/install/zowe-install.sh -i /home/zowe/install -l /home/zowe/logs && \ + bash -c "/home/zowe/install/bin/zowe-configure-instance.sh -c /home/zowe/instance" && \ + \ + \ + cd /home/zowe/install/components/explorer-ui-server && \ + rm -rf node_modules && \ + npm install --only=prod --ignore-scripts && \ + cd /home/zowe/install/components && \ + find */bin -type f -name '*.sh' -exec sh -c "sed -i 's/-Xquickstart//' {}" \; + +# Could be modified during runtime, back it up. +RUN cp /home/zowe/instance/instance.env /home/zowe/instance/instance.env.bkp \ + && cp /home/zowe/install/bin/zowe-setup-certificates.env /home/zowe/install/bin/zowe-setup-certificates.env.bkp + +FROM zowe-docker-release.jfrog.io/ompzowe/zowecicd-node-java:2.0.0 + +EXPOSE 7553/tcp +EXPOSE 7554/tcp +EXPOSE 7556/tcp + +#ENV ZOWE_ZOSMF_HOST='zosmf.host.com' +#ENV ZOWE_ZSS_HOST='zss.host.com' +#ENV ZWED_agent_host='zwed.host.com' +ENV ZOWE_EXPLORER_HOST='localhost' +ENV ZOWE_IP_ADDRESS=0.0.0.0 + +ENV ZOWE_ZOSMF_PORT='443' +#ENV ZWES_SERVER_PORT='00000' +ENV ZWED_agent_https_port='7557' + +# authorization needs to point to zss endpoint +ENV APIML_SECURITY_AUTHORIZATION_PROVIDER=endpoint +ENV APIML_SECURITY_AUTHORIZATION_ENDPOINT_ENABLED=true + +ENV LAUNCH_COMPONENT_GROUPS=DESKTOP,GATEWAY + +COPY --chown=zowe:zowe --from=builder /home/zowe /home/zowe +RUN chmod a+x /home/zowe/*.sh /home/zowe/.run_inner.sh + +ENTRYPOINT ["/home/zowe/run.sh"] diff --git a/containers/server-bundle/ubuntu/Dockerfile.nodejava.amd64 b/containers/server-bundle/ubuntu/Dockerfile.nodejava.amd64 new file mode 100644 index 0000000000..ac7ff0d4ab --- /dev/null +++ b/containers/server-bundle/ubuntu/Dockerfile.nodejava.amd64 @@ -0,0 +1,104 @@ +FROM openjdk:8-jdk-slim as builder + +################################## +# labels +LABEL name="Zowe Docker Distribution Base Image" \ + vendor="Zowe" \ + version="2.0.0" \ + release="0" \ + summary="Base image for Zowe docker distribution" \ + description="Base image for Zowe docker distribution" + +RUN apt-get update && apt-get install -y --no-install-recommends \ + ca-certificates curl wget \ + groff iproute2 moreutils pax && \ + apt-get dist-upgrade -y + +### +# node install code from loyaltyone/docker-slim-java-node +### + +RUN set -ex; \ + if ! command -v gpg > /dev/null; then \ + apt-get install -y --no-install-recommends gnupg dirmngr; \ + fi + +# gpg keys listed at https://github.com/nodejs/node#release-team +RUN set -ex \ + && \ + gpg --keyserver hkps://keys.openpgp.org --recv-keys 4ED778F539E3634C779C87C6D7062848A1AB005C && \ + gpg --keyserver hkps://keys.openpgp.org --recv-keys 141F07595B7B3FFE74309A937405533BE57C7D57 && \ + gpg --keyserver hkps://keys.openpgp.org --recv-keys 74F12602B6F1C4E913FAA37AD3A89613643B6201 && \ + gpg --keyserver hkps://keys.openpgp.org --recv-keys DD792F5973C6DE52C432CBDAC77ABFA00DDBF2B7 && \ + gpg --keyserver hkps://keys.openpgp.org --recv-keys 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 && \ + gpg --keyserver hkps://keys.openpgp.org --recv-keys C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 && \ + gpg --keyserver hkps://keys.openpgp.org --recv-keys 890C08DB8579162FEE0DF9DB8BEAB4DFCF555EF4 && \ + gpg --keyserver hkps://keys.openpgp.org --recv-keys C82FA3AE1CBEDC6BE46B9360C43CEC45C17AB93C && \ + gpg --keyserver hkps://keys.openpgp.org --recv-keys 108F52B48DB57BB0CC439B2997B01419BD92F80A + +ENV NODE_VERSION 16.18.1 + +RUN buildDeps='xz-utils' \ + && ARCH= && dpkgArch="$(dpkg --print-architecture)" \ + && case "${dpkgArch##*-}" in \ + amd64) ARCH='x64';; \ + ppc64el) ARCH='ppc64le';; \ + s390x) ARCH='s390x';; \ + arm64) ARCH='arm64';; \ + armhf) ARCH='armv7l';; \ + i386) ARCH='x86';; \ + *) echo "unsupported architecture"; exit 1 ;; \ + esac \ + && set -x \ + && apt-get install -y $buildDeps --no-install-recommends \ + && curl -SLO "https://nodejs.org/dist/v$NODE_VERSION/node-v$NODE_VERSION-linux-$ARCH.tar.xz" \ + && curl -SLO --compressed "https://nodejs.org/dist/v$NODE_VERSION/SHASUMS256.txt.asc" \ + && gpg --batch --decrypt --output SHASUMS256.txt SHASUMS256.txt.asc \ + && grep " node-v$NODE_VERSION-linux-$ARCH.tar.xz\$" SHASUMS256.txt | sha256sum -c - \ + && mkdir -p /usr/local/node \ + && tar -xJf "node-v$NODE_VERSION-linux-$ARCH.tar.xz" -C /usr/local/node --strip-components=1 --no-same-owner \ + && rm "node-v$NODE_VERSION-linux-$ARCH.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt \ + && apt-get purge -y $buildDeps + +### +# End of NodeJS Setup +### + +FROM openjdk:8-jdk-slim + +# Updates and Cleanup + +RUN apt-get update && apt-get dist-upgrade -y + +COPY --from=builder /usr/local/node /usr/local/node + +RUN ln -s /usr/local/node/bin/node /usr/local/bin/node \ + && ln -s /usr/local/node/bin/node /usr/local/bin/nodejs \ + && ln -s /usr/local/node/lib/node_modules/npm/bin/npm-cli.js /usr/local/bin/npm \ + && ln -s /usr/local/node/lib/node_modules/npm/bin/npx-cli.js /usr/local/bin/npx + +RUN apt-get purge -y --auto-remove gnupg dirmngr wget && \ + rm -rf /var/lib/apt/lists/* && \ + apt-get clean + +# set bash as default shell +RUN mkdir -p /usr/share/man/man1/ && touch /usr/share/man/man1/sh.distrib.1.gz && \ + echo "dash dash/sh boolean false" | debconf-set-selections && \ + DEBIAN_FRONTEND=noninteractive dpkg-reconfigure dash + +RUN groupadd --gid 7556 zowe \ + && useradd --uid 7556 --gid zowe --shell /bin/bash --create-home zowe \ + && mkdir /root/zowe && chown zowe:zowe /root/zowe \ + && mkdir /global && chown zowe:zowe /global \ + && cd /home/zowe && \ + ( echo '#!/bin/sh'; echo 'tr '"'"'\000\001\002\003\004\005\006\007\010\011\012\013\014\015\016\017\020\021\022\023\024\025\026\027\030\031\032\033\034\035\036\037\040\041\042\043\044\045\046\047\050\051\052\053\054\055\056\057\060\061\062\063\064\065\066\067\070\071\072\073\074\075\076\077\100\101\102\103\104\105\106\107\110\111\112\113\114\115\116\117\120\121\122\123\124\125\126\127\130\131\132\133\134\135\136\137\140\141\142\143\144\145\146\147\150\151\152\153\154\155\156\157\160\161\162\163\164\165\166\167\170\171\172\173\174\175\176\177\200\201\202\203\204\205\206\207\210\211\212\213\214\215\216\217\220\221\222\223\224\225\226\227\230\231\232\233\234\235\236\237\240\241\242\243\244\245\246\247\250\251\252\253\254\255\256\257\260\261\262\263\264\265\266\267\270\271\272\273\274\275\276\277\300\301\302\303\304\305\306\307\310\311\312\313\314\315\316\317\320\321\322\323\324\325\326\327\330\331\332\333\334\335\336\337\340\341\342\343\344\345\346\347\350\351\352\353\354\355\356\357\360\361\362\363\364\365\366\367\370\371\372\373\374\375\376\377'"'"' '"'"'\000\001\002\003\234\011\206\177\227\215\216\013\014\015\016\017\020\021\022\023\235\012\010\207\030\031\222\217\034\035\036\037\200\201\202\203\204\205\027\033\210\211\212\213\214\005\006\007\220\221\026\223\224\225\226\004\230\231\232\233\024\025\236\032\040\240\342\344\340\341\343\345\347\361\242\056\074\050\053\174\046\351\352\353\350\355\356\357\354\337\041\044\052\051\073\136\055\057\302\304\300\301\303\305\307\321\246\054\045\137\076\077\370\311\312\313\310\315\316\317\314\140\072\043\100\047\075\042\330\141\142\143\144\145\146\147\150\151\253\273\360\375\376\261\260\152\153\154\155\156\157\160\161\162\252\272\346\270\306\244\265\176\163\164\165\166\167\170\171\172\241\277\320\133\336\256\254\243\245\267\251\247\266\274\275\276\335\250\257\135\264\327\173\101\102\103\104\105\106\107\110\111\255\364\366\362\363\365\175\112\113\114\115\116\117\120\121\122\271\373\374\371\372\377\134\367\123\124\125\126\127\130\131\132\262\324\326\322\323\325\060\061\062\063\064\065\066\067\070\071\263\333\334\331\332\237'"'"' <$1' ) >conv && chmod +x conv && ln -s $(pwd)/conv /bin/conv && \ + rm -rf zowe && \ + echo "exit 0" > /bin/extattr && chmod +x /bin/extattr && \ + echo "exit 0" > /bin/ping && chmod +x /bin/ping && \ + echo "exit 0" > /bin/oping && chmod +x /bin/oping && \ + echo "exit 0" > /bin/onetstat && chmod +x /bin/onetstat && \ + echo "exit 0" > /bin/chtag && chmod +x /bin/chtag && \ + echo 'cat $5' > /bin/iconv && chmod +x /bin/iconv && \ + mv /usr/bin/iconv /usr/bin/iconv_ + +ENV NODE_HOME='/usr/local/node' diff --git a/containers/server-bundle/ubuntu/Dockerfile.nodejava.s390x b/containers/server-bundle/ubuntu/Dockerfile.nodejava.s390x new file mode 100644 index 0000000000..f7c223f4ca --- /dev/null +++ b/containers/server-bundle/ubuntu/Dockerfile.nodejava.s390x @@ -0,0 +1,120 @@ +FROM s390x/debian:stretch as builder +#FROM s390x/ibmjava:sdk as builder + +################################## +# labels +LABEL name="Zowe Docker Distribution Base Image" \ + vendor="Zowe" \ + version="2.0.0" \ + release="0" \ + summary="Base image for Zowe docker distribution" \ + description="Base image for Zowe docker distribution" + + +### +# node install code from loyaltyone/docker-slim-java-node +### + +# Update stretch repositories +RUN sed -i -e 's/deb.debian.org/archive.debian.org/g' \ + -e 's|security.debian.org|archive.debian.org/|g' \ + -e '/stretch-updates/d' /etc/apt/sources.list + +RUN apt-get update && apt-get install -y --no-install-recommends \ + ca-certificates curl wget \ + groff iproute2 moreutils pax + + +RUN set -ex; \ + if ! command -v gpg > /dev/null; then \ + apt-get install -y --no-install-recommends gnupg dirmngr; \ + fi + +# gpg keys listed at https://github.com/nodejs/node#release-team +RUN set -ex \ + && \ + gpg --keyserver hkps://keys.openpgp.org --recv-keys 4ED778F539E3634C779C87C6D7062848A1AB005C && \ + gpg --keyserver hkps://keys.openpgp.org --recv-keys 141F07595B7B3FFE74309A937405533BE57C7D57 && \ + gpg --keyserver hkps://keys.openpgp.org --recv-keys 74F12602B6F1C4E913FAA37AD3A89613643B6201 && \ + gpg --keyserver hkps://keys.openpgp.org --recv-keys DD792F5973C6DE52C432CBDAC77ABFA00DDBF2B7 && \ + gpg --keyserver hkps://keys.openpgp.org --recv-keys 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 && \ + gpg --keyserver hkps://keys.openpgp.org --recv-keys C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 && \ + gpg --keyserver hkps://keys.openpgp.org --recv-keys 890C08DB8579162FEE0DF9DB8BEAB4DFCF555EF4 && \ + gpg --keyserver hkps://keys.openpgp.org --recv-keys C82FA3AE1CBEDC6BE46B9360C43CEC45C17AB93C && \ + gpg --keyserver hkps://keys.openpgp.org --recv-keys 108F52B48DB57BB0CC439B2997B01419BD92F80A + +ENV NODE_VERSION 16.18.1 + +RUN buildDeps='xz-utils' \ + && ARCH= && dpkgArch="$(dpkg --print-architecture)" \ + && case "${dpkgArch##*-}" in \ + amd64) ARCH='x64';; \ + ppc64el) ARCH='ppc64le';; \ + s390x) ARCH='s390x';; \ + arm64) ARCH='arm64';; \ + armhf) ARCH='armv7l';; \ + i386) ARCH='x86';; \ + *) echo "unsupported architecture"; exit 1 ;; \ + esac \ + && set -x \ + && apt-get install -y $buildDeps --no-install-recommends \ + && curl -SLO "https://nodejs.org/dist/v$NODE_VERSION/node-v$NODE_VERSION-linux-$ARCH.tar.xz" \ + && curl -SLO --compressed "https://nodejs.org/dist/v$NODE_VERSION/SHASUMS256.txt.asc" \ + && gpg --batch --decrypt --output SHASUMS256.txt SHASUMS256.txt.asc \ + && grep " node-v$NODE_VERSION-linux-$ARCH.tar.xz\$" SHASUMS256.txt | sha256sum -c - \ + && mkdir -p /usr/local/node \ + && tar -xJf "node-v$NODE_VERSION-linux-$ARCH.tar.xz" -C /usr/local/node --strip-components=1 --no-same-owner \ + && rm "node-v$NODE_VERSION-linux-$ARCH.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt \ + && apt-get purge -y $buildDeps + +### +# End of NodeJS Setup +### + +FROM s390x/debian:stretch +#FROM s390x/ibmjava:sdk + +# Update stretch repositories +RUN sed -i -e 's/deb.debian.org/archive.debian.org/g' \ + -e 's|security.debian.org|archive.debian.org/|g' \ + -e '/stretch-updates/d' /etc/apt/sources.list + +# Updates and Cleanup + +RUN apt-get update && apt-get install -y --no-install-recommends \ + openjdk-8-jdk-headless && \ + apt-get dist-upgrade -y + +COPY --from=builder /usr/local/node /usr/local/node + +RUN ln -s /usr/local/node/bin/node /usr/local/bin/node \ + && ln -s /usr/local/node/bin/node /usr/local/bin/nodejs \ + && ln -s /usr/local/node/lib/node_modules/npm/bin/npm-cli.js /usr/local/bin/npm \ + && ln -s /usr/local/node/lib/node_modules/npm/bin/npx-cli.js /usr/local/bin/npx + +RUN apt-get purge -y --auto-remove gnupg dirmngr wget && \ + rm -rf /var/lib/apt/lists/* && \ + apt-get clean + +# set bash as default shell +RUN mkdir -p /usr/share/man/man1/ && touch /usr/share/man/man1/sh.distrib.1.gz && \ + echo "dash dash/sh boolean false" | debconf-set-selections && \ + DEBIAN_FRONTEND=noninteractive dpkg-reconfigure dash + +RUN groupadd --gid 7556 zowe \ + && useradd --uid 7556 --gid zowe --shell /bin/bash --create-home zowe \ + && mkdir /root/zowe && chown zowe:zowe /root/zowe \ + && mkdir /global && chown zowe:zowe /global \ + && cd /home/zowe && \ + ( echo '#!/bin/sh'; echo 'tr '"'"'\000\001\002\003\004\005\006\007\010\011\012\013\014\015\016\017\020\021\022\023\024\025\026\027\030\031\032\033\034\035\036\037\040\041\042\043\044\045\046\047\050\051\052\053\054\055\056\057\060\061\062\063\064\065\066\067\070\071\072\073\074\075\076\077\100\101\102\103\104\105\106\107\110\111\112\113\114\115\116\117\120\121\122\123\124\125\126\127\130\131\132\133\134\135\136\137\140\141\142\143\144\145\146\147\150\151\152\153\154\155\156\157\160\161\162\163\164\165\166\167\170\171\172\173\174\175\176\177\200\201\202\203\204\205\206\207\210\211\212\213\214\215\216\217\220\221\222\223\224\225\226\227\230\231\232\233\234\235\236\237\240\241\242\243\244\245\246\247\250\251\252\253\254\255\256\257\260\261\262\263\264\265\266\267\270\271\272\273\274\275\276\277\300\301\302\303\304\305\306\307\310\311\312\313\314\315\316\317\320\321\322\323\324\325\326\327\330\331\332\333\334\335\336\337\340\341\342\343\344\345\346\347\350\351\352\353\354\355\356\357\360\361\362\363\364\365\366\367\370\371\372\373\374\375\376\377'"'"' '"'"'\000\001\002\003\234\011\206\177\227\215\216\013\014\015\016\017\020\021\022\023\235\012\010\207\030\031\222\217\034\035\036\037\200\201\202\203\204\205\027\033\210\211\212\213\214\005\006\007\220\221\026\223\224\225\226\004\230\231\232\233\024\025\236\032\040\240\342\344\340\341\343\345\347\361\242\056\074\050\053\174\046\351\352\353\350\355\356\357\354\337\041\044\052\051\073\136\055\057\302\304\300\301\303\305\307\321\246\054\045\137\076\077\370\311\312\313\310\315\316\317\314\140\072\043\100\047\075\042\330\141\142\143\144\145\146\147\150\151\253\273\360\375\376\261\260\152\153\154\155\156\157\160\161\162\252\272\346\270\306\244\265\176\163\164\165\166\167\170\171\172\241\277\320\133\336\256\254\243\245\267\251\247\266\274\275\276\335\250\257\135\264\327\173\101\102\103\104\105\106\107\110\111\255\364\366\362\363\365\175\112\113\114\115\116\117\120\121\122\271\373\374\371\372\377\134\367\123\124\125\126\127\130\131\132\262\324\326\322\323\325\060\061\062\063\064\065\066\067\070\071\263\333\334\331\332\237'"'"' <$1' ) >conv && chmod +x conv && ln -s $(pwd)/conv /bin/conv && \ + rm -rf zowe && \ + echo "exit 0" > /bin/extattr && chmod +x /bin/extattr && \ + echo "exit 0" > /bin/ping && chmod +x /bin/ping && \ + echo "exit 0" > /bin/oping && chmod +x /bin/oping && \ + echo "exit 0" > /bin/onetstat && chmod +x /bin/onetstat && \ + echo "exit 0" > /bin/chtag && chmod +x /bin/chtag && \ + echo 'cat $5' > /bin/iconv && chmod +x /bin/iconv && \ + mv /usr/bin/iconv /usr/bin/iconv_ + +ENV NODE_HOME='/usr/local/node' +ENV JAVA_HOME='/usr/lib/jvm/java-8-openjdk-s390x' diff --git a/containers/server-bundle/Dockerfile.sources b/containers/server-bundle/ubuntu/Dockerfile.sources similarity index 100% rename from containers/server-bundle/Dockerfile.sources rename to containers/server-bundle/ubuntu/Dockerfile.sources diff --git a/containers/server-bundle/LICENSE.txt b/containers/server-bundle/ubuntu/LICENSE.txt similarity index 100% rename from containers/server-bundle/LICENSE.txt rename to containers/server-bundle/ubuntu/LICENSE.txt diff --git a/containers/server-bundle/NOTICE.txt b/containers/server-bundle/ubuntu/NOTICE.txt similarity index 100% rename from containers/server-bundle/NOTICE.txt rename to containers/server-bundle/ubuntu/NOTICE.txt diff --git a/containers/server-bundle/README.md b/containers/server-bundle/ubuntu/README.md similarity index 98% rename from containers/server-bundle/README.md rename to containers/server-bundle/ubuntu/README.md index 9f28a8e525..622533b9bc 100644 --- a/containers/server-bundle/README.md +++ b/containers/server-bundle/ubuntu/README.md @@ -47,7 +47,7 @@ Within this directory are several dockerfiles that have different purposes ### Building docker image on Linux This folder and associated utils folder contains the scripts needed to build. Simply execute: ```sh -cd zowe-install-packaging/containers/server-bundle +cd zowe-install-packaging/containers/server-bundle/ubuntu mkdir utils cp -r ../utils/* ./utils docker build -t zowe/docker:latest . @@ -56,7 +56,7 @@ docker build -t zowe/docker:latest . ### Building docker image on Windows This folder and associated utils folder contains the scripts needed to build. Simply execute: ```powershell -cd zowe-install-packaging/containers/server-bundle +cd zowe-install-packaging/containers/server-bundle/ubuntu mkdir utils copy ..\utils\* utils docker build -t zowe/docker:latest . diff --git a/containers/server-bundle/build.sh b/containers/server-bundle/ubuntu/build.sh similarity index 100% rename from containers/server-bundle/build.sh rename to containers/server-bundle/ubuntu/build.sh diff --git a/containers/server-bundle/run.sh b/containers/server-bundle/ubuntu/run.sh similarity index 100% rename from containers/server-bundle/run.sh rename to containers/server-bundle/ubuntu/run.sh diff --git a/containers/server-bundle/run_inner.sh b/containers/server-bundle/ubuntu/run_inner.sh similarity index 100% rename from containers/server-bundle/run_inner.sh rename to containers/server-bundle/ubuntu/run_inner.sh diff --git a/containers/server-bundle/start.sh b/containers/server-bundle/ubuntu/start.sh similarity index 100% rename from containers/server-bundle/start.sh rename to containers/server-bundle/ubuntu/start.sh From 19e9d68e9487bd42fabeefd3508aca5b41d1f692 Mon Sep 17 00:00:00 2001 From: Martin Zeithaml Date: Fri, 30 Jun 2023 13:21:44 +0200 Subject: [PATCH 032/168] Zowe-yaml-schema: validate unix path by def in server-common Signed-off-by: Martin Zeithaml --- CHANGELOG.md | 4 ++++ schemas/zowe-yaml-schema.json | 38 +++++++++++++++++------------------ 2 files changed, 23 insertions(+), 19 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 60a5e3c4b7..9c3e578c66 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,10 @@ All notable changes to the Zowe Installer will be documented in this file. +## `2.10.0` +#### Minor enhancements/defect fixes +- `zowe-yaml-schema.json` validates unix directory path as `server-common#zowePath` + ## `2.9.0` ### New features and enhancements diff --git a/schemas/zowe-yaml-schema.json b/schemas/zowe-yaml-schema.json index 52b6dcb0df..c92c20e464 100644 --- a/schemas/zowe-yaml-schema.json +++ b/schemas/zowe-yaml-schema.json @@ -49,7 +49,7 @@ }, "loadlib": { "type": "string", - "description": "States the path where Zowe executable utilities are located", + "description": "States the dataset where Zowe executable utilities are located", "default": ".SZWELOAD" }, "authLoadlib": { @@ -190,7 +190,7 @@ "description": "PKCS#12 keystore settings", "properties": { "directory": { - "type": "string", + "$ref": "/schemas/v2/server-common#zowePath", "description": "Keystore directory" }, "name": { @@ -388,19 +388,19 @@ } }, "runtimeDirectory": { - "type": "string", + "$ref": "/schemas/v2/server-common#zowePath", "description": "Path to where you installed Zowe." }, "logDirectory": { - "type": "string", + "$ref": "/schemas/v2/server-common#zowePath", "description": "Path to where you want to store Zowe log files." }, "workspaceDirectory": { - "type": "string", + "$ref": "/schemas/v2/server-common#zowePath", "description": "Path to where you want to store Zowe workspace files. Zowe workspace are used by Zowe component runtime to store temporary files." }, "extensionDirectory": { - "type": "string", + "$ref": "/schemas/v2/server-common#zowePath", "description": "Path to where you want to store Zowe extensions. \"zwe components install\" will install new extensions into this directory." }, "job": { @@ -552,7 +552,7 @@ "type": "object", "properties": { "home": { - "type": "string", + "$ref": "/schemas/v2/server-common#zowePath", "description": "Path to Java home directory." } } @@ -561,7 +561,7 @@ "type": "object", "properties": { "home": { - "type": "string", + "$ref": "/schemas/v2/server-common#zowePath", "description": "Path to node.js home directory." } } @@ -650,7 +650,7 @@ "const": "PKCS12" }, "file": { - "type": "string", + "$ref": "/schemas/v2/server-common#zowePath", "description": "Path to your PKCS#12 keystore." }, "password": { @@ -675,7 +675,7 @@ "const": "PKCS12" }, "file": { - "type": "string", + "$ref": "/schemas/v2/server-common#zowePath", "description": "Path to your PKCS#12 keystore." }, "password": { @@ -691,24 +691,24 @@ "required": ["key", "certificate"], "properties": { "key": { - "type": "string", + "$ref": "/schemas/v2/server-common#zowePath", "description": "Path to the certificate private key stored in PEM format." }, "certificate": { - "type": "string", + "$ref": "/schemas/v2/server-common#zowePath", "description": "Path to the certificate stored in PEM format." }, "certificateAuthorities": { "description": "List of paths to the certificate authorities stored in PEM format.", "oneOf": [{ - "type": "string", + "$ref": "/schemas/v2/server-common#zowePath", "description": "Paths to the certificate authorities stored in PEM format. You can separate multiple certificate authorities by comma." }, { "type": "array", "description": "Path to the certificate authority stored in PEM format.", "items": { - "type": "string" + "$ref": "/schemas/v2/server-common#zowePath" } } ] @@ -779,24 +779,24 @@ "required": ["key", "certificate"], "properties": { "key": { - "type": "string", + "$ref": "/schemas/v2/server-common#zowePath", "description": "Path to the certificate private key stored in PEM format." }, "certificate": { - "type": "string", + "$ref": "/schemas/v2/server-common#zowePath", "description": "Path to the certificate stored in PEM format." }, "certificateAuthorities": { "description": "List of paths to the certificate authorities stored in PEM format.", "oneOf": [{ - "type": "string", + "$ref": "/schemas/v2/server-common#zowePath", "description": "Paths to the certificate authorities stored in PEM format. You can separate multiple certificate authorities by comma." }, { "type": "array", "description": "Path to the certificate authority stored in PEM format.", "items": { - "type": "string" + "$ref": "/schemas/v2/server-common#zowePath" } } ] @@ -855,7 +855,7 @@ "description": "The location of the default registry for this handler. It could be a URL, path, dataset, whatever this handler supports" }, "path": { - "type": "string", + "$ref": "/schemas/v2/server-common#zowePath", "description": "Unix file path to the configmgr-compatible JS file which implements the handler API" } } From 2d1dc783b542989e2823ba1ded1f85d1c9e68063 Mon Sep 17 00:00:00 2001 From: Martin Zeithaml Date: Mon, 3 Jul 2023 11:04:00 +0200 Subject: [PATCH 033/168] Regex removed Signed-off-by: Martin Zeithaml --- schemas/server-common.json | 2 -- 1 file changed, 2 deletions(-) diff --git a/schemas/server-common.json b/schemas/server-common.json index 2285acb4a0..4eaa81feb1 100644 --- a/schemas/server-common.json +++ b/schemas/server-common.json @@ -56,14 +56,12 @@ "path": { "$anchor": "zowePath", "type": "string", - "pattern": "^([^\0]){1,1024}$", "minLength": 1, "maxLength": 1024 }, "file": { "$anchor": "zoweFile", "type": "string", - "pattern": "^([^\\\0]){1,256}$", "minLength": 1, "maxLength": 256 }, From b57c6c1ab5350bc72aabc250f7db50b1c5fd763d Mon Sep 17 00:00:00 2001 From: 1000TurquoisePogs Date: Fri, 7 Jul 2023 17:39:18 +0000 Subject: [PATCH 034/168] Bugfix that the env var for log directory did not exist when needed for preparing log directory at startup. switched to yaml property (#3494) Signed-off-by: 1000TurquoisePogs --- bin/commands/internal/start/prepare/index.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/commands/internal/start/prepare/index.ts b/bin/commands/internal/start/prepare/index.ts index 504ed1a014..98b2bffec5 100644 --- a/bin/commands/internal/start/prepare/index.ts +++ b/bin/commands/internal/start/prepare/index.ts @@ -71,7 +71,7 @@ function prepareRunningInContainer() { // Prepare log directory function prepareLogDirectory() { - const logDir = std.getenv('ZWE_zowe_logDirectory'); + const logDir = ZOWE_CONFIG.zowe.logDirectory; if (logDir) { os.mkdir(logDir, 0o750); if (!fs.isDirectoryWritable(logDir)) { From bf6a92126d03ab443b6a24579bd07386141d81e0 Mon Sep 17 00:00:00 2001 From: MarkAckert Date: Mon, 10 Jul 2023 12:06:47 -0400 Subject: [PATCH 035/168] build: install-verify PTF updates; include APIML vars in install-fmid Signed-off-by: MarkAckert --- .../src/__tests__/basic/install-ptf.ts | 12 ++++++++---- .../extended/security-systems/ptf/acf2.ts | 1 + .../extended/security-systems/ptf/racf.ts | 1 + .../extended/security-systems/ptf/ts.ts | 1 + tests/installation/src/utils.ts | 17 +++++++++++------ 5 files changed, 22 insertions(+), 10 deletions(-) diff --git a/tests/installation/src/__tests__/basic/install-ptf.ts b/tests/installation/src/__tests__/basic/install-ptf.ts index 7ce7708a57..dd5a559417 100644 --- a/tests/installation/src/__tests__/basic/install-ptf.ts +++ b/tests/installation/src/__tests__/basic/install-ptf.ts @@ -26,17 +26,21 @@ describe(testSuiteName, () => { }); test('install and verify', async () => { + const apimlOidcVars = { + 'zowe_apiml_security_oidc_client_id': process.env['OKTA_CLIENT_ID'], + 'zowe_apiml_security_oidc_client_secret': process.env['OKTA_CLIENT_SECRET'], + 'zowe_apiml_security_oidc_registry': process.env['OIDC_REGISTRY'], + 'zowe_apiml_security_oidc_introspect_url': `https://${process.env['OKTA_HOSTNAME']}/oauth2/default/v1/introspect`, + }; await installAndVerifySmpePtf( testSuiteName, process.env.TEST_SERVER, + apimlOidcVars, { 'zowe_build_local': process.env['ZOWE_BUILD_LOCAL'], - 'zowe_apiml_security_oidc_client_id': process.env['OKTA_CLIENT_ID'], - 'zowe_apiml_security_oidc_client_secret': process.env['OKTA_CLIENT_SECRET'], - 'zowe_apiml_security_oidc_registry': process.env['OIDC_REGISTRY'], - 'zowe_apiml_security_oidc_introspect_url': `https://${process.env['OKTA_HOSTNAME']}/oauth2/default/v1/introspect`, 'zowe_custom_for_test': 'true', 'zowe_lock_keystore': 'false', + ...apimlOidcVars } ); }, TEST_TIMEOUT_SMPE_PTF); diff --git a/tests/installation/src/__tests__/extended/security-systems/ptf/acf2.ts b/tests/installation/src/__tests__/extended/security-systems/ptf/acf2.ts index cdeb1b4b32..47497ded57 100644 --- a/tests/installation/src/__tests__/extended/security-systems/ptf/acf2.ts +++ b/tests/installation/src/__tests__/extended/security-systems/ptf/acf2.ts @@ -35,6 +35,7 @@ describe(testSuiteName, () => { await installAndVerifySmpePtf( testSuiteName, testServer, + {}, { 'zowe_build_local': process.env['ZOWE_BUILD_LOCAL'], 'zowe_custom_for_test': 'true', diff --git a/tests/installation/src/__tests__/extended/security-systems/ptf/racf.ts b/tests/installation/src/__tests__/extended/security-systems/ptf/racf.ts index 17d51a268f..697f69e9ee 100644 --- a/tests/installation/src/__tests__/extended/security-systems/ptf/racf.ts +++ b/tests/installation/src/__tests__/extended/security-systems/ptf/racf.ts @@ -34,6 +34,7 @@ describe(testSuiteName, () => { await installAndVerifySmpePtf( testSuiteName, testServer, + {}, { 'zowe_build_local': process.env['ZOWE_BUILD_LOCAL'], 'zowe_custom_for_test': 'true', diff --git a/tests/installation/src/__tests__/extended/security-systems/ptf/ts.ts b/tests/installation/src/__tests__/extended/security-systems/ptf/ts.ts index f367c392fd..aef8d45c06 100644 --- a/tests/installation/src/__tests__/extended/security-systems/ptf/ts.ts +++ b/tests/installation/src/__tests__/extended/security-systems/ptf/ts.ts @@ -35,6 +35,7 @@ describe(testSuiteName, () => { await installAndVerifySmpePtf( testSuiteName, testServer, + {}, { 'zowe_build_local': process.env['ZOWE_BUILD_LOCAL'], 'zowe_custom_for_test': 'true', diff --git a/tests/installation/src/utils.ts b/tests/installation/src/utils.ts index cfb0c72a72..de50c27c91 100644 --- a/tests/installation/src/utils.ts +++ b/tests/installation/src/utils.ts @@ -396,16 +396,20 @@ export async function installAndVerifyExtension(testcase: string, serverId: stri } /** - * Install and verify SMPE PTF + * Install and verify SMPE PTF. Separate variables for FMID and PTF install operations. * * @param {String} testcase * @param {String} serverId - * @param {Object} extraVars + * @param {Object} extraFmidVars + * @param {Object} extraPtfVars */ -export async function installAndVerifySmpePtf(testcase: string, serverId: string, extraVars: {[key: string]: any} = {}): Promise { - debug(`installAndVerifySmpePtf(${testcase}, ${serverId}, ${JSON.stringify(extraVars)})`); +export async function installAndVerifySmpePtf(testcase: string, serverId: string, + extraFmidVars: {[key: string]: any} = {}, + extraPtfVars: {[key: string]: any} = {}): Promise { + debug(`installAndVerifySmpePtf(${testcase}, ${serverId}, FMID: ${JSON.stringify(extraFmidVars)}, PTF: ${JSON.stringify(extraPtfVars)})`); debug(`run install-fmid.yml on ${serverId}`); + const resultFmid = await runAnsiblePlaybook( testcase, 'install-fmid.yml', @@ -413,6 +417,7 @@ export async function installAndVerifySmpePtf(testcase: string, serverId: string { 'zowe_build_remote': ZOWE_FMID, 'skip_start': 'true', + ...extraFmidVars } ); @@ -423,7 +428,7 @@ export async function installAndVerifySmpePtf(testcase: string, serverId: string testcase, 'install-ptf.yml', serverId, - extraVars + extraPtfVars ); expect(resultPtf.code).toBe(0); @@ -435,7 +440,7 @@ export async function installAndVerifySmpePtf(testcase: string, serverId: string // clean up sanity test folder cleanupSanityTestReportDir(); - if (extraVars && extraVars['skip_start'] && extraVars['skip_start'] === 'true') { + if (extraPtfVars && extraPtfVars['skip_start'] && extraPtfVars['skip_start'] === 'true') { debug('running install-ptf.yml playbook with skip_start=true, skip verify'); } else { From c102aeefe1f7173bf11d87e52fc19d92ae6c49bd Mon Sep 17 00:00:00 2001 From: MarkAckert Date: Mon, 10 Jul 2023 12:30:29 -0400 Subject: [PATCH 036/168] chore: fix lint Signed-off-by: MarkAckert --- tests/installation/src/utils.ts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/installation/src/utils.ts b/tests/installation/src/utils.ts index de50c27c91..7fb15bd4e2 100644 --- a/tests/installation/src/utils.ts +++ b/tests/installation/src/utils.ts @@ -404,8 +404,8 @@ export async function installAndVerifyExtension(testcase: string, serverId: stri * @param {Object} extraPtfVars */ export async function installAndVerifySmpePtf(testcase: string, serverId: string, - extraFmidVars: {[key: string]: any} = {}, - extraPtfVars: {[key: string]: any} = {}): Promise { + extraFmidVars: {[key: string]: any} = {}, + extraPtfVars: {[key: string]: any} = {}): Promise { debug(`installAndVerifySmpePtf(${testcase}, ${serverId}, FMID: ${JSON.stringify(extraFmidVars)}, PTF: ${JSON.stringify(extraPtfVars)})`); debug(`run install-fmid.yml on ${serverId}`); @@ -417,7 +417,7 @@ export async function installAndVerifySmpePtf(testcase: string, serverId: string { 'zowe_build_remote': ZOWE_FMID, 'skip_start': 'true', - ...extraFmidVars + ...extraFmidVars } ); From 15f9f44d76797d41ecdea46f92a6fb391ff55174 Mon Sep 17 00:00:00 2001 From: Joe Winchester Date: Mon, 10 Jul 2023 18:44:14 +0100 Subject: [PATCH 037/168] SET STCGRP= for ACF2 using zowe.yaml values Signed-off-by: Joe Winchester --- bin/libs/certificate.sh | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/bin/libs/certificate.sh b/bin/libs/certificate.sh index 455cc06d91..451fbd47f1 100644 --- a/bin/libs/certificate.sh +++ b/bin/libs/certificate.sh @@ -883,9 +883,11 @@ EOF racf_connect2="s/^ \+LABEL[(]'certlabel'[)].*\$/ LABEL('${connect_label}') +/" fi - # used by ACF2 - # TODO: how to pass this? - stc_group= + # used by ACF2 + stc_group=$(read_yaml "${ZWE_CLI_PARAMETER_CONFIG}" ".zowe.setup.security.groups.stc") + if [ -z "${security_groups_stc}" ]; then + stc_group=${ZWE_PRIVATE_DEFAULT_ADMIN_GROUP} + fi ############################### # prepare ZWEKRING JCL From 8e225af957338620fd5bcaa4b22f346da93b601a Mon Sep 17 00:00:00 2001 From: Sakshi Bobade Date: Tue, 11 Jul 2023 05:44:34 +0530 Subject: [PATCH 038/168] Adding a new diagnose command (#3455) * Adding new help command * Debugging the help command * Testing * Bugfix * New command * Bugfix * Bugfix * testing * Adding .parameters * Adding a new index.sh file * Updating the command * Bugfix * More test commands * Updating the parameter name * Extract the char * Check for valid message id * Regex to check valid code * Bugfixes * Final commit * Updating the example * Adding the typescript file * Adding the discussions link for all the error codes * Updating the cmd name * Update change log --------- Co-authored-by: 1000TurquoisePogs --- CHANGELOG.md | 5 ++++ bin/commands/diagnose/.errors | 1 + bin/commands/diagnose/.examples | 1 + bin/commands/diagnose/.help | 1 + bin/commands/diagnose/.parameters | 1 + bin/commands/diagnose/cli.ts | 13 +++++++++++ bin/commands/diagnose/index.sh | 35 ++++++++++++++++++++++++++++ bin/commands/diagnose/index.ts | 38 +++++++++++++++++++++++++++++++ 8 files changed, 95 insertions(+) create mode 100644 bin/commands/diagnose/.errors create mode 100644 bin/commands/diagnose/.examples create mode 100644 bin/commands/diagnose/.help create mode 100644 bin/commands/diagnose/.parameters create mode 100644 bin/commands/diagnose/cli.ts create mode 100644 bin/commands/diagnose/index.sh create mode 100644 bin/commands/diagnose/index.ts diff --git a/CHANGELOG.md b/CHANGELOG.md index 60a5e3c4b7..99b11d739f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,11 @@ All notable changes to the Zowe Installer will be documented in this file. +## `2.10.0` + +### New features and enhancements +- Enhancement: Added a new zwe "diagnose" command to find help on zowe error messages. + ## `2.9.0` ### New features and enhancements diff --git a/bin/commands/diagnose/.errors b/bin/commands/diagnose/.errors new file mode 100644 index 0000000000..d2aa05208d --- /dev/null +++ b/bin/commands/diagnose/.errors @@ -0,0 +1 @@ +ZWEL0102E|102|Invalid parameter %s. diff --git a/bin/commands/diagnose/.examples b/bin/commands/diagnose/.examples new file mode 100644 index 0000000000..8db5029957 --- /dev/null +++ b/bin/commands/diagnose/.examples @@ -0,0 +1 @@ +zwe diagnose -e ZWES0014I diff --git a/bin/commands/diagnose/.help b/bin/commands/diagnose/.help new file mode 100644 index 0000000000..e3c3548025 --- /dev/null +++ b/bin/commands/diagnose/.help @@ -0,0 +1 @@ +Display the message corresponding to the error code. diff --git a/bin/commands/diagnose/.parameters b/bin/commands/diagnose/.parameters new file mode 100644 index 0000000000..e12a927e81 --- /dev/null +++ b/bin/commands/diagnose/.parameters @@ -0,0 +1 @@ +error-code|e|string|required||||Error Code. diff --git a/bin/commands/diagnose/cli.ts b/bin/commands/diagnose/cli.ts new file mode 100644 index 0000000000..2001e54af7 --- /dev/null +++ b/bin/commands/diagnose/cli.ts @@ -0,0 +1,13 @@ +/* + 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 * as index from './index'; +index.execute(); diff --git a/bin/commands/diagnose/index.sh b/bin/commands/diagnose/index.sh new file mode 100644 index 0000000000..e843993523 --- /dev/null +++ b/bin/commands/diagnose/index.sh @@ -0,0 +1,35 @@ +#!/bin/sh + +####################################################################### +# 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. +####################################################################### + +error_code="${ZWE_CLI_PARAMETER_ERROR_CODE}" + +server_code=$(echo "${error_code}" | cut -c4) + +if echo $error_code | grep -q -E "^[zZ][wW][eE][AaSsDdLl][A-Za-z]?[0-9]{3,4}[A-Za-z]$"; then + if [[ "$server_code" == [Dd] ]]; then + print_message "This code corresponds to the errors related to the ZOWE Desktop and the App Server." + print_message "To find the description of this error code, refer to the Zowe documentation at https://github.com/zowe/docs-site/blob/master/docs/troubleshoot/app-framework/appserver-error-codes.md" + elif [[ "$server_code" == [Ss] ]]; then + print_message "This code corresponds to the errors related to the Zowe Subsystem Services (ZSS) and Zowe Installation Services (ZIS)" + print_message "To find the description of this error code, refer to the Zowe documentation for ZSS at https://docs.zowe.org/stable/troubleshoot/app-framework/zss-error-codes and for ZIS at https://github.com/zowe/docs-site/blob/master/docs/troubleshoot/app-framework/zis-error-codes.md" + elif [[ "$server_code" == [Aa] ]]; then + print_message "This code corresponds to the errors related to the Zowe API Mediation Layer (APIML)." + print_message "To find the description of this error code, refer to the Zowe documentation at https://docs.zowe.org/stable/troubleshoot/troubleshoot-apiml-error-codes" + elif [[ "$server_code" == [Ll] ]]; then + print_message "This code corresponds to the errors related to the Zowe Launcher and ZWE" + print_message "To find the description of this error code, refer to the Zowe documentation for the Launcher at https://docs.zowe.org/stable/troubleshoot/launcher/launcher-error-codes and https://github.com/zowe/launcher/blob/v2.x/master/src/msg.h, and for ZWE at https://docs.zowe.org/stable/appendix/zwe_server_command_reference/zwe/ " + fi + print_message "You may also explore reports from other users experiencing the same error by searching here https://github.com/search?q=org%3Azowe+${error_code}&type=discussions" +else + print_error_and_exit "Invalid Error Code" "" 102 +fi diff --git a/bin/commands/diagnose/index.ts b/bin/commands/diagnose/index.ts new file mode 100644 index 0000000000..1fe91dc198 --- /dev/null +++ b/bin/commands/diagnose/index.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 * as std from 'cm_std'; +import * as common from '../../libs/common'; + +export function execute() { + const errorCode: string = std.getenv('ZWE_CLI_PARAMETER_ERROR_CODE'); + + const serverCode: string = errorCode.charAt(3); + + if (/^[zZ][wW][eE][AaSsDdLl][A-Za-z]?[0-9]{3,4}[A-Za-z]$/.test(errorCode)) { + if (serverCode.toLowerCase() === 'd') { + common.printMessage("This code corresponds to the errors related to the ZOWE Desktop and the App Server."); + common.printMessage("To find the description of this error code, refer to the Zowe documentation at https://github.com/zowe/docs-site/blob/master/docs/troubleshoot/app-framework/appserver-error-codes.md"); + } else if (serverCode.toLowerCase() === 's') { + common.printMessage("This code corresponds to the errors related to the Zowe Subsystem Services (ZSS) and Zowe Installation Services (ZIS)"); + common.printMessage("To find the description of this error code, refer to the Zowe documentation for ZSS at https://docs.zowe.org/stable/troubleshoot/app-framework/zss-error-codes and for ZIS at https://github.com/zowe/docs-site/blob/master/docs/troubleshoot/app-framework/zis-error-codes.md"); + } else if (serverCode.toLowerCase() === 'a') { + common.printMessage("This code corresponds to the errors related to the Zowe API Mediation Layer (APIML)."); + common.printMessage("To find the description of this error code, refer to the Zowe documentation at https://docs.zowe.org/stable/troubleshoot/troubleshoot-apiml-error-codes"); + } else if (serverCode.toLowerCase() === 'l') { + common.printMessage("This code corresponds to the errors related to the Zowe Launcher and ZWE"); + common.printMessage("To find the description of this error code, refer to the Zowe documentation for the Launcher at https://docs.zowe.org/stable/troubleshoot/launcher/launcher-error-codes and https://github.com/zowe/launcher/blob/v2.x/master/src/msg.h, and for ZWE at https://docs.zowe.org/stable/appendix/zwe_server_command_reference/zwe/"); + } + common.printMessage(`You may also explore reports from other users experiencing the same error by searching here https://github.com/search?q=org%3Azowe+${errorCode}&type=discussions`) + } else { + common.printErrorAndExit("Invalid Error Code", undefined, 102); + } +} From 3407d1b00b9d98f9057182b009e9a4552c9ee211 Mon Sep 17 00:00:00 2001 From: achmelo <37397715+achmelo@users.noreply.github.com> Date: Mon, 10 Jul 2023 21:06:51 +0200 Subject: [PATCH 039/168] apiml rc1 Signed-off-by: achmelo --- manifest.json.template | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/manifest.json.template b/manifest.json.template index d46218a44c..c5f242f5d9 100644 --- a/manifest.json.template +++ b/manifest.json.template @@ -73,27 +73,27 @@ "artifact": "explorer-ip*.pax" }, "org.zowe.apiml.api-catalog-package": { - "version": "2.9.1", + "version": "2.10.5", "artifact": "api-catalog*.zip" }, "org.zowe.apiml.discovery-package": { - "version": "2.9.1", + "version": "2.10.5", "artifact": "discovery*.zip" }, "org.zowe.apiml.gateway-package": { - "version": "2.9.1", + "version": "2.10.5", "artifact": "gateway*.zip" }, "org.zowe.apiml.caching-service-package": { - "version": "2.9.1", + "version": "2.10.5", "artifact": "caching-service*.zip" }, "org.zowe.apiml.metrics-service-package": { - "version": "2.9.1", + "version": "2.10.5", "artifact": "metrics-service*.zip" }, "org.zowe.apiml.apiml-common-lib-package": { - "version": "2.9.1", + "version": "2.10.5", "artifact": "apiml-common-lib-*.zip" }, "org.zowe.apiml.sdk.common-java-lib-package": { @@ -101,11 +101,11 @@ "artifact": "common-java-lib-*.zip" }, "org.zowe.apiml.sdk.apiml-sample-extension-package": { - "version": "2.9.1", + "version": "2.10.5", "artifact": "apiml-sample-extension-*.zip" }, "org.zowe.apiml.cloud-gateway-package": { - "version": "2.9.1", + "version": "2.10.5", "artifact": "cloud-gateway-*.zip" }, "org.zowe.configmgr-rexx": { @@ -411,23 +411,23 @@ "api-catalog": { "registry": "zowe-docker-release.jfrog.io", "name": "ompzowe/api-catalog-services", - "tag" : "2.9.1-ubuntu" + "tag" : "2.10.5-ubuntu" }, "caching": { "registry": "zowe-docker-release.jfrog.io", "name": "ompzowe/caching-service", - "tag" : "2.9.1-ubuntu" + "tag" : "2.10.5-ubuntu" }, "discovery": { "kind": "statefulset", "registry": "zowe-docker-release.jfrog.io", "name": "ompzowe/discovery-service", - "tag" : "2.9.1-ubuntu" + "tag" : "2.10.5-ubuntu" }, "gateway": { "registry": "zowe-docker-release.jfrog.io", "name": "ompzowe/gateway-service", - "tag" : "2.9.1-ubuntu" + "tag" : "2.10.5-ubuntu" }, "app-server": { "registry": "zowe-docker-release.jfrog.io", From 4d1f2db8210d6491c8385b218e4c4642e97afe87 Mon Sep 17 00:00:00 2001 From: 1000TurquoisePogs Date: Tue, 11 Jul 2023 19:13:57 +0000 Subject: [PATCH 040/168] Allow node 18, but not 18.12.1 (#3485) * Update node.sh Signed-off-by: 1000TurquoisePogs * Update node.ts Signed-off-by: 1000TurquoisePogs * Update CHANGELOG.md Signed-off-by: 1000TurquoisePogs --------- Signed-off-by: 1000TurquoisePogs --- CHANGELOG.md | 5 ++++- bin/libs/node.sh | 6 ++++++ bin/libs/node.ts | 6 ++++++ 3 files changed, 16 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 99b11d739f..1faf469baf 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,7 +6,10 @@ All notable changes to the Zowe Installer will be documented in this file. ## `2.10.0` ### New features and enhancements -- Enhancement: Added a new zwe "diagnose" command to find help on zowe error messages. +- Enhancement: Added a new zwe "diagnose" command to find help on zowe error messages. (#3455) + +#### Minor enhancements/defect fixes +- Enhancement: Check for node v18 which is now supported, but disallow v18.12.1 because it is known not to work for Zowe. (#3485) ## `2.9.0` diff --git a/bin/libs/node.sh b/bin/libs/node.sh index f349cf15e1..63cc564ca8 100644 --- a/bin/libs/node.sh +++ b/bin/libs/node.sh @@ -126,6 +126,12 @@ validate_node_home() { print_error "Node ${node_version} specifically is not compatible with Zowe. Please use a different version. See https://docs.zowe.org/stable/troubleshoot/app-framework/app-known-issues.html#desktop-apps-fail-to-load for more details." return 1 fi + + if [ "${node_version}" = "v18.12.1" ]; then + print_error "Node ${node_version} specifically is not compatible with Zowe. Please use a different version. See https://github.com/ibmruntimes/node-zos/issues/21 for more details." + return 1 + fi + if [ ${node_major_version} -lt 14 ]; then print_error "Node ${node_version} is less than the minimum level required of v14+." return 1 diff --git a/bin/libs/node.ts b/bin/libs/node.ts index a4a54711a6..e9f0a427fd 100644 --- a/bin/libs/node.ts +++ b/bin/libs/node.ts @@ -113,6 +113,12 @@ export function validateNodeHome(nodeHome:string|undefined=std.getenv("NODE_HOME common.printError(`Node ${version} specifically is not compatible with Zowe. Please use a different version. See https://docs.zowe.org/stable/troubleshoot/app-framework/app-known-issues.html#desktop-apps-fail-to-load for more details.`); return false; } + + if (version == 'v18.12.1') { + common.printError(`Node ${version} specifically is not compatible with Zowe. Please use a different version. See https://github.com/ibmruntimes/node-zos/issues/21 for more details.`); + return false; + } + if (nodeMajorVersion < NODE_MIN_VERSION) { common.printError(`Node ${version} is less than the minimum level required of v${NODE_MIN_VERSION}.`); return false; From d8d5e3f9799ba5704eb7355a5afe7e898fce5c37 Mon Sep 17 00:00:00 2001 From: 1000TurquoisePogs Date: Tue, 11 Jul 2023 19:27:52 +0000 Subject: [PATCH 041/168] Remove trivial-auth from default list of plugins (#3418) * Delete org.zowe.zlux.auth.trivial.json Remove trivial-auth as being something that runs by default because it's really not needed by anyone, sso-auth is the default. Signed-off-by: 1000TurquoisePogs * Update manifest.json.template Signed-off-by: 1000TurquoisePogs * Update example-zowe.yaml Signed-off-by: 1000TurquoisePogs * Update manifest.json.template Signed-off-by: 1000TurquoisePogs * Update manifest.json.template Revert manifest Signed-off-by: 1000TurquoisePogs * Update example-zowe.yaml add debug bool Signed-off-by: 1000TurquoisePogs * Update manifest.json.template Signed-off-by: 1000TurquoisePogs * Update manifest.json.template Signed-off-by: 1000TurquoisePogs * revert manifest after testing. Signed-off-by: 1000TurquoisePogs --------- Signed-off-by: 1000TurquoisePogs --- example-zowe.yaml | 1 + files/zlux/config/plugins/org.zowe.zlux.auth.trivial.json | 5 ----- 2 files changed, 1 insertion(+), 5 deletions(-) delete mode 100644 files/zlux/config/plugins/org.zowe.zlux.auth.trivial.json diff --git a/example-zowe.yaml b/example-zowe.yaml index 888da55b59..81ae8ec3fa 100644 --- a/example-zowe.yaml +++ b/example-zowe.yaml @@ -544,6 +544,7 @@ components: app-server: enabled: true port: 7556 + debug: false # we can customize any component with custom certificate # the missing definitions will be picked from "zowe.certificate" # certificate: diff --git a/files/zlux/config/plugins/org.zowe.zlux.auth.trivial.json b/files/zlux/config/plugins/org.zowe.zlux.auth.trivial.json deleted file mode 100644 index 645f3722ef..0000000000 --- a/files/zlux/config/plugins/org.zowe.zlux.auth.trivial.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "identifier": "org.zowe.zlux.auth.trivial", - "pluginLocation": "zlux-server-framework/plugins/trivial-auth", - "relativeTo": "$ZLUX_ROOT_DIR" -} From 7f90e4bf5884c99e913e6a9404d1e62d1af79988 Mon Sep 17 00:00:00 2001 From: James Struga Date: Tue, 11 Jul 2023 15:59:36 -0400 Subject: [PATCH 042/168] 2.10.0 WebUI RC1 Signed-off-by: James Struga --- manifest.json.template | 78 +++++++++++++++++++++--------------------- 1 file changed, 39 insertions(+), 39 deletions(-) diff --git a/manifest.json.template b/manifest.json.template index d46218a44c..9d192afaf8 100644 --- a/manifest.json.template +++ b/manifest.json.template @@ -1,6 +1,6 @@ { "name": "Zowe", - "version": "2.9.0", + "version": "2.10.0", "description": "Zowe is an open source project created to host technologies that benefit the Z platform from all members of the Z community (Integrated Software Vendors, System Integrators and z/OS consumers). Zowe, like Mac or Windows, comes with a set of APIs and OS capabilities that applications build on and also includes some applications out of the box. Zowe offers modern interfaces to interact with z/OS and allows you to work with z/OS in a way that is similar to what you experience on cloud platforms today. You can use these interfaces as delivered or through plug-ins and extensions that are created by clients or third-party vendors.", "license": "EPL-2.0", "homepage": "https://zowe.org", @@ -12,44 +12,44 @@ }, "binaryDependencies": { "org.zowe.zlux.zlux-core": { - "version": "2.9.0-RC", + "version": "2.10.0-RC", "repository": "libs-snapshot-local", - "artifact": "zlux-core-2.9.0-20230608.142940.pax" + "artifact": "zlux-core-2.10.0-20230711.194608.pax" }, "org.zowe.zlux.sample-angular-app": { - "version": "2.9.0-V2.X-RC", + "version": "2.10.0-V2.X-RC", "repository": "libs-snapshot-local", - "artifact": "sample-angular-app-2.9.0-20230531.164048.pax" + "artifact": "sample-angular-app-2.10.0-20230711.193337.pax" }, "org.zowe.zlux.sample-iframe-app": { - "version": "2.9.0-V2.X-RC", + "version": "2.10.0-V2.X-RC", "repository": "libs-snapshot-local", - "artifact": "sample-iframe-app-2.9.0-20230531.163947.pax" + "artifact": "sample-iframe-app-2.10.0-20230711.193057.pax" }, "org.zowe.zlux.sample-react-app": { - "version": "2.9.0-V2.X-RC", + "version": "2.10.0-V2.X-RC", "repository": "libs-snapshot-local", - "artifact": "sample-react-app-2.9.0-20230531.164112.pax" + "artifact": "sample-react-app-2.10.0-20230711.193314.pax" }, "org.zowe.zlux.tn3270-ng2": { - "version": "2.9.0-V2.X-RC", + "version": "2.10.0-V2.X-RC", "repository": "libs-snapshot-local", - "artifact": "tn3270-ng2-2.9.0-20230531.164056.pax" + "artifact": "tn3270-ng2-2.10.0-20230711.193210.pax" }, "org.zowe.zlux.vt-ng2": { - "version": "2.9.0-V2.X-RC", + "version": "2.10.0-V2.X-RC", "repository": "libs-snapshot-local", - "artifact": "vt-ng2-2.9.0-20230531.164117.pax" + "artifact": "vt-ng2-2.10.0-20230711.193229.pax" }, "org.zowe.zlux.zlux-editor": { - "version": "2.9.0-V2.X-RC", + "version": "2.10.0-V2.X-RC", "repository": "libs-snapshot-local", - "artifact": "zlux-editor-2.9.0-20230531.164506.pax" + "artifact": "zlux-editor-2.10.0-20230711.193530.pax" }, "org.zowe.zss": { - "version": "2.9.0-RC", + "version": "2.10.0-RC", "repository": "libs-snapshot-local", - "artifact": "zss-2.9.0-rc-893-20230608154524.pax" + "artifact": "zss-2.10.0-rc-920-20230711194821.pax" }, "org.zowe.explorer.jobs.jobs-api-package": { "version": "2.0.17", @@ -109,17 +109,17 @@ "artifact": "cloud-gateway-*.zip" }, "org.zowe.configmgr-rexx": { - "version": "2.9.0-V2.X-RC", + "version": "2.10.0-V2.X-RC", "repository": "libs-snapshot-local", - "artifact": "configmgr-rexx-2.9.0-2023060818.pax" + "artifact": "configmgr-rexx-2.9.0-2023071157.pax" }, "org.zowe.configmgr": { - "version": "2.9.0-V2.X-RC", + "version": "2.10.0-V2.X-RC", "repository": "libs-snapshot-local", - "artifact": "configmgr-2.9.0-2023060822.pax" + "artifact": "configmgr-2.9.0-2023071158.pax" }, "org.zowe.launcher": { - "version": "2.0.11" + "version": "2.0.12" }, "org.zowe.keyring-utilities": { "version": "1.0.4", @@ -161,12 +161,12 @@ "componentGroup": "Zowe Application Framework", "entries": [{ "repository": "zlux-app-manager", - "tag": "v2.9.0-RC1", + "tag": "v2.10.0-RC1", "destinations": ["Zowe PAX"] }, { "repository": "zlux-app-server", - "tag": "v2.9.0-RC2", + "tag": "v2.10.0-RC1", "destinations": ["Zowe PAX"] }, { @@ -181,17 +181,17 @@ }, { "repository": "zlux-platform", - "tag": "v2.9.0-RC1", + "tag": "v2.10.0-RC1", "destinations": ["Zowe PAX"] }, { "repository": "zlux-server-framework", - "tag": "v2.9.0-RC2", + "tag": "v2.10.0-RC1", "destinations": ["Zowe PAX"] }, { "repository": "zlux-shared", - "tag": "v2.9.0-RC1", + "tag": "v2.10.0-RC1", "destinations": ["Zowe PAX"] }, { @@ -201,17 +201,17 @@ }, { "repository": "zlux-build", - "tag": "v2.9.0-RC1", + "tag": "v2.10.0-RC1", "destinations": ["Zowe PAX"] }, { "repository": "zss", - "tag": "v2.9.0-RC2", + "tag": "v2.10.0-RC1", "destinations": ["Zowe PAX"] }, { "repository": "zowe-common-c", - "tag": "zss-v2.9.0-RC2", + "tag": "zss-v2.10.0-RC1", "destinations": ["Zowe PAX"] } ] @@ -318,14 +318,14 @@ "componentGroup": "Zowe Desktop TN3270 Emulator Plug-in", "entries": [{ "repository": "tn3270-ng2", - "tag": "v2.9.0-RC1", + "tag": "v2.10.0-RC1", "destinations": ["Zowe PAX"] }] }, { "componentGroup": "Zowe Desktop Sample Angular Application", "entries": [{ "repository": "sample-angular-app", - "tag": "v2.9.0-RC1", + "tag": "v2.10.0-RC1", "destinations": ["Zowe PAX"] }] }, @@ -333,7 +333,7 @@ "componentGroup": "Zowe Desktop Sample iFrame Application", "entries": [{ "repository": "sample-iframe-app", - "tag": "v2.9.0-RC1", + "tag": "v2.10.0-RC1", "destinations": ["Zowe PAX"] }] }, @@ -341,7 +341,7 @@ "componentGroup": "Zowe Desktop Sample React Application", "entries": [{ "repository": "sample-react-app", - "tag": "v2.9.0-RC1", + "tag": "v2.10.0-RC1", "destinations": ["Zowe PAX"] }] }, @@ -349,7 +349,7 @@ "componentGroup": "Zowe Desktop VT Emulator Plugin-in", "entries": [{ "repository": "vt-ng2", - "tag": "v2.9.0-RC1", + "tag": "v2.10.0-RC1", "destinations": ["Zowe PAX"] }] }, @@ -357,7 +357,7 @@ "componentGroup": "Zowe Desktop Editor Plugin-in", "entries": [{ "repository": "zlux-editor", - "tag": "v2.9.0-RC1", + "tag": "v2.10.0-RC1", "destinations": ["Zowe PAX"] }] }, @@ -373,7 +373,7 @@ "destinations": ["Zowe PAX"] }, { "repository": "launcher", - "tag": "v2.0.10", + "tag": "v2.0.12", "destinations": ["Zowe PAX"] }] }, @@ -397,7 +397,7 @@ "componentGroup": "Configmgr", "entries": [{ "repository": "zowe-common-c", - "tag": "configmgr-v2.9.0-RC2", + "tag": "configmgr-v2.10.0-RC1", "destinations": ["Zowe PAX"] }] } @@ -432,7 +432,7 @@ "app-server": { "registry": "zowe-docker-release.jfrog.io", "name": "ompzowe/app-server", - "tag" : "2.9.0-ubuntu" + "tag" : "2.10.0-ubuntu" }, "explorer-ip": { "kind": "job", From 01ba8ba493d22c77bb5081a54a12bff51993835f Mon Sep 17 00:00:00 2001 From: James Struga Date: Wed, 12 Jul 2023 09:25:33 -0400 Subject: [PATCH 043/168] update missing paxs Signed-off-by: James Struga --- manifest.json.template | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/manifest.json.template b/manifest.json.template index 9d192afaf8..42496dceda 100644 --- a/manifest.json.template +++ b/manifest.json.template @@ -34,7 +34,7 @@ "org.zowe.zlux.tn3270-ng2": { "version": "2.10.0-V2.X-RC", "repository": "libs-snapshot-local", - "artifact": "tn3270-ng2-2.10.0-20230711.193210.pax" + "artifact": "tn3270-ng2-2.10.0-20230711.193249.pax" }, "org.zowe.zlux.vt-ng2": { "version": "2.10.0-V2.X-RC", @@ -49,7 +49,7 @@ "org.zowe.zss": { "version": "2.10.0-RC", "repository": "libs-snapshot-local", - "artifact": "zss-2.10.0-rc-920-20230711194821.pax" + "artifact": "zss-2.10.0-rc-921-20230712132442.pax" }, "org.zowe.explorer.jobs.jobs-api-package": { "version": "2.0.17", @@ -111,12 +111,12 @@ "org.zowe.configmgr-rexx": { "version": "2.10.0-V2.X-RC", "repository": "libs-snapshot-local", - "artifact": "configmgr-rexx-2.9.0-2023071157.pax" + "artifact": "configmgr-rexx-2.10.0-2023071214.pax" }, "org.zowe.configmgr": { "version": "2.10.0-V2.X-RC", "repository": "libs-snapshot-local", - "artifact": "configmgr-2.9.0-2023071158.pax" + "artifact": "configmgr-2.10.0-2023071212.pax" }, "org.zowe.launcher": { "version": "2.0.12" From f74aa1318923b01b2e4f6a6a6c885adefbcab9d7 Mon Sep 17 00:00:00 2001 From: achmelo Date: Wed, 12 Jul 2023 16:47:44 +0200 Subject: [PATCH 044/168] underscore.js update Signed-off-by: achmelo --- manifest.json.template | 25 ++++++++++++------------- 1 file changed, 12 insertions(+), 13 deletions(-) diff --git a/manifest.json.template b/manifest.json.template index c5f242f5d9..7aa4ee578e 100644 --- a/manifest.json.template +++ b/manifest.json.template @@ -73,27 +73,27 @@ "artifact": "explorer-ip*.pax" }, "org.zowe.apiml.api-catalog-package": { - "version": "2.10.5", + "version": "2.10.6", "artifact": "api-catalog*.zip" }, "org.zowe.apiml.discovery-package": { - "version": "2.10.5", + "version": "2.10.6", "artifact": "discovery*.zip" }, "org.zowe.apiml.gateway-package": { - "version": "2.10.5", + "version": "2.10.6", "artifact": "gateway*.zip" }, "org.zowe.apiml.caching-service-package": { - "version": "2.10.5", + "version": "2.10.6", "artifact": "caching-service*.zip" }, "org.zowe.apiml.metrics-service-package": { - "version": "2.10.5", + "version": "2.10.6", "artifact": "metrics-service*.zip" }, "org.zowe.apiml.apiml-common-lib-package": { - "version": "2.10.5", + "version": "2.10.6", "artifact": "apiml-common-lib-*.zip" }, "org.zowe.apiml.sdk.common-java-lib-package": { @@ -101,11 +101,11 @@ "artifact": "common-java-lib-*.zip" }, "org.zowe.apiml.sdk.apiml-sample-extension-package": { - "version": "2.10.5", + "version": "2.10.6", "artifact": "apiml-sample-extension-*.zip" }, "org.zowe.apiml.cloud-gateway-package": { - "version": "2.10.5", + "version": "2.10.6", "artifact": "cloud-gateway-*.zip" }, "org.zowe.configmgr-rexx": { @@ -411,23 +411,23 @@ "api-catalog": { "registry": "zowe-docker-release.jfrog.io", "name": "ompzowe/api-catalog-services", - "tag" : "2.10.5-ubuntu" + "tag" : "2.10.6-ubuntu" }, "caching": { "registry": "zowe-docker-release.jfrog.io", "name": "ompzowe/caching-service", - "tag" : "2.10.5-ubuntu" + "tag" : "2.10.6-ubuntu" }, "discovery": { "kind": "statefulset", "registry": "zowe-docker-release.jfrog.io", "name": "ompzowe/discovery-service", - "tag" : "2.10.5-ubuntu" + "tag" : "2.10.6-ubuntu" }, "gateway": { "registry": "zowe-docker-release.jfrog.io", "name": "ompzowe/gateway-service", - "tag" : "2.10.5-ubuntu" + "tag" : "2.10.6-ubuntu" }, "app-server": { "registry": "zowe-docker-release.jfrog.io", @@ -488,4 +488,3 @@ "rel": ".dependency/doc/dependency_decisions.yml" } } - \ No newline at end of file From e732835da22831b9428d67657477fab1084bcc33 Mon Sep 17 00:00:00 2001 From: Amanda D'Errico Date: Wed, 12 Jul 2023 11:03:58 -0400 Subject: [PATCH 045/168] bump explorer apis 2.10 RC1 Signed-off-by: Amanda D'Errico --- manifest.json.template | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/manifest.json.template b/manifest.json.template index d46218a44c..7040a713e2 100644 --- a/manifest.json.template +++ b/manifest.json.template @@ -52,11 +52,11 @@ "artifact": "zss-2.9.0-rc-893-20230608154524.pax" }, "org.zowe.explorer.jobs.jobs-api-package": { - "version": "2.0.17", + "version": "2.0.18", "artifact": "jobs-api-package-*.zip" }, "org.zowe.explorer.files.files-api-package": { - "version": "2.0.17", + "version": "2.0.18", "artifact": "files-api-package-*.zip" }, "org.zowe.explorer-jes": { @@ -296,21 +296,21 @@ "componentGroup": "Zowe Explorer Common REST Server", "entries": [{ "repository": "explorer-api-common", - "tag": "2.0.21", + "tag": "2.0.22", "destinations": ["Zowe PAX"] }] }, { "componentGroup": "Zowe Explorer Data Sets REST Server", "entries": [{ "repository": "data-sets", - "tag": "2.0.17", + "tag": "2.0.18", "destinations": ["Zowe PAX"] }] }, { "componentGroup": "Zowe Explorer Jobs REST Server", "entries": [{ "repository": "jobs", - "tag": "2.0.17", + "tag": "2.0.18", "destinations": ["Zowe PAX"] }] }, @@ -461,12 +461,12 @@ "files-api": { "registry": "zowe-docker-release.jfrog.io", "name": "ompzowe/files-api", - "tag" : "2.0.17-ubuntu" + "tag" : "2.0.18-ubuntu" }, "jobs-api": { "registry": "zowe-docker-release.jfrog.io", "name": "ompzowe/jobs-api", - "tag" : "2.0.17-ubuntu" + "tag" : "2.0.18-ubuntu" }, "base": { "registry": "zowe-docker-release.jfrog.io", @@ -488,4 +488,3 @@ "rel": ".dependency/doc/dependency_decisions.yml" } } - \ No newline at end of file From 49e94c22c03bdd842b3e86a88dc42770962e34ea Mon Sep 17 00:00:00 2001 From: ojcelis Date: Wed, 12 Jul 2023 12:28:38 -0400 Subject: [PATCH 046/168] Update zowe-launch-script and vscode version Signed-off-by: ojcelis --- manifest.json.template | 314 +++++++++++++++++++++-------------------- 1 file changed, 160 insertions(+), 154 deletions(-) diff --git a/manifest.json.template b/manifest.json.template index 311cd3cc53..144a3bbcbc 100644 --- a/manifest.json.template +++ b/manifest.json.template @@ -12,128 +12,126 @@ }, "binaryDependencies": { "org.zowe.zlux.zlux-core": { - "version": "^2.0.0-V2.X-STAGING-ZLUX-CORE", - "artifact": "*.pax" + "version": "2.10.0-RC", + "repository": "libs-snapshot-local", + "artifact": "zlux-core-2.10.0-20230711.194608.pax" }, "org.zowe.zlux.sample-angular-app": { - "version": "^2.0.0-V2.X-STAGING", - "artifact": "*.pax" + "version": "2.10.0-V2.X-RC", + "repository": "libs-snapshot-local", + "artifact": "sample-angular-app-2.10.0-20230711.193337.pax" }, "org.zowe.zlux.sample-iframe-app": { - "version": "^2.0.0-V2.X-STAGING", - "artifact": "*.pax" + "version": "2.10.0-V2.X-RC", + "repository": "libs-snapshot-local", + "artifact": "sample-iframe-app-2.10.0-20230711.193057.pax" }, "org.zowe.zlux.sample-react-app": { - "version": "^2.0.0-V2.X-STAGING", - "artifact": "*.pax" + "version": "2.10.0-V2.X-RC", + "repository": "libs-snapshot-local", + "artifact": "sample-react-app-2.10.0-20230711.193314.pax" }, "org.zowe.zlux.tn3270-ng2": { - "version": "^2.0.0-V2.X-STAGING", - "artifact": "*.pax" + "version": "2.10.0-V2.X-RC", + "repository": "libs-snapshot-local", + "artifact": "tn3270-ng2-2.10.0-20230711.193249.pax" }, "org.zowe.zlux.vt-ng2": { - "version": "^2.0.0-V2.X-STAGING", - "artifact": "*.pax" + "version": "2.10.0-V2.X-RC", + "repository": "libs-snapshot-local", + "artifact": "vt-ng2-2.10.0-20230711.193229.pax" }, "org.zowe.zlux.zlux-editor": { - "version": "^2.0.0-V2.X-STAGING", - "artifact": "*.pax" + "version": "2.10.0-V2.X-RC", + "repository": "libs-snapshot-local", + "artifact": "zlux-editor-2.10.0-20230711.193530.pax" }, "org.zowe.zss": { - "version": "^2.0.0-STAGING", - "artifact": "*.pax" + "version": "2.10.0-RC", + "repository": "libs-snapshot-local", + "artifact": "zss-2.10.0-rc-921-20230712132442.pax" }, "org.zowe.explorer.jobs.jobs-api-package": { - "version": "^2.0.7-SNAPSHOT", - "artifact": "jobs-api-package-*.zip", - "exclusions": ["*PR*.zip","*BRANCH*"] + "version": "2.0.18", + "artifact": "jobs-api-package-*.zip" }, "org.zowe.explorer.files.files-api-package": { - "version": "^2.0.7-SNAPSHOT", - "artifact": "files-api-package-*.zip", - "exclusions": ["*PR*.zip","*BRANCH*"] + "version": "2.0.18", + "artifact": "files-api-package-*.zip" }, "org.zowe.explorer-jes": { - "version": "~2.0.2-SNAPSHOT" + "version": "2.0.7" }, "org.zowe.explorer-mvs": { - "version": "~2.0.2-SNAPSHOT" + "version": "2.0.7" }, "org.zowe.explorer-uss": { - "version": "~2.0.2-SNAPSHOT" + "version": "2.0.7" }, "org.zowe.explorer-ip": { - "version": "~2.0.0-SNAPSHOT", - "artifact": "*.pax" + "version": "2.0.0", + "artifact": "explorer-ip*.pax" }, "org.zowe.apiml.api-catalog-package": { - "version": "^2.1.1-SNAPSHOT", - "artifact": "api-catalog-*.zip", - "exclusions": ["*PR*.zip"] + "version": "2.10.6", + "artifact": "api-catalog*.zip" }, "org.zowe.apiml.discovery-package": { - "version": "^2.1.1-SNAPSHOT", - "artifact": "discovery-*.zip", - "exclusions": ["*PR*.zip"] + "version": "2.10.6", + "artifact": "discovery*.zip" }, "org.zowe.apiml.gateway-package": { - "version": "^2.1.1-SNAPSHOT", - "artifact": "gateway-*.zip", - "exclusions": ["*PR*.zip"] + "version": "2.10.6", + "artifact": "gateway*.zip" }, "org.zowe.apiml.caching-service-package": { - "version": "^2.1.1-SNAPSHOT", - "artifact": "caching-service-*.zip", - "exclusions": ["*PR*.zip"] + "version": "2.10.6", + "artifact": "caching-service*.zip" }, "org.zowe.apiml.metrics-service-package": { - "version": "^2.1.1-SNAPSHOT", - "artifact": "metrics-service-*.zip", - "exclusions": ["*PR*.zip"] + "version": "2.10.6", + "artifact": "metrics-service*.zip" }, "org.zowe.apiml.apiml-common-lib-package": { - "version": "^2.1.1-SNAPSHOT", - "artifact": "apiml-common-lib-*.zip", - "exclusions": ["*PR*.zip"] + "version": "2.10.6", + "artifact": "apiml-common-lib-*.zip" }, "org.zowe.apiml.sdk.common-java-lib-package": { - "version": "~2.0.0-SNAPSHOT", - "artifact": "common-java-lib-*.zip", - "exclusions": ["*PR*.zip"] + "version": "2.0.0", + "artifact": "common-java-lib-*.zip" }, "org.zowe.apiml.sdk.apiml-sample-extension-package": { - "version": "^2.1.1-SNAPSHOT", - "artifact": "apiml-sample-extension-*.zip", - "exclusions": ["*PR*.zip"] + "version": "2.10.6", + "artifact": "apiml-sample-extension-*.zip" }, "org.zowe.apiml.cloud-gateway-package": { - "version": "^2.4.4-SNAPSHOT", - "artifact": "cloud-gateway-*.zip", - "exclusions": ["*PR*.zip"] - }, - "org.zowe.configmgr": { - "version": "^2.0.0-V2.X-STAGING", - "artifact": "*.pax" + "version": "2.10.6", + "artifact": "cloud-gateway-*.zip" }, "org.zowe.configmgr-rexx": { - "version": "^2.0.0-V2.X-STAGING", - "artifact": "*.pax" + "version": "2.10.0-V2.X-RC", + "repository": "libs-snapshot-local", + "artifact": "configmgr-rexx-2.10.0-2023071214.pax" + }, + "org.zowe.configmgr": { + "version": "2.10.0-V2.X-RC", + "repository": "libs-snapshot-local", + "artifact": "configmgr-2.10.0-2023071212.pax" }, "org.zowe.launcher": { - "version": "^2.0.0-SNAPSHOT" + "version": "2.0.12" }, "org.zowe.keyring-utilities": { "version": "1.0.4", - "artifact": "keyring-util-*", + "artifact": "keyring-util-1.0.4", "explode": "false", - "flat": "true", - "exclusions": ["*PR*"] + "flat": "true" }, "org.zowe.utility-tools": { - "version": "~2.0.0-SNAPSHOT" + "version": "2.0.3" }, "org.zowe.licenses": { - "version": "2.3.0", + "version": "2.9.0", "artifact": "zowe_licenses_full.zip" } }, @@ -142,78 +140,78 @@ "componentGroup": "Imperative CLI Framework for Zowe", "entries": [{ "repository": "imperative", - "tag": "master", + "tag": "v5.14.1", "destinations": ["Zowe CLI Package"] }] }, { "componentGroup": "Zowe API Mediation Layer", "entries": [{ "repository": "api-layer", - "tag": "v2.x.x", + "tag": "v2.9.1", "destinations": ["Zowe PAX"] }] }, { "componentGroup": "Zowe common java libraries", "entries": [{ "repository": "common-java", - "tag": "v2.x.x", + "tag": "v1.21.3", "destinations": ["Zowe PAX"] }] }, { "componentGroup": "Zowe Application Framework", "entries": [{ "repository": "zlux-app-manager", - "tag": "v2.x/staging", + "tag": "v2.10.0-RC1", "destinations": ["Zowe PAX"] }, { "repository": "zlux-app-server", - "tag": "v2.x/staging", + "tag": "v2.10.0-RC1", "destinations": ["Zowe PAX"] }, { "repository": "zlux-file-explorer", - "tag": "v2.x/staging", + "tag": "v1.6.0-RC1", "destinations": ["Zowe PAX"] }, { "repository": "zlux-grid", - "tag": "v1.x/master", + "tag": "v0.0.6", "destinations": ["Zowe PAX"] }, { "repository": "zlux-platform", - "tag": "v2.x/staging", + "tag": "v2.10.0-RC1", "destinations": ["Zowe PAX"] }, { "repository": "zlux-server-framework", - "tag": "v2.x/staging", + "tag": "v2.10.0-RC1", "destinations": ["Zowe PAX"] }, { "repository": "zlux-shared", - "tag": "v2.x/staging", + "tag": "v2.10.0-RC1", "destinations": ["Zowe PAX"] }, { "repository": "zlux-widgets", - "tag": "v1.x/master", + "tag": "v0.0.4", "destinations": ["Zowe PAX"] }, { "repository": "zlux-build", - "tag": "v2.x/staging", + "tag": "v2.10.0-RC1", "destinations": ["Zowe PAX"] }, { "repository": "zss", - "tag": "v2.x/staging", + "tag": "v2.10.0-RC1", "destinations": ["Zowe PAX"] }, { "repository": "zowe-common-c", - "tag": "v2.x/staging", + "tag": "zss-v2.10.0-RC1", "destinations": ["Zowe PAX"] } ] @@ -221,98 +219,98 @@ "componentGroup": "Zowe CLI", "entries": [{ "repository": "zowe-cli", - "tag": "master", + "tag": "v7.16.4", "destinations": ["Zowe CLI Package"] }] }, { "componentGroup": "IBM® CICS® Plug-in for Zowe CLI", "entries": [{ "repository": "zowe-cli-cics-plugin", - "tag": "master", + "tag": "v5.0.1", "destinations": ["Zowe CLI Package"] }] }, { "componentGroup": "IBM® Db2® Plug-in for Zowe CLI", "entries": [{ "repository": "zowe-cli-db2-plugin", - "tag": "master", + "tag": "v5.0.3", "destinations": ["Zowe CLI Package"] }] }, { "componentGroup": "Performance Timing Utility", "entries": [{ "repository": "perf-timing", - "tag": "master", + "tag": "v1.0.7", "destinations": ["Zowe CLI Package"] }] }, { "componentGroup": "IBM® MQ Plug-in for Zowe CLI", "entries": [{ "repository": "zowe-cli-mq-plugin", - "tag": "master", + "tag": "v3.0.1", "destinations": ["Zowe CLI Package"] }] }, { "componentGroup": "z/OS® FTP Plug-in for Zowe CLI", "entries": [{ "repository": "zowe-cli-ftp-plugin", - "tag": "master", + "tag": "v2.1.3", "destinations": ["Zowe CLI Package"] }] }, { "componentGroup": "IBM® IMS® Plug-in for Zowe CLI", "entries": [{ "repository": "zowe-cli-ims-plugin", - "tag": "master", + "tag": "v3.0.0", "destinations": ["Zowe CLI Package"] }] }, { - "componentGroup": "Zowe Desktop Data Sets UI Plugin", + "componentGroup": "Zowe Desktop Eclipse Orion-based React Editor", "entries": [{ - "repository": "explorer-mvs", - "tag": "v2.x/master", + "repository": "orion-editor-component", + "tag": "v0.0.14", "destinations": ["Zowe PAX"] }] }, { - "componentGroup": "Zowe Desktop Eclipse Orion-based React Editor", + "componentGroup": "Zowe Desktop Data Sets UI Plugin", "entries": [{ - "repository": "orion-editor-component", - "tag": "master", + "repository": "explorer-mvs", + "tag": "v2.0.7", "destinations": ["Zowe PAX"] }] }, { "componentGroup": "Zowe Desktop JES UI Plugin", "entries": [{ "repository": "explorer-jes", - "tag": "v2.x/master", + "tag": "v2.0.7", "destinations": ["Zowe PAX"] }] }, { "componentGroup": "Zowe Desktop z/OS Unix Files UI Plugin", "entries": [{ "repository": "explorer-uss", - "tag": "v2.x/master", + "tag": "v2.0.7", "destinations": ["Zowe PAX"] }] }, { "componentGroup": "Zowe Explorer Common REST Server", "entries": [{ "repository": "explorer-api-common", - "tag": "v2.x/master", + "tag": "2.0.22", "destinations": ["Zowe PAX"] }] }, { "componentGroup": "Zowe Explorer Data Sets REST Server", "entries": [{ "repository": "data-sets", - "tag": "v2.x/master", + "tag": "2.0.18", "destinations": ["Zowe PAX"] }] }, { "componentGroup": "Zowe Explorer Jobs REST Server", "entries": [{ "repository": "jobs", - "tag": "v2.x/master", + "tag": "2.0.18", "destinations": ["Zowe PAX"] }] }, @@ -320,14 +318,14 @@ "componentGroup": "Zowe Desktop TN3270 Emulator Plug-in", "entries": [{ "repository": "tn3270-ng2", - "tag": "v2.x/staging", + "tag": "v2.10.0-RC1", "destinations": ["Zowe PAX"] }] }, { "componentGroup": "Zowe Desktop Sample Angular Application", "entries": [{ "repository": "sample-angular-app", - "tag": "v2.x/staging", + "tag": "v2.10.0-RC1", "destinations": ["Zowe PAX"] }] }, @@ -335,7 +333,7 @@ "componentGroup": "Zowe Desktop Sample iFrame Application", "entries": [{ "repository": "sample-iframe-app", - "tag": "v2.x/staging", + "tag": "v2.10.0-RC1", "destinations": ["Zowe PAX"] }] }, @@ -343,7 +341,7 @@ "componentGroup": "Zowe Desktop Sample React Application", "entries": [{ "repository": "sample-react-app", - "tag": "v2.x/staging", + "tag": "v2.10.0-RC1", "destinations": ["Zowe PAX"] }] }, @@ -351,15 +349,15 @@ "componentGroup": "Zowe Desktop VT Emulator Plugin-in", "entries": [{ "repository": "vt-ng2", - "tag": "v2.x/staging", - "destinations": ["Zowe PAX"] + "tag": "v2.10.0-RC1", + "destinations": ["Zowe PAX"] }] }, { "componentGroup": "Zowe Desktop Editor Plugin-in", "entries": [{ "repository": "zlux-editor", - "tag": "v2.x/staging", + "tag": "v2.10.0-RC1", "destinations": ["Zowe PAX"] }] }, @@ -367,15 +365,15 @@ "componentGroup": "Utilities", "entries": [{ "repository": "keyring-utilities", - "tag": "master", + "tag": "v1.1.0", "destinations": ["Zowe PAX"] }, { "repository": "zowe-install-packaging-tools", - "tag": "v2.x/master", + "tag": "v2.0.3", "destinations": ["Zowe PAX"] }, { "repository": "launcher", - "tag": "v2.x/master", + "tag": "v2.0.12", "destinations": ["Zowe PAX"] }] }, @@ -383,7 +381,7 @@ "componentGroup": "Zowe Visual Studio Code Extension", "entries": [{ "repository": "vscode-extension-for-zowe", - "tag": "master", + "tag": "v2.9.1", "destinations": ["Visual Studio Code Marketplace"] }] }, @@ -391,91 +389,99 @@ "componentGroup": "Zowe Desktop IP Explorer Plug-in", "entries": [{ "repository": "explorer-ip", - "tag": "v2.x/master", + "tag": "v2.0.0", + "destinations": ["Zowe PAX"] + }] + }, + { + "componentGroup": "Configmgr", + "entries": [{ + "repository": "zowe-common-c", + "tag": "configmgr-v2.10.0-RC1", "destinations": ["Zowe PAX"] }] } ], "imageDependencies": { "zowe-launch-scripts": { - "registry": "zowe-docker-snapshot.jfrog.io", + "registry": "zowe-docker-release.jfrog.io", "name": "ompzowe/zowe-launch-scripts", - "tag" : "2.1.0-ubuntu.v2-x-staging" + "tag" : "2.10.0-ubuntu" }, "api-catalog": { - "registry": "zowe-docker-snapshot.jfrog.io", + "registry": "zowe-docker-release.jfrog.io", "name": "ompzowe/api-catalog-services", - "tag" : "2.1.1-SNAPSHOT-ubuntu.v2-x-x" + "tag" : "2.10.6-ubuntu" }, "caching": { - "registry": "zowe-docker-snapshot.jfrog.io", + "registry": "zowe-docker-release.jfrog.io", "name": "ompzowe/caching-service", - "tag" : "2.1.1-SNAPSHOT-ubuntu.v2-x-x" + "tag" : "2.10.6-ubuntu" }, "discovery": { "kind": "statefulset", - "registry": "zowe-docker-snapshot.jfrog.io", + "registry": "zowe-docker-release.jfrog.io", "name": "ompzowe/discovery-service", - "tag" : "2.1.1-SNAPSHOT-ubuntu.v2-x-x" + "tag" : "2.10.6-ubuntu" }, "gateway": { - "registry": "zowe-docker-snapshot.jfrog.io", - "name": "ompzowe/gateway-service", - "tag" : "2.1.1-SNAPSHOT-ubuntu.v2-x-x" + "registry": "zowe-docker-release.jfrog.io", + "name": "ompzowe/gateway-service", + "tag" : "2.10.6-ubuntu" }, "app-server": { - "registry": "zowe-docker-snapshot.jfrog.io", + "registry": "zowe-docker-release.jfrog.io", "name": "ompzowe/app-server", - "tag" : "2.1.0-ubuntu.v2-x-staging" + "tag" : "2.10.0-ubuntu" }, "explorer-ip": { - "kind": "job", - "registry": "zowe-docker-snapshot.jfrog.io", - "name": "ompzowe/explorer-ip", - "tag" : "2.0.0-ubuntu.v2-x-master" + "kind": "job", + "registry": "zowe-docker-release.jfrog.io", + "name": "ompzowe/explorer-ip", + "tag" : "2.0.0-ubuntu" }, "explorer-jes": { - "kind": "job", - "registry": "zowe-docker-release.jfrog.io", - "name": "ompzowe/explorer-jes", - "tag" : "2-ubuntu" + "kind": "job", + "registry": "zowe-docker-release.jfrog.io", + "name": "ompzowe/explorer-jes", + "tag" : "2.0.7-ubuntu" }, "explorer-mvs": { - "kind": "job", - "registry": "zowe-docker-release.jfrog.io", - "name": "ompzowe/explorer-mvs", - "tag" : "2-ubuntu" + "kind": "job", + "registry": "zowe-docker-release.jfrog.io", + "name": "ompzowe/explorer-mvs", + "tag" : "2.0.7-ubuntu" }, "explorer-uss": { - "kind": "job", - "registry": "zowe-docker-release.jfrog.io", - "name": "ompzowe/explorer-uss", - "tag" : "2-ubuntu" + "kind": "job", + "registry": "zowe-docker-release.jfrog.io", + "name": "ompzowe/explorer-uss", + "tag" : "2.0.7-ubuntu" }, "files-api": { - "registry": "zowe-docker-release.jfrog.io", - "name": "ompzowe/files-api", - "tag" : "2-ubuntu" + "registry": "zowe-docker-release.jfrog.io", + "name": "ompzowe/files-api", + "tag" : "2.0.18-ubuntu" }, "jobs-api": { - "registry": "zowe-docker-release.jfrog.io", - "name": "ompzowe/jobs-api", - "tag" : "2-ubuntu" + "registry": "zowe-docker-release.jfrog.io", + "name": "ompzowe/jobs-api", + "tag" : "2.0.18-ubuntu" }, "base": { - "registry": "zowe-docker-release.jfrog.io", - "name": "ompzowe/base", - "tag" : "2.0-ubuntu" + "registry": "zowe-docker-release.jfrog.io", + "name": "ompzowe/base", + "tag" : "2.0.1-ubuntu" }, "base-jdk": { - "registry": "zowe-docker-release.jfrog.io", - "name": "ompzowe/base-jdk", - "tag" : "2.0-ubuntu" + "registry": "zowe-docker-release.jfrog.io", + "name": "ompzowe/base-jdk", + "tag" : "2.0.1-ubuntu" }, "base-node": { - "registry": "zowe-docker-release.jfrog.io", - "name": "ompzowe/base-node", - "tag" : "2.0-ubuntu" + "registry": "zowe-docker-release.jfrog.io", + "name": "ompzowe/base-node", + "tag" : "2.0.1-ubuntu" } }, "dependencyDecisions": { From 7c753c95edb85da91b0652ed3dcbdf2c9a14f1b3 Mon Sep 17 00:00:00 2001 From: MarkAckert Date: Thu, 13 Jul 2023 12:25:09 -0400 Subject: [PATCH 047/168] build: make APIML_OIDC vars default for all builds Signed-off-by: MarkAckert --- .../src/__tests__/basic/install-fmid.ts | 4 ---- .../src/__tests__/basic/install-ptf.ts | 8 -------- .../src/__tests__/basic/install.ts | 4 ---- .../extended/security-systems/ptf/acf2.ts | 1 - .../extended/security-systems/ptf/racf.ts | 1 - .../extended/security-systems/ptf/ts.ts | 1 - tests/installation/src/constants.ts | 7 +++++++ tests/installation/src/utils.ts | 19 +++++++++---------- 8 files changed, 16 insertions(+), 29 deletions(-) diff --git a/tests/installation/src/__tests__/basic/install-fmid.ts b/tests/installation/src/__tests__/basic/install-fmid.ts index e6d74093e9..0726f9f445 100644 --- a/tests/installation/src/__tests__/basic/install-fmid.ts +++ b/tests/installation/src/__tests__/basic/install-fmid.ts @@ -31,10 +31,6 @@ describe(testSuiteName, () => { process.env.TEST_SERVER, { 'zowe_build_local': process.env['ZOWE_BUILD_LOCAL'], - 'zowe_apiml_security_oidc_client_id': process.env['OKTA_CLIENT_ID'], - 'zowe_apiml_security_oidc_client_secret': process.env['OKTA_CLIENT_SECRET'], - 'zowe_apiml_security_oidc_registry': process.env['OIDC_REGISTRY'], - 'zowe_apiml_security_oidc_introspect_url': `https://${process.env['OKTA_HOSTNAME']}/oauth2/default/v1/introspect`, 'zowe_custom_for_test': 'true', 'zowe_lock_keystore': 'false', } diff --git a/tests/installation/src/__tests__/basic/install-ptf.ts b/tests/installation/src/__tests__/basic/install-ptf.ts index dd5a559417..60b83f2248 100644 --- a/tests/installation/src/__tests__/basic/install-ptf.ts +++ b/tests/installation/src/__tests__/basic/install-ptf.ts @@ -26,21 +26,13 @@ describe(testSuiteName, () => { }); test('install and verify', async () => { - const apimlOidcVars = { - 'zowe_apiml_security_oidc_client_id': process.env['OKTA_CLIENT_ID'], - 'zowe_apiml_security_oidc_client_secret': process.env['OKTA_CLIENT_SECRET'], - 'zowe_apiml_security_oidc_registry': process.env['OIDC_REGISTRY'], - 'zowe_apiml_security_oidc_introspect_url': `https://${process.env['OKTA_HOSTNAME']}/oauth2/default/v1/introspect`, - }; await installAndVerifySmpePtf( testSuiteName, process.env.TEST_SERVER, - apimlOidcVars, { 'zowe_build_local': process.env['ZOWE_BUILD_LOCAL'], 'zowe_custom_for_test': 'true', 'zowe_lock_keystore': 'false', - ...apimlOidcVars } ); }, TEST_TIMEOUT_SMPE_PTF); diff --git a/tests/installation/src/__tests__/basic/install.ts b/tests/installation/src/__tests__/basic/install.ts index f1ba3a6517..9d49eddebb 100644 --- a/tests/installation/src/__tests__/basic/install.ts +++ b/tests/installation/src/__tests__/basic/install.ts @@ -31,10 +31,6 @@ describe(testSuiteName, () => { process.env.TEST_SERVER, { 'zowe_build_local': process.env['ZOWE_BUILD_LOCAL'], - 'zowe_apiml_security_oidc_client_id': process.env['OKTA_CLIENT_ID'], - 'zowe_apiml_security_oidc_client_secret': process.env['OKTA_CLIENT_SECRET'], - 'zowe_apiml_security_oidc_registry': process.env['OIDC_REGISTRY'], - 'zowe_apiml_security_oidc_introspect_url': `https://${process.env['OKTA_HOSTNAME']}/oauth2/default/v1/introspect`, 'zowe_custom_for_test': 'true', 'zowe_lock_keystore': 'false', } diff --git a/tests/installation/src/__tests__/extended/security-systems/ptf/acf2.ts b/tests/installation/src/__tests__/extended/security-systems/ptf/acf2.ts index 47497ded57..cdeb1b4b32 100644 --- a/tests/installation/src/__tests__/extended/security-systems/ptf/acf2.ts +++ b/tests/installation/src/__tests__/extended/security-systems/ptf/acf2.ts @@ -35,7 +35,6 @@ describe(testSuiteName, () => { await installAndVerifySmpePtf( testSuiteName, testServer, - {}, { 'zowe_build_local': process.env['ZOWE_BUILD_LOCAL'], 'zowe_custom_for_test': 'true', diff --git a/tests/installation/src/__tests__/extended/security-systems/ptf/racf.ts b/tests/installation/src/__tests__/extended/security-systems/ptf/racf.ts index 697f69e9ee..17d51a268f 100644 --- a/tests/installation/src/__tests__/extended/security-systems/ptf/racf.ts +++ b/tests/installation/src/__tests__/extended/security-systems/ptf/racf.ts @@ -34,7 +34,6 @@ describe(testSuiteName, () => { await installAndVerifySmpePtf( testSuiteName, testServer, - {}, { 'zowe_build_local': process.env['ZOWE_BUILD_LOCAL'], 'zowe_custom_for_test': 'true', diff --git a/tests/installation/src/__tests__/extended/security-systems/ptf/ts.ts b/tests/installation/src/__tests__/extended/security-systems/ptf/ts.ts index aef8d45c06..f367c392fd 100644 --- a/tests/installation/src/__tests__/extended/security-systems/ptf/ts.ts +++ b/tests/installation/src/__tests__/extended/security-systems/ptf/ts.ts @@ -35,7 +35,6 @@ describe(testSuiteName, () => { await installAndVerifySmpePtf( testSuiteName, testServer, - {}, { 'zowe_build_local': process.env['ZOWE_BUILD_LOCAL'], 'zowe_custom_for_test': 'true', diff --git a/tests/installation/src/constants.ts b/tests/installation/src/constants.ts index 694d2cf359..74ecdddce8 100644 --- a/tests/installation/src/constants.ts +++ b/tests/installation/src/constants.ts @@ -39,4 +39,11 @@ export const TEST_TIMEOUT_SMPE_PTF: number = 120 * 60 * 1000; export const KEYSTORE_MODE_KEYSTORE = 'KEYSTORE_MODE_KEYSTORE'; export const KEYSTORE_MODE_KEYRING = 'KEYSTORE_MODE_KEYRING'; +export const APIML_OIDC_VARS = { + 'zowe_apiml_security_oidc_client_id': process.env['OKTA_CLIENT_ID'] || 'dummy_id_from_constants_ts', + 'zowe_apiml_security_oidc_client_secret': process.env['OKTA_CLIENT_SECRET'] || 'dummy_secret_from_constants_ts', + 'zowe_apiml_security_oidc_registry': process.env['OIDC_REGISTRY'] || 'dummy_registry_from_constants_ts', + 'zowe_apiml_security_oidc_introspect_url': `https://${process.env['OKTA_HOSTNAME']}/oauth2/default/v1/introspect`, +}; + // debug(`process.env >>>>>>>>>>>>>>>>>>>>>>>>>>\n${JSON.stringify(process.env)}\n<<<<<<<<<<<<<<<<<<<<<<<`); diff --git a/tests/installation/src/utils.ts b/tests/installation/src/utils.ts index 7fb15bd4e2..9b41514184 100644 --- a/tests/installation/src/utils.ts +++ b/tests/installation/src/utils.ts @@ -21,6 +21,7 @@ import { ANSIBLE_ROOT_DIR, SANITY_TEST_REPORTS_DIR, INSTALL_TEST_REPORTS_DIR, + APIML_OIDC_VARS, } from './constants'; /** @@ -209,7 +210,7 @@ async function installAndVerifyZowe(testcase: string, installPlaybook: string, s testcase, installPlaybook, serverId, - extraVars + { ...APIML_OIDC_VARS , ...extraVars} ); expect(resultInstall.code).toBe(0); @@ -335,7 +336,7 @@ export async function installAndVerifyDockerBuild(testcase: string, serverId: st testcase, 'install-docker.yml', serverId, - extraVars + { ...extraVars, ...APIML_OIDC_VARS } ); expect(resultInstall.code).toBe(0); @@ -403,10 +404,8 @@ export async function installAndVerifyExtension(testcase: string, serverId: stri * @param {Object} extraFmidVars * @param {Object} extraPtfVars */ -export async function installAndVerifySmpePtf(testcase: string, serverId: string, - extraFmidVars: {[key: string]: any} = {}, - extraPtfVars: {[key: string]: any} = {}): Promise { - debug(`installAndVerifySmpePtf(${testcase}, ${serverId}, FMID: ${JSON.stringify(extraFmidVars)}, PTF: ${JSON.stringify(extraPtfVars)})`); +export async function installAndVerifySmpePtf(testcase: string, serverId: string, extraPtfVars: {[key: string]: any} = {}): Promise { + debug(`installAndVerifySmpePtf(${testcase}, ${serverId}, ${JSON.stringify(extraPtfVars)})`); debug(`run install-fmid.yml on ${serverId}`); @@ -417,7 +416,7 @@ export async function installAndVerifySmpePtf(testcase: string, serverId: string { 'zowe_build_remote': ZOWE_FMID, 'skip_start': 'true', - ...extraFmidVars + ...APIML_OIDC_VARS } ); @@ -428,7 +427,7 @@ export async function installAndVerifySmpePtf(testcase: string, serverId: string testcase, 'install-ptf.yml', serverId, - extraPtfVars + { ...extraPtfVars, ...APIML_OIDC_VARS } ); expect(resultPtf.code).toBe(0); @@ -468,7 +467,7 @@ export async function installAndGenerateApiDocs(testcase: string, serverId: stri testcase, 'install.yml', serverId, - extraVars + { ...extraVars, ...APIML_OIDC_VARS } ); expect(resultInstall.code).toBe(0); @@ -514,7 +513,7 @@ export async function showZoweRuntimeLogs(serverId: string, extraVars: {[key: st 'doesn\'t matter', 'show-logs.yml', serverId, - extraVars + { ...extraVars, ...APIML_OIDC_VARS } ); } catch (e) { debug(`showZoweRuntimeLogs failed: ${e}`); From b54717bb2feccbe8d65738cdaaac0a7b9f1f7dbb Mon Sep 17 00:00:00 2001 From: Timothy Johnson Date: Fri, 14 Jul 2023 08:57:23 -0400 Subject: [PATCH 048/168] Update CLI component versions for Zowe 2.10.0 Signed-off-by: Timothy Johnson --- manifest.json.template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/manifest.json.template b/manifest.json.template index 144a3bbcbc..f859539bd4 100644 --- a/manifest.json.template +++ b/manifest.json.template @@ -140,7 +140,7 @@ "componentGroup": "Imperative CLI Framework for Zowe", "entries": [{ "repository": "imperative", - "tag": "v5.14.1", + "tag": "v5.15.1", "destinations": ["Zowe CLI Package"] }] }, { @@ -219,7 +219,7 @@ "componentGroup": "Zowe CLI", "entries": [{ "repository": "zowe-cli", - "tag": "v7.16.4", + "tag": "v7.16.6", "destinations": ["Zowe CLI Package"] }] }, { From ab35ba24772b05a43aeeaa7120b70d6e57cc860e Mon Sep 17 00:00:00 2001 From: ojcelis Date: Mon, 17 Jul 2023 16:48:55 -0400 Subject: [PATCH 049/168] Update jes, mvs, uss and zlux tests Signed-off-by: ojcelis --- tests/sanity/test/e2e/test-02-jes-explorer.js | 14 +++--- tests/sanity/test/e2e/test-03-mvs-explorer.js | 14 +++--- tests/sanity/test/e2e/test-04-uss-explorer.js | 14 +++--- tests/sanity/test/zlux/test-zlux-server.js | 48 +++++++++---------- 4 files changed, 45 insertions(+), 45 deletions(-) diff --git a/tests/sanity/test/e2e/test-02-jes-explorer.js b/tests/sanity/test/e2e/test-02-jes-explorer.js index e142291fb8..0e1ed2dcfe 100644 --- a/tests/sanity/test/e2e/test-02-jes-explorer.js +++ b/tests/sanity/test/e2e/test-02-jes-explorer.js @@ -8,7 +8,7 @@ * Copyright IBM Corporation 2018, 2020 */ -const { setApimlAuthTokenCookie } = require('explorer-fvt-utilities'); +//const { setApimlAuthTokenCookie } = require('explorer-fvt-utilities'); const path = require('path'); const expect = require('chai').expect; const debug = require('debug')('zowe-sanity-test:e2e:jes-explorer'); @@ -56,12 +56,12 @@ describe(`test ${APP_TO_TEST}`, function() { driver = await getDefaultDriver(); debug('webdriver initialized'); - await setApimlAuthTokenCookie(driver, - process.env.SSH_USER, - process.env.SSH_PASSWD, - `https://${process.env.ZOWE_EXTERNAL_HOST}:${process.env.ZOWE_API_MEDIATION_GATEWAY_HTTP_PORT}/gateway/api/v1/auth/login`, - `https://${process.env.ZOWE_EXTERNAL_HOST}:${process.env.ZOWE_API_MEDIATION_GATEWAY_HTTP_PORT}/zlux/ui/v1/ZLUX/plugins/org.zowe.explorer-jes/web/index.html` - ); + //await setApimlAuthTokenCookie(driver, + // process.env.SSH_USER, + // process.env.SSH_PASSWD, + // `https://${process.env.ZOWE_EXTERNAL_HOST}:${process.env.ZOWE_API_MEDIATION_GATEWAY_HTTP_PORT}/gateway/api/v1/auth/login`, + // `https://${process.env.ZOWE_EXTERNAL_HOST}:${process.env.ZOWE_API_MEDIATION_GATEWAY_HTTP_PORT}/zlux/ui/v1/ZLUX/plugins/org.zowe.explorer-jes/web/index.html` + //); // load MVD login page await loginMVD( diff --git a/tests/sanity/test/e2e/test-03-mvs-explorer.js b/tests/sanity/test/e2e/test-03-mvs-explorer.js index 9edf10dd2b..ec85008816 100644 --- a/tests/sanity/test/e2e/test-03-mvs-explorer.js +++ b/tests/sanity/test/e2e/test-03-mvs-explorer.js @@ -8,7 +8,7 @@ * Copyright IBM Corporation 2018, 2020 */ -const { setApimlAuthTokenCookie } = require('explorer-fvt-utilities'); +//const { setApimlAuthTokenCookie } = require('explorer-fvt-utilities'); const path = require('path'); const expect = require('chai').expect; const debug = require('debug')('zowe-sanity-test:e2e:mvs-explorer'); @@ -60,12 +60,12 @@ describe(`test ${APP_TO_TEST}`, function() { driver = await getDefaultDriver(); debug('webdriver initialized'); - await setApimlAuthTokenCookie(driver, - process.env.SSH_USER, - process.env.SSH_PASSWD, - `https://${process.env.ZOWE_EXTERNAL_HOST}:${process.env.ZOWE_API_MEDIATION_GATEWAY_HTTP_PORT}/gateway/api/v1/auth/login`, - `https://${process.env.ZOWE_EXTERNAL_HOST}:${process.env.ZOWE_API_MEDIATION_GATEWAY_HTTP_PORT}/zlux/ui/v1/ZLUX/plugins/org.zowe.explorer-mvs/web/index.html` - ); + //await setApimlAuthTokenCookie(driver, + // process.env.SSH_USER, + // process.env.SSH_PASSWD, + // `https://${process.env.ZOWE_EXTERNAL_HOST}:${process.env.ZOWE_API_MEDIATION_GATEWAY_HTTP_PORT}/gateway/api/v1/auth/login`, + // `https://${process.env.ZOWE_EXTERNAL_HOST}:${process.env.ZOWE_API_MEDIATION_GATEWAY_HTTP_PORT}/zlux/ui/v1/ZLUX/plugins/org.zowe.explorer-mvs/web/index.html` + //); await loginMVD( driver, diff --git a/tests/sanity/test/e2e/test-04-uss-explorer.js b/tests/sanity/test/e2e/test-04-uss-explorer.js index bd4585ab9d..9b2eca1576 100644 --- a/tests/sanity/test/e2e/test-04-uss-explorer.js +++ b/tests/sanity/test/e2e/test-04-uss-explorer.js @@ -8,7 +8,7 @@ * Copyright IBM Corporation 2018, 2020 */ -const { setApimlAuthTokenCookie } = require('explorer-fvt-utilities'); +//const { setApimlAuthTokenCookie } = require('explorer-fvt-utilities'); const path = require('path'); const expect = require('chai').expect; const debug = require('debug')('zowe-sanity-test:e2e:uss-explorer'); @@ -59,12 +59,12 @@ describe(`test ${APP_TO_TEST}`, function() { driver = await getDefaultDriver(); debug('webdriver initialized'); - await setApimlAuthTokenCookie(driver, - process.env.SSH_USER, - process.env.SSH_PASSWD, - `https://${process.env.ZOWE_EXTERNAL_HOST}:${process.env.ZOWE_API_MEDIATION_GATEWAY_HTTP_PORT}/gateway/api/v1/auth/login`, - `https://${process.env.ZOWE_EXTERNAL_HOST}:${process.env.ZOWE_API_MEDIATION_GATEWAY_HTTP_PORT}/zlux/ui/v1/ZLUX/plugins/org.zowe.explorer-uss/web/index.html` - ); + //await setApimlAuthTokenCookie(driver, + // process.env.SSH_USER, + // process.env.SSH_PASSWD, + // `https://${process.env.ZOWE_EXTERNAL_HOST}:${process.env.ZOWE_API_MEDIATION_GATEWAY_HTTP_PORT}/gateway/api/v1/auth/login`, + // `https://${process.env.ZOWE_EXTERNAL_HOST}:${process.env.ZOWE_API_MEDIATION_GATEWAY_HTTP_PORT}/zlux/ui/v1/ZLUX/plugins/org.zowe.explorer-uss/web/index.html` + //); await loginMVD( driver, diff --git a/tests/sanity/test/zlux/test-zlux-server.js b/tests/sanity/test/zlux/test-zlux-server.js index 0c3ba390fd..355050e006 100644 --- a/tests/sanity/test/zlux/test-zlux-server.js +++ b/tests/sanity/test/zlux/test-zlux-server.js @@ -41,31 +41,31 @@ describe(`test zLux server https://${process.env.ZOWE_EXTERNAL_HOST}:${process.e token = await zlux.login(); }); - describe('GET /', function() { - it('should redirect to ./ZLUX/plugins/org.zowe.zlux.bootstrap/web/', async function() { - const res = await hqZlux.request({ - url: '/', - maxRedirects: 0, - }); - - expect(res).to.have.property('status'); - expect(res.status).to.equal(HTTP_STATUS.REDIRECT); - expect(res).to.have.property('headers'); - expect(res.headers).to.have.property('location'); - expect(res.headers.location).to.equal('./ZLUX/plugins/org.zowe.zlux.bootstrap/web/'); - }); - - it('should return ok', async function() { - const res = await hqZlux.request({ - url: '/', - }); - - expect(res).to.have.property('status'); - expect(res.status).to.equal(HTTP_STATUS.SUCCESS); + //describe('GET /', function() { + // it('should redirect to ./ZLUX/plugins/org.zowe.zlux.bootstrap/web/', async function() { + // const res = await hqZlux.request({ + // url: '/', + // maxRedirects: 0, + // }); + + // expect(res).to.have.property('status'); + // expect(res.status).to.equal(HTTP_STATUS.REDIRECT); + // expect(res).to.have.property('headers'); + // expect(res.headers).to.have.property('location'); + // expect(res.headers.location).to.equal('./ZLUX/plugins/org.zowe.zlux.bootstrap/web/'); + // }); + + // it('should return ok', async function() { + // const res = await hqZlux.request({ + // url: '/', + // }); + + // expect(res).to.have.property('status'); + // expect(res.status).to.equal(HTTP_STATUS.SUCCESS); // has been renamed to Zowe Desktop - expect(res.data).to.match(/(Mainframe Virtual Desktop|Zowe Desktop)/); - }); - }); + // expect(res.data).to.match(/(Mainframe Virtual Desktop|Zowe Desktop)/); + // }); + //}); describe('GET /ZLUX/plugins', function() { it('/org.zowe.explorer-jes/web/index.html is an unprotected path', async function() { From 5b4071a01db82364e87b432c59383a0e794b09ae Mon Sep 17 00:00:00 2001 From: ojcelis Date: Mon, 17 Jul 2023 17:00:40 -0400 Subject: [PATCH 050/168] update spacing Signed-off-by: ojcelis --- tests/sanity/test/zlux/test-zlux-server.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/sanity/test/zlux/test-zlux-server.js b/tests/sanity/test/zlux/test-zlux-server.js index 355050e006..94174babfe 100644 --- a/tests/sanity/test/zlux/test-zlux-server.js +++ b/tests/sanity/test/zlux/test-zlux-server.js @@ -62,7 +62,7 @@ describe(`test zLux server https://${process.env.ZOWE_EXTERNAL_HOST}:${process.e // expect(res).to.have.property('status'); // expect(res.status).to.equal(HTTP_STATUS.SUCCESS); - // has been renamed to Zowe Desktop + // has been renamed to Zowe Desktop // expect(res.data).to.match(/(Mainframe Virtual Desktop|Zowe Desktop)/); // }); //}); From 03a068cf08ee3a01688798bb6b300c64be577853 Mon Sep 17 00:00:00 2001 From: ojcelis Date: Tue, 18 Jul 2023 09:28:53 -0400 Subject: [PATCH 051/168] update zlux, jes, mvs and uss sanity tests Signed-off-by: ojcelis --- tests/sanity/test/e2e/test-02-jes-explorer.js | 14 +++--- tests/sanity/test/e2e/test-03-mvs-explorer.js | 14 +++--- tests/sanity/test/e2e/test-04-uss-explorer.js | 14 +++--- tests/sanity/test/zlux/test-zlux-server.js | 50 +++++++++---------- 4 files changed, 46 insertions(+), 46 deletions(-) diff --git a/tests/sanity/test/e2e/test-02-jes-explorer.js b/tests/sanity/test/e2e/test-02-jes-explorer.js index e142291fb8..0e1ed2dcfe 100644 --- a/tests/sanity/test/e2e/test-02-jes-explorer.js +++ b/tests/sanity/test/e2e/test-02-jes-explorer.js @@ -8,7 +8,7 @@ * Copyright IBM Corporation 2018, 2020 */ -const { setApimlAuthTokenCookie } = require('explorer-fvt-utilities'); +//const { setApimlAuthTokenCookie } = require('explorer-fvt-utilities'); const path = require('path'); const expect = require('chai').expect; const debug = require('debug')('zowe-sanity-test:e2e:jes-explorer'); @@ -56,12 +56,12 @@ describe(`test ${APP_TO_TEST}`, function() { driver = await getDefaultDriver(); debug('webdriver initialized'); - await setApimlAuthTokenCookie(driver, - process.env.SSH_USER, - process.env.SSH_PASSWD, - `https://${process.env.ZOWE_EXTERNAL_HOST}:${process.env.ZOWE_API_MEDIATION_GATEWAY_HTTP_PORT}/gateway/api/v1/auth/login`, - `https://${process.env.ZOWE_EXTERNAL_HOST}:${process.env.ZOWE_API_MEDIATION_GATEWAY_HTTP_PORT}/zlux/ui/v1/ZLUX/plugins/org.zowe.explorer-jes/web/index.html` - ); + //await setApimlAuthTokenCookie(driver, + // process.env.SSH_USER, + // process.env.SSH_PASSWD, + // `https://${process.env.ZOWE_EXTERNAL_HOST}:${process.env.ZOWE_API_MEDIATION_GATEWAY_HTTP_PORT}/gateway/api/v1/auth/login`, + // `https://${process.env.ZOWE_EXTERNAL_HOST}:${process.env.ZOWE_API_MEDIATION_GATEWAY_HTTP_PORT}/zlux/ui/v1/ZLUX/plugins/org.zowe.explorer-jes/web/index.html` + //); // load MVD login page await loginMVD( diff --git a/tests/sanity/test/e2e/test-03-mvs-explorer.js b/tests/sanity/test/e2e/test-03-mvs-explorer.js index 9edf10dd2b..ec85008816 100644 --- a/tests/sanity/test/e2e/test-03-mvs-explorer.js +++ b/tests/sanity/test/e2e/test-03-mvs-explorer.js @@ -8,7 +8,7 @@ * Copyright IBM Corporation 2018, 2020 */ -const { setApimlAuthTokenCookie } = require('explorer-fvt-utilities'); +//const { setApimlAuthTokenCookie } = require('explorer-fvt-utilities'); const path = require('path'); const expect = require('chai').expect; const debug = require('debug')('zowe-sanity-test:e2e:mvs-explorer'); @@ -60,12 +60,12 @@ describe(`test ${APP_TO_TEST}`, function() { driver = await getDefaultDriver(); debug('webdriver initialized'); - await setApimlAuthTokenCookie(driver, - process.env.SSH_USER, - process.env.SSH_PASSWD, - `https://${process.env.ZOWE_EXTERNAL_HOST}:${process.env.ZOWE_API_MEDIATION_GATEWAY_HTTP_PORT}/gateway/api/v1/auth/login`, - `https://${process.env.ZOWE_EXTERNAL_HOST}:${process.env.ZOWE_API_MEDIATION_GATEWAY_HTTP_PORT}/zlux/ui/v1/ZLUX/plugins/org.zowe.explorer-mvs/web/index.html` - ); + //await setApimlAuthTokenCookie(driver, + // process.env.SSH_USER, + // process.env.SSH_PASSWD, + // `https://${process.env.ZOWE_EXTERNAL_HOST}:${process.env.ZOWE_API_MEDIATION_GATEWAY_HTTP_PORT}/gateway/api/v1/auth/login`, + // `https://${process.env.ZOWE_EXTERNAL_HOST}:${process.env.ZOWE_API_MEDIATION_GATEWAY_HTTP_PORT}/zlux/ui/v1/ZLUX/plugins/org.zowe.explorer-mvs/web/index.html` + //); await loginMVD( driver, diff --git a/tests/sanity/test/e2e/test-04-uss-explorer.js b/tests/sanity/test/e2e/test-04-uss-explorer.js index bd4585ab9d..9b2eca1576 100644 --- a/tests/sanity/test/e2e/test-04-uss-explorer.js +++ b/tests/sanity/test/e2e/test-04-uss-explorer.js @@ -8,7 +8,7 @@ * Copyright IBM Corporation 2018, 2020 */ -const { setApimlAuthTokenCookie } = require('explorer-fvt-utilities'); +//const { setApimlAuthTokenCookie } = require('explorer-fvt-utilities'); const path = require('path'); const expect = require('chai').expect; const debug = require('debug')('zowe-sanity-test:e2e:uss-explorer'); @@ -59,12 +59,12 @@ describe(`test ${APP_TO_TEST}`, function() { driver = await getDefaultDriver(); debug('webdriver initialized'); - await setApimlAuthTokenCookie(driver, - process.env.SSH_USER, - process.env.SSH_PASSWD, - `https://${process.env.ZOWE_EXTERNAL_HOST}:${process.env.ZOWE_API_MEDIATION_GATEWAY_HTTP_PORT}/gateway/api/v1/auth/login`, - `https://${process.env.ZOWE_EXTERNAL_HOST}:${process.env.ZOWE_API_MEDIATION_GATEWAY_HTTP_PORT}/zlux/ui/v1/ZLUX/plugins/org.zowe.explorer-uss/web/index.html` - ); + //await setApimlAuthTokenCookie(driver, + // process.env.SSH_USER, + // process.env.SSH_PASSWD, + // `https://${process.env.ZOWE_EXTERNAL_HOST}:${process.env.ZOWE_API_MEDIATION_GATEWAY_HTTP_PORT}/gateway/api/v1/auth/login`, + // `https://${process.env.ZOWE_EXTERNAL_HOST}:${process.env.ZOWE_API_MEDIATION_GATEWAY_HTTP_PORT}/zlux/ui/v1/ZLUX/plugins/org.zowe.explorer-uss/web/index.html` + //); await loginMVD( driver, diff --git a/tests/sanity/test/zlux/test-zlux-server.js b/tests/sanity/test/zlux/test-zlux-server.js index 0c3ba390fd..94174babfe 100644 --- a/tests/sanity/test/zlux/test-zlux-server.js +++ b/tests/sanity/test/zlux/test-zlux-server.js @@ -41,31 +41,31 @@ describe(`test zLux server https://${process.env.ZOWE_EXTERNAL_HOST}:${process.e token = await zlux.login(); }); - describe('GET /', function() { - it('should redirect to ./ZLUX/plugins/org.zowe.zlux.bootstrap/web/', async function() { - const res = await hqZlux.request({ - url: '/', - maxRedirects: 0, - }); - - expect(res).to.have.property('status'); - expect(res.status).to.equal(HTTP_STATUS.REDIRECT); - expect(res).to.have.property('headers'); - expect(res.headers).to.have.property('location'); - expect(res.headers.location).to.equal('./ZLUX/plugins/org.zowe.zlux.bootstrap/web/'); - }); - - it('should return ok', async function() { - const res = await hqZlux.request({ - url: '/', - }); - - expect(res).to.have.property('status'); - expect(res.status).to.equal(HTTP_STATUS.SUCCESS); - // has been renamed to Zowe Desktop - expect(res.data).to.match(/(Mainframe Virtual Desktop|Zowe Desktop)/); - }); - }); + //describe('GET /', function() { + // it('should redirect to ./ZLUX/plugins/org.zowe.zlux.bootstrap/web/', async function() { + // const res = await hqZlux.request({ + // url: '/', + // maxRedirects: 0, + // }); + + // expect(res).to.have.property('status'); + // expect(res.status).to.equal(HTTP_STATUS.REDIRECT); + // expect(res).to.have.property('headers'); + // expect(res.headers).to.have.property('location'); + // expect(res.headers.location).to.equal('./ZLUX/plugins/org.zowe.zlux.bootstrap/web/'); + // }); + + // it('should return ok', async function() { + // const res = await hqZlux.request({ + // url: '/', + // }); + + // expect(res).to.have.property('status'); + // expect(res.status).to.equal(HTTP_STATUS.SUCCESS); + // has been renamed to Zowe Desktop + // expect(res.data).to.match(/(Mainframe Virtual Desktop|Zowe Desktop)/); + // }); + //}); describe('GET /ZLUX/plugins', function() { it('/org.zowe.explorer-jes/web/index.html is an unprotected path', async function() { From 01c437c5f5f847a889fe1dd884131f448737f021 Mon Sep 17 00:00:00 2001 From: Joe Winchester Date: Tue, 18 Jul 2023 17:32:32 +0100 Subject: [PATCH 052/168] Fix review comments from Mark and Martin. Signed-off-by: Joe Winchester --- bin/libs/certificate.sh | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/bin/libs/certificate.sh b/bin/libs/certificate.sh index 451fbd47f1..40fa4e44aa 100644 --- a/bin/libs/certificate.sh +++ b/bin/libs/certificate.sh @@ -885,7 +885,7 @@ EOF # used by ACF2 stc_group=$(read_yaml "${ZWE_CLI_PARAMETER_CONFIG}" ".zowe.setup.security.groups.stc") - if [ -z "${security_groups_stc}" ]; then + if [ -z "${stc_group}" ]; then stc_group=${ZWE_PRIVATE_DEFAULT_ADMIN_GROUP} fi @@ -1012,8 +1012,10 @@ keyring_run_zwenokyr_jcl() { security_product=${7:-RACF} # used by ACF2 - # TODO: how to pass this? - stc_group= + stc_group=$(read_yaml "${ZWE_CLI_PARAMETER_CONFIG}" ".zowe.setup.security.groups.stc") + if [ -z "${stc_group}" ]; then + stc_group=${ZWE_PRIVATE_DEFAULT_ADMIN_GROUP} + fi ############################### # prepare ZWENOKYR JCL From a25ba0ea4bf395bee2fbef1aa54d536ac198edb5 Mon Sep 17 00:00:00 2001 From: MarkAckert Date: Thu, 13 Jul 2023 12:25:09 -0400 Subject: [PATCH 053/168] build: make APIML_OIDC vars default for all builds Signed-off-by: MarkAckert --- .../src/__tests__/basic/install-fmid.ts | 4 ---- .../src/__tests__/basic/install-ptf.ts | 8 -------- .../src/__tests__/basic/install.ts | 4 ---- .../extended/security-systems/ptf/acf2.ts | 1 - .../extended/security-systems/ptf/racf.ts | 1 - .../extended/security-systems/ptf/ts.ts | 1 - tests/installation/src/constants.ts | 7 +++++++ tests/installation/src/utils.ts | 19 +++++++++---------- 8 files changed, 16 insertions(+), 29 deletions(-) diff --git a/tests/installation/src/__tests__/basic/install-fmid.ts b/tests/installation/src/__tests__/basic/install-fmid.ts index e6d74093e9..0726f9f445 100644 --- a/tests/installation/src/__tests__/basic/install-fmid.ts +++ b/tests/installation/src/__tests__/basic/install-fmid.ts @@ -31,10 +31,6 @@ describe(testSuiteName, () => { process.env.TEST_SERVER, { 'zowe_build_local': process.env['ZOWE_BUILD_LOCAL'], - 'zowe_apiml_security_oidc_client_id': process.env['OKTA_CLIENT_ID'], - 'zowe_apiml_security_oidc_client_secret': process.env['OKTA_CLIENT_SECRET'], - 'zowe_apiml_security_oidc_registry': process.env['OIDC_REGISTRY'], - 'zowe_apiml_security_oidc_introspect_url': `https://${process.env['OKTA_HOSTNAME']}/oauth2/default/v1/introspect`, 'zowe_custom_for_test': 'true', 'zowe_lock_keystore': 'false', } diff --git a/tests/installation/src/__tests__/basic/install-ptf.ts b/tests/installation/src/__tests__/basic/install-ptf.ts index dd5a559417..60b83f2248 100644 --- a/tests/installation/src/__tests__/basic/install-ptf.ts +++ b/tests/installation/src/__tests__/basic/install-ptf.ts @@ -26,21 +26,13 @@ describe(testSuiteName, () => { }); test('install and verify', async () => { - const apimlOidcVars = { - 'zowe_apiml_security_oidc_client_id': process.env['OKTA_CLIENT_ID'], - 'zowe_apiml_security_oidc_client_secret': process.env['OKTA_CLIENT_SECRET'], - 'zowe_apiml_security_oidc_registry': process.env['OIDC_REGISTRY'], - 'zowe_apiml_security_oidc_introspect_url': `https://${process.env['OKTA_HOSTNAME']}/oauth2/default/v1/introspect`, - }; await installAndVerifySmpePtf( testSuiteName, process.env.TEST_SERVER, - apimlOidcVars, { 'zowe_build_local': process.env['ZOWE_BUILD_LOCAL'], 'zowe_custom_for_test': 'true', 'zowe_lock_keystore': 'false', - ...apimlOidcVars } ); }, TEST_TIMEOUT_SMPE_PTF); diff --git a/tests/installation/src/__tests__/basic/install.ts b/tests/installation/src/__tests__/basic/install.ts index f1ba3a6517..9d49eddebb 100644 --- a/tests/installation/src/__tests__/basic/install.ts +++ b/tests/installation/src/__tests__/basic/install.ts @@ -31,10 +31,6 @@ describe(testSuiteName, () => { process.env.TEST_SERVER, { 'zowe_build_local': process.env['ZOWE_BUILD_LOCAL'], - 'zowe_apiml_security_oidc_client_id': process.env['OKTA_CLIENT_ID'], - 'zowe_apiml_security_oidc_client_secret': process.env['OKTA_CLIENT_SECRET'], - 'zowe_apiml_security_oidc_registry': process.env['OIDC_REGISTRY'], - 'zowe_apiml_security_oidc_introspect_url': `https://${process.env['OKTA_HOSTNAME']}/oauth2/default/v1/introspect`, 'zowe_custom_for_test': 'true', 'zowe_lock_keystore': 'false', } diff --git a/tests/installation/src/__tests__/extended/security-systems/ptf/acf2.ts b/tests/installation/src/__tests__/extended/security-systems/ptf/acf2.ts index 47497ded57..cdeb1b4b32 100644 --- a/tests/installation/src/__tests__/extended/security-systems/ptf/acf2.ts +++ b/tests/installation/src/__tests__/extended/security-systems/ptf/acf2.ts @@ -35,7 +35,6 @@ describe(testSuiteName, () => { await installAndVerifySmpePtf( testSuiteName, testServer, - {}, { 'zowe_build_local': process.env['ZOWE_BUILD_LOCAL'], 'zowe_custom_for_test': 'true', diff --git a/tests/installation/src/__tests__/extended/security-systems/ptf/racf.ts b/tests/installation/src/__tests__/extended/security-systems/ptf/racf.ts index 697f69e9ee..17d51a268f 100644 --- a/tests/installation/src/__tests__/extended/security-systems/ptf/racf.ts +++ b/tests/installation/src/__tests__/extended/security-systems/ptf/racf.ts @@ -34,7 +34,6 @@ describe(testSuiteName, () => { await installAndVerifySmpePtf( testSuiteName, testServer, - {}, { 'zowe_build_local': process.env['ZOWE_BUILD_LOCAL'], 'zowe_custom_for_test': 'true', diff --git a/tests/installation/src/__tests__/extended/security-systems/ptf/ts.ts b/tests/installation/src/__tests__/extended/security-systems/ptf/ts.ts index aef8d45c06..f367c392fd 100644 --- a/tests/installation/src/__tests__/extended/security-systems/ptf/ts.ts +++ b/tests/installation/src/__tests__/extended/security-systems/ptf/ts.ts @@ -35,7 +35,6 @@ describe(testSuiteName, () => { await installAndVerifySmpePtf( testSuiteName, testServer, - {}, { 'zowe_build_local': process.env['ZOWE_BUILD_LOCAL'], 'zowe_custom_for_test': 'true', diff --git a/tests/installation/src/constants.ts b/tests/installation/src/constants.ts index 694d2cf359..74ecdddce8 100644 --- a/tests/installation/src/constants.ts +++ b/tests/installation/src/constants.ts @@ -39,4 +39,11 @@ export const TEST_TIMEOUT_SMPE_PTF: number = 120 * 60 * 1000; export const KEYSTORE_MODE_KEYSTORE = 'KEYSTORE_MODE_KEYSTORE'; export const KEYSTORE_MODE_KEYRING = 'KEYSTORE_MODE_KEYRING'; +export const APIML_OIDC_VARS = { + 'zowe_apiml_security_oidc_client_id': process.env['OKTA_CLIENT_ID'] || 'dummy_id_from_constants_ts', + 'zowe_apiml_security_oidc_client_secret': process.env['OKTA_CLIENT_SECRET'] || 'dummy_secret_from_constants_ts', + 'zowe_apiml_security_oidc_registry': process.env['OIDC_REGISTRY'] || 'dummy_registry_from_constants_ts', + 'zowe_apiml_security_oidc_introspect_url': `https://${process.env['OKTA_HOSTNAME']}/oauth2/default/v1/introspect`, +}; + // debug(`process.env >>>>>>>>>>>>>>>>>>>>>>>>>>\n${JSON.stringify(process.env)}\n<<<<<<<<<<<<<<<<<<<<<<<`); diff --git a/tests/installation/src/utils.ts b/tests/installation/src/utils.ts index 7fb15bd4e2..9b41514184 100644 --- a/tests/installation/src/utils.ts +++ b/tests/installation/src/utils.ts @@ -21,6 +21,7 @@ import { ANSIBLE_ROOT_DIR, SANITY_TEST_REPORTS_DIR, INSTALL_TEST_REPORTS_DIR, + APIML_OIDC_VARS, } from './constants'; /** @@ -209,7 +210,7 @@ async function installAndVerifyZowe(testcase: string, installPlaybook: string, s testcase, installPlaybook, serverId, - extraVars + { ...APIML_OIDC_VARS , ...extraVars} ); expect(resultInstall.code).toBe(0); @@ -335,7 +336,7 @@ export async function installAndVerifyDockerBuild(testcase: string, serverId: st testcase, 'install-docker.yml', serverId, - extraVars + { ...extraVars, ...APIML_OIDC_VARS } ); expect(resultInstall.code).toBe(0); @@ -403,10 +404,8 @@ export async function installAndVerifyExtension(testcase: string, serverId: stri * @param {Object} extraFmidVars * @param {Object} extraPtfVars */ -export async function installAndVerifySmpePtf(testcase: string, serverId: string, - extraFmidVars: {[key: string]: any} = {}, - extraPtfVars: {[key: string]: any} = {}): Promise { - debug(`installAndVerifySmpePtf(${testcase}, ${serverId}, FMID: ${JSON.stringify(extraFmidVars)}, PTF: ${JSON.stringify(extraPtfVars)})`); +export async function installAndVerifySmpePtf(testcase: string, serverId: string, extraPtfVars: {[key: string]: any} = {}): Promise { + debug(`installAndVerifySmpePtf(${testcase}, ${serverId}, ${JSON.stringify(extraPtfVars)})`); debug(`run install-fmid.yml on ${serverId}`); @@ -417,7 +416,7 @@ export async function installAndVerifySmpePtf(testcase: string, serverId: string { 'zowe_build_remote': ZOWE_FMID, 'skip_start': 'true', - ...extraFmidVars + ...APIML_OIDC_VARS } ); @@ -428,7 +427,7 @@ export async function installAndVerifySmpePtf(testcase: string, serverId: string testcase, 'install-ptf.yml', serverId, - extraPtfVars + { ...extraPtfVars, ...APIML_OIDC_VARS } ); expect(resultPtf.code).toBe(0); @@ -468,7 +467,7 @@ export async function installAndGenerateApiDocs(testcase: string, serverId: stri testcase, 'install.yml', serverId, - extraVars + { ...extraVars, ...APIML_OIDC_VARS } ); expect(resultInstall.code).toBe(0); @@ -514,7 +513,7 @@ export async function showZoweRuntimeLogs(serverId: string, extraVars: {[key: st 'doesn\'t matter', 'show-logs.yml', serverId, - extraVars + { ...extraVars, ...APIML_OIDC_VARS } ); } catch (e) { debug(`showZoweRuntimeLogs failed: ${e}`); From d4d2588df1a3ade51b00420eef486269a04dccd4 Mon Sep 17 00:00:00 2001 From: MarkAckert Date: Wed, 19 Jul 2023 12:11:32 -0400 Subject: [PATCH 054/168] test: add external root ca to keyring in test automation Signed-off-by: MarkAckert --- playbooks/all_host_vars_list.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/playbooks/all_host_vars_list.yml b/playbooks/all_host_vars_list.yml index 173bd4efcf..d3528c7fa7 100644 --- a/playbooks/all_host_vars_list.yml +++ b/playbooks/all_host_vars_list.yml @@ -68,7 +68,7 @@ zowe_jobs_explorer_port: 7560 zowe_keyring_alias: ZoweKeyring zowe_keyring_certname: ZoweCert zowe_keyring_external_intermediate_ca: -zowe_keyring_external_root_ca: +zowe_keyring_external_root_ca: brcmso zowe_keystore_alias: localhost zowe_keystore_dir: ~/.zowe/keystore zowe_keystore_password: password From 87b67ea8a265ab963423c466767c9cfb3f96cb5d Mon Sep 17 00:00:00 2001 From: MarkAckert Date: Wed, 19 Jul 2023 12:11:32 -0400 Subject: [PATCH 055/168] test: add external root ca to keyring in test automation Signed-off-by: MarkAckert --- playbooks/all_host_vars_list.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/playbooks/all_host_vars_list.yml b/playbooks/all_host_vars_list.yml index 173bd4efcf..d3528c7fa7 100644 --- a/playbooks/all_host_vars_list.yml +++ b/playbooks/all_host_vars_list.yml @@ -68,7 +68,7 @@ zowe_jobs_explorer_port: 7560 zowe_keyring_alias: ZoweKeyring zowe_keyring_certname: ZoweCert zowe_keyring_external_intermediate_ca: -zowe_keyring_external_root_ca: +zowe_keyring_external_root_ca: brcmso zowe_keystore_alias: localhost zowe_keystore_dir: ~/.zowe/keystore zowe_keystore_password: password From 6e374b07909590be980f4e06c8e78c515a48b52c Mon Sep 17 00:00:00 2001 From: MarkAckert Date: Wed, 19 Jul 2023 14:39:36 -0400 Subject: [PATCH 056/168] build: update defaults un-setting variable in specific playbook roles Signed-off-by: MarkAckert --- playbooks/roles/configfmid/defaults/main.yml | 2 +- playbooks/roles/configure/defaults/main.yml | 2 +- playbooks/roles/custom_for_test/defaults/main.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/playbooks/roles/configfmid/defaults/main.yml b/playbooks/roles/configfmid/defaults/main.yml index aad0f019e2..65d34fcae1 100644 --- a/playbooks/roles/configfmid/defaults/main.yml +++ b/playbooks/roles/configfmid/defaults/main.yml @@ -104,7 +104,7 @@ zowe_keystore_password: password zowe_keyring_alias: ZoweKeyring zowe_keyring_certname: ZoweCert zowe_keyring_external_intermediate_ca: -zowe_keyring_external_root_ca: +zowe_keyring_external_root_ca: brcmso zowe_keystore_alias: localhost zowe_jcllib: zowe_proclib_dsname: auto diff --git a/playbooks/roles/configure/defaults/main.yml b/playbooks/roles/configure/defaults/main.yml index 37feba2654..5e0cd717d4 100644 --- a/playbooks/roles/configure/defaults/main.yml +++ b/playbooks/roles/configure/defaults/main.yml @@ -105,7 +105,7 @@ zowe_keystore_password: password zowe_keyring_alias: ZoweKeyring zowe_keyring_certname: ZoweCert zowe_keyring_external_intermediate_ca: -zowe_keyring_external_root_ca: +zowe_keyring_external_root_ca: brcmso zowe_keystore_alias: localhost zowe_jcllib: zowe_proclib_dsname: auto diff --git a/playbooks/roles/custom_for_test/defaults/main.yml b/playbooks/roles/custom_for_test/defaults/main.yml index 520be87041..9dbd3c90c8 100644 --- a/playbooks/roles/custom_for_test/defaults/main.yml +++ b/playbooks/roles/custom_for_test/defaults/main.yml @@ -105,7 +105,7 @@ zowe_keystore_password: password zowe_keyring_alias: ZoweKeyring zowe_keyring_certname: ZoweCert zowe_keyring_external_intermediate_ca: -zowe_keyring_external_root_ca: +zowe_keyring_external_root_ca: brcmso zowe_keystore_alias: localhost zowe_jcllib: zowe_proclib_dsname: auto From deafa02eb935ae06c974c42ddcfbbaef1a5d2448 Mon Sep 17 00:00:00 2001 From: MarkAckert Date: Wed, 19 Jul 2023 15:47:16 -0400 Subject: [PATCH 057/168] build: workaround keyring jcl RC=4 Signed-off-by: MarkAckert --- playbooks/host_vars/marist-3.yml | 2 ++ playbooks/host_vars/marist-4.yml | 2 ++ 2 files changed, 4 insertions(+) diff --git a/playbooks/host_vars/marist-3.yml b/playbooks/host_vars/marist-3.yml index f14790f987..939bfb5e26 100644 --- a/playbooks/host_vars/marist-3.yml +++ b/playbooks/host_vars/marist-3.yml @@ -4,3 +4,5 @@ zowe_sanity_test_testcases: "./test/**/!(api-doc-gen).js" zowe_apiml_security_x509_enabled: true zowe_apiml_security_oidc_enabled: true zos_zosmf_ca: ZOSMFCA + +zowe_configure_ignore_security_failures: true # Required for keyring tests - only Root cert passed, missing intermediate RC=4 diff --git a/playbooks/host_vars/marist-4.yml b/playbooks/host_vars/marist-4.yml index 68291d8f89..894500deef 100644 --- a/playbooks/host_vars/marist-4.yml +++ b/playbooks/host_vars/marist-4.yml @@ -12,3 +12,5 @@ zowe_install_logs_dir: /ZOWE/logs zowe_smpe_volser: ZOWE03 zowe_caching_vsam_volume: ZOWE03 + +zowe_configure_ignore_security_failures: true # Required for keyring tests - only Root cert passed, missing intermediate RC=4 From 1947d4049e66f694a861341be1eeccce04748a6b Mon Sep 17 00:00:00 2001 From: MarkAckert Date: Wed, 19 Jul 2023 14:39:36 -0400 Subject: [PATCH 058/168] build: update defaults un-setting variable in specific playbook roles Signed-off-by: MarkAckert --- playbooks/roles/configfmid/defaults/main.yml | 2 +- playbooks/roles/configure/defaults/main.yml | 2 +- playbooks/roles/custom_for_test/defaults/main.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/playbooks/roles/configfmid/defaults/main.yml b/playbooks/roles/configfmid/defaults/main.yml index aad0f019e2..65d34fcae1 100644 --- a/playbooks/roles/configfmid/defaults/main.yml +++ b/playbooks/roles/configfmid/defaults/main.yml @@ -104,7 +104,7 @@ zowe_keystore_password: password zowe_keyring_alias: ZoweKeyring zowe_keyring_certname: ZoweCert zowe_keyring_external_intermediate_ca: -zowe_keyring_external_root_ca: +zowe_keyring_external_root_ca: brcmso zowe_keystore_alias: localhost zowe_jcllib: zowe_proclib_dsname: auto diff --git a/playbooks/roles/configure/defaults/main.yml b/playbooks/roles/configure/defaults/main.yml index 37feba2654..5e0cd717d4 100644 --- a/playbooks/roles/configure/defaults/main.yml +++ b/playbooks/roles/configure/defaults/main.yml @@ -105,7 +105,7 @@ zowe_keystore_password: password zowe_keyring_alias: ZoweKeyring zowe_keyring_certname: ZoweCert zowe_keyring_external_intermediate_ca: -zowe_keyring_external_root_ca: +zowe_keyring_external_root_ca: brcmso zowe_keystore_alias: localhost zowe_jcllib: zowe_proclib_dsname: auto diff --git a/playbooks/roles/custom_for_test/defaults/main.yml b/playbooks/roles/custom_for_test/defaults/main.yml index 520be87041..9dbd3c90c8 100644 --- a/playbooks/roles/custom_for_test/defaults/main.yml +++ b/playbooks/roles/custom_for_test/defaults/main.yml @@ -105,7 +105,7 @@ zowe_keystore_password: password zowe_keyring_alias: ZoweKeyring zowe_keyring_certname: ZoweCert zowe_keyring_external_intermediate_ca: -zowe_keyring_external_root_ca: +zowe_keyring_external_root_ca: brcmso zowe_keystore_alias: localhost zowe_jcllib: zowe_proclib_dsname: auto From df5a708d6844710caa431106d5165814b041d21b Mon Sep 17 00:00:00 2001 From: MarkAckert Date: Wed, 19 Jul 2023 15:47:16 -0400 Subject: [PATCH 059/168] build: workaround keyring jcl RC=4 Signed-off-by: MarkAckert --- playbooks/host_vars/marist-3.yml | 2 ++ playbooks/host_vars/marist-4.yml | 2 ++ 2 files changed, 4 insertions(+) diff --git a/playbooks/host_vars/marist-3.yml b/playbooks/host_vars/marist-3.yml index f14790f987..939bfb5e26 100644 --- a/playbooks/host_vars/marist-3.yml +++ b/playbooks/host_vars/marist-3.yml @@ -4,3 +4,5 @@ zowe_sanity_test_testcases: "./test/**/!(api-doc-gen).js" zowe_apiml_security_x509_enabled: true zowe_apiml_security_oidc_enabled: true zos_zosmf_ca: ZOSMFCA + +zowe_configure_ignore_security_failures: true # Required for keyring tests - only Root cert passed, missing intermediate RC=4 diff --git a/playbooks/host_vars/marist-4.yml b/playbooks/host_vars/marist-4.yml index 68291d8f89..894500deef 100644 --- a/playbooks/host_vars/marist-4.yml +++ b/playbooks/host_vars/marist-4.yml @@ -12,3 +12,5 @@ zowe_install_logs_dir: /ZOWE/logs zowe_smpe_volser: ZOWE03 zowe_caching_vsam_volume: ZOWE03 + +zowe_configure_ignore_security_failures: true # Required for keyring tests - only Root cert passed, missing intermediate RC=4 From 2228a99ab5267859cbe46e2dc39fdbee027234f7 Mon Sep 17 00:00:00 2001 From: Martin Zeithaml <66114686+Martin-Zeithaml@users.noreply.github.com> Date: Thu, 20 Jul 2023 10:45:18 +0200 Subject: [PATCH 060/168] Update zwe config validate examples Added new example, where the combination of FILE and PARMLIB is used. Signed-off-by: Martin Zeithaml <66114686+Martin-Zeithaml@users.noreply.github.com> --- bin/commands/config/validate/.examples | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/bin/commands/config/validate/.examples b/bin/commands/config/validate/.examples index 0b694a64b3..dc19d1f17a 100644 --- a/bin/commands/config/validate/.examples +++ b/bin/commands/config/validate/.examples @@ -1,2 +1,3 @@ zwe config validate -c /path/to/zowe.yaml -zwe config validate -c FILE(/customizations/zowe.yaml):FILE(/defaults/zowe.yaml) --all \ No newline at end of file +zwe config validate -c FILE(/customizations/zowe.yaml):FILE(/defaults/zowe.yaml) --all +zwe config validate -c 'FILE(/path/to/zowe.yaml):PARMLIB(ZOWE.PARMLIB(YAML))' From 828c3b42edb06b50d6c0c798b8766e230abbd309 Mon Sep 17 00:00:00 2001 From: Martin Zeithaml <66114686+Martin-Zeithaml@users.noreply.github.com> Date: Thu, 20 Jul 2023 11:47:48 +0200 Subject: [PATCH 061/168] Update example-zowe.yaml Added PARMLIB example. Signed-off-by: Martin Zeithaml <66114686+Martin-Zeithaml@users.noreply.github.com> --- example-zowe.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/example-zowe.yaml b/example-zowe.yaml index 81ae8ec3fa..87f4431229 100644 --- a/example-zowe.yaml +++ b/example-zowe.yaml @@ -293,7 +293,7 @@ zowe: # * schema-backed validation of zowe.yaml # * should greatly improve startup time. # * can supply multiple zowe.yaml as defaults & overrides in the format of - # FILE(/my/customizations.yaml):FILE(/company/customizations.yaml):FILE(/zowe/defaults.yaml) + # FILE(/my/customizations.yaml):PARMLIB(MYORG.ZOWE(YAML)):FILE(/zowe/defaults.yaml) # * allows templating in zowe.yaml by putting references within ${{ }} blocks such as # rewriting the job section below as # job: From c8b4c774ae2111ef3a298912b47caca47233a956 Mon Sep 17 00:00:00 2001 From: James Struga Date: Mon, 24 Jul 2023 10:47:55 -0400 Subject: [PATCH 062/168] Container bug fix for rc3 Signed-off-by: James Struga --- manifest.json.template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/manifest.json.template b/manifest.json.template index f859539bd4..39f96fb79c 100644 --- a/manifest.json.template +++ b/manifest.json.template @@ -14,7 +14,7 @@ "org.zowe.zlux.zlux-core": { "version": "2.10.0-RC", "repository": "libs-snapshot-local", - "artifact": "zlux-core-2.10.0-20230711.194608.pax" + "artifact": "zlux-core-2.10.0-20230724.143701.pax" }, "org.zowe.zlux.sample-angular-app": { "version": "2.10.0-V2.X-RC", @@ -186,7 +186,7 @@ }, { "repository": "zlux-server-framework", - "tag": "v2.10.0-RC1", + "tag": "v2.10.0-RC3", "destinations": ["Zowe PAX"] }, { From 725eddbf5feadafddb6188bf9fa907d06bcef91b Mon Sep 17 00:00:00 2001 From: ojcelis Date: Mon, 24 Jul 2023 11:31:31 -0400 Subject: [PATCH 063/168] Update org.zowe.licenses to the latest version Signed-off-by: ojcelis --- manifest.json.template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.json.template b/manifest.json.template index f859539bd4..f835114339 100644 --- a/manifest.json.template +++ b/manifest.json.template @@ -131,7 +131,7 @@ "version": "2.0.3" }, "org.zowe.licenses": { - "version": "2.9.0", + "version": "2.10.0", "artifact": "zowe_licenses_full.zip" } }, From 9fa0bfea8da990d50ed12e11b71d3bdcc43f60c9 Mon Sep 17 00:00:00 2001 From: James Struga Date: Mon, 24 Jul 2023 17:45:08 -0400 Subject: [PATCH 064/168] update zlux-cote Signed-off-by: James Struga --- manifest.json.template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.json.template b/manifest.json.template index 39f96fb79c..49f807593b 100644 --- a/manifest.json.template +++ b/manifest.json.template @@ -14,7 +14,7 @@ "org.zowe.zlux.zlux-core": { "version": "2.10.0-RC", "repository": "libs-snapshot-local", - "artifact": "zlux-core-2.10.0-20230724.143701.pax" + "artifact": "zlux-core-2.10.0-20230724.213938.pax" }, "org.zowe.zlux.sample-angular-app": { "version": "2.10.0-V2.X-RC", From 5bdce605324a8cf212c2c339487f36e0e32420c3 Mon Sep 17 00:00:00 2001 From: James Struga Date: Tue, 25 Jul 2023 09:17:48 -0400 Subject: [PATCH 065/168] add missing pax Signed-off-by: James Struga --- manifest.json.template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.json.template b/manifest.json.template index 49f807593b..95b0496ec5 100644 --- a/manifest.json.template +++ b/manifest.json.template @@ -14,7 +14,7 @@ "org.zowe.zlux.zlux-core": { "version": "2.10.0-RC", "repository": "libs-snapshot-local", - "artifact": "zlux-core-2.10.0-20230724.213938.pax" + "artifact": "zlux-core-2.10.0-20230725.131652.pax" }, "org.zowe.zlux.sample-angular-app": { "version": "2.10.0-V2.X-RC", From 243596b3022d25cf2b981085f241399e1b8502a7 Mon Sep 17 00:00:00 2001 From: James Struga Date: Tue, 25 Jul 2023 15:06:24 -0400 Subject: [PATCH 066/168] add new container fixes Signed-off-by: James Struga --- manifest.json.template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.json.template b/manifest.json.template index 95b0496ec5..8c6089b449 100644 --- a/manifest.json.template +++ b/manifest.json.template @@ -14,7 +14,7 @@ "org.zowe.zlux.zlux-core": { "version": "2.10.0-RC", "repository": "libs-snapshot-local", - "artifact": "zlux-core-2.10.0-20230725.131652.pax" + "artifact": "zlux-core-2.10.0-20230725.190542.pax" }, "org.zowe.zlux.sample-angular-app": { "version": "2.10.0-V2.X-RC", From 00fab2f27500208e44b703b4fce4c09e88fa3f7f Mon Sep 17 00:00:00 2001 From: James Struga Date: Wed, 26 Jul 2023 08:52:28 -0400 Subject: [PATCH 067/168] Add container fix Signed-off-by: James Struga --- manifest.json.template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.json.template b/manifest.json.template index db78e5c521..1f4e997e72 100644 --- a/manifest.json.template +++ b/manifest.json.template @@ -14,7 +14,7 @@ "org.zowe.zlux.zlux-core": { "version": "2.10.0-RC", "repository": "libs-snapshot-local", - "artifact": "zlux-core-2.10.0-20230725.190542.pax" + "artifact": "zlux-core-2.10.0-20230726.125125.pax" }, "org.zowe.zlux.sample-angular-app": { "version": "2.10.0-V2.X-RC", From 1183d54c385e0b896f3dc5909faf2d6e0d3fa5b9 Mon Sep 17 00:00:00 2001 From: James Struga Date: Thu, 27 Jul 2023 09:09:03 -0400 Subject: [PATCH 068/168] New zlux-build Signed-off-by: James Struga --- manifest.json.template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.json.template b/manifest.json.template index 1f4e997e72..59d5b13440 100644 --- a/manifest.json.template +++ b/manifest.json.template @@ -14,7 +14,7 @@ "org.zowe.zlux.zlux-core": { "version": "2.10.0-RC", "repository": "libs-snapshot-local", - "artifact": "zlux-core-2.10.0-20230726.125125.pax" + "artifact": "zlux-core-2.10.0-20230727.130803.pax" }, "org.zowe.zlux.sample-angular-app": { "version": "2.10.0-V2.X-RC", From 7b939b251e2d264824eef749d2d223c94608adab Mon Sep 17 00:00:00 2001 From: MarkAckert Date: Thu, 27 Jul 2023 12:11:05 -0400 Subject: [PATCH 069/168] build: revert manifest to earlier point for v2.10.0 Signed-off-by: MarkAckert --- manifest.json.template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.json.template b/manifest.json.template index 59d5b13440..6a8cbe7165 100644 --- a/manifest.json.template +++ b/manifest.json.template @@ -14,7 +14,7 @@ "org.zowe.zlux.zlux-core": { "version": "2.10.0-RC", "repository": "libs-snapshot-local", - "artifact": "zlux-core-2.10.0-20230727.130803.pax" + "artifact": "zlux-core-2.10.0-20230724.143701.pax" }, "org.zowe.zlux.sample-angular-app": { "version": "2.10.0-V2.X-RC", From 33e58f4e90d9137f4104b7e52a7c3f96f1307adb Mon Sep 17 00:00:00 2001 From: ojcelis Date: Thu, 27 Jul 2023 14:09:59 -0400 Subject: [PATCH 070/168] revert back zlux changes Signed-off-by: ojcelis --- manifest.json.template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.json.template b/manifest.json.template index 6a8cbe7165..1f4e997e72 100644 --- a/manifest.json.template +++ b/manifest.json.template @@ -14,7 +14,7 @@ "org.zowe.zlux.zlux-core": { "version": "2.10.0-RC", "repository": "libs-snapshot-local", - "artifact": "zlux-core-2.10.0-20230724.143701.pax" + "artifact": "zlux-core-2.10.0-20230726.125125.pax" }, "org.zowe.zlux.sample-angular-app": { "version": "2.10.0-V2.X-RC", From e8aed8ce5a926ea0e9b9f39b48b3039a2c3ff8f3 Mon Sep 17 00:00:00 2001 From: zowe-robot Date: Fri, 28 Jul 2023 01:08:59 +0000 Subject: [PATCH 071/168] Promote PTF after release v2.10.0 Signed-off-by: zowe-robot --- smpe/bld/service/promoted-apar.txt | 3 ++ smpe/bld/service/promoted-close.txt | 45 +++++++++++++++++++++++++++++ smpe/bld/service/promoted-hold.txt | 25 ++++++++++++++++ smpe/bld/service/promoted-ptf.txt | 2 ++ smpe/bld/service/ptf-bucket.txt | 2 +- 5 files changed, 76 insertions(+), 1 deletion(-) diff --git a/smpe/bld/service/promoted-apar.txt b/smpe/bld/service/promoted-apar.txt index ba5ef97143..6ca8f40fd6 100644 --- a/smpe/bld/service/promoted-apar.txt +++ b/smpe/bld/service/promoted-apar.txt @@ -1,3 +1,6 @@ +IO29185 +IO29186 +IO29187 IO29182 IO29183 IO29184 diff --git a/smpe/bld/service/promoted-close.txt b/smpe/bld/service/promoted-close.txt index 146d7ab471..e6cdaaabd2 100644 --- a/smpe/bld/service/promoted-close.txt +++ b/smpe/bld/service/promoted-close.txt @@ -1,3 +1,48 @@ + IO29185 - + PROBLEM SUMMARY: + **************************************************************** + * USERS AFFECTED: All Zowe users * + **************************************************************** + * PROBLEM DESCRIPTION: Update Zowe FMID AZWE002 to match the * + * community release * + **************************************************************** + * RECOMMENDATION: Apply provided service * + **************************************************************** + The Zowe community version was updated to 2.10.0. + This PTF provides the community changes in SMP/E format. + Follow this link for more details on the community changes: + https://docs.zowe.org/stable/ + + IO29186 - + PROBLEM SUMMARY: + **************************************************************** + * USERS AFFECTED: All Zowe users * + **************************************************************** + * PROBLEM DESCRIPTION: Update Zowe FMID AZWE002 to match the * + * community release * + **************************************************************** + * RECOMMENDATION: Apply provided service * + **************************************************************** + The Zowe community version was updated to 2.10.0. + This PTF provides the community changes in SMP/E format. + Follow this link for more details on the community changes: + https://docs.zowe.org/stable/ + + IO29187 - + PROBLEM SUMMARY: + **************************************************************** + * USERS AFFECTED: All Zowe users * + **************************************************************** + * PROBLEM DESCRIPTION: Update Zowe FMID AZWE002 to match the * + * community release * + **************************************************************** + * RECOMMENDATION: Apply provided service * + **************************************************************** + The Zowe community version was updated to 2.10.0. + This PTF provides the community changes in SMP/E format. + Follow this link for more details on the community changes: + https://docs.zowe.org/stable/ + IO29182 - PROBLEM SUMMARY: **************************************************************** diff --git a/smpe/bld/service/promoted-hold.txt b/smpe/bld/service/promoted-hold.txt index 3cb9be11af..30c27af2ab 100644 --- a/smpe/bld/service/promoted-hold.txt +++ b/smpe/bld/service/promoted-hold.txt @@ -1,3 +1,28 @@ +++HOLD(UO90022) SYSTEM FMID(AZWE002) REASON(ACTION) DATE(23208) + COMMENT( + **************************************************************** + * Affected function: Zowe servers * + **************************************************************** + * Description: stop servers * + **************************************************************** + * Timing: pre-APPLY * + **************************************************************** + * Part: ZWESLSTC and ZWESISTC * + **************************************************************** + Stop the Zowe servers before installing this update. + + **************************************************************** + * Affected function: Zowe servers * + **************************************************************** + * Description: start servers * + **************************************************************** + * Timing: post-APPLY * + **************************************************************** + * Part: ZWESLSTC and ZWESISTC * + **************************************************************** + Start the Zowe servers after installing this update. + + ). ++HOLD(UO90020) SYSTEM FMID(AZWE002) REASON(ACTION) DATE(23164) COMMENT( **************************************************************** diff --git a/smpe/bld/service/promoted-ptf.txt b/smpe/bld/service/promoted-ptf.txt index c1fb4a105e..0e26b90913 100644 --- a/smpe/bld/service/promoted-ptf.txt +++ b/smpe/bld/service/promoted-ptf.txt @@ -1,3 +1,5 @@ +UO90022 +UO90023 UO90020 UO90021 UO90018 diff --git a/smpe/bld/service/ptf-bucket.txt b/smpe/bld/service/ptf-bucket.txt index 1d52c1da24..97c4ba5123 100644 --- a/smpe/bld/service/ptf-bucket.txt +++ b/smpe/bld/service/ptf-bucket.txt @@ -16,4 +16,4 @@ #UO02066 UO02067 - IO29092 IO29093 IO29094 - Thu Mar 16 00:39:46 UTC 2023 v2r7 #UO90018 UO90019 - IO29174 IO29175 IO29176 - Wed Apr 26 22:58:46 UTC 2023 #UO90020 UO90021 - IO29182 IO29183 IO29184 - Tue Jun 13 21:20:27 UTC 2023 -UO90022 UO90023 - IO29185 IO29186 IO29187 \ No newline at end of file +#UO90022 UO90023 - IO29185 IO29186 IO29187 - Fri Jul 28 01:08:59 UTC 2023 \ No newline at end of file From 13b224223004c66e70bb3656a8d03a3a2f2206e6 Mon Sep 17 00:00:00 2001 From: ojcelis Date: Thu, 27 Jul 2023 21:48:26 -0400 Subject: [PATCH 072/168] update next version Signed-off-by: ojcelis --- manifest.json.template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.json.template b/manifest.json.template index 311cd3cc53..b02a93740a 100644 --- a/manifest.json.template +++ b/manifest.json.template @@ -1,6 +1,6 @@ { "name": "Zowe", - "version": "2.10.0", + "version": "2.11.0", "description": "Zowe is an open source project created to host technologies that benefit the Z platform from all members of the Z community (Integrated Software Vendors, System Integrators and z/OS consumers). Zowe, like Mac or Windows, comes with a set of APIs and OS capabilities that applications build on and also includes some applications out of the box. Zowe offers modern interfaces to interact with z/OS and allows you to work with z/OS in a way that is similar to what you experience on cloud platforms today. You can use these interfaces as delivered or through plug-ins and extensions that are created by clients or third-party vendors.", "license": "EPL-2.0", "homepage": "https://zowe.org", From 7d334a42dfcca0dfbe90fe199d0b9ffdf542f3e6 Mon Sep 17 00:00:00 2001 From: 1000TurquoisePogs Date: Fri, 28 Jul 2023 19:33:36 +0000 Subject: [PATCH 073/168] Allow bypassing version check of zOS (#3535) * Update zowe-yaml-schema.json Signed-off-by: 1000TurquoisePogs * linking all involved prs Signed-off-by: 1000TurquoisePogs * Update manifest.json.template Signed-off-by: 1000TurquoisePogs * Update zowe-yaml-schema.json Signed-off-by: 1000TurquoisePogs --------- Signed-off-by: 1000TurquoisePogs --- schemas/zowe-yaml-schema.json | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/schemas/zowe-yaml-schema.json b/schemas/zowe-yaml-schema.json index 52b6dcb0df..6733775837 100644 --- a/schemas/zowe-yaml-schema.json +++ b/schemas/zowe-yaml-schema.json @@ -475,6 +475,11 @@ "description": "Determines which SHAREAS mode should be used when starting a component", "enum": ["no", "yes", "must", ""], "default": "yes" + }, + "unsafeDisableZosVersionCheck": { + "type": "boolean", + "description": "Used to allow Zowe to warn, instead of error, when running on a version of zOS that this version of Zowe hasn't been verified as working with", + "default": false } } }, From 0ef7a08d0b7aed814f47df8aec5b93e79e34522a Mon Sep 17 00:00:00 2001 From: ojcelis Date: Fri, 28 Jul 2023 16:19:24 -0400 Subject: [PATCH 074/168] update ptf bucket for new PTF numbers Signed-off-by: ojcelis --- smpe/bld/service/ptf-bucket.txt | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/smpe/bld/service/ptf-bucket.txt b/smpe/bld/service/ptf-bucket.txt index 97c4ba5123..10917e71c8 100644 --- a/smpe/bld/service/ptf-bucket.txt +++ b/smpe/bld/service/ptf-bucket.txt @@ -16,4 +16,6 @@ #UO02066 UO02067 - IO29092 IO29093 IO29094 - Thu Mar 16 00:39:46 UTC 2023 v2r7 #UO90018 UO90019 - IO29174 IO29175 IO29176 - Wed Apr 26 22:58:46 UTC 2023 #UO90020 UO90021 - IO29182 IO29183 IO29184 - Tue Jun 13 21:20:27 UTC 2023 -#UO90022 UO90023 - IO29185 IO29186 IO29187 - Fri Jul 28 01:08:59 UTC 2023 \ No newline at end of file +#UO90022 UO90023 - IO29185 IO29186 IO29187 - Fri Jul 28 01:08:59 UTC 2023 +UO90031 UO90032 - IO29286 IO29287 IO29288 +UO90033 UO90034 - IO29289 IO29290 IO29291 \ No newline at end of file From cdcd061c72b9b5435d92bf1213efbfee76b95f61 Mon Sep 17 00:00:00 2001 From: 1000TurquoisePogs Date: Mon, 31 Jul 2023 12:54:02 +0000 Subject: [PATCH 075/168] Applied keystore flags to keep keystore compat with all components (#3507) * Applied keystore flags to keep keystore compat with all components Signed-off-by: 1000TurquoisePogs * Update CHANGELOG.md Signed-off-by: 1000TurquoisePogs * Update certificate.sh Add flags to keyring-to-keystore import process Signed-off-by: 1000TurquoisePogs --------- Signed-off-by: 1000TurquoisePogs --- CHANGELOG.md | 5 ++++ bin/libs/certificate.sh | 46 ++++++++++++++++++++++++------- bin/libs/java.sh | 29 ++++++++++++++++++++ bin/libs/java.ts | 60 +++++++++++++++++++++++++++++++++++++++++ 4 files changed, 130 insertions(+), 10 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1faf469baf..ff076a4ab8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,11 @@ All notable changes to the Zowe Installer will be documented in this file. +## `2.11.0` + +### Minor enhancements/defect fixes +- Bugfix: Fixed that Zowe would allow newer Java versions to generate PKCS12 keystores that was not compatible with some components. Newer versions of Java by default create PKCS12 keystores that aren't compatible with GSK / SystemSSL which components such as ZSS use, but include flags to restore a compatibility mode, which Zowe now uses. (#3507) + ## `2.10.0` ### New features and enhancements diff --git a/bin/libs/certificate.sh b/bin/libs/certificate.sh index 40fa4e44aa..d323d4f25a 100644 --- a/bin/libs/certificate.sh +++ b/bin/libs/certificate.sh @@ -199,6 +199,8 @@ pkcs12_create_certificate_authority() { password="${3}" common_name=${4:-${ZWE_PRIVATE_DEFAULT_CERTIFICATE_CA_COMMON_NAME}} + flags=$(get_java_pkcs12_keystore_flag) + print_message ">>>> Generate PKCS12 format local CA with alias ${alias}:" mkdir -p "${keystore_dir}/${alias}" result=$(pkeytool -genkeypair -v \ @@ -210,6 +212,7 @@ pkcs12_create_certificate_authority() { -storepass "${password}" \ -storetype "PKCS12" \ -validity "${ZWE_PRIVATE_CERTIFICATE_CA_VALIDITY:-${ZWE_PRIVATE_DEFAULT_CERTIFICATE_CA_VALIDITY}}" \ + ${flags} \ -ext KeyUsage="keyCertSign" \ -ext BasicConstraints:"critical=ca:true") if [ $? -ne 0 ]; then @@ -231,9 +234,14 @@ pkcs12_create_certificate_and_sign() { ca_alias=${7} ca_password=${8} + print_message ">>>> Generate certificate \"${alias}\" in the keystore ${keystore_name}:" + + flags=$(get_java_pkcs12_keystore_flag) + mkdir -p "${keystore_dir}/${keystore_name}" result=$(pkeytool -genkeypair -v \ + ${flags} \ -alias "${alias}" \ -keyalg RSA -keysize 2048 \ -keystore "${keystore_dir}/${keystore_name}/${keystore_name}.keystore.p12" \ @@ -251,7 +259,8 @@ pkcs12_create_certificate_and_sign() { fi print_message ">>>> Generate CSR for the certificate \"${alias}\" in the keystore \"${keystore_name}\":" - result=$(pkeytool -certreq -v \ + result=$(pkeytool ${flags} \ + -certreq -v \ -alias "${alias}" \ -keystore "${keystore_dir}/${keystore_name}/${keystore_name}.keystore.p12" \ -storepass "${password}" \ @@ -279,7 +288,8 @@ pkcs12_create_certificate_and_sign() { san="${san}dns:localhost.localdomain,dns:localhost,ip:127.0.0.1" print_message ">>>> Sign the CSR using the Certificate Authority \"${ca_alias}\":" - result=$(pkeytool -gencert -v \ + result=$(pkeytool ${flags} \ + -gencert -v \ -infile "${keystore_dir}/${keystore_name}/${alias}.csr" \ -outfile "${keystore_dir}/${keystore_name}/${alias}.signed.cer" \ -keystore "${keystore_dir}/${ca_alias}/${ca_alias}.keystore.p12" \ @@ -315,7 +325,8 @@ pkcs12_create_certificate_and_sign() { >/dev/null 2>/dev/null if [ "$?" != "0" ]; then print_message ">>>> Import the Certificate Authority \"${ca_alias}\" to the keystore \"${keystore_name}\":" - result=$(pkeytool -importcert -v \ + result=$(pkeytool ${flags} \ + -importcert -v \ -trustcacerts -noprompt \ -file "${ca_cert_file}" \ -alias "${ca_alias}" \ @@ -333,7 +344,8 @@ pkcs12_create_certificate_and_sign() { >/dev/null 2>/dev/null if [ "$?" != "0" ]; then print_message ">>>> Import the Certificate Authority \"${ca_alias}\" to the truststore \"${keystore_name}\":" - result=$(pkeytool -importcert -v \ + result=$(pkeytool ${flags} \ + -importcert -v \ -trustcacerts -noprompt \ -file "${ca_cert_file}" \ -alias "${ca_alias}" \ @@ -348,7 +360,8 @@ pkcs12_create_certificate_and_sign() { fi print_message ">>>> Import the signed CSR to the keystore \"${keystore_name}\":" - result=$(pkeytool -importcert -v \ + result=$(pkeytool ${flags} \ + -importcert -v \ -trustcacerts -noprompt \ -file "${keystore_dir}/${keystore_name}/${alias}.signed.cer" \ -alias "${alias}" \ @@ -464,7 +477,10 @@ pkcs12_import_pkcs12_keystore() { return 1 fi - result=$(pkeytool -importkeystore -v \ + flags=$(get_java_pkcs12_keystore_flag) + + result=$(pkeytool ${flags} \ + -importkeystore -v \ -noprompt \ -deststoretype "PKCS12" \ -destkeystore "${dest_keystore}" \ @@ -492,12 +508,15 @@ pkcs12_import_certificates() { ca_files="${3}" alias="${4:-extca}" + flags=$(get_java_pkcs12_keystore_flag) + ca_index=1 while read -r ca_file; do ca_file=$(echo "${ca_file}" | trim) if [ -n "${ca_file}" ]; then print_message ">>>> Import \"${ca_file}\" to the keystore \"${dest_keystore}\":" - result=$(pkeytool -importcert -v \ + result=$(pkeytool ${flags} \ + -importcert -v \ -trustcacerts -noprompt \ -file "${ca_file}" \ -alias "${alias}${ca_index}" \ @@ -549,6 +568,8 @@ pkcs12_trust_service() { return 1 fi + flags=$(get_java_pkcs12_keystore_flag) + # parse keytool output into separate files csplit -s -k -f "${keystore_dir}/${keystore_name}/${service_alias}" "${tmp_file}" /-----END\ CERTIFICATE-----/1 \ {$(expr `grep -c -e '-----END CERTIFICATE-----' "${tmp_file}"` - 1)} @@ -557,7 +578,8 @@ pkcs12_trust_service() { cert_file=$(basename "${cert}") cert_alias=${cert_file%.cer} echo ">>>> Import a certificate \"${cert_alias}\" to the truststore:" - result=$(pkeytool -importcert -v \ + result=$(pkeytool ${flags} \ + -importcert -v \ -trustcacerts \ -noprompt \ -file "${cert}" \ @@ -1165,10 +1187,13 @@ keyring_export_to_pkcs12() { print_debug ">>>> Export certificate \"${label}\" from safkeyring:////${keyring_owner}/${keyring_name} to PKCS#12 keystore ${keystore_file}" + flags=$(get_java_pkcs12_keystore_flag) + # create keystore if it doesn't exist if [ -f "${keystore_file}" ]; then print_debug "- Create keystore with dummy certificate ${dummy_cert}" - result=$(pkeytool -genkeypair \ + result=$(pkeytool ${flags} \ + -genkeypair \ -alias "${dummy_cert}" \ -dname "CN=Zowe Dummy Cert, OU=ZWELS, O=Zowe, C=US" \ -keystore "${keystore_file}" \ @@ -1204,7 +1229,8 @@ keyring_export_to_pkcs12() { if [ "${cert_only}" = "true" ]; then # use keytool to import certificate print_debug "- Import certificate into keystore as \"${label}\"" - result=$(pkeytool -import -v \ + result=$(pkeytool ${flags} \ + -import -v \ -trustcacerts -noprompt \ -alias "${label}" \ -file "${uss_temp_target}.cer" \ diff --git a/bin/libs/java.sh b/bin/libs/java.sh index 1db7f3b154..3bf49d3329 100644 --- a/bin/libs/java.sh +++ b/bin/libs/java.sh @@ -132,3 +132,32 @@ validate_java_home() { print_debug "Java check is successful." } + +get_java_pkcs12_keystore_flag() { + java_version=$("${JAVA_HOME}/bin/java" -version 2>&1) # Capture stderr to stdout, so we can print below if error + + + # As we know the java -version command works then strip out the line we need + java_version_short=$(echo "${java_version}" | grep ^"java version" | sed -e "s/java version //g"| sed -e "s/\"//g") + if [[ $java_version_short == "" ]]; then + java_version_short=$(echo "${java_version}" | grep ^"openjdk version" | sed -e "s/openjdk version //g"| sed -e "s/\"//g") + fi + java_major_version=$(echo "${java_version_short}" | cut -d '.' -f 1) + java_minor_version=$(echo "${java_version_short}" | cut -d '.' -f 2) + java_fix_version=$(echo "${java_version_short}" | cut -d '_' -f 2) + + if [ ${java_major_version} -eq 1 -a ${java_minor_version} -eq 8 ]; then + if [ ${java_fix_version} -lt 341 ]; then + printf " " + elif [ ${java_fix_version} -lt 361 ]; then + printf " -J-Dkeystore.pkcs12.certProtectionAlgorithm=PBEWithSHAAnd40BitRC2 -J-Dkeystore.pkcs12.certPbeIterationCount=50000 -J-Dkeystore.pkcs12.keyProtectionAlgorithm=PBEWithSHAAnd3KeyTripleDES -J-Dkeystore.pkcs12.keyPbeIterationCount=50000 " + else + printf " -J-Dkeystore.pkcs12.legacy " + fi + elif [ ${java_major_version} -eq 1 -a ${java_minor_version} -gt 8 ]; then + printf " -J-Dkeystore.pkcs12.legacy " + else + printf " " + fi +} + diff --git a/bin/libs/java.ts b/bin/libs/java.ts index c729d1b245..a2a67e55ca 100644 --- a/bin/libs/java.ts +++ b/bin/libs/java.ts @@ -138,3 +138,63 @@ export function validateJavaHome(javaHome:string|undefined=std.getenv("JAVA_HOME return false; } } + +export function getJavaPkcs12KeystoreFlag(javaHome:string|undefined=std.getenv("JAVA_HOME")): string { + if (!javaHome) { + common.printError("Cannot find java. Please define JAVA_HOME environment variable."); + return ' '; + } + if (!fs.fileExists(fs.resolvePath(javaHome,`/bin/java`))) { + common.printError(`JAVA_HOME: ${javaHome}/bin does not point to a valid install of Java.`); + return ' '; + } + + let execReturn = shell.execErrSync(fs.resolvePath(javaHome,`/bin/java`), `-version`); + const version = execReturn.err; + if (execReturn.rc != 0) { + common.printError(`Java version check failed with return code: ${execReturn.rc}: ${version}`); + return ' '; + } + + try { + let index = 0; + let javaVersionShort; + let versionLines = (version as string).split('\n'); // valid because of above rc check + for (let i = 0; i < versionLines.length; i++) { + if ((index = versionLines[i].indexOf('java version')) != -1) { + //format of: java version "1.8.0_321" + javaVersionShort=versionLines[i].substring(index+('java version'.length)+2, versionLines[i].length-1); + break; + } else if ((index = versionLines[i].indexOf('openjdk version')) != -1) { + javaVersionShort=versionLines[i].substring(index+('openjdk version'.length)+2, versionLines[i].length-1); + break; + } + } + if (!javaVersionShort){ + common.printError("could not find java version"); + return ' '; + } + let versionParts = javaVersionShort.split('.'); + const javaMajorVersion=Number(versionParts[0]); + const javaMinorVersion=Number(versionParts[1]); + let fixParts = javaVersionShort.split('_'); + const javaFixVersion=Number(fixParts[1]); + + if (javaMajorVersion == 1 && javaMinorVersion == 8) { + if (javaFixVersion < 341) { + return ' '; + } else if (javaFixVersion < 361) { + return " -J-Dkeystore.pkcs12.certProtectionAlgorithm=PBEWithSHAAnd40BitRC2 -J-Dkeystore.pkcs12.certPbeIterationCount=50000 -J-Dkeystore.pkcs12.keyProtectionAlgorithm=PBEWithSHAAnd3KeyTripleDES -J-Dkeystore.pkcs12.keyPbeIterationCount=50000 " + } else { + return " -J-Dkeystore.pkcs12.legacy "; + } + } else if (javaMajorVersion == 1 && javaMinorVersion > 8) { + return " -J-Dkeystore.pkcs12.legacy "; + } else { + return ' '; + } + + } catch (e) { + return ' '; + } +} From 04d025a49818aed75e918729584f18d89c90d1e8 Mon Sep 17 00:00:00 2001 From: James Struga Date: Fri, 4 Aug 2023 10:36:27 -0400 Subject: [PATCH 076/168] Container fix for app-server Signed-off-by: James Struga --- manifest.json.template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.json.template b/manifest.json.template index 1f4e997e72..613b30a6bf 100644 --- a/manifest.json.template +++ b/manifest.json.template @@ -14,7 +14,7 @@ "org.zowe.zlux.zlux-core": { "version": "2.10.0-RC", "repository": "libs-snapshot-local", - "artifact": "zlux-core-2.10.0-20230726.125125.pax" + "artifact": "zlux-core-2.10.0-20230804.143132.pax" }, "org.zowe.zlux.sample-angular-app": { "version": "2.10.0-V2.X-RC", From 1270f0d19f92d2e8346ec822bf41fc3b0409194b Mon Sep 17 00:00:00 2001 From: Martin Zeithaml <66114686+Martin-Zeithaml@users.noreply.github.com> Date: Wed, 9 Aug 2023 17:31:59 +0200 Subject: [PATCH 077/168] Small typo fix (#3545) Signed-off-by: Martin Zeithaml --- bin/libs/config.ts | 18 +++++++++--------- bin/libs/sys.sh | 14 +++++++------- bin/libs/sys.ts | 8 ++++---- 3 files changed, 20 insertions(+), 20 deletions(-) diff --git a/bin/libs/config.ts b/bin/libs/config.ts index 0c78c7ada4..d1cafe5771 100644 --- a/bin/libs/config.ts +++ b/bin/libs/config.ts @@ -95,7 +95,7 @@ export function generateInstanceEnvFromYamlConfig(haInstance: string) { } // delete old files to avoid potential issues - common.printFormattedTrace( "ZWELS", "bin/libs/config.sh,generate_instance_env_from_yaml_config", `deleting old files under ${zwePrivateWorkspaceEnvDir}`); + common.printFormattedTrace( "ZWELS", "bin/libs/config.ts,generate_instance_env_from_yaml_config", `deleting old files under ${zwePrivateWorkspaceEnvDir}`); let foundFiles = fs.getFilesInDirectory(zwePrivateWorkspaceEnvDir); if (foundFiles) { foundFiles.forEach((file:string)=> { @@ -111,12 +111,12 @@ export function generateInstanceEnvFromYamlConfig(haInstance: string) { //TODO use configmgr to write json and ha json, and components json // prepare .zowe.json and .zowe-.json - common.printFormattedTrace("ZWELS", "bin/libs/config.sh,generate_instance_env_from_yaml_config", `config-converter yaml convert --ha ${haInstance} ${cliParameterConfig}`); + common.printFormattedTrace("ZWELS", "bin/libs/config.ts,generate_instance_env_from_yaml_config", `config-converter yaml convert --ha ${haInstance} ${cliParameterConfig}`); let result = shell.execOutSync('node', `${runtimeDirectory}/bin/utils/config-converter/src/cli.js`, `yaml`, `convert`, `--wd`, zwePrivateWorkspaceEnvDir, `--ha`, haInstance, cliParameterConfig, `--verbose`); - common.printFormattedTrace("ZWELS", "bin/libs/config.sh,generate_instance_env_from_yaml_config", `- Exit code: ${result.rc}: ${result.out}`); + common.printFormattedTrace("ZWELS", "bin/libs/config.ts,generate_instance_env_from_yaml_config", `- Exit code: ${result.rc}: ${result.out}`); if ( !fs.fileExists(`${zwePrivateWorkspaceEnvDir}/.zowe.json`)) { - common.printFormattedError( "ZWELS", "bin/libs/config.sh,generate_instance_env_from_yaml_config", `ZWEL0140E: Failed to translate Zowe configuration (${cliParameterConfig}).`); + common.printFormattedError( "ZWELS", "bin/libs/config.ts,generate_instance_env_from_yaml_config", `ZWEL0140E: Failed to translate Zowe configuration (${cliParameterConfig}).`); std.exit(140); } @@ -126,9 +126,9 @@ export function generateInstanceEnvFromYamlConfig(haInstance: string) { // convert YAML configurations to backward compatible .instance-.env files - common.printFormattedTrace("ZWELS", "bin/libs/config.sh,generate_instance_env_from_yaml_config", `config-converter yaml env --ha ${haInstance}`); + common.printFormattedTrace("ZWELS", "bin/libs/config.ts,generate_instance_env_from_yaml_config", `config-converter yaml env --ha ${haInstance}`); const envs = configmgr.getZoweConfigEnv(haInstance); - common.printFormattedTrace("ZWELS", "bin/libs/config.sh,generate_instance_env_from_yaml_config", `- Output: ${JSON.stringify(envs, null, 2)}`); + common.printFormattedTrace("ZWELS", "bin/libs/config.ts,generate_instance_env_from_yaml_config", `- Output: ${JSON.stringify(envs, null, 2)}`); const envKeys = Object.keys(envs); let envFileArray=[]; @@ -145,7 +145,7 @@ export function generateInstanceEnvFromYamlConfig(haInstance: string) { let rc = fs.mkdirp(folderName, 0o700); if (rc) { //TODO error code - common.printFormattedError("ZWELS", "bin/libs/config.sh,generate_instance_env_from_yaml_config", `Failed to make env var folder for component=${currentComponent}`); + common.printFormattedError("ZWELS", "bin/libs/config.ts,generate_instance_env_from_yaml_config", `Failed to make env var folder for component=${currentComponent}`); } let componentFileArray = []; componentFileArray.push('#!/bin/sh'); @@ -194,7 +194,7 @@ export function generateInstanceEnvFromYamlConfig(haInstance: string) { const componentFileContent = componentFileArray.join('\n'); rc = xplatform.storeFileUTF8(`${folderName}/.instance-${haInstance}.env`, xplatform.AUTO_DETECT, componentFileContent); if (rc) { - common.printFormattedError("ZWELS", "bin/libs/config.sh,generate_instance_env_from_yaml_config", `ZWEL0140E: Failed to translate Zowe configuration (${cliParameterConfig}).`); + common.printFormattedError("ZWELS", "bin/libs/config.ts,generate_instance_env_from_yaml_config", `ZWEL0140E: Failed to translate Zowe configuration (${cliParameterConfig}).`); std.exit(140); return; } @@ -203,7 +203,7 @@ export function generateInstanceEnvFromYamlConfig(haInstance: string) { let envFileContent = envFileArray.join('\n'); let rc = xplatform.storeFileUTF8(`${zwePrivateWorkspaceEnvDir}/.instance-${haInstance}.env`, xplatform.AUTO_DETECT, envFileContent); if (rc) { - common.printFormattedError("ZWELS", "bin/libs/config.sh,generate_instance_env_from_yaml_config", `ZWEL0140E: Failed to translate Zowe configuration (${cliParameterConfig}).`); + common.printFormattedError("ZWELS", "bin/libs/config.ts,generate_instance_env_from_yaml_config", `ZWEL0140E: Failed to translate Zowe configuration (${cliParameterConfig}).`); std.exit(140); return; } diff --git a/bin/libs/sys.sh b/bin/libs/sys.sh index d76fce6193..9ef7659654 100644 --- a/bin/libs/sys.sh +++ b/bin/libs/sys.sh @@ -112,7 +112,7 @@ find_all_child_processes() { wait_for_process_exit() { pid="${1}" - print_formatted_debug "ZWELS" "sys-utils.sh,wait_for_process_exit:${LINENO}" "waiting for process $pid to exit" + print_formatted_debug "ZWELS" "sys.sh,wait_for_process_exit:${LINENO}" "waiting for process $pid to exit" iterator_index=0 max_iterator_index=30 @@ -123,13 +123,13 @@ wait_for_process_exit() { found=$(ps -p ${pid} -o pid 2>/dev/null | tail -n +2) done if [ -n "${found}" ]; then - print_formatted_debug "ZWELS" "sys-utils.sh,wait_for_process_exit:${LINENO}" "process $pid does NOT exit before timeout" + print_formatted_debug "ZWELS" "sys.sh,wait_for_process_exit:${LINENO}" "process $pid does NOT exit before timeout" return 1 elif [ ${iterator_index} -eq 0 ]; then - print_formatted_debug "ZWELS" "sys-utils.sh,wait_for_process_exit:${LINENO}" "process $pid does NOT exist or already exited" + print_formatted_debug "ZWELS" "sys.sh,wait_for_process_exit:${LINENO}" "process $pid does NOT exist or already exited" return 0 else - print_formatted_debug "ZWELS" "sys-utils.sh,wait_for_process_exit:${LINENO}" "process $pid exited gracefully" + print_formatted_debug "ZWELS" "sys.sh,wait_for_process_exit:${LINENO}" "process $pid exited gracefully" return 0 fi } @@ -145,16 +145,16 @@ wait_for_process_exit() { gracefully_shutdown() { pid=${1:-${ZWE_GRACEFULLY_SHUTDOWN_PID:-1}} - print_formatted_debug "ZWELS" "sys-utils.sh,gracefully_shutdown:${LINENO}" "SIGTERM signal received, shutting down process ${pid} and all child processes" + print_formatted_debug "ZWELS" "sys.sh,gracefully_shutdown:${LINENO}" "SIGTERM signal received, shutting down process ${pid} and all child processes" if [ -n "${pid}" ]; then children=$(find_all_child_processes $pid) - print_formatted_debug "ZWELS" "sys-utils.sh,gracefully_shutdown:${LINENO}" "propagate SIGTERM to all children: ${children}" + print_formatted_debug "ZWELS" "sys.sh,gracefully_shutdown:${LINENO}" "propagate SIGTERM to all children: ${children}" # send SIGTERM to all children kill -15 ${children} 2>/dev/null for pid in ${children}; do wait_for_process_exit $pid done - print_formatted_debug "ZWELS" "sys-utils.sh,gracefully_shutdown:${LINENO}" "all child processes exited" + print_formatted_debug "ZWELS" "sys.sh,gracefully_shutdown:${LINENO}" "all child processes exited" fi exit 0 diff --git a/bin/libs/sys.ts b/bin/libs/sys.ts index 06ace6bd10..a54902fe32 100644 --- a/bin/libs/sys.ts +++ b/bin/libs/sys.ts @@ -114,10 +114,10 @@ export function waitForProcessExit(pid: number): boolean { } if (shellReturn.rc == 0) { - common.printFormattedDebug("ZWELS", "sys-utils.sh,wait_for_process_exit:", `process ${pid} does NOT exit before timeout`); + common.printFormattedDebug("ZWELS", "sys.ts,wait_for_process_exit:", `process ${pid} does NOT exit before timeout`); return false; } else { - common.printFormattedDebug("ZWELS", "sys-utils.sh,wait_for_process_exit:", `process ${pid} no longer exists`); + common.printFormattedDebug("ZWELS", "sys.ts,wait_for_process_exit:", `process ${pid} no longer exists`); return true; } } @@ -138,14 +138,14 @@ export function gracefullyShutdown(pid?: number): boolean { } if (pid >= 1) { let children = findAllChildProcesses(pid); - common.printFormattedDebug("ZWELS", "sys-utils.sh,gracefully_shutdown", "SIGTERM signal received, shutting down process ${pid} and all child processes"); + common.printFormattedDebug("ZWELS", "sys.ts,gracefully_shutdown", "SIGTERM signal received, shutting down process ${pid} and all child processes"); // send SIGTERM to all children os.kill(pid, 15); children.forEach((pid:number)=>{ waitForProcessExit(pid); }); - common.printFormattedDebug("ZWELS", "sys-utils.sh,gracefully_shutdown", "all child processes exited"); + common.printFormattedDebug("ZWELS", "sys.ts,gracefully_shutdown", "all child processes exited"); return true; } return false; From eee59f941d20f8f0f786d1ff9a9c6fbb717fc69a Mon Sep 17 00:00:00 2001 From: Martin Zeithaml <66114686+Martin-Zeithaml@users.noreply.github.com> Date: Mon, 14 Aug 2023 14:08:07 +0200 Subject: [PATCH 078/168] Update CHANGELOG.md Signed-off-by: Martin Zeithaml <66114686+Martin-Zeithaml@users.noreply.github.com> --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 9c3e578c66..5240362e2c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,7 +3,7 @@ All notable changes to the Zowe Installer will be documented in this file. -## `2.10.0` +## `2.11.0` #### Minor enhancements/defect fixes - `zowe-yaml-schema.json` validates unix directory path as `server-common#zowePath` From 24f06e539016c35f9c738ece1bc46b3c80f6c3f4 Mon Sep 17 00:00:00 2001 From: ojcelis Date: Mon, 14 Aug 2023 15:47:57 -0400 Subject: [PATCH 079/168] update node version 14, 16 & 18 Signed-off-by: ojcelis --- .github/workflows/cicd-test.yml | 4 ++-- .pax/pre-packaging.sh | 2 +- .../src/__tests__/extended/node-versions/node-v14.ts | 2 +- .../src/__tests__/extended/node-versions/node-v16.ts | 2 +- .../src/__tests__/extended/node-versions/node-v18.ts | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/cicd-test.yml b/.github/workflows/cicd-test.yml index 8f96a23a5f..4c4ea7b1d2 100644 --- a/.github/workflows/cicd-test.yml +++ b/.github/workflows/cicd-test.yml @@ -63,8 +63,8 @@ env: DEFAULT_ZOWE_EXT_ARTIFACTORY_PATTERN: libs-snapshot-local/org/zowe/{ext-name}/*/{ext-name}-*.pax # below block can be overwritten, adjusted by DevOps only - # ZOS_NODE_VERSION more to choose from: v14.21.3, v16.19.1 - ZOS_NODE_VERSION: v14.21.3 + # ZOS_NODE_VERSION more to choose from: v14.21.3.1, v16.20.1 + ZOS_NODE_VERSION: v14.21.3.1 CLIENT_NODE_VERSION: v12.18.3 INSTALL_TEST_DEBUG_INFORMATION: zowe-install-test:* SANITY_TEST_DEBUG_INFORMATION: zowe-sanity-test:* diff --git a/.pax/pre-packaging.sh b/.pax/pre-packaging.sh index eccbd2d66a..236a3d2595 100755 --- a/.pax/pre-packaging.sh +++ b/.pax/pre-packaging.sh @@ -147,7 +147,7 @@ SCRIPT_NAME=$(basename "$0") # $0=./pre-packaging.sh BASE_DIR=$(cd $(dirname "$0"); pwd) # /.pax # use node v14 to build -export NODE_HOME=/ZOWE/node/node-v14.21.3-os390-s390x +export NODE_HOME=/ZOWE/node/node-v14.21.3.1-os390-s390x-202306302026 ZOWE_ROOT_DIR="${BASE_DIR}/content" diff --git a/tests/installation/src/__tests__/extended/node-versions/node-v14.ts b/tests/installation/src/__tests__/extended/node-versions/node-v14.ts index 0889466a2c..16356e8161 100644 --- a/tests/installation/src/__tests__/extended/node-versions/node-v14.ts +++ b/tests/installation/src/__tests__/extended/node-versions/node-v14.ts @@ -32,7 +32,7 @@ describe(testSuiteName, () => { { 'zowe_build_local': process.env['ZOWE_BUILD_LOCAL'], 'zowe_custom_for_test': 'true', - 'zos_node_home': '/ZOWE/node/node-v14.21.3-os390-s390x', + 'zos_node_home': '/ZOWE/node/node-v14.21.3.1-os390-s390x-202306302026', 'zowe_lock_keystore': 'false', } ); diff --git a/tests/installation/src/__tests__/extended/node-versions/node-v16.ts b/tests/installation/src/__tests__/extended/node-versions/node-v16.ts index 65823a2179..37a5851b62 100644 --- a/tests/installation/src/__tests__/extended/node-versions/node-v16.ts +++ b/tests/installation/src/__tests__/extended/node-versions/node-v16.ts @@ -32,7 +32,7 @@ describe(testSuiteName, () => { { 'zowe_build_local': process.env['ZOWE_BUILD_LOCAL'], 'zowe_custom_for_test': 'true', - 'zos_node_home': '/ZOWE/node/node-v16.19.1-os390-s390x', + 'zos_node_home': '/ZOWE/node/node-v16.20.1-os390-s390x-202307241558', 'zowe_lock_keystore': 'false', } ); diff --git a/tests/installation/src/__tests__/extended/node-versions/node-v18.ts b/tests/installation/src/__tests__/extended/node-versions/node-v18.ts index e0c7cbb5d0..f44632a305 100644 --- a/tests/installation/src/__tests__/extended/node-versions/node-v18.ts +++ b/tests/installation/src/__tests__/extended/node-versions/node-v18.ts @@ -33,7 +33,7 @@ describe(testSuiteName, () => { { 'zowe_build_local': process.env['ZOWE_BUILD_LOCAL'], 'zowe_custom_for_test': 'true', - 'zos_node_home': '/ZOWE/node/node-v18.14.2', + 'zos_node_home': '/ZOWE/node/node-v18.16.0', 'zowe_lock_keystore': 'false', } ); From 96f3e8fb752b7169a86487c6412e6e963a593a39 Mon Sep 17 00:00:00 2001 From: ojcelis Date: Tue, 15 Aug 2023 10:53:47 -0400 Subject: [PATCH 080/168] update node directory Signed-off-by: ojcelis --- .pax/pre-packaging.sh | 2 +- .../src/__tests__/extended/node-versions/node-v14.ts | 2 +- .../src/__tests__/extended/node-versions/node-v16.ts | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.pax/pre-packaging.sh b/.pax/pre-packaging.sh index 236a3d2595..819d4818ea 100755 --- a/.pax/pre-packaging.sh +++ b/.pax/pre-packaging.sh @@ -147,7 +147,7 @@ SCRIPT_NAME=$(basename "$0") # $0=./pre-packaging.sh BASE_DIR=$(cd $(dirname "$0"); pwd) # /.pax # use node v14 to build -export NODE_HOME=/ZOWE/node/node-v14.21.3.1-os390-s390x-202306302026 +export NODE_HOME=/ZOWE/node/node-v14.21.3.1-os390-s390x ZOWE_ROOT_DIR="${BASE_DIR}/content" diff --git a/tests/installation/src/__tests__/extended/node-versions/node-v14.ts b/tests/installation/src/__tests__/extended/node-versions/node-v14.ts index 16356e8161..00d47e38ab 100644 --- a/tests/installation/src/__tests__/extended/node-versions/node-v14.ts +++ b/tests/installation/src/__tests__/extended/node-versions/node-v14.ts @@ -32,7 +32,7 @@ describe(testSuiteName, () => { { 'zowe_build_local': process.env['ZOWE_BUILD_LOCAL'], 'zowe_custom_for_test': 'true', - 'zos_node_home': '/ZOWE/node/node-v14.21.3.1-os390-s390x-202306302026', + 'zos_node_home': '/ZOWE/node/node-v14.21.3.1-os390-s390x', 'zowe_lock_keystore': 'false', } ); diff --git a/tests/installation/src/__tests__/extended/node-versions/node-v16.ts b/tests/installation/src/__tests__/extended/node-versions/node-v16.ts index 37a5851b62..bebbbdb660 100644 --- a/tests/installation/src/__tests__/extended/node-versions/node-v16.ts +++ b/tests/installation/src/__tests__/extended/node-versions/node-v16.ts @@ -32,7 +32,7 @@ describe(testSuiteName, () => { { 'zowe_build_local': process.env['ZOWE_BUILD_LOCAL'], 'zowe_custom_for_test': 'true', - 'zos_node_home': '/ZOWE/node/node-v16.20.1-os390-s390x-202307241558', + 'zos_node_home': '/ZOWE/node/node-v16.20.1-os390-s390x', 'zowe_lock_keystore': 'false', } ); From 788ae859b0cedbe8ca4e1549222179bdaf974a0d Mon Sep 17 00:00:00 2001 From: Amanda D'Errico Date: Tue, 29 Aug 2023 10:23:37 -0400 Subject: [PATCH 081/168] bump explorer apis 2.11 RC1 Signed-off-by: Amanda D'Errico --- manifest.json.template | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/manifest.json.template b/manifest.json.template index 613b30a6bf..20f5b68343 100644 --- a/manifest.json.template +++ b/manifest.json.template @@ -52,11 +52,11 @@ "artifact": "zss-2.10.0-rc-921-20230712132442.pax" }, "org.zowe.explorer.jobs.jobs-api-package": { - "version": "2.0.18", + "version": "2.0.19", "artifact": "jobs-api-package-*.zip" }, "org.zowe.explorer.files.files-api-package": { - "version": "2.0.18", + "version": "2.0.19", "artifact": "files-api-package-*.zip" }, "org.zowe.explorer-jes": { @@ -296,21 +296,21 @@ "componentGroup": "Zowe Explorer Common REST Server", "entries": [{ "repository": "explorer-api-common", - "tag": "2.0.22", + "tag": "2.0.23", "destinations": ["Zowe PAX"] }] }, { "componentGroup": "Zowe Explorer Data Sets REST Server", "entries": [{ "repository": "data-sets", - "tag": "2.0.18", + "tag": "2.0.19", "destinations": ["Zowe PAX"] }] }, { "componentGroup": "Zowe Explorer Jobs REST Server", "entries": [{ "repository": "jobs", - "tag": "2.0.18", + "tag": "2.0.19", "destinations": ["Zowe PAX"] }] }, @@ -461,12 +461,12 @@ "files-api": { "registry": "zowe-docker-release.jfrog.io", "name": "ompzowe/files-api", - "tag" : "2.0.18-ubuntu" + "tag" : "2.0.19-ubuntu" }, "jobs-api": { "registry": "zowe-docker-release.jfrog.io", "name": "ompzowe/jobs-api", - "tag" : "2.0.18-ubuntu" + "tag" : "2.0.19-ubuntu" }, "base": { "registry": "zowe-docker-release.jfrog.io", From 15f2d1a5474e4732c1aa5577e167c4cfcb6046b8 Mon Sep 17 00:00:00 2001 From: achmelo Date: Tue, 29 Aug 2023 16:54:27 +0200 Subject: [PATCH 082/168] apiml rc1 Signed-off-by: achmelo --- manifest.json.template | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/manifest.json.template b/manifest.json.template index 613b30a6bf..81b4500390 100644 --- a/manifest.json.template +++ b/manifest.json.template @@ -73,27 +73,27 @@ "artifact": "explorer-ip*.pax" }, "org.zowe.apiml.api-catalog-package": { - "version": "2.10.6", + "version": "2.11.0", "artifact": "api-catalog*.zip" }, "org.zowe.apiml.discovery-package": { - "version": "2.10.6", + "version": "2.11.0", "artifact": "discovery*.zip" }, "org.zowe.apiml.gateway-package": { - "version": "2.10.6", + "version": "2.11.0", "artifact": "gateway*.zip" }, "org.zowe.apiml.caching-service-package": { - "version": "2.10.6", + "version": "2.11.0", "artifact": "caching-service*.zip" }, "org.zowe.apiml.metrics-service-package": { - "version": "2.10.6", + "version": "2.11.0", "artifact": "metrics-service*.zip" }, "org.zowe.apiml.apiml-common-lib-package": { - "version": "2.10.6", + "version": "2.11.0", "artifact": "apiml-common-lib-*.zip" }, "org.zowe.apiml.sdk.common-java-lib-package": { @@ -101,11 +101,11 @@ "artifact": "common-java-lib-*.zip" }, "org.zowe.apiml.sdk.apiml-sample-extension-package": { - "version": "2.10.6", + "version": "2.11.0", "artifact": "apiml-sample-extension-*.zip" }, "org.zowe.apiml.cloud-gateway-package": { - "version": "2.10.6", + "version": "2.11.0", "artifact": "cloud-gateway-*.zip" }, "org.zowe.configmgr-rexx": { @@ -411,23 +411,23 @@ "api-catalog": { "registry": "zowe-docker-release.jfrog.io", "name": "ompzowe/api-catalog-services", - "tag" : "2.10.6-ubuntu" + "tag" : "2.11.0-ubuntu" }, "caching": { "registry": "zowe-docker-release.jfrog.io", "name": "ompzowe/caching-service", - "tag" : "2.10.6-ubuntu" + "tag" : "2.11.0-ubuntu" }, "discovery": { "kind": "statefulset", "registry": "zowe-docker-release.jfrog.io", "name": "ompzowe/discovery-service", - "tag" : "2.10.6-ubuntu" + "tag" : "2.11.0-ubuntu" }, "gateway": { "registry": "zowe-docker-release.jfrog.io", "name": "ompzowe/gateway-service", - "tag" : "2.10.6-ubuntu" + "tag" : "2.11.0-ubuntu" }, "app-server": { "registry": "zowe-docker-release.jfrog.io", From fc860e2778a98bde7ad48b184b7b17adbb939e89 Mon Sep 17 00:00:00 2001 From: 1000TurquoisePogs Date: Tue, 29 Aug 2023 14:23:37 -0500 Subject: [PATCH 083/168] Duplicate log messages into syslog according to zowe.sysMessages (#3553) * Add zowe.sysMessages to schema Signed-off-by: 1000TurquoisePogs * Added missing comma + CHANGELOG Signed-off-by: Leanid Astrakou * Remove empty sysMessages from example-zowe.yaml Signed-off-by: Leanid Astrakou * Added some message ID examples Signed-off-by: Leanid Astrakou --------- Signed-off-by: 1000TurquoisePogs Signed-off-by: Leanid Astrakou Co-authored-by: Leanid Astrakou --- CHANGELOG.md | 5 ++++- example-zowe.yaml | 28 ++++++++++++++++++++++++++++ schemas/zowe-yaml-schema.json | 10 +++++++++- 3 files changed, 41 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index b1455e9f14..4892c37682 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,8 +5,11 @@ All notable changes to the Zowe Installer will be documented in this file. ## `2.11.0` +### New features and enhancements +- Enhancement: Duplicate log messages into syslog according to "zowe.sysMessages" array [#93](https://github.com/zowe/launcher/pull/93) + #### Minor enhancements/defect fixes -- `zowe-yaml-schema.json` validates unix directory path as `server-common#zowePath` +- Bugfix: `zowe-yaml-schema.json` validates unix directory path as `server-common#zowePath` - Bugfix: Fixed that Zowe would allow newer Java versions to generate PKCS12 keystores that was not compatible with some components. Newer versions of Java by default create PKCS12 keystores that aren't compatible with GSK / SystemSSL which components such as ZSS use, but include flags to restore a compatibility mode, which Zowe now uses. (#3507) ## `2.10.0` diff --git a/example-zowe.yaml b/example-zowe.yaml index 87f4431229..e82479c0dd 100644 --- a/example-zowe.yaml +++ b/example-zowe.yaml @@ -350,6 +350,34 @@ zowe: # ZWED_SSH_PORT: 22 # ZWED_TN3270_PORT: 23 + # >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> + # You can define any Zowe message portions to be checked for and the whole message added to the system log + sysMessages: + # # Zowe starting + - "ZWEL0021I" + # # Zowe started + - "ZWEL0018I" + - "ZWEL0006I" + # # Zowe ready to use + - "ZWES1601I" + # # Zowe stopping + - "ZWEL0008I" + # # Zowe stopped + - "ZWEL0022I" + # # Zowe components starting + - "ZWEL0001I" + # # Zowe components stopped + - "ZWEL0002I" + # # API ML components ready + - "ZWEAM000I" + # # App server ready + - "ZWED0031I" + # # ZSS ready + - "ZWES1013I" + + # # Not limited to Zowe message ID's + # - "ERROR" + # >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> # Enable debug mode for zowe launch scripts launchScript: diff --git a/schemas/zowe-yaml-schema.json b/schemas/zowe-yaml-schema.json index 11fb594460..39db90e8f5 100644 --- a/schemas/zowe-yaml-schema.json +++ b/schemas/zowe-yaml-schema.json @@ -478,7 +478,7 @@ }, "unsafeDisableZosVersionCheck": { "type": "boolean", - "description": "Used to allow Zowe to warn, instead of error, when running on a version of zOS that this version of Zowe hasn't been verified as working with", + "description": "Used to allow Zowe to warn, instead of error, when running on a version of z/OS that this version of Zowe hasn't been verified as working with", "default": false } } @@ -534,6 +534,14 @@ "description": "Customize how Zowe should validate certificates used by components or other services.", "enum": ["STRICT", "NONSTRICT", "DISABLED"] }, + "sysMessages": { + "type": "array", + "description": "List of Zowe message portions when matched will be additionally logged into the system's log (such as syslog on z/OS). Note: Some messages extremely early in the Zowe lifecycle may not be added to the system's log", + "uniqueItems": true, + "items": { + "type": "string" + } + }, "useConfigmgr": { "type": "boolean", "default": false, From d6f274d5a8e2d0902b02a91cf001923f20588291 Mon Sep 17 00:00:00 2001 From: James Struga Date: Wed, 30 Aug 2023 13:10:45 -0400 Subject: [PATCH 084/168] webUI PR for 2.11 Signed-off-by: James Struga --- manifest.json.template | 76 +++++++++++++++++++++--------------------- 1 file changed, 38 insertions(+), 38 deletions(-) diff --git a/manifest.json.template b/manifest.json.template index 613b30a6bf..b3397cf59c 100644 --- a/manifest.json.template +++ b/manifest.json.template @@ -1,6 +1,6 @@ { "name": "Zowe", - "version": "2.10.0", + "version": "2.11.0", "description": "Zowe is an open source project created to host technologies that benefit the Z platform from all members of the Z community (Integrated Software Vendors, System Integrators and z/OS consumers). Zowe, like Mac or Windows, comes with a set of APIs and OS capabilities that applications build on and also includes some applications out of the box. Zowe offers modern interfaces to interact with z/OS and allows you to work with z/OS in a way that is similar to what you experience on cloud platforms today. You can use these interfaces as delivered or through plug-ins and extensions that are created by clients or third-party vendors.", "license": "EPL-2.0", "homepage": "https://zowe.org", @@ -12,44 +12,44 @@ }, "binaryDependencies": { "org.zowe.zlux.zlux-core": { - "version": "2.10.0-RC", + "version": "2.11.0-RC", "repository": "libs-snapshot-local", - "artifact": "zlux-core-2.10.0-20230804.143132.pax" + "artifact": "zlux-core-2.11.0-20230830.130147.pax" }, "org.zowe.zlux.sample-angular-app": { - "version": "2.10.0-V2.X-RC", + "version": "2.11.0-V2.X-RC", "repository": "libs-snapshot-local", - "artifact": "sample-angular-app-2.10.0-20230711.193337.pax" + "artifact": "sample-angular-app-2.11.0-20230829.202745.pax" }, "org.zowe.zlux.sample-iframe-app": { - "version": "2.10.0-V2.X-RC", + "version": "2.11.0-V2.X-RC", "repository": "libs-snapshot-local", - "artifact": "sample-iframe-app-2.10.0-20230711.193057.pax" + "artifact": "sample-iframe-app-2.11.0-20230829.202533.pax" }, "org.zowe.zlux.sample-react-app": { - "version": "2.10.0-V2.X-RC", + "version": "2.11.0-V2.X-RC", "repository": "libs-snapshot-local", - "artifact": "sample-react-app-2.10.0-20230711.193314.pax" + "artifact": "sample-react-app-2.11.0-20230829.202650.pax" }, "org.zowe.zlux.tn3270-ng2": { - "version": "2.10.0-V2.X-RC", + "version": "2.11.0-V2.X-RC", "repository": "libs-snapshot-local", - "artifact": "tn3270-ng2-2.10.0-20230711.193249.pax" + "artifact": "tn3270-ng2-2.11.0-20230830.125742.pax" }, "org.zowe.zlux.vt-ng2": { - "version": "2.10.0-V2.X-RC", + "version": "2.11.0-V2.X-RC", "repository": "libs-snapshot-local", - "artifact": "vt-ng2-2.10.0-20230711.193229.pax" + "artifact": "vt-ng2-2.11.0-20230829.202549.pax" }, "org.zowe.zlux.zlux-editor": { - "version": "2.10.0-V2.X-RC", + "version": "2.11.0-V2.X-RC", "repository": "libs-snapshot-local", - "artifact": "zlux-editor-2.10.0-20230711.193530.pax" + "artifact": "zlux-editor-2.11.0-20230829.202844.pax" }, "org.zowe.zss": { - "version": "2.10.0-RC", + "version": "2.11.0-RC", "repository": "libs-snapshot-local", - "artifact": "zss-2.10.0-rc-921-20230712132442.pax" + "artifact": "zss-2.11.0-rc-965-20230830170742.pax" }, "org.zowe.explorer.jobs.jobs-api-package": { "version": "2.0.18", @@ -109,17 +109,17 @@ "artifact": "cloud-gateway-*.zip" }, "org.zowe.configmgr-rexx": { - "version": "2.10.0-V2.X-RC", + "version": "2.11.0-V2.X-RC", "repository": "libs-snapshot-local", - "artifact": "configmgr-rexx-2.10.0-2023071214.pax" + "artifact": "configmgr-rexx-2.11.0-2023082950.pax" }, "org.zowe.configmgr": { - "version": "2.10.0-V2.X-RC", + "version": "2.11.0-V2.X-RC", "repository": "libs-snapshot-local", - "artifact": "configmgr-2.10.0-2023071212.pax" + "artifact": "configmgr-2.11.0-2023082956.pax" }, "org.zowe.launcher": { - "version": "2.0.12" + "version": "2.0.13" }, "org.zowe.keyring-utilities": { "version": "1.0.4", @@ -161,12 +161,12 @@ "componentGroup": "Zowe Application Framework", "entries": [{ "repository": "zlux-app-manager", - "tag": "v2.10.0-RC1", + "tag": "v2.11.0-RC1", "destinations": ["Zowe PAX"] }, { "repository": "zlux-app-server", - "tag": "v2.10.0-RC1", + "tag": "v2.11.0-RC1", "destinations": ["Zowe PAX"] }, { @@ -181,17 +181,17 @@ }, { "repository": "zlux-platform", - "tag": "v2.10.0-RC1", + "tag": "v2.11.0-RC1", "destinations": ["Zowe PAX"] }, { "repository": "zlux-server-framework", - "tag": "v2.10.0-RC3", + "tag": "v2.11.0-RC1", "destinations": ["Zowe PAX"] }, { "repository": "zlux-shared", - "tag": "v2.10.0-RC1", + "tag": "v2.11.0-RC1", "destinations": ["Zowe PAX"] }, { @@ -201,17 +201,17 @@ }, { "repository": "zlux-build", - "tag": "v2.10.0-RC1", + "tag": "v2.11.0-RC1", "destinations": ["Zowe PAX"] }, { "repository": "zss", - "tag": "v2.10.0-RC1", + "tag": "v2.11.0-RC1", "destinations": ["Zowe PAX"] }, { "repository": "zowe-common-c", - "tag": "zss-v2.10.0-RC1", + "tag": "zss-v2.11.0-RC1", "destinations": ["Zowe PAX"] } ] @@ -318,14 +318,14 @@ "componentGroup": "Zowe Desktop TN3270 Emulator Plug-in", "entries": [{ "repository": "tn3270-ng2", - "tag": "v2.10.0-RC1", + "tag": "v2.11.0-RC1", "destinations": ["Zowe PAX"] }] }, { "componentGroup": "Zowe Desktop Sample Angular Application", "entries": [{ "repository": "sample-angular-app", - "tag": "v2.10.0-RC1", + "tag": "v2.11.0-RC1", "destinations": ["Zowe PAX"] }] }, @@ -333,7 +333,7 @@ "componentGroup": "Zowe Desktop Sample iFrame Application", "entries": [{ "repository": "sample-iframe-app", - "tag": "v2.10.0-RC1", + "tag": "v2.11.0-RC1", "destinations": ["Zowe PAX"] }] }, @@ -341,7 +341,7 @@ "componentGroup": "Zowe Desktop Sample React Application", "entries": [{ "repository": "sample-react-app", - "tag": "v2.10.0-RC1", + "tag": "v2.11.0-RC1", "destinations": ["Zowe PAX"] }] }, @@ -349,7 +349,7 @@ "componentGroup": "Zowe Desktop VT Emulator Plugin-in", "entries": [{ "repository": "vt-ng2", - "tag": "v2.10.0-RC1", + "tag": "v2.11.0-RC1", "destinations": ["Zowe PAX"] }] }, @@ -357,7 +357,7 @@ "componentGroup": "Zowe Desktop Editor Plugin-in", "entries": [{ "repository": "zlux-editor", - "tag": "v2.10.0-RC1", + "tag": "v2.11.0-RC1", "destinations": ["Zowe PAX"] }] }, @@ -397,7 +397,7 @@ "componentGroup": "Configmgr", "entries": [{ "repository": "zowe-common-c", - "tag": "configmgr-v2.10.0-RC1", + "tag": "configmgr-v2.11.0-RC1", "destinations": ["Zowe PAX"] }] } @@ -432,7 +432,7 @@ "app-server": { "registry": "zowe-docker-release.jfrog.io", "name": "ompzowe/app-server", - "tag" : "2.10.0-ubuntu" + "tag" : "2.11.0-ubuntu" }, "explorer-ip": { "kind": "job", From 1b5e4bee155e2a12e0e8100271451ebb839db5ad Mon Sep 17 00:00:00 2001 From: Trae Yelovich Date: Wed, 30 Aug 2023 14:53:20 -0400 Subject: [PATCH 085/168] Update CLI component versions for Zowe 2.11.0 Signed-off-by: Trae Yelovich --- manifest.json.template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/manifest.json.template b/manifest.json.template index 20f5b68343..aa7f6bfe9f 100644 --- a/manifest.json.template +++ b/manifest.json.template @@ -140,7 +140,7 @@ "componentGroup": "Imperative CLI Framework for Zowe", "entries": [{ "repository": "imperative", - "tag": "v5.15.1", + "tag": "v5.18.1", "destinations": ["Zowe CLI Package"] }] }, { @@ -219,7 +219,7 @@ "componentGroup": "Zowe CLI", "entries": [{ "repository": "zowe-cli", - "tag": "v7.16.6", + "tag": "v7.18.3", "destinations": ["Zowe CLI Package"] }] }, { From 01705aa961eb4a3b649020647ca139eeac808a00 Mon Sep 17 00:00:00 2001 From: ojcelis Date: Wed, 30 Aug 2023 17:12:44 -0400 Subject: [PATCH 086/168] Overwrite manifest file with manifest from rc branch Signed-off-by: ojcelis --- manifest.json.template | 314 +++++++++++++++++++++-------------------- 1 file changed, 160 insertions(+), 154 deletions(-) diff --git a/manifest.json.template b/manifest.json.template index b02a93740a..cacecdfe72 100644 --- a/manifest.json.template +++ b/manifest.json.template @@ -12,128 +12,126 @@ }, "binaryDependencies": { "org.zowe.zlux.zlux-core": { - "version": "^2.0.0-V2.X-STAGING-ZLUX-CORE", - "artifact": "*.pax" + "version": "2.10.0-RC", + "repository": "libs-snapshot-local", + "artifact": "zlux-core-2.10.0-20230804.143132.pax" }, "org.zowe.zlux.sample-angular-app": { - "version": "^2.0.0-V2.X-STAGING", - "artifact": "*.pax" + "version": "2.10.0-V2.X-RC", + "repository": "libs-snapshot-local", + "artifact": "sample-angular-app-2.10.0-20230711.193337.pax" }, "org.zowe.zlux.sample-iframe-app": { - "version": "^2.0.0-V2.X-STAGING", - "artifact": "*.pax" + "version": "2.10.0-V2.X-RC", + "repository": "libs-snapshot-local", + "artifact": "sample-iframe-app-2.10.0-20230711.193057.pax" }, "org.zowe.zlux.sample-react-app": { - "version": "^2.0.0-V2.X-STAGING", - "artifact": "*.pax" + "version": "2.10.0-V2.X-RC", + "repository": "libs-snapshot-local", + "artifact": "sample-react-app-2.10.0-20230711.193314.pax" }, "org.zowe.zlux.tn3270-ng2": { - "version": "^2.0.0-V2.X-STAGING", - "artifact": "*.pax" + "version": "2.10.0-V2.X-RC", + "repository": "libs-snapshot-local", + "artifact": "tn3270-ng2-2.10.0-20230711.193249.pax" }, "org.zowe.zlux.vt-ng2": { - "version": "^2.0.0-V2.X-STAGING", - "artifact": "*.pax" + "version": "2.10.0-V2.X-RC", + "repository": "libs-snapshot-local", + "artifact": "vt-ng2-2.10.0-20230711.193229.pax" }, "org.zowe.zlux.zlux-editor": { - "version": "^2.0.0-V2.X-STAGING", - "artifact": "*.pax" + "version": "2.10.0-V2.X-RC", + "repository": "libs-snapshot-local", + "artifact": "zlux-editor-2.10.0-20230711.193530.pax" }, "org.zowe.zss": { - "version": "^2.0.0-STAGING", - "artifact": "*.pax" + "version": "2.10.0-RC", + "repository": "libs-snapshot-local", + "artifact": "zss-2.10.0-rc-921-20230712132442.pax" }, "org.zowe.explorer.jobs.jobs-api-package": { - "version": "^2.0.7-SNAPSHOT", - "artifact": "jobs-api-package-*.zip", - "exclusions": ["*PR*.zip","*BRANCH*"] + "version": "2.0.19", + "artifact": "jobs-api-package-*.zip" }, "org.zowe.explorer.files.files-api-package": { - "version": "^2.0.7-SNAPSHOT", - "artifact": "files-api-package-*.zip", - "exclusions": ["*PR*.zip","*BRANCH*"] + "version": "2.0.19", + "artifact": "files-api-package-*.zip" }, "org.zowe.explorer-jes": { - "version": "~2.0.2-SNAPSHOT" + "version": "2.0.7" }, "org.zowe.explorer-mvs": { - "version": "~2.0.2-SNAPSHOT" + "version": "2.0.7" }, "org.zowe.explorer-uss": { - "version": "~2.0.2-SNAPSHOT" + "version": "2.0.7" }, "org.zowe.explorer-ip": { - "version": "~2.0.0-SNAPSHOT", - "artifact": "*.pax" + "version": "2.0.0", + "artifact": "explorer-ip*.pax" }, "org.zowe.apiml.api-catalog-package": { - "version": "^2.1.1-SNAPSHOT", - "artifact": "api-catalog-*.zip", - "exclusions": ["*PR*.zip"] + "version": "2.10.6", + "artifact": "api-catalog*.zip" }, "org.zowe.apiml.discovery-package": { - "version": "^2.1.1-SNAPSHOT", - "artifact": "discovery-*.zip", - "exclusions": ["*PR*.zip"] + "version": "2.10.6", + "artifact": "discovery*.zip" }, "org.zowe.apiml.gateway-package": { - "version": "^2.1.1-SNAPSHOT", - "artifact": "gateway-*.zip", - "exclusions": ["*PR*.zip"] + "version": "2.10.6", + "artifact": "gateway*.zip" }, "org.zowe.apiml.caching-service-package": { - "version": "^2.1.1-SNAPSHOT", - "artifact": "caching-service-*.zip", - "exclusions": ["*PR*.zip"] + "version": "2.10.6", + "artifact": "caching-service*.zip" }, "org.zowe.apiml.metrics-service-package": { - "version": "^2.1.1-SNAPSHOT", - "artifact": "metrics-service-*.zip", - "exclusions": ["*PR*.zip"] + "version": "2.10.6", + "artifact": "metrics-service*.zip" }, "org.zowe.apiml.apiml-common-lib-package": { - "version": "^2.1.1-SNAPSHOT", - "artifact": "apiml-common-lib-*.zip", - "exclusions": ["*PR*.zip"] + "version": "2.10.6", + "artifact": "apiml-common-lib-*.zip" }, "org.zowe.apiml.sdk.common-java-lib-package": { - "version": "~2.0.0-SNAPSHOT", - "artifact": "common-java-lib-*.zip", - "exclusions": ["*PR*.zip"] + "version": "2.0.0", + "artifact": "common-java-lib-*.zip" }, "org.zowe.apiml.sdk.apiml-sample-extension-package": { - "version": "^2.1.1-SNAPSHOT", - "artifact": "apiml-sample-extension-*.zip", - "exclusions": ["*PR*.zip"] + "version": "2.10.6", + "artifact": "apiml-sample-extension-*.zip" }, "org.zowe.apiml.cloud-gateway-package": { - "version": "^2.4.4-SNAPSHOT", - "artifact": "cloud-gateway-*.zip", - "exclusions": ["*PR*.zip"] - }, - "org.zowe.configmgr": { - "version": "^2.0.0-V2.X-STAGING", - "artifact": "*.pax" + "version": "2.10.6", + "artifact": "cloud-gateway-*.zip" }, "org.zowe.configmgr-rexx": { - "version": "^2.0.0-V2.X-STAGING", - "artifact": "*.pax" + "version": "2.10.0-V2.X-RC", + "repository": "libs-snapshot-local", + "artifact": "configmgr-rexx-2.10.0-2023071214.pax" + }, + "org.zowe.configmgr": { + "version": "2.10.0-V2.X-RC", + "repository": "libs-snapshot-local", + "artifact": "configmgr-2.10.0-2023071212.pax" }, "org.zowe.launcher": { - "version": "^2.0.0-SNAPSHOT" + "version": "2.0.12" }, "org.zowe.keyring-utilities": { "version": "1.0.4", - "artifact": "keyring-util-*", + "artifact": "keyring-util-1.0.4", "explode": "false", - "flat": "true", - "exclusions": ["*PR*"] + "flat": "true" }, "org.zowe.utility-tools": { - "version": "~2.0.0-SNAPSHOT" + "version": "2.0.3" }, "org.zowe.licenses": { - "version": "2.3.0", + "version": "2.10.0", "artifact": "zowe_licenses_full.zip" } }, @@ -142,78 +140,78 @@ "componentGroup": "Imperative CLI Framework for Zowe", "entries": [{ "repository": "imperative", - "tag": "master", + "tag": "v5.15.1", "destinations": ["Zowe CLI Package"] }] }, { "componentGroup": "Zowe API Mediation Layer", "entries": [{ "repository": "api-layer", - "tag": "v2.x.x", + "tag": "v2.9.1", "destinations": ["Zowe PAX"] }] }, { "componentGroup": "Zowe common java libraries", "entries": [{ "repository": "common-java", - "tag": "v2.x.x", + "tag": "v1.21.3", "destinations": ["Zowe PAX"] }] }, { "componentGroup": "Zowe Application Framework", "entries": [{ "repository": "zlux-app-manager", - "tag": "v2.x/staging", + "tag": "v2.10.0-RC1", "destinations": ["Zowe PAX"] }, { "repository": "zlux-app-server", - "tag": "v2.x/staging", + "tag": "v2.10.0-RC1", "destinations": ["Zowe PAX"] }, { "repository": "zlux-file-explorer", - "tag": "v2.x/staging", + "tag": "v1.6.0-RC1", "destinations": ["Zowe PAX"] }, { "repository": "zlux-grid", - "tag": "v1.x/master", + "tag": "v0.0.6", "destinations": ["Zowe PAX"] }, { "repository": "zlux-platform", - "tag": "v2.x/staging", + "tag": "v2.10.0-RC1", "destinations": ["Zowe PAX"] }, { "repository": "zlux-server-framework", - "tag": "v2.x/staging", + "tag": "v2.10.0-RC3", "destinations": ["Zowe PAX"] }, { "repository": "zlux-shared", - "tag": "v2.x/staging", + "tag": "v2.10.0-RC1", "destinations": ["Zowe PAX"] }, { "repository": "zlux-widgets", - "tag": "v1.x/master", + "tag": "v0.0.4", "destinations": ["Zowe PAX"] }, { "repository": "zlux-build", - "tag": "v2.x/staging", + "tag": "v2.10.0-RC1", "destinations": ["Zowe PAX"] }, { "repository": "zss", - "tag": "v2.x/staging", + "tag": "v2.10.0-RC1", "destinations": ["Zowe PAX"] }, { "repository": "zowe-common-c", - "tag": "v2.x/staging", + "tag": "zss-v2.10.0-RC1", "destinations": ["Zowe PAX"] } ] @@ -221,98 +219,98 @@ "componentGroup": "Zowe CLI", "entries": [{ "repository": "zowe-cli", - "tag": "master", + "tag": "v7.16.6", "destinations": ["Zowe CLI Package"] }] }, { "componentGroup": "IBM® CICS® Plug-in for Zowe CLI", "entries": [{ "repository": "zowe-cli-cics-plugin", - "tag": "master", + "tag": "v5.0.1", "destinations": ["Zowe CLI Package"] }] }, { "componentGroup": "IBM® Db2® Plug-in for Zowe CLI", "entries": [{ "repository": "zowe-cli-db2-plugin", - "tag": "master", + "tag": "v5.0.3", "destinations": ["Zowe CLI Package"] }] }, { "componentGroup": "Performance Timing Utility", "entries": [{ "repository": "perf-timing", - "tag": "master", + "tag": "v1.0.7", "destinations": ["Zowe CLI Package"] }] }, { "componentGroup": "IBM® MQ Plug-in for Zowe CLI", "entries": [{ "repository": "zowe-cli-mq-plugin", - "tag": "master", + "tag": "v3.0.1", "destinations": ["Zowe CLI Package"] }] }, { "componentGroup": "z/OS® FTP Plug-in for Zowe CLI", "entries": [{ "repository": "zowe-cli-ftp-plugin", - "tag": "master", + "tag": "v2.1.3", "destinations": ["Zowe CLI Package"] }] }, { "componentGroup": "IBM® IMS® Plug-in for Zowe CLI", "entries": [{ "repository": "zowe-cli-ims-plugin", - "tag": "master", + "tag": "v3.0.0", "destinations": ["Zowe CLI Package"] }] }, { - "componentGroup": "Zowe Desktop Data Sets UI Plugin", + "componentGroup": "Zowe Desktop Eclipse Orion-based React Editor", "entries": [{ - "repository": "explorer-mvs", - "tag": "v2.x/master", + "repository": "orion-editor-component", + "tag": "v0.0.14", "destinations": ["Zowe PAX"] }] }, { - "componentGroup": "Zowe Desktop Eclipse Orion-based React Editor", + "componentGroup": "Zowe Desktop Data Sets UI Plugin", "entries": [{ - "repository": "orion-editor-component", - "tag": "master", + "repository": "explorer-mvs", + "tag": "v2.0.7", "destinations": ["Zowe PAX"] }] }, { "componentGroup": "Zowe Desktop JES UI Plugin", "entries": [{ "repository": "explorer-jes", - "tag": "v2.x/master", + "tag": "v2.0.7", "destinations": ["Zowe PAX"] }] }, { "componentGroup": "Zowe Desktop z/OS Unix Files UI Plugin", "entries": [{ "repository": "explorer-uss", - "tag": "v2.x/master", + "tag": "v2.0.7", "destinations": ["Zowe PAX"] }] }, { "componentGroup": "Zowe Explorer Common REST Server", "entries": [{ "repository": "explorer-api-common", - "tag": "v2.x/master", + "tag": "2.0.23", "destinations": ["Zowe PAX"] }] }, { "componentGroup": "Zowe Explorer Data Sets REST Server", "entries": [{ "repository": "data-sets", - "tag": "v2.x/master", + "tag": "2.0.19", "destinations": ["Zowe PAX"] }] }, { "componentGroup": "Zowe Explorer Jobs REST Server", "entries": [{ "repository": "jobs", - "tag": "v2.x/master", + "tag": "2.0.19", "destinations": ["Zowe PAX"] }] }, @@ -320,14 +318,14 @@ "componentGroup": "Zowe Desktop TN3270 Emulator Plug-in", "entries": [{ "repository": "tn3270-ng2", - "tag": "v2.x/staging", + "tag": "v2.10.0-RC1", "destinations": ["Zowe PAX"] }] }, { "componentGroup": "Zowe Desktop Sample Angular Application", "entries": [{ "repository": "sample-angular-app", - "tag": "v2.x/staging", + "tag": "v2.10.0-RC1", "destinations": ["Zowe PAX"] }] }, @@ -335,7 +333,7 @@ "componentGroup": "Zowe Desktop Sample iFrame Application", "entries": [{ "repository": "sample-iframe-app", - "tag": "v2.x/staging", + "tag": "v2.10.0-RC1", "destinations": ["Zowe PAX"] }] }, @@ -343,7 +341,7 @@ "componentGroup": "Zowe Desktop Sample React Application", "entries": [{ "repository": "sample-react-app", - "tag": "v2.x/staging", + "tag": "v2.10.0-RC1", "destinations": ["Zowe PAX"] }] }, @@ -351,15 +349,15 @@ "componentGroup": "Zowe Desktop VT Emulator Plugin-in", "entries": [{ "repository": "vt-ng2", - "tag": "v2.x/staging", - "destinations": ["Zowe PAX"] + "tag": "v2.10.0-RC1", + "destinations": ["Zowe PAX"] }] }, { "componentGroup": "Zowe Desktop Editor Plugin-in", "entries": [{ "repository": "zlux-editor", - "tag": "v2.x/staging", + "tag": "v2.10.0-RC1", "destinations": ["Zowe PAX"] }] }, @@ -367,15 +365,15 @@ "componentGroup": "Utilities", "entries": [{ "repository": "keyring-utilities", - "tag": "master", + "tag": "v1.1.0", "destinations": ["Zowe PAX"] }, { "repository": "zowe-install-packaging-tools", - "tag": "v2.x/master", + "tag": "v2.0.3", "destinations": ["Zowe PAX"] }, { "repository": "launcher", - "tag": "v2.x/master", + "tag": "v2.0.12", "destinations": ["Zowe PAX"] }] }, @@ -383,7 +381,7 @@ "componentGroup": "Zowe Visual Studio Code Extension", "entries": [{ "repository": "vscode-extension-for-zowe", - "tag": "master", + "tag": "v2.9.1", "destinations": ["Visual Studio Code Marketplace"] }] }, @@ -391,91 +389,99 @@ "componentGroup": "Zowe Desktop IP Explorer Plug-in", "entries": [{ "repository": "explorer-ip", - "tag": "v2.x/master", + "tag": "v2.0.0", + "destinations": ["Zowe PAX"] + }] + }, + { + "componentGroup": "Configmgr", + "entries": [{ + "repository": "zowe-common-c", + "tag": "configmgr-v2.10.0-RC1", "destinations": ["Zowe PAX"] }] } ], "imageDependencies": { "zowe-launch-scripts": { - "registry": "zowe-docker-snapshot.jfrog.io", + "registry": "zowe-docker-release.jfrog.io", "name": "ompzowe/zowe-launch-scripts", - "tag" : "2.1.0-ubuntu.v2-x-staging" + "tag" : "2.10.0-ubuntu" }, "api-catalog": { - "registry": "zowe-docker-snapshot.jfrog.io", + "registry": "zowe-docker-release.jfrog.io", "name": "ompzowe/api-catalog-services", - "tag" : "2.1.1-SNAPSHOT-ubuntu.v2-x-x" + "tag" : "2.10.6-ubuntu" }, "caching": { - "registry": "zowe-docker-snapshot.jfrog.io", + "registry": "zowe-docker-release.jfrog.io", "name": "ompzowe/caching-service", - "tag" : "2.1.1-SNAPSHOT-ubuntu.v2-x-x" + "tag" : "2.10.6-ubuntu" }, "discovery": { "kind": "statefulset", - "registry": "zowe-docker-snapshot.jfrog.io", + "registry": "zowe-docker-release.jfrog.io", "name": "ompzowe/discovery-service", - "tag" : "2.1.1-SNAPSHOT-ubuntu.v2-x-x" + "tag" : "2.10.6-ubuntu" }, "gateway": { - "registry": "zowe-docker-snapshot.jfrog.io", - "name": "ompzowe/gateway-service", - "tag" : "2.1.1-SNAPSHOT-ubuntu.v2-x-x" + "registry": "zowe-docker-release.jfrog.io", + "name": "ompzowe/gateway-service", + "tag" : "2.10.6-ubuntu" }, "app-server": { - "registry": "zowe-docker-snapshot.jfrog.io", + "registry": "zowe-docker-release.jfrog.io", "name": "ompzowe/app-server", - "tag" : "2.1.0-ubuntu.v2-x-staging" + "tag" : "2.10.0-ubuntu" }, "explorer-ip": { - "kind": "job", - "registry": "zowe-docker-snapshot.jfrog.io", - "name": "ompzowe/explorer-ip", - "tag" : "2.0.0-ubuntu.v2-x-master" + "kind": "job", + "registry": "zowe-docker-release.jfrog.io", + "name": "ompzowe/explorer-ip", + "tag" : "2.0.0-ubuntu" }, "explorer-jes": { - "kind": "job", - "registry": "zowe-docker-release.jfrog.io", - "name": "ompzowe/explorer-jes", - "tag" : "2-ubuntu" + "kind": "job", + "registry": "zowe-docker-release.jfrog.io", + "name": "ompzowe/explorer-jes", + "tag" : "2.0.7-ubuntu" }, "explorer-mvs": { - "kind": "job", - "registry": "zowe-docker-release.jfrog.io", - "name": "ompzowe/explorer-mvs", - "tag" : "2-ubuntu" + "kind": "job", + "registry": "zowe-docker-release.jfrog.io", + "name": "ompzowe/explorer-mvs", + "tag" : "2.0.7-ubuntu" }, "explorer-uss": { - "kind": "job", - "registry": "zowe-docker-release.jfrog.io", - "name": "ompzowe/explorer-uss", - "tag" : "2-ubuntu" + "kind": "job", + "registry": "zowe-docker-release.jfrog.io", + "name": "ompzowe/explorer-uss", + "tag" : "2.0.7-ubuntu" }, "files-api": { - "registry": "zowe-docker-release.jfrog.io", - "name": "ompzowe/files-api", - "tag" : "2-ubuntu" + "registry": "zowe-docker-release.jfrog.io", + "name": "ompzowe/files-api", + "tag" : "2.0.19-ubuntu" }, "jobs-api": { - "registry": "zowe-docker-release.jfrog.io", - "name": "ompzowe/jobs-api", - "tag" : "2-ubuntu" + "registry": "zowe-docker-release.jfrog.io", + "name": "ompzowe/jobs-api", + "tag" : "2.0.19-ubuntu" }, "base": { - "registry": "zowe-docker-release.jfrog.io", - "name": "ompzowe/base", - "tag" : "2.0-ubuntu" + "registry": "zowe-docker-release.jfrog.io", + "name": "ompzowe/base", + "tag" : "2.0.1-ubuntu" }, "base-jdk": { - "registry": "zowe-docker-release.jfrog.io", - "name": "ompzowe/base-jdk", - "tag" : "2.0-ubuntu" + "registry": "zowe-docker-release.jfrog.io", + "name": "ompzowe/base-jdk", + "tag" : "2.0.1-ubuntu" }, "base-node": { - "registry": "zowe-docker-release.jfrog.io", - "name": "ompzowe/base-node", - "tag" : "2.0-ubuntu" + "registry": "zowe-docker-release.jfrog.io", + "name": "ompzowe/base-node", + "tag" : "2.0.1-ubuntu" } }, "dependencyDecisions": { From 154843129389a7e6337237a15ee97d8fdf61ccf8 Mon Sep 17 00:00:00 2001 From: James Struga Date: Thu, 31 Aug 2023 09:12:46 -0400 Subject: [PATCH 087/168] update config manager with better error Signed-off-by: James Struga --- manifest.json.template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/manifest.json.template b/manifest.json.template index b3397cf59c..1146a58cb0 100644 --- a/manifest.json.template +++ b/manifest.json.template @@ -111,12 +111,12 @@ "org.zowe.configmgr-rexx": { "version": "2.11.0-V2.X-RC", "repository": "libs-snapshot-local", - "artifact": "configmgr-rexx-2.11.0-2023082950.pax" + "artifact": "configmgr-rexx-2.11.0-2023083137.pax" }, "org.zowe.configmgr": { "version": "2.11.0-V2.X-RC", "repository": "libs-snapshot-local", - "artifact": "configmgr-2.11.0-2023082956.pax" + "artifact": "configmgr-2.11.0-2023083140.pax" }, "org.zowe.launcher": { "version": "2.0.13" From 71f573b1dc91cbaa76079ad90ac33518557becf4 Mon Sep 17 00:00:00 2001 From: ojcelis Date: Thu, 31 Aug 2023 09:23:19 -0400 Subject: [PATCH 088/168] update vscode and launch-script Signed-off-by: ojcelis --- manifest.json.template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/manifest.json.template b/manifest.json.template index cacecdfe72..51649ff2d1 100644 --- a/manifest.json.template +++ b/manifest.json.template @@ -381,7 +381,7 @@ "componentGroup": "Zowe Visual Studio Code Extension", "entries": [{ "repository": "vscode-extension-for-zowe", - "tag": "v2.9.1", + "tag": "v2.10.0", "destinations": ["Visual Studio Code Marketplace"] }] }, @@ -406,7 +406,7 @@ "zowe-launch-scripts": { "registry": "zowe-docker-release.jfrog.io", "name": "ompzowe/zowe-launch-scripts", - "tag" : "2.10.0-ubuntu" + "tag" : "2.11.0-ubuntu" }, "api-catalog": { "registry": "zowe-docker-release.jfrog.io", From 3de9f2ce4c74885add477c44bd4f1a3f572d9e08 Mon Sep 17 00:00:00 2001 From: Trae Yelovich Date: Thu, 31 Aug 2023 12:10:27 -0400 Subject: [PATCH 089/168] Update Zowe CLI for 2.11 Signed-off-by: Trae Yelovich --- manifest.json.template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.json.template b/manifest.json.template index def311315e..a7c32bd34d 100644 --- a/manifest.json.template +++ b/manifest.json.template @@ -219,7 +219,7 @@ "componentGroup": "Zowe CLI", "entries": [{ "repository": "zowe-cli", - "tag": "v7.18.3", + "tag": "v7.18.4", "destinations": ["Zowe CLI Package"] }] }, { From 292a93fa46a06f7c727d3e8dd67af230353597f8 Mon Sep 17 00:00:00 2001 From: 1000TurquoisePogs Date: Tue, 5 Sep 2023 10:09:20 -0400 Subject: [PATCH 090/168] Allow pem to be present but empty when keyring Signed-off-by: 1000TurquoisePogs --- schemas/zowe-yaml-schema.json | 1 - 1 file changed, 1 deletion(-) diff --git a/schemas/zowe-yaml-schema.json b/schemas/zowe-yaml-schema.json index 39db90e8f5..62eb04187e 100644 --- a/schemas/zowe-yaml-schema.json +++ b/schemas/zowe-yaml-schema.json @@ -789,7 +789,6 @@ "type": "object", "additionalProperties": false, "description": "Certificate in PEM format.", - "required": ["key", "certificate"], "properties": { "key": { "$ref": "/schemas/v2/server-common#zowePath", From a45d99c882f86c5a5db351da620ae13163283b26 Mon Sep 17 00:00:00 2001 From: 1000TurquoisePogs Date: Tue, 5 Sep 2023 10:16:38 -0400 Subject: [PATCH 091/168] Revert pem section back to type=string Signed-off-by: 1000TurquoisePogs --- schemas/zowe-yaml-schema.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/schemas/zowe-yaml-schema.json b/schemas/zowe-yaml-schema.json index 62eb04187e..b37915a80c 100644 --- a/schemas/zowe-yaml-schema.json +++ b/schemas/zowe-yaml-schema.json @@ -791,24 +791,24 @@ "description": "Certificate in PEM format.", "properties": { "key": { - "$ref": "/schemas/v2/server-common#zowePath", + "type": "string", "description": "Path to the certificate private key stored in PEM format." }, "certificate": { - "$ref": "/schemas/v2/server-common#zowePath", + "type": "string", "description": "Path to the certificate stored in PEM format." }, "certificateAuthorities": { "description": "List of paths to the certificate authorities stored in PEM format.", "oneOf": [{ - "$ref": "/schemas/v2/server-common#zowePath", + "type": "string", "description": "Paths to the certificate authorities stored in PEM format. You can separate multiple certificate authorities by comma." }, { "type": "array", "description": "Path to the certificate authority stored in PEM format.", "items": { - "$ref": "/schemas/v2/server-common#zowePath" + "type": "string" } } ] From 2f7df0187f697af1c4ef2f9beceee2dd1aa5b578 Mon Sep 17 00:00:00 2001 From: James Struga Date: Tue, 5 Sep 2023 11:25:07 -0400 Subject: [PATCH 092/168] RC2 fix Signed-off-by: James Struga --- manifest.json.template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.json.template b/manifest.json.template index feac5b926e..f53d3f712b 100644 --- a/manifest.json.template +++ b/manifest.json.template @@ -14,7 +14,7 @@ "org.zowe.zlux.zlux-core": { "version": "2.11.0-RC", "repository": "libs-snapshot-local", - "artifact": "zlux-core-2.11.0-20230830.130147.pax" + "artifact": "zlux-core-2.11.0-20230905.133406.pax" }, "org.zowe.zlux.sample-angular-app": { "version": "2.11.0-V2.X-RC", From dc437ef44f70ea2693e4ce9260180a53b7f93c42 Mon Sep 17 00:00:00 2001 From: James Struga Date: Wed, 6 Sep 2023 12:04:53 -0400 Subject: [PATCH 093/168] add zowe-common-c change Signed-off-by: James Struga --- manifest.json.template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/manifest.json.template b/manifest.json.template index f53d3f712b..0a50b94cdb 100644 --- a/manifest.json.template +++ b/manifest.json.template @@ -49,7 +49,7 @@ "org.zowe.zss": { "version": "2.11.0-RC", "repository": "libs-snapshot-local", - "artifact": "zss-2.11.0-rc-965-20230830170742.pax" + "artifact": "zss-2.11.0-rc-974-20230906160141.pax" }, "org.zowe.explorer.jobs.jobs-api-package": { "version": "2.0.19", @@ -111,12 +111,12 @@ "org.zowe.configmgr-rexx": { "version": "2.11.0-V2.X-RC", "repository": "libs-snapshot-local", - "artifact": "configmgr-rexx-2.11.0-2023083137.pax" + "artifact": "configmgr-rexx-2.11.0-2023090632.pax" }, "org.zowe.configmgr": { "version": "2.11.0-V2.X-RC", "repository": "libs-snapshot-local", - "artifact": "configmgr-2.11.0-2023083140.pax" + "artifact": "configmgr-2.11.0-2023090629.pax" }, "org.zowe.launcher": { "version": "2.0.13" From c47ec0696dffecdcd924f69a345f0be8a9e38aaf Mon Sep 17 00:00:00 2001 From: ojcelis Date: Mon, 11 Sep 2023 09:55:01 -0400 Subject: [PATCH 094/168] update licenses to 2.11 Signed-off-by: ojcelis --- manifest.json.template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.json.template b/manifest.json.template index 0a50b94cdb..c5684fcde9 100644 --- a/manifest.json.template +++ b/manifest.json.template @@ -131,7 +131,7 @@ "version": "2.0.3" }, "org.zowe.licenses": { - "version": "2.10.0", + "version": "2.11.0", "artifact": "zowe_licenses_full.zip" } }, From c5566f24e48cc74bdab7efe350735ef5e15740cd Mon Sep 17 00:00:00 2001 From: zowe-robot Date: Tue, 12 Sep 2023 18:27:06 +0000 Subject: [PATCH 095/168] Promote PTF after release v2.11.0 Signed-off-by: zowe-robot --- smpe/bld/service/promoted-apar.txt | 3 ++ smpe/bld/service/promoted-close.txt | 45 +++++++++++++++++++++++++++++ smpe/bld/service/promoted-hold.txt | 25 ++++++++++++++++ smpe/bld/service/promoted-ptf.txt | 2 ++ smpe/bld/service/ptf-bucket.txt | 2 +- 5 files changed, 76 insertions(+), 1 deletion(-) diff --git a/smpe/bld/service/promoted-apar.txt b/smpe/bld/service/promoted-apar.txt index 6ca8f40fd6..7675df3320 100644 --- a/smpe/bld/service/promoted-apar.txt +++ b/smpe/bld/service/promoted-apar.txt @@ -1,3 +1,6 @@ +IO29286 +IO29287 +IO29288 IO29185 IO29186 IO29187 diff --git a/smpe/bld/service/promoted-close.txt b/smpe/bld/service/promoted-close.txt index e6cdaaabd2..ad937b94d8 100644 --- a/smpe/bld/service/promoted-close.txt +++ b/smpe/bld/service/promoted-close.txt @@ -1,3 +1,48 @@ + IO29286 - + PROBLEM SUMMARY: + **************************************************************** + * USERS AFFECTED: All Zowe users * + **************************************************************** + * PROBLEM DESCRIPTION: Update Zowe FMID AZWE002 to match the * + * community release * + **************************************************************** + * RECOMMENDATION: Apply provided service * + **************************************************************** + The Zowe community version was updated to 2.11.0. + This PTF provides the community changes in SMP/E format. + Follow this link for more details on the community changes: + https://docs.zowe.org/stable/ + + IO29287 - + PROBLEM SUMMARY: + **************************************************************** + * USERS AFFECTED: All Zowe users * + **************************************************************** + * PROBLEM DESCRIPTION: Update Zowe FMID AZWE002 to match the * + * community release * + **************************************************************** + * RECOMMENDATION: Apply provided service * + **************************************************************** + The Zowe community version was updated to 2.11.0. + This PTF provides the community changes in SMP/E format. + Follow this link for more details on the community changes: + https://docs.zowe.org/stable/ + + IO29288 - + PROBLEM SUMMARY: + **************************************************************** + * USERS AFFECTED: All Zowe users * + **************************************************************** + * PROBLEM DESCRIPTION: Update Zowe FMID AZWE002 to match the * + * community release * + **************************************************************** + * RECOMMENDATION: Apply provided service * + **************************************************************** + The Zowe community version was updated to 2.11.0. + This PTF provides the community changes in SMP/E format. + Follow this link for more details on the community changes: + https://docs.zowe.org/stable/ + IO29185 - PROBLEM SUMMARY: **************************************************************** diff --git a/smpe/bld/service/promoted-hold.txt b/smpe/bld/service/promoted-hold.txt index 30c27af2ab..e4a768ccd8 100644 --- a/smpe/bld/service/promoted-hold.txt +++ b/smpe/bld/service/promoted-hold.txt @@ -1,3 +1,28 @@ +++HOLD(UO90031) SYSTEM FMID(AZWE002) REASON(ACTION) DATE(23255) + COMMENT( + **************************************************************** + * Affected function: Zowe servers * + **************************************************************** + * Description: stop servers * + **************************************************************** + * Timing: pre-APPLY * + **************************************************************** + * Part: ZWESLSTC and ZWESISTC * + **************************************************************** + Stop the Zowe servers before installing this update. + + **************************************************************** + * Affected function: Zowe servers * + **************************************************************** + * Description: start servers * + **************************************************************** + * Timing: post-APPLY * + **************************************************************** + * Part: ZWESLSTC and ZWESISTC * + **************************************************************** + Start the Zowe servers after installing this update. + + ). ++HOLD(UO90022) SYSTEM FMID(AZWE002) REASON(ACTION) DATE(23208) COMMENT( **************************************************************** diff --git a/smpe/bld/service/promoted-ptf.txt b/smpe/bld/service/promoted-ptf.txt index 0e26b90913..0867777fc6 100644 --- a/smpe/bld/service/promoted-ptf.txt +++ b/smpe/bld/service/promoted-ptf.txt @@ -1,3 +1,5 @@ +UO90031 +UO90032 UO90022 UO90023 UO90020 diff --git a/smpe/bld/service/ptf-bucket.txt b/smpe/bld/service/ptf-bucket.txt index 10917e71c8..ac0efb82f1 100644 --- a/smpe/bld/service/ptf-bucket.txt +++ b/smpe/bld/service/ptf-bucket.txt @@ -17,5 +17,5 @@ #UO90018 UO90019 - IO29174 IO29175 IO29176 - Wed Apr 26 22:58:46 UTC 2023 #UO90020 UO90021 - IO29182 IO29183 IO29184 - Tue Jun 13 21:20:27 UTC 2023 #UO90022 UO90023 - IO29185 IO29186 IO29187 - Fri Jul 28 01:08:59 UTC 2023 -UO90031 UO90032 - IO29286 IO29287 IO29288 +#UO90031 UO90032 - IO29286 IO29287 IO29288 - Tue Sep 12 18:27:05 UTC 2023 UO90033 UO90034 - IO29289 IO29290 IO29291 \ No newline at end of file From 7bb64b04e4f12db7eefa0f7cd29d5a11fa6d1ff6 Mon Sep 17 00:00:00 2001 From: ojcelis Date: Tue, 12 Sep 2023 15:11:19 -0400 Subject: [PATCH 096/168] update manifest back to staging version Signed-off-by: ojcelis --- manifest.json.template | 316 ++++++++++++++++++++--------------------- 1 file changed, 155 insertions(+), 161 deletions(-) diff --git a/manifest.json.template b/manifest.json.template index c5684fcde9..bfd04cc9fa 100644 --- a/manifest.json.template +++ b/manifest.json.template @@ -1,6 +1,6 @@ { "name": "Zowe", - "version": "2.11.0", + "version": "2.12.0", "description": "Zowe is an open source project created to host technologies that benefit the Z platform from all members of the Z community (Integrated Software Vendors, System Integrators and z/OS consumers). Zowe, like Mac or Windows, comes with a set of APIs and OS capabilities that applications build on and also includes some applications out of the box. Zowe offers modern interfaces to interact with z/OS and allows you to work with z/OS in a way that is similar to what you experience on cloud platforms today. You can use these interfaces as delivered or through plug-ins and extensions that are created by clients or third-party vendors.", "license": "EPL-2.0", "homepage": "https://zowe.org", @@ -12,126 +12,128 @@ }, "binaryDependencies": { "org.zowe.zlux.zlux-core": { - "version": "2.11.0-RC", - "repository": "libs-snapshot-local", - "artifact": "zlux-core-2.11.0-20230905.133406.pax" + "version": "^2.0.0-V2.X-STAGING-ZLUX-CORE", + "artifact": "*.pax" }, "org.zowe.zlux.sample-angular-app": { - "version": "2.11.0-V2.X-RC", - "repository": "libs-snapshot-local", - "artifact": "sample-angular-app-2.11.0-20230829.202745.pax" + "version": "^2.0.0-V2.X-STAGING", + "artifact": "*.pax" }, "org.zowe.zlux.sample-iframe-app": { - "version": "2.11.0-V2.X-RC", - "repository": "libs-snapshot-local", - "artifact": "sample-iframe-app-2.11.0-20230829.202533.pax" + "version": "^2.0.0-V2.X-STAGING", + "artifact": "*.pax" }, "org.zowe.zlux.sample-react-app": { - "version": "2.11.0-V2.X-RC", - "repository": "libs-snapshot-local", - "artifact": "sample-react-app-2.11.0-20230829.202650.pax" + "version": "^2.0.0-V2.X-STAGING", + "artifact": "*.pax" }, "org.zowe.zlux.tn3270-ng2": { - "version": "2.11.0-V2.X-RC", - "repository": "libs-snapshot-local", - "artifact": "tn3270-ng2-2.11.0-20230830.125742.pax" + "version": "^2.0.0-V2.X-STAGING", + "artifact": "*.pax" }, "org.zowe.zlux.vt-ng2": { - "version": "2.11.0-V2.X-RC", - "repository": "libs-snapshot-local", - "artifact": "vt-ng2-2.11.0-20230829.202549.pax" + "version": "^2.0.0-V2.X-STAGING", + "artifact": "*.pax" }, "org.zowe.zlux.zlux-editor": { - "version": "2.11.0-V2.X-RC", - "repository": "libs-snapshot-local", - "artifact": "zlux-editor-2.11.0-20230829.202844.pax" + "version": "^2.0.0-V2.X-STAGING", + "artifact": "*.pax" }, "org.zowe.zss": { - "version": "2.11.0-RC", - "repository": "libs-snapshot-local", - "artifact": "zss-2.11.0-rc-974-20230906160141.pax" + "version": "^2.0.0-STAGING", + "artifact": "*.pax" }, "org.zowe.explorer.jobs.jobs-api-package": { - "version": "2.0.19", - "artifact": "jobs-api-package-*.zip" + "version": "^2.0.7-SNAPSHOT", + "artifact": "jobs-api-package-*.zip", + "exclusions": ["*PR*.zip","*BRANCH*"] }, "org.zowe.explorer.files.files-api-package": { - "version": "2.0.19", - "artifact": "files-api-package-*.zip" + "version": "^2.0.7-SNAPSHOT", + "artifact": "files-api-package-*.zip", + "exclusions": ["*PR*.zip","*BRANCH*"] }, "org.zowe.explorer-jes": { - "version": "2.0.7" + "version": "~2.0.2-SNAPSHOT" }, "org.zowe.explorer-mvs": { - "version": "2.0.7" + "version": "~2.0.2-SNAPSHOT" }, "org.zowe.explorer-uss": { - "version": "2.0.7" + "version": "~2.0.2-SNAPSHOT" }, "org.zowe.explorer-ip": { - "version": "2.0.0", - "artifact": "explorer-ip*.pax" + "version": "~2.0.0-SNAPSHOT", + "artifact": "*.pax" }, "org.zowe.apiml.api-catalog-package": { - "version": "2.11.0", - "artifact": "api-catalog*.zip" + "version": "^2.1.1-SNAPSHOT", + "artifact": "api-catalog-*.zip", + "exclusions": ["*PR*.zip"] }, "org.zowe.apiml.discovery-package": { - "version": "2.11.0", - "artifact": "discovery*.zip" + "version": "^2.1.1-SNAPSHOT", + "artifact": "discovery-*.zip", + "exclusions": ["*PR*.zip"] }, "org.zowe.apiml.gateway-package": { - "version": "2.11.0", - "artifact": "gateway*.zip" + "version": "^2.1.1-SNAPSHOT", + "artifact": "gateway-*.zip", + "exclusions": ["*PR*.zip"] }, "org.zowe.apiml.caching-service-package": { - "version": "2.11.0", - "artifact": "caching-service*.zip" + "version": "^2.1.1-SNAPSHOT", + "artifact": "caching-service-*.zip", + "exclusions": ["*PR*.zip"] }, "org.zowe.apiml.metrics-service-package": { - "version": "2.11.0", - "artifact": "metrics-service*.zip" + "version": "^2.1.1-SNAPSHOT", + "artifact": "metrics-service-*.zip", + "exclusions": ["*PR*.zip"] }, "org.zowe.apiml.apiml-common-lib-package": { - "version": "2.11.0", - "artifact": "apiml-common-lib-*.zip" + "version": "^2.1.1-SNAPSHOT", + "artifact": "apiml-common-lib-*.zip", + "exclusions": ["*PR*.zip"] }, "org.zowe.apiml.sdk.common-java-lib-package": { - "version": "2.0.0", - "artifact": "common-java-lib-*.zip" + "version": "~2.0.0-SNAPSHOT", + "artifact": "common-java-lib-*.zip", + "exclusions": ["*PR*.zip"] }, "org.zowe.apiml.sdk.apiml-sample-extension-package": { - "version": "2.11.0", - "artifact": "apiml-sample-extension-*.zip" + "version": "^2.1.1-SNAPSHOT", + "artifact": "apiml-sample-extension-*.zip", + "exclusions": ["*PR*.zip"] }, "org.zowe.apiml.cloud-gateway-package": { - "version": "2.11.0", - "artifact": "cloud-gateway-*.zip" - }, - "org.zowe.configmgr-rexx": { - "version": "2.11.0-V2.X-RC", - "repository": "libs-snapshot-local", - "artifact": "configmgr-rexx-2.11.0-2023090632.pax" + "version": "^2.4.4-SNAPSHOT", + "artifact": "cloud-gateway-*.zip", + "exclusions": ["*PR*.zip"] }, "org.zowe.configmgr": { - "version": "2.11.0-V2.X-RC", - "repository": "libs-snapshot-local", - "artifact": "configmgr-2.11.0-2023090629.pax" + "version": "^2.0.0-V2.X-STAGING", + "artifact": "*.pax" + }, + "org.zowe.configmgr-rexx": { + "version": "^2.0.0-V2.X-STAGING", + "artifact": "*.pax" }, "org.zowe.launcher": { - "version": "2.0.13" + "version": "^2.0.0-SNAPSHOT" }, "org.zowe.keyring-utilities": { "version": "1.0.4", - "artifact": "keyring-util-1.0.4", + "artifact": "keyring-util-*", "explode": "false", - "flat": "true" + "flat": "true", + "exclusions": ["*PR*"] }, "org.zowe.utility-tools": { - "version": "2.0.3" + "version": "~2.0.0-SNAPSHOT" }, "org.zowe.licenses": { - "version": "2.11.0", + "version": "2.3.0", "artifact": "zowe_licenses_full.zip" } }, @@ -140,78 +142,78 @@ "componentGroup": "Imperative CLI Framework for Zowe", "entries": [{ "repository": "imperative", - "tag": "v5.18.1", + "tag": "master", "destinations": ["Zowe CLI Package"] }] }, { "componentGroup": "Zowe API Mediation Layer", "entries": [{ "repository": "api-layer", - "tag": "v2.9.1", + "tag": "v2.x.x", "destinations": ["Zowe PAX"] }] }, { "componentGroup": "Zowe common java libraries", "entries": [{ "repository": "common-java", - "tag": "v1.21.3", + "tag": "v2.x.x", "destinations": ["Zowe PAX"] }] }, { "componentGroup": "Zowe Application Framework", "entries": [{ "repository": "zlux-app-manager", - "tag": "v2.11.0-RC1", + "tag": "v2.x/staging", "destinations": ["Zowe PAX"] }, { "repository": "zlux-app-server", - "tag": "v2.11.0-RC1", + "tag": "v2.x/staging", "destinations": ["Zowe PAX"] }, { "repository": "zlux-file-explorer", - "tag": "v1.6.0-RC1", + "tag": "v2.x/staging", "destinations": ["Zowe PAX"] }, { "repository": "zlux-grid", - "tag": "v0.0.6", + "tag": "v1.x/master", "destinations": ["Zowe PAX"] }, { "repository": "zlux-platform", - "tag": "v2.11.0-RC1", + "tag": "v2.x/staging", "destinations": ["Zowe PAX"] }, { "repository": "zlux-server-framework", - "tag": "v2.11.0-RC1", + "tag": "v2.x/staging", "destinations": ["Zowe PAX"] }, { "repository": "zlux-shared", - "tag": "v2.11.0-RC1", + "tag": "v2.x/staging", "destinations": ["Zowe PAX"] }, { "repository": "zlux-widgets", - "tag": "v0.0.4", + "tag": "v1.x/master", "destinations": ["Zowe PAX"] }, { "repository": "zlux-build", - "tag": "v2.11.0-RC1", + "tag": "v2.x/staging", "destinations": ["Zowe PAX"] }, { "repository": "zss", - "tag": "v2.11.0-RC1", + "tag": "v2.x/staging", "destinations": ["Zowe PAX"] }, { "repository": "zowe-common-c", - "tag": "zss-v2.11.0-RC1", + "tag": "v2.x/staging", "destinations": ["Zowe PAX"] } ] @@ -219,98 +221,98 @@ "componentGroup": "Zowe CLI", "entries": [{ "repository": "zowe-cli", - "tag": "v7.18.4", + "tag": "master", "destinations": ["Zowe CLI Package"] }] }, { "componentGroup": "IBM® CICS® Plug-in for Zowe CLI", "entries": [{ "repository": "zowe-cli-cics-plugin", - "tag": "v5.0.1", + "tag": "master", "destinations": ["Zowe CLI Package"] }] }, { "componentGroup": "IBM® Db2® Plug-in for Zowe CLI", "entries": [{ "repository": "zowe-cli-db2-plugin", - "tag": "v5.0.3", + "tag": "master", "destinations": ["Zowe CLI Package"] }] }, { "componentGroup": "Performance Timing Utility", "entries": [{ "repository": "perf-timing", - "tag": "v1.0.7", + "tag": "master", "destinations": ["Zowe CLI Package"] }] }, { "componentGroup": "IBM® MQ Plug-in for Zowe CLI", "entries": [{ "repository": "zowe-cli-mq-plugin", - "tag": "v3.0.1", + "tag": "master", "destinations": ["Zowe CLI Package"] }] }, { "componentGroup": "z/OS® FTP Plug-in for Zowe CLI", "entries": [{ "repository": "zowe-cli-ftp-plugin", - "tag": "v2.1.3", + "tag": "master", "destinations": ["Zowe CLI Package"] }] }, { "componentGroup": "IBM® IMS® Plug-in for Zowe CLI", "entries": [{ "repository": "zowe-cli-ims-plugin", - "tag": "v3.0.0", + "tag": "master", "destinations": ["Zowe CLI Package"] }] }, { - "componentGroup": "Zowe Desktop Eclipse Orion-based React Editor", + "componentGroup": "Zowe Desktop Data Sets UI Plugin", "entries": [{ - "repository": "orion-editor-component", - "tag": "v0.0.14", + "repository": "explorer-mvs", + "tag": "v2.x/master", "destinations": ["Zowe PAX"] }] }, { - "componentGroup": "Zowe Desktop Data Sets UI Plugin", + "componentGroup": "Zowe Desktop Eclipse Orion-based React Editor", "entries": [{ - "repository": "explorer-mvs", - "tag": "v2.0.7", + "repository": "orion-editor-component", + "tag": "master", "destinations": ["Zowe PAX"] }] }, { "componentGroup": "Zowe Desktop JES UI Plugin", "entries": [{ "repository": "explorer-jes", - "tag": "v2.0.7", + "tag": "v2.x/master", "destinations": ["Zowe PAX"] }] }, { "componentGroup": "Zowe Desktop z/OS Unix Files UI Plugin", "entries": [{ "repository": "explorer-uss", - "tag": "v2.0.7", + "tag": "v2.x/master", "destinations": ["Zowe PAX"] }] }, { "componentGroup": "Zowe Explorer Common REST Server", "entries": [{ "repository": "explorer-api-common", - "tag": "2.0.23", + "tag": "v2.x/master", "destinations": ["Zowe PAX"] }] }, { "componentGroup": "Zowe Explorer Data Sets REST Server", "entries": [{ "repository": "data-sets", - "tag": "2.0.19", + "tag": "v2.x/master", "destinations": ["Zowe PAX"] }] }, { "componentGroup": "Zowe Explorer Jobs REST Server", "entries": [{ "repository": "jobs", - "tag": "2.0.19", + "tag": "v2.x/master", "destinations": ["Zowe PAX"] }] }, @@ -318,14 +320,14 @@ "componentGroup": "Zowe Desktop TN3270 Emulator Plug-in", "entries": [{ "repository": "tn3270-ng2", - "tag": "v2.11.0-RC1", + "tag": "v2.x/staging", "destinations": ["Zowe PAX"] }] }, { "componentGroup": "Zowe Desktop Sample Angular Application", "entries": [{ "repository": "sample-angular-app", - "tag": "v2.11.0-RC1", + "tag": "v2.x/staging", "destinations": ["Zowe PAX"] }] }, @@ -333,7 +335,7 @@ "componentGroup": "Zowe Desktop Sample iFrame Application", "entries": [{ "repository": "sample-iframe-app", - "tag": "v2.11.0-RC1", + "tag": "v2.x/staging", "destinations": ["Zowe PAX"] }] }, @@ -341,7 +343,7 @@ "componentGroup": "Zowe Desktop Sample React Application", "entries": [{ "repository": "sample-react-app", - "tag": "v2.11.0-RC1", + "tag": "v2.x/staging", "destinations": ["Zowe PAX"] }] }, @@ -349,15 +351,15 @@ "componentGroup": "Zowe Desktop VT Emulator Plugin-in", "entries": [{ "repository": "vt-ng2", - "tag": "v2.11.0-RC1", - "destinations": ["Zowe PAX"] + "tag": "v2.x/staging", + "destinations": ["Zowe PAX"] }] }, { "componentGroup": "Zowe Desktop Editor Plugin-in", "entries": [{ "repository": "zlux-editor", - "tag": "v2.11.0-RC1", + "tag": "v2.x/staging", "destinations": ["Zowe PAX"] }] }, @@ -365,15 +367,15 @@ "componentGroup": "Utilities", "entries": [{ "repository": "keyring-utilities", - "tag": "v1.1.0", + "tag": "master", "destinations": ["Zowe PAX"] }, { "repository": "zowe-install-packaging-tools", - "tag": "v2.0.3", + "tag": "v2.x/master", "destinations": ["Zowe PAX"] }, { "repository": "launcher", - "tag": "v2.0.12", + "tag": "v2.x/master", "destinations": ["Zowe PAX"] }] }, @@ -381,7 +383,7 @@ "componentGroup": "Zowe Visual Studio Code Extension", "entries": [{ "repository": "vscode-extension-for-zowe", - "tag": "v2.10.0", + "tag": "master", "destinations": ["Visual Studio Code Marketplace"] }] }, @@ -389,99 +391,91 @@ "componentGroup": "Zowe Desktop IP Explorer Plug-in", "entries": [{ "repository": "explorer-ip", - "tag": "v2.0.0", - "destinations": ["Zowe PAX"] - }] - }, - { - "componentGroup": "Configmgr", - "entries": [{ - "repository": "zowe-common-c", - "tag": "configmgr-v2.11.0-RC1", + "tag": "v2.x/master", "destinations": ["Zowe PAX"] }] } ], "imageDependencies": { "zowe-launch-scripts": { - "registry": "zowe-docker-release.jfrog.io", + "registry": "zowe-docker-snapshot.jfrog.io", "name": "ompzowe/zowe-launch-scripts", - "tag" : "2.11.0-ubuntu" + "tag" : "2.1.0-ubuntu.v2-x-staging" }, "api-catalog": { - "registry": "zowe-docker-release.jfrog.io", + "registry": "zowe-docker-snapshot.jfrog.io", "name": "ompzowe/api-catalog-services", - "tag" : "2.11.0-ubuntu" + "tag" : "2.1.1-SNAPSHOT-ubuntu.v2-x-x" }, "caching": { - "registry": "zowe-docker-release.jfrog.io", + "registry": "zowe-docker-snapshot.jfrog.io", "name": "ompzowe/caching-service", - "tag" : "2.11.0-ubuntu" + "tag" : "2.1.1-SNAPSHOT-ubuntu.v2-x-x" }, "discovery": { "kind": "statefulset", - "registry": "zowe-docker-release.jfrog.io", + "registry": "zowe-docker-snapshot.jfrog.io", "name": "ompzowe/discovery-service", - "tag" : "2.11.0-ubuntu" + "tag" : "2.1.1-SNAPSHOT-ubuntu.v2-x-x" }, "gateway": { - "registry": "zowe-docker-release.jfrog.io", - "name": "ompzowe/gateway-service", - "tag" : "2.11.0-ubuntu" + "registry": "zowe-docker-snapshot.jfrog.io", + "name": "ompzowe/gateway-service", + "tag" : "2.1.1-SNAPSHOT-ubuntu.v2-x-x" }, "app-server": { - "registry": "zowe-docker-release.jfrog.io", + "registry": "zowe-docker-snapshot.jfrog.io", "name": "ompzowe/app-server", - "tag" : "2.11.0-ubuntu" + "tag" : "2.1.0-ubuntu.v2-x-staging" }, "explorer-ip": { - "kind": "job", - "registry": "zowe-docker-release.jfrog.io", - "name": "ompzowe/explorer-ip", - "tag" : "2.0.0-ubuntu" + "kind": "job", + "registry": "zowe-docker-snapshot.jfrog.io", + "name": "ompzowe/explorer-ip", + "tag" : "2.0.0-ubuntu.v2-x-master" }, "explorer-jes": { - "kind": "job", - "registry": "zowe-docker-release.jfrog.io", - "name": "ompzowe/explorer-jes", - "tag" : "2.0.7-ubuntu" + "kind": "job", + "registry": "zowe-docker-release.jfrog.io", + "name": "ompzowe/explorer-jes", + "tag" : "2-ubuntu" }, "explorer-mvs": { - "kind": "job", - "registry": "zowe-docker-release.jfrog.io", - "name": "ompzowe/explorer-mvs", - "tag" : "2.0.7-ubuntu" + "kind": "job", + "registry": "zowe-docker-release.jfrog.io", + "name": "ompzowe/explorer-mvs", + "tag" : "2-ubuntu" }, "explorer-uss": { - "kind": "job", - "registry": "zowe-docker-release.jfrog.io", - "name": "ompzowe/explorer-uss", - "tag" : "2.0.7-ubuntu" + "kind": "job", + "registry": "zowe-docker-release.jfrog.io", + "name": "ompzowe/explorer-uss", + "tag" : "2-ubuntu" }, "files-api": { - "registry": "zowe-docker-release.jfrog.io", - "name": "ompzowe/files-api", - "tag" : "2.0.19-ubuntu" + "registry": "zowe-docker-release.jfrog.io", + "name": "ompzowe/files-api", + "tag" : "2-ubuntu" }, "jobs-api": { - "registry": "zowe-docker-release.jfrog.io", - "name": "ompzowe/jobs-api", - "tag" : "2.0.19-ubuntu" + "registry": "zowe-docker-release.jfrog.io", + "name": "ompzowe/jobs-api", + "tag" : "2-ubuntu" }, "base": { - "registry": "zowe-docker-release.jfrog.io", - "name": "ompzowe/base", - "tag" : "2.0.1-ubuntu" + "registry": "zowe-docker-release.jfrog.io", + "name": "ompzowe/base", + "tag" : "2.0-ubuntu" }, "base-jdk": { - "registry": "zowe-docker-release.jfrog.io", - "name": "ompzowe/base-jdk", - "tag" : "2.0.1-ubuntu" + "registry": "zowe-docker-release.jfrog.io", + "name": "ompzowe/base-jdk", + "tag" : "2.0-ubuntu" }, "base-node": { - "registry": "zowe-docker-release.jfrog.io", - "name": "ompzowe/base-node", - "tag" : "2.0.1-ubuntu" + "registry": "zowe-docker-release.jfrog.io", + "name": "ompzowe/base-node", + "tag" : "2.0-ubuntu" } }, "dependencyDecisions": { From 4c8809bd323c3493c92bbcd8b2c6a9c10c3ea2b7 Mon Sep 17 00:00:00 2001 From: 1000TurquoisePogs Date: Wed, 11 Oct 2023 10:55:26 -0400 Subject: [PATCH 097/168] Fixed typos in parameter help (#3589) Signed-off-by: 1000TurquoisePogs --- .dependency/zwe_doc_generation/md-content.js | 2 +- bin/commands/components/search/.parameters | 2 +- bin/commands/components/uninstall/.parameters | 2 +- bin/commands/components/upgrade/.parameters | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.dependency/zwe_doc_generation/md-content.js b/.dependency/zwe_doc_generation/md-content.js index 736cb5f496..bc0e6bd11b 100644 --- a/.dependency/zwe_doc_generation/md-content.js +++ b/.dependency/zwe_doc_generation/md-content.js @@ -46,7 +46,7 @@ function generateDocumentationForNode(curNode, assembledParentNode) { docContent += createDocContent(assembledDocNode[docType.fileName].content, docType); const parentDocContent = createDocContent(assembledDocNode[docType.fileName].parentContent, docType); if (parentDocContent) { - docContent += SUB_SECTION_HEADER_PREFIX + 'Inherited from parent command' + SEPARATOR + parentDocContent; + docContent += SEPARATOR + SUB_SECTION_HEADER_PREFIX + 'Inherited from parent command' + SEPARATOR + parentDocContent; } } diff --git a/bin/commands/components/search/.parameters b/bin/commands/components/search/.parameters index 2d659cee46..d24d7ca8ad 100644 --- a/bin/commands/components/search/.parameters +++ b/bin/commands/components/search/.parameters @@ -1,5 +1,5 @@ component-name,component|o|string|||||Component name to search for. component-id,id|d|string|||||Component id to search for. -registry|r|string|||||Specifies the registry to searh within instead of the default. The registry must be compatible with the manager used. +registry|r|string|||||Specifies the registry to search within instead of the default. The registry must be compatible with the manager used. handler||string|||||Specifies the registry handler name used with the package registry, instead of the default. The handler must be compatible with the registry used. diff --git a/bin/commands/components/uninstall/.parameters b/bin/commands/components/uninstall/.parameters index 38f0184402..d5cc61584c 100644 --- a/bin/commands/components/uninstall/.parameters +++ b/bin/commands/components/uninstall/.parameters @@ -1,4 +1,4 @@ component-name,component|o|string|required||||The name of an installed component. -registry|r|string|||||Specifies the registry to searh within instead of the default. The registry must be compatible with the manager used. +registry|r|string|||||Specifies the registry to search within instead of the default. The registry must be compatible with the manager used. handler||string|||||Specifies the registry handler name used with the package registry, instead of the default. The handler must be compatible with the registry used. dry-run|d|boolean|||||Whether or not to perform the upgrade versus just checking if an upgrade is available \ No newline at end of file diff --git a/bin/commands/components/upgrade/.parameters b/bin/commands/components/upgrade/.parameters index a2556d5830..b1cc825579 100644 --- a/bin/commands/components/upgrade/.parameters +++ b/bin/commands/components/upgrade/.parameters @@ -1,4 +1,4 @@ component-file,component|o|string|required||||Either a path or component name. The path must be to a component package or directory. If a name is specified instead, install checks the zowe package registry. -registry|r|string|||||Specifies the registry to searh within instead of the default. The registry must be compatible with the manager used. +registry|r|string|||||Specifies the registry to search within instead of the default. The registry must be compatible with the manager used. handler||string|||||Specifies the registry handler name used with the package registry, instead of the default. The handler must be compatible with the registry used. dry-run|d|boolean|||||Whether or not to perform the upgrade versus just checking if an upgrade is available \ No newline at end of file From 8f981ac9a3b318b80494a946edc3623a9e1946d1 Mon Sep 17 00:00:00 2001 From: Martin Zeithaml <66114686+Martin-Zeithaml@users.noreply.github.com> Date: Wed, 11 Oct 2023 16:59:22 +0200 Subject: [PATCH 098/168] Close unused pipes (#3590) Signed-off-by: Martin Zeithaml --- bin/libs/shell.ts | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/bin/libs/shell.ts b/bin/libs/shell.ts index dc29b57e0a..1a5581616a 100644 --- a/bin/libs/shell.ts +++ b/bin/libs/shell.ts @@ -73,10 +73,10 @@ export function execOutSync(command: string, ...args: string[]): ExecReturn { return { rc: -1 }; } const rc = os.exec([command, ...args], { block: true, usePath: true, stdout: pipeArray[1]}); + os.close(pipeArray[1]); let out = readStreamFully(pipeArray[0]); os.close(pipeArray[0]); - os.close(pipeArray[1]); return { rc, out @@ -94,11 +94,11 @@ export function execErrSync(command: string, ...args: string[]): ExecReturn { if (!pipeArray){ return { rc: -1 }; } - const rc = os.exec([command, ...args], { block: true, usePath: true, stderr: pipeArray[1]}); - + const rc = os.exec([command, ...args], { block: true, usePath: true, stderr: pipeArray[1]}); + os.close(pipeArray[1]); + let err = readStreamFully(pipeArray[0]); os.close(pipeArray[0]); - os.close(pipeArray[1]); return { rc, err @@ -117,16 +117,17 @@ export function execOutErrSync(command: string, ...args: string[]): ExecReturn { return { rc: -1 }; } const rc = os.exec([command, ...args], { block: true, usePath: true, stdout: pipeArray[1], stderr: errArray[1]}); + os.close(pipeArray[1]); + os.close(errArray[1]); let out = readStreamFully(pipeArray[0]); os.close(pipeArray[0]); - os.close(pipeArray[1]); - + let err = readStreamFully(errArray[0]); os.close(errArray[0]); - os.close(errArray[1]); + return { - rc, err + rc, out, err }; } From bde75f5ea0b7e681dfa7c94dd90aeaa2e871fbf0 Mon Sep 17 00:00:00 2001 From: Martin Zeithaml <66114686+Martin-Zeithaml@users.noreply.github.com> Date: Wed, 11 Oct 2023 17:19:48 +0200 Subject: [PATCH 099/168] Remove only char which was added (#3603) Signed-off-by: Martin Zeithaml <66114686+Martin-Zeithaml@users.noreply.github.com> --- bin/libs/zos.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/bin/libs/zos.ts b/bin/libs/zos.ts index 94370a5f29..b49e81451b 100644 --- a/bin/libs/zos.ts +++ b/bin/libs/zos.ts @@ -25,6 +25,7 @@ export function tsoCommand(...args:string[]): { rc: number, out: string } { common.printTrace(` * Exit code: ${result.rc}`); common.printTrace(" * Output:"); if (result.out) { + result.out = result.out.substring(0, result.out.length - 1); common.printTrace(stringlib.paddingLeft(result.out, " ")); } } else { @@ -35,8 +36,7 @@ export function tsoCommand(...args:string[]): { rc: number, out: string } { common.printError(stringlib.paddingLeft(result.out, " ")); } } - //we strip the '.' we added above - return { rc: result.rc, out: result.out ? result.out.substring(0, result.out.length-1) : '' }; + return { rc: result.rc, out: result.out ? result.out : '' }; } export function operatorCommand(command: string): { rc: number, out: string } { From 79e73f57966c6e2659728cd85f11f28a84dbc5e5 Mon Sep 17 00:00:00 2001 From: 1000TurquoisePogs Date: Fri, 20 Oct 2023 07:07:20 -0500 Subject: [PATCH 100/168] Remove node 14 support node 14 is no longer supported. our documentation says so Signed-off-by: 1000TurquoisePogs --- bin/libs/node.ts | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/bin/libs/node.ts b/bin/libs/node.ts index e9f0a427fd..b1e9c57884 100644 --- a/bin/libs/node.ts +++ b/bin/libs/node.ts @@ -18,7 +18,7 @@ import * as shell from './shell'; import * as config from './config'; import { PathAPI as pathoid } from './pathoid'; -const NODE_MIN_VERSION=14; +const NODE_MIN_VERSION=16; // enforce encoding of stdio/stdout/stderr // sometimes /dev/tty* ($SSH_TTY) are not configured properly, for example tagged as binary or wrong encoding @@ -109,11 +109,6 @@ export function validateNodeHome(nodeHome:string|undefined=std.getenv("NODE_HOME //const nodeMinorVersion = Number(parts[1]); //const nodePatchVersion = Number(parts[2]); - if (version == 'v14.17.2') { - common.printError(`Node ${version} specifically is not compatible with Zowe. Please use a different version. See https://docs.zowe.org/stable/troubleshoot/app-framework/app-known-issues.html#desktop-apps-fail-to-load for more details.`); - return false; - } - if (version == 'v18.12.1') { common.printError(`Node ${version} specifically is not compatible with Zowe. Please use a different version. See https://github.com/ibmruntimes/node-zos/issues/21 for more details.`); return false; From fd0831c15761e6fe31715ea3c3b8c34056d970b9 Mon Sep 17 00:00:00 2001 From: 1000TurquoisePogs Date: Fri, 20 Oct 2023 07:07:52 -0500 Subject: [PATCH 101/168] Update node.sh Signed-off-by: 1000TurquoisePogs --- bin/libs/node.sh | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/bin/libs/node.sh b/bin/libs/node.sh index 63cc564ca8..cef1050787 100644 --- a/bin/libs/node.sh +++ b/bin/libs/node.sh @@ -122,17 +122,12 @@ validate_node_home() { node_fix_version=$(echo ${node_version} | cut -d '.' -f 3) # check node version - if [ "${node_version}" = "v14.17.2" ]; then - print_error "Node ${node_version} specifically is not compatible with Zowe. Please use a different version. See https://docs.zowe.org/stable/troubleshoot/app-framework/app-known-issues.html#desktop-apps-fail-to-load for more details." - return 1 - fi - if [ "${node_version}" = "v18.12.1" ]; then print_error "Node ${node_version} specifically is not compatible with Zowe. Please use a different version. See https://github.com/ibmruntimes/node-zos/issues/21 for more details." return 1 fi - if [ ${node_major_version} -lt 14 ]; then + if [ ${node_major_version} -lt 16 ]; then print_error "Node ${node_version} is less than the minimum level required of v14+." return 1 fi From 013c2b88ca80ffc064e5bff62a013d8378abbc27 Mon Sep 17 00:00:00 2001 From: 1000TurquoisePogs Date: Fri, 20 Oct 2023 07:10:36 -0500 Subject: [PATCH 102/168] Update cicd-test.yml Signed-off-by: 1000TurquoisePogs --- .github/workflows/cicd-test.yml | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/.github/workflows/cicd-test.yml b/.github/workflows/cicd-test.yml index 4c4ea7b1d2..5deecc5ef9 100644 --- a/.github/workflows/cicd-test.yml +++ b/.github/workflows/cicd-test.yml @@ -24,7 +24,6 @@ on: - SMPE PTF - Extensions - Keyring - - z/OS node v14 - z/OS node v16 - z/OS node v18 - Non-strict Verify External Certificate @@ -63,8 +62,8 @@ env: DEFAULT_ZOWE_EXT_ARTIFACTORY_PATTERN: libs-snapshot-local/org/zowe/{ext-name}/*/{ext-name}-*.pax # below block can be overwritten, adjusted by DevOps only - # ZOS_NODE_VERSION more to choose from: v14.21.3.1, v16.20.1 - ZOS_NODE_VERSION: v14.21.3.1 + # ZOS_NODE_VERSION more to choose from: v16.20.1 + ZOS_NODE_VERSION: v16.20.1 CLIENT_NODE_VERSION: v12.18.3 INSTALL_TEST_DEBUG_INFORMATION: zowe-install-test:* SANITY_TEST_DEBUG_INFORMATION: zowe-sanity-test:* @@ -75,7 +74,6 @@ env: SMPE_PTF_TESTFILE: basic/install-ptf.ts EXTENSIONS_TESTFILE: basic/install-ext.ts KEYRING_TESTFILE: extended/keyring.ts - ZOS_NODE_V14_TESTFILE: extended/node-versions/node-v14.ts ZOS_NODE_V16_TESTFILE: extended/node-versions/node-v16.ts ZOS_NODE_V18_TESTFILE: extended/node-versions/node-v18.ts NON_STRICT_VERIFY_EXTERNAL_CERTIFICATE_TESTFILE: extended/certificates/nonstrict-verify-external-certificate.ts @@ -293,9 +291,6 @@ jobs: case 'Keyring': eta = 53 break; - case 'z/OS node v14': - eta = 45 - break; case 'z/OS node v16': eta = 45 break; From 4ed7cafed8d20ee4a56003a8488b3020f95fefbf Mon Sep 17 00:00:00 2001 From: 1000TurquoisePogs Date: Fri, 20 Oct 2023 07:10:58 -0500 Subject: [PATCH 103/168] Update cicd-test-readme.md Signed-off-by: 1000TurquoisePogs --- .github/workflows/cicd-test-readme.md | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/workflows/cicd-test-readme.md b/.github/workflows/cicd-test-readme.md index 6e71645572..26c6a38836 100644 --- a/.github/workflows/cicd-test-readme.md +++ b/.github/workflows/cicd-test-readme.md @@ -29,7 +29,6 @@ Workflow trigger is at [cicd-test](https://github.com/zowe/zowe-install-packagin - SMPE PTF - Extensions - Keyring - - z/OS node v14 - z/OS node v16 - z/OS node v18 - Non-strict Verify External Certificate @@ -125,7 +124,6 @@ Selected test running elapsed time: | SMPE PTF | 68m | | z/OS node v18 | 45m | | z/OS node v16 | 45m | -| z/OS node v14 | 45m | | Keyring | 53m | | Non-strict Verify External Certificate | 51m | | Extensions | 67m From 4338f3ca5f2f48291f1a41debf329da6d7785a2b Mon Sep 17 00:00:00 2001 From: 1000TurquoisePogs Date: Fri, 20 Oct 2023 07:11:17 -0500 Subject: [PATCH 104/168] Update make_matrix.sh Signed-off-by: 1000TurquoisePogs --- .github/scripts/cicd_test/make_matrix.sh | 4 ---- 1 file changed, 4 deletions(-) diff --git a/.github/scripts/cicd_test/make_matrix.sh b/.github/scripts/cicd_test/make_matrix.sh index ac4dfc146b..899a6a0a77 100644 --- a/.github/scripts/cicd_test/make_matrix.sh +++ b/.github/scripts/cicd_test/make_matrix.sh @@ -32,10 +32,6 @@ case $install_test_choice in test_file="$KEYRING_TESTFILE" ;; -"z/OS node v14") - test_file="$ZOS_NODE_V14_TESTFILE" - ;; - "z/OS node v16") test_file="$ZOS_NODE_V16_TESTFILE" ;; From 4a31ab06afb966141a4b6a206f85d349275ef205 Mon Sep 17 00:00:00 2001 From: 1000TurquoisePogs Date: Fri, 20 Oct 2023 07:19:45 -0500 Subject: [PATCH 105/168] Update node.sh Signed-off-by: 1000TurquoisePogs --- bin/libs/node.sh | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/bin/libs/node.sh b/bin/libs/node.sh index cef1050787..068fa7abc7 100644 --- a/bin/libs/node.sh +++ b/bin/libs/node.sh @@ -22,6 +22,8 @@ export NODE_STDIN_CCSID=1047 # Workaround Fix for node 8.16.1 that requires compatibility mode for untagged files export __UNTAGGED_READ_MODE=V6 +NODE_MIN=16 + ensure_node_is_on_path() { if [[ ":${PATH}:" != *":${NODE_HOME}/bin:"* ]]; then export PATH="${NODE_HOME}/bin:${PATH}" @@ -127,8 +129,8 @@ validate_node_home() { return 1 fi - if [ ${node_major_version} -lt 16 ]; then - print_error "Node ${node_version} is less than the minimum level required of v14+." + if [ ${node_major_version} -lt ${NODE_MIN} ]; then + print_error "Node ${node_version} is less than the minimum level required of v${NODE_MIN}+." return 1 fi print_debug "Node ${node_version} is supported." From 6afc567a5bd44018a06d4d613306bc4a918764a5 Mon Sep 17 00:00:00 2001 From: Martin Zeithaml <66114686+Martin-Zeithaml@users.noreply.github.com> Date: Fri, 20 Oct 2023 15:27:34 +0200 Subject: [PATCH 106/168] Tracing messages with correct function names (#3619) Signed-off-by: Martin Zeithaml --- bin/libs/json.ts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/bin/libs/json.ts b/bin/libs/json.ts index c4f5f77bb1..70243b8901 100644 --- a/bin/libs/json.ts +++ b/bin/libs/json.ts @@ -73,7 +73,7 @@ export function readYaml(file: string, key: string) { const jq=`${utils_dir}/njq/src/index.js`; const fconv=`${utils_dir}/fconv/src/index.js`; - common.printTrace(`- read_yaml load content from ${file}`); + common.printTrace(`- readYaml load content from ${file}`); if (std.getenv('ZWE_CLI_PARAMETER_CONFIG') == file) { return fakejq.jqget(ZOWE_CONFIG, key); } else { @@ -86,7 +86,7 @@ export function readYaml(file: string, key: string) { return; } - common.printTrace(`- read_yaml ${key} from yaml content`); + common.printTrace(`- readYaml ${key} from yaml content`); const result=shell.execOutSync('sh', '-c', `echo "${ZWE_PRIVATE_YAML_CACHE}" | node "${jq}" -r "${key}" 2>&1`); code=result.rc; common.printTrace(` * Exit code: ${code}`); @@ -104,7 +104,7 @@ export function readJson(file: string, key: string):any { const utils_dir=`${ZOWE_CONFIG.zowe.runtimeDirectory}/bin/utils`; const jq=`${utils_dir}/njq/src/index.js`; - common.printTrace(`- read_json ${key} from ${file}`); + common.printTrace(`- readJson ${key} from ${file}`); let result=shell.execOutSync('sh', '-c', `cat "${file}" | node "${jq}" -r "${key}" 2>&1`); const code = result.rc; common.printTrace(` * Exit code: ${code}`); From 5bb6282107371830cb4cfbf8155d8646ad7a0bfd Mon Sep 17 00:00:00 2001 From: Andrea Tabone <39694626+taban03@users.noreply.github.com> Date: Fri, 20 Oct 2023 16:57:06 +0200 Subject: [PATCH 107/168] Replace introspect URL with JWK for OIDC validation (#3614) * Replace introspect url with JWK Signed-off-by: at670475 * fix name Signed-off-by: at670475 * temporary change to test Signed-off-by: at670475 * fix Signed-off-by: at670475 * fix Signed-off-by: at670475 * revert back the manifest.json Signed-off-by: at670475 --------- Signed-off-by: at670475 Co-authored-by: Mark Ackert <35308966+MarkAckert@users.noreply.github.com> --- playbooks/roles/configfmid/defaults/main.yml | 2 +- playbooks/roles/configfmid/tasks/main.yml | 4 ++-- playbooks/roles/configure/defaults/main.yml | 2 +- playbooks/roles/configure/tasks/main.yml | 4 ++-- playbooks/roles/custom_for_test/defaults/main.yml | 2 +- tests/installation/src/constants.ts | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/playbooks/roles/configfmid/defaults/main.yml b/playbooks/roles/configfmid/defaults/main.yml index 65d34fcae1..322e90b06d 100644 --- a/playbooks/roles/configfmid/defaults/main.yml +++ b/playbooks/roles/configfmid/defaults/main.yml @@ -70,7 +70,7 @@ zowe_apiml_security_oidc_enabled: false zowe_apiml_security_oidc_client_id: zowe_apiml_security_oidc_client_secret: zowe_apiml_security_oidc_registry: -zowe_apiml_security_oidc_introspect_url: +zowe_apiml_security_oidc_jwks_uri: # explorer APIs/plugins ports zowe_jobs_api_port: 7558 zowe_mvs_api_port: 7559 diff --git a/playbooks/roles/configfmid/tasks/main.yml b/playbooks/roles/configfmid/tasks/main.yml index bd049e7cf9..7b2ad2c6c5 100644 --- a/playbooks/roles/configfmid/tasks/main.yml +++ b/playbooks/roles/configfmid/tasks/main.yml @@ -39,7 +39,7 @@ - zowe_apiml_security_oidc_client_id - zowe_apiml_security_oidc_client_secret - zowe_apiml_security_oidc_registry - - zowe_apiml_security_oidc_introspect_url + - zowe_apiml_security_oidc_jwks_uri - zowe_jobs_api_port - zowe_mvs_api_port - zowe_jobs_explorer_port @@ -299,7 +299,7 @@ "components.gateway.apiml.security.oidc.clientId": "{{ zowe_apiml_security_oidc_client_id|string }}" "components.gateway.apiml.security.oidc.clientSecret": "{{ zowe_apiml_security_oidc_client_secret|string }}" "components.gateway.apiml.security.oidc.registry": "{{ zowe_apiml_security_oidc_registry|string }}" - "components.gateway.apiml.security.oidc.introspectUrl": "{{ zowe_apiml_security_oidc_introspect_url|string }}" + "components.gateway.apiml.security.oidc.jwks.uri": "{{ zowe_apiml_security_oidc_jwks_uri|string }}" # desktop customizations "zowe.environments.ZWED_SSH_PORT": "{{ zowe_zlux_terminal_ssh_port }}" "zowe.environments.ZWED_TN3270_PORT": "{{ zowe_zlux_terminal_telnet_port }}" diff --git a/playbooks/roles/configure/defaults/main.yml b/playbooks/roles/configure/defaults/main.yml index 5e0cd717d4..24ff9b6446 100644 --- a/playbooks/roles/configure/defaults/main.yml +++ b/playbooks/roles/configure/defaults/main.yml @@ -71,7 +71,7 @@ zowe_apiml_security_oidc_enabled: false zowe_apiml_security_oidc_client_id: zowe_apiml_security_oidc_client_secret: zowe_apiml_security_oidc_registry: -zowe_apiml_security_oidc_introspect_url: +zowe_apiml_security_oidc_jwks_uri: # explorer APIs/plugins ports zowe_jobs_api_port: 7558 zowe_mvs_api_port: 7559 diff --git a/playbooks/roles/configure/tasks/main.yml b/playbooks/roles/configure/tasks/main.yml index e8fbfa267e..0cc6b1f017 100644 --- a/playbooks/roles/configure/tasks/main.yml +++ b/playbooks/roles/configure/tasks/main.yml @@ -39,7 +39,7 @@ - zowe_apiml_security_oidc_client_id - zowe_apiml_security_oidc_client_secret - zowe_apiml_security_oidc_registry - - zowe_apiml_security_oidc_introspect_url + - zowe_apiml_security_oidc_jwks_uri - zowe_jobs_api_port - zowe_mvs_api_port - zowe_jobs_explorer_port @@ -301,7 +301,7 @@ "components.gateway.apiml.security.oidc.clientId": "{{ zowe_apiml_security_oidc_client_id|string }}" "components.gateway.apiml.security.oidc.clientSecret": "{{ zowe_apiml_security_oidc_client_secret|string }}" "components.gateway.apiml.security.oidc.registry": "{{ zowe_apiml_security_oidc_registry|string }}" - "components.gateway.apiml.security.oidc.introspectUrl": "{{ zowe_apiml_security_oidc_introspect_url|string }}" + "components.gateway.apiml.security.oidc.jwks.uri": "{{ zowe_apiml_security_oidc_jwks_uri|string }}" # desktop customizations "zowe.environments.ZWED_SSH_PORT": "{{ zowe_zlux_terminal_ssh_port }}" "zowe.environments.ZWED_TN3270_PORT": "{{ zowe_zlux_terminal_telnet_port }}" diff --git a/playbooks/roles/custom_for_test/defaults/main.yml b/playbooks/roles/custom_for_test/defaults/main.yml index 9dbd3c90c8..0f223bc20e 100644 --- a/playbooks/roles/custom_for_test/defaults/main.yml +++ b/playbooks/roles/custom_for_test/defaults/main.yml @@ -68,7 +68,7 @@ zowe_apiml_security_oidc_enabled: false zowe_apiml_security_oidc_client_id: zowe_apiml_security_oidc_client_secret: zowe_apiml_security_oidc_registry: -zowe_apiml_security_oidc_introspect_url: +zowe_apiml_security_oidc_jwks_uri: zowe_apiml_security_zosmf_applid: IZUDFLT zowe_apiml_security_auth_provider: zosmf zowe_apiml_security_zosmf_jwt_autoconfiguration_mode: auto diff --git a/tests/installation/src/constants.ts b/tests/installation/src/constants.ts index 74ecdddce8..c60aa86853 100644 --- a/tests/installation/src/constants.ts +++ b/tests/installation/src/constants.ts @@ -43,7 +43,7 @@ export const APIML_OIDC_VARS = { 'zowe_apiml_security_oidc_client_id': process.env['OKTA_CLIENT_ID'] || 'dummy_id_from_constants_ts', 'zowe_apiml_security_oidc_client_secret': process.env['OKTA_CLIENT_SECRET'] || 'dummy_secret_from_constants_ts', 'zowe_apiml_security_oidc_registry': process.env['OIDC_REGISTRY'] || 'dummy_registry_from_constants_ts', - 'zowe_apiml_security_oidc_introspect_url': `https://${process.env['OKTA_HOSTNAME']}/oauth2/default/v1/introspect`, + 'zowe_apiml_security_oidc_jwks_uri': `https://${process.env['OKTA_HOSTNAME']}/oauth2/default/v1/keys`, }; // debug(`process.env >>>>>>>>>>>>>>>>>>>>>>>>>>\n${JSON.stringify(process.env)}\n<<<<<<<<<<<<<<<<<<<<<<<`); From 9f5c095d47cc851f2f2195b0685e33adebe55f73 Mon Sep 17 00:00:00 2001 From: Mark Ackert <35308966+MarkAckert@users.noreply.github.com> Date: Fri, 20 Oct 2023 12:00:28 -0400 Subject: [PATCH 108/168] Ensure workflow files are in ascii in final PAX (#3593) * build: convert workflow files to ascii before paxing Signed-off-by: MarkAckert * chore: add changelog Signed-off-by: MarkAckert * build: adjust dir base Signed-off-by: MarkAckert * build: remove quotes from ls command Signed-off-by: MarkAckert * build: fix quotes in iconv Signed-off-by: MarkAckert * deleted hyphen Signed-off-by: mm667937 * script was trying to convert files that are in input directory but it was trying it from working directory Signed-off-by: mm667937 * build: fix variable Signed-off-by: MarkAckert * build: correct conversion script; use find instead of ls Signed-off-by: MarkAckert * Have to convert all the workflows back to IBM-1047 before copy into dataset(not going into pswi, just test dir) Signed-off-by: mm667937 * update changelog target version Signed-off-by: MarkAckert --------- Signed-off-by: MarkAckert Signed-off-by: mm667937 Co-authored-by: mm667937 --- .pax/pre-packaging.sh | 143 +++++++++++++++++++++++++++--------------- CHANGELOG.md | 12 ++++ pswi/03_create.sh | 30 +++++---- 3 files changed, 124 insertions(+), 61 deletions(-) diff --git a/.pax/pre-packaging.sh b/.pax/pre-packaging.sh index 819d4818ea..85f92603a7 100755 --- a/.pax/pre-packaging.sh +++ b/.pax/pre-packaging.sh @@ -26,6 +26,51 @@ # ./content/templates/ # ./content/ +# --------------------------------------------------------------------- +# --- convert files to ascii +# $1: (input) pattern to convert. +# Files will be determined by 'find -type f' +# $2: (input) optional output directory. +# If unset, conversion happens in-place +# If set, conversion will mirror directory structure in output +# (output) converted files or directory following $2 +# TODO: is this replacable with autoconv? +# --------------------------------------------------------------------- +function _convertEbcdicToAscii { + input=$1 + output_dir=$2 + using_output_dir="no" + + if [ -z "$output_dir" ]; then + echo "[$SCRIPT_NAME] converting $input to ascii in-place" + else + if [ -f "$output_dir" ]; then + echo "[$SCRIPT_NAME] $output_dir already exists and is a file, aborting _convertEbcdicToAscii" + return 1 + elif [ ! -d "$output_dir" ]; then + mkdir -p "$output_dir" + fi + using_output_dir="yes" + echo "[$SCRIPT_NAME] will convert $input to ascii, results in $output_dir" + fi + + files_to_convert=$(find $input -type f) # processes all files + for ebcdic_file in $files_to_convert; do + echo "[$SCRIPT_NAME] converting $ebcdic_file to ascii..." + tmpfile="$(basename $ebcdic_file).tmp" + iconv -f IBM-1047 -t ISO8859-1 "${ebcdic_file}" >${tmpfile} + if [[ "$using_output_dir" == "yes" ]]; then + dir_path=$(dirname $ebcdic_file) + mkdir -p ${output_dir}/${dir_path} + mv "${tmpfile}" "${output_dir}/${ebcdic_file}" + else + mv "${tmpfile}" "${ebcdic_file}" + fi + done + + return 0 +} # _convertEbcdicToAscii + # --------------------------------------------------------------------- # --- create JCL files # $1: (input) location of .vtl & .properties files @@ -35,33 +80,31 @@ # --------------------------------------------------------------------- function _createJCL { - VTLCLI_PATH="/ZOWE/vtl-cli" # tools, path must be absolute + VTLCLI_PATH="/ZOWE/vtl-cli" # tools, path must be absolute # vtl-cli source: https://github.com/plavjanik/vtl-cli if [ -f "$1/$2.vtl" ]; then - vtlList="$2.vtl" # process just this file + vtlList="$2.vtl" # process just this file vtlPath="$1" elif [ -d "$1/$2" ]; then - vtlList="$(ls $1/$2/)" # process all if directory passed in + vtlList="$(ls $1/$2/)" # process all if directory passed in vtlPath="$1/${2:-.}" else echo "[$SCRIPT_NAME] $1/$2.vtl not found" exit 1 fi - for vtlEntry in $vtlList - do - if [ "${vtlEntry##*.}" = "vtl" ] # keep from last . (exclusive) - then - vtlBase="${vtlEntry%.*}" # keep up to last . (exclusive) + for vtlEntry in $vtlList; do + if [ "${vtlEntry##*.}" = "vtl" ]; then # keep from last . (exclusive) + vtlBase="${vtlEntry%.*}" # keep up to last . (exclusive) JCL="${JCL_PATH}/${vtlBase}.jcl" VTL="${vtlPath}/${vtlEntry}" if [ -f ${vtlPath}/${vtlBase}.properties ]; then YAML="${vtlPath}/${vtlBase}.properties" - # elif [ -f ${vtlPath}/${vtlBase}.yaml ]; then - # YAML="${vtlPath}/${vtlBase}.yaml" - # elif [ -f ${vtlPath}/${vtlBase}.yml ]; then - # YAML="${vtlPath}/${vtlBase}.yml" + # elif [ -f ${vtlPath}/${vtlBase}.yaml ]; then + # YAML="${vtlPath}/${vtlBase}.yaml" + # elif [ -f ${vtlPath}/${vtlBase}.yml ]; then + # YAML="${vtlPath}/${vtlBase}.yml" else echo "[$SCRIPT_NAME] ${vtlPath}/${vtlBase}.properties not found" exit 1 @@ -74,9 +117,9 @@ function _createJCL # assumes java is in $PATH java -jar ${VTLCLI_PATH}/vtl-cli.jar \ -ie Cp1140 --yaml-context ${YAML} ${VTL} -o ${JCL} -oe Cp1140 - fi # vtl found + fi # vtl found done -} # _createJCL +} # _createJCL # --------------------------------------------------------------------- # --- create workflow & JCL files @@ -89,62 +132,63 @@ function _createJCL function _createWorkflow { here=$(pwd) - CREAXML_PATH="${here}/templates" # tools, path must be absolute + CREAXML_PATH="${here}/templates" # tools, path must be absolute if [ -f "$1/$2.xml" ]; then - xmlList="$2.xml" # process just this file + xmlList="$2.xml" # process just this file xmlPath="$1" elif [ -d "$1/$2" ]; then - xmlList="$(ls $1/$2/)" # process all if directory passed in + xmlList="$(ls $1/$2/)" # process all if directory passed in xmlPath="$1/${2:-.}" else echo "[$SCRIPT_NAME] $1/$2.xml not found" exit 1 fi - for xmlEntry in $xmlList - do - if [ "${xmlEntry##*.}" = "xml" ] # keep from last . (exclusive) - then - xmlBase="${xmlEntry%.*}" # keep up to last . (exclusive) - XML="${here}/${WORKFLOW_PATH}/${xmlBase}.xml" # use absolute path + for xmlEntry in $xmlList; do + if [ "${xmlEntry##*.}" = "xml" ]; then # keep from last . (exclusive) + xmlBase="${xmlEntry%.*}" # keep up to last . (exclusive) + XML="${here}/${WORKFLOW_PATH}/${xmlBase}.xml" # use absolute path if [ -d ${xmlBase} ]; then # TODO ensure workflow yaml has all variables of JCL yamls fi - + # create JCL related to this workflow - _createJCL ${xmlPath} ${xmlBase} # ${xmlBase} can be a directory + _createJCL ${xmlPath} ${xmlBase} # ${xmlBase} can be a directory # create workflow echo "[$SCRIPT_NAME] creating $XML" # inlineTemplate definition in xml expects us to be in $xmlPath cd "${xmlPath}" ${CREAXML_PATH}/build-workflow.rex -d -i ${xmlEntry} -o ${XML} - rm -f ${xmlEntry} # remove to avoid processing twice - cd - # return to previous directory + rm -f ${xmlEntry} # remove to avoid processing twice + cd - # return to previous directory # copy default variable definitions to ${WORKFLOW_PATH} if [ -f ${xmlPath}/${xmlBase}.properties ]; then YAML="${xmlPath}/${xmlBase}.properties" - # elif [ -f ${xmlPath}/${xmlBase}.yaml ]; then - # YAML="${xmlPath}/${xmlBase}.yaml" - # elif [ -f ${xmlPath}/${xmlBase}.yml ]; then - # YAML="${xmlPath}/${xmlBase}.yml" + # elif [ -f ${xmlPath}/${xmlBase}.yaml ]; then + # YAML="${xmlPath}/${xmlBase}.yaml" + # elif [ -f ${xmlPath}/${xmlBase}.yml ]; then + # YAML="${xmlPath}/${xmlBase}.yml" else echo "[$SCRIPT_NAME] ${xmlPath}/${xmlBase}.properties not found" exit 1 fi cp "${YAML}" "${WORKFLOW_PATH}/${xmlBase}.properties" - fi # xml found + fi # xml found done -} # _createWorkflow +} # _createWorkflow # --------------------------------------------------------------------- # --- main --- main --- main --- main --- main --- main --- main --- # --------------------------------------------------------------------- -SCRIPT_NAME=$(basename "$0") # $0=./pre-packaging.sh -BASE_DIR=$(cd $(dirname "$0"); pwd) # /.pax +SCRIPT_NAME=$(basename "$0") # $0=./pre-packaging.sh +BASE_DIR=$( + cd $(dirname "$0") + pwd +) # /.pax # use node v14 to build export NODE_HOME=/ZOWE/node/node-v14.21.3.1-os390-s390x @@ -196,15 +240,14 @@ cd "${BASE_DIR}" # prepare for SMPE echo "[$SCRIPT_NAME] smpe is not part of zowe.pax, moving it out ..." -mv ./content/smpe . +mv ./content/smpe . # workflow customization # >>> echo "[$SCRIPT_NAME] templates is not part of zowe.pax, moving it out ..." -mv ./content/templates . +mv ./content/templates . chmod +x templates/*.rex - mkdir -p "${ZOWE_ROOT_DIR}/bin/utils" configmgr=$(find "${ZOWE_ROOT_DIR}/files" -type f \( -name "configmgr-2*.pax" \) | head -n 1) echo "[$SCRIPT_NAME] extract configmgr $configmgr" @@ -221,9 +264,8 @@ pax -ppx -rf "${configmgr_rexx}" rm "${configmgr_rexx}" cd "${BASE_DIR}" - echo "[$SCRIPT_NAME] create dummy zowe.yaml for install" -cat <> "${BASE_DIR}/zowe.yaml" +cat <>"${BASE_DIR}/zowe.yaml" zowe: extensionDirectory: "${ZOWE_ROOT_DIR}/components" useConfigmgr: false @@ -250,9 +292,9 @@ for component in app-server; do echo "[$SCRIPT_NAME] - ${component}" # FIXME: these environment variables are changed in v2 ZOWE_ROOT_DIR=${ZOWE_ROOT_DIR} \ - ZWED_INSTALL_DIR=${ZOWE_ROOT_DIR} \ - LOG_FILE="${BASE_DIR}/logs/zwe-components-install-process-hook.log" \ - "${ZOWE_ROOT_DIR}/bin/zwe" \ + ZWED_INSTALL_DIR=${ZOWE_ROOT_DIR} \ + LOG_FILE="${BASE_DIR}/logs/zwe-components-install-process-hook.log" \ + "${ZOWE_ROOT_DIR}/bin/zwe" \ components install process-hook \ --component-name "${component}" \ --config "${BASE_DIR}/zowe.yaml" \ @@ -318,7 +360,10 @@ else exit 1 fi -#3. clean up working files +#3. Convert z/OSMF workflows and templates to ASCII in-place +_convertEbcdicToAscii "${WORKFLOW_PATH}" + +#4. clean up working files echo "[$SCRIPT_NAME] clean up working files" rm -rf "./templates" @@ -332,11 +377,11 @@ echo "[$SCRIPT_NAME] generate fingerprints" mkdir -p "${BASE_DIR}/fingerprints" mkdir -p "${ZOWE_ROOT_DIR}/fingerprint" cd "${ZOWE_ROOT_DIR}" -find . -name ./SMPE -prune \ - -o -name "./ZWE*" -prune \ - -o -name ./fingerprint -prune \ - -o -type f -print > "${BASE_DIR}/fingerprints/files.in" -java -cp "${ZOWE_ROOT_DIR}/bin/utils" HashFiles "${BASE_DIR}/fingerprints/files.in" | sort > "${ZOWE_ROOT_DIR}/fingerprint/RefRuntimeHash-${ZOWE_VERSION}.txt" +find . -name ./SMPE -prune \ + -o -name "./ZWE*" -prune \ + -o -name ./fingerprint -prune \ + -o -type f -print >"${BASE_DIR}/fingerprints/files.in" +java -cp "${ZOWE_ROOT_DIR}/bin/utils" HashFiles "${BASE_DIR}/fingerprints/files.in" | sort >"${ZOWE_ROOT_DIR}/fingerprint/RefRuntimeHash-${ZOWE_VERSION}.txt" echo "[$SCRIPT_NAME] cleanup fingerprints code" rm -fr "${BASE_DIR}/fingerprints" diff --git a/CHANGELOG.md b/CHANGELOG.md index 4892c37682..7c6ce5f47b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,18 @@ All notable changes to the Zowe Installer will be documented in this file. +## `2.13.0` + +### New features and enhancements + +#### Minor enhancements/defect fixes +- Bugfix: Workflow files in the Zowe PAX are now ASCII-encoded. Fixes [#3591](https://github.com/zowe/zowe-install-packaging/issues/3591). + +## `2.12.0` + +### New features and enhancements + +#### Minor enhancements/defect fixes ## `2.11.0` diff --git a/pswi/03_create.sh b/pswi/03_create.sh index a300646fab..99d4ab7687 100644 --- a/pswi/03_create.sh +++ b/pswi/03_create.sh @@ -131,28 +131,34 @@ echo "SH set -x;set -e;" >> JCL echo "cd ${WORK_MOUNT};" >> JCL echo "source=\"${ZOWE_MOUNT}files/workflows/ZWEWRF02.xml\";" >> JCL echo "target=\"//'${WORKFLOW_DSN}(ZWEWRF02)'\";" >> JCL -echo "sed 's|UTF-8|IBM-1047|g' \$source > _ZWEWRF02;" >> JCL -echo "cp -T _ZWEWRF02 \$target;" >> JCL +echo "iconv -f ISO8859-1 -t IBM-1047 \$source > _ZWEWRF02;" >> JCL +echo "sed 's|UTF-8|IBM-1047|g' _ZWEWRF02 > ZWEWRF02;" >> JCL +echo "cp -T ZWEWRF02 \$target;" >> JCL echo "source=\"${ZOWE_MOUNT}files/workflows/ZWECRECR.xml\";" >> JCL echo "target=\"//'${WORKFLOW_DSN}(ZWECRECR)'\";" >> JCL -echo "sed 's|UTF-8|IBM-1047|g' \$source > _ZWECRECR;" >> JCL -echo "cp -T _ZWECRECR \$target;" >> JCL +echo "iconv -f ISO8859-1 -t IBM-1047 \$source > _ZWECRECR;" >> JCL +echo "sed 's|UTF-8|IBM-1047|g' _ZWECRECR > ZWECRECR;" >> JCL +echo "cp -T ZWECRECR \$target;" >> JCL echo "source=\"${ZOWE_MOUNT}files/workflows/ZWEKRING.xml\";" >> JCL echo "target=\"//'${WORKFLOW_DSN}(ZWEKRING)'\";" >> JCL -echo "sed 's|UTF-8|IBM-1047|g' \$source > _ZWEKRING;" >> JCL -echo "cp -T _ZWEKRING \$target;" >> JCL +echo "iconv -f ISO8859-1 -t IBM-1047 \$source > _ZWEKRING;" >> JCL +echo "sed 's|UTF-8|IBM-1047|g' _ZWEKRING > ZWEKRING;" >> JCL +echo "cp -T ZWEKRING \$target;" >> JCL echo "source=\"${ZOWE_MOUNT}files/workflows/ZWELOADC.xml\";" >> JCL echo "target=\"//'${WORKFLOW_DSN}(ZWELOADC)'\";" >> JCL -echo "sed 's|UTF-8|IBM-1047|g' \$source > _ZWELOADC;" >> JCL -echo "cp -T _ZWELOADC \$target;" >> JCL +echo "iconv -f ISO8859-1 -t IBM-1047 \$source > _ZWELOADC;" >> JCL +echo "sed 's|UTF-8|IBM-1047|g' _ZWELOADC > ZWELOADC;" >> JCL +echo "cp -T ZWELOADC \$target;" >> JCL echo "source=\"${ZOWE_MOUNT}files/workflows/ZWESIGNC.xml\";" >> JCL echo "target=\"//'${WORKFLOW_DSN}(ZWESIGNC)'\";" >> JCL -echo "sed 's|UTF-8|IBM-1047|g' \$source > _ZWESIGNC;" >> JCL -echo "cp -T _ZWESIGNC \$target;" >> JCL +echo "iconv -f ISO8859-1 -t IBM-1047 \$source > _ZWESIGNC;" >> JCL +echo "sed 's|UTF-8|IBM-1047|g' _ZWESIGNC > ZWESIGNC;" >> JCL +echo "cp -T ZWESIGNC \$target;" >> JCL echo "source=\"${ZOWE_MOUNT}files/workflows/ZWECONF.xml\";" >> JCL echo "target=\"//'${WORKFLOW_DSN}(ZWECONF)'\";" >> JCL -echo "sed 's|UTF-8|IBM-1047|g' \$source > _ZWECONF;" >> JCL -echo "cp -T _ZWECONF \$target;" >> JCL +echo "iconv -f ISO8859-1 -t IBM-1047 \$source > _ZWECONF;" >> JCL +echo "sed 's|UTF-8|IBM-1047|g' _ZWECONF > ZWECONF;" >> JCL +echo "cp -T ZWECONF \$target;" >> JCL echo "/*" >> JCL sh scripts/submit_jcl.sh "`cat JCL`" From bfc4f26b8bac4dee3272cffcb50dbf3f610293fb Mon Sep 17 00:00:00 2001 From: Martin Zeithaml <66114686+Martin-Zeithaml@users.noreply.github.com> Date: Fri, 20 Oct 2023 19:05:37 +0200 Subject: [PATCH 109/168] Formatting in general pattern (#3615) Signed-off-by: Martin Zeithaml Co-authored-by: Mark Ackert <35308966+MarkAckert@users.noreply.github.com> --- CHANGELOG.md | 4 +++ bin/libs/certificate.sh | 4 +-- bin/utils/date-add.rex | 59 ++++++++++++++++++++++++++++++++++------- 3 files changed, 55 insertions(+), 12 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 7c6ce5f47b..f0dfd72d56 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -15,6 +15,10 @@ All notable changes to the Zowe Installer will be documented in this file. #### Minor enhancements/defect fixes +## `2.13.0` +#### Minor enhancements/defect fixes +- Enhancement: `/bin/utils/date-add.rex` utility is accepting the date formatting as combination of YY|YYYY, MM, DD and any separator. + ## `2.11.0` ### New features and enhancements diff --git a/bin/libs/certificate.sh b/bin/libs/certificate.sh index d323d4f25a..49fcc232ef 100644 --- a/bin/libs/certificate.sh +++ b/bin/libs/certificate.sh @@ -884,8 +884,8 @@ EOF fi date_add_util="${ZWE_zowe_runtimeDirectory}/bin/utils/date-add.rex" - validity_ymd=$("${date_add_util}" ${validity} 1234-56-78) - validity_mdy=$("${date_add_util}" ${validity} 56/78/34) + validity_ymd=$("${date_add_util}" ${validity} YYYY-MM-DD) + validity_mdy=$("${date_add_util}" ${validity} MM/DD/YY) # option 2 needs further changes on JCL racf_connect1="s/dummy/dummy/" diff --git a/bin/utils/date-add.rex b/bin/utils/date-add.rex index c8f3649a3e..bf6b0d120d 100755 --- a/bin/utils/date-add.rex +++ b/bin/utils/date-add.rex @@ -13,19 +13,58 @@ /* * Parameters: - * 1: how many days in the future - * 2: date format. - * For example, 1234-56-78 will be YYYY-MM-DD. - * For example, 56/78/34 will be MM/DD/YY. + * 1: days: how many days in the future or past + * negative number for past + * 2: dformat: date format + * Combination of YY|YYYY, MM and DD and (optional) any separator + * For example: YYYY-MM-DD, MM/DD/YY, DD.MM.YY, YYMMDD... * - * Example: date-add.rexx 7 1234-56-78 + * Examples: + * date-add.rex 7 YYYY-MM-DD + * date-add.rex -1 MM/DD/YY */ arg options -parse var options days format +parse upper var options days dformat -today = Date('Base') +ERR_DATE.1 = "YY or YYYY (year)" +ERR_DATE.2 = "MM (month)" +ERR_DATE.3 = "DD (day)" + +if datatype(days) \= "NUM" then do + say "ERROR: expected numeric value for days: '"days"'" + exit 1 +end +/* YYMMDD -> YYYY/MM/DD */ +if length(dformat) < 6 | length(dformat) > 10 then do + len = 'short' + if length(dformat) > 10 then + len = 'long' + say "ERROR: invalid date format: '"||dformat||"' is too "||len + exit 1 +end +else do i = 1 to 3 + if pos(word(ERR_DATE.i, 1), dformat) = 0 then do + say "ERROR: invalid date format: '"||dformat||, + "' is missing "||ERR_DATE.i + exit 1 + end +end + +today = Date("Base") target = today + days -ISOTarget = Date('Standard', target, 'Base') -result = Translate(format, ISOTarget, '12345678') -say result +ISOTarget = Date("Standard", target, "Base") + +/* ISOTarget YYYYMMDD */ +/* 12344578 => YYYY = 1234, MM = 56, DD = 78 */ + +if pos("YYYY", dformat) = 0 then + dformat = overlay("34", dformat, pos("YY", dformat)) +else + dformat = overlay("1234", dformat, pos("YYYY", dformat)) +dformat = overlay("56", dformat, pos("MM", dformat)) +dformat = overlay("78", dformat, pos("DD", dformat)) + +res = translate(dformat, ISOTarget, "12345678") +say res +exit 0 From 9c584f96118bdcc0bbee4d310b012496f7c0efda Mon Sep 17 00:00:00 2001 From: ojcelis Date: Tue, 24 Oct 2023 12:23:20 -0400 Subject: [PATCH 110/168] add new PTF numbers Signed-off-by: ojcelis --- smpe/bld/service/ptf-bucket.txt | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/smpe/bld/service/ptf-bucket.txt b/smpe/bld/service/ptf-bucket.txt index ac0efb82f1..678f551643 100644 --- a/smpe/bld/service/ptf-bucket.txt +++ b/smpe/bld/service/ptf-bucket.txt @@ -18,4 +18,7 @@ #UO90020 UO90021 - IO29182 IO29183 IO29184 - Tue Jun 13 21:20:27 UTC 2023 #UO90022 UO90023 - IO29185 IO29186 IO29187 - Fri Jul 28 01:08:59 UTC 2023 #UO90031 UO90032 - IO29286 IO29287 IO29288 - Tue Sep 12 18:27:05 UTC 2023 -UO90033 UO90034 - IO29289 IO29290 IO29291 \ No newline at end of file +UO90033 UO90034 - IO29289 IO29290 IO29291 +UO90045 UO90046 - IO29343 IO29344 IO29345 +UO90047 UO90048 - IO29346 IO29347 IO29348 +UO90049 UO90050 - IO29349 IO29350 IO29351 \ No newline at end of file From 1cf6d441042ad4051e329847ebd973a18a2c0632 Mon Sep 17 00:00:00 2001 From: zowe-robot Date: Tue, 24 Oct 2023 19:49:49 +0000 Subject: [PATCH 111/168] Promote PTF after release v2.12.0 Signed-off-by: zowe-robot --- smpe/bld/service/promoted-apar.txt | 3 ++ smpe/bld/service/promoted-close.txt | 45 +++++++++++++++++++++++++++++ smpe/bld/service/promoted-hold.txt | 25 ++++++++++++++++ smpe/bld/service/promoted-ptf.txt | 2 ++ smpe/bld/service/ptf-bucket.txt | 2 +- 5 files changed, 76 insertions(+), 1 deletion(-) diff --git a/smpe/bld/service/promoted-apar.txt b/smpe/bld/service/promoted-apar.txt index 7675df3320..eda8068aeb 100644 --- a/smpe/bld/service/promoted-apar.txt +++ b/smpe/bld/service/promoted-apar.txt @@ -1,3 +1,6 @@ +IO29289 +IO29290 +IO29291 IO29286 IO29287 IO29288 diff --git a/smpe/bld/service/promoted-close.txt b/smpe/bld/service/promoted-close.txt index ad937b94d8..1a8d92b9ca 100644 --- a/smpe/bld/service/promoted-close.txt +++ b/smpe/bld/service/promoted-close.txt @@ -1,3 +1,48 @@ + IO29289 - + PROBLEM SUMMARY: + **************************************************************** + * USERS AFFECTED: All Zowe users * + **************************************************************** + * PROBLEM DESCRIPTION: Update Zowe FMID AZWE002 to match the * + * community release * + **************************************************************** + * RECOMMENDATION: Apply provided service * + **************************************************************** + The Zowe community version was updated to 2.12.0. + This PTF provides the community changes in SMP/E format. + Follow this link for more details on the community changes: + https://docs.zowe.org/stable/ + + IO29290 - + PROBLEM SUMMARY: + **************************************************************** + * USERS AFFECTED: All Zowe users * + **************************************************************** + * PROBLEM DESCRIPTION: Update Zowe FMID AZWE002 to match the * + * community release * + **************************************************************** + * RECOMMENDATION: Apply provided service * + **************************************************************** + The Zowe community version was updated to 2.12.0. + This PTF provides the community changes in SMP/E format. + Follow this link for more details on the community changes: + https://docs.zowe.org/stable/ + + IO29291 - + PROBLEM SUMMARY: + **************************************************************** + * USERS AFFECTED: All Zowe users * + **************************************************************** + * PROBLEM DESCRIPTION: Update Zowe FMID AZWE002 to match the * + * community release * + **************************************************************** + * RECOMMENDATION: Apply provided service * + **************************************************************** + The Zowe community version was updated to 2.12.0. + This PTF provides the community changes in SMP/E format. + Follow this link for more details on the community changes: + https://docs.zowe.org/stable/ + IO29286 - PROBLEM SUMMARY: **************************************************************** diff --git a/smpe/bld/service/promoted-hold.txt b/smpe/bld/service/promoted-hold.txt index e4a768ccd8..7df8737e0f 100644 --- a/smpe/bld/service/promoted-hold.txt +++ b/smpe/bld/service/promoted-hold.txt @@ -1,3 +1,28 @@ +++HOLD(UO90033) SYSTEM FMID(AZWE002) REASON(ACTION) DATE(23297) + COMMENT( + **************************************************************** + * Affected function: Zowe servers * + **************************************************************** + * Description: stop servers * + **************************************************************** + * Timing: pre-APPLY * + **************************************************************** + * Part: ZWESLSTC and ZWESISTC * + **************************************************************** + Stop the Zowe servers before installing this update. + + **************************************************************** + * Affected function: Zowe servers * + **************************************************************** + * Description: start servers * + **************************************************************** + * Timing: post-APPLY * + **************************************************************** + * Part: ZWESLSTC and ZWESISTC * + **************************************************************** + Start the Zowe servers after installing this update. + + ). ++HOLD(UO90031) SYSTEM FMID(AZWE002) REASON(ACTION) DATE(23255) COMMENT( **************************************************************** diff --git a/smpe/bld/service/promoted-ptf.txt b/smpe/bld/service/promoted-ptf.txt index 0867777fc6..4782225075 100644 --- a/smpe/bld/service/promoted-ptf.txt +++ b/smpe/bld/service/promoted-ptf.txt @@ -1,3 +1,5 @@ +UO90033 +UO90034 UO90031 UO90032 UO90022 diff --git a/smpe/bld/service/ptf-bucket.txt b/smpe/bld/service/ptf-bucket.txt index ac0efb82f1..060c2378b6 100644 --- a/smpe/bld/service/ptf-bucket.txt +++ b/smpe/bld/service/ptf-bucket.txt @@ -18,4 +18,4 @@ #UO90020 UO90021 - IO29182 IO29183 IO29184 - Tue Jun 13 21:20:27 UTC 2023 #UO90022 UO90023 - IO29185 IO29186 IO29187 - Fri Jul 28 01:08:59 UTC 2023 #UO90031 UO90032 - IO29286 IO29287 IO29288 - Tue Sep 12 18:27:05 UTC 2023 -UO90033 UO90034 - IO29289 IO29290 IO29291 \ No newline at end of file +#UO90033 UO90034 - IO29289 IO29290 IO29291 - Tue Oct 24 19:49:48 UTC 2023 \ No newline at end of file From ea362ceeda238927b4a3bc803c4b3dce76de42fb Mon Sep 17 00:00:00 2001 From: ojcelis Date: Wed, 25 Oct 2023 08:19:18 -0400 Subject: [PATCH 112/168] updated PTF bucket Signed-off-by: ojcelis --- smpe/bld/service/ptf-bucket.txt | 1 - 1 file changed, 1 deletion(-) diff --git a/smpe/bld/service/ptf-bucket.txt b/smpe/bld/service/ptf-bucket.txt index 67168bbe66..daa206b57a 100644 --- a/smpe/bld/service/ptf-bucket.txt +++ b/smpe/bld/service/ptf-bucket.txt @@ -19,7 +19,6 @@ #UO90022 UO90023 - IO29185 IO29186 IO29187 - Fri Jul 28 01:08:59 UTC 2023 #UO90031 UO90032 - IO29286 IO29287 IO29288 - Tue Sep 12 18:27:05 UTC 2023 #UO90033 UO90034 - IO29289 IO29290 IO29291 - Tue Oct 24 19:49:48 UTC 2023 -UO90033 UO90034 - IO29289 IO29290 IO29291 UO90045 UO90046 - IO29343 IO29344 IO29345 UO90047 UO90048 - IO29346 IO29347 IO29348 UO90049 UO90050 - IO29349 IO29350 IO29351 \ No newline at end of file From f84232216a86625b885919f50d1fa46688d958cf Mon Sep 17 00:00:00 2001 From: 1000TurquoisePogs Date: Wed, 25 Oct 2023 09:24:35 -0500 Subject: [PATCH 113/168] Update cicd-test-readme.md Signed-off-by: 1000TurquoisePogs --- .github/workflows/cicd-test-readme.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/cicd-test-readme.md b/.github/workflows/cicd-test-readme.md index 26c6a38836..e2da92b983 100644 --- a/.github/workflows/cicd-test-readme.md +++ b/.github/workflows/cicd-test-readme.md @@ -110,7 +110,7 @@ Background: CICD testing relies on a `zowe.pax` or `zowe-smpe.zip` (for SMPE ins When running CICD integration tests during RC stage, the following string will be parsed into the Github Actions matrix. As a result, a total of 21 independent jobs will be spawned. ``` -basic/install.ts(zzow02,zzow03,zzow04);basic/install-ptf.ts(zzow02,zzow03,zzow04);basic/install-ext.ts(zzow03);extended/keyring.ts(zzow02,zzow03,zzow04);extended/node-versions/node-v8.ts(zzow02,zzow03,zzow04);extended/node-versions/node-v14.ts(zzow02,zzow03,zzow04);extended/certificates/nonstrict-verify-external-certificate.ts(zzow02) +basic/install.ts(zzow02,zzow03,zzow04);basic/install-ptf.ts(zzow02,zzow03,zzow04);basic/install-ext.ts(zzow03);extended/keyring.ts(zzow02,zzow03,zzow04);extended/node-versions/node-v16.ts(zzow02,zzow03,zzow04);extended/certificates/nonstrict-verify-external-certificate.ts(zzow02) ``` Total elapsed time when running in parallel is approximately 3.5 hours on paper idealy if all parallel jobs are executing at the same time. In reality, from numerous tests performed, total elapsed time is around 4 hours. From 250e53a6b591de7cea7c49fcd9defc38d855b414 Mon Sep 17 00:00:00 2001 From: 1000TurquoisePogs Date: Wed, 25 Oct 2023 09:25:47 -0500 Subject: [PATCH 114/168] Update cicd-test.yml Signed-off-by: 1000TurquoisePogs --- .github/workflows/cicd-test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/cicd-test.yml b/.github/workflows/cicd-test.yml index 5deecc5ef9..a1e5119d39 100644 --- a/.github/workflows/cicd-test.yml +++ b/.github/workflows/cicd-test.yml @@ -83,7 +83,7 @@ env: CONFIG_MANAGER_TESTFILE: extended/config-manager/enable-config-manager.ts GENERAL_API_DOCUMENTATION_TESTFILE: basic/install-api-gen.ts ZOWE_NIGHTLY_TESTS_FULL: basic/install.ts(all);basic/install-ptf.ts(all) - ZOWE_RELEASE_TESTS_FULL: basic/install.ts(all);basic/install-ptf.ts(all);basic/install-ext.ts(any);extended/keyring.ts(all);extended/node-versions/node-v14.ts(any);extended/node-versions/node-v16.ts(any);extended/node-versions/node-v18.ts(zzow04):extended/certificates/nonstrict-verify-external-certificate.ts(any);extended/caching-storages/infinispan-storage.ts(any);extended/config-manager/enable-config-manager.ts(any) + ZOWE_RELEASE_TESTS_FULL: basic/install.ts(all);basic/install-ptf.ts(all);basic/install-ext.ts(any);extended/keyring.ts(all);extended/node-versions/node-v16.ts(any);extended/node-versions/node-v18.ts(zzow04):extended/certificates/nonstrict-verify-external-certificate.ts(any);extended/caching-storages/infinispan-storage.ts(any);extended/config-manager/enable-config-manager.ts(any) jobs: display-dispatch-event-id: From b31828d2ff9813c77efdd11b9ac394d4cef21d44 Mon Sep 17 00:00:00 2001 From: ojcelis Date: Wed, 25 Oct 2023 13:23:29 -0400 Subject: [PATCH 115/168] update zowe version to next release Signed-off-by: ojcelis --- manifest.json.template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.json.template b/manifest.json.template index bfd04cc9fa..d925e240e8 100644 --- a/manifest.json.template +++ b/manifest.json.template @@ -1,6 +1,6 @@ { "name": "Zowe", - "version": "2.12.0", + "version": "2.13.0", "description": "Zowe is an open source project created to host technologies that benefit the Z platform from all members of the Z community (Integrated Software Vendors, System Integrators and z/OS consumers). Zowe, like Mac or Windows, comes with a set of APIs and OS capabilities that applications build on and also includes some applications out of the box. Zowe offers modern interfaces to interact with z/OS and allows you to work with z/OS in a way that is similar to what you experience on cloud platforms today. You can use these interfaces as delivered or through plug-ins and extensions that are created by clients or third-party vendors.", "license": "EPL-2.0", "homepage": "https://zowe.org", From 75414a8ec3f2ac59fc73e51f880c45b4c2363f9b Mon Sep 17 00:00:00 2001 From: MarkAckert Date: Wed, 25 Oct 2023 15:07:11 -0400 Subject: [PATCH 116/168] build: remove node v14/v16 refs; cicd defaults to v16 Signed-off-by: MarkAckert --- .github/scripts/cicd_test/make_matrix.sh | 4 -- .github/workflows/cicd-test-readme.md | 4 +- .github/workflows/cicd-test.yml | 9 +--- .pax/pre-packaging.sh | 4 +- containers/conformance.md | 2 +- .../extended/node-versions/node-v14.ts | 44 ------------------- .../extended/node-versions/node-v16.ts | 44 ------------------- 7 files changed, 6 insertions(+), 105 deletions(-) delete mode 100644 tests/installation/src/__tests__/extended/node-versions/node-v14.ts delete mode 100644 tests/installation/src/__tests__/extended/node-versions/node-v16.ts diff --git a/.github/scripts/cicd_test/make_matrix.sh b/.github/scripts/cicd_test/make_matrix.sh index 899a6a0a77..5a94f3c4b5 100644 --- a/.github/scripts/cicd_test/make_matrix.sh +++ b/.github/scripts/cicd_test/make_matrix.sh @@ -32,10 +32,6 @@ case $install_test_choice in test_file="$KEYRING_TESTFILE" ;; -"z/OS node v16") - test_file="$ZOS_NODE_V16_TESTFILE" - ;; - "z/OS node v18") test_file="$ZOS_NODE_V18_TESTFILE" test_force_system="zzow04" diff --git a/.github/workflows/cicd-test-readme.md b/.github/workflows/cicd-test-readme.md index e2da92b983..c6820292bb 100644 --- a/.github/workflows/cicd-test-readme.md +++ b/.github/workflows/cicd-test-readme.md @@ -29,7 +29,6 @@ Workflow trigger is at [cicd-test](https://github.com/zowe/zowe-install-packagin - SMPE PTF - Extensions - Keyring - - z/OS node v16 - z/OS node v18 - Non-strict Verify External Certificate - Install PTF twice @@ -110,7 +109,7 @@ Background: CICD testing relies on a `zowe.pax` or `zowe-smpe.zip` (for SMPE ins When running CICD integration tests during RC stage, the following string will be parsed into the Github Actions matrix. As a result, a total of 21 independent jobs will be spawned. ``` -basic/install.ts(zzow02,zzow03,zzow04);basic/install-ptf.ts(zzow02,zzow03,zzow04);basic/install-ext.ts(zzow03);extended/keyring.ts(zzow02,zzow03,zzow04);extended/node-versions/node-v16.ts(zzow02,zzow03,zzow04);extended/certificates/nonstrict-verify-external-certificate.ts(zzow02) +basic/install.ts(zzow02,zzow03,zzow04);basic/install-ptf.ts(zzow02,zzow03,zzow04);basic/install-ext.ts(zzow03);extended/keyring.ts(zzow02,zzow03,zzow04);extended/node-versions/node-v18.ts(zzow02,zzow03,zzow04);extended/certificates/nonstrict-verify-external-certificate.ts(zzow02) ``` Total elapsed time when running in parallel is approximately 3.5 hours on paper idealy if all parallel jobs are executing at the same time. In reality, from numerous tests performed, total elapsed time is around 4 hours. @@ -123,7 +122,6 @@ Selected test running elapsed time: | Convenience Pax | 53m | | SMPE PTF | 68m | | z/OS node v18 | 45m | -| z/OS node v16 | 45m | | Keyring | 53m | | Non-strict Verify External Certificate | 51m | | Extensions | 67m diff --git a/.github/workflows/cicd-test.yml b/.github/workflows/cicd-test.yml index a1e5119d39..412fd38b1f 100644 --- a/.github/workflows/cicd-test.yml +++ b/.github/workflows/cicd-test.yml @@ -24,7 +24,6 @@ on: - SMPE PTF - Extensions - Keyring - - z/OS node v16 - z/OS node v18 - Non-strict Verify External Certificate - Install PTF Twice @@ -62,7 +61,7 @@ env: DEFAULT_ZOWE_EXT_ARTIFACTORY_PATTERN: libs-snapshot-local/org/zowe/{ext-name}/*/{ext-name}-*.pax # below block can be overwritten, adjusted by DevOps only - # ZOS_NODE_VERSION more to choose from: v16.20.1 + # ZOS_NODE_VERSION more to choose from: v16.20.1, v18.16.0 ZOS_NODE_VERSION: v16.20.1 CLIENT_NODE_VERSION: v12.18.3 INSTALL_TEST_DEBUG_INFORMATION: zowe-install-test:* @@ -74,7 +73,6 @@ env: SMPE_PTF_TESTFILE: basic/install-ptf.ts EXTENSIONS_TESTFILE: basic/install-ext.ts KEYRING_TESTFILE: extended/keyring.ts - ZOS_NODE_V16_TESTFILE: extended/node-versions/node-v16.ts ZOS_NODE_V18_TESTFILE: extended/node-versions/node-v18.ts NON_STRICT_VERIFY_EXTERNAL_CERTIFICATE_TESTFILE: extended/certificates/nonstrict-verify-external-certificate.ts INSTALL_PTF_TWICE_TESTFILE: extended/install-ptf-two-times.ts @@ -83,7 +81,7 @@ env: CONFIG_MANAGER_TESTFILE: extended/config-manager/enable-config-manager.ts GENERAL_API_DOCUMENTATION_TESTFILE: basic/install-api-gen.ts ZOWE_NIGHTLY_TESTS_FULL: basic/install.ts(all);basic/install-ptf.ts(all) - ZOWE_RELEASE_TESTS_FULL: basic/install.ts(all);basic/install-ptf.ts(all);basic/install-ext.ts(any);extended/keyring.ts(all);extended/node-versions/node-v16.ts(any);extended/node-versions/node-v18.ts(zzow04):extended/certificates/nonstrict-verify-external-certificate.ts(any);extended/caching-storages/infinispan-storage.ts(any);extended/config-manager/enable-config-manager.ts(any) + ZOWE_RELEASE_TESTS_FULL: basic/install.ts(all);basic/install-ptf.ts(all);basic/install-ext.ts(any);extended/keyring.ts(all);extended/node-versions/node-v18.ts(zzow04):extended/certificates/nonstrict-verify-external-certificate.ts(any);extended/caching-storages/infinispan-storage.ts(any);extended/config-manager/enable-config-manager.ts(any) jobs: display-dispatch-event-id: @@ -291,9 +289,6 @@ jobs: case 'Keyring': eta = 53 break; - case 'z/OS node v16': - eta = 45 - break; case 'z/OS node v18': eta = 45 break; diff --git a/.pax/pre-packaging.sh b/.pax/pre-packaging.sh index 819d4818ea..6d1c1571a0 100755 --- a/.pax/pre-packaging.sh +++ b/.pax/pre-packaging.sh @@ -146,8 +146,8 @@ function _createWorkflow SCRIPT_NAME=$(basename "$0") # $0=./pre-packaging.sh BASE_DIR=$(cd $(dirname "$0"); pwd) # /.pax -# use node v14 to build -export NODE_HOME=/ZOWE/node/node-v14.21.3.1-os390-s390x +# use node v16 to build +export NODE_HOME=/ZOWE/node/node-v16.20.1-os390-s390x ZOWE_ROOT_DIR="${BASE_DIR}/content" diff --git a/containers/conformance.md b/containers/conformance.md index d487941ef7..e5e43c5e1e 100644 --- a/containers/conformance.md +++ b/containers/conformance.md @@ -16,7 +16,7 @@ Here are our recommendations of base images: - Zowe base images: * `ompzowe/base`: `zowe-docker-release.jfrog.io/ompzowe/base:latest-ubuntu` and `zowe-docker-release.jfrog.io/ompzowe/base:latest-ubi`. - * `ompzowe/base-node`: `zowe-docker-release.jfrog.io/ompzowe/base-node:latest-ubuntu` and `zowe-docker-release.jfrog.io/ompzowe/base-node:latest-ubi` has node.js LTS (v14) version pre-installed. + * `ompzowe/base-node`: `zowe-docker-release.jfrog.io/ompzowe/base-node:latest-ubuntu` and `zowe-docker-release.jfrog.io/ompzowe/base-node:latest-ubi` has node.js LTS (v16) version pre-installed. * `ompzowe/base-jdk`: `zowe-docker-release.jfrog.io/ompzowe/base-jdk:latest-ubuntu` and `zowe-docker-release.jfrog.io/ompzowe/base-jdk:latest-ubi` has JRE v8 pre-installed. - [Red Hat Universal Base Image 8 Minimal](https://developers.redhat.com/articles/ubi-faq?redirect_fragment=resources#ubi_details) - [Ubuntu](https://hub.docker.com/_/ubuntu) diff --git a/tests/installation/src/__tests__/extended/node-versions/node-v14.ts b/tests/installation/src/__tests__/extended/node-versions/node-v14.ts deleted file mode 100644 index 00d47e38ab..0000000000 --- a/tests/installation/src/__tests__/extended/node-versions/node-v14.ts +++ /dev/null @@ -1,44 +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 IBM Corporation 2020 - */ - -import { - checkMandatoryEnvironmentVariables, - installAndVerifyConvenienceBuild, - showZoweRuntimeLogs, -} from '../../../utils'; -import { TEST_TIMEOUT_CONVENIENCE_BUILD } from '../../../constants'; - -const testServer = process.env.TEST_SERVER; -const testSuiteName = 'Test convenience build installation with node.js v6'; -describe(testSuiteName, () => { - beforeAll(() => { - // validate variables - checkMandatoryEnvironmentVariables([ - 'ZOWE_BUILD_LOCAL', - ]); - }); - - test('install and verify', async () => { - await installAndVerifyConvenienceBuild( - testSuiteName, - testServer, - { - 'zowe_build_local': process.env['ZOWE_BUILD_LOCAL'], - 'zowe_custom_for_test': 'true', - 'zos_node_home': '/ZOWE/node/node-v14.21.3.1-os390-s390x', - 'zowe_lock_keystore': 'false', - } - ); - }, TEST_TIMEOUT_CONVENIENCE_BUILD); - - afterAll(async () => { - await showZoweRuntimeLogs(testServer); - }) -}); diff --git a/tests/installation/src/__tests__/extended/node-versions/node-v16.ts b/tests/installation/src/__tests__/extended/node-versions/node-v16.ts deleted file mode 100644 index bebbbdb660..0000000000 --- a/tests/installation/src/__tests__/extended/node-versions/node-v16.ts +++ /dev/null @@ -1,44 +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 IBM Corporation 2022 - */ - -import { - checkMandatoryEnvironmentVariables, - installAndVerifyConvenienceBuild, - showZoweRuntimeLogs, -} from '../../../utils'; -import { TEST_TIMEOUT_CONVENIENCE_BUILD } from '../../../constants'; - -const testServer = process.env.TEST_SERVER; -const testSuiteName = 'Test convenience build installation with node.js v16'; -describe(testSuiteName, () => { - beforeAll(() => { - // validate variables - checkMandatoryEnvironmentVariables([ - 'ZOWE_BUILD_LOCAL', - ]); - }); - - test('install and verify', async () => { - await installAndVerifyConvenienceBuild( - testSuiteName, - testServer, - { - 'zowe_build_local': process.env['ZOWE_BUILD_LOCAL'], - 'zowe_custom_for_test': 'true', - 'zos_node_home': '/ZOWE/node/node-v16.20.1-os390-s390x', - 'zowe_lock_keystore': 'false', - } - ); - }, TEST_TIMEOUT_CONVENIENCE_BUILD); - - afterAll(async () => { - await showZoweRuntimeLogs(testServer); - }) -}); From 312bda6a6de3fd03a9fb8631f590ea25c5a86781 Mon Sep 17 00:00:00 2001 From: Martin Zeithaml Date: Fri, 27 Oct 2023 10:21:16 +0200 Subject: [PATCH 117/168] zwe diagnose running under configmgr Signed-off-by: Martin Zeithaml --- CHANGELOG.md | 6 +-- bin/commands/diagnose/index.sh | 70 ++++++++++++++++++++++++--------- bin/commands/diagnose/index.ts | 71 ++++++++++++++++++++++++---------- 3 files changed, 104 insertions(+), 43 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index f0dfd72d56..388029c040 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,8 @@ All notable changes to the Zowe Installer will be documented in this file. #### Minor enhancements/defect fixes - Bugfix: Workflow files in the Zowe PAX are now ASCII-encoded. Fixes [#3591](https://github.com/zowe/zowe-install-packaging/issues/3591). +- Enhancement: `/bin/utils/date-add.rex` utility is accepting the date formatting as combination of YY|YYYY, MM, DD and any separator. +- Bugfix: `zwe diagnose` running under comfigmgr and output formatted. Fixes #[3627](https://github.com/zowe/zowe-install-packaging/issues/3627). ## `2.12.0` @@ -15,10 +17,6 @@ All notable changes to the Zowe Installer will be documented in this file. #### Minor enhancements/defect fixes -## `2.13.0` -#### Minor enhancements/defect fixes -- Enhancement: `/bin/utils/date-add.rex` utility is accepting the date formatting as combination of YY|YYYY, MM, DD and any separator. - ## `2.11.0` ### New features and enhancements diff --git a/bin/commands/diagnose/index.sh b/bin/commands/diagnose/index.sh index e843993523..d1f07e8ebe 100644 --- a/bin/commands/diagnose/index.sh +++ b/bin/commands/diagnose/index.sh @@ -11,25 +11,59 @@ # Copyright Contributors to the Zowe Project. ####################################################################### -error_code="${ZWE_CLI_PARAMETER_ERROR_CODE}" +USE_CONFIGMGR=$(check_configmgr_enabled) +if [ "${USE_CONFIGMGR}" = "true" ]; then + _CEE_RUNOPTS="XPLINK(ON),HEAPPOOLS(OFF)" ${ZWE_zowe_runtimeDirectory}/bin/utils/configmgr -script "${ZWE_zowe_runtimeDirectory}/bin/commands/diagnose/cli.js" +else + + error_code="${ZWE_CLI_PARAMETER_ERROR_CODE}" -server_code=$(echo "${error_code}" | cut -c4) + print_message "" -if echo $error_code | grep -q -E "^[zZ][wW][eE][AaSsDdLl][A-Za-z]?[0-9]{3,4}[A-Za-z]$"; then - if [[ "$server_code" == [Dd] ]]; then - print_message "This code corresponds to the errors related to the ZOWE Desktop and the App Server." - print_message "To find the description of this error code, refer to the Zowe documentation at https://github.com/zowe/docs-site/blob/master/docs/troubleshoot/app-framework/appserver-error-codes.md" - elif [[ "$server_code" == [Ss] ]]; then - print_message "This code corresponds to the errors related to the Zowe Subsystem Services (ZSS) and Zowe Installation Services (ZIS)" - print_message "To find the description of this error code, refer to the Zowe documentation for ZSS at https://docs.zowe.org/stable/troubleshoot/app-framework/zss-error-codes and for ZIS at https://github.com/zowe/docs-site/blob/master/docs/troubleshoot/app-framework/zis-error-codes.md" - elif [[ "$server_code" == [Aa] ]]; then - print_message "This code corresponds to the errors related to the Zowe API Mediation Layer (APIML)." - print_message "To find the description of this error code, refer to the Zowe documentation at https://docs.zowe.org/stable/troubleshoot/troubleshoot-apiml-error-codes" - elif [[ "$server_code" == [Ll] ]]; then - print_message "This code corresponds to the errors related to the Zowe Launcher and ZWE" - print_message "To find the description of this error code, refer to the Zowe documentation for the Launcher at https://docs.zowe.org/stable/troubleshoot/launcher/launcher-error-codes and https://github.com/zowe/launcher/blob/v2.x/master/src/msg.h, and for ZWE at https://docs.zowe.org/stable/appendix/zwe_server_command_reference/zwe/ " + if echo $error_code | grep -q -E "^[zZ][wW][eE][AaSsDdLl][A-Za-z]?[0-9]{3,4}[A-Za-z]$"; then + server_code=$(echo "${error_code}" | cut -c4) + if [[ "$server_code" == [Dd] ]]; then + print_message "This code corresponds to the errors related to the ZOWE Desktop and the App Server." + print_message "" + print_message "To find the description of this error code, refer to the:" + print_message "" + print_message " Zowe documentation for Application framework" + print_message " https://docs.zowe.org/stable/troubleshoot/app-framework/appserver-error-codes" + elif [[ "$server_code" == [Ss] ]]; then + print_message "This code corresponds to the errors related to the Zowe Subsystem Services (ZSS) and Zowe Installation Services (ZIS)." + print_message "" + print_message "To find the description of this error code, refer to the:" + print_message "" + print_message " Zowe documentation for ZSS" + print_message " https://docs.zowe.org/stable/troubleshoot/app-framework/zss-error-codes" + print_message " Zowe documentation for ZIS" + print_message " https://docs.zowe.org/stable/troubleshoot/app-framework/zis-error-codes" + elif [[ "$server_code" == [Aa] ]]; then + print_message "This code corresponds to the errors related to the Zowe API Mediation Layer (APIML)." + print_message "" + print_message "To find the description of this error code, refer to the:" + print_message "" + print_message " Zowe documentation for API Mediation Layer" + print_message " https://docs.zowe.org/stable/troubleshoot/troubleshoot-apiml-error-codes" + elif [[ "$server_code" == [Ll] ]]; then + print_message "This code corresponds to the errors related to the Zowe Launcher and ZWE." + print_message "" + print_message "To find the description of this error code, refer to the:" + print_message "" + print_message " Zowe documentation for Launcher" + print_message " https://docs.zowe.org/stable/troubleshoot/launcher/launcher-error-codes" + print_message " Launcher error codes" + print_message " https://github.com/zowe/launcher/blob/v2.x/master/src/msg.h" + print_message " Zowe documentation for ZWE" + print_message " https://docs.zowe.org/stable/appendix/zwe_server_command_reference/zwe/" + fi + print_message "" + print_message "You may also explore reports from other users experiencing the same error by searching" + print_message "https://github.com/search?q=org%3Azowe+${error_code}&type=discussions" + else + print_error_and_exit "ZWEL0102E: Invalid parameter --error-code='${error_code}'" "" 102 fi - print_message "You may also explore reports from other users experiencing the same error by searching here https://github.com/search?q=org%3Azowe+${error_code}&type=discussions" -else - print_error_and_exit "Invalid Error Code" "" 102 + + print_message "" + fi diff --git a/bin/commands/diagnose/index.ts b/bin/commands/diagnose/index.ts index 1fe91dc198..8fb6518277 100644 --- a/bin/commands/diagnose/index.ts +++ b/bin/commands/diagnose/index.ts @@ -8,31 +8,60 @@ Copyright Contributors to the Zowe Project. */ - import * as std from 'cm_std'; import * as common from '../../libs/common'; -export function execute() { - const errorCode: string = std.getenv('ZWE_CLI_PARAMETER_ERROR_CODE'); +const THIS_CODE = "\nThis code corresponds to the errors related to the"; +const FIND_DESC = "To find the description of this error code, refer to the:\n "; +const URL = { + apiML: "https://docs.zowe.org/stable/troubleshoot/troubleshoot-apiml-error-codes", + appFW : "https://docs.zowe.org/stable/troubleshoot/app-framework/appserver-error-codes", + launcher: "https://docs.zowe.org/stable/troubleshoot/launcher/launcher-error-codes", + launcherGit: "https://github.com/zowe/launcher/blob/v2.x/master/src/msg.h", + zss: "https://docs.zowe.org/stable/troubleshoot/app-framework/zss-error-codes", + zis: "https://docs.zowe.org/stable/troubleshoot/app-framework/zis-error-codes", + zwe: "https://docs.zowe.org/stable/appendix/zwe_server_command_reference/zwe/" +} + +function thisCodeCorrespondsTo(component: string){ + common.printMessage(`${THIS_CODE} ${component}.\n`); + common.printMessage(`${FIND_DESC}`); +} - const serverCode: string = errorCode.charAt(3); +function printLinks(description: string, link: string){ + if (link.indexOf('github') > 0) + common.printMessage(` ${description}`) + else + common.printMessage(` Zowe documentation for ${description}`) + common.printMessage(` ${link}`); +} - if (/^[zZ][wW][eE][AaSsDdLl][A-Za-z]?[0-9]{3,4}[A-Za-z]$/.test(errorCode)) { - if (serverCode.toLowerCase() === 'd') { - common.printMessage("This code corresponds to the errors related to the ZOWE Desktop and the App Server."); - common.printMessage("To find the description of this error code, refer to the Zowe documentation at https://github.com/zowe/docs-site/blob/master/docs/troubleshoot/app-framework/appserver-error-codes.md"); - } else if (serverCode.toLowerCase() === 's') { - common.printMessage("This code corresponds to the errors related to the Zowe Subsystem Services (ZSS) and Zowe Installation Services (ZIS)"); - common.printMessage("To find the description of this error code, refer to the Zowe documentation for ZSS at https://docs.zowe.org/stable/troubleshoot/app-framework/zss-error-codes and for ZIS at https://github.com/zowe/docs-site/blob/master/docs/troubleshoot/app-framework/zis-error-codes.md"); - } else if (serverCode.toLowerCase() === 'a') { - common.printMessage("This code corresponds to the errors related to the Zowe API Mediation Layer (APIML)."); - common.printMessage("To find the description of this error code, refer to the Zowe documentation at https://docs.zowe.org/stable/troubleshoot/troubleshoot-apiml-error-codes"); - } else if (serverCode.toLowerCase() === 'l') { - common.printMessage("This code corresponds to the errors related to the Zowe Launcher and ZWE"); - common.printMessage("To find the description of this error code, refer to the Zowe documentation for the Launcher at https://docs.zowe.org/stable/troubleshoot/launcher/launcher-error-codes and https://github.com/zowe/launcher/blob/v2.x/master/src/msg.h, and for ZWE at https://docs.zowe.org/stable/appendix/zwe_server_command_reference/zwe/"); +export function execute() { + const errorCode = std.getenv('ZWE_CLI_PARAMETER_ERROR_CODE'); + if (/^[zZ][wW][eE][AaSsDdLl][A-Za-z]?[0-9]{3,4}[A-Za-z]$/.test(errorCode)) { + const serverCode = errorCode.charAt(3); + if (serverCode.toLowerCase() === 'd') { + thisCodeCorrespondsTo('ZOWE Desktop and the App Server'); + printLinks('Application framework', `${URL.appFW}`); + } + else if (serverCode.toLowerCase() === 's') { + thisCodeCorrespondsTo('Zowe Subsystem Services (ZSS) and Zowe Installation Services (ZIS)'); + printLinks('ZSS', `${URL.zss}`); + printLinks('ZIS', `${URL.zis}`); + } + else if (serverCode.toLowerCase() === 'a') { + thisCodeCorrespondsTo('Zowe API Mediation Layer (APIML)'); + printLinks('API Mediation Layer', `${URL.apiML}`); + } + else if (serverCode.toLowerCase() === 'l') { + thisCodeCorrespondsTo('Zowe Launcher and ZWE'); + printLinks('Launcher', `${URL.launcher}`); + printLinks('Launcher error codes', `${URL.launcherGit}`); + printLinks('ZWE', `${URL.zwe}`); + } + common.printMessage(`\nYou may also explore reports from other users experiencing the same error by searching\nhttps://github.com/search?q=org%3Azowe+${errorCode}&type=discussions\n`); + } + else { + common.printErrorAndExit(`ZWEL0102E: Invalid parameter --error-code='${errorCode}'`, undefined, 102); } - common.printMessage(`You may also explore reports from other users experiencing the same error by searching here https://github.com/search?q=org%3Azowe+${errorCode}&type=discussions`) - } else { - common.printErrorAndExit("Invalid Error Code", undefined, 102); - } } From 6fad6ca625b20b38d7c4dade902e62f2971d3aa8 Mon Sep 17 00:00:00 2001 From: Leanid Astrakou Date: Thu, 16 Nov 2023 10:26:06 -0500 Subject: [PATCH 118/168] Make example-zowe.yaml certificate scenarios more accurate Signed-off-by: Leanid Astrakou --- example-zowe.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/example-zowe.yaml b/example-zowe.yaml index e82479c0dd..2f121c4128 100644 --- a/example-zowe.yaml +++ b/example-zowe.yaml @@ -173,7 +173,7 @@ zowe: # - "" # # >>>> Certificate setup scenario 3 - # # z/OS Keyring with Zowe generated certificates. + # # Zowe generated z/OS Keyring with Zowe generated certificates. # certificate: # # Type of certificate storage. Valid values are: PKCS12, JCEKS, JCECCAKS, JCERACFKS, JCECCARACFKS, or JCEHYBRIDRACFKS # type: JCERACFKS @@ -209,7 +209,7 @@ zowe: # # - 12.34.56.78 # # >>>> Certificate setup scenario 4 - # # z/OS Keyring and connect to existing certificate + # # Zowe generated z/OS Keyring and connect to existing certificate # certificate: # # Type of certificate storage. Valid values are: PKCS12, JCEKS, JCECCAKS, JCERACFKS, JCECCARACFKS, or JCEHYBRIDRACFKS # type: JCERACFKS @@ -233,7 +233,7 @@ zowe: # - "" # # >>>> Certificate setup scenario 5 - # # z/OS Keyring with importing certificate stored in data set + # # Zowe generated z/OS Keyring with importing certificate stored in data set # certificate: # # Type of certificate storage. Valid values are: PKCS12, JCEKS, JCECCAKS, JCERACFKS, JCECCARACFKS, or JCEHYBRIDRACFKS # type: JCERACFKS From 9aef6279b0f0c241fcb3cbb9120ed522c43afc35 Mon Sep 17 00:00:00 2001 From: Timothy Gerstel Date: Fri, 17 Nov 2023 08:57:12 -0500 Subject: [PATCH 119/168] Add global and component level network configuration options (#3509) * Add global and component level network configuration options Signed-off-by: Timothy Gerstel * Use zoweIpv4 for bind addresses and update tls settings to enums Signed-off-by: Timothy Gerstel * Deduplicate schema and separate server from client Also change "bind" to "listen" and tls prefix with TLSv, as seen in the majority of our servers. Signed-off-by: 1000TurquoisePogs * Fix schema json syntax Signed-off-by: 1000TurquoisePogs * Shorten tlsSettings to tls, and fix plural ipAddresses Signed-off-by: 1000TurquoisePogs --------- Signed-off-by: Timothy Gerstel Signed-off-by: 1000TurquoisePogs Co-authored-by: 1000TurquoisePogs --- schemas/zowe-yaml-schema.json | 101 +++++++++++++++++++++++++++++----- 1 file changed, 87 insertions(+), 14 deletions(-) diff --git a/schemas/zowe-yaml-schema.json b/schemas/zowe-yaml-schema.json index b37915a80c..60a2f83374 100644 --- a/schemas/zowe-yaml-schema.json +++ b/schemas/zowe-yaml-schema.json @@ -419,20 +419,7 @@ } }, "network": { - "type": "object", - "additionalProperties": false, - "description": "Optional, advanced network configuration parameters", - "properties": { - "vipaIp": { - "type": "string", - "description": "The IP address which all of the Zowe servers will be binding to. If you are using multiple DIPVA addresses, do not use this option." - }, - "validatePortFree": { - "type": "boolean", - "default": true, - "description": "Whether or not to ensure that the port a server is about to use is available. Usually, servers will know this when they attempt to bind to a port, so this option allows you to disable the additional verification step." - } - } + "$ref": "#/$defs/networkSettings" }, "extensionRegistry": { "type": "object", @@ -854,6 +841,92 @@ "default": "yes" } } + }, + "zowe": { + "type": "object", + "description": "Component level overrides for top level Zowe network configuration.", + "additionalProperties": false, + "properties": { + "network": { + "$ref": "#/$defs/networkSettings" + } + } + } + } + }, + "tlsSettings": { + "$anchor": "tlsSettings", + "type": "object", + "properties": { + "ciphers": { + "type": "array", + "description": "Acceptable TLS cipher suites for network connections.", + "items": { + "type": "string" + } + }, + "curves": { + "type": "array", + "description": "Acceptable key exchange elliptic curves for network connections.", + "items": { + "type": "string" + } + }, + "maxTls": { + "type": "string", + "enum": ["TLSv1.0", "TLSv1.1", "TLSv1.2", "TLSv1.3"], + "default": "TLSv1.3", + "description": "Maximum TLS version allowed for network connections." + }, + "minTls": { + "type": "string", + "enum": ["TLSv1.0", "TLSv1.1", "TLSv1.2", "TLSv1.3"], + "default": "TLSv1.3", + "description": "Minimum TLS version allowed for network connections, and less than network.maxTls." + } + } + }, + "networkSettings": { + "type": "object", + "$anchor": "networkSettings", + "additionalProperties": false, + "description": "Optional, advanced network configuration parameters", + "properties": { + "server": { + "type": "object", + "additionalProperties": false, + "description": "Optional, advanced network configuration parameters for Zowe servers", + "properties": { + "tls": { + "$ref": "#/$defs/tlsSettings" + }, + "listenAddresses": { + "type": "array", + "description": "The IP addresses which all of the Zowe servers will be binding on and listening to. Some servers may only support listening on the first element.", + "items": { + "$ref": "/schemas/v2/server-common#zoweIpv4" + } + }, + "vipaIp": { + "type": "string", + "description": "The IP address which all of the Zowe servers will be binding to. If you are using multiple DIPVA addresses, do not use this option." + }, + "validatePortFree": { + "type": "boolean", + "default": true, + "description": "Whether or not to ensure that the port a server is about to use is available. Usually, servers will know this when they attempt to bind to a port, so this option allows you to disable the additional verification step." + } + } + }, + "client": { + "type": "object", + "additionalProperties": false, + "description": "Optional, advanced network configuration parameters for Zowe servers when sending requests as clients.", + "properties": { + "tls": { + "$ref": "#/$defs/tlsSettings" + } + } } } }, From b2b7b02dc6bd66e0222165f4d25ab61ab5019fe8 Mon Sep 17 00:00:00 2001 From: Mark Ackert <35308966+MarkAckert@users.noreply.github.com> Date: Mon, 20 Nov 2023 11:47:54 -0500 Subject: [PATCH 120/168] Build: fix failing chown from build step (#3658) * build: remove failing chown from build step Signed-off-by: MarkAckert * build: update mkdir to _cmd, chown _super to _cmd Signed-off-by: MarkAckert * chore: update comment Signed-off-by: MarkAckert --------- Signed-off-by: MarkAckert --- smpe/bld/smpe-install.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/smpe/bld/smpe-install.sh b/smpe/bld/smpe-install.sh index 2022745c71..d08c8ad57b 100755 --- a/smpe/bld/smpe-install.sh +++ b/smpe/bld/smpe-install.sh @@ -171,7 +171,7 @@ opts="$opts -l $log" # install log _cmd $extract/$zweScript install $opts Date: Wed, 22 Nov 2023 15:18:56 -0500 Subject: [PATCH 121/168] zzow system updates (#3651) * build: zzow04 to zzow08 Signed-off-by: MarkAckert * build: add port Signed-off-by: MarkAckert * build: remove explicit pax vars. action defaults updated. Signed-off-by: MarkAckert * build: update marist system names Signed-off-by: MarkAckert * chore: update playbook hosts Signed-off-by: MarkAckert * chore: change ansible port for new systems Signed-off-by: MarkAckert * test: update failing vt test; system response correct Signed-off-by: MarkAckert * build: update PSWI builds for zzow07 Signed-off-by: MarkAckert * chore: lint fix Signed-off-by: MarkAckert * chore: update random gen to create 6,7,8 Signed-off-by: MarkAckert * build: temporarily disable vt test Signed-off-by: MarkAckert * build: comment out entire file (lint errors) Signed-off-by: MarkAckert --------- Signed-off-by: MarkAckert --- .github/scripts/cicd_test/make_matrix.sh | 7 +- .../03_process_test_server.sh | 26 ++-- .github/workflows/build-packaging.yml | 3 +- .github/workflows/cicd-test-readme.md | 10 +- .github/workflows/cicd-test.yml | 10 +- .../host_vars/{marist-2.yml => marist-6.yml} | 2 +- .../host_vars/{marist-3.yml => marist-7.yml} | 2 +- .../host_vars/{marist-4.yml => marist-8.yml} | 2 + playbooks/hosts | 6 +- pswi/00_presmpe.sh | 7 +- pswi/01_smpe.sh | 3 +- pswi/02_ptf.sh | 3 +- pswi/03_create.sh | 3 +- pswi/05_test.sh | 3 +- pswi/PSWI-marist.sh | 143 +++++++++--------- .../extended/keyring-modes/acf2-keyring.ts | 2 +- .../extended/keyring-modes/racf-keyring.ts | 2 +- .../extended/keyring-modes/tss-keyring.ts | 2 +- .../extended/node-versions/node-v18.ts | 2 +- .../security-systems/convenience/acf2.ts | 6 +- .../security-systems/convenience/racf.ts | 4 +- .../security-systems/convenience/ts.ts | 6 +- .../extended/security-systems/fmid/acf2.ts | 6 +- .../extended/security-systems/fmid/racf.ts | 4 +- .../extended/security-systems/fmid/ts.ts | 6 +- .../extended/security-systems/ptf/acf2.ts | 6 +- .../extended/security-systems/ptf/racf.ts | 4 +- .../extended/security-systems/ptf/ts.ts | 6 +- tests/sanity/test/e2e/test-06-vt.js | 14 +- 29 files changed, 154 insertions(+), 146 deletions(-) rename playbooks/host_vars/{marist-2.yml => marist-6.yml} (83%) rename playbooks/host_vars/{marist-3.yml => marist-7.yml} (93%) rename playbooks/host_vars/{marist-4.yml => marist-8.yml} (96%) mode change 100644 => 100755 pswi/PSWI-marist.sh diff --git a/.github/scripts/cicd_test/make_matrix.sh b/.github/scripts/cicd_test/make_matrix.sh index 5a94f3c4b5..7a17f253db 100644 --- a/.github/scripts/cicd_test/make_matrix.sh +++ b/.github/scripts/cicd_test/make_matrix.sh @@ -34,7 +34,7 @@ case $install_test_choice in "z/OS node v18") test_file="$ZOS_NODE_V18_TESTFILE" - test_force_system="zzow04" + test_force_system="zzow08" ;; "Non-strict Verify External Certificate") @@ -90,10 +90,11 @@ else any_occurrence=$(echo $test_file | grep -o "(any)" | wc -l) interim_test_file_server=$test_file for i in $(seq $any_occurrence); do - interim_test_file_server=$(echo $interim_test_file_server | sed "s#(any)#(zzow0$(echo $(($RANDOM % 3 + 2))))#") + # Generates zzow06, zzow07, zzow08 + interim_test_file_server=$(echo $interim_test_file_server | sed "s#(any)#(zzow0$(echo $(($RANDOM % 3 + 6))))#") done - TEST_FILE_SERVER=$(echo $interim_test_file_server | sed "s#(all)#(zzow02,zzow03,zzow04)#g") + TEST_FILE_SERVER=$(echo $interim_test_file_server | sed "s#(all)#(zzow06,zzow07,zzow08)#g") fi fi diff --git a/.github/scripts/cicd_test/prep7_more_test_prep/03_process_test_server.sh b/.github/scripts/cicd_test/prep7_more_test_prep/03_process_test_server.sh index 02ad5813f5..7e7b80ad07 100644 --- a/.github/scripts/cicd_test/prep7_more_test_prep/03_process_test_server.sh +++ b/.github/scripts/cicd_test/prep7_more_test_prep/03_process_test_server.sh @@ -14,24 +14,24 @@ TEST_SERVER=$(echo "$MATRIX_SERVER" | cut -d "-" -f2) case $TEST_SERVER in -"zzow02") - TEST_SERVER_NICKNAME=marist-2 - ;; +"zzow06") + TEST_SERVER_NICKNAME=marist-6 + ;; -"zzow03") - TEST_SERVER_NICKNAME=marist-3 - ;; +"zzow07") + TEST_SERVER_NICKNAME=marist-7 + ;; -"zzow04") - TEST_SERVER_NICKNAME=marist-4 - ;; +"zzow08") + TEST_SERVER_NICKNAME=marist-8 + ;; *) - printf "${RED}[Check 2 ERROR] Something went wrong when parsing test server nickname\n" - exit 1 - ;; + printf "${RED}[Check 2 ERROR] Something went wrong when parsing test server nickname\n" + exit 1 + ;; esac assert_env_var "TEST_SERVER" assert_env_var "TEST_SERVER_NICKNAME" -printf "${GREEN}[Check 2/$TOTAL_CHECK] Test server name processing complete!${NC}\n" \ No newline at end of file +printf "${GREEN}[Check 2/$TOTAL_CHECK] Test server name processing complete!${NC}\n" diff --git a/.github/workflows/build-packaging.yml b/.github/workflows/build-packaging.yml index 66d21b9395..7751f2f770 100644 --- a/.github/workflows/build-packaging.yml +++ b/.github/workflows/build-packaging.yml @@ -236,7 +236,7 @@ jobs: with: lock-repository: ${{ github.repository }} github-token: ${{ secrets.GITHUB_TOKEN }} - lock-resource-name: zowe-psi-build-zzow03-lock + lock-resource-name: zowe-psi-build-zzow07-lock lock-avg-retry-interval: 60 - name: '[SMPE Pax 4] Build PSWI' @@ -249,6 +249,7 @@ jobs: env: ZOSMF_USER: ${{ secrets.ZOWE_PSWI_BUILD_USR }} ZOSMF_PASS: ${{ secrets.ZOWE_PSWI_BUILD_PASSWD }} + ZZOW_SSH_PORT: ${{ secrets.SSH_MARIST_ALLSYS_PORT }} VERSION: ${{ env.P_VERSION }} - name: '[K8S] Build Kubernetes' diff --git a/.github/workflows/cicd-test-readme.md b/.github/workflows/cicd-test-readme.md index c6820292bb..2a658f5eeb 100644 --- a/.github/workflows/cicd-test-readme.md +++ b/.github/workflows/cicd-test-readme.md @@ -4,9 +4,9 @@ This guide will describe how you should input into Github Actions workflow input Currently we support three testing z/OS servers: -- zzow02 (ACF2) -- zzow03 (Top Secret/TSS) -- zzow04 (RACF) +- zzow06 (ACF2) +- zzow07 (Top Secret/TSS) +- zzow08 (RACF) Testing pipeline is running tests in parallel. The workflow will try to acquire the resource lock if available. If the resource lock is occupied, the workflow will wait until the lock is succesfully acquired. @@ -17,7 +17,7 @@ Workflow trigger is at [cicd-test](https://github.com/zowe/zowe-install-packagin ### Choose Test Server - This input is a choice, and it's mandatory. -- You can choose from one of `zzow02`, `zzow03`, `zzow04`, `zzow02,zzow03,zzow04` (if you want to run the test on all zzow servers), or `Any zzow servers` (pick any zzow servers, potentially help reduce wait time) +- You can choose from one of `zzow06`, `zzow07`, `zzow08`, `zzow06,zzow07,zzow08` (if you want to run the test on all zzow servers), or `Any zzow servers` (pick any zzow servers, potentially help reduce wait time) - Default is `Any zzow servers` ### Choose Install Test @@ -109,7 +109,7 @@ Background: CICD testing relies on a `zowe.pax` or `zowe-smpe.zip` (for SMPE ins When running CICD integration tests during RC stage, the following string will be parsed into the Github Actions matrix. As a result, a total of 21 independent jobs will be spawned. ``` -basic/install.ts(zzow02,zzow03,zzow04);basic/install-ptf.ts(zzow02,zzow03,zzow04);basic/install-ext.ts(zzow03);extended/keyring.ts(zzow02,zzow03,zzow04);extended/node-versions/node-v18.ts(zzow02,zzow03,zzow04);extended/certificates/nonstrict-verify-external-certificate.ts(zzow02) +basic/install.ts(zzow06,zzow07,zzow08);basic/install-ptf.ts(zzow06,zzow07,zzow08);basic/install-ext.ts(zzow07);extended/keyring.ts(zzow06,zzow07,zzow08);extended/node-versions/node-v18.ts(zzow06,zzow07,zzow08);extended/certificates/nonstrict-verify-external-certificate.ts(zzow06) ``` Total elapsed time when running in parallel is approximately 3.5 hours on paper idealy if all parallel jobs are executing at the same time. In reality, from numerous tests performed, total elapsed time is around 4 hours. diff --git a/.github/workflows/cicd-test.yml b/.github/workflows/cicd-test.yml index 412fd38b1f..56a0e2ab89 100644 --- a/.github/workflows/cicd-test.yml +++ b/.github/workflows/cicd-test.yml @@ -9,10 +9,10 @@ on: default: 'Any zzow servers' options: - Any zzow servers - - zzow02 - - zzow03 - - zzow04 - - zzow02,zzow03,zzow04 + - zzow06 + - zzow07 + - zzow08 + - zzow06,zzow07,zzow08 install-test: description: 'Choose Install Test' type: choice @@ -81,7 +81,7 @@ env: CONFIG_MANAGER_TESTFILE: extended/config-manager/enable-config-manager.ts GENERAL_API_DOCUMENTATION_TESTFILE: basic/install-api-gen.ts ZOWE_NIGHTLY_TESTS_FULL: basic/install.ts(all);basic/install-ptf.ts(all) - ZOWE_RELEASE_TESTS_FULL: basic/install.ts(all);basic/install-ptf.ts(all);basic/install-ext.ts(any);extended/keyring.ts(all);extended/node-versions/node-v18.ts(zzow04):extended/certificates/nonstrict-verify-external-certificate.ts(any);extended/caching-storages/infinispan-storage.ts(any);extended/config-manager/enable-config-manager.ts(any) + ZOWE_RELEASE_TESTS_FULL: basic/install.ts(all);basic/install-ptf.ts(all);basic/install-ext.ts(any);extended/keyring.ts(all);extended/node-versions/node-v18.ts(zzow08):extended/certificates/nonstrict-verify-external-certificate.ts(any);extended/caching-storages/infinispan-storage.ts(any);extended/config-manager/enable-config-manager.ts(any) jobs: display-dispatch-event-id: diff --git a/playbooks/host_vars/marist-2.yml b/playbooks/host_vars/marist-6.yml similarity index 83% rename from playbooks/host_vars/marist-2.yml rename to playbooks/host_vars/marist-6.yml index 180f8af53e..6a013b35de 100644 --- a/playbooks/host_vars/marist-2.yml +++ b/playbooks/host_vars/marist-6.yml @@ -1,5 +1,5 @@ --- zos_security_system: ACF2 zos_zosmf_ca: ZOSMFSRV - +ansible_port: 65522 zowe_configure_ignore_security_failures: true diff --git a/playbooks/host_vars/marist-3.yml b/playbooks/host_vars/marist-7.yml similarity index 93% rename from playbooks/host_vars/marist-3.yml rename to playbooks/host_vars/marist-7.yml index 939bfb5e26..e5dbecc34b 100644 --- a/playbooks/host_vars/marist-3.yml +++ b/playbooks/host_vars/marist-7.yml @@ -4,5 +4,5 @@ zowe_sanity_test_testcases: "./test/**/!(api-doc-gen).js" zowe_apiml_security_x509_enabled: true zowe_apiml_security_oidc_enabled: true zos_zosmf_ca: ZOSMFCA - +ansible_port: 65522 zowe_configure_ignore_security_failures: true # Required for keyring tests - only Root cert passed, missing intermediate RC=4 diff --git a/playbooks/host_vars/marist-4.yml b/playbooks/host_vars/marist-8.yml similarity index 96% rename from playbooks/host_vars/marist-4.yml rename to playbooks/host_vars/marist-8.yml index 894500deef..4fd32f3177 100644 --- a/playbooks/host_vars/marist-4.yml +++ b/playbooks/host_vars/marist-8.yml @@ -13,4 +13,6 @@ zowe_install_logs_dir: /ZOWE/logs zowe_smpe_volser: ZOWE03 zowe_caching_vsam_volume: ZOWE03 +ansible_port: 65522 + zowe_configure_ignore_security_failures: true # Required for keyring tests - only Root cert passed, missing intermediate RC=4 diff --git a/playbooks/hosts b/playbooks/hosts index 2fabf917b3..f53a1884e8 100644 --- a/playbooks/hosts +++ b/playbooks/hosts @@ -1,7 +1,7 @@ [marist] -marist-2 -marist-3 -marist-4 +marist-6 +marist-7 +marist-8 [tvt] tvt4188 diff --git a/pswi/00_presmpe.sh b/pswi/00_presmpe.sh index 258d13268b..e8db65fa11 100644 --- a/pswi/00_presmpe.sh +++ b/pswi/00_presmpe.sh @@ -8,6 +8,7 @@ echo "" echo "Script for preparing datasets for SMP/E (PTFs)..." echo "Host :" $ZOSMF_URL echo "Port :" $ZOSMF_PORT +echo "SSH Port :" $ZZOW_SSH_PORT echo "z/OSMF system :" $ZOSMF_SYSTEM echo "FMID :" $FMID echo "RFDSNPFX :" $RFDSNPFX @@ -27,7 +28,7 @@ sh scripts/tmp_mounts.sh "${TMP_ZFS}" "${TMP_MOUNT}" if [ $? -gt 0 ];then exit -1;fi cd unzipped -sshpass -p${ZOSMF_PASS} sftp -o HostKeyAlgorithms=+ssh-rsa -o BatchMode=no -o StrictHostKeyChecking=no -o PubkeyAuthentication=no -b - -P 22 ${ZOSMF_USER}@${HOST} << EOF +sshpass -p${ZOSMF_PASS} sftp -o HostKeyAlgorithms=+ssh-rsa -o BatchMode=no -o StrictHostKeyChecking=no -o PubkeyAuthentication=no -b - -P ${ZZOW_SSH_PORT} ${ZOSMF_USER}@${HOST} << EOF cd ${TMP_MOUNT} put ${FMID}.pax.Z EOF @@ -76,13 +77,13 @@ rm JCL cd unzipped if [ $PTFNR -eq 2 ] then -sshpass -p${ZOSMF_PASS} sftp -o HostKeyAlgorithms=+ssh-rsa -o BatchMode=no -o StrictHostKeyChecking=no -o PubkeyAuthentication=no -b - -P 22 ${ZOSMF_USER}@${HOST} << EOF +sshpass -p${ZOSMF_PASS} sftp -o HostKeyAlgorithms=+ssh-rsa -o BatchMode=no -o StrictHostKeyChecking=no -o PubkeyAuthentication=no -b - -P ${ZZOW_SSH_PORT} ${ZOSMF_USER}@${HOST} << EOF cd ${TMP_MOUNT} put ${RFDSNPFX}.${FMID}.${PTF1} ${PTF1} put ${RFDSNPFX}.${FMID}.${PTF2} ${PTF2} EOF else -sshpass -p${ZOSMF_PASS} sftp -o HostKeyAlgorithms=+ssh-rsa -o BatchMode=no -o StrictHostKeyChecking=no -o PubkeyAuthentication=no -b - -P 22 ${ZOSMF_USER}@${HOST} << EOF +sshpass -p${ZOSMF_PASS} sftp -o HostKeyAlgorithms=+ssh-rsa -o BatchMode=no -o StrictHostKeyChecking=no -o PubkeyAuthentication=no -b - -P ${ZZOW_SSH_PORT} ${ZOSMF_USER}@${HOST} << EOF cd ${TMP_MOUNT} put ${RFDSNPFX}.${FMID}.${PTF1} ${PTF1} EOF diff --git a/pswi/01_smpe.sh b/pswi/01_smpe.sh index 458d9c9356..8370b9ef54 100644 --- a/pswi/01_smpe.sh +++ b/pswi/01_smpe.sh @@ -9,6 +9,7 @@ echo "" echo "Script for creation of ZOWE SMP/E environment..." echo "Host :" $ZOSMF_URL echo "Port :" $ZOSMF_PORT +echo "SSH Port :" $ZZOW_SSH_PORT echo "z/OSMF system :" $ZOSMF_SYSTEM echo "Dataset with workflows :" $WORKFLOW_DS echo "SMPE workflow name :" $SMPE_WF_NAME @@ -42,7 +43,7 @@ echo "Uploading workflow SMPE into ${DIR} directory thru SSH" cd workflows -sshpass -p${ZOSMF_PASS} sftp -o HostKeyAlgorithms=+ssh-rsa -o BatchMode=no -o StrictHostKeyChecking=no -o PubkeyAuthentication=no -b - -P 22 ${ZOSMF_USER}@${HOST} << EOF +sshpass -p${ZOSMF_PASS} sftp -o HostKeyAlgorithms=+ssh-rsa -o BatchMode=no -o StrictHostKeyChecking=no -o PubkeyAuthentication=no -b - -P ${ZZOW_SSH_PORT} ${ZOSMF_USER}@${HOST} << EOF cd ${DIR} put SMPE20 EOF diff --git a/pswi/02_ptf.sh b/pswi/02_ptf.sh index 5684360470..e2c23e54e3 100644 --- a/pswi/02_ptf.sh +++ b/pswi/02_ptf.sh @@ -9,6 +9,7 @@ echo "" echo "Script for applying of PTFs into SMPE via workflow..." echo "Host :" $ZOSMF_URL echo "Port :" $ZOSMF_PORT +echo "SSH Port :" $ZZOW_SSH_PORT echo "z/OSMF system :" $ZOSMF_SYSTEM echo "CSI HLQ :" $CSIHLQ echo "PTF dataset :" $SMPE @@ -37,7 +38,7 @@ ADD_WORKFLOW_JSON='{"workflowName":"'$PTF_WF_NAME'", cd workflows -sshpass -p${ZOSMF_PASS} sftp -o HostKeyAlgorithms=+ssh-rsa -o BatchMode=no -o StrictHostKeyChecking=no -o PubkeyAuthentication=no -b - -P 22 ${ZOSMF_USER}@${HOST} << EOF +sshpass -p${ZOSMF_PASS} sftp -o HostKeyAlgorithms=+ssh-rsa -o BatchMode=no -o StrictHostKeyChecking=no -o PubkeyAuthentication=no -b - -P ${ZZOW_SSH_PORT} ${ZOSMF_USER}@${HOST} << EOF cd ${DIR} put WFPTF EOF diff --git a/pswi/03_create.sh b/pswi/03_create.sh index 99d4ab7687..3f9e30fb84 100644 --- a/pswi/03_create.sh +++ b/pswi/03_create.sh @@ -8,6 +8,7 @@ echo "" echo "Script for creating a Portable Software Instance..." echo "Host :" $ZOSMF_URL echo "Port :" $ZOSMF_PORT +echo "SSH Port :" $ZZOW_SSH_PORT echo "CSI HLQ :" $CSIHLQ echo "SMP/E zone :" $ZONE echo "z/OSMF system :" $ZOSMF_SYSTEM @@ -331,7 +332,7 @@ if [ $? -gt 0 ];then exit -1;fi rm JCL cd ../.pax -sshpass -p${ZOSMF_PASS} sftp -o HostKeyAlgorithms=+ssh-rsa -o BatchMode=no -o StrictHostKeyChecking=no -o PubkeyAuthentication=no -b - -P 22 ${ZOSMF_USER}@${HOST} << EOF +sshpass -p${ZOSMF_PASS} sftp -o HostKeyAlgorithms=+ssh-rsa -o BatchMode=no -o StrictHostKeyChecking=no -o PubkeyAuthentication=no -b - -P ${ZZOW_SSH_PORT} ${ZOSMF_USER}@${HOST} << EOF cd ${TMP_MOUNT} get ${SWI_NAME}.pax.Z EOF diff --git a/pswi/05_test.sh b/pswi/05_test.sh index 8ee0a9f1b9..523458b3c3 100644 --- a/pswi/05_test.sh +++ b/pswi/05_test.sh @@ -8,6 +8,7 @@ echo "" echo "Script for testing a Portable Software Instance..." echo "Host :" $ZOSMF_URL echo "Port :" $ZOSMF_PORT +echo "SSH Port :" $ZZOW_SSH_PORT echo "PSWI name :" $PSWI echo "z/OSMF system :" $ZOSMF_SYSTEM echo "Test HLQ :" $TEST_HLQ @@ -33,7 +34,7 @@ sh scripts/tmp_mounts.sh "${TMP_ZFS}" "${TMP_MOUNT}" if [ $? -gt 0 ];then exit -1;fi cd ../.pax -sshpass -p${ZOSMF_PASS} sftp -o HostKeyAlgorithms=+ssh-rsa -o BatchMode=no -o StrictHostKeyChecking=no -o PubkeyAuthentication=no -b - -P 22 ${ZOSMF_USER}@${HOST} << EOF +sshpass -p${ZOSMF_PASS} sftp -o HostKeyAlgorithms=+ssh-rsa -o BatchMode=no -o StrictHostKeyChecking=no -o PubkeyAuthentication=no -b - -P ${ZZOW_SSH_PORT} ${ZOSMF_USER}@${HOST} << EOF cd ${TMP_MOUNT} put ${SWI_NAME}.pax.Z EOF diff --git a/pswi/PSWI-marist.sh b/pswi/PSWI-marist.sh old mode 100644 new mode 100755 index ab3f30b677..80441508af --- a/pswi/PSWI-marist.sh +++ b/pswi/PSWI-marist.sh @@ -1,4 +1,4 @@ -export ZOSMF_URL="https://zzow03.zowe.marist.cloud" +export ZOSMF_URL="https://zzow07.zowe.marist.cloud" export ZOSMF_PORT=10443 export ZOSMF_SYSTEM="S0W1" export DIR="/u/zowead2" @@ -7,7 +7,7 @@ export TMP_ZFS="ZOWEAD2.TMP.ZFS" export ZOWE_MOUNT="/u/zwe/zowe-smpe/" export VOLUME="ZOS003" export TEST_HLQ="ZOWEAD2.PSWIT" -export SYSAFF="(2964,S0W1)" +export SYSAFF="(S0W1)" export ACCOUNT=1 # Variables for workflows @@ -16,11 +16,10 @@ export TZONE="TZONE" export DZONE="DZONE" export JOBNAME="ZWEPSWI1" -if [ -n "$ACCOUNT" ] -then -export JOBST1="//"${JOBNAME}" JOB ("${ACCOUNT}"),'PSWI',MSGCLASS=A,REGION=0M" +if [ -n "$ACCOUNT" ]; then + export JOBST1="//"${JOBNAME}" JOB ("${ACCOUNT}"),'PSWI',MSGCLASS=A,REGION=0M" else -export JOBST1="//"${JOBNAME}" JOB 'PSWI',MSGCLASS=A,REGION=0M" + export JOBST1="//"${JOBNAME}" JOB 'PSWI',MSGCLASS=A,REGION=0M" fi export JOBST2="/*JOBPARM SYSAFF=${SYSAFF}" export DEPLOY_NAME="DEPLOY" @@ -37,8 +36,7 @@ export PTF_WF_NAME="ZOWE_PTF_WF" export HOST=${ZOSMF_URL#https:\/\/} echo "--------------------------------- Getting build specific variables ---------------------------------------" -if [ -f ../.pax/zowe-smpe.zip ] -then +if [ -f ../.pax/zowe-smpe.zip ]; then echo "ok" mkdir -p "unzipped" unzip ../.pax/zowe-smpe.zip -d unzipped @@ -47,36 +45,32 @@ else exit -1 fi -if [ -f unzipped/*.pax.Z ] -then +if [ -f unzipped/*.pax.Z ]; then echo "it's new fmid" - export FMID=`ls unzipped | tail -n 1 | cut -f1 -d'.'` - export RFDSNPFX=`cat unzipped/*htm | grep -o "hlq.*.${FMID}.F1" | cut -f2 -d'.'` + export FMID=$(ls unzipped | tail -n 1 | cut -f1 -d'.') + export RFDSNPFX=$(cat unzipped/*htm | grep -o "hlq.*.${FMID}.F1" | cut -f2 -d'.') else echo "it's ptf/apar" mv unzipped/*htm ptfs.html - export PTFNR=`ls unzipped | wc -l` - - if [ $PTFNR -le 2 ] - then + export PTFNR=$(ls unzipped | wc -l) + + if [ $PTFNR -le 2 ]; then echo "standard situation" - export RFDSNPFX=`ls unzipped | tail -n 1 | cut -f1 -d'.'` - export FMID=`ls unzipped | tail -n 1 | cut -f2 -d'.'` - - FILES=`ls unzipped` + export RFDSNPFX=$(ls unzipped | tail -n 1 | cut -f1 -d'.') + export FMID=$(ls unzipped | tail -n 1 | cut -f2 -d'.') + + FILES=$(ls unzipped) N=0 - for FILE in $FILES - do - N=$((N+1)) - export PTF${N}=`echo $FILE | tail -n 1 | cut -f3 -d'.'` + for FILE in $FILES; do + N=$((N + 1)) + export PTF${N}=$(echo $FILE | tail -n 1 | cut -f3 -d'.') done else echo "Different number of files" #TODO:make it more universal (we have the workflow now just for two files anyway so change it with that) fi - if [ -f ../.pax/${FMID}.zip ] - then + if [ -f ../.pax/${FMID}.zip ]; then unzip ../.pax/${FMID}.zip -d unzipped else echo "File with FMID not found" @@ -94,66 +88,65 @@ export GLOBAL_ZONE=${CSIHLQ}.CSI export EXPORT_DSN=${CSIHLQ}.EXPORT export WORKFLOW_DSN=${CSIHLQ}.WORKFLOW export ZOWE_ZFS="${CSIHLQ}.ZFS" -export VERSION=`cat ../manifest.json.template | grep -o '"version": ".*"' | head -1 | cut -f4 -d\"` +export VERSION=$(cat ../manifest.json.template | grep -o '"version": ".*"' | head -1 | cut -f4 -d\") # Upload and prepare all files sh 00_presmpe.sh presmpe=$? -if [ $presmpe -eq 0 ];then -# Create SMP/E -sh 01_smpe.sh -smpe=$? +if [ $presmpe -eq 0 ]; then + # Create SMP/E + sh 01_smpe.sh + smpe=$? -if [ $smpe -eq 0 ];then -if [ -n "$PTFNR" ];then -# Apply PTFs -sh 02_ptf.sh -ptf=$? -else -# There are no PTFs -ptf=0 -fi - -if [ $ptf -eq 0 ];then -# Create PSWI -sh 03_create.sh -create=$? - -# Cleanup after the creation of PSWI -sh 04_create_cleanup.sh -# Cleanup of SMP/E -sh 07_smpe_cleanup.sh -# Clean RELFILEs and PTFs -sh 08_presmpe_cleanup.sh - -if [ $create -eq 0 ];then -# Test PSWI -sh 05_test.sh -test=$? - -# Cleanup after the test -sh 06_test_cleanup.sh -fi -else - # Cleanup of SMP/E if PTF weren't successful - because the earlier cleanup runs only it it was success - sh 07_smpe_cleanup.sh - # Clean RELFILEs and PTFs -sh 08_presmpe_cleanup.sh -fi -else - # Cleanup of SMP/E if SMPE weren't successful - because the earlier cleanup runs only it it was success - sh 07_smpe_cleanup.sh - # Clean RELFILEs and PTFs -sh 08_presmpe_cleanup.sh + if [ $smpe -eq 0 ]; then + if [ -n "$PTFNR" ]; then + # Apply PTFs + sh 02_ptf.sh + ptf=$? + else + # There are no PTFs + ptf=0 + fi + + if [ $ptf -eq 0 ]; then + # Create PSWI + sh 03_create.sh + create=$? + + # Cleanup after the creation of PSWI + sh 04_create_cleanup.sh + # Cleanup of SMP/E + sh 07_smpe_cleanup.sh + # Clean RELFILEs and PTFs + sh 08_presmpe_cleanup.sh + + if [ $create -eq 0 ]; then + # Test PSWI + sh 05_test.sh + test=$? + + # Cleanup after the test + sh 06_test_cleanup.sh + fi + else + # Cleanup of SMP/E if PTF weren't successful - because the earlier cleanup runs only it it was success + sh 07_smpe_cleanup.sh + # Clean RELFILEs and PTFs + sh 08_presmpe_cleanup.sh + fi + else + # Cleanup of SMP/E if SMPE weren't successful - because the earlier cleanup runs only it it was success + sh 07_smpe_cleanup.sh + # Clean RELFILEs and PTFs + sh 08_presmpe_cleanup.sh + fi fi -fi echo "" echo "" -if [ $smpe -ne 0 ] || [ $ptf -ne 0 ] || [ $create -ne 0 ] || [ $test -ne 0 ] || [ $presmpe -ne 0 ] -then +if [ $smpe -ne 0 ] || [ $ptf -ne 0 ] || [ $create -ne 0 ] || [ $test -ne 0 ] || [ $presmpe -ne 0 ]; then echo "Build unsuccessful!" if [ $presmpe -ne 0 ]; then echo "Pre-SMP/E wasn't successful." diff --git a/tests/installation/src/__tests__/extended/keyring-modes/acf2-keyring.ts b/tests/installation/src/__tests__/extended/keyring-modes/acf2-keyring.ts index 5740f129be..8b740588ee 100644 --- a/tests/installation/src/__tests__/extended/keyring-modes/acf2-keyring.ts +++ b/tests/installation/src/__tests__/extended/keyring-modes/acf2-keyring.ts @@ -18,7 +18,7 @@ import { KEYSTORE_MODE_KEYRING, } from '../../../constants'; -const testServer = 'marist-2'; +const testServer = 'marist-6'; const testSuiteName = 'Test convenience build installation with keystore pointing to an ACF2 keyring'; describe(testSuiteName, () => { beforeAll(() => { diff --git a/tests/installation/src/__tests__/extended/keyring-modes/racf-keyring.ts b/tests/installation/src/__tests__/extended/keyring-modes/racf-keyring.ts index 7e950bee6e..f2399de380 100644 --- a/tests/installation/src/__tests__/extended/keyring-modes/racf-keyring.ts +++ b/tests/installation/src/__tests__/extended/keyring-modes/racf-keyring.ts @@ -18,7 +18,7 @@ import { KEYSTORE_MODE_KEYRING, } from '../../../constants'; -const testServer = 'marist-4'; +const testServer = 'marist-8'; const testSuiteName = 'Test convenience build installation with keystore pointing to a RACF keyring'; describe(testSuiteName, () => { beforeAll(() => { diff --git a/tests/installation/src/__tests__/extended/keyring-modes/tss-keyring.ts b/tests/installation/src/__tests__/extended/keyring-modes/tss-keyring.ts index 19bf77eb98..fbd1f1f69d 100644 --- a/tests/installation/src/__tests__/extended/keyring-modes/tss-keyring.ts +++ b/tests/installation/src/__tests__/extended/keyring-modes/tss-keyring.ts @@ -18,7 +18,7 @@ import { KEYSTORE_MODE_KEYRING, } from '../../../constants'; -const testServer = 'marist-3'; +const testServer = 'marist-7'; const testSuiteName = 'Test convenience build installation with keystore pointing to a TSS keyring'; describe(testSuiteName, () => { beforeAll(() => { diff --git a/tests/installation/src/__tests__/extended/node-versions/node-v18.ts b/tests/installation/src/__tests__/extended/node-versions/node-v18.ts index f44632a305..4758b24904 100644 --- a/tests/installation/src/__tests__/extended/node-versions/node-v18.ts +++ b/tests/installation/src/__tests__/extended/node-versions/node-v18.ts @@ -15,7 +15,7 @@ import { } from '../../../utils'; import { TEST_TIMEOUT_CONVENIENCE_BUILD } from '../../../constants'; -// Only runs on zzow04 at time of change (04.2023). See cicd-test.yml and make_matrix.sh. +// Only runs on zzow08 at time of change (04.2023). See cicd-test.yml and make_matrix.sh. const testServer = process.env.TEST_SERVER; const testSuiteName = 'Test convenience build installation with node.js v18'; describe(testSuiteName, () => { diff --git a/tests/installation/src/__tests__/extended/security-systems/convenience/acf2.ts b/tests/installation/src/__tests__/extended/security-systems/convenience/acf2.ts index 9e9e6c88dc..7989dd6204 100644 --- a/tests/installation/src/__tests__/extended/security-systems/convenience/acf2.ts +++ b/tests/installation/src/__tests__/extended/security-systems/convenience/acf2.ts @@ -18,10 +18,10 @@ import {TEST_TIMEOUT_CONVENIENCE_BUILD} from '../../../../constants'; /** * Define this test should run in a specific worker * - * @worker marist-2 + * @worker marist-6 */ -// hard code to use marist-2 which we started with ACF2 -const testServer = 'marist-2'; +// hard code to use marist-6 which we started with ACF2 +const testServer = 'marist-6'; const testSuiteName = 'Test convenience build installation with ACF2'; describe(testSuiteName, () => { beforeAll(() => { diff --git a/tests/installation/src/__tests__/extended/security-systems/convenience/racf.ts b/tests/installation/src/__tests__/extended/security-systems/convenience/racf.ts index 6dbf38158a..8f5a5a4c01 100644 --- a/tests/installation/src/__tests__/extended/security-systems/convenience/racf.ts +++ b/tests/installation/src/__tests__/extended/security-systems/convenience/racf.ts @@ -18,9 +18,9 @@ import {TEST_TIMEOUT_CONVENIENCE_BUILD} from '../../../../constants'; /** * Define this test should run in a specific worker * - * @worker marist-4 + * @worker marist-8 */ -const testServer = 'marist-4'; +const testServer = 'marist-8'; const testSuiteName = 'Test convenience build installation with RACF'; describe(testSuiteName, () => { beforeAll(() => { diff --git a/tests/installation/src/__tests__/extended/security-systems/convenience/ts.ts b/tests/installation/src/__tests__/extended/security-systems/convenience/ts.ts index 6fcde1aede..22f339ae6b 100644 --- a/tests/installation/src/__tests__/extended/security-systems/convenience/ts.ts +++ b/tests/installation/src/__tests__/extended/security-systems/convenience/ts.ts @@ -18,10 +18,10 @@ import {TEST_TIMEOUT_CONVENIENCE_BUILD} from '../../../../constants'; /** * Define this test should run in a specific worker * - * @worker marist-3 + * @worker marist-7 */ -// hard code to use marist-3 which we started with Top Secret -const testServer = 'marist-3'; +// hard code to use marist-7 which we started with Top Secret +const testServer = 'marist-7'; const testSuiteName = 'Test convenience build installation with Top Secret'; describe(testSuiteName, () => { beforeAll(() => { diff --git a/tests/installation/src/__tests__/extended/security-systems/fmid/acf2.ts b/tests/installation/src/__tests__/extended/security-systems/fmid/acf2.ts index 1b3c5a2aae..9a6e32810b 100644 --- a/tests/installation/src/__tests__/extended/security-systems/fmid/acf2.ts +++ b/tests/installation/src/__tests__/extended/security-systems/fmid/acf2.ts @@ -18,10 +18,10 @@ import {TEST_TIMEOUT_SMPE_FMID} from '../../../../constants'; /** * Define this test should run in a specific worker * - * @worker marist-2 + * @worker marist-6 */ -// hard code to use marist-2 which we started with ACF2 -const testServer = 'marist-2'; +// hard code to use marist-6 which we started with ACF2 +const testServer = 'marist-6'; const testSuiteName = 'Test SMPE FMID installation with ACF2'; describe(testSuiteName, () => { beforeAll(() => { diff --git a/tests/installation/src/__tests__/extended/security-systems/fmid/racf.ts b/tests/installation/src/__tests__/extended/security-systems/fmid/racf.ts index 336d3e1181..a283327624 100644 --- a/tests/installation/src/__tests__/extended/security-systems/fmid/racf.ts +++ b/tests/installation/src/__tests__/extended/security-systems/fmid/racf.ts @@ -18,9 +18,9 @@ import {TEST_TIMEOUT_SMPE_FMID} from '../../../../constants'; /** * Define this test should run in a specific worker * - * @worker marist-4 + * @worker marist-8 */ -const testServer = 'marist-4'; +const testServer = 'marist-8'; const testSuiteName = 'Test SMPE FMID installation with RACF'; describe(testSuiteName, () => { beforeAll(() => { diff --git a/tests/installation/src/__tests__/extended/security-systems/fmid/ts.ts b/tests/installation/src/__tests__/extended/security-systems/fmid/ts.ts index 7e33ba2eca..d274358705 100644 --- a/tests/installation/src/__tests__/extended/security-systems/fmid/ts.ts +++ b/tests/installation/src/__tests__/extended/security-systems/fmid/ts.ts @@ -18,10 +18,10 @@ import {TEST_TIMEOUT_SMPE_FMID} from '../../../../constants'; /** * Define this test should run in a specific worker * - * @worker marist-3 + * @worker marist-7 */ -// hard code to use marist-3 which we started with Top Secret -const testServer = 'marist-3'; +// hard code to use marist-7 which we started with Top Secret +const testServer = 'marist-7'; const testSuiteName = 'Test SMPE FMID installation with Top Secret'; describe(testSuiteName, () => { beforeAll(() => { diff --git a/tests/installation/src/__tests__/extended/security-systems/ptf/acf2.ts b/tests/installation/src/__tests__/extended/security-systems/ptf/acf2.ts index cdeb1b4b32..3665c08d52 100644 --- a/tests/installation/src/__tests__/extended/security-systems/ptf/acf2.ts +++ b/tests/installation/src/__tests__/extended/security-systems/ptf/acf2.ts @@ -18,10 +18,10 @@ import {TEST_TIMEOUT_SMPE_PTF} from '../../../../constants'; /** * Define this test should run in a specific worker * - * @worker marist-2 + * @worker marist-6 */ -// hard code to use marist-2 which we started with ACF2 -const testServer = 'marist-2'; +// hard code to use marist-6 which we started with ACF2 +const testServer = 'marist-6'; const testSuiteName = 'Test SMPE PTF installation with ACF2'; describe(testSuiteName, () => { beforeAll(() => { diff --git a/tests/installation/src/__tests__/extended/security-systems/ptf/racf.ts b/tests/installation/src/__tests__/extended/security-systems/ptf/racf.ts index 17d51a268f..a796eed96c 100644 --- a/tests/installation/src/__tests__/extended/security-systems/ptf/racf.ts +++ b/tests/installation/src/__tests__/extended/security-systems/ptf/racf.ts @@ -18,9 +18,9 @@ import {TEST_TIMEOUT_SMPE_PTF} from '../../../../constants'; /** * Define this test should run in a specific worker * - * @worker marist-4 + * @worker marist-8 */ -const testServer = 'marist-4'; +const testServer = 'marist-8'; const testSuiteName = 'Test SMPE PTF installation with RACF'; describe(testSuiteName, () => { beforeAll(() => { diff --git a/tests/installation/src/__tests__/extended/security-systems/ptf/ts.ts b/tests/installation/src/__tests__/extended/security-systems/ptf/ts.ts index f367c392fd..43d08633ca 100644 --- a/tests/installation/src/__tests__/extended/security-systems/ptf/ts.ts +++ b/tests/installation/src/__tests__/extended/security-systems/ptf/ts.ts @@ -18,10 +18,10 @@ import {TEST_TIMEOUT_SMPE_PTF} from '../../../../constants'; /** * Define this test should run in a specific worker * - * @worker marist-3 + * @worker marist-7 */ -// hard code to use marist-3 which we started with Top Secret -const testServer = 'marist-3'; +// hard code to use marist-7 which we started with Top Secret +const testServer = 'marist-7'; const testSuiteName = 'Test SMPE PTF installation with Top Secret'; describe(testSuiteName, () => { beforeAll(() => { diff --git a/tests/sanity/test/e2e/test-06-vt.js b/tests/sanity/test/e2e/test-06-vt.js index b9619b793a..8e816ca02b 100644 --- a/tests/sanity/test/e2e/test-06-vt.js +++ b/tests/sanity/test/e2e/test-06-vt.js @@ -8,6 +8,7 @@ * Copyright IBM Corporation 2018, 2019 */ +/* const path = require('path'); const expect = require('chai').expect; const debug = require('debug')('zowe-sanity-test:e2e:vt'); @@ -48,7 +49,7 @@ describe(`test ${APP_TO_TEST}`, function() { ); }); - +/* it('should launch app correctly', async function() { // load app await launchApp(driver, APP_TO_TEST); @@ -87,11 +88,15 @@ describe(`test ${APP_TO_TEST}`, function() { addContext(this, file2); // it shouldn't show any error message + + // Open issue: test systems use non-standard port, so we DO see an error message. validate that. const errorLabel = await getElement(viewport, 'com-rs-mvd-vt .vt-parent .toolbar .error-label', true); - expect(errorLabel).to.not.be.an('object'); + expect(errorLabel).to.be.an('object'); + // const errorLabel = await getElement(viewport, 'com-rs-mvd-vt .vt-parent .toolbar .error-label', true); + // expect(errorLabel).to.not.be.an('object'); }); - - +*/ +/* after('quit webdriver', async function() { // quit webdriver if (driver) { @@ -99,3 +104,4 @@ describe(`test ${APP_TO_TEST}`, function() { } }); }); +*/ From dca2a7ecef6f9ce243a52f5a7a386cf48002d584 Mon Sep 17 00:00:00 2001 From: 1000TurquoisePogs Date: Mon, 27 Nov 2023 05:46:16 -0500 Subject: [PATCH 122/168] Update TLS settings (#3659) * Update TLS settings Signed-off-by: 1000TurquoisePogs * Update zowe-yaml-schema.json Signed-off-by: 1000TurquoisePogs --------- Signed-off-by: 1000TurquoisePogs Co-authored-by: Mark Ackert <35308966+MarkAckert@users.noreply.github.com> --- schemas/zowe-yaml-schema.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/schemas/zowe-yaml-schema.json b/schemas/zowe-yaml-schema.json index 60a2f83374..bd4d2f458d 100644 --- a/schemas/zowe-yaml-schema.json +++ b/schemas/zowe-yaml-schema.json @@ -860,7 +860,7 @@ "properties": { "ciphers": { "type": "array", - "description": "Acceptable TLS cipher suites for network connections.", + "description": "Acceptable TLS cipher suites for network connections, in IANA format.", "items": { "type": "string" } @@ -874,15 +874,15 @@ }, "maxTls": { "type": "string", - "enum": ["TLSv1.0", "TLSv1.1", "TLSv1.2", "TLSv1.3"], + "enum": ["TLSv1.2", "TLSv1.3"], "default": "TLSv1.3", "description": "Maximum TLS version allowed for network connections." }, "minTls": { "type": "string", - "enum": ["TLSv1.0", "TLSv1.1", "TLSv1.2", "TLSv1.3"], - "default": "TLSv1.3", - "description": "Minimum TLS version allowed for network connections, and less than network.maxTls." + "enum": ["TLSv1.2", "TLSv1.3"], + "default": "TLSv1.2", + "description": "Minimum TLS version allowed for network connections, and less than or equal to network.maxTls." } } }, From 6cfe733774df559757dda47c79773541e71b33c6 Mon Sep 17 00:00:00 2001 From: 1000TurquoisePogs Date: Tue, 28 Nov 2023 07:34:17 -0500 Subject: [PATCH 123/168] Add getesm to build (#3663) * Add getesm to build Signed-off-by: 1000TurquoisePogs * Update README.md Signed-off-by: Martin Zeithaml <66114686+Martin-Zeithaml@users.noreply.github.com> --------- Signed-off-by: 1000TurquoisePogs Signed-off-by: Martin Zeithaml <66114686+Martin-Zeithaml@users.noreply.github.com> Co-authored-by: Martin Zeithaml <66114686+Martin-Zeithaml@users.noreply.github.com> --- .github/workflows/build-packaging.yml | 2 +- .pax/pre-packaging.sh | 7 +++++++ CHANGELOG.md | 2 ++ bin/README.md | 1 + manifest.json.template | 4 ++++ 5 files changed, 15 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build-packaging.yml b/.github/workflows/build-packaging.yml index 7751f2f770..1591457df4 100644 --- a/.github/workflows/build-packaging.yml +++ b/.github/workflows/build-packaging.yml @@ -171,7 +171,7 @@ jobs: with: manifest-file-path: ${{ github.workspace }}/manifest.json default-target-path: .pax/binaryDependencies/ - expected-count: 29 + expected-count: 30 # this step is not doing a publish, we are just utilizing this actions to get the PUBLISH_TARGET_PATH, # and it will be used in the next step: [Download 3] Download SMPE build log diff --git a/.pax/pre-packaging.sh b/.pax/pre-packaging.sh index 8b4fe80b14..8069837337 100755 --- a/.pax/pre-packaging.sh +++ b/.pax/pre-packaging.sh @@ -249,6 +249,13 @@ mv ./content/templates . chmod +x templates/*.rex mkdir -p "${ZOWE_ROOT_DIR}/bin/utils" +getesm=$(find "${ZOWE_ROOT_DIR}/files" -type f \( -name "getesm*.pax" \) | head -n 1) +echo "[$SCRIPT_NAME] extract getesm $getesm" +cd "${ZOWE_ROOT_DIR}/bin/utils" +pax -ppx -rf "${getesm}" +rm "${getesm}" +cd "${BASE_DIR}" + configmgr=$(find "${ZOWE_ROOT_DIR}/files" -type f \( -name "configmgr-2*.pax" \) | head -n 1) echo "[$SCRIPT_NAME] extract configmgr $configmgr" cd "${ZOWE_ROOT_DIR}/bin/utils" diff --git a/CHANGELOG.md b/CHANGELOG.md index f0dfd72d56..a6a68c1b21 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,10 +5,12 @@ All notable changes to the Zowe Installer will be documented in this file. ## `2.13.0` ### New features and enhancements +- Enhancement: Added utility "getesm" into bin/utils. When run it outputs to STDOUT which ESM your system is using. (#3662) #### Minor enhancements/defect fixes - Bugfix: Workflow files in the Zowe PAX are now ASCII-encoded. Fixes [#3591](https://github.com/zowe/zowe-install-packaging/issues/3591). + ## `2.12.0` ### New features and enhancements diff --git a/bin/README.md b/bin/README.md index f508bbf0d6..c41812e683 100644 --- a/bin/README.md +++ b/bin/README.md @@ -56,6 +56,7 @@ Please be aware of using functions marked as `@experimental`. These functions ma - `bin/utils/opercmd.rex`: To issue operator command on z/OS. This script can only run on z/OS. - `bin/utils/curl.js`: This is node.js script works similar to popular Linux tool `curl`. It can make HTTP/HTTPS request and display response. +- `bin/utils/getesm`: Executable to get the name of External Security Manager Please be aware of using utilities marked as `@experimental`. These utilities may be changed or improved in the future, and they may not be stable enough for extenders to use if they target to support multiple versions of Zowe. diff --git a/manifest.json.template b/manifest.json.template index d925e240e8..7a6a03dfed 100644 --- a/manifest.json.template +++ b/manifest.json.template @@ -111,6 +111,10 @@ "artifact": "cloud-gateway-*.zip", "exclusions": ["*PR*.zip"] }, + "org.zowe.getesm": { + "version": "^2.0.0-V2.X-STAGING", + "artifact": "*.pax" + }, "org.zowe.configmgr": { "version": "^2.0.0-V2.X-STAGING", "artifact": "*.pax" From 1190cbbd35e7ef5eb6e7234b830f856c1f6a970a Mon Sep 17 00:00:00 2001 From: 1000TurquoisePogs Date: Tue, 28 Nov 2023 11:56:18 -0500 Subject: [PATCH 124/168] Reduce string fields by introducing better typing (#3617) * Reduce string fields by introducing better typing Signed-off-by: 1000TurquoisePogs * Add new reusable types Signed-off-by: 1000TurquoisePogs --------- Signed-off-by: 1000TurquoisePogs Signed-off-by: Mark Ackert <35308966+MarkAckert@users.noreply.github.com> Co-authored-by: Mark Ackert <35308966+MarkAckert@users.noreply.github.com> --- schemas/server-common.json | 21 +++++++++++++++++ schemas/zowe-yaml-schema.json | 44 ++++++++++++++++++----------------- 2 files changed, 44 insertions(+), 21 deletions(-) diff --git a/schemas/server-common.json b/schemas/server-common.json index 4eaa81feb1..cf9e0a6c80 100644 --- a/schemas/server-common.json +++ b/schemas/server-common.json @@ -46,6 +46,27 @@ "minLength": 1, "maxLength": 8 }, + "userAnyCase": { + "$anchor": "zoweUserAnyCase", + "type": "string", + "pattern": "^([A-Za-z0-9$#@]){1,8}$", + "minLength": 1, + "maxLength": 8 + }, + "groupNameAnyCase": { + "$anchor": "zoweGroupNameAnyCase", + "type": "string", + "pattern": "[A-Z#$@][A-Z0-9Z#@]{0,7}", + "minLength": 1, + "maxLength": 8 + }, + "groupNameUppercase": { + "$anchor": "zoweGroup", + "type": "string", + "pattern": "[A-Za-z#$@][A-Za-z0-9Z#@]{0,7}", + "minLength": 1, + "maxLength": 8 + }, "token": { "$anchor": "zoweToken", "type": "string", diff --git a/schemas/zowe-yaml-schema.json b/schemas/zowe-yaml-schema.json index bd4d2f458d..fc3a2bf129 100644 --- a/schemas/zowe-yaml-schema.json +++ b/schemas/zowe-yaml-schema.json @@ -21,15 +21,15 @@ "description": "MVS data set related configurations", "properties": { "prefix": { - "type": "string", + "$ref": "/schemas/v2/server-common#zoweDataset", "description": "Where Zowe MVS data sets will be installed" }, "proclib": { - "type": "string", + "$ref": "/schemas/v2/server-common#zoweDataset", "description": "PROCLIB where Zowe STCs will be copied over" }, "parmlib": { - "type": "string", + "$ref": "/schemas/v2/server-common#zoweDataset", "description": "Zowe PARMLIB" }, "parmlibMembers": { @@ -44,21 +44,21 @@ } }, "jcllib": { - "type": "string", + "$ref": "/schemas/v2/server-common#zoweDataset", "description": "JCL library where Zowe will store temporary JCLs during initialization" }, "loadlib": { - "type": "string", + "$ref": "/schemas/v2/server-common#zoweDataset", "description": "States the dataset where Zowe executable utilities are located", "default": ".SZWELOAD" }, "authLoadlib": { - "type": "string", + "$ref": "/schemas/v2/server-common#zoweDataset", "description": "The dataset that contains any Zowe core code that needs to run APF-authorized, such as ZIS", "default": ".SZWEAUTH" }, "authPluginLib": { - "type": "string", + "$ref": "/schemas/v2/server-common#zoweDataset", "description": "APF authorized LOADLIB for Zowe ZIS Plugins" } } @@ -103,17 +103,17 @@ "description": "security group name", "properties": { "admin": { - "type": "string", + "$ref": "/schemas/v2/server-common#zoweGroupNameAnyCase", "description": "Zowe admin user group", "default": "ZWEADMIN" }, "stc": { - "type": "string", + "$ref": "/schemas/v2/server-common#zoweGroupNameAnyCase", "description": "Zowe STC group", "default": "ZWEADMIN" }, "sysProg": { - "type": "string", + "$ref": "/schemas/v2/server-common#zoweGroupNameAnyCase", "description": "Zowe SysProg group", "default": "ZWEADMIN" } @@ -125,12 +125,12 @@ "description": "security user name", "properties": { "zowe": { - "type": "string", + "$ref": "/schemas/v2/server-common#zoweUserAnyCase", "description": "Zowe runtime user name of main service", "default": "ZWESVUSR" }, "zis": { - "type": "string", + "$ref": "/schemas/v2/server-common#zoweUserAnyCase", "description": "Zowe runtime user name of ZIS", "default": "ZWESIUSR" } @@ -142,17 +142,17 @@ "description": "STC names", "properties": { "zowe": { - "type": "string", + "$ref": "/schemas/v2/server-common#zoweJobname", "description": "STC name of main service", "default": "ZWESLSTC" }, "zis": { - "type": "string", + "$ref": "/schemas/v2/server-common#zoweJobname", "description": "STC name of ZIS", "default": "ZWESISTC" }, "aux": { - "type": "string", + "$ref": "/schemas/v2/server-common#zoweJobname", "description": "STC name of Auxiliary Service", "default": "ZWESASTC" } @@ -244,7 +244,7 @@ "description": "Configure this section if you are using z/OS keyring", "properties": { "owner": { - "type": "string", + "$ref": "/schemas/v2/server-common#zoweUserAnyCase", "description": "keyring owner. If this is empty, Zowe will use the user ID defined as zowe.setup.security.users.zowe." }, "name": { @@ -282,7 +282,7 @@ "description": "Configure this section if you want to import existing certificate stored in data set to Zowe.", "properties": { "dsName": { - "type": "string", + "$ref": "/schemas/v2/server-common#zoweDataset", "description": "Name of the data set holds the certificate issued by other CA. This data set should be in PKCS12 format and contain private key." }, "password": { @@ -301,7 +301,7 @@ "description": "z/OSMF certificate authority alias" }, "user": { - "type": "string", + "$ref": "/schemas/v2/server-common#zoweUserAnyCase", "description": "z/OSMF user. Zowe initialization utility can detect alias of z/OSMF CA for RACF security system. The automated detection requires this z/OSMF user as input." } } @@ -339,7 +339,8 @@ }, "country": { "type": "string", - "description": "2 letters country code of certificate generated by Zowe." + "description": "2 letters country code of certificate generated by Zowe.", + "pattern": "[A-Z][A-Z]" } } }, @@ -377,7 +378,8 @@ }, "volume": { "type": "string", - "description": "Volume name if you are using VSAM in NONRLS mode" + "description": "Volume name if you are using VSAM in NONRLS mode", + "maxLength": 6 }, "storageClass": { "type": "string", @@ -409,7 +411,7 @@ "description": "Customize your Zowe z/OS JES job.", "properties": { "name": { - "type": "string", + "$ref": "/schemas/v2/server-common#zoweJobname", "description": "Job name of Zowe primary ZWESLSTC started task." }, "prefix": { From d6234a222ad9ce86a9be919c1fd32fbf79ba823e Mon Sep 17 00:00:00 2001 From: Mark Ackert <35308966+MarkAckert@users.noreply.github.com> Date: Tue, 28 Nov 2023 12:02:27 -0500 Subject: [PATCH 125/168] build: update zzow matrix generator (#3665) Signed-off-by: MarkAckert --- .github/scripts/cicd_test/make_matrix.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/scripts/cicd_test/make_matrix.sh b/.github/scripts/cicd_test/make_matrix.sh index 7a17f253db..7a32aa75f6 100644 --- a/.github/scripts/cicd_test/make_matrix.sh +++ b/.github/scripts/cicd_test/make_matrix.sh @@ -83,7 +83,7 @@ if [[ ! -z "$test_force_system" ]]; then else if [[ -z "$dont_parse_test_server" ]]; then if [[ "$test_server" == "Any zzow servers" ]]; then - test_server="zzow0"$(echo $(($RANDOM % 3 + 2))) + test_server="zzow0"$(echo $(($RANDOM % 3 + 6))) fi TEST_FILE_SERVER="$test_file($test_server)" else From 846d8f0b79117bace6377fd5888c1bdb716c1a13 Mon Sep 17 00:00:00 2001 From: Leanid Astrakou Date: Tue, 28 Nov 2023 12:51:50 -0500 Subject: [PATCH 126/168] Added more clarification to example-zowe.yaml (#3660) * Added more clarification Signed-off-by: Leanid Astrakou * 512 char --> 126 Signed-off-by: Leanid Astrakou --------- Signed-off-by: Leanid Astrakou Co-authored-by: ojcelis <84936499+ojcelis@users.noreply.github.com> Co-authored-by: Mark Ackert <35308966+MarkAckert@users.noreply.github.com> Co-authored-by: 1000TurquoisePogs --- example-zowe.yaml | 37 ++++++++++++++++++++++--------------- 1 file changed, 22 insertions(+), 15 deletions(-) diff --git a/example-zowe.yaml b/example-zowe.yaml index 2f121c4128..347230414d 100644 --- a/example-zowe.yaml +++ b/example-zowe.yaml @@ -9,18 +9,19 @@ ################################################################################ #=============================================================================== -# This is a YAML configuration file for Zowe instance. +# This is a YAML configuration file for a Zowe instance. # # YAML is a human-friendly data serialization language for all programming languages. # To learn more about YAML specifications, please check https://yaml.org/. # -# To learn more details about the entries, please check https://docs.zowe.org/. +# To learn more details about the content of this file, please check https://docs.zowe.org/. # # For first time users, or for the most common use cases, please pay more -# attention on the entries marked with "**COMMONLY_CUSTOMIZED**". +# attention to the entries marked with "**COMMONLY_CUSTOMIZED**". A "directory" refers +# to a directory in z/OS Unix. # # If you modify any settings listed in "zwe init --help" command, you may need to -# re-run "zwe init" command to make them take effect. +# re-run the "zwe init" command to make them take effect. #=============================================================================== #------------------------------------------------------------------------------- @@ -268,10 +269,15 @@ zowe: # **COMMONLY_CUSTOMIZED** # Zowe runtime (root) directory # - # **NOTE**: if it is not specified and you passed "--update-config" argument - # when you run "zwe init" command, this value will be updated with the Zowe + # **NOTE**: + # 1. if it is not specified and you passed "--update-config" argument + # when you ran "zwe init" command, this value will be updated with the Zowe # runtime where the "zwe" command is located. # + # 2. the runtime directory is designed to be "read only". This is different from the + # log, workspace, and extension directories. Setting those three to the same parent folder + # as the runtime directory is unsupported & may cause issues + # # This value is required by ZWESLSTC to know where is Zowe runtime. runtimeDirectory: "" @@ -325,8 +331,8 @@ zowe: # >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> # **COMMONLY_CUSTOMIZED** - # You can list your external domains how you want to access Zowe. - # This should be the domain list you would like to put into your web browser + # You can list your external domains on how you want to access Zowe. + # This should be the domain list you would like to put into your web browser's # address bar. externalDomains: # this should be the domain name to access Zowe APIML Gateway @@ -351,7 +357,8 @@ zowe: # ZWED_TN3270_PORT: 23 # >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> - # You can define any Zowe message portions to be checked for and the whole message added to the system log + # You can define any Zowe message portions to be checked for and the message added to the + # system log upon its logging, truncated to 126 characters. sysMessages: # # Zowe starting - "ZWEL0021I" @@ -375,15 +382,15 @@ zowe: # # ZSS ready - "ZWES1013I" - # # Not limited to Zowe message ID's + # # Not limited to Zowe message ID's, you can specify your own string for example: # - "ERROR" # >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> - # Enable debug mode for zowe launch scripts + # Enable debug mode for Zowe launch scripts launchScript: - # set to "debug" or "trace" to display extra debug information + # Set to "debug" or "trace" to display extra debug information logLevel: "info" - # set to "exit" if you'd like startup to exit if any component has an error in the configure stage, otherwise zwe will warn but continue. + # Set to "exit" if you'd like startup to exit if any component has an error in the configure stage, otherwise zwe will warn but continue. onComponentConfigureFail: "warn" # >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> @@ -421,7 +428,7 @@ zowe: # This mode does not validate certificate Common Name and Subject # Alternative Name (SAN). # - DISABLED: disable certificate validation. This is NOT recommended for - # security + # security. verifyCertificates: STRICT @@ -463,7 +470,7 @@ node: #------------------------------------------------------------------------------- zOSMF: # **COMMONLY_CUSTOMIZED** - # host name of your z/OSMF instance + # Host name of your z/OSMF instance host: dvipa.my-company.com # **COMMONLY_CUSTOMIZED** port: 443 From 98048f11e398db70b2f47035b682fe5a91a933cc Mon Sep 17 00:00:00 2001 From: Pablo Carle Date: Wed, 29 Nov 2023 14:19:37 +0100 Subject: [PATCH 127/168] Add zosmf scheme option for at-tls in api ml (#3661) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * add zosmf scheme option for at-tls in api ml Signed-off-by: Pablo Hernán Carle * add common-java Signed-off-by: Pablo Hernán Carle * common-java lib package Signed-off-by: Pablo Hernán Carle * try without comp Signed-off-by: Pablo Hernán Carle * back to allowlist common-java-lib Signed-off-by: Pablo Hernán Carle * remove env Signed-off-by: Pablo Hernán Carle --------- Signed-off-by: Pablo Hernán Carle Co-authored-by: Pablo Hernán Carle Co-authored-by: Mark Ackert <35308966+MarkAckert@users.noreply.github.com> --- .pax/pre-packaging.sh | 2 +- manifest.json.template | 2 +- schemas/zowe-yaml-schema.json | 12 ++++++++++++ 3 files changed, 14 insertions(+), 2 deletions(-) diff --git a/.pax/pre-packaging.sh b/.pax/pre-packaging.sh index 8069837337..cb17b8244b 100755 --- a/.pax/pre-packaging.sh +++ b/.pax/pre-packaging.sh @@ -295,7 +295,7 @@ done echo "[$SCRIPT_NAME] process commands.install hooks" # not all core components has commands.install -for component in app-server; do +for component in app-server common-java-lib; do echo "[$SCRIPT_NAME] - ${component}" # FIXME: these environment variables are changed in v2 ZOWE_ROOT_DIR=${ZOWE_ROOT_DIR} \ diff --git a/manifest.json.template b/manifest.json.template index 7a6a03dfed..a3cc856311 100644 --- a/manifest.json.template +++ b/manifest.json.template @@ -97,7 +97,7 @@ "exclusions": ["*PR*.zip"] }, "org.zowe.apiml.sdk.common-java-lib-package": { - "version": "~2.0.0-SNAPSHOT", + "version": "^2.0.0-SNAPSHOT", "artifact": "common-java-lib-*.zip", "exclusions": ["*PR*.zip"] }, diff --git a/schemas/zowe-yaml-schema.json b/schemas/zowe-yaml-schema.json index fc3a2bf129..ceca72bcb0 100644 --- a/schemas/zowe-yaml-schema.json +++ b/schemas/zowe-yaml-schema.json @@ -580,6 +580,10 @@ "$ref": "#/$defs/port", "description": "Port number of your z/OSMF instance." }, + "scheme": { + "$ref" : "#/$defs/scheme", + "description": "Scheme used to connect to z/OSMF instance. Optional for outbout AT-TLS, defaults to https" + }, "applId": { "type": "string", "description": "Appl ID of your z/OSMF instance." @@ -629,6 +633,14 @@ "minimum": 0, "maximum": 65535 }, + "scheme": { + "type": "string", + "enum": [ + "http", + "https" + ], + "default": "https" + }, "certificate": { "oneOf": [ { "$ref": "#/$defs/pkcs12-certificate" }, From c436e5e7f3e896e16423d732cb14354a637ac289 Mon Sep 17 00:00:00 2001 From: Mark Ackert <35308966+MarkAckert@users.noreply.github.com> Date: Fri, 1 Dec 2023 10:43:49 -0500 Subject: [PATCH 128/168] Revert "Reduce string fields by introducing better typing (#3617)" (#3674) This reverts commit 1190cbbd35e7ef5eb6e7234b830f856c1f6a970a. Signed-off-by: MarkAckert --- schemas/server-common.json | 21 ----------------- schemas/zowe-yaml-schema.json | 44 +++++++++++++++++------------------ 2 files changed, 21 insertions(+), 44 deletions(-) diff --git a/schemas/server-common.json b/schemas/server-common.json index cf9e0a6c80..4eaa81feb1 100644 --- a/schemas/server-common.json +++ b/schemas/server-common.json @@ -46,27 +46,6 @@ "minLength": 1, "maxLength": 8 }, - "userAnyCase": { - "$anchor": "zoweUserAnyCase", - "type": "string", - "pattern": "^([A-Za-z0-9$#@]){1,8}$", - "minLength": 1, - "maxLength": 8 - }, - "groupNameAnyCase": { - "$anchor": "zoweGroupNameAnyCase", - "type": "string", - "pattern": "[A-Z#$@][A-Z0-9Z#@]{0,7}", - "minLength": 1, - "maxLength": 8 - }, - "groupNameUppercase": { - "$anchor": "zoweGroup", - "type": "string", - "pattern": "[A-Za-z#$@][A-Za-z0-9Z#@]{0,7}", - "minLength": 1, - "maxLength": 8 - }, "token": { "$anchor": "zoweToken", "type": "string", diff --git a/schemas/zowe-yaml-schema.json b/schemas/zowe-yaml-schema.json index ceca72bcb0..23bebfff07 100644 --- a/schemas/zowe-yaml-schema.json +++ b/schemas/zowe-yaml-schema.json @@ -21,15 +21,15 @@ "description": "MVS data set related configurations", "properties": { "prefix": { - "$ref": "/schemas/v2/server-common#zoweDataset", + "type": "string", "description": "Where Zowe MVS data sets will be installed" }, "proclib": { - "$ref": "/schemas/v2/server-common#zoweDataset", + "type": "string", "description": "PROCLIB where Zowe STCs will be copied over" }, "parmlib": { - "$ref": "/schemas/v2/server-common#zoweDataset", + "type": "string", "description": "Zowe PARMLIB" }, "parmlibMembers": { @@ -44,21 +44,21 @@ } }, "jcllib": { - "$ref": "/schemas/v2/server-common#zoweDataset", + "type": "string", "description": "JCL library where Zowe will store temporary JCLs during initialization" }, "loadlib": { - "$ref": "/schemas/v2/server-common#zoweDataset", + "type": "string", "description": "States the dataset where Zowe executable utilities are located", "default": ".SZWELOAD" }, "authLoadlib": { - "$ref": "/schemas/v2/server-common#zoweDataset", + "type": "string", "description": "The dataset that contains any Zowe core code that needs to run APF-authorized, such as ZIS", "default": ".SZWEAUTH" }, "authPluginLib": { - "$ref": "/schemas/v2/server-common#zoweDataset", + "type": "string", "description": "APF authorized LOADLIB for Zowe ZIS Plugins" } } @@ -103,17 +103,17 @@ "description": "security group name", "properties": { "admin": { - "$ref": "/schemas/v2/server-common#zoweGroupNameAnyCase", + "type": "string", "description": "Zowe admin user group", "default": "ZWEADMIN" }, "stc": { - "$ref": "/schemas/v2/server-common#zoweGroupNameAnyCase", + "type": "string", "description": "Zowe STC group", "default": "ZWEADMIN" }, "sysProg": { - "$ref": "/schemas/v2/server-common#zoweGroupNameAnyCase", + "type": "string", "description": "Zowe SysProg group", "default": "ZWEADMIN" } @@ -125,12 +125,12 @@ "description": "security user name", "properties": { "zowe": { - "$ref": "/schemas/v2/server-common#zoweUserAnyCase", + "type": "string", "description": "Zowe runtime user name of main service", "default": "ZWESVUSR" }, "zis": { - "$ref": "/schemas/v2/server-common#zoweUserAnyCase", + "type": "string", "description": "Zowe runtime user name of ZIS", "default": "ZWESIUSR" } @@ -142,17 +142,17 @@ "description": "STC names", "properties": { "zowe": { - "$ref": "/schemas/v2/server-common#zoweJobname", + "type": "string", "description": "STC name of main service", "default": "ZWESLSTC" }, "zis": { - "$ref": "/schemas/v2/server-common#zoweJobname", + "type": "string", "description": "STC name of ZIS", "default": "ZWESISTC" }, "aux": { - "$ref": "/schemas/v2/server-common#zoweJobname", + "type": "string", "description": "STC name of Auxiliary Service", "default": "ZWESASTC" } @@ -244,7 +244,7 @@ "description": "Configure this section if you are using z/OS keyring", "properties": { "owner": { - "$ref": "/schemas/v2/server-common#zoweUserAnyCase", + "type": "string", "description": "keyring owner. If this is empty, Zowe will use the user ID defined as zowe.setup.security.users.zowe." }, "name": { @@ -282,7 +282,7 @@ "description": "Configure this section if you want to import existing certificate stored in data set to Zowe.", "properties": { "dsName": { - "$ref": "/schemas/v2/server-common#zoweDataset", + "type": "string", "description": "Name of the data set holds the certificate issued by other CA. This data set should be in PKCS12 format and contain private key." }, "password": { @@ -301,7 +301,7 @@ "description": "z/OSMF certificate authority alias" }, "user": { - "$ref": "/schemas/v2/server-common#zoweUserAnyCase", + "type": "string", "description": "z/OSMF user. Zowe initialization utility can detect alias of z/OSMF CA for RACF security system. The automated detection requires this z/OSMF user as input." } } @@ -339,8 +339,7 @@ }, "country": { "type": "string", - "description": "2 letters country code of certificate generated by Zowe.", - "pattern": "[A-Z][A-Z]" + "description": "2 letters country code of certificate generated by Zowe." } } }, @@ -378,8 +377,7 @@ }, "volume": { "type": "string", - "description": "Volume name if you are using VSAM in NONRLS mode", - "maxLength": 6 + "description": "Volume name if you are using VSAM in NONRLS mode" }, "storageClass": { "type": "string", @@ -411,7 +409,7 @@ "description": "Customize your Zowe z/OS JES job.", "properties": { "name": { - "$ref": "/schemas/v2/server-common#zoweJobname", + "type": "string", "description": "Job name of Zowe primary ZWESLSTC started task." }, "prefix": { From 7810be6aa36c3719a46f8cef23b9b228395d196d Mon Sep 17 00:00:00 2001 From: Martin Zeithaml <66114686+Martin-Zeithaml@users.noreply.github.com> Date: Wed, 6 Dec 2023 17:12:15 +0100 Subject: [PATCH 129/168] Typo in comment (#3679) Signed-off-by: Martin Zeithaml <66114686+Martin-Zeithaml@users.noreply.github.com> --- bin/utils/date-add.rex | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/utils/date-add.rex b/bin/utils/date-add.rex index bf6b0d120d..3763be6af7 100755 --- a/bin/utils/date-add.rex +++ b/bin/utils/date-add.rex @@ -56,7 +56,7 @@ target = today + days ISOTarget = Date("Standard", target, "Base") /* ISOTarget YYYYMMDD */ -/* 12344578 => YYYY = 1234, MM = 56, DD = 78 */ +/* 12345678 => YYYY = 1234, MM = 56, DD = 78 */ if pos("YYYY", dformat) = 0 then dformat = overlay("34", dformat, pos("YY", dformat)) From ceb26636c20abfebdd7e3129a8962bb0ba3e3c16 Mon Sep 17 00:00:00 2001 From: zowe-robot Date: Thu, 14 Dec 2023 16:23:26 +0000 Subject: [PATCH 130/168] Promote PTF after release v2.13.0 Signed-off-by: zowe-robot --- smpe/bld/service/promoted-apar.txt | 3 ++ smpe/bld/service/promoted-close.txt | 45 +++++++++++++++++++++++++++++ smpe/bld/service/promoted-hold.txt | 25 ++++++++++++++++ smpe/bld/service/promoted-ptf.txt | 2 ++ smpe/bld/service/ptf-bucket.txt | 2 +- 5 files changed, 76 insertions(+), 1 deletion(-) diff --git a/smpe/bld/service/promoted-apar.txt b/smpe/bld/service/promoted-apar.txt index eda8068aeb..a2d7a4efd6 100644 --- a/smpe/bld/service/promoted-apar.txt +++ b/smpe/bld/service/promoted-apar.txt @@ -1,3 +1,6 @@ +IO29343 +IO29344 +IO29345 IO29289 IO29290 IO29291 diff --git a/smpe/bld/service/promoted-close.txt b/smpe/bld/service/promoted-close.txt index 1a8d92b9ca..e8b8ecc2fe 100644 --- a/smpe/bld/service/promoted-close.txt +++ b/smpe/bld/service/promoted-close.txt @@ -1,3 +1,48 @@ + IO29343 - + PROBLEM SUMMARY: + **************************************************************** + * USERS AFFECTED: All Zowe users * + **************************************************************** + * PROBLEM DESCRIPTION: Update Zowe FMID AZWE002 to match the * + * community release * + **************************************************************** + * RECOMMENDATION: Apply provided service * + **************************************************************** + The Zowe community version was updated to 2.13.0. + This PTF provides the community changes in SMP/E format. + Follow this link for more details on the community changes: + https://docs.zowe.org/stable/ + + IO29344 - + PROBLEM SUMMARY: + **************************************************************** + * USERS AFFECTED: All Zowe users * + **************************************************************** + * PROBLEM DESCRIPTION: Update Zowe FMID AZWE002 to match the * + * community release * + **************************************************************** + * RECOMMENDATION: Apply provided service * + **************************************************************** + The Zowe community version was updated to 2.13.0. + This PTF provides the community changes in SMP/E format. + Follow this link for more details on the community changes: + https://docs.zowe.org/stable/ + + IO29345 - + PROBLEM SUMMARY: + **************************************************************** + * USERS AFFECTED: All Zowe users * + **************************************************************** + * PROBLEM DESCRIPTION: Update Zowe FMID AZWE002 to match the * + * community release * + **************************************************************** + * RECOMMENDATION: Apply provided service * + **************************************************************** + The Zowe community version was updated to 2.13.0. + This PTF provides the community changes in SMP/E format. + Follow this link for more details on the community changes: + https://docs.zowe.org/stable/ + IO29289 - PROBLEM SUMMARY: **************************************************************** diff --git a/smpe/bld/service/promoted-hold.txt b/smpe/bld/service/promoted-hold.txt index 7df8737e0f..ac8bc27006 100644 --- a/smpe/bld/service/promoted-hold.txt +++ b/smpe/bld/service/promoted-hold.txt @@ -1,3 +1,28 @@ +++HOLD(UO90045) SYSTEM FMID(AZWE002) REASON(ACTION) DATE(23348) + COMMENT( + **************************************************************** + * Affected function: Zowe servers * + **************************************************************** + * Description: stop servers * + **************************************************************** + * Timing: pre-APPLY * + **************************************************************** + * Part: ZWESLSTC and ZWESISTC * + **************************************************************** + Stop the Zowe servers before installing this update. + + **************************************************************** + * Affected function: Zowe servers * + **************************************************************** + * Description: start servers * + **************************************************************** + * Timing: post-APPLY * + **************************************************************** + * Part: ZWESLSTC and ZWESISTC * + **************************************************************** + Start the Zowe servers after installing this update. + + ). ++HOLD(UO90033) SYSTEM FMID(AZWE002) REASON(ACTION) DATE(23297) COMMENT( **************************************************************** diff --git a/smpe/bld/service/promoted-ptf.txt b/smpe/bld/service/promoted-ptf.txt index 4782225075..77aa3f6180 100644 --- a/smpe/bld/service/promoted-ptf.txt +++ b/smpe/bld/service/promoted-ptf.txt @@ -1,3 +1,5 @@ +UO90045 +UO90046 UO90033 UO90034 UO90031 diff --git a/smpe/bld/service/ptf-bucket.txt b/smpe/bld/service/ptf-bucket.txt index daa206b57a..206a6a7933 100644 --- a/smpe/bld/service/ptf-bucket.txt +++ b/smpe/bld/service/ptf-bucket.txt @@ -19,6 +19,6 @@ #UO90022 UO90023 - IO29185 IO29186 IO29187 - Fri Jul 28 01:08:59 UTC 2023 #UO90031 UO90032 - IO29286 IO29287 IO29288 - Tue Sep 12 18:27:05 UTC 2023 #UO90033 UO90034 - IO29289 IO29290 IO29291 - Tue Oct 24 19:49:48 UTC 2023 -UO90045 UO90046 - IO29343 IO29344 IO29345 +#UO90045 UO90046 - IO29343 IO29344 IO29345 - Thu Dec 14 16:23:26 UTC 2023 UO90047 UO90048 - IO29346 IO29347 IO29348 UO90049 UO90050 - IO29349 IO29350 IO29351 \ No newline at end of file From c389fafc08bb9f957ada2053f494e59f161f9575 Mon Sep 17 00:00:00 2001 From: MarkAckert Date: Thu, 14 Dec 2023 15:41:06 -0500 Subject: [PATCH 131/168] update manifest version Signed-off-by: MarkAckert --- manifest.json.template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.json.template b/manifest.json.template index a3cc856311..871e1f817f 100644 --- a/manifest.json.template +++ b/manifest.json.template @@ -1,6 +1,6 @@ { "name": "Zowe", - "version": "2.13.0", + "version": "2.14.0", "description": "Zowe is an open source project created to host technologies that benefit the Z platform from all members of the Z community (Integrated Software Vendors, System Integrators and z/OS consumers). Zowe, like Mac or Windows, comes with a set of APIs and OS capabilities that applications build on and also includes some applications out of the box. Zowe offers modern interfaces to interact with z/OS and allows you to work with z/OS in a way that is similar to what you experience on cloud platforms today. You can use these interfaces as delivered or through plug-ins and extensions that are created by clients or third-party vendors.", "license": "EPL-2.0", "homepage": "https://zowe.org", From b3b76b76490a3a50d5979db796777436e7076596 Mon Sep 17 00:00:00 2001 From: James Struga Date: Tue, 19 Dec 2023 13:05:39 -0500 Subject: [PATCH 132/168] Update version to 2.14.0 (#3691) Signed-off-by: James Struga --- manifest.json.template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.json.template b/manifest.json.template index a3cc856311..871e1f817f 100644 --- a/manifest.json.template +++ b/manifest.json.template @@ -1,6 +1,6 @@ { "name": "Zowe", - "version": "2.13.0", + "version": "2.14.0", "description": "Zowe is an open source project created to host technologies that benefit the Z platform from all members of the Z community (Integrated Software Vendors, System Integrators and z/OS consumers). Zowe, like Mac or Windows, comes with a set of APIs and OS capabilities that applications build on and also includes some applications out of the box. Zowe offers modern interfaces to interact with z/OS and allows you to work with z/OS in a way that is similar to what you experience on cloud platforms today. You can use these interfaces as delivered or through plug-ins and extensions that are created by clients or third-party vendors.", "license": "EPL-2.0", "homepage": "https://zowe.org", From 8c220246a726826e7ed7ee76a829998218605e54 Mon Sep 17 00:00:00 2001 From: James Struga Date: Mon, 8 Jan 2024 11:10:36 -0500 Subject: [PATCH 133/168] Add return code to zis plugin install Signed-off-by: James Struga --- bin/libs/component.sh | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/bin/libs/component.sh b/bin/libs/component.sh index 6494b53930..7f405e972f 100644 --- a/bin/libs/component.sh +++ b/bin/libs/component.sh @@ -551,6 +551,10 @@ zis_plugin_install() { if [ $changed -eq 1 ]; then copy_to_data_set "$parmlib_member_as_unix_file" "$zwes_zis_parmlib($zwes_zis_parmlib_member)" "" "true" + if [ $? != 0 ]; then + print_error "Error ZWEL0200E: Failed to copy USS file ${parmlib_member_as_unix_file} to MVS data set ${zwes_zis_parmlib}." + return 200 + fi fi } From 832bd260676afbc9d56213561b361ad76c7abafa Mon Sep 17 00:00:00 2001 From: James Struga Date: Mon, 8 Jan 2024 11:15:53 -0500 Subject: [PATCH 134/168] add typescript too Signed-off-by: James Struga --- bin/libs/component.ts | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/bin/libs/component.ts b/bin/libs/component.ts index 7318c3b4ff..1680ca3f61 100644 --- a/bin/libs/component.ts +++ b/bin/libs/component.ts @@ -672,7 +672,11 @@ export function zisPluginInstall(pluginPath: string, zisPluginlib: string, zisPa if (changed) { common.printDebug(`Parmlib modified, writing as \n${parmlibContents}`); xplatform.storeFileUTF8(parmlibMemberAsUnixFile, xplatform.AUTO_DETECT, parmlibContents); - zosdataset.copyToDataset(parmlibMemberAsUnixFile, `${zisParmlib}(${zisParmlibMember})`, "", true); + const rc = zosdataset.copyToDataset(parmlibMemberAsUnixFile, `${zisParmlib}(${zisParmlibMember})`, "", true); + if (rc != 0) { + common.printError(`Error ZWEL0200E: Failed to copy USS file ${parmlibMemberAsUnixFile} to MVS data set ${zisParmlib}.`); + return 200; + } } return 0; } From 62415b51de71ac63b7307e729c20e8447c692846 Mon Sep 17 00:00:00 2001 From: James Struga Date: Mon, 8 Jan 2024 14:12:46 -0500 Subject: [PATCH 135/168] Schema missing in staging Signed-off-by: James Struga --- schemas/zowe-yaml-schema.json | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/schemas/zowe-yaml-schema.json b/schemas/zowe-yaml-schema.json index 23bebfff07..32fe423772 100644 --- a/schemas/zowe-yaml-schema.json +++ b/schemas/zowe-yaml-schema.json @@ -861,11 +861,25 @@ "properties": { "network": { "$ref": "#/$defs/networkSettings" + }, + "job": { + "$ref": "#/$defs/componentJobSettings" } } } } }, + "componentJobSettings": { + "$anchor": "componentJobSettings", + "type": "object", + "description": "Component level overrides for job execution behavior", + "properties": { + "suffix": { + "type": "string", + "description": "Can be used by components to declare a jobname suffix to append to their job. This is not currently used by Zowe itself, it is up to components to use this value if desired. Zowe may use this value in the future." + } + } + }, "tlsSettings": { "$anchor": "tlsSettings", "type": "object", From 78f3f656d3f5db0a4cf3b3fe2a99283d7cfc816e Mon Sep 17 00:00:00 2001 From: 1000TurquoisePogs Date: Tue, 9 Jan 2024 12:47:32 -0600 Subject: [PATCH 136/168] Fix components not being enabled or disabled at ha instance level (#3692) * Fix components not being enabled or disabled at ha instance level Signed-off-by: 1000TurquoisePogs * Fix for env vars too Signed-off-by: 1000TurquoisePogs --------- Signed-off-by: 1000TurquoisePogs Co-authored-by: Timothy Gerstel --- CHANGELOG.md | 8 ++++++++ bin/libs/component.ts | 23 +++++++++-------------- bin/libs/configmgr.ts | 25 +++++++++++++++++++++---- 3 files changed, 38 insertions(+), 18 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index a6a68c1b21..be6da56e68 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,14 @@ All notable changes to the Zowe Installer will be documented in this file. +## `2.14.0` + +### New features and enhancements +- Enhancement: configmgr.ts now can return a Zowe config with the given HA instance's configuration substituted for convenience. This now used in zwe to fix an issue where zwe would not respect the preference of if a component was enabled or disabled in a particular instance when zowe.useConfigmgr was set to true. + +#### Minor enhancements/defect fixes +- Bugfix: environment variables were not using the values specified for each HA instance when zowe.useConfigmgr was set to true. + ## `2.13.0` ### New features and enhancements diff --git a/bin/libs/component.ts b/bin/libs/component.ts index 1680ca3f61..ddf6eb3037 100644 --- a/bin/libs/component.ts +++ b/bin/libs/component.ts @@ -24,6 +24,7 @@ import * as shell from './shell'; import * as configmgr from './configmgr'; import * as varlib from './var'; import * as fakejq from './fakejq'; +import * as configUtils from './config'; const CONFIG_MGR=configmgr.CONFIG_MGR; const ZOWE_CONFIG=configmgr.ZOWE_CONFIG; @@ -44,11 +45,13 @@ const PLUGIN_DEF_SCHEMA_ID = "https://zowe.org/schemas/v2/appfw-plugin-definitio const PLUGIN_DEF_SCHEMAS = `${runtimeDirectory}/components/app-server/schemas/plugindefinition-schema.json`; -export function getEnabledComponents(): string[] { - let components = Object.keys(ZOWE_CONFIG.components); - let enabled:string[] = []; - components.forEach((key:string) => { - if (ZOWE_CONFIG.components[key].enabled == true) { +export function getEnabledComponents() { + let haInstance = configUtils.sanitizeHaInstanceId(); + let haConfig = configmgr.getZoweConfig(haInstance); + let components = Object.keys(haConfig.components); + let enabled: string[] = []; + components.forEach((key) => { + if (haConfig.components[key].enabled == true) { enabled.push(key); } }); @@ -353,15 +356,7 @@ export function findAllEnabledComponents(): string { } export function findAllEnabledComponents2(): string[] { - let installedComponentsEnv=std.getenv('ZWE_INSTALLED_COMPONENTS'); - let installedComponents = installedComponentsEnv ? installedComponentsEnv.split(',') : null; - if (!installedComponents) { - installedComponents = findAllInstalledComponents2(); - } - return installedComponents.filter(function(component: string) { - let componentNameAsEnv=stringlib.sanitizeAlphanum(component); - return std.getenv(`ZWE_components_${componentNameAsEnv}_enabled`) == 'true'; - }); + return getEnabledComponents(); } export function findAllLaunchComponents(): string { diff --git a/bin/libs/configmgr.ts b/bin/libs/configmgr.ts index 03863f3d7a..ba16685f1e 100644 --- a/bin/libs/configmgr.ts +++ b/bin/libs/configmgr.ts @@ -48,6 +48,7 @@ const ZOWE_SCHEMA_ID = 'https://zowe.org/schemas/v2/server-base'; const ZOWE_SCHEMA_SET=`${ZOWE_SCHEMA}:${COMMON_SCHEMA}`; export let ZOWE_CONFIG=getZoweConfig(); +let HA_CONFIGS = {}; export function getZoweBaseSchemas(): string { return ZOWE_SCHEMA_SET; @@ -373,6 +374,7 @@ export function updateZoweConfig(updateObj: any, writeUpdate: boolean, arrayMerg let rc = updateConfig(getZoweConfigName(), updateObj, arrayMergeStrategy); if (rc == 0) { ZOWE_CONFIG=getZoweConfig(); + HA_CONFIGS = {}; //reset if (writeUpdate) { writeZoweConfigUpdate(updateObj, arrayMergeStrategy); writeMergedConfig(ZOWE_CONFIG); @@ -490,14 +492,29 @@ function getConfig(configName: string, configPath: string, schemas: string): any } } -export function getZoweConfig(): any { - if (configLoaded) { +function makeHaConfig(haInstance: string): any { + let config = getConfig(ZOWE_CONFIG_NAME, ZOWE_CONFIG_PATH, ZOWE_SCHEMA_SET); + if (config.haInstances && config.haInstances[haInstance]) { + let merger = new objUtils.Merger(); + merger.mergeArrays = false; + let mergedConfig = merger.merge(config.haInstances[haInstance], config); + INSTANCE_KEYS_NOT_IN_BASE.forEach((key) => delete mergedConfig[key]); + HA_CONFIGS[haInstance] = mergedConfig; + return mergedConfig; + } + return config; +} + +export function getZoweConfig(haInstance?: string): any { + if (configLoaded && !haInstance) { return getConfig(ZOWE_CONFIG_NAME, ZOWE_CONFIG_PATH, ZOWE_SCHEMA_SET); + } else if (configLoaded) { + return HA_CONFIGS[haInstance] || makeHaConfig(haInstance); } else { let config = getConfig(ZOWE_CONFIG_NAME, ZOWE_CONFIG_PATH, ZOWE_SCHEMA_SET); configLoaded = true; const writeResult = writeMergedConfig(config); - return config; + return haInstance ? makeHaConfig(haInstance) : config; } } @@ -528,7 +545,7 @@ export function getZoweConfigEnv(haInstance: string): any { haFlattener.setSeparator('_'); haFlattener.setPrefix('ZWE_'); haFlattener.setKeepArrays(true); - let overrides = haFlattener.flatten(config.haInstances[haInstance]); + overrides = haFlattener.flatten(config.haInstances[haInstance]); } else { envs['ZWE_haInstance_hostname'] = config.zowe.externalDomains[0]; } From a3bf0d237bf9511ed292e5d23363d5b447ebf036 Mon Sep 17 00:00:00 2001 From: MarkAckert Date: Mon, 22 Jan 2024 12:24:04 -0500 Subject: [PATCH 137/168] build: sigstore sign build artifacts Signed-off-by: MarkAckert --- .github/workflows/build-packaging.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/build-packaging.yml b/.github/workflows/build-packaging.yml index 1591457df4..a3c3fec7ff 100644 --- a/.github/workflows/build-packaging.yml +++ b/.github/workflows/build-packaging.yml @@ -265,6 +265,7 @@ jobs: timeout-minutes: 10 uses: zowe-actions/shared-actions/publish@main with: + sigstore-sign-artifacts: true artifacts: | .pax/zowe.pax .pax/zowe-smpe.zip From 9354d7c4b6afa9d5ebbe045a235aa6a97311dc74 Mon Sep 17 00:00:00 2001 From: MarkAckert Date: Mon, 22 Jan 2024 12:47:46 -0500 Subject: [PATCH 138/168] build: add id-token permissions for sigstore Signed-off-by: MarkAckert --- .github/workflows/build-packaging.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/build-packaging.yml b/.github/workflows/build-packaging.yml index a3c3fec7ff..8df9ac8d69 100644 --- a/.github/workflows/build-packaging.yml +++ b/.github/workflows/build-packaging.yml @@ -1,4 +1,8 @@ name: Zowe Build and Packaging + +permissions: + id-token: write + on: push: branches: From 95eefda739ed51e9e3e9224eb85cac3cb803cc04 Mon Sep 17 00:00:00 2001 From: MarkAckert Date: Mon, 22 Jan 2024 12:51:24 -0500 Subject: [PATCH 139/168] build: discrete permissions cont.. Signed-off-by: MarkAckert --- .github/workflows/build-packaging.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build-packaging.yml b/.github/workflows/build-packaging.yml index 8df9ac8d69..131fe2cae2 100644 --- a/.github/workflows/build-packaging.yml +++ b/.github/workflows/build-packaging.yml @@ -2,6 +2,7 @@ name: Zowe Build and Packaging permissions: id-token: write + issues: write on: push: @@ -134,7 +135,7 @@ jobs: echo BUILD_WHAT=$BUILD_WHAT >> $GITHUB_OUTPUT - - name: '[Prep 7] Comment on PR to indicate build is started' + - name: '[Prep 7] Comment on PR to indicate build is started' uses: actions/github-script@v5 id: create-comment if: (github.event_name == 'workflow_dispatch' || github.event_name == 'pull_request') && startsWith(env.CURRENT_BRANCH, 'PR-') From 1cde35268b6be98a4aa1bc7a67393ee73bef5954 Mon Sep 17 00:00:00 2001 From: MarkAckert Date: Mon, 22 Jan 2024 12:57:06 -0500 Subject: [PATCH 140/168] build: discrete permissions cont... PR Signed-off-by: MarkAckert --- .github/workflows/build-packaging.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/build-packaging.yml b/.github/workflows/build-packaging.yml index 131fe2cae2..254b17187b 100644 --- a/.github/workflows/build-packaging.yml +++ b/.github/workflows/build-packaging.yml @@ -3,6 +3,7 @@ name: Zowe Build and Packaging permissions: id-token: write issues: write + pull-requests: write on: push: From d3a35314f5a498a126a9ce0bfbfab1afd7abb852 Mon Sep 17 00:00:00 2001 From: MarkAckert Date: Mon, 22 Jan 2024 14:29:39 -0500 Subject: [PATCH 141/168] build: update contents permissions (ack locks) Signed-off-by: MarkAckert --- .github/workflows/build-packaging.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/build-packaging.yml b/.github/workflows/build-packaging.yml index 254b17187b..dc6dda480d 100644 --- a/.github/workflows/build-packaging.yml +++ b/.github/workflows/build-packaging.yml @@ -4,6 +4,7 @@ permissions: id-token: write issues: write pull-requests: write + contents: write on: push: From 443e4a06e1f665ce2d8f88cdac7323582cebfd0a Mon Sep 17 00:00:00 2001 From: MarkAckert Date: Thu, 25 Jan 2024 09:26:56 -0500 Subject: [PATCH 142/168] upgrade cicd-test to node18 Signed-off-by: MarkAckert --- .github/workflows/cicd-test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/cicd-test.yml b/.github/workflows/cicd-test.yml index 56a0e2ab89..ef54f73d4f 100644 --- a/.github/workflows/cicd-test.yml +++ b/.github/workflows/cicd-test.yml @@ -133,7 +133,7 @@ jobs: - name: '[Prep 2] Setup Node' uses: actions/setup-node@v3 with: - node-version: '14' + node-version: '18' - name: '[Prep 3] Cache node modules' uses: actions/cache@v2 From b398038bddf5fa4f56252b95c833877d41b7caea Mon Sep 17 00:00:00 2001 From: zowe-robot Date: Fri, 26 Jan 2024 17:21:09 +0000 Subject: [PATCH 143/168] Promote PTF after release v2.14.0 Signed-off-by: zowe-robot --- smpe/bld/service/promoted-apar.txt | 5 ++- smpe/bld/service/promoted-close.txt | 47 ++++++++++++++++++++++++++++- smpe/bld/service/promoted-hold.txt | 27 ++++++++++++++++- smpe/bld/service/promoted-ptf.txt | 4 ++- smpe/bld/service/ptf-bucket.txt | 2 +- 5 files changed, 80 insertions(+), 5 deletions(-) diff --git a/smpe/bld/service/promoted-apar.txt b/smpe/bld/service/promoted-apar.txt index a2d7a4efd6..07ec28cc3e 100644 --- a/smpe/bld/service/promoted-apar.txt +++ b/smpe/bld/service/promoted-apar.txt @@ -1,3 +1,6 @@ +IO29346 +IO29347 +IO29348 IO29343 IO29344 IO29345 @@ -42,4 +45,4 @@ IO28862 IO28866 IO28859 IO28860 -IO28865 \ No newline at end of file +IO28865 diff --git a/smpe/bld/service/promoted-close.txt b/smpe/bld/service/promoted-close.txt index e8b8ecc2fe..ee6b38e692 100644 --- a/smpe/bld/service/promoted-close.txt +++ b/smpe/bld/service/promoted-close.txt @@ -1,3 +1,48 @@ + IO29346 - + PROBLEM SUMMARY: + **************************************************************** + * USERS AFFECTED: All Zowe users * + **************************************************************** + * PROBLEM DESCRIPTION: Update Zowe FMID AZWE002 to match the * + * community release * + **************************************************************** + * RECOMMENDATION: Apply provided service * + **************************************************************** + The Zowe community version was updated to 2.14.0. + This PTF provides the community changes in SMP/E format. + Follow this link for more details on the community changes: + https://docs.zowe.org/stable/ + + IO29347 - + PROBLEM SUMMARY: + **************************************************************** + * USERS AFFECTED: All Zowe users * + **************************************************************** + * PROBLEM DESCRIPTION: Update Zowe FMID AZWE002 to match the * + * community release * + **************************************************************** + * RECOMMENDATION: Apply provided service * + **************************************************************** + The Zowe community version was updated to 2.14.0. + This PTF provides the community changes in SMP/E format. + Follow this link for more details on the community changes: + https://docs.zowe.org/stable/ + + IO29348 - + PROBLEM SUMMARY: + **************************************************************** + * USERS AFFECTED: All Zowe users * + **************************************************************** + * PROBLEM DESCRIPTION: Update Zowe FMID AZWE002 to match the * + * community release * + **************************************************************** + * RECOMMENDATION: Apply provided service * + **************************************************************** + The Zowe community version was updated to 2.14.0. + This PTF provides the community changes in SMP/E format. + Follow this link for more details on the community changes: + https://docs.zowe.org/stable/ + IO29343 - PROBLEM SUMMARY: **************************************************************** @@ -671,4 +716,4 @@ The Zowe community version was updated to 2.1.0. This PTF provides the community changes in SMP/E format. Follow this link for more details on the community changes: - https://docs.zowe.org/stable/ \ No newline at end of file + https://docs.zowe.org/stable/ diff --git a/smpe/bld/service/promoted-hold.txt b/smpe/bld/service/promoted-hold.txt index ac8bc27006..3337b60c7a 100644 --- a/smpe/bld/service/promoted-hold.txt +++ b/smpe/bld/service/promoted-hold.txt @@ -1,3 +1,28 @@ +++HOLD(UO90047) SYSTEM FMID(AZWE002) REASON(ACTION) DATE(24026) + COMMENT( + **************************************************************** + * Affected function: Zowe servers * + **************************************************************** + * Description: stop servers * + **************************************************************** + * Timing: pre-APPLY * + **************************************************************** + * Part: ZWESLSTC and ZWESISTC * + **************************************************************** + Stop the Zowe servers before installing this update. + + **************************************************************** + * Affected function: Zowe servers * + **************************************************************** + * Description: start servers * + **************************************************************** + * Timing: post-APPLY * + **************************************************************** + * Part: ZWESLSTC and ZWESISTC * + **************************************************************** + Start the Zowe servers after installing this update. + + ). ++HOLD(UO90045) SYSTEM FMID(AZWE002) REASON(ACTION) DATE(23348) COMMENT( **************************************************************** @@ -412,4 +437,4 @@ **************************************************************** Start the Zowe servers after installing this update. - ). \ No newline at end of file + ). diff --git a/smpe/bld/service/promoted-ptf.txt b/smpe/bld/service/promoted-ptf.txt index 77aa3f6180..08242dbddd 100644 --- a/smpe/bld/service/promoted-ptf.txt +++ b/smpe/bld/service/promoted-ptf.txt @@ -1,3 +1,5 @@ +UO90047 +UO90048 UO90045 UO90046 UO90033 @@ -27,4 +29,4 @@ UO02052 UO02049 UO02050 UO02047 -UO02048 \ No newline at end of file +UO02048 diff --git a/smpe/bld/service/ptf-bucket.txt b/smpe/bld/service/ptf-bucket.txt index 206a6a7933..47e79c15bd 100644 --- a/smpe/bld/service/ptf-bucket.txt +++ b/smpe/bld/service/ptf-bucket.txt @@ -20,5 +20,5 @@ #UO90031 UO90032 - IO29286 IO29287 IO29288 - Tue Sep 12 18:27:05 UTC 2023 #UO90033 UO90034 - IO29289 IO29290 IO29291 - Tue Oct 24 19:49:48 UTC 2023 #UO90045 UO90046 - IO29343 IO29344 IO29345 - Thu Dec 14 16:23:26 UTC 2023 -UO90047 UO90048 - IO29346 IO29347 IO29348 +#UO90047 UO90048 - IO29346 IO29347 IO29348 - Fri Jan 26 17:21:09 UTC 2024 UO90049 UO90050 - IO29349 IO29350 IO29351 \ No newline at end of file From 453dd6937b63f23851a1412aa296657a03a14314 Mon Sep 17 00:00:00 2001 From: MarkAckert Date: Fri, 26 Jan 2024 16:17:08 -0500 Subject: [PATCH 144/168] update manifest to 2.15.0 Signed-off-by: MarkAckert --- manifest.json.template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.json.template b/manifest.json.template index 871e1f817f..5f0645c5fa 100644 --- a/manifest.json.template +++ b/manifest.json.template @@ -1,6 +1,6 @@ { "name": "Zowe", - "version": "2.14.0", + "version": "2.15.0", "description": "Zowe is an open source project created to host technologies that benefit the Z platform from all members of the Z community (Integrated Software Vendors, System Integrators and z/OS consumers). Zowe, like Mac or Windows, comes with a set of APIs and OS capabilities that applications build on and also includes some applications out of the box. Zowe offers modern interfaces to interact with z/OS and allows you to work with z/OS in a way that is similar to what you experience on cloud platforms today. You can use these interfaces as delivered or through plug-ins and extensions that are created by clients or third-party vendors.", "license": "EPL-2.0", "homepage": "https://zowe.org", From 34c2c30a86d0398224dde838b46ea5d1335eb66c Mon Sep 17 00:00:00 2001 From: Martin Zeithaml <66114686+Martin-Zeithaml@users.noreply.github.com> Date: Wed, 31 Jan 2024 13:57:53 +0100 Subject: [PATCH 145/168] bin/libs/string.sh: trim update Signed-off-by: Martin Zeithaml <66114686+Martin-Zeithaml@users.noreply.github.com> --- bin/libs/string.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/libs/string.sh b/bin/libs/string.sh index 1c1be161ba..c5b95d38bb 100755 --- a/bin/libs/string.sh +++ b/bin/libs/string.sh @@ -22,7 +22,7 @@ trim() { input=${1} fi - echo "${input}" | xargs + echo "${input}" | sed -e 's/^[[:space:]]*//;s/[[:space:]]*$//' } ############################### From 8ad163e64cc53bf8c3ad6bb4322e30f8996cf0c1 Mon Sep 17 00:00:00 2001 From: Martin Zeithaml <66114686+Martin-Zeithaml@users.noreply.github.com> Date: Tue, 6 Feb 2024 13:27:19 +0100 Subject: [PATCH 146/168] Update zwe for handeling missing parms Signed-off-by: Martin Zeithaml <66114686+Martin-Zeithaml@users.noreply.github.com> --- bin/zwe | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/bin/zwe b/bin/zwe index baaf43bb9d..80e6247115 100755 --- a/bin/zwe +++ b/bin/zwe @@ -69,7 +69,9 @@ while [ $# -gt 0 ]; do print_error_and_exit "Error ZWEL0103E: Invalid type of parameter ${arg}" "" 103 fi fi - shift + if [ $# -gt 0 ]; then + shift + fi done # debug results From d8b26529700b77b8327194172805a0eb1e995720 Mon Sep 17 00:00:00 2001 From: Martin Zeithaml Date: Tue, 6 Feb 2024 09:23:49 -0500 Subject: [PATCH 147/168] Treat special chars Signed-off-by: Martin Zeithaml --- bin/libs/configmgr.ts | 3 ++- bin/libs/string.ts | 13 +++++++++++++ bin/libs/zos-dataset.ts | 16 ++++++++-------- bin/libs/zos.ts | 2 +- 4 files changed, 24 insertions(+), 10 deletions(-) diff --git a/bin/libs/configmgr.ts b/bin/libs/configmgr.ts index ba16685f1e..e9a4112d38 100644 --- a/bin/libs/configmgr.ts +++ b/bin/libs/configmgr.ts @@ -14,6 +14,7 @@ import * as os from 'cm_os'; import * as xplatform from 'xplatform'; import { ConfigManager } from 'Configuration'; import * as fs from './fs'; +import * as stringlib from './string'; import * as objUtils from '../utils/ObjUtils'; @@ -415,7 +416,7 @@ function getMemberNameFromConfigPath(configPath: string): string|undefined { function stripMemberName(configPath: string, memberName: string): string { //Turn PARMLIB(my.zowe(yaml)):PARMLIB(my.other.zowe(yaml)) //Into PARMLIB(my.zowe):FILE(/some/path.yaml):PARMLIB(my.other.zowe) - const replacer = new RegExp('\\('+memberName+'\\)\\)', 'gi'); + const replacer = new RegExp('\\('+stringlib.escapeRegExp(memberName)+'\\)\\)', 'gi'); return configPath.replace(replacer, ")"); } diff --git a/bin/libs/string.ts b/bin/libs/string.ts index 7fa5c6020f..20acafbf6d 100644 --- a/bin/libs/string.ts +++ b/bin/libs/string.ts @@ -344,3 +344,16 @@ export function itemInList(stringList: string, stringToFind?: string, separator: } return stringList.split(separator).includes(stringToFind); } + +export function escapeDollar(str: string): string | undefined { + if (str === null || str === undefined) + return undefined; + return str.replace(/[$]/g, '\\$&'); +} + +export function escapeRegExp(str: string): string | undefined { + if (str === null || str === undefined) + return undefined; + return str.replace(/[.*+?^${}()|[\]\\]/g, '\\$&'); +} + diff --git a/bin/libs/zos-dataset.ts b/bin/libs/zos-dataset.ts index c1960ec929..295afc8d05 100644 --- a/bin/libs/zos-dataset.ts +++ b/bin/libs/zos-dataset.ts @@ -18,7 +18,7 @@ import * as shell from './shell'; import * as zoslib from './zos'; export function isDatasetExists(datasetName: string): boolean { - const result = shell.execSync('sh', '-c', `cat "//'${datasetName}'" 1>/dev/null 2>&1`); + const result = shell.execSync('sh', '-c', `cat "//'${stringlib.escapeDollar(datasetName)}'" 1>/dev/null 2>&1`); return result.rc === 0; } @@ -27,7 +27,7 @@ export function isDatasetExists(datasetName: string): boolean { // 1: data set is not in catalog // 2: data set member doesn't exist export function tsoIsDatasetExists(datasetName: string): number { - const result = zoslib.tsoCommand(`listds '${datasetName}' label`); + const result = zoslib.tsoCommand(`listds '${stringlib.escapeDollar(datasetName)}' label`); if (result.rc != 0) { if (result.out.includes('NOT IN CATALOG')) { return 1; @@ -44,7 +44,7 @@ export function tsoIsDatasetExists(datasetName: string): number { } export function createDataSet(dsName: string, dsOptions: string): number { - const result=zoslib.tsoCommand(`ALLOCATE NEW DA('${dsName}') ${dsOptions}`); + const result=zoslib.tsoCommand(`ALLOCATE NEW DA('${stringlib.escapeDollar(dsName)}') ${dsOptions}`); return result.rc; } @@ -55,7 +55,7 @@ export function copyToDataset(filePath: string, dsName: string, cpOptions: strin } } - const cpCommand=`cp ${cpOptions} -v "${filePath}" "//'${dsName}'"`; + const cpCommand=`cp ${cpOptions} -v "${filePath}" "//'${stringlib.escapeDollar(dsName)}'"`; common.printDebug('- '+cpCommand); const result=shell.execOutSync('sh', '-c', `${cpCommand} 2>&1`); if (result.rc == 0) { @@ -79,7 +79,7 @@ export function datasetCopyToDataset(prefix: string, datasetFrom: string, datase } } - const cmd=`exec '${prefix}.${std.getenv('ZWE_PRIVATE_DS_SZWEEXEC')}(ZWEMCOPY)' '${datasetFrom} ${datasetTo}'`; + const cmd=`exec '${prefix}.${std.getenv('ZWE_PRIVATE_DS_SZWEEXEC')}(ZWEMCOPY)' '${stringlib.escapeDollar(datasetFrom)} ${stringlib.escapeDollar(datasetTo)}'`; const result = zoslib.tsoCommand(cmd); return result.rc; } @@ -128,7 +128,7 @@ export function listDatasetUser(datasetName: string): number { // 3: data set is in use // @output tso listds label output export function deleteDataset(dataset: string): number { - const cmd=`delete '${dataset}'`; + const cmd=`delete '${stringlib.escapeDollar(dataset)}'`; const result=zoslib.tsoCommand(cmd); if (result.rc != 0) { if (result.out.includes('NOT IN CATALOG')) { @@ -170,7 +170,7 @@ export function isDatasetSmsManaged(dataset: string): { rc: number, smsManaged?: // SMS flag is in `FORMAT 1 DSCB` section second line, after 780037 common.printTrace(`- Check if ${dataset} is SMS managed`); - const labelResult = zoslib.tsoCommand(`listds '${dataset}' label`); + const labelResult = zoslib.tsoCommand(`listds '${stringlib.escapeDollar(dataset)}' label`); const datasetLabel=labelResult.out; if (labelResult.rc == 0) { let formatIndex = datasetLabel.indexOf('--FORMAT 1 DSCB--'); @@ -212,7 +212,7 @@ export function isDatasetSmsManaged(dataset: string): { rc: number, smsManaged?: export function getDatasetVolume(dataset: string): { rc: number, volume?: string } { common.printTrace(`- Find volume of data set ${dataset}`); - const result = zoslib.tsoCommand(`listds '${dataset}'`); + const result = zoslib.tsoCommand(`listds '${stringlib.escapeDollar(dataset)}'`); if (result.rc == 0) { let volumesIndex = result.out.indexOf('--VOLUMES--'); let volume: string; diff --git a/bin/libs/zos.ts b/bin/libs/zos.ts index b49e81451b..8cc5dea000 100644 --- a/bin/libs/zos.ts +++ b/bin/libs/zos.ts @@ -16,7 +16,7 @@ import * as shell from './shell'; import * as stringlib from './string'; export function tsoCommand(...args:string[]): { rc: number, out: string } { - let message="tsocmd "+args.join(' '); + let message = "tsocmd " + '"' + args.join(' ') + '"'; common.printDebug('- '+message); //we echo at the end to avoid a configmgr quirk where trying to read stdout when empty can hang waiting for bytes const result = shell.execOutSync('sh', '-c', `${message} 2>&1 && echo '.'`); From 4bec72ec877ffd5065b278108e5e10c798139dd5 Mon Sep 17 00:00:00 2001 From: Martin Zeithaml Date: Tue, 6 Feb 2024 10:08:58 -0500 Subject: [PATCH 148/168] Too many slashes Signed-off-by: Martin Zeithaml --- bin/libs/zos-dataset.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/bin/libs/zos-dataset.sh b/bin/libs/zos-dataset.sh index 16154681f5..18ebc5fade 100644 --- a/bin/libs/zos-dataset.sh +++ b/bin/libs/zos-dataset.sh @@ -75,7 +75,7 @@ copy_to_data_set() { allow_overwrite="${4}" if [ "${allow_overwrite}" != "true" ]; then - if [ "$(is_data_set_exists "//'${ds_name}'")" = "true" ]; then + if [ "$(is_data_set_exists "${ds_name}")" = "true" ]; then print_error_and_exit "Error ZWEL0133E: Data set ${ds_name} already exists" "" 133 fi fi @@ -105,7 +105,7 @@ data_set_copy_to_data_set() { allow_overwrite="${4}" if [ "${allow_overwrite}" != "true" ]; then - if [ "$(is_data_set_exists "//'${ds_to}'")" = "true" ]; then + if [ "$(is_data_set_exists "${ds_to}")" = "true" ]; then print_error_and_exit "Error ZWEL0133E: Data set ${ds_to} already exists" "" 133 fi fi From 686cd7967258f6d28692e2d7e214d9eb18baff9c Mon Sep 17 00:00:00 2001 From: Martin Zeithaml Date: Tue, 6 Feb 2024 10:30:58 -0500 Subject: [PATCH 149/168] Minor fixes Signed-off-by: Martin Zeithaml --- bin/libs/zos-dataset.ts | 6 +++--- bin/libs/zwecli.sh | 3 +++ 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/bin/libs/zos-dataset.ts b/bin/libs/zos-dataset.ts index 295afc8d05..912c35eb07 100644 --- a/bin/libs/zos-dataset.ts +++ b/bin/libs/zos-dataset.ts @@ -235,7 +235,7 @@ export function getDatasetVolume(dataset: string): { rc: number, volume?: string export function apfAuthorizeDataset(dataset: string): number { const result = isDatasetSmsManaged(dataset); if (result.rc) { - common.printError("Error ZWEL0134E: Failed to find SMS status of data set ${dataset}."); + common.printError(`Error ZWEL0134E: Failed to find SMS status of data set ${dataset}.`); return 134; } @@ -256,7 +256,7 @@ export function apfAuthorizeDataset(dataset: string): number { } } - const apfCmd="SETPROG APF,ADD,DSNAME=${dataset},${apfVolumeParam}" + const apfCmd=`SETPROG APF,ADD,DSNAME=${dataset},${apfVolumeParam}`; if (std.getenv('ZWE_CLI_PARAMETER_SECURITY_DRY_RUN') == "true") { common.printMessage("- Dry-run mode, security setup is NOT performed on the system."); common.printMessage(" Please apply this operator command manually:"); @@ -277,7 +277,7 @@ export function apfAuthorizeDataset(dataset: string): number { } export function createDatasetTmpMember(dataset: string, prefix: string='ZW'): string | null { - common.printTrace(` > create_data_set_tmp_member in ${dataset}`); + common.printTrace(` > createDatasetTmpMember in ${dataset}`); for (var i = 0; i < 100; i++) { let rnd=Math.floor(Math.random()*10000); diff --git a/bin/libs/zwecli.sh b/bin/libs/zwecli.sh index eb0e249a3c..0131c5ff5b 100755 --- a/bin/libs/zwecli.sh +++ b/bin/libs/zwecli.sh @@ -376,6 +376,9 @@ zwecli_inline_execute_command() { export ZWE_PRIVATE_CLI_IS_TOP_LEVEL_COMMAND=false + print_trace "- zwecli_inline_execute_command" + print_trace " * ${*}" + # process new command . "${ZWE_zowe_runtimeDirectory}/bin/zwe" From af0e6a000f73ecc123ac50023a849103bd21481e Mon Sep 17 00:00:00 2001 From: Martin Zeithaml Date: Wed, 7 Feb 2024 02:56:26 -0500 Subject: [PATCH 150/168] Switch ChangeTag to sh Signed-off-by: Martin Zeithaml --- bin/libs/zos-fs.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/libs/zos-fs.ts b/bin/libs/zos-fs.ts index 99305bc4b9..d0c868cb8d 100644 --- a/bin/libs/zos-fs.ts +++ b/bin/libs/zos-fs.ts @@ -109,7 +109,7 @@ export function ensureFileEncoding(file: string, expectedSample: string, expecte } } common.printTrace(`- Remove encoding tag of ${file}.`); - zos.changeTag(file, 0); + shell.execSync('sh', '-c', `chtag -r "${file}"`); } else { common.printTrace(`- Failed to detect encoding of ${file}.`); } From dc66beb2d5578419de2f981dea90ad8796162151 Mon Sep 17 00:00:00 2001 From: Martin Zeithaml Date: Thu, 8 Feb 2024 03:48:15 -0500 Subject: [PATCH 151/168] Regex update Signed-off-by: Martin Zeithaml --- bin/libs/configmgr.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/libs/configmgr.ts b/bin/libs/configmgr.ts index e9a4112d38..26c16fa89a 100644 --- a/bin/libs/configmgr.ts +++ b/bin/libs/configmgr.ts @@ -416,7 +416,7 @@ function getMemberNameFromConfigPath(configPath: string): string|undefined { function stripMemberName(configPath: string, memberName: string): string { //Turn PARMLIB(my.zowe(yaml)):PARMLIB(my.other.zowe(yaml)) //Into PARMLIB(my.zowe):FILE(/some/path.yaml):PARMLIB(my.other.zowe) - const replacer = new RegExp('\\('+stringlib.escapeRegExp(memberName)+'\\)\\)', 'gi'); + const replacer = new RegExp('\\('+stringlib.escapeDollar(memberName)+'\\)\\)', 'gi'); return configPath.replace(replacer, ")"); } From d1abd3e79a8204abd538d79aead5fc56997e21a5 Mon Sep 17 00:00:00 2001 From: Martin Zeithaml Date: Thu, 8 Feb 2024 10:20:23 -0500 Subject: [PATCH 152/168] Revert changes Signed-off-by: Martin Zeithaml --- bin/libs/zos-dataset.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/bin/libs/zos-dataset.sh b/bin/libs/zos-dataset.sh index 18ebc5fade..16154681f5 100644 --- a/bin/libs/zos-dataset.sh +++ b/bin/libs/zos-dataset.sh @@ -75,7 +75,7 @@ copy_to_data_set() { allow_overwrite="${4}" if [ "${allow_overwrite}" != "true" ]; then - if [ "$(is_data_set_exists "${ds_name}")" = "true" ]; then + if [ "$(is_data_set_exists "//'${ds_name}'")" = "true" ]; then print_error_and_exit "Error ZWEL0133E: Data set ${ds_name} already exists" "" 133 fi fi @@ -105,7 +105,7 @@ data_set_copy_to_data_set() { allow_overwrite="${4}" if [ "${allow_overwrite}" != "true" ]; then - if [ "$(is_data_set_exists "${ds_to}")" = "true" ]; then + if [ "$(is_data_set_exists "//'${ds_to}'")" = "true" ]; then print_error_and_exit "Error ZWEL0133E: Data set ${ds_to} already exists" "" 133 fi fi From 0d461b6f8f35048e47e67ffef3fbe5f707727b41 Mon Sep 17 00:00:00 2001 From: Martin Zeithaml Date: Fri, 9 Feb 2024 08:53:18 -0500 Subject: [PATCH 153/168] Get volume Signed-off-by: Martin Zeithaml --- bin/libs/zos-dataset.ts | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/bin/libs/zos-dataset.ts b/bin/libs/zos-dataset.ts index 912c35eb07..f18fcde5ac 100644 --- a/bin/libs/zos-dataset.ts +++ b/bin/libs/zos-dataset.ts @@ -218,8 +218,7 @@ export function getDatasetVolume(dataset: string): { rc: number, volume?: string let volume: string; if (volumesIndex != -1) { let startIndex = volumesIndex + '--VOLUMES--'.length; - let endIndex = result.out.indexOf('--',startIndex); - volume = result.out.substring(startIndex, endIndex).trim(); + volume = result.out.substring(startIndex).trim(); } if (!volume) { common.printError(" * Failed to find volume information of the data set."); From f77aba55055821efd872d10b3d475ebc7a0358af Mon Sep 17 00:00:00 2001 From: Martin Zeithaml Date: Fri, 9 Feb 2024 10:41:43 -0500 Subject: [PATCH 154/168] Support '$' and '-' in ds name Signed-off-by: Martin Zeithaml --- bin/libs/zos-dataset.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/libs/zos-dataset.ts b/bin/libs/zos-dataset.ts index f18fcde5ac..4e4528b5c2 100644 --- a/bin/libs/zos-dataset.ts +++ b/bin/libs/zos-dataset.ts @@ -91,7 +91,7 @@ export function datasetCopyToDataset(prefix: string, datasetFrom: string, datase // 1: there are some users // @output output of operator command "d grs" export function listDatasetUser(datasetName: string): number { - const cmd=`D GRS,RES=(*,${datasetName})`; + const cmd = `D GRS,RES=(*,'${stringlib.escapeDollar(datasetName)}')`; const result=zoslib.operatorCommand(cmd); return result.out.includes('NO REQUESTORS FOR RESOURCE') ? 0 : 1; // example outputs: From 406e1bc773a7c96b451f83a191e6eea40123f403 Mon Sep 17 00:00:00 2001 From: Martin Zeithaml Date: Mon, 12 Feb 2024 05:28:41 -0500 Subject: [PATCH 155/168] Escape prefix Signed-off-by: Martin Zeithaml --- bin/libs/zos-dataset.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/libs/zos-dataset.ts b/bin/libs/zos-dataset.ts index 4e4528b5c2..74d10aed9e 100644 --- a/bin/libs/zos-dataset.ts +++ b/bin/libs/zos-dataset.ts @@ -79,7 +79,7 @@ export function datasetCopyToDataset(prefix: string, datasetFrom: string, datase } } - const cmd=`exec '${prefix}.${std.getenv('ZWE_PRIVATE_DS_SZWEEXEC')}(ZWEMCOPY)' '${stringlib.escapeDollar(datasetFrom)} ${stringlib.escapeDollar(datasetTo)}'`; + const cmd = `exec '${stringlib.escapeDollar(prefix)}.${std.getenv('ZWE_PRIVATE_DS_SZWEEXEC')}(ZWEMCOPY)' '${stringlib.escapeDollar(datasetFrom)} ${stringlib.escapeDollar(datasetTo)}'`; const result = zoslib.tsoCommand(cmd); return result.rc; } From d52a3334a90f78e5ea30d74a960e8650fe2c5095 Mon Sep 17 00:00:00 2001 From: Martin Zeithaml <66114686+Martin-Zeithaml@users.noreply.github.com> Date: Wed, 14 Feb 2024 17:35:12 +0100 Subject: [PATCH 156/168] Use the zos function for getFileEncoding (#3642) * Use the zos function Signed-off-by: Martin Zeithaml * CCSID only for platform=zos Signed-off-by: Martin Zeithaml * Update type declaration file Signed-off-by: Martin Zeithaml --------- Signed-off-by: Martin Zeithaml Co-authored-by: Mark Ackert <35308966+MarkAckert@users.noreply.github.com> --- bin/libs/zos-fs.ts | 12 +++++++----- build/zwe/types/@qjstypes/zos.d.ts | 5 +++++ 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/bin/libs/zos-fs.ts b/bin/libs/zos-fs.ts index 99305bc4b9..64eae0b2fd 100644 --- a/bin/libs/zos-fs.ts +++ b/bin/libs/zos-fs.ts @@ -20,11 +20,13 @@ import * as shell from './shell'; // Get file encoding from z/OS USS tagging export function getFileEncoding(filePath: string): number|undefined { //zos.changeTag(file, id) - let returnArray = os.stat(filePath); - if (!returnArray[1] && ((returnArray[0].mode & os.S_IFREG) == os.S_IFREG)) { //no error, and is file - return returnArray[0].ccsid; - } else { - common.printError(`getFileEncoding path=${filePath}, err=${returnArray[1]}`); + if (os.platform == 'zos') { + let returnArray = zos.zstat(filePath); + if (!returnArray[1] && ((returnArray[0].mode & os.S_IFMT) == os.S_IFREG)) { //no error, and is file + return returnArray[0].ccsid; + } else { + common.printError(`getFileEncoding path=${filePath}, err=${returnArray[1]}`); + } } return undefined; } diff --git a/build/zwe/types/@qjstypes/zos.d.ts b/build/zwe/types/@qjstypes/zos.d.ts index ec41ae6571..551948c5c2 100644 --- a/build/zwe/types/@qjstypes/zos.d.ts +++ b/build/zwe/types/@qjstypes/zos.d.ts @@ -11,8 +11,13 @@ export type ZStat = { dev: number; ino: number; + mode: number; + nlink: number; uid: number; gid: number; + rdev: number; + size: number; + blocks: number; atime: number; mtime: number; ctime: number; From 1f334af363e4edb68815d77c05371efb526e5bb4 Mon Sep 17 00:00:00 2001 From: MarkAckert Date: Wed, 14 Feb 2024 14:02:20 -0500 Subject: [PATCH 157/168] update changelog to align with 2.15.0 Signed-off-by: MarkAckert --- CHANGELOG.md | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index c3292093c2..9edb889b67 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,13 @@ All notable changes to the Zowe Installer will be documented in this file. +## `2.15.0` + +## New features and enhancements + +## Minor enhancements/defect fixes +- Bugfix: `zwe diagnose` running under comfigmgr and output formatted. Fixes #[3627](https://github.com/zowe/zowe-install-packaging/issues/3627). + ## `2.14.0` ### New features and enhancements @@ -18,8 +25,6 @@ All notable changes to the Zowe Installer will be documented in this file. #### Minor enhancements/defect fixes - Bugfix: Workflow files in the Zowe PAX are now ASCII-encoded. Fixes [#3591](https://github.com/zowe/zowe-install-packaging/issues/3591). - Enhancement: `/bin/utils/date-add.rex` utility is accepting the date formatting as combination of YY|YYYY, MM, DD and any separator. -- Bugfix: `zwe diagnose` running under comfigmgr and output formatted. Fixes #[3627](https://github.com/zowe/zowe-install-packaging/issues/3627). - ## `2.12.0` From 2d8b04dc457de6d9ef17d16d8d53ae5d9d6d9c37 Mon Sep 17 00:00:00 2001 From: Martin Zeithaml <66114686+Martin-Zeithaml@users.noreply.github.com> Date: Thu, 15 Feb 2024 14:12:18 +0100 Subject: [PATCH 158/168] TSS: Detect zOSMF Root CA (#3725) * TSS: Detect zOSMF Root CA Signed-off-by: Martin Zeithaml * Parameters updated Signed-off-by: Martin Zeithaml * Minor text change Signed-off-by: Martin Zeithaml --------- Signed-off-by: Martin Zeithaml Signed-off-by: Martin Zeithaml Co-authored-by: Mark Ackert <35308966+MarkAckert@users.noreply.github.com> --- .../keyring-jcl/connect/.parameters | 2 +- .../keyring-jcl/generate/.parameters | 2 +- .../keyring-jcl/import-ds/.parameters | 2 +- bin/libs/certificate.sh | 80 ++++++++++++++++++- 4 files changed, 79 insertions(+), 7 deletions(-) diff --git a/bin/commands/certificate/keyring-jcl/connect/.parameters b/bin/commands/certificate/keyring-jcl/connect/.parameters index 8ae86cb266..1160a03958 100644 --- a/bin/commands/certificate/keyring-jcl/connect/.parameters +++ b/bin/commands/certificate/keyring-jcl/connect/.parameters @@ -8,6 +8,6 @@ trust-cas||string|||||Labels of extra certificate authorities should be trusted, connect-user||string|required||||Certificate owner. Can be `SITE` or a user ID. connect-label||string|required||||Certificate label to connect. trust-zosmf||boolean|||||Whether to trust z/OSMF CA. -zosmf-ca||string||_auto_|||Labels of z/OSMF root certificate authorities. Specify "_auto_" to let Zowe to detect automatically. This only works for RACF. +zosmf-ca||string||_auto_|||Labels of z/OSMF root certificate authorities. Specify `_auto_` to let Zowe to detect automatically. This works for RACF and TSS. zosmf-user||string||IZUSVR|||z/OSMF user name. This is used to automatically detect z/OSMF root certificate authorities. ignore-security-failures||boolean|||||Whether to ignore security setup job failures. diff --git a/bin/commands/certificate/keyring-jcl/generate/.parameters b/bin/commands/certificate/keyring-jcl/generate/.parameters index 6017cd675d..5a16628783 100644 --- a/bin/commands/certificate/keyring-jcl/generate/.parameters +++ b/bin/commands/certificate/keyring-jcl/generate/.parameters @@ -16,6 +16,6 @@ country||string|||||Country of certificate and certificate authority. validity||string|||||Validity days of certificate. trust-cas||string|||||Labels of extra certificate authorities should be trusted, separated by comma (Maximum 2). trust-zosmf||boolean|||||Whether to trust z/OSMF CA. -zosmf-ca||string||_auto_|||Labels of z/OSMF root certificate authorities. Specify "_auto_" to let Zowe to detect automatically. This only works for RACF. +zosmf-ca||string||_auto_|||Labels of z/OSMF root certificate authorities. Specify `_auto_` to let Zowe to detect automatically. This works for RACF and TSS. zosmf-user||string||IZUSVR|||z/OSMF user name. This is used to automatically detect z/OSMF root certificate authorities. ignore-security-failures||boolean|||||Whether to ignore security setup job failures. diff --git a/bin/commands/certificate/keyring-jcl/import-ds/.parameters b/bin/commands/certificate/keyring-jcl/import-ds/.parameters index f0cb41275a..801991dcce 100644 --- a/bin/commands/certificate/keyring-jcl/import-ds/.parameters +++ b/bin/commands/certificate/keyring-jcl/import-ds/.parameters @@ -7,7 +7,7 @@ keyring-name||string|required||||Name of the keyring. alias|a|string|required|localhost|||Certificate alias name. trust-cas||string|||||Labels of extra certificate authorities should be trusted, separated by comma (Maximum 2). trust-zosmf||boolean|||||Whether to trust z/OSMF CA. -zosmf-ca||string||_auto_|||Labels of z/OSMF root certificate authorities. Specify "_auto_" to let Zowe to detect automatically. This only works for RACF. +zosmf-ca||string||_auto_|||Labels of z/OSMF root certificate authorities. Specify `_auto_` to let Zowe to detect automatically. This works for RACF and TSS. zosmf-user||string||IZUSVR|||z/OSMF user name. This is used to automatically detect z/OSMF root certificate authorities. import-ds-name||string|required||||Name of the data set holds certificate to import into keyring. import-ds-password||string|required||||Password of the data set holds certificate to import. diff --git a/bin/libs/certificate.sh b/bin/libs/certificate.sh index 49fcc232ef..13dec5e1d4 100644 --- a/bin/libs/certificate.sh +++ b/bin/libs/certificate.sh @@ -876,7 +876,15 @@ EOF if [ "${trust_zosmf}" = "1" ]; then if [ "${zosmf_root_ca}" = "_auto_" ]; then - zosmf_root_ca=$(detect_zosmf_root_ca "${ZWE_PRIVATE_ZOSMF_USER}") + if [ "${security_product}" = "RACF" ]; then + zosmf_root_ca=$(detect_zosmf_root_ca_racf "${ZWE_PRIVATE_ZOSMF_USER}") + fi + if [ "${security_product}" = "TSS" ]; then + zosmf_root_ca=$(detect_zosmf_root_ca_tss "${ZWE_PRIVATE_ZOSMF_USER}") + fi + if [ "${security_product}" = "ACF2" ]; then + zosmf_root_ca=$(detect_zosmf_root_ca_acf2 "${ZWE_PRIVATE_ZOSMF_USER}") + fi fi if [ -z "${zosmf_root_ca}" ]; then print_error_and_exit "Error ZWEL0137E: z/OSMF root certificate authority is not provided (or cannot be detected) with trusting z/OSMF option enabled." "" 137 @@ -1397,12 +1405,76 @@ EOF "${labels_with_private_key}" } -# this only works for RACF -detect_zosmf_root_ca() { +# FIXME +# - Support for multiple? | long | special characters entries +detect_zosmf_root_ca_tss() { + zosmf_user=${1:-IZUSVR} + zosmf_root_ca= + + print_trace "- Detect z/OSMF keyring by listing ID(${zosmf_user}) [TSS]" + zosmf_certs=$(tsocmd "TSS LIST(${zosmf_user}) KEYRING(ALL)" 2>&1) + code=$? + if [ ${code} -ne 0 ]; then + print_trace " * Exit code: ${code}" + print_trace " * Output:" + if [ -n "${zosmf_certs}" ]; then + print_trace "$(padding_left "${zosmf_certs}" " ")" + fi + return 1 + fi + + # Output example: + # KEYRING LABEL = KEYRING.IZUDFLT + zosmf_keyring_name=$(echo "${zosmf_certs}" | grep "KEYRING LABEL = " | awk -F= '{ print $2 }' | head -n 1) + if [ -n "${zosmf_keyring_name}" ]; then + print_trace " * z/OSMF keyring name is ${zosmf_keyring_name}" + # Output example: + # ACID(CERTAUTH) DIGICERT(ABCDEFGH) DEFAULT(NO ) USAGE(CERTAUTH) + # LABLCERT(ZOSMF_ROOT_CA ) + zosmf_root_ca=$(echo "${zosmf_certs}" | grep -A 1 "ACID(CERTAUTH)" | grep "LABLCERT(" | head -n 1) + zosmf_root_ca=$(echo "${zosmf_root_ca}" | awk '{ print substr( $0, 12, length($0)-13) }') + zosmf_root_ca=$(echo "${zosmf_root_ca}" | sed -e 's/^[[:space:]]*//;s/[[:space:]]*$//') + if [ -n "${zosmf_root_ca}" ]; then + print_trace " * z/OSMF root certificate authority found: ${zosmf_root_ca}" + echo "${zosmf_root_ca}" + return 0 + else + print_trace " * Error: cannot detect z/OSMF root certificate authority" + return 2 + fi + else + print_trace " * Error: failed to detect z/OSMF keyring name" + return 3 + fi +} + +# FIXME +# - add similar code using ACFUNIX instead of tsocmd +# - or use JCLs to be sure it will always works +detect_zosmf_root_ca_acf2() { + zosmf_user=${1:-IZUSVR} + zosmf_root_ca= + + print_trace "- Detect z/OSMF keyring by listing ID(${zosmf_user}) [ACF2]" + echo "${zosmf_root_ca}" + return 1 +} + +# FIXME +# - Support for multiple? | long | special characters entries +# - RACDCERT LISTRING will be confused if label contains 'CERTAUTH' word: +# +# Certificate Label Name Cert Owner USAGE DEFAULT +# -------------------------------- ------------ -------- ------- +# CERTAUTH_FOR_T800 ID(SKYNET) DEADLY YES +# JOHN_CONNOR CERTAUTH CERTAUTH NO +# +# Will return CERTAUTH_FOR_T800 instead of JOHN_CONNOR +detect_zosmf_root_ca_racf() { zosmf_user=${1:-IZUSVR} zosmf_root_ca= - print_trace "- Detect z/OSMF keyring by listing ID(${zosmf_user})" + print_trace "- Detect z/OSMF keyring by listing ID(${zosmf_user}) [RACF]" zosmf_certs=$(tsocmd "RACDCERT LIST ID(${zosmf_user})" 2>&1) code=$? if [ ${code} -ne 0 ]; then From e23727250b30f29973caa8d582041208ee3db187 Mon Sep 17 00:00:00 2001 From: Martin Zeithaml Date: Thu, 15 Feb 2024 10:07:20 -0500 Subject: [PATCH 159/168] Escape dataset in copyMvsToUss Signed-off-by: Martin Zeithaml --- bin/libs/zos-fs.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/libs/zos-fs.ts b/bin/libs/zos-fs.ts index ec29d37c69..e0023a449f 100644 --- a/bin/libs/zos-fs.ts +++ b/bin/libs/zos-fs.ts @@ -87,7 +87,7 @@ export function detectFileEncoding(fileName: string, expectedSample: string, exp export function copyMvsToUss(dataset: string, file: string): number { common.printDebug(`copyMvsToUss dataset=${dataset}, file=${file}`); - const result = shell.execSync('sh', '-c', `cp "//'${dataset}'" "${file}"`); + const result = shell.execSync('sh', '-c', `cp "//'${stringlib.escapeDollar(dataset)}'" '${file}'`); return result.rc; } From 1646329d755ac02b82cab7226b09904f0b3c4e55 Mon Sep 17 00:00:00 2001 From: Mark Ackert <35308966+MarkAckert@users.noreply.github.com> Date: Wed, 21 Feb 2024 08:49:17 -0500 Subject: [PATCH 160/168] add backtick to (#3736) Signed-off-by: MarkAckert --- bin/commands/certificate/pkcs12/lock/.parameters | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/commands/certificate/pkcs12/lock/.parameters b/bin/commands/certificate/pkcs12/lock/.parameters index 4a539c7aeb..9c137e1f62 100644 --- a/bin/commands/certificate/pkcs12/lock/.parameters +++ b/bin/commands/certificate/pkcs12/lock/.parameters @@ -1,4 +1,4 @@ keystore-dir|d|string|required||||Keystore directory. user||string|required||||Owner of the keystore directory. group||string|required||||Group of the keystore directory. -group-permission||string|||||Group permission. Can be for no permission, or `read`, `write`. +group-permission||string|||||Group permission. Can be `` for no permission, or `read`, `write`. From 468aeb3eec72d7bf83f558b534543205bb4425a6 Mon Sep 17 00:00:00 2001 From: 1000TurquoisePogs Date: Wed, 21 Feb 2024 09:07:29 -0600 Subject: [PATCH 161/168] allow custom properties in components.zowe (#3735) Signed-off-by: 1000TurquoisePogs --- schemas/zowe-yaml-schema.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/schemas/zowe-yaml-schema.json b/schemas/zowe-yaml-schema.json index 32fe423772..e3867cb09f 100644 --- a/schemas/zowe-yaml-schema.json +++ b/schemas/zowe-yaml-schema.json @@ -857,7 +857,7 @@ "zowe": { "type": "object", "description": "Component level overrides for top level Zowe network configuration.", - "additionalProperties": false, + "additionalProperties": true, "properties": { "network": { "$ref": "#/$defs/networkSettings" From 70003f487edef87db8b61af1fc536ac2183f9571 Mon Sep 17 00:00:00 2001 From: Martin Zeithaml <66114686+Martin-Zeithaml@users.noreply.github.com> Date: Wed, 6 Mar 2024 16:37:57 +0100 Subject: [PATCH 162/168] Add ESM to support details (#3749) Signed-off-by: Martin Zeithaml --- bin/commands/support/.help | 1 + bin/commands/support/index.sh | 5 ++++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/bin/commands/support/.help b/bin/commands/support/.help index 0f9ef64565..07bfab5e29 100644 --- a/bin/commands/support/.help +++ b/bin/commands/support/.help @@ -6,6 +6,7 @@ This command will collect these information: * z/OS version * Java version * Node.js version + * External Security Manager - Zowe configurations * Zowe manifest.json * Zowe configuration file diff --git a/bin/commands/support/index.sh b/bin/commands/support/index.sh index be3ab8c68e..970cde1523 100644 --- a/bin/commands/support/index.sh +++ b/bin/commands/support/index.sh @@ -43,7 +43,7 @@ print_debug "Temporary directory created: ${tmp_dir}" print_message ############################### -print_level1_message "Collecting version of z/OS, Java, NodeJS" +print_level1_message "Collecting information about z/OS, Java, NodeJS and ESM" VERSION_FILE="${tmp_dir}/version_output" ZOS_VERSION=`operator_command "D IPLINFO" | grep -i release | xargs` print_message "- z/OS: ${ZOS_VERSION}" @@ -51,9 +51,12 @@ JAVA_VERSION=`${JAVA_HOME}/bin/java -version 2>&1 | head -n 1` print_message "- Java: ${JAVA_VERSION}" NODE_VERSION=`${NODE_HOME}/bin/node --version` print_message "- NodeJS: ${NODE_VERSION}" +ESM=`"${ZWE_zowe_runtimeDirectory}/bin/utils/getesm"` +print_message "- External Security Manager: ${ESM}" echo "z/OS version: ${ZOS_VERSION}" > "${VERSION_FILE}" echo "Java version: ${JAVA_VERSION}" >> "${VERSION_FILE}" echo "NodeJS version: ${NODE_VERSION}" >> "${VERSION_FILE}" +echo "External Security Manager: ${ESM}" >> "${VERSION_FILE}" print_message ############################### From 2a0cd42177e9b975248a8ef399749b2853146329 Mon Sep 17 00:00:00 2001 From: zowe-robot <42546701+zowe-robot@users.noreply.github.com> Date: Fri, 8 Mar 2024 15:56:23 -0500 Subject: [PATCH 163/168] Promote PTF after release v2.15.0 (#3754) Signed-off-by: zowe-robot --- smpe/bld/service/promoted-apar.txt | 3 ++ smpe/bld/service/promoted-close.txt | 45 +++++++++++++++++++++++++++++ smpe/bld/service/promoted-hold.txt | 25 ++++++++++++++++ smpe/bld/service/promoted-ptf.txt | 2 ++ smpe/bld/service/ptf-bucket.txt | 2 +- 5 files changed, 76 insertions(+), 1 deletion(-) diff --git a/smpe/bld/service/promoted-apar.txt b/smpe/bld/service/promoted-apar.txt index 07ec28cc3e..dacba17f67 100644 --- a/smpe/bld/service/promoted-apar.txt +++ b/smpe/bld/service/promoted-apar.txt @@ -1,3 +1,6 @@ +IO29349 +IO29350 +IO29351 IO29346 IO29347 IO29348 diff --git a/smpe/bld/service/promoted-close.txt b/smpe/bld/service/promoted-close.txt index ee6b38e692..2b678fc7fa 100644 --- a/smpe/bld/service/promoted-close.txt +++ b/smpe/bld/service/promoted-close.txt @@ -1,3 +1,48 @@ + IO29349 - + PROBLEM SUMMARY: + **************************************************************** + * USERS AFFECTED: All Zowe users * + **************************************************************** + * PROBLEM DESCRIPTION: Update Zowe FMID AZWE002 to match the * + * community release * + **************************************************************** + * RECOMMENDATION: Apply provided service * + **************************************************************** + The Zowe community version was updated to 2.15.0. + This PTF provides the community changes in SMP/E format. + Follow this link for more details on the community changes: + https://docs.zowe.org/stable/ + + IO29350 - + PROBLEM SUMMARY: + **************************************************************** + * USERS AFFECTED: All Zowe users * + **************************************************************** + * PROBLEM DESCRIPTION: Update Zowe FMID AZWE002 to match the * + * community release * + **************************************************************** + * RECOMMENDATION: Apply provided service * + **************************************************************** + The Zowe community version was updated to 2.15.0. + This PTF provides the community changes in SMP/E format. + Follow this link for more details on the community changes: + https://docs.zowe.org/stable/ + + IO29351 - + PROBLEM SUMMARY: + **************************************************************** + * USERS AFFECTED: All Zowe users * + **************************************************************** + * PROBLEM DESCRIPTION: Update Zowe FMID AZWE002 to match the * + * community release * + **************************************************************** + * RECOMMENDATION: Apply provided service * + **************************************************************** + The Zowe community version was updated to 2.15.0. + This PTF provides the community changes in SMP/E format. + Follow this link for more details on the community changes: + https://docs.zowe.org/stable/ + IO29346 - PROBLEM SUMMARY: **************************************************************** diff --git a/smpe/bld/service/promoted-hold.txt b/smpe/bld/service/promoted-hold.txt index 3337b60c7a..41f010ffcc 100644 --- a/smpe/bld/service/promoted-hold.txt +++ b/smpe/bld/service/promoted-hold.txt @@ -1,3 +1,28 @@ +++HOLD(UO90049) SYSTEM FMID(AZWE002) REASON(ACTION) DATE(24068) + COMMENT( + **************************************************************** + * Affected function: Zowe servers * + **************************************************************** + * Description: stop servers * + **************************************************************** + * Timing: pre-APPLY * + **************************************************************** + * Part: ZWESLSTC and ZWESISTC * + **************************************************************** + Stop the Zowe servers before installing this update. + + **************************************************************** + * Affected function: Zowe servers * + **************************************************************** + * Description: start servers * + **************************************************************** + * Timing: post-APPLY * + **************************************************************** + * Part: ZWESLSTC and ZWESISTC * + **************************************************************** + Start the Zowe servers after installing this update. + + ). ++HOLD(UO90047) SYSTEM FMID(AZWE002) REASON(ACTION) DATE(24026) COMMENT( **************************************************************** diff --git a/smpe/bld/service/promoted-ptf.txt b/smpe/bld/service/promoted-ptf.txt index 08242dbddd..f6a1a9488e 100644 --- a/smpe/bld/service/promoted-ptf.txt +++ b/smpe/bld/service/promoted-ptf.txt @@ -1,3 +1,5 @@ +UO90049 +UO90050 UO90047 UO90048 UO90045 diff --git a/smpe/bld/service/ptf-bucket.txt b/smpe/bld/service/ptf-bucket.txt index 47e79c15bd..4acb9c7364 100644 --- a/smpe/bld/service/ptf-bucket.txt +++ b/smpe/bld/service/ptf-bucket.txt @@ -21,4 +21,4 @@ #UO90033 UO90034 - IO29289 IO29290 IO29291 - Tue Oct 24 19:49:48 UTC 2023 #UO90045 UO90046 - IO29343 IO29344 IO29345 - Thu Dec 14 16:23:26 UTC 2023 #UO90047 UO90048 - IO29346 IO29347 IO29348 - Fri Jan 26 17:21:09 UTC 2024 -UO90049 UO90050 - IO29349 IO29350 IO29351 \ No newline at end of file +#UO90049 UO90050 - IO29349 IO29350 IO29351 - Fri Mar 8 19:42:44 UTC 2024 \ No newline at end of file From abadb12436d97a58fabc3bb4fbd0a3fb6ee2c0df Mon Sep 17 00:00:00 2001 From: Mark Ackert <35308966+MarkAckert@users.noreply.github.com> Date: Sat, 9 Mar 2024 12:33:21 -0500 Subject: [PATCH 164/168] set manifest to 2.15.1 (#3755) Signed-off-by: MarkAckert --- manifest.json.template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.json.template b/manifest.json.template index 5f0645c5fa..20d421ae28 100644 --- a/manifest.json.template +++ b/manifest.json.template @@ -1,6 +1,6 @@ { "name": "Zowe", - "version": "2.15.0", + "version": "2.15.1", "description": "Zowe is an open source project created to host technologies that benefit the Z platform from all members of the Z community (Integrated Software Vendors, System Integrators and z/OS consumers). Zowe, like Mac or Windows, comes with a set of APIs and OS capabilities that applications build on and also includes some applications out of the box. Zowe offers modern interfaces to interact with z/OS and allows you to work with z/OS in a way that is similar to what you experience on cloud platforms today. You can use these interfaces as delivered or through plug-ins and extensions that are created by clients or third-party vendors.", "license": "EPL-2.0", "homepage": "https://zowe.org", From db377be2dcfe1750b4a52a312fb40e17d6a513da Mon Sep 17 00:00:00 2001 From: ManjuVNair133 <160747386+ManjuVNair133@users.noreply.github.com> Date: Wed, 13 Mar 2024 19:20:25 +0530 Subject: [PATCH 165/168] Added new PTF numbers for v2 (#3757) Signed-off-by: ManjuVNair133 --- smpe/bld/service/ptf-bucket.txt | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/smpe/bld/service/ptf-bucket.txt b/smpe/bld/service/ptf-bucket.txt index 4acb9c7364..ef14889cff 100644 --- a/smpe/bld/service/ptf-bucket.txt +++ b/smpe/bld/service/ptf-bucket.txt @@ -21,4 +21,7 @@ #UO90033 UO90034 - IO29289 IO29290 IO29291 - Tue Oct 24 19:49:48 UTC 2023 #UO90045 UO90046 - IO29343 IO29344 IO29345 - Thu Dec 14 16:23:26 UTC 2023 #UO90047 UO90048 - IO29346 IO29347 IO29348 - Fri Jan 26 17:21:09 UTC 2024 -#UO90049 UO90050 - IO29349 IO29350 IO29351 - Fri Mar 8 19:42:44 UTC 2024 \ No newline at end of file +#UO90049 UO90050 - IO29349 IO29350 IO29351 - Fri Mar 8 19:42:44 UTC 2024 +UO90057 UO90058 - IO29424 IO29425 IO29426 +UO90059 UO90060 - IO29428 IO29429 IO29430 +UO90061 UO90062 - IO29431 IO29432 IO29433 \ No newline at end of file From a72d2e8ca259df5061f7fca2d79e8e69c2f07c17 Mon Sep 17 00:00:00 2001 From: Marketka Date: Mon, 18 Mar 2024 16:18:22 +0100 Subject: [PATCH 166/168] User/pavelzlatnik/fix zweconf yaml generator (#3761) * updated header Signed-off-by: pz636264 * tillZislib Signed-off-by: pz636264 * loadLibUtil Signed-off-by: pz636264 * tillVolume Signed-off-by: pz636264 * tillConfigManager Signed-off-by: pz636264 * Updated my part of zowe.yaml in ZWECONF workflow Signed-off-by: mm667937 * tillRbacId Signed-off-by: pz636264 * cookieId Signed-off-by: pz636264 * tillLogLvl Signed-off-by: pz636264 * tillCompConf Signed-off-by: pz636264 * tillAppId Signed-off-by: pz636264 * newProperties Signed-off-by: pz636264 * Added also new variables Signed-off-by: mm667937 * new step for changing owner and mode of ZOWE USS mountpoint Signed-off-by: mm667937 * new variables in variable input file as well Signed-off-by: mm667937 * 775 instead of 755 for zowe.yml Signed-off-by: mm667937 * typos Signed-off-by: mm667937 * new category for certificates separate commands for zwe init vsam, stc and mvs Signed-off-by: mm667937 * updated input file updated some variables security setup mandatory Signed-off-by: mm667937 * Changed grammar based on suggestions Signed-off-by: mm667937 --------- Signed-off-by: pz636264 Signed-off-by: mm667937 Co-authored-by: pz636264 --- workflows/files/ZWECONF.properties | 267 ++++++++-- workflows/files/ZWECONF.xml | 824 ++++++++++++++++++++++++----- workflows/files/ZWEWRF02.xml | 34 +- 3 files changed, 937 insertions(+), 188 deletions(-) diff --git a/workflows/files/ZWECONF.properties b/workflows/files/ZWECONF.properties index 1e1efb1f38..876020cab4 100644 --- a/workflows/files/ZWECONF.properties +++ b/workflows/files/ZWECONF.properties @@ -22,6 +22,14 @@ zowe_setup_dataset_proclib=USER.PROCLIB # Zowe parameter library zowe_setup_dataset_parmlib=IBMUSER.ZWEV2.CUST.PARMLIB +# zowe_setup_dataset_libzis +# Label: Zowe setup PARMLIB members for ZIS plugins +# Abstract: Zowe ZIS plugins PARMLIB +# Category: zowe +# Description: +# Holds PARMLIB members for ZIS plugins +zowe_setup_dataset_libzis=ZWESIP00 + # zowe_setup_dataset_jcllib # Label: Zowe setup MVS JCL library # Abstract: JCL library where Zowe will store temporary JCLs during initialization @@ -30,13 +38,21 @@ zowe_setup_dataset_parmlib=IBMUSER.ZWEV2.CUST.PARMLIB # JCL library where Zowe will store temporary JCLs during initialization zowe_setup_dataset_jcllib=IBMUSER.ZWEV2.CUST.JCLLIB +# zowe_setup_dataset_loadlibPlugin +# Label: Zowe setup Utilities and extensions library +# Abstract: Load library where Zowe stores libraries for Utilities for use by Zowe and extensions +# Category: zowe +# Description: +# Load library for Utilities for use by Zowe and extensions +zowe_setup_dataset_loadlibPlugin=IBMUSER.ZWEV2.SZWELOAD + # zowe_setup_dataset_authLoadlib # Label: Zowe setup MVS auth load library # Abstract: APF authorized LOADLIB for Zowe # Category: zowe # Description: -# Optional. If it's empty, .SZWEAUTH will be APF authorized -zowe_setup_dataset_authLoadlib= +# APF authorized LOADLIB for Zowe core +zowe_setup_dataset_authLoadlib=IBMUSER.ZWEV2.SZWEAUTH # zowe_setup_dataset_authPluginLib # Label: Zowe setup MVS auth plugin library @@ -46,27 +62,10 @@ zowe_setup_dataset_authLoadlib= # APF authorized LOADLIB for Zowe ZIS Plugins zowe_setup_dataset_authPluginLib=IBMUSER.ZWEV2.CUST.ZWESAPL -# zowe_setup_certificate_type -# Label: Zowe setup certificate type -# Abstract: Type of certificate storage. -# Category: zowe -# Description: -# Type of certificate storage. Valid values are: PKCS12, JCEKS, JCECCAKS, JCERACFKS, JCECCARACFKS, or JCEHYBRIDRACFKS -# Choices: PKCS12,JCEKS,JCECCAKS,JCERACFKS,JCECCARACFKS,JCEHYBRIDRACFKS -zowe_setup_certificate_type=PKCS12 - -# zowe_setup_certificate_pkcs12_directory -# Label: Zowe setup certificate PKCS12 directory -# Abstract: Keystore directory -# Category: zowe -# Description: -# Keystore directory -zowe_setup_certificate_pkcs12_directory=/var/zowe/keystore - # zowe_setup_vsam_mode # Label: Zowe setup VSAM mode # Abstract: VSAM data set with Record-Level-Sharing enabled or not -# Category: zowe +# Category: components # Description: # VSAM data set with Record-Level-Sharing enabled or not # Choices: NONRLS,RLS @@ -75,15 +74,15 @@ zowe_setup_vsam_mode=NONRLS # zowe_setup_vsam_volume # Label: Zowe setup VSAM volume # Abstract: Volume name if you are using VSAM in NONRLS mode -# Category: zowe +# Category: components # Description: # Volume name if you are using VSAM in NONRLS mode -zowe_setup_vsam_volume=VOL123 +zowe_setup_vsam_volume= # zowe_setup_vsam_storageClass # Label: Zowe setup VSAM storage class # Abstract: Storage class name if you are using VSAM in RLS mode -# Category: zowe +# Category: components # Description: # Storage class name if you are using VSAM in RLS mode zowe_setup_vsam_storageClass= @@ -163,13 +162,22 @@ zowe_externalPort=7554 # Category: zowe # Description: # Set to "debug" or "trace" to display extra debug information -# Choices: debug,trace -zowe_launchScript_logLevel= +# Choices: info,debug,trace +zowe_launchScript_logLevel=info + +# zowe_launchScript_CompConf +# Label: Zowe launch script component configuration +# Abstract: Set to "exit" or "warn" if any component has an error +# Category: zowe +# Description: +# Set to "exit" if you want startup to exit if any component has an error in the configuration stage, otherwise zwe will issue a warning but continue running. +# Choices: warn,exit +zowe_launchScript_CompConf=warn # zowe_certificate_keystore_type # Label: Zowe certificate keystore type # Abstract: Certificate keystore type (PKCS12, JCEKS, JCECCAKS, JCERACFKS, JCECCARACFKS, or JCEHYBRIDRACFKS) -# Category: zowe +# Category: certificates # Description: # Certificate keystore type (PKCS12, JCEKS, JCECCAKS, JCERACFKS, JCECCARACFKS, or JCEHYBRIDRACFKS) # Choices: PKCS12,JCEKS,JCECCAKS,JCERACFKS,JCECCARACFKS,JCEHYBRIDRACFKS @@ -177,8 +185,8 @@ zowe_certificate_keystore_type=PKCS12 # zowe_certificate_keystore_file # Label: Zowe certificate keystore file -# Abstract: Zowe certificate keystore file -# Category: zowe +# Abstract: Zowe certificate keystore file. In case of keyring the format is "safkeyring://OWNER/KEYRING". +# Category: certificates # Description: # Zowe certificate keystore file zowe_certificate_keystore_file=/global/zowe/keystore/localhost/localhost.keystore.p12 @@ -186,31 +194,32 @@ zowe_certificate_keystore_file=/global/zowe/keystore/localhost/localhost.keystor # zowe_certificate_keystore_password # Label: Zowe certificate keystore password # Abstract: Certificate keystore password. -# Category: zowe +# Category: certificates # Description: # Certificate keystore password. -zowe_certificate_keystore_password= +zowe_certificate_keystore_password=password # zowe_certificate_keystore_alias # Label: Zowe certificate keystore alias # Abstract: Alias for the certificate keystore -# Category: zowe +# Category: certificates # Description: # Alias for the certificate keystore zowe_certificate_keystore_alias=localhost # zowe_certificate_truststore_type # Label: Zowe certificate truststore type -# Abstract: zowe_certificate_truststore_type -# Category: zowe +# Abstract: Zowe certificate truststore type +# Category: certificates # Description: -# zowe_certificate_truststore_type +# Zowe certificate truststore type +# Choices: PKCS12,JCEKS,JCECCAKS,JCERACFKS,JCECCARACFKS,JCEHYBRIDRACFKS zowe_certificate_truststore_type=PKCS12 # zowe_certificate_truststore_file # Label: Zowe certificate truststore file -# Abstract: File location for the certificate truststore -# Category: zowe +# Abstract: File location for the certificate truststore. Keyring is in the format "safkeyring://OWNER/KEYRING". +# Category: certificates # Description: # File location for the certificate truststore zowe_certificate_truststore_file=/global/zowe/keystore/localhost/localhost.truststore.p12 @@ -218,15 +227,15 @@ zowe_certificate_truststore_file=/global/zowe/keystore/localhost/localhost.trust # zowe_certificate_truststore_password # Label: Zowe certificate truststore password # Abstract: Password for the certificate truststore -# Category: zowe +# Category: certificates # Description: # Password for the certificate truststore -zowe_certificate_truststore_password= +zowe_certificate_truststore_password=password # zowe_certificate_pem_key # Label: Zowe certificate PEM key # Abstract: Path to the Zowe certificate PEM key -# Category: zowe +# Category: certificates # Description: # Path to the Zowe certificate PEM key zowe_certificate_pem_key=/global/zowe/keystore/localhost/localhost.key @@ -234,7 +243,7 @@ zowe_certificate_pem_key=/global/zowe/keystore/localhost/localhost.key # zowe_certificate_pem_certificate # Label: Zowe certificate PEM certificate # Abstract: Path to the PEM certificate -# Category: zowe +# Category: certificates # Description: # Path to the PEM certificate zowe_certificate_pem_certificate=/global/zowe/keystore/localhost/localhost.cer @@ -242,7 +251,7 @@ zowe_certificate_pem_certificate=/global/zowe/keystore/localhost/localhost.cer # zowe_certificate_pem_certificateAuthorities # Label: Zowe certificate PEM certificate authorities # Abstract: zowe_certificate_pem_certificateAuthorities -# Category: zowe +# Category: certificates # Description: # zowe_certificate_pem_certificateAuthorities zowe_certificate_pem_certificateAuthorities=/global/zowe/keystore/local_ca/local_ca.cer @@ -250,7 +259,7 @@ zowe_certificate_pem_certificateAuthorities=/global/zowe/keystore/local_ca/local # zowe_verifyCertificates # Label: Zowe verify certificates # Abstract: Zowe certificate verification -# Category: zowe +# Category: certificates # Description: # Zowe certificate verification # Choices: STRICT,NONSTRICT,DISABLED @@ -278,7 +287,7 @@ node_home= # Category: zOSMF # Description: # Hostname of the running z/OSMF instance -zOSMF_host=example-domain.com +zOSMF_host=dvipa.my-company.com # zOSMF_port # Label: z/OSMF port @@ -416,6 +425,30 @@ components_metrics_service_port=7551 # Check this value to get additional debugging components_metrics_service_debug=false +# components_cloud_gateway_enabled +# Label: Enable cloud gateway +# Abstract: Use this option to enable the cloud gateway +# Category: components +# Description: +# Use this option to enable the cloud gateway +components_cloud_gateway_enabled=false + +# components_cloud_gateway_port +# Label: Cloud gateway port +# Abstract: Port for the cloud gateway +# Category: components +# Description: +# Port for the cloud gateway +components_cloud_gateway_port=7563 + +# components_cloud_gatewaye_debug +# Label: Cloud gateway debug +# Abstract: Check this value to get additional debugging +# Category: components +# Description: +# Check this value to get additional debugging +components_cloud_gatewaye_debug=false + # components_api_catalog_enabled # Label: Enable API catalog # Abstract: Use this option to enable the API catalog @@ -503,7 +536,7 @@ components_caching_service_storage_evictionStrategy=reject # Category: components # Description: # Specifies the components caching service storage mode -# Choices: inMemory,VSAM +# Choices: inMemory,redis,infinispan,VSAM components_caching_service_storage_mode=VSAM # components_caching_service_storage_size @@ -522,6 +555,14 @@ components_caching_service_storage_size=10000 # VSAM name of the storage components_caching_service_storage_vsam_name= +# components_caching_service_storage_infinispan_jgroups_port +# Label: Caching service storage jgroups port +# Abstract: Port for jgroups +# Category: components +# Description: +# Port for jgroups. This is required if storage mode is infinispan. +components_caching_service_storage_infinispan_jgroups_port=7600 + # components_app_server_enabled # Label: Enable app server # Abstract: Check this option to enable the app server @@ -530,6 +571,14 @@ components_caching_service_storage_vsam_name= # Check this option to enable the app server components_app_server_enabled=true +# components_app_server_debug +# Label: App server debug +# Abstract: Check to get extra debug information from the service +# Category: components +# Description: +# Check to get extra debug information from the service +components_app_server_debug=false + # components_app_server_port # Label: App server port # Abstract: Port for the app server @@ -570,6 +619,14 @@ components_zss_crossMemoryServerName=ZWESIS_STD # Check this to enable TLS on ZSS components_zss_tls=true +# components_zss_agent_jwt_fallback +# Label: ZSS JWT fallback +# Abstract: Check this to enable fallback +# Category: components +# Description: +# If fallback is enabled, the agent issues and accepts cookies from itself in the event a JWT cannot be provided. +components_zss_agent_jwt_fallback=true + # components_jobs_api_enabled # Label: Enable jobs API # Abstract: Check this option to enable the jobs API @@ -578,6 +635,14 @@ components_zss_tls=true # Check this option to enable the jobs API components_jobs_api_enabled=false +# components_jobs_api_debug +# Label: Jobs API debug +# Abstract: Check to get extra debug information from the service +# Category: components +# Description: +# Check to get extra debug information from the service +components_jobs_api_debug=false + # components_jobs_api_port # Label: Jobs API port # Abstract: Port for the Jobs API @@ -594,6 +659,14 @@ components_jobs_api_port=7558 # Check this option to enable the files API components_files_api_enabled=false +# components_files_api_debug +# Label: Files API debug +# Abstract: Check to get extra debug information from the service +# Category: components +# Description: +# Check to get extra debug information from the service +components_files_api_debug=false + # components_files_api_port # Label: Files API port # Abstract: Port which will be used by the Files API @@ -625,3 +698,109 @@ components_explorer_mvs_enabled=true # Description: # Check this option to enable USS explorer components_explorer_uss_enabled=true + +# useconfig_manager_enabled +# Label: Enable Zowe configuration manager +# Abstract: Should Zowe configuration manager be enabled? +# Category: configManager +# Description: +# Should Zowe configuration manager be enabled? +useconfig_manager_enabled=true + +# config_manager_validation +# Label: Zowe configuration manager validation type +# Abstract: STRICT or COMPONENT-COMPAT validation type +# Category: configManager +# Description: +# STRICT=quit on any error, COMPONENT-COMPAT=if component missing schema, skip it with warning instead of quit +# Choices: COMPONENT-COMPAT,STRICT +config_manager_validation=COMPONENT-COMPAT + +# zowe_rbacProfileId +# Label: Zowe Profile Identifier +# Abstract: ID you use to separate multiple Zowe installs +# Category: zowe +# Description: +# ID when determining resource names used in RBAC authorization checks such as dataservices with RBAC expects this ID in SAF resources +zowe_rbacProfileId=1 + +# zowe_cookieId +# Label: Zowe Cookie Identifier +# Abstract: ID that can be used by servers to distinguish their cookies from unrelated Zowe installs +# Category: zowe +# Description: +# ID which allows multiple copies of Zowe to be used within the same client +zowe_cookieId=1 + +# zowe_setup_security_product +# Label: Security product name +# Abstract: Security product name. Can be RACF, ACF2 or TSS +# Category: security +# Description: +# Security product name. Can be RACF, ACF2 or TSS +# Choices: RACF,TSS,ACF2 +zowe_setup_security_product=RACF + +# zowe_setup_security_groups_admin +# Label: Zowe admin user group +# Abstract: Zowe admin user group +# Category: security +# Description: +# Zowe admin user group +zowe_setup_security_groups_admin=ZWEADMIN + +# zowe_setup_security_groups_stc +# Label: Zowe STC group +# Abstract: Zowe STC group +# Category: security +# Description: +# Zowe STC group +zowe_setup_security_groups_stc=ZWEADMIN + +# zowe_setup_security_groups_sysProg +# Label: Zowe SysProg group +# Abstract: Zowe SysProg group +# Category: security +# Description: +# Zowe SysProg group +zowe_setup_security_groups_sysProg=ZWEADMIN + +# zowe_setup_security_users_zowe +# Label: Zowe runtime user +# Abstract: Zowe runtime user name of main service +# Category: security +# Description: +# Zowe runtime user name of main service +zowe_setup_security_users_zowe=ZWESVUSR + +# zowe_setup_security_users_zis +# Label: Zowe runtime user name of ZIS +# Abstract: Zowe runtime user name of ZIS +# Category: security +# Description: +# Zowe runtime user name of ZIS +zowe_setup_security_users_zis=ZWESIUSR + +# zowe_setup_security_stcs_zowe +# Label: STC name +# Abstract: STC name of main service +# Category: security +# Description: +# STC name of main service +zowe_setup_security_stcs_zowe=ZWESLSTC + +# zowe_setup_security_stcs_zis +# Label: STC name of ZIS +# Abstract: STC name of ZIS +# Category: security +# Description: +# STC name of ZIS +zowe_setup_security_stcs_zis=ZWESISTC + +# zowe_setup_security_stcs_aux +# Label: STC name of Auxiliary Service +# Abstract: STC name of Auxiliary Service +# Category: security +# Description: +# STC name of Auxiliary Service +zowe_setup_security_stcs_aux=ZWESASTC \ No newline at end of file diff --git a/workflows/files/ZWECONF.xml b/workflows/files/ZWECONF.xml index 3f581d300b..95966631b0 100644 --- a/workflows/files/ZWECONF.xml +++ b/workflows/files/ZWECONF.xml @@ -44,6 +44,17 @@ IBMUSER.ZWEV2.CUST.PARMLIB + + + Zowe ZIS plugins PARMLIB + Holds PARMLIB members for ZIS plugins + zowe + + + + ZWESIP00 + + JCL library where Zowe will store temporary JCLs during initialization @@ -55,14 +66,26 @@ IBMUSER.ZWEV2.CUST.JCLLIB + + + Load library where Zowe stores libraries for Utilities for use by Zowe and extensions + Load library for Utilities for use by Zowe and extensions + zowe + + + + IBMUSER.ZWEV2.SZWELOAD + + APF authorized LOADLIB for Zowe - Optional. If it's empty, <hlq>.SZWEAUTH will be APF authorized + APF authorized LOADLIB for Zowe core zowe + IBMUSER.ZWEV2.SZWEAUTH @@ -76,39 +99,11 @@ IBMUSER.ZWEV2.CUST.ZWESAPL - - - Type of certificate storage. - Type of certificate storage. Valid values are: PKCS12, JCEKS, JCECCAKS, JCERACFKS, JCECCARACFKS, or JCEHYBRIDRACFKS - zowe - - - - PKCS12 - JCEKS - JCECCAKS - JCERACFKS - JCECCARACFKS - JCEHYBRIDRACFKS - PKCS12 - - - - - Keystore directory - Keystore directory - zowe - - - - /var/zowe/keystore - - VSAM data set with Record-Level-Sharing enabled or not VSAM data set with Record-Level-Sharing enabled or not - zowe + components @@ -121,18 +116,17 @@ Volume name if you are using VSAM in NONRLS mode Volume name if you are using VSAM in NONRLS mode - zowe + components - - VOL123 + Storage class name if you are using VSAM in RLS mode Storage class name if you are using VSAM in RLS mode - zowe + components @@ -237,15 +231,29 @@ some use cases, like containerization, this port could be different.zowe + info debug trace + info + + + + + Set to "exit" or "warn" if any component has an error + Set to "exit" if you want startup to exit if any component has an error in the configuration stage, otherwise zwe will issue a warning but continue running. + zowe + + + warn + exit + warn Certificate keystore type (PKCS12, JCEKS, JCECCAKS, JCERACFKS, JCECCARACFKS, or JCEHYBRIDRACFKS) Certificate keystore type (PKCS12, JCEKS, JCECCAKS, JCERACFKS, JCECCARACFKS, or JCEHYBRIDRACFKS) - zowe + certificates @@ -260,9 +268,9 @@ some use cases, like containerization, this port could be different. - Zowe certificate keystore file + Zowe certificate keystore file. In case of keyring the format is "safkeyring://OWNER/KEYRING". Zowe certificate keystore file - zowe + certificates @@ -273,14 +281,17 @@ some use cases, like containerization, this port could be different.Zowe certificate keystore password Certificate keystore password. Certificate keystore password. - zowe - + certificates + + + password + Alias for the certificate keystore Alias for the certificate keystore - zowe + certificates @@ -289,20 +300,26 @@ some use cases, like containerization, this port could be different. - zowe_certificate_truststore_type - zowe_certificate_truststore_type - zowe + Zowe certificate truststore type + Zowe certificate truststore type + certificates + PKCS12 + JCEKS + JCECCAKS + JCERACFKS + JCECCARACFKS + JCEHYBRIDRACFKS PKCS12 - File location for the certificate truststore + File location for the certificate truststore. Keyring is in the format "safkeyring://OWNER/KEYRING". File location for the certificate truststore - zowe + certificates @@ -313,14 +330,18 @@ some use cases, like containerization, this port could be different.Zowe certificate truststore password Password for the certificate truststore Password for the certificate truststore - zowe - + certificates + + + + password + Path to the Zowe certificate PEM key Path to the Zowe certificate PEM key - zowe + certificates @@ -331,7 +352,7 @@ some use cases, like containerization, this port could be different.Zowe certificate PEM certificate Path to the PEM certificate Path to the PEM certificate - zowe + certificates @@ -342,7 +363,7 @@ some use cases, like containerization, this port could be different.Zowe certificate PEM certificate authorities zowe_certificate_pem_certificateAuthorities zowe_certificate_pem_certificateAuthorities - zowe + certificates @@ -363,7 +384,7 @@ How we want to verify SSL certificates of services. Valid values are: - DISABLED: disable certificate validation. This is NOT recommended for security ]]> - zowe + certificates @@ -401,7 +422,7 @@ How we want to verify SSL certificates of services. Valid values are: - example-domain.com + dvipa.my-company.com @@ -590,6 +611,39 @@ How we want to verify SSL certificates of services. Valid values are: false + + + Use this option to enable the cloud gateway + Use this option to enable the cloud gateway + components + + + + false + + + + + Port for the cloud gateway + Port for the cloud gateway + components + + + + 7563 + + + + + Check this value to get additional debugging + Check this value to get additional debugging + components + + + + false + + Use this option to enable the API catalog @@ -711,6 +765,8 @@ How we want to verify SSL certificates of services. Valid values are: inMemory + redis + infinispan VSAM VSAM @@ -736,6 +792,17 @@ How we want to verify SSL certificates of services. Valid values are: + + + Port for jgroups + Port for jgroups. This is required if storage mode is infinispan. + components + + + + 7600 + + Check this option to enable the app server @@ -747,6 +814,17 @@ How we want to verify SSL certificates of services. Valid values are: true + + + Check to get extra debug information from the service + Check to get extra debug information from the service + components + + + + false + + Port for the app server @@ -802,6 +880,17 @@ How we want to verify SSL certificates of services. Valid values are: true + + + Check this to enable fallback + If fallback is enabled, the agent issues and accepts cookies from itself in the event a JWT cannot be provided. + components + + + + true + + Check this option to enable the jobs API @@ -813,6 +902,17 @@ How we want to verify SSL certificates of services. Valid values are: false + + + Check to get extra debug information from the service + Check to get extra debug information from the service + components + + + + false + + Port for the Jobs API @@ -835,6 +935,17 @@ How we want to verify SSL certificates of services. Valid values are: false + + + Check to get extra debug information from the service + Check to get extra debug information from the service + components + + + + false + + Port which will be used by the Files API @@ -879,6 +990,163 @@ How we want to verify SSL certificates of services. Valid values are: true + + + Should Zowe configuration manager be enabled? + Should Zowe configuration manager be enabled? + configManager + + + + true + + + + + STRICT or COMPONENT-COMPAT validation type + STRICT=quit on any error, COMPONENT-COMPAT=if component missing schema, skip it with warning instead of quit + configManager + + + + COMPONENT-COMPAT + STRICT + COMPONENT-COMPAT + + + + + ID you use to separate multiple Zowe installs + ID when determining resource names used in RBAC authorization checks such as dataservices with RBAC expects this ID in SAF resources + zowe + + + + 1 + + + + + ID that can be used by servers to distinguish their cookies from unrelated Zowe installs + ID which allows multiple copies of Zowe to be used within the same client + zowe + + + + 1 + + + + + Security product name. Can be RACF, ACF2 or TSS + Security product name. Can be RACF, ACF2 or TSS + security + + + + + RACF + TSS + ACF2 + RACF + + + + + Zowe admin user group + Zowe admin user group + security + + + + ZWEADMIN + + + + + + Zowe STC group + Zowe STC group + security + + + + + ZWEADMIN + + + + + Zowe SysProg group + Zowe SysProg group + security + + + + + ZWEADMIN + + + + + Zowe runtime user name of main service + Zowe runtime user name of main service + security + + + + + ZWESVUSR + + + + + Zowe runtime user name of ZIS + Zowe runtime user name of ZIS + security + + + + + ZWESIUSR + + + + + STC name of main service + STC name of main service + security + + + + + ZWESLSTC + + + + + STC name of ZIS + STC name of ZIS + security + + + + + ZWESISTC + + + + + STC name of Auxiliary Service + STC name of Auxiliary Service + security + + + + + ZWESASTC + + @@ -894,14 +1162,11 @@ How we want to verify SSL certificates of services. Valid values are: + + - - - - - @@ -911,6 +1176,7 @@ How we want to verify SSL certificates of services. Valid values are: + @@ -922,13 +1188,18 @@ How we want to verify SSL certificates of services. Valid values are: + + + + + @@ -939,6 +1210,15 @@ How we want to verify SSL certificates of services. Valid values are: + + + + + + + + + Run this step to fill base variables. 1 z/OS System Programmer @@ -967,7 +1247,7 @@ How we want to verify SSL certificates of services. Valid values are: - + @@ -1003,6 +1283,30 @@ How we want to verify SSL certificates of services. Valid values are: false + + Cloud gateway variables + Specify the variables for the cloud gateway component + + + 1 == 1 + Always true + + + Skipped if the cloud gateway was not selected + !${instance-components_cloud_gateway_enabled} + skipped + + + + + + Run this step to specify the cloud gateway variables + 1 + z/OS System Programmer + false + false + + API Catalog Variables Variables for the API catalog @@ -1051,9 +1355,12 @@ How we want to verify SSL certificates of services. Valid values are: false + + Chaching Service variables + Specify the variables for the Caching Service - Variables for Caching Service - Specify the variables for the Caching Service + Main variables for Caching Service + Specify the main variables for the Caching Service 1==1 @@ -1071,7 +1378,6 @@ How we want to verify SSL certificates of services. Valid values are: - Run this step to specify the variables for the Caching Service 1 z/OS System Programmer @@ -1079,6 +1385,67 @@ How we want to verify SSL certificates of services. Valid values are: false + + Variables for Caching Service - VSAM mode + Specify the variables for the VSAM mode of Caching Service + + + 1==1 + Always true + + + Skipped if Caching Service was not selected + !${instance-components_caching_service_enabled} + skipped + + + Skipped if VSAM was not selected + !(${instance-components_caching_service_storage_mode} == "VSAM") + skipped + + + + + + + + Run this step to specify the variables for the Caching Service + 1 + z/OS System Programmer + false + false + + + + Variables for Caching Service - infinispan mode + Specify the variables for the infinispan mode of Caching Service + + + + 1==1 + Always true + + + Skipped if Caching Service was not selected + !${instance-components_caching_service_enabled} + skipped + + + Skipped if infinispan was not selected + !(${instance-components_caching_service_storage_mode} == "infinispan") + skipped + + + + + Run this step to specify the variables for the Caching Service + 1 + z/OS System Programmer + false + false + + + App Server variables Specify the variables for the App Server @@ -1095,6 +1462,7 @@ How we want to verify SSL certificates of services. Valid values are: + Run this step to specify the variables for the App Server. 1 z/OS System Programmer @@ -1120,6 +1488,7 @@ How we want to verify SSL certificates of services. Valid values are: + Run this step to specify the values for the ZSS variables 1 z/OS System Programmer @@ -1143,6 +1512,7 @@ How we want to verify SSL certificates of services. Valid values are: + Run this step to define the variables for the Jobs API 1 z/OS System Programmer @@ -1166,6 +1536,7 @@ How we want to verify SSL certificates of services. Valid values are: + Run this step to specify the variables for the Files API 1 z/OS System Programmer @@ -1213,18 +1584,19 @@ echo '# Copyright Contributors to the Zowe Project.' >> "${instance-zowe_runtime echo '#[[################################################################################]]#' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" echo '' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" echo '#===============================================================================' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" -echo '# This is a YAML configuration file for Zowe instance.' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" +echo '# This is a YAML configuration file for a Zowe instance.' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" echo '#' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" echo '# YAML is a human-friendly data serialization language for all programming languages.' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" echo '# To learn more about YAML specifications, please check https://yaml.org/.' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" echo '#' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" -echo '# To learn more details about the entries, please check https://docs.zowe.org/.' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" +echo '# To learn more details about the content of this file, please check https://docs.zowe.org/.' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" echo '#' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" echo '# For first time users, or for the most common use cases, please pay more' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" -echo '# attention on the entries marked with "**COMMONLY_CUSTOMIZED**".' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" +echo '# attention to the entries marked with "**COMMONLY_CUSTOMIZED**". A "directory" refers' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" +echo '# to a directory in z/OS Unix.' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" echo '#' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" echo '# If you modify any settings listed in "zwe init --help" command, you may need to' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" -echo '# re-run "zwe init" command to make them take effect.' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" +echo '# re-run the "zwe init" command to make them take effect.' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" echo '#===============================================================================' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" echo '' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" echo '#-------------------------------------------------------------------------------' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" @@ -1242,51 +1614,56 @@ echo ' setup:' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" echo ' # MVS data set related configurations' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" echo ' dataset:' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" echo ' # **COMMONLY_CUSTOMIZED**' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" -echo ' # Where Zowe MVS data sets will be installed' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" -echo ' prefix: "$!{instance-zowe_setup_dataset_prefix}"' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" +echo ' # where Zowe MVS data sets will be installed' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" +echo ' prefix: $!{instance-zowe_setup_dataset_prefix}' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" echo ' # **COMMONLY_CUSTOMIZED**' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" echo ' # PROCLIB where Zowe STCs will be copied over' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" -echo ' proclib: "$!{instance-zowe_setup_dataset_proclib}"' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" +echo ' proclib: $!{instance-zowe_setup_dataset_proclib}' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" echo ' # **COMMONLY_CUSTOMIZED**' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" echo ' # Zowe PARMLIB' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" -echo ' parmlib: "$!{instance-zowe_setup_dataset_parmlib}"' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" +echo ' parmlib: $!{instance-zowe_setup_dataset_parmlib}' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" +echo ' # Holds Zowe PARMLIB members for plugins' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" +echo ' parmlibMembers:' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" +echo ' # For ZIS plugins' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" +echo ' zis: $!{instance-zowe_setup_dataset_libzis}' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" echo ' # **COMMONLY_CUSTOMIZED**' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" echo ' # JCL library where Zowe will store temporary JCLs during initialization' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" -echo ' jcllib: "$!{instance-zowe_setup_dataset_jcllib}"' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" +echo ' jcllib: $!{instance-zowe_setup_dataset_jcllib}' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" +echo ' # Utilities for use by Zowe and extensions' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" +echo ' loadlib: $!{instance-zowe_setup_dataset_loadlibPlugin}' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" echo ' # APF authorized LOADLIB for Zowe' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" -echo ' # Optional. If it'\''s empty, .SZWEAUTH will be APF authorized.' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" -echo ' authLoadlib: "$!{instance-zowe_setup_dataset_authLoadlib}"' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" +echo ' authLoadlib: $!{instance-zowe_setup_dataset_authLoadlib}' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" echo ' # **COMMONLY_CUSTOMIZED**' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" echo ' # APF authorized LOADLIB for Zowe ZIS Plugins' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" -echo ' authPluginLib: "$!{instance-zowe_setup_dataset_authPluginLib}"' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" +echo ' authPluginLib: $!{instance-zowe_setup_dataset_authPluginLib}' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" echo '' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" echo ' # >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" -echo ' # # Security related configurations. This setup is optional.' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" -echo ' # security:' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" -echo ' # # security product name. Can be RACF, ACF2 or TSS' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" -echo ' # product: RACF' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" -echo ' # # security group name' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" -echo ' # groups:' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" -echo ' # # Zowe admin user group' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" -echo ' # admin: ZWEADMIN' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" -echo ' # # Zowe STC group' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" -echo ' # stc: ZWEADMIN' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" -echo ' # # Zowe SysProg group' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" -echo ' # sysProg: ZWEADMIN' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" -echo ' # # security user name' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" -echo ' # users:' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" -echo ' # # Zowe runtime user name of main service' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" -echo ' # zowe: ZWESVUSR' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" -echo ' # # Zowe runtime user name of ZIS' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" -echo ' # zis: ZWESIUSR' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" -echo ' # # STC names' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" -echo ' # stcs:' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" -echo ' # # STC name of Zowe main service' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" -echo ' # zowe: ZWESLSTC' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" -echo ' # # STC name of Zowe ZIS' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" -echo ' # zis: ZWESISTC' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" -echo ' # # STC name of Zowe ZIS Auxiliary Server' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" -echo ' # aux: ZWESASTC' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" +echo ' # Security related configurations. This setup is optional.' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" +echo ' security:' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" +echo ' # security product name. Can be RACF, ACF2 or TSS' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" +echo ' product: $!{instance-zowe_setup_security_product}' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" +echo ' # security group name' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" +echo ' groups:' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" +echo ' # Zowe admin user group' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" +echo ' admin: $!{instance-zowe_setup_security_groups_admin}' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" +echo ' # Zowe STC group' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" +echo ' stc: $!{instance-zowe_setup_security_groups_stc}' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" +echo ' # Zowe SysProg group' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" +echo ' sysProg: $!{instance-zowe_setup_security_groups_sysProg}' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" +echo ' # security user name' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" +echo ' users:' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" +echo ' # Zowe runtime user name of main service' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" +echo ' zowe: $!{instance-zowe_setup_security_users_zowe}' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" +echo ' # Zowe runtime user name of ZIS' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" +echo ' zis: $!{instance-zowe_setup_security_users_zis}' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" +echo ' # STC names' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" +echo ' stcs:' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" +echo ' # STC name of Zowe main service' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" +echo ' zowe: $!{instance-zowe_setup_security_stcs_zowe}' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" +echo ' # STC name of Zowe ZIS' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" +echo ' zis: $!{instance-zowe_setup_security_stcs_zis}' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" +echo ' # STC name of Zowe ZIS Auxiliary Server' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" +echo ' aux: $!{instance-zowe_setup_security_stcs_aux}' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" echo '' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" echo ' # >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" echo ' # Certificate related configurations' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" @@ -1295,13 +1672,13 @@ echo ' # There are 5 configurations cases. Please choose one from below.' >> echo '' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" echo ' # >>>> Certificate setup scenario 1' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" echo ' # PKCS12 (keystore) with Zowe generate certificates.' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" -echo ' certificate:' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" +echo ' # certificate:' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" echo ' # Type of certificate storage. Valid values are: PKCS12, JCEKS, JCECCAKS, JCERACFKS, JCECCARACFKS, or JCEHYBRIDRACFKS' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" -echo ' type: "$!{instance-zowe_setup_certificate_type}"' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" -echo ' pkcs12:' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" +echo ' # type: $!{instance-zowe_setup_certificate_type}' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" +echo ' # pkcs12:' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" echo ' # **COMMONLY_CUSTOMIZED**' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" echo ' # Keystore directory' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" -echo ' directory: "$!{instance-zowe_setup_certificate_pkcs12_directory}"' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" +echo ' # directory: ' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" echo ' # # Lock the keystore directory to only accessible by Zowe runtime user and group.' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" echo ' # lock: true' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" echo ' # **COMMONLY_CUSTOMIZED**' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" @@ -1372,10 +1749,11 @@ echo ' # # Path to the certificate authority signed the certificate will echo ' # - ""' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" echo '' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" echo ' # # >>>> Certificate setup scenario 3' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" -echo ' # # z/OS Keyring with Zowe generated certificates.' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" +echo ' # # Zowe generated z/OS Keyring with Zowe generated certificates.' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" echo ' # certificate:' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" echo ' # # Type of certificate storage. Valid values are: PKCS12, JCEKS, JCECCAKS, JCERACFKS, JCECCARACFKS, or JCEHYBRIDRACFKS' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" echo ' # type: JCERACFKS' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" +echo ' # createZosmfTrust: true' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" echo ' # keyring:' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" echo ' # # **COMMONLY_CUSTOMIZED**' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" echo ' # # keyring name' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" @@ -1407,7 +1785,7 @@ echo ' # # - dvipa.my-company.com' >> "${instance-zowe_runtimeDirectory}/ echo ' # # - 12.34.56.78' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" echo '' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" echo ' # # >>>> Certificate setup scenario 4' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" -echo ' # # z/OS Keyring and connect to existing certificate' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" +echo ' # # Zowe generated z/OS Keyring and connect to existing certificate' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" echo ' # certificate:' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" echo ' # # Type of certificate storage. Valid values are: PKCS12, JCEKS, JCECCAKS, JCERACFKS, JCECCARACFKS, or JCEHYBRIDRACFKS' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" echo ' # type: JCERACFKS' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" @@ -1431,7 +1809,7 @@ echo ' # importCertificateAuthorities:' >> "${instance-zowe_runtimeDirector echo ' # - ""' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" echo '' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" echo ' # # >>>> Certificate setup scenario 5' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" -echo ' # # z/OS Keyring with importing certificate stored in data set' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" +echo ' # # Zowe generated z/OS Keyring with importing certificate stored in data set' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" echo ' # certificate:' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" echo ' # # Type of certificate storage. Valid values are: PKCS12, JCEKS, JCECCAKS, JCERACFKS, JCECCARACFKS, or JCEHYBRIDRACFKS' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" echo ' # type: JCERACFKS' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" @@ -1456,7 +1834,7 @@ echo ' # VSAM configurations if you are using VSAM as Caching Service storage echo ' vsam:' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" echo ' # VSAM data set with Record-Level-Sharing enabled or not' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" echo ' # Valid values could be: NONRLS or RLS.' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" -echo ' mode: "$!{instance-zowe_setup_vsam_mode}"' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" +echo ' mode: $!{instance-zowe_setup_vsam_mode}' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" echo ' # Volume name if you are using VSAM in NONRLS mode' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" echo ' volume: "$!{instance-zowe_setup_vsam_volume}"' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" echo ' # Storage class name if you are using VSAM in RLS mode' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" @@ -1466,42 +1844,82 @@ echo ' # >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>' >> "${instance-zowe_runtimeDire echo ' # **COMMONLY_CUSTOMIZED**' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" echo ' # Zowe runtime (root) directory' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" echo ' #' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" -echo ' # **NOTE**: if it'\''s not specified and you passed "--update-config" argument' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" -echo ' # when you run "zwe init" command, this value will be updated with the Zowe' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" +echo ' # **NOTE**: ' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" +echo ' # 1. if it is not specified and you passed "--update-config" argument' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" +echo ' # when you ran "zwe init" command, this value will be updated with the Zowe' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" echo ' # runtime where the "zwe" command is located.' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" echo ' #' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" +echo ' # 2. the runtime directory is designed to be "read only". This is different from the' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" +echo ' # log, workspace, and extension directories. Setting those three to the same parent folder' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" +echo ' # as the runtime directory is unsupported & may cause issues' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" +echo ' #' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" echo ' # This value is required by ZWESLSTC to know where is Zowe runtime.' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" echo ' runtimeDirectory: "$!{instance-zowe_runtimeDirectory}"' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" echo '' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" echo ' # **COMMONLY_CUSTOMIZED**' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" echo ' # Where to store runtime logs' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" -echo ' logDirectory: "$!{instance-zowe_logDirectory}"' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" +echo ' logDirectory: $!{instance-zowe_logDirectory}' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" echo '' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" echo ' # **COMMONLY_CUSTOMIZED**' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" echo ' # Zowe runtime workspace directory' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" -echo ' workspaceDirectory: "$!{instance-zowe_workspaceDirectory}"' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" +echo ' workspaceDirectory: $!{instance-zowe_workspaceDirectory}' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" echo '' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" echo ' # **COMMONLY_CUSTOMIZED**' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" echo ' # Where extensions are installed' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" -echo ' extensionDirectory: "$!{instance-zowe_extensionDirectory}"' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" +echo ' extensionDirectory: $!{instance-zowe_extensionDirectory}' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" +echo '' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" +echo ' # **COMMONLY_CUSTOMIZED**' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" +echo ' useConfigmgr: $!{instance-useconfig_manager_enabled}' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" +echo ' # Setting to true will enable:' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" +echo ' # * schema-backed validation of zowe.yaml' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" +echo ' # * should greatly improve startup time.' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" +echo ' # * can supply multiple zowe.yaml as defaults & overrides in the format of' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" +echo ' # FILE(/my/customizations.yaml):PARMLIB(MYORG.ZOWE(YAML)):FILE(/zowe/defaults.yaml)' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" +echo ' # * allows templating in zowe.yaml by putting references within ${{ }} blocks such as' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" +echo ' # rewriting the job section below as' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" +echo ' # job:' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" +echo ' # name: ${{ zowe.job.prefix }}SV' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" +echo ' # prefix: ZWE1' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" +echo ' configmgr:' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" +echo ' # STRICT=quit on any error, including missing schema' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" +echo ' # COMPONENT-COMPAT=if component missing schema, skip it with warning instead of quit' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" +echo ' validation: "$!{instance-config_manager_validation}"' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" echo '' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" echo ' # >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" echo ' # runtime z/OS job name' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" echo ' job:' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" echo ' # Zowe JES job name' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" -echo ' name: "$!{instance-zowe_job_name}"' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" +echo ' name: $!{instance-zowe_job_name}' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" echo ' # Prefix of component address space' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" -echo ' prefix: "$!{instance-zowe_job_prefix}"' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" +echo ' prefix: $!{instance-zowe_job_prefix}' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" +echo '' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" +echo ' # >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" +echo ' # This is an ID you use to separate multiple Zowe installs when determining' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" +echo ' # resource names used in RBAC authorization checks such as dataservices with RBAC' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" +echo ' # expects this ID in SAF resources' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" +echo ' rbacProfileIdentifier: "$!{instance-zowe_rbacProfileId}"' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" +echo '' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" +echo ' # >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" +echo ' # This is an ID that can be used by servers that distinguish their cookies from unrelated Zowe installs, ' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" +echo ' # for purposes such as to allow multiple copies of Zowe to be used within the same client' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" +echo ' cookieIdentifier: "$!{instance-zowe_cookieId}"' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" echo '' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" echo ' # >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" echo ' # **COMMONLY_CUSTOMIZED**' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" -echo ' # You can list your external domains how you want to access Zowe.' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" -echo ' # This should be the domain list you would like to put into your web browser' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" +echo ' # You can list your external domains on how you want to access Zowe.' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" +echo ' # This should be the domain list you would like to put into your web browser'\''s' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" echo ' # address bar.' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" echo ' externalDomains:' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" +echo ' # this should be the domain name to access Zowe APIML Gateway' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" #foreach($externalDomain in ${instance-zowe_externalDomains.split("\n")}) echo ' - ${externalDomain}' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" #end +echo '' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" +echo ' # >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" +echo ' # This is the port you use to access Zowe Gateway from your web browser.' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" +echo ' #' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" +echo ' # In many use cases, this should be same as `components.gateway.port`. But in' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" +echo ' # some use cases, like containerization, this port could be different.' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" echo ' externalPort: ${instance-zowe_externalPort}' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" echo '' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" echo ' # >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" @@ -1516,10 +1934,41 @@ echo ' # ZWED_SSH_PORT: 22' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" echo ' # ZWED_TN3270_PORT: 23' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" echo '' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" echo ' # >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" -echo ' # Enable debug mode for zowe launch scripts' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" +echo ' # You can define any Zowe message portions to be checked for and the message added to the' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" +echo ' # system log upon its logging, truncated to 126 characters.' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" +echo ' sysMessages:' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" +echo ' # # Zowe starting' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" +echo ' - "ZWEL0021I"' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" +echo ' # # Zowe started' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" +echo ' - "ZWEL0018I"' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" +echo ' - "ZWEL0006I"' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" +echo ' # # Zowe ready to use' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" +echo ' - "ZWES1601I"' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" +echo ' # # Zowe stopping' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" +echo ' - "ZWEL0008I"' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" +echo ' # # Zowe stopped' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" +echo ' - "ZWEL0022I"' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" +echo ' # # Zowe components starting' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" +echo ' - "ZWEL0001I"' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" +echo ' # # Zowe components stopped' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" +echo ' - "ZWEL0002I"' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" +echo ' # # API ML components ready' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" +echo ' - "ZWEAM000I"' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" +echo ' # # App server ready' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" +echo ' - "ZWED0031I"' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" +echo ' # # ZSS ready' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" +echo ' - "ZWES1013I"' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" +echo '' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" +echo ' # # Not limited to Zowe message ID'\''s, you can specify your own string for example:' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" +echo ' # - "ERROR"' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" +echo '' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" +echo ' # >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" +echo ' # Enable debug mode for Zowe launch scripts' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" echo ' launchScript:' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" echo ' # Set to "debug" or "trace" to display extra debug information' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" echo ' logLevel: "$!{instance-zowe_launchScript_logLevel}"' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" +echo ' # Set to "exit" if you'\''d like startup to exit if any component has an error in the configure stage, otherwise zwe will warn but continue.' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" +echo ' onComponentConfigureFail: "$!{instance-zowe_launchScript_CompConf}"' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" echo '' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" echo ' # >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" echo ' # Default Zowe certificate' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" @@ -1529,18 +1978,23 @@ echo ' # `--update-config` to `zwe init` command. The generated value will base echo ' # your setup in `zowe.setup.certificate` section.' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" echo ' certificate:' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" echo ' keystore:' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" -echo ' type: "$!{instance-zowe_certificate_keystore_type}"' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" -echo ' file: "$!{instance-zowe_certificate_keystore_file}"' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" -echo ' password: "$!{instance-zowe_certificate_keystore_password}"' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" -echo ' alias: "$!{instance-zowe_certificate_keystore_alias}"' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" +echo ' type: $!{instance-zowe_certificate_keystore_type}' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" +echo ' # if keyrings, the format is safkeyring:////stcusername/KeyName' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" +echo ' file: $!{instance-zowe_certificate_keystore_file}' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" +echo ' # "password" should either be the value you set when PKCS12, or literally "password" for keyrings.' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" +echo ' password: $!{instance-zowe_certificate_keystore_password}' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" +echo ' # alias is the name of your key/cert. When using keyrings, get the Case Sensitive, Space Sensitive value in a TSO list ring.' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" +echo ' alias: $!{instance-zowe_certificate_keystore_alias}' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" echo ' truststore:' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" -echo ' type: "$!{instance-zowe_certificate_truststore_type}"' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" -echo ' file: "$!{instance-zowe_certificate_truststore_file}"' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" -echo ' password: "$!{instance-zowe_certificate_truststore_password}"' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" +echo ' # truststore usually has same values as keystore (minus alias), but can be different if desired.' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" +echo ' type: $!{instance-zowe_certificate_truststore_type}' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" +echo ' file: $!{instance-zowe_certificate_truststore_file}' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" +echo ' password: $!{instance-zowe_certificate_truststore_password}' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" echo ' pem:' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" -echo ' key: "$!{instance-zowe_certificate_pem_key}"' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" -echo ' certificate: "$!{instance-zowe_certificate_pem_certificate}"' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" -echo ' certificateAuthorities: "$!{instance-zowe_certificate_pem_certificateAuthorities}"' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" +echo ' key: $!{instance-zowe_certificate_pem_key}' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" +echo ' certificate: $!{instance-zowe_certificate_pem_certificate}' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" +echo ' # if keyrings, the format is "safkeyring:////stcusername/KeyName&ca name"' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" +echo ' certificateAuthorities: $!{instance-zowe_certificate_pem_certificateAuthorities}' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" echo '' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" echo ' # >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" echo ' # How we want to verify SSL certificates of services. Valid values are:' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" @@ -1551,8 +2005,8 @@ echo ' # - NONSTRICT: will validate if the certificate is trusted in our trust echo ' # This mode does not validate certificate Common Name and Subject' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" echo ' # Alternative Name (SAN).' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" echo ' # - DISABLED: disable certificate validation. This is NOT recommended for' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" -echo ' # security ' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" -echo ' verifyCertificates: "$!{instance-zowe_verifyCertificates}"' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" +echo ' # security.' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" +echo ' verifyCertificates: $!{instance-zowe_verifyCertificates}' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" echo '' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" echo '' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" echo '#-------------------------------------------------------------------------------' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" @@ -1593,11 +2047,11 @@ echo '# features. You need to define how to access your z/OSMF instance.' >> "${ echo '#-------------------------------------------------------------------------------' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" echo 'zOSMF:' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" echo ' # **COMMONLY_CUSTOMIZED**' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" -echo ' # host name of your z/OSMF instance' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" -echo ' host: "$!{instance-zOSMF_host}"' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" +echo ' # Host name of your z/OSMF instance' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" +echo ' host: $!{instance-zOSMF_host}' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" echo ' # **COMMONLY_CUSTOMIZED**' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" echo ' port: ${instance-zOSMF_port}' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" -echo ' applId: "$!{instance-zOSMF_applId}"' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" +echo ' applId: $!{instance-zOSMF_applId}' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" echo '' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" echo '' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" echo '#-------------------------------------------------------------------------------' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" @@ -1700,6 +2154,20 @@ echo ' debug: false' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" #end echo '' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" echo ' # >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" +#if (${instance-components_cloud_gateway_enabled} == "true" ) +echo ' cloud-gateway:' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" +echo ' enabled: ${instance-components_cloud_gateway_enabled}' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" +echo ' port: ${instance-components_cloud_gateway_port}' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" +echo ' debug: ${instance-components_cloud_gatewaye_debug}' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" +#end +#if (${instance-components_cloud_gateway_enabled} == "false" ) +echo ' cloud-gateway:' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" +echo ' enabled: ${instance-components_cloud_gateway_enabled}' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" +echo ' port: 7563' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" +echo ' debug: false' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" +#end +echo '' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" +echo ' # >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" #if (${instance-components_api_catalog_enabled} == "true" ) echo ' api-catalog:' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" echo ' enabled: ${instance-components_api_catalog_enabled}' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" @@ -1738,13 +2206,17 @@ echo ' debug: ${instance-components_caching_service_debug}' >> "${instance-zo echo '' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" echo ' storage:' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" echo ' evictionStrategy: "$!{instance-components_caching_service_storage_evictionStrategy}"' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" -echo ' # can be inMemory, VSAM' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" +echo ' # can be inMemory, VSAM, redis or infinispan' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" echo ' mode: "$!{instance-components_caching_service_storage_mode}"' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" echo ' size: ${instance-components_caching_service_storage_size}' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" echo ' vsam:' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" -echo ' # your VSAM data set created by ZWECSVSM job' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" +echo ' # your VSAM data set created by "zwe init vsam" command or ZWECSVSM JCL' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" echo ' # this is required if storage mode is VSAM' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" echo ' name: "$!{instance-components_caching_service_storage_vsam_name}"' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" +echo ' infinispan:' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" +echo ' # this is required if storage mode is infinispan' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" +echo ' jgroups:' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" +echo ' port: ${instance-components_caching_service_storage_infinispan_jgroups_port}' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" #end #if (${instance-components_caching_service_enabled} == "false" ) echo ' caching-service:' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" @@ -1754,13 +2226,17 @@ echo ' debug: false' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" echo '' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" echo ' storage:' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" echo ' evictionStrategy: "reject"' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" -echo ' # can be inMemory, VSAM' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" +echo ' # can be inMemory, VSAM, redis or infinispan' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" echo ' mode: "VSAM"' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" echo ' size: 10000' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" echo ' vsam:' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" -echo ' # your VSAM data set created by ZWECSVSM job' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" +echo ' # your VSAM data set created by "zwe init vsam" command or ZWECSVSM JCL' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" echo ' # this is required if storage mode is VSAM' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" echo ' name: ""' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" +echo ' infinispan:' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" +echo ' # this is required if storage mode is infinispan' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" +echo ' jgroups:' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" +echo ' port: 7600' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" #end echo '' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" echo ' # >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" @@ -1768,11 +2244,13 @@ echo ' # >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>' >> "${instance-zowe_runtimeDire echo ' app-server:' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" echo ' enabled: ${instance-components_app_server_enabled}' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" echo ' port: ${instance-components_app_server_port}' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" +echo ' debug: ${instance-components_app_server_debug}' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" #end #if (${instance-components_app_server_enabled} == "false" ) echo ' app-server:' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" echo ' enabled: ${instance-components_app_server_enabled}' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" echo ' port: 7556' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" +echo ' debug: false' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" #end echo ' # we can customize any component with custom certificate' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" echo ' # the missing definitions will be picked from "zowe.certificate"' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" @@ -1790,23 +2268,31 @@ echo ' enabled: ${instance-components_zss_enabled}' >> "${instance-zowe_runti echo ' port: ${instance-components_zss_port}' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" echo ' crossMemoryServerName: "$!{instance-components_zss_crossMemoryServerName}"' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" echo ' tls: ${instance-components_zss_tls}' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" +echo ' agent:' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" +echo ' jwt:' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" +echo ' fallback: ${instance-components_zss_agent_jwt_fallback}' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" #end #if (${instance-components_zss_enabled} == "false" ) echo ' enabled: ${instance-components_zss_enabled}' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" echo ' port: 7557' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" echo ' crossMemoryServerName: "ZWESIS_STD"' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" echo ' tls: true' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" +echo ' agent:' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" +echo ' jwt:' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" +echo ' fallback: true' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" #end echo '' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" echo ' # >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" #if (${instance-components_jobs_api_enabled} == "true" ) echo ' jobs-api:' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" echo ' enabled: ${instance-components_jobs_api_enabled}' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" +echo ' debug: ${instance-components_jobs_api_debug}' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" echo ' port: ${instance-components_jobs_api_port}' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" #end #if (${instance-components_jobs_api_enabled} == "false" ) echo ' jobs-api:' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" echo ' enabled: ${instance-components_jobs_api_enabled}' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" +echo ' debug: false' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" echo ' port: 7558' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" #end echo '' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" @@ -1814,11 +2300,13 @@ echo ' # >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>' >> "${instance-zowe_runtimeDire #if (${instance-components_files_api_enabled} == "true" ) echo ' files-api:' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" echo ' enabled: ${instance-components_files_api_enabled}' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" +echo ' debug: ${instance-components_files_api_debug}' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" echo ' port: ${instance-components_files_api_port}' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" #end #if (${instance-components_files_api_enabled} == "false" ) echo ' files-api:' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" echo ' enabled: ${instance-components_files_api_enabled}' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" +echo ' debug: false' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" echo ' port: 7559' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" #end echo '' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" @@ -1856,7 +2344,8 @@ echo '# hostname: lpar1.my-company.com' >> "${instance-zowe_runtimeDirectory echo '# # Your &SYSNAME for this LPAR' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" echo '# # This sysname will be used to route your JES command to target system.' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" echo '# sysname: LPR1' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" -echo '# # for this HA instance, we didn'\''t customize "components", so it will use default value.' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" +echo '# # for this HA instance, we did not customize "components", so it will use default value.' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" +echo '' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" echo '# # HA instance ID, we will start 2 instances on LPAR2' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" echo '# # **NOTE**, we can only start one gateway in same LPAR.' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" echo '# lpar2a:' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" @@ -1943,7 +2432,7 @@ export NODE_HOME='${instance-node_home}' export PATH=$PATH:'${instance-zowe_runtimeDirectory}/bin' -zwe install -c '${instance-zowe_runtimeDirectory}/zowe.yaml' +zwe install -c '${instance-zowe_runtimeDirectory}/zowe.yaml' --allow-overwrite shell-JCL 1024 @@ -1956,9 +2445,59 @@ zwe install -c '${instance-zowe_runtimeDirectory}/zowe.yaml' zwe init -c ${instance-zowe_runtimeDirectory}/zowe.yml

- NOTE: The zwe init command is a combination of the following sub-commands.
- Each sub-command defines a configuration. + This step runs the commands:
+ zwe init mvs -c ${instance-zowe_runtimeDirectory}/zowe.yml --allow-overwrite
+ zwe init stc -c ${instance-zowe_runtimeDirectory}/zowe.yml --allow-overwrite
+#if (${instance-components_caching_service_storage_mode} == "VSAM" && ${instance-components_caching_service_enabled}) + zwe init vsam -c ${instance-zowe_runtimeDirectory}/zowe.yml --allow-overwrite
+#end +
+ NOTE: + Each zwe init sub-command defines a configuration. +
    +
  • mvs: Copy the data sets provided with Zowe to custom data sets.
    • +
  • security: Create the user IDs and security manager settings.
    • +
  • apfauth: APF authorize the LOADLIB containing the modules that need to perform z/OS priviledged security calls.
    • +
  • certificate: Configure Zowe to use TLS certificates.
    • +
  • vsam: Configure the VSAM files needed to run the Zowe caching service used for high availability (HA).
    • +
  • stc: Configure the system to launch the Zowe started task.
    • +
+ ]]> + 1 + z/OS System Programmer + false + false + + + + Run the Zowe init security + Executes the Zowe initialization for security setup + + + + zwe init apfauth -c ${instance-zowe_runtimeDirectory}/zowe.yml
+ zwe init security -c ${instance-zowe_runtimeDirectory}/zowe.yml --allow-overwrite
+
+ NOTE: + Each zwe init sub-command defines a configuration.
  • mvs: Copy the data sets provided with Zowe to custom data sets.
  • security: Create the user IDs and security manager settings.
    • @@ -1981,7 +2520,8 @@ export NODE_HOME='${instance-node_home}' export PATH=$PATH:'${instance-zowe_runtimeDirectory}/bin' -zwe init -c '${instance-zowe_runtimeDirectory}/zowe.yaml' +zwe init security -c '${instance-zowe_runtimeDirectory}/zowe.yaml' --allow-overwrite +zwe init apfauth -c '${instance-zowe_runtimeDirectory}/zowe.yaml' shell-JCL 1024 diff --git a/workflows/files/ZWEWRF02.xml b/workflows/files/ZWEWRF02.xml index 7fea70c2ac..5fb653e1e6 100644 --- a/workflows/files/ZWEWRF02.xml +++ b/workflows/files/ZWEWRF02.xml @@ -48,8 +48,8 @@ Mount ZOWE zFS This step mounts ZOWE zFS on the mount point that was selected during the deployment. - Make sure you have correct SYSAFF in the following JCL so the filesystem is - mounted correctly. + Make sure you have the correct SYSAFF in the following JCL so the filesystem is +mounted correctly. 1 z/OS system programmer @@ -79,6 +79,36 @@ MOUNT FILESYSTEM('${zfsdsn}') + TYPE(ZFS) MODE(RDWR) + PARM('AGGRGROW') + MOUNTPOINT('${zfsmount}') +/* + JCL + 80 + + + + Change ownership + This step changes the ownership and mode of the ZOWE USS directory so the zwe command can be called. + Make sure you have the correct SYSAFF in the following JCL so the filesystem is +mounted correctly. + + 1 + z/OS system programmer + true + false +