Merge branch 'v3.x/staging' into v3.x/feature/checkFSforNOSUID

.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 [email protected]
+        shell: bash
+
       - name: '[PSI-LOCK] Lock marist servers to build PSWI'
         uses: zowe-actions/shared-actions/lock-resource@main
         with:

CHANGELOG.md

@@ -9,10 +9,14 @@ 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)
+- 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)
 
 <!--Add the PR or issue number to the entry if available.-->
 

README.md

@@ -1,4 +1,4 @@
-# zowe-install-packaging
+# zowe-install-packaging 
 
 This repository includes Zowe installation script and pipelines to build Zowe.
 

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);

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.
@@ -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
@@ -379,7 +367,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"

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
@@ -157,20 +157,13 @@ components:
         authorization:
           endpoint:
             enabled: false
-          provider: ""
+          provider: "native"
         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
 

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": ["*"]
@@ -60,10 +52,6 @@
       "identifier": "org.zowe.zlux.ng2desktop.settings",
       "versions": ["*"]
     },
-    {
-      "identifier": "org.zowe.zlux.proxy.zosmf",
-      "versions": ["*"]
-    },
     {
       "identifier": "org.zowe.zlux.sample.angular",
       "versions": ["*"]
@@ -76,10 +64,6 @@
       "identifier": "org.zowe.zlux.sample.iframe",
       "versions": ["*"]
     },
-    {
-      "identifier": "org.zowe.zosmf.workflows",
-      "versions": ["*"]
-    },
     {
       "identifier": "org.openmainframe.zowe.workshop-starter",
       "versions": ["*"]

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": {
@@ -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",
@@ -336,7 +336,7 @@
       "componentGroup": "Zowe Visual Studio Code Extension",
       "entries": [{
         "repository": "zowe-explorer-vscode",
-        "tag": "next",
+        "tag": "main",
         "destinations": ["Visual Studio Code Marketplace"]
       }]
     },

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.",

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"

pswi/scripts/base_diff.txt

@@ -1,7 +1,7 @@
-483c
+471c
   home: "#delete_me#"
 .
-468c
+456c
   home: "#delete_me#"
 .
 281c

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.",