Zowe Suite v1.28.0

zowe · May 11, 2022 · 00f8db4 · 00f8db4
2 parents 9913b09 + f64143e
commit 00f8db4
Show file tree

Hide file tree

Showing 23 changed files with 2,908 additions and 284 deletions.
diff --git a/.github/workflows/build_test.yml b/.github/workflows/build_test.yml
@@ -2,7 +2,9 @@ name: Build and Test Workflow
 on:
   push:
     branches:
-      - staging, master, rc 
+      - staging 
+      - master
+      - rc 
   pull_request:
     types: [opened, reopened, synchronize]
   workflow_dispatch:

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,11 @@ All notable changes to the ZSS package will be documented in this file.
 
 ## Recent Changes
 
+## v1.28.0
+
+- Bugfix: ZSS had a jobname prefix regression for several releases when it recieved an incorrect value for ZOWE_PREFIX when LAUNCH_COMPONENT_GROUPS included GATEWAY
+
+
 ## `1.27.0`
 
 - Enhancement: Get public key for JWT signature verification using APIML

diff --git a/apiml-static-reg.yaml.template b/apiml-static-reg.yaml.template
@@ -14,7 +14,9 @@ services:
         gatewayUrl: api/v1
         swaggerUrl: https://${ZOWE_EXPLORER_HOST}:${ZOWE_ZLUX_SERVER_HTTPS_PORT:-8544}/api-docs/agent
         # documentationUrl: TODO
+    authentication:
+        scheme: zoweJwt
 catalogUiTiles:
   zss:
     title: Zowe System Services (ZSS)
-    description:  Zowe System Services is an HTTPS and Websocket server that makes it easy to have secure, powerful web APIs backed by low-level z/OS constructs.
+    description:  Zowe System Services is an HTTPS and Websocket server that makes it easy to have secure, powerful web APIs backed by low-level z/OS constructs.
diff --git a/bin/zss-import-jwt-key.sh b/bin/zss-import-jwt-key.sh
diff --git a/bin/zssServer.sh b/bin/zssServer.sh
@@ -168,6 +168,16 @@ fi
 #Determined log file.  Run zssServer.
 export dir=`dirname "$0"`
 cd $ZSS_SCRIPT_DIR
+
+# Weird bug in recent releases has app-server not having the same jobname prefix as other services.
+# This only happens when LAUNCH_COMPONENT_GROUPS includes GATEWAY.
+# Possibly due to hacks elsewhere that we weren't notified of https://github.com/zowe/zowe-install-packaging/commit/0ccb77afca8f6dd8e2782c25490283739ab2791c
+if [ -n "${ZOWE_INSTANCE}" ]; then
+  if [[ "${ZOWE_PREFIX}" != *"${ZOWE_INSTANCE}" ]]; then
+    export ZOWE_PREFIX=${ZOWE_PREFIX}${ZOWE_INSTANCE}
+  fi
+fi
+
 _BPX_SHAREAS=NO _BPX_JOBNAME=${ZOWE_PREFIX}SZ1 ./zssServer "${CONFIG_FILE}" 2>&1 | tee $ZSS_LOG_FILE
 # This program and the accompanying materials are
 # made available under the terms of the Eclipse Public License v2.0 which accompanies

diff --git a/build/build_zss.sh b/build/build_zss.sh
@@ -89,7 +89,6 @@ if c89 \
   ${COMMON}/c/crossmemory.c \
   ${COMMON}/c/crypto.c \
   ${COMMON}/c/dataservice.c \
-  ${COMMON}/c/datasetjson.c \
   ${COMMON}/c/discovery.c \
   ${COMMON}/c/dynalloc.c \
   ${COMMON}/c/fdpoll.c \
@@ -138,6 +137,7 @@ if c89 \
   ${ZSS}/c/certificateService.c \
   ${ZSS}/c/unixFileService.c \
   ${ZSS}/c/datasetService.c \
+  ${ZSS}/c/datasetjson.c \
   ${ZSS}/c/envService.c \
   ${ZSS}/c/zosDiscovery.c \
   ${ZSS}/c/securityService.c \

diff --git a/build/build_zss64.sh b/build/build_zss64.sh
@@ -62,7 +62,6 @@ if ! c89 \
   ${COMMON}/c/crossmemory.c \
   ${COMMON}/c/crypto.c \
   ${COMMON}/c/dataservice.c \
-  ${COMMON}/c/datasetjson.c \
   ${COMMON}/c/discovery.c \
   ${COMMON}/c/dynalloc.c \
   ${COMMON}/c/fdpoll.c \
@@ -113,6 +112,7 @@ if ! c89 \
   ${ZSS}/c/certificateService.c \
   ${ZSS}/c/unixFileService.c \
   ${ZSS}/c/datasetService.c \
+  ${ZSS}/c/datasetjson.c \
   ${ZSS}/c/envService.c \
   ${ZSS}/c/zosDiscovery.c \
   ${ZSS}/c/securityService.c \