Merge branch 'v3.x/staging' into chore/v3/configmgr

.github/workflows/build-packaging.yml

@@ -353,8 +353,8 @@ jobs:
           jfrog rt dl ${{github.event.inputs.PSWI_SMPE_AZWE_ARTIFACTORY_PATH}}/AZWE002*.zip --flat=true .pax/AZWE002.zip
           jfrog rt dl ${{github.event.inputs.PSWI_SMPE_ARTIFACTORY_PATH}}/zowe-smpe-*.zip --flat=true .pax/zowe-smpe.zip
 
-
       - name: '[SMPE Pax 4] Build PSWI'
+        id: pswi
         if: env.INPUTS_BUILD_PSWI == 'true'
         timeout-minutes: 60
         run: |
@@ -367,6 +367,14 @@ jobs:
           ZZOW_SSH_PORT: ${{ secrets.SSH_MARIST_ALLSYS_PORT }}
           VERSION: ${{ env.P_VERSION }}
 
+      - name: Store PSWI folder
+        uses: actions/upload-artifact@v4
+        if: env.INPUTS_BUILD_PSWI == 'true' && failure()
+        with:
+          name: pswi-folder
+          path: |
+            pswi/**
+
       - name: '[K8S] Build Kubernetes'
         timeout-minutes: 10
         if: env.INPUTS_BUILD_KUBERNETES == 'true'

.github/workflows/cicd-test.yml

@@ -1,4 +1,11 @@
 name: Zowe CICD Integration Tests
+
+permissions:
+  contents: write
+  issues: write
+  pull-requests: write
+  statuses: write
+
 on:   
   workflow_dispatch:
     inputs:

.github/workflows/pswi-zowe-config-test.yml

@@ -0,0 +1,60 @@
+name: PSWI zowe.yaml sync check
+
+permissions:
+  id-token: write
+  issues: write
+  pull-requests: write
+  contents: write
+
+on:
+  push:
+    branches:
+      - v3.x/staging 
+  pull_request:
+    types: [opened, synchronize]
+  workflow_dispatch:
+
+jobs:
+  test-pswi-zowe-yaml:
+    runs-on: ubuntu-latest
+    steps:
+
+      - 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:
+          lock-repository: ${{ github.repository }}
+          github-token: ${{ secrets.GITHUB_TOKEN }}
+          lock-resource-name: zowe-psi-build-zzow07-lock
+          lock-avg-retry-interval: 30
+
+      - name: 'Test ZWECONF workflow'
+        id: zweconf
+        timeout-minutes: 30
+        run: |
+          cd pswi
+          ./ZWECONF_test.sh
+        env:
+          ZOSMF_USER: ${{ secrets.ZOWE_PSWI_BUILD_USR }}
+          ZOSMF_PASS: ${{ secrets.ZOWE_PSWI_BUILD_PASSWD }}
+          ZZOW_SSH_PORT: ${{ secrets.SSH_MARIST_ALLSYS_PORT }}
+
+      - name: Store test output
+        uses: actions/upload-artifact@v4
+        if: steps.zweconf.outcome != '' && failure()
+        with:
+          name: zweconf_test
+          path: |
+            pswi/**.txt
+            pswi/zowe_.yaml
+            pswi/ZWECONF1/**

CHANGELOG.md

@@ -8,6 +8,10 @@ All notable changes to the Zowe Installer will be documented in this file.
 
 - `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.
 
+### 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.-->
 
 ## `2.17.0`

README.md

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

bin/commands/internal/start/prepare/index.sh

@@ -144,9 +144,13 @@ global_validate() {
   if [ -n "${ZOSMF_HOST}" -a -n "${ZOSMF_PORT}" ]; then
     if [[ ${ZWE_ENABLED_COMPONENTS} == *"discovery"* ]]; then
       validate_this "validate_zosmf_host_and_port \"${ZOSMF_HOST}\" \"${ZOSMF_PORT}\" 2>&1" "zwe-internal-start-prepare,global_validate:${LINENO}"
+    else
+      if [ "${ZWE_components_gateway_apiml_security_auth_provider}" = "zosmf" ]; then
+        let "ZWE_PRIVATE_ERRORS_FOUND=${ZWE_PRIVATE_OLD_ERRORS_FOUND}+1"
+        print_error "Using z/OSMF as 'components.gateway.apiml.security.auth.provider' is not possible: discovery is disabled."
+        print_formatted_info "ZWELS" "zwe-internal-start-prepare,global_validate:${LINENO}" "Zosmf validation failed"
+      fi
     fi
-  elif [ "${ZWE_components_zaas_apiml_security_auth_provider}" = "zosmf" ]; then
-    validate_this "validate_zosmf_as_auth_provider \"${ZOSMF_HOST}\" \"${ZOSMF_PORT}\" \"${ZWE_components_zaas_apiml_security_auth_provider}\" 2>&1" "zwe-internal-start-prepare,global_validate:${LINENO}"
   fi
 
   check_runtime_validation_result "zwe-internal-start-prepare,global_validate:${LINENO}"

bin/commands/internal/start/prepare/index.ts

@@ -3,9 +3,9 @@
   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.
 */
 
@@ -75,7 +75,7 @@ function prepareLogDirectory() {
   if (logDir) {
     os.mkdir(logDir, 0o750);
     if (!fs.isDirectoryWritable(logDir)) {
-      common.printFormattedError("ZWELS", "zwe-internal-start-prepare,prepare_log_directory", `ZWEL0141E: User $(get_user_id) does not have write permission on ${logDir}.`);
+      common.printFormattedError("ZWELS", "zwe-internal-start-prepare,prepare_log_directory", `ZWEL0141E: User ${user} does not have write permission on ${logDir}.`);
       std.exit(141);
     }
   }
@@ -172,12 +172,10 @@ function globalValidate(enabledComponents:string[]): void {
         privateErrors++;
         common.printFormattedError('ZWELS', "zwe-internal-start-prepare,global_validate", "Zosmf validation failed");
       }
-    } else if (std.getenv('ZWE_components_zaas_apiml_security_auth_provider') == "zosmf") {
-      let zosmfOk = zosmf.validateZosmfAsAuthProvider(zosmfHost, zosmfPort, 'zosmf');
-      if (!zosmfOk) {
+    } else if (std.getenv('ZWE_components_gateway_apiml_security_auth_provider') == "zosmf") {
         privateErrors++;
+        common.printError("Using z/OSMF as 'components.gateway.apiml.security.auth.provider' is not possible: discovery is disabled.");
         common.printFormattedError('ZWELS', "zwe-internal-start-prepare,global_validate", "Zosmf validation failed");
-      }
     }
   }
 
@@ -195,7 +193,7 @@ function validateComponents(enabledComponents:string[]): any {
   common.printFormattedInfo("ZWELS", "zwe-internal-start-prepare,validate_components", "process component validations ...");
 
   const componentEnvironments = {};
-  
+
   // reset error counter
   let privateErrors = 0;
   std.setenv('ZWE_PRIVATE_ERRORS_FOUND','0');
@@ -244,7 +242,7 @@ function validateComponents(enabledComponents:string[]): any {
       }
     }
   });
-  
+
   std.setenv('ZWE_PRIVATE_ERRORS_FOUND', ''+privateErrors);
   varlib.checkRuntimeValidationResult("zwe-internal-start-prepare,validate_components");
 
@@ -259,8 +257,8 @@ function configureComponents(componentEnvironments?: any, enabledComponents?:str
 
   const zwePrivateWorkspaceEnvDir = std.getenv('ZWE_PRIVATE_WORKSPACE_ENV_DIR');
   const zweCliParameterHaInstance = std.getenv('ZWE_CLI_PARAMETER_HA_INSTANCE');
-  
-  
+
+
   enabledComponents.forEach((componentId: string)=> {
     common.printFormattedTrace("ZWELS", "zwe-internal-start-prepare,configure_components", `- checking ${componentId}`);
     const componentDir = component.findComponentDirectory(componentId);
@@ -312,7 +310,7 @@ function configureComponents(componentEnvironments?: any, enabledComponents?:str
         common.printFormattedError("ZWELS", "zwe-internal-start-prepare,configure_components", `${componentName} processComponentApimlStaticDefinitions failure`);
       }
       // - generic app framework plugin
-      success=component.processComponentAppfwPlugin(componentDir);      
+      success=component.processComponentAppfwPlugin(componentDir);
       if (success) {
         common.printFormattedDebug("ZWELS", "zwe-internal-start-prepare,configure_components", `${componentName} processComponentAppfwPlugin success`);
       } else {
@@ -326,7 +324,7 @@ function configureComponents(componentEnvironments?: any, enabledComponents?:str
       } else {
         common.printFormattedError("ZWELS", "zwe-internal-start-prepare,configure_components", `${componentName} processComponentZaasSharedLibs failure`);
       }
-                                    
+
       // - gateway shared lib
       success=component.processComponentGatewaySharedLibs(componentDir);
       if (success) {
@@ -362,13 +360,13 @@ function configureComponents(componentEnvironments?: any, enabledComponents?:str
           const result = shell.execOutSync('sh', '-c', `. ${runtimeDirectory}/bin/libs/configmgr-index.sh && cd ${componentDir} && . ${fullPath} ; export rc=$? ; export -p`);
 
           common.printFormattedDebug("ZWELS", "zwe-internal-start-prepare,configure_components", `${componentName} configure ended with rc=${result.rc}`);
-          
+
           if (result.rc==0) {
             const exportContent = varlib.getEnvironmentExports(result.out);
             if (exportContent) {
               const rc = xplatform.storeFileUTF8(`${zwePrivateWorkspaceEnvDir}/${componentName}/.${zweCliParameterHaInstance}.env`, xplatform.AUTO_DETECT, exportContent);
               if (!rc) {
-                
+
               } else {
                 // set permission for the component environment snapshot
                 shell.execSync('chmod', `700`, `"${zwePrivateWorkspaceEnvDir}/${componentName}/.${zweCliParameterHaInstance}.env"`);
@@ -396,7 +394,7 @@ function configureComponents(componentEnvironments?: any, enabledComponents?:str
       }
     }
   });
-                            
+
   common.printFormattedDebug("ZWELS", "zwe-internal-start-prepare,configure_components", "component configurations are successful");
 }
 
@@ -462,7 +460,7 @@ export function execute() {
   config.sanitizeHaInstanceId();
   common.printFormattedInfo("ZWELS", "zwe-internal-start-prepare", `starting Zowe instance ${std.getenv('ZWE_CLI_PARAMETER_HA_INSTANCE')} with ${cliParameterConfig} ...`);
 
-  // extra preparations for running in container 
+  // extra preparations for running in container
   // this is running in containers
   if (runInContainer == 'true') {
     prepareRunningInContainer();

bin/commands/migrate/for/kubernetes/index.sh

@@ -204,7 +204,7 @@ done
 
 update_zowe_yaml "${temp_dir}/zowe.yaml" "zowe.externalPort" "${ZWE_CLI_PARAMETER_EXTERNAL_PORT}"
 update_zowe_yaml "${temp_dir}/zowe.yaml" "components.gateway.port" "7554"
-update_zowe_yaml "${temp_dir}/zowe.yaml" "components.zaas.port" "7563"
+update_zowe_yaml "${temp_dir}/zowe.yaml" "components.zaas.port" "7558"
 update_zowe_yaml "${temp_dir}/zowe.yaml" "components.discovery.port" "7553"
 update_zowe_yaml "${temp_dir}/zowe.yaml" "components.api-catalog.port" "7552"
 update_zowe_yaml "${temp_dir}/zowe.yaml" "components.caching-service.port" "7555"
@@ -220,13 +220,13 @@ update_zowe_yaml "${temp_dir}/zowe.yaml" "components.explorer-jes.enabled" "true
 update_zowe_yaml "${temp_dir}/zowe.yaml" "components.explorer-mvs.enabled" "true"
 update_zowe_yaml "${temp_dir}/zowe.yaml" "components.explorer-uss.enabled" "true"
 
-update_zowe_yaml "${temp_dir}/zowe.yaml" "components.zaas.apiml.security.x509.externalMapperUrl" ""
-update_zowe_yaml "${temp_dir}/zowe.yaml" "components.zaas.apiml.security.authorization.endpoint.url" ""
-zaas_auth_provider=$(read_yaml "${temp_dir}/zowe.yaml" ".components.zaas.apiml.security.authorization.endpoint.provider")
+update_zowe_yaml "${temp_dir}/zowe.yaml" "components.gateway.apiml.security.x509.externalMapperUrl" ""
+update_zowe_yaml "${temp_dir}/zowe.yaml" "components.gateway.apiml.security.authorization.endpoint.url" ""
+zaas_auth_provider=$(read_yaml "${temp_dir}/zowe.yaml" ".components.gateway.apiml.security.authorization.endpoint.provider")
 if [ "${zaas_auth_provider}" != "" ]; then
   print_message "Zowe APIML ZAAS authorization provider is suggested to be empty when running in Kubernetes. 'native' is not supported off Z platform."
 fi
-update_zowe_yaml "${temp_dir}/zowe.yaml" "components.zaas.apiml.security.authorization.endpoint.provider" ""
+update_zowe_yaml "${temp_dir}/zowe.yaml" "components.gateway.apiml.security.authorization.endpoint.provider" ""
 update_zowe_yaml "${temp_dir}/zowe.yaml" "components.discovery.replicas" "1"
 update_zowe_yaml "${temp_dir}/zowe.yaml" "components.caching-service.storage.mode" ""
 

bin/libs/zosmf.sh

@@ -49,16 +49,3 @@ validate_zosmf_host_and_port() {
     print_message "Successfully checked z/OS MF is available on 'https://${zosmf_host}:${zosmf_port}/zosmf/info'"
   fi
 }
-
-validate_zosmf_as_auth_provider() {
-  zosmf_host="${1}"
-  zosmf_port="${2}"
-  auth_provider="${3}"
-
-  if [ -n "${zosmf_host}" -a -n "${zosmf_port}" ]; then
-    if [ "${auth_provider}" = "zosmf" ]; then
-      print_error "z/OSMF is not configured. Using z/OSMF as authentication provider is not supported."
-      return 1
-    fi
-  fi
-}

bin/libs/zosmf.ts

@@ -47,14 +47,3 @@ export function validateZosmfHostAndPort(zosmfHost: string, zosmfPort: number):
   }
   return zosmfCheckPassed;
 }
-
-//TODO isnt this completely backwards?
-export function validateZosmfAsAuthProvider(zosmfHost: string, zosmfPort: number, authProvider: string): boolean {
-  if (zosmfHost && zosmfPort) {
-    if (authProvider == 'zosmf') {
-      common.printError("z/OSMF is not configured. Using z/OSMF as authentication provider is not supported.");
-      return true;
-    }
-  }
-  return false;
-}

containers/base-jdk/ubi/Dockerfile

@@ -9,23 +9,23 @@
 # Copyright Contributors to the Zowe Project.
 #######################################################################
 
-FROM zowe-docker-release.jfrog.io/ompzowe/base:latest-ubi
+FROM zowe-docker-release.jfrog.io/ompzowe/base:3-ubi
 
 ##################################
 # labels
 LABEL name="Zowe Base Image with JDK enabled" \
-      maintainer="jack-tiefeng.jia@ibm.com" \
-      vendor="Zowe" \
-      version="2.0.2" \
-      release="0" \
-      summary="Base image for Zowe components with JDK enabled" \
-      description="Base image for Zowe components with JDK enabled"
+  maintainer="mark.ackert@broadcom.com" \
+  vendor="Zowe" \
+  version="3.0.0" \
+  release="0" \
+  summary="Base image for Zowe components with JDK enabled" \
+  description="Base image for Zowe components with JDK enabled"
 
 ##################################
 # Install JDK
 RUN microdnf install --nodocs \
-      java-1.8.0-openjdk \
-    && microdnf clean all --enablerepo='*' \
-    # smoke tests
-    && java -version
-ENV JAVA_HOME=/usr/lib/jvm/jre-1.8.0
+  java-17-openjdk-headless \
+  && microdnf clean all --enablerepo='*' \
+  # smoke tests
+  && java -version
+ENV JAVA_HOME=/usr/lib/jvm/jre-1.17.0

containers/base-jdk/ubuntu/Dockerfile

@@ -9,24 +9,25 @@
 # Copyright Contributors to the Zowe Project.
 #######################################################################
 
-FROM zowe-docker-release.jfrog.io/ompzowe/base:latest-ubuntu
+FROM zowe-docker-release.jfrog.io/ompzowe/base:3-ubuntu
 
 ##################################
 # labels
 LABEL name="Zowe Base Image with JDK enabled" \
-      maintainer="jack-tiefeng.jia@ibm.com" \
-      vendor="Zowe" \
-      version="2.0.2" \
-      release="0" \
-      summary="Base image for Zowe components with JDK enabled" \
-      description="Base image for Zowe components with JDK enabled"
+  maintainer="mark.ackert@broadcom.com" \
+  vendor="Zowe" \
+  version="3.0.0" \
+  release="0" \
+  summary="Base image for Zowe components with JDK enabled" \
+  description="Base image for Zowe components with JDK enabled"
 
 ##################################
-# Install JDK
+
+# Install JDK. 
 RUN apt-get update \
-    && apt-get install -y \
-      openjdk-8-jre \
-    && rm -rf /var/lib/apt/lists/* \
-    # smoke tests
-    && java -version
-ENV JAVA_HOME=/usr/lib/jvm/java-8-openjdk-amd64/jre
+  && apt-get install -y \
+  openjdk-17-jre \
+  && rm -rf /var/lib/apt/lists/* \
+  # smoke tests
+  && java -version
+ENV JAVA_HOME=/usr/lib/jvm/java-17-openjdk-amd64/jre