From 8c49dd58ef595d9d413bef1cd5ff593be53ecab1 Mon Sep 17 00:00:00 2001 From: 1000TurquoisePogs Date: Thu, 29 Aug 2024 07:38:25 -0400 Subject: [PATCH 01/24] Add zlux content for v3 Signed-off-by: 1000TurquoisePogs --- files/zlux/config/allowedPlugins.json | 16 +---- .../plugins/org.zowe.zlux.ivydesktop.json | 5 ++ .../plugins/org.zowe.zlux.ng2desktop.json | 2 +- files/zlux/config/zluxserver.json | 72 ------------------- manifest.json.template | 2 +- 5 files changed, 9 insertions(+), 88 deletions(-) create mode 100644 files/zlux/config/plugins/org.zowe.zlux.ivydesktop.json delete mode 100644 files/zlux/config/zluxserver.json diff --git a/files/zlux/config/allowedPlugins.json b/files/zlux/config/allowedPlugins.json index 368cac3a02..dcc69a094f 100644 --- a/files/zlux/config/allowedPlugins.json +++ b/files/zlux/config/allowedPlugins.json @@ -28,14 +28,6 @@ "identifier": "org.zowe.zlux.auth.trivial", "versions": ["*"] }, - { - "identifier": "org.zowe.zlux.auth.zosmf", - "versions": ["*"] - }, - { - "identifier": "org.zowe.zlux.auth.zss", - "versions": ["*"] - }, { "identifier": "org.zowe.zlux.auth.safsso", "versions": ["*"] @@ -53,11 +45,11 @@ "versions": ["*"] }, { - "identifier": "org.zowe.zlux.ng2desktop.settings", + "identifier": "org.zowe.zlux.ivydesktop", "versions": ["*"] }, { - "identifier": "org.zowe.zlux.proxy.zosmf", + "identifier": "org.zowe.zlux.ng2desktop.settings", "versions": ["*"] }, { @@ -72,10 +64,6 @@ "identifier": "org.zowe.zlux.sample.iframe", "versions": ["*"] }, - { - "identifier": "org.zowe.zosmf.workflows", - "versions": ["*"] - }, { "identifier": "org.openmainframe.zowe.workshop-starter", "versions": ["*"] diff --git a/files/zlux/config/plugins/org.zowe.zlux.ivydesktop.json b/files/zlux/config/plugins/org.zowe.zlux.ivydesktop.json new file mode 100644 index 0000000000..1a791b6331 --- /dev/null +++ b/files/zlux/config/plugins/org.zowe.zlux.ivydesktop.json @@ -0,0 +1,5 @@ +{ + "identifier": "org.zowe.zlux.ivydesktop", + "pluginLocation": "zlux-app-manager/virtual-desktop", + "relativeTo": "$ZLUX_ROOT_DIR" +} diff --git a/files/zlux/config/plugins/org.zowe.zlux.ng2desktop.json b/files/zlux/config/plugins/org.zowe.zlux.ng2desktop.json index 2fd18ed29b..44a33568d3 100644 --- a/files/zlux/config/plugins/org.zowe.zlux.ng2desktop.json +++ b/files/zlux/config/plugins/org.zowe.zlux.ng2desktop.json @@ -1,5 +1,5 @@ { "identifier": "org.zowe.zlux.ng2desktop", - "pluginLocation": "zlux-app-manager/virtual-desktop", + "pluginLocation": "zlux-app-manager-v2/virtual-desktop", "relativeTo": "$ZLUX_ROOT_DIR" } diff --git a/files/zlux/config/zluxserver.json b/files/zlux/config/zluxserver.json deleted file mode 100644 index 9283155557..0000000000 --- a/files/zlux/config/zluxserver.json +++ /dev/null @@ -1,72 +0,0 @@ -{ - "node": { - "https": { - "ipAddresses": ["0.0.0.0"], - "port": 7556, - //pfx (string), keys, certificates, certificateAuthorities, and certificateRevocationLists are all valid here. - "keys": ["../defaults/serverConfig/zlux.keystore.key"], - "certificates": ["../defaults/serverConfig/zlux.keystore.cer"], - "certificateAuthorities": ["../defaults/serverConfig/apiml-localca.cer"] - }, - "mediationLayer": { - "server": { - "hostname": "localhost", - "port": 7554, - "isHttps": true - }, - //environmentally set to true when apiml available - "enabled": false - }, - "headers": { - "X-frame-Options": { - "override": true, - "value": "sameorigin" - } - } - }, - "agent": { - //host is for zlux to know, not zss - "host": "localhost", - "jwt": { - "fallback": true - }, - "https": { - "ipAddresses": ["127.0.0.1"], - //to be a replacement for zssPort - "port": 7557 - }, - "mediationLayer": { - "serviceName": "zss", - //environmentally set to true when apiml available - "enabled": false - } - }, - //Zowe cross memory server name - "privilegedServerName": "ZWESIS_STD", - -// All paths relative to ZLUX/node or ZLUX/bin -// In real installations, these values will be configured during the install. - "productDir":"../defaults", - "siteDir":"../deploy/site", - "instanceDir":"../deploy/instance", - "groupsDir":"../deploy/instance/groups", - "usersDir":"../deploy/instance/users", - "pluginsDir":"../defaults/plugins", - - "dataserviceAuthentication": { - //this specifies the default authentication type for dataservices that didn't specify which type to use. These dataservices therefore should not expect a particular type of authentication to be used. - "defaultAuthentication": "saf", - //enable this to use role-based access control (RBAC) for Zowe dataservice endpoints - "rbac": false, - - //each authentication type may have more than one implementing plugin, but the specification below just describes the priority of them. Every one that is found in the pluginsDir is loaded. - "implementationDefaults": { - //each type has an object which describes which implementation to use based on some criteria to find which is best for the task. For now, just "plugins" will - //be used to state that you want a particular plugin. - "saf": { - "plugins": ["org.zowe.zlux.auth.safsso"] - } - - } - } -} diff --git a/manifest.json.template b/manifest.json.template index 6194230ca9..ccb0477694 100644 --- a/manifest.json.template +++ b/manifest.json.template @@ -12,7 +12,7 @@ }, "binaryDependencies": { "org.zowe.zlux.zlux-core": { - "version": "^3.0.0-V3.X-STAGING-ZLUX-CORE", + "version": "3.0.0-938-v3.x-staging-zlux-build", "artifact": "*.pax" }, "org.zowe.zlux.sample-angular-app": { From bc4421ba09a3ed2dbf189a3a00798891b416da60 Mon Sep 17 00:00:00 2001 From: 1000TurquoisePogs Date: Thu, 29 Aug 2024 14:25:29 +0200 Subject: [PATCH 02/24] Set v3 configmgr defaults Signed-off-by: 1000TurquoisePogs --- example-zowe.yaml | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-) diff --git a/example-zowe.yaml b/example-zowe.yaml index 812f46b7b5..811f07c67c 100644 --- a/example-zowe.yaml +++ b/example-zowe.yaml @@ -292,22 +292,10 @@ zowe: # Where extensions are installed extensionDirectory: /global/zowe/extensions - # **COMMONLY_CUSTOMIZED** - useConfigmgr: true - # Setting to true will enable: - # * 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):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: - # name: ${{ zowe.job.prefix }}SV - # prefix: ZWE1 configmgr: # STRICT=quit on any error, including missing schema # COMPONENT-COMPAT=if component missing schema, skip it with warning instead of quit - validation: "COMPONENT-COMPAT" + validation: "STRICT" # >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> # runtime z/OS job name From 8d546b03f5e9f840b9ae2262a057a29bcfb2650c Mon Sep 17 00:00:00 2001 From: Leanid Astrakou Date: Thu, 5 Sep 2024 13:08:10 -0400 Subject: [PATCH 03/24] Intentional nothing change Signed-off-by: Leanid Astrakou --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 6b389b95fd..29203e277b 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# zowe-install-packaging +# zowe-install-packaging This repository includes Zowe installation script and pipelines to build Zowe. From 58f0956bfef7b08a52d3b7bc95eb01a49e7aea90 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pablo=20Hern=C3=A1n=20Carle?= Date: Fri, 20 Sep 2024 09:13:54 +0200 Subject: [PATCH 04/24] update defaults, zaas enabled by default MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Pablo Hernán Carle --- files/defaults.yaml | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/files/defaults.yaml b/files/defaults.yaml index eed7339508..9020e6f634 100644 --- a/files/defaults.yaml +++ b/files/defaults.yaml @@ -160,17 +160,10 @@ components: provider: "" x509: enabled: false - server: - internal: - # gateway supports internal connector - enabled: false - port: 7550 - ssl: - enabled: false # >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> zaas: - enabled: false + enabled: true port: 7558 debug: false From e897a0bc95ae72a24f16fda006b17932e8759a27 Mon Sep 17 00:00:00 2001 From: MarkAckert Date: Fri, 20 Sep 2024 12:00:34 -0400 Subject: [PATCH 05/24] update defaults to match example-zowe.yaml Signed-off-by: MarkAckert --- files/defaults.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/files/defaults.yaml b/files/defaults.yaml index 9020e6f634..94cd675cdf 100644 --- a/files/defaults.yaml +++ b/files/defaults.yaml @@ -157,7 +157,7 @@ components: authorization: endpoint: enabled: false - provider: "" + provider: "native" x509: enabled: false From eee5927470d3885e834086fe77ab436f4a5e8930 Mon Sep 17 00:00:00 2001 From: MarkAckert Date: Fri, 20 Sep 2024 12:01:17 -0400 Subject: [PATCH 06/24] update zowe explorer vscode tag (fix automation) 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 6194230ca9..412befcf93 100644 --- a/manifest.json.template +++ b/manifest.json.template @@ -336,7 +336,7 @@ "componentGroup": "Zowe Visual Studio Code Extension", "entries": [{ "repository": "zowe-explorer-vscode", - "tag": "next", + "tag": "main", "destinations": ["Visual Studio Code Marketplace"] }] }, From b9cecbe9075cc4863f2cbdd34ee7583af844f183 Mon Sep 17 00:00:00 2001 From: MarkAckert Date: Fri, 20 Sep 2024 16:28:02 -0400 Subject: [PATCH 07/24] pswi automation user/email Signed-off-by: MarkAckert --- .github/workflows/pswi-zowe-config-test.yml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/.github/workflows/pswi-zowe-config-test.yml b/.github/workflows/pswi-zowe-config-test.yml index 96d666ba34..0d25066436 100644 --- a/.github/workflows/pswi-zowe-config-test.yml +++ b/.github/workflows/pswi-zowe-config-test.yml @@ -22,6 +22,14 @@ jobs: - name: '[Prep 1] Checkout' uses: actions/checkout@v4 + # Taken from shared-actions/prepare-workflow + - name: 'export github username and email' + run: | + git config --global user.name ${{ github.actor }} + echo ${{ github.actor }} + git config --global user.email dummy-email@email.com + shell: bash + - name: '[PSI-LOCK] Lock marist servers to build PSWI' uses: zowe-actions/shared-actions/lock-resource@main with: From 9d5f0fd1f94cb06319ef3dccaacfb996acc39f31 Mon Sep 17 00:00:00 2001 From: mm667937 Date: Mon, 23 Sep 2024 16:45:43 +0200 Subject: [PATCH 08/24] making sure ZOSMF_USER is in uppercase Signed-off-by: mm667937 --- pswi/PSWI-marist.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pswi/PSWI-marist.sh b/pswi/PSWI-marist.sh index 67fcedf490..40ed0a8014 100755 --- a/pswi/PSWI-marist.sh +++ b/pswi/PSWI-marist.sh @@ -3,11 +3,11 @@ export ZOSMF_URL="https://zzow07.zowe.marist.cloud" export ZOSMF_PORT=10443 export ZOSMF_SYSTEM="S0W1" export DIR="/u/${ZOSMF_USER,,}" -export SMPEHLQ="${ZOSMF_USER}" -export TMP_ZFS="${ZOSMF_USER}.TMP.ZFS" +export SMPEHLQ="${ZOSMF_USER^^}" +export TMP_ZFS="${ZOSMF_USER^^}.TMP.ZFS" export ZOWE_MOUNT="/u/zwe/zowe-smpe/" export VOLUME="ZOS003" -export TEST_HLQ="${ZOSMF_USER}.PSWIT" +export TEST_HLQ="${ZOSMF_USER^^}.PSWIT" export SYSAFF="(S0W1)" export ACCOUNT=1 @@ -30,7 +30,7 @@ export TMP_MOUNT="${DIR}/zowe-tmp" export TEST_MOUNT="${DIR}/test_mount" export EXPORT="${TMP_MOUNT}/export/" export WORK_MOUNT="${DIR}/work" -export WORK_ZFS="${ZOSMF_USER}.WORK.ZFS" +export WORK_ZFS="${ZOSMF_USER^^}.WORK.ZFS" export ZOSMF_V="2.3" export SMPE_WF_NAME="ZOWE_SMPE_WF" export PTF_WF_NAME="ZOWE_PTF_WF" From 2ff5b01aa33327d530229fe6dbc295c714dfa704 Mon Sep 17 00:00:00 2001 From: mm667937 Date: Mon, 23 Sep 2024 17:26:40 +0200 Subject: [PATCH 09/24] putting ZOSMF_USER in plain text into pswi creation 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 40ed0a8014..5a9e03bfa7 100755 --- a/pswi/PSWI-marist.sh +++ b/pswi/PSWI-marist.sh @@ -2,12 +2,12 @@ set -x export ZOSMF_URL="https://zzow07.zowe.marist.cloud" export ZOSMF_PORT=10443 export ZOSMF_SYSTEM="S0W1" -export DIR="/u/${ZOSMF_USER,,}" -export SMPEHLQ="${ZOSMF_USER^^}" -export TMP_ZFS="${ZOSMF_USER^^}.TMP.ZFS" +export DIR="/u/zowead2" +export SMPEHLQ="ZOWEAD2" +export TMP_ZFS="ZOWEAD2.TMP.ZFS" export ZOWE_MOUNT="/u/zwe/zowe-smpe/" export VOLUME="ZOS003" -export TEST_HLQ="${ZOSMF_USER^^}.PSWIT" +export TEST_HLQ="ZOWEAD2.PSWIT" export SYSAFF="(S0W1)" export ACCOUNT=1 @@ -30,7 +30,7 @@ export TMP_MOUNT="${DIR}/zowe-tmp" export TEST_MOUNT="${DIR}/test_mount" export EXPORT="${TMP_MOUNT}/export/" export WORK_MOUNT="${DIR}/work" -export WORK_ZFS="${ZOSMF_USER^^}.WORK.ZFS" +export WORK_ZFS="ZOWEAD2.WORK.ZFS" export ZOSMF_V="2.3" export SMPE_WF_NAME="ZOWE_SMPE_WF" export PTF_WF_NAME="ZOWE_PTF_WF" From 6f8ecc872b797ebe386b55e1c7b8774a1e4c3fd8 Mon Sep 17 00:00:00 2001 From: Leanid Astrakou Date: Tue, 24 Sep 2024 00:05:50 -0400 Subject: [PATCH 10/24] Added changelog update Signed-off-by: Leanid Astrakou --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 79928168c0..b2c4502bd5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,6 +10,7 @@ All notable changes to the Zowe Installer will be documented in this file. ### New features and enhancements - Enhancement: Added explanation to possible error message when checking z/OSMF setting. [#3956](https://github.com/zowe/zowe-install-packaging/pull/3956) +- Enhancement: New plugin identifier added to list of plugins and `allowedPlugins.json` for the new V3 Desktop in Angular 18. [#3984](https://github.com/zowe/zowe-install-packaging/pull/3984) From adee48e930a952662452428a55ed3216ed33c984 Mon Sep 17 00:00:00 2001 From: Martin Zeithaml <66114686+Martin-Zeithaml@users.noreply.github.com> Date: Tue, 24 Sep 2024 09:45:53 +0200 Subject: [PATCH 11/24] Clarify sysMessages 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 a1c235e1e1..869c0d407c 100644 --- a/example-zowe.yaml +++ b/example-zowe.yaml @@ -379,7 +379,7 @@ zowe: # >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> # 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. + # system log upon its logging, truncated to 126 characters (wildcards are not supported). sysMessages: # # Zowe starting - "ZWEL0021I" From 40602963738daebca06413609ec2b4b9ad751df9 Mon Sep 17 00:00:00 2001 From: James Struga Date: Tue, 24 Sep 2024 09:39:34 -0400 Subject: [PATCH 12/24] Update explorers 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 6194230ca9..93de059e8c 100644 --- a/manifest.json.template +++ b/manifest.json.template @@ -44,16 +44,16 @@ "artifact": "*.pax" }, "org.zowe.explorer-jes": { - "version": "~2.0.2-SNAPSHOT" + "version": "^3.0.0-SNAPSHOT" }, "org.zowe.explorer-mvs": { - "version": "~2.0.2-SNAPSHOT" + "version": "^3.0.0-SNAPSHOT" }, "org.zowe.explorer-uss": { - "version": "~2.0.2-SNAPSHOT" + "version": "^3.0.0-SNAPSHOT" }, "org.zowe.explorer-ip": { - "version": "~3.0.0-SNAPSHOT", + "version": "^3.0.0-SNAPSHOT", "artifact": "*.pax" }, "org.zowe.apiml.api-catalog-package": { From c11e0f259543aca8d2be189f8871b5112620b639 Mon Sep 17 00:00:00 2001 From: James Struga Date: Tue, 24 Sep 2024 09:44:24 -0400 Subject: [PATCH 13/24] Update manifest.json.template 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 93de059e8c..ccd79e8e3a 100644 --- a/manifest.json.template +++ b/manifest.json.template @@ -44,10 +44,10 @@ "artifact": "*.pax" }, "org.zowe.explorer-jes": { - "version": "^3.0.0-SNAPSHOT" + "version": "^3.0.0-PR-389" }, "org.zowe.explorer-mvs": { - "version": "^3.0.0-SNAPSHOT" + "version": "^3.0.0-PR-263" }, "org.zowe.explorer-uss": { "version": "^3.0.0-SNAPSHOT" From 5e6114c23b90052303ce2b54c0a4b690160c91a5 Mon Sep 17 00:00:00 2001 From: Martin Zeithaml Date: Wed, 25 Sep 2024 14:54:56 +0200 Subject: [PATCH 14/24] Minor mkdirp update Signed-off-by: Martin Zeithaml --- bin/libs/fs.ts | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/bin/libs/fs.ts b/bin/libs/fs.ts index 144fe461a0..632bb2cbd7 100644 --- a/bin/libs/fs.ts +++ b/bin/libs/fs.ts @@ -66,15 +66,17 @@ export function resolvePath(...parts:string[]): string { } export function mkdirp(path:string, mode?: number): number { + if (!path) { + return 1; + } let paths: string[] = []; let parts = path.split('/'); let currentPath = ''; parts.forEach((part:string)=> { - currentPath+='/'+part; - if (currentPath.startsWith('//')) { - currentPath = currentPath.substring(1); + if (part) { + currentPath += '/' + part; + paths.push(currentPath); } - paths.push(currentPath); }); let firstMissingDir: number; @@ -85,9 +87,9 @@ export function mkdirp(path:string, mode?: number): number { } } - common.printDebug('paths='+JSON.stringify(paths)); + common.printDebug('fs.mkdir paths='+JSON.stringify(paths)); if (firstMissingDir >= paths.length) { return 0; } - common.printDebug('firstMissingDir='+paths[firstMissingDir]); + common.printDebug('fs.mkdir firstMissingDir='+paths[firstMissingDir]); for (let i = firstMissingDir; i < paths.length; i++) { let rc = os.mkdir(paths[i], mode ? mode : 0o777); From 7d86bd2b96753b1c02f1eeea299869c089df8558 Mon Sep 17 00:00:00 2001 From: James Struga Date: Wed, 25 Sep 2024 14:54:53 -0400 Subject: [PATCH 15/24] Update staging 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 2311a20676..b4ba678504 100644 --- a/manifest.json.template +++ b/manifest.json.template @@ -44,10 +44,10 @@ "artifact": "*.pax" }, "org.zowe.explorer-jes": { - "version": "^3.0.0-PR-389" + "version": "^3.0.0-SNAPSHOT" }, "org.zowe.explorer-mvs": { - "version": "^3.0.0-PR-263" + "version": "^3.0.0-SNAPSHOT" }, "org.zowe.explorer-uss": { "version": "^3.0.0-SNAPSHOT" @@ -109,7 +109,7 @@ "artifact": "*.pax" }, "org.zowe.launcher": { - "version": "^2.0.0-STAGING" + "version": "^3.0.0-STAGING" }, "org.zowe.keyring-utilities": { "version": "1.0.4", From a942fc5a897ca30b330c8ba089d4f00b3d80d81b Mon Sep 17 00:00:00 2001 From: mm667937 Date: Thu, 26 Sep 2024 10:57:46 +0200 Subject: [PATCH 16/24] small workflow fix - delete unused variable, fix version, added auto choice for jwt autoconfig Signed-off-by: mm667937 --- pswi/03_create.sh | 2 +- pswi/scripts/deploy_test_2_3.py | 4 ++-- workflows/files/ZWECONF.properties | 12 ++---------- workflows/files/ZWECONF.xml | 13 +------------ 4 files changed, 6 insertions(+), 25 deletions(-) diff --git a/pswi/03_create.sh b/pswi/03_create.sh index 724ab7ad61..6feb2d56a7 100644 --- a/pswi/03_create.sh +++ b/pswi/03_create.sh @@ -28,7 +28,7 @@ echo "z/OSMF version :" $ZOSMF_V # JSONs ADD_SWI_JSON='{"name":"'${SWI_NAME}'","system":"'${ZOSMF_SYSTEM}'","description":"ZOWE v'${VERSION}' Portable Software Instance", "globalzone":"'${GLOBAL_ZONE}'","targetzones":["'${TZONE}'"],"workflows":[{"name":"ZOWE Mount Workflow","description":"This workflow performs mount action of ZOWE zFS.", -"location": {"dsname":"'${WORKFLOW_DSN}'(ZWEWRF02)"}},{"name":"ZOWE Configuration of Zowe 2.0","description":"This workflow configures Zowe v2.0.", +"location": {"dsname":"'${WORKFLOW_DSN}'(ZWEWRF02)"}},{"name":"ZOWE Configuration of Zowe 3.0","description":"This workflow configures Zowe v3.0.", "location": {"dsname":"'${WORKFLOW_DSN}'(ZWECONF)"}},{"name":"ZOWE Creation of CSR request workflow","description":"This workflow creates a certificate sign request.", "location": {"dsname":"'${WORKFLOW_DSN}'(ZWECRECR)"}},{"name":"ZOWE Sign a CSR request","description":"This workflow signs the certificate sign request by a local CA.", "location": {"dsname":"'${WORKFLOW_DSN}'(ZWESIGNC)"}},{"name":"ZOWE Load Authentication Certificate into ESM","description":"This workflow loads a signed client authentication certificate to the ESM.", diff --git a/pswi/scripts/deploy_test_2_3.py b/pswi/scripts/deploy_test_2_3.py index f06a631379..7163577ce5 100644 --- a/pswi/scripts/deploy_test_2_3.py +++ b/pswi/scripts/deploy_test_2_3.py @@ -196,8 +196,8 @@ def create_swi(self): {"name": "ZOWE Mount Workflow", "description": "This workflow performs mount action of ZOWE zFS.", "location": {"dsname": self.hlq + ".WORKFLOW(ZWEWRF02)"}}, - {"name": "ZOWE Configuration of Zowe 2.0", - "description": "This workflow configures Zowe v2.0.", + {"name": "ZOWE Configuration of Zowe 3.0", + "description": "This workflow configures Zowe v3.0.", "location": {"dsname": self.hlq + ".WORKFLOW(ZWECONF)"}}, {"name":"ZOWE Creation of CSR request workflow", "description":"This workflow creates a certificate sign request.", diff --git a/workflows/files/ZWECONF.properties b/workflows/files/ZWECONF.properties index ccf3efc3a8..8a90b767d2 100644 --- a/workflows/files/ZWECONF.properties +++ b/workflows/files/ZWECONF.properties @@ -407,7 +407,7 @@ components_gateway_apiml_security_auth_provider=zosmf # Category: components # Description: # JWT auto configuration for gateway security auth -# Choices: jwt,ltpa +# Choices: jwt,ltpa,auto components_gateway_apiml_security_auth_zosmf_jwtAutoconfiguration=jwt # components_gateway_apiml_security_auth_zosmf_serviceId @@ -612,14 +612,6 @@ components_zss_port=7557 # Name for the ZSS cross memory server components_zss_crossMemoryServerName=ZWESIS_STD -# components_zss_tls -# Label: ZSS TLS -# Abstract: Check this to enable TLS on ZSS -# Category: components -# Description: -# 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 @@ -774,4 +766,4 @@ zowe_setup_security_stcs_aux=ZWESASTC # Check this option to enable the optional workflow step with zwe install command. After Zowe convenience build is extracted, # you can enable this flag to run the zwe install command to install MVS data sets within this workflow run. # This option is for convenience build only. SMP/E installs the MVS data sets during installation. -zowe_setup_installStep_enabled=false \ No newline at end of file +zowe_setup_installStep_enabled=false diff --git a/workflows/files/ZWECONF.xml b/workflows/files/ZWECONF.xml index b9a54cde87..9d3c51040f 100644 --- a/workflows/files/ZWECONF.xml +++ b/workflows/files/ZWECONF.xml @@ -588,6 +588,7 @@ How we want to verify SSL certificates of services. Valid values are: jwt ltpa + auto jwt @@ -867,17 +868,6 @@ How we want to verify SSL certificates of services. Valid values are: ZWESIS_STD - - - Check this to enable TLS on ZSS - Check this to enable TLS on ZSS - components - - - - true - - Check this to enable fallback @@ -1419,7 +1409,6 @@ How we want to verify SSL certificates of services. Valid values are: - Run this step to specify the values for the ZSS variables From 57ca44cc02f534a2b87d8c81379a12e26fdd50d8 Mon Sep 17 00:00:00 2001 From: mm667937 Date: Thu, 26 Sep 2024 14:11:14 +0200 Subject: [PATCH 17/24] Changes in workflow based on changes in example-zowe.yaml Signed-off-by: mm667937 --- workflows/files/ZWECONF.properties | 10 +--------- workflows/files/ZWECONF.xml | 26 +------------------------- 2 files changed, 2 insertions(+), 34 deletions(-) diff --git a/workflows/files/ZWECONF.properties b/workflows/files/ZWECONF.properties index 8a90b767d2..ea680bc7d1 100644 --- a/workflows/files/ZWECONF.properties +++ b/workflows/files/ZWECONF.properties @@ -652,14 +652,6 @@ components_explorer_mvs_enabled=true # Check this option to enable the USS explorer. components_explorer_uss_enabled=true -# useconfig_manager_enabled -# Label: Enable Zowe configuration manager -# Abstract: Check this option to enable Zowe configuration manager -# Category: configManager -# Description: -# Check this option to enable Zowe configuration manager. -useconfig_manager_enabled=true - # config_manager_validation # Label: Zowe configuration manager validation type # Abstract: STRICT or COMPONENT-COMPAT validation type @@ -667,7 +659,7 @@ useconfig_manager_enabled=true # 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 +config_manager_validation=STRICT # zowe_rbacProfileId # Label: Zowe Profile Identifier diff --git a/workflows/files/ZWECONF.xml b/workflows/files/ZWECONF.xml index 9d3c51040f..e516120fad 100644 --- a/workflows/files/ZWECONF.xml +++ b/workflows/files/ZWECONF.xml @@ -923,17 +923,6 @@ How we want to verify SSL certificates of services. Valid values are: true - - - Check this option to enable Zowe configuration manager - Check this option to enable Zowe configuration manager. - configManager - - - - true - - STRICT or COMPONENT-COMPAT validation type @@ -944,7 +933,7 @@ How we want to verify SSL certificates of services. Valid values are: COMPONENT-COMPAT STRICT - COMPONENT-COMPAT + STRICT @@ -1145,7 +1134,6 @@ How we want to verify SSL certificates of services. Valid values are: - @@ -1745,18 +1733,6 @@ echo ' # **COMMONLY_CUSTOMIZED**' >> "${instance-zowe_runtimeDirectory}/zowe.ya echo ' # Where extensions are installed' >> "${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" From 0b860858463625e6f31528a5e0004be7c3af9fb4 Mon Sep 17 00:00:00 2001 From: mm667937 Date: Thu, 26 Sep 2024 15:09:51 +0200 Subject: [PATCH 18/24] line numbers changed Signed-off-by: mm667937 --- pswi/scripts/base_diff.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pswi/scripts/base_diff.txt b/pswi/scripts/base_diff.txt index d23d5ebdc1..ad4425a61f 100644 --- a/pswi/scripts/base_diff.txt +++ b/pswi/scripts/base_diff.txt @@ -1,7 +1,7 @@ -483c +471c home: "#delete_me#" . -468c +456c home: "#delete_me#" . 281c From 20acfba56b055bcf7a04ae04dce0f45bcb04a0e0 Mon Sep 17 00:00:00 2001 From: mm667937 Date: Thu, 26 Sep 2024 15:20:53 +0200 Subject: [PATCH 19/24] misunderstanding about auto jwt Signed-off-by: mm667937 --- workflows/files/ZWECONF.properties | 2 +- workflows/files/ZWECONF.xml | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/workflows/files/ZWECONF.properties b/workflows/files/ZWECONF.properties index ea680bc7d1..be0fd50ae0 100644 --- a/workflows/files/ZWECONF.properties +++ b/workflows/files/ZWECONF.properties @@ -407,7 +407,7 @@ components_gateway_apiml_security_auth_provider=zosmf # Category: components # Description: # JWT auto configuration for gateway security auth -# Choices: jwt,ltpa,auto +# Choices: jwt,ltpa components_gateway_apiml_security_auth_zosmf_jwtAutoconfiguration=jwt # components_gateway_apiml_security_auth_zosmf_serviceId diff --git a/workflows/files/ZWECONF.xml b/workflows/files/ZWECONF.xml index e516120fad..db0a2ce898 100644 --- a/workflows/files/ZWECONF.xml +++ b/workflows/files/ZWECONF.xml @@ -588,7 +588,6 @@ How we want to verify SSL certificates of services. Valid values are: jwt ltpa - auto jwt @@ -1974,7 +1973,7 @@ echo ' security:' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" echo ' auth:' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" echo ' provider: zosmf' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" echo ' zosmf:' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" -echo ' jwtAutoconfiguration: auto' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" +echo ' jwtAutoconfiguration: jwt' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" echo ' serviceId: ibmzosmf' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" echo ' authorization:' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" echo ' endpoint:' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" From 06535b5d9c7670675ff96fdffd34c1a4a49bb178 Mon Sep 17 00:00:00 2001 From: Martin Zeithaml <66114686+Martin-Zeithaml@users.noreply.github.com> Date: Thu, 26 Sep 2024 15:26:58 +0200 Subject: [PATCH 20/24] ZWEV2 to ZWEV3 Signed-off-by: Martin Zeithaml <66114686+Martin-Zeithaml@users.noreply.github.com> --- example-zowe.yaml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/example-zowe.yaml b/example-zowe.yaml index 79aec60b1b..5cb1ec46f8 100644 --- a/example-zowe.yaml +++ b/example-zowe.yaml @@ -40,27 +40,27 @@ zowe: dataset: # **COMMONLY_CUSTOMIZED** # where Zowe MVS data sets will be installed - prefix: IBMUSER.ZWEV2 + prefix: IBMUSER.ZWEV3 # **COMMONLY_CUSTOMIZED** # PROCLIB where Zowe STCs will be copied over proclib: USER.PROCLIB # **COMMONLY_CUSTOMIZED** # Zowe PARMLIB - parmlib: IBMUSER.ZWEV2.CUST.PARMLIB + parmlib: IBMUSER.ZWEV3.CUST.PARMLIB # Holds Zowe PARMLIB members for plugins parmlibMembers: # For ZIS plugins zis: ZWESIP00 # **COMMONLY_CUSTOMIZED** # JCL library where Zowe will store temporary JCLs during initialization - jcllib: IBMUSER.ZWEV2.CUST.JCLLIB + jcllib: IBMUSER.ZWEV3.CUST.JCLLIB # Utilities for use by Zowe and extensions - loadlib: IBMUSER.ZWEV2.SZWELOAD + loadlib: IBMUSER.ZWEV3.SZWELOAD # APF authorized LOADLIB for Zowe - authLoadlib: IBMUSER.ZWEV2.SZWEAUTH + authLoadlib: IBMUSER.ZWEV3.SZWEAUTH # **COMMONLY_CUSTOMIZED** # APF authorized LOADLIB for Zowe ZIS Plugins - authPluginLib: IBMUSER.ZWEV2.CUST.ZWESAPL + authPluginLib: IBMUSER.ZWEV3.CUST.ZWESAPL # >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> # # Security related configurations. This setup is optional. From 495746027c552f12194921c95835a27aaac9e23d Mon Sep 17 00:00:00 2001 From: pz636264 Date: Fri, 27 Sep 2024 14:02:24 +0200 Subject: [PATCH 21/24] category fix for TLS variable Signed-off-by: pz636264 --- workflows/files/ZWECONF.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/workflows/files/ZWECONF.xml b/workflows/files/ZWECONF.xml index db0a2ce898..d6fb790207 100644 --- a/workflows/files/ZWECONF.xml +++ b/workflows/files/ZWECONF.xml @@ -294,7 +294,7 @@ some use cases, like containerization, this port could be different. - certificates + network TLSv1.1 From c0caf0ce8e4ac31b16a606b02e0d6b9ac6e4736e Mon Sep 17 00:00:00 2001 From: 1000TurquoisePogs Date: Fri, 27 Sep 2024 21:47:18 +0200 Subject: [PATCH 22/24] Update manifest.json.template Signed-off-by: 1000TurquoisePogs --- manifest.json.template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.json.template b/manifest.json.template index ba87fc868d..b4ba678504 100644 --- a/manifest.json.template +++ b/manifest.json.template @@ -12,7 +12,7 @@ }, "binaryDependencies": { "org.zowe.zlux.zlux-core": { - "version": "3.0.0-938-v3.x-staging-zlux-build", + "version": "^3.0.0-V3.X-STAGING-ZLUX-CORE", "artifact": "*.pax" }, "org.zowe.zlux.sample-angular-app": { From 66ce46d42c8758599cb9511a6ffb220a75a8739a Mon Sep 17 00:00:00 2001 From: 1000TurquoisePogs Date: Mon, 30 Sep 2024 19:51:01 +0200 Subject: [PATCH 23/24] Update defaults.yaml to example-zowe.yaml Signed-off-by: 1000TurquoisePogs --- files/defaults.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/files/defaults.yaml b/files/defaults.yaml index 94cd675cdf..8e319ea090 100644 --- a/files/defaults.yaml +++ b/files/defaults.yaml @@ -88,7 +88,7 @@ zowe: configmgr: # STRICT=quit on any error, including missing schema # COMPONENT-COMPAT=if component missing schema, skip it with warning instead of quit - validation: "COMPONENT-COMPAT" + validation: "STRICT" # >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> # runtime z/OS job name From 57ed0fa9f636ae2ccd7c240f367de29ecc9a936d Mon Sep 17 00:00:00 2001 From: 1000TurquoisePogs Date: Tue, 1 Oct 2024 20:38:30 +0200 Subject: [PATCH 24/24] Update CHANGELOG.md for breaking changes Signed-off-by: 1000TurquoisePogs --- CHANGELOG.md | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index b2c4502bd5..c4a3636231 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,7 +6,10 @@ All notable changes to the Zowe Installer will be documented in this file. ### Breaking Changes -- `zowe.yaml` changed its default z/OSMF Service ID definition from `zosmf` to `ibmzosmf`, which may impact Zowe Clients. For more information on this change, please see the API Mediation Layer's 3.0.0 Breaking Changes. +- The Zowe YAML now requires the `zaas` component for the API Mediation Layer to work. See example-zowe.yaml for new component values. +- The Zowe YAML attribute `components.gateway.apiml.security.auth.zosmf.serviceId` for the “gateway” component has changed from “zosmf” to “ibmzosmf”. This may impact Zowe Clients. See example-zowe.yaml for new component values. For more information on this change, please see the API Mediation Layer's 3.0.0 Breaking Changes. +- The Zowe YAML parameter `components.gateway.apiml.security.auth.zosmf.jwtAutoconfiguration` for the “gateway” component has changed. The value “auto” is no longer allowed, and you must choose either the default of “jwt” or “ltpa” depending on if your z/OSMF is set up for JWT use as recommended See example-zowe.yaml for new component values. For more information on this change, please see the API Mediation Layer's 3.0.0 Breaking Changes. + ### New features and enhancements - Enhancement: Added explanation to possible error message when checking z/OSMF setting. [#3956](https://github.com/zowe/zowe-install-packaging/pull/3956)