From bda9b95fb4817c99a8198bd842b53f7de6cc92f5 Mon Sep 17 00:00:00 2001
From: Aditya Ranshinge <aranshinge@rocketsoftware.com>
Date: Tue, 12 Apr 2022 17:25:22 +0530
Subject: [PATCH 1/4] Removed hardcoded 1 from jobname

Signed-off-by: Aditya Ranshinge <aranshinge@rocketsoftware.com>
---
 bin/app-server.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/bin/app-server.sh b/bin/app-server.sh
index ea90c3b1..7677de2a 100755
--- a/bin/app-server.sh
+++ b/bin/app-server.sh
@@ -92,9 +92,9 @@ else
 fi
 
 if [ -z "$ZLUX_NO_LOGFILE" ]; then
-    __UNTAGGED_READ_MODE=V6 _BPX_JOBNAME=${ZOWE_PREFIX}DS1 ${NODE_BIN} --harmony ${ZOWE_LIB_DIR}/${ZLUX_SERVER_FILE} --config="${CONFIG_FILE}" "$@" 2>&1 | tee $ZWED_NODE_LOG_FILE
+    __UNTAGGED_READ_MODE=V6 _BPX_JOBNAME=${ZOWE_PREFIX}DS ${NODE_BIN} --harmony ${ZOWE_LIB_DIR}/${ZLUX_SERVER_FILE} --config="${CONFIG_FILE}" "$@" 2>&1 | tee $ZWED_NODE_LOG_FILE
 else
-    __UNTAGGED_READ_MODE=V6 _BPX_JOBNAME=${ZOWE_PREFIX}DS1 ${NODE_BIN} --harmony ${ZOWE_LIB_DIR}/${ZLUX_SERVER_FILE} --config="${CONFIG_FILE}" "$@"
+    __UNTAGGED_READ_MODE=V6 _BPX_JOBNAME=${ZOWE_PREFIX}DS ${NODE_BIN} --harmony ${ZOWE_LIB_DIR}/${ZLUX_SERVER_FILE} --config="${CONFIG_FILE}" "$@"
     echo "Ended with rc=$?"
 fi
 

From fa4e8289d280466d234626a0e00332a98c948dba Mon Sep 17 00:00:00 2001
From: Aditya Ranshinge <aranshinge@rocketsoftware.com>
Date: Tue, 12 Apr 2022 17:53:05 +0530
Subject: [PATCH 2/4] Removed hardcoded 1 from zss jobname

Signed-off-by: Aditya Ranshinge <aranshinge@rocketsoftware.com>
---
 bin/zssServer.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bin/zssServer.sh b/bin/zssServer.sh
index 1411ca4e..28a3c552 100755
--- a/bin/zssServer.sh
+++ b/bin/zssServer.sh
@@ -164,7 +164,7 @@ fi
 #Determined log file.  Run zssServer.
 export dir=`dirname "$0"`
 cd $ZSS_SCRIPT_DIR
-_BPX_SHAREAS=NO _BPX_JOBNAME=${ZOWE_PREFIX}SZ1 ./zssServer "${CONFIG_FILE}" 2>&1 | tee $ZWES_LOG_FILE
+_BPX_SHAREAS=NO _BPX_JOBNAME=${ZOWE_PREFIX}SZ ./zssServer "${CONFIG_FILE}" 2>&1 | tee $ZWES_LOG_FILE
 # 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

From 60d74862e8c43013c5b6383e13595e5ea4fd458a Mon Sep 17 00:00:00 2001
From: Aditya Ranshinge <aranshinge@rocketsoftware.com>
Date: Tue, 19 Apr 2022 18:50:06 +0530
Subject: [PATCH 3/4] make ZWED_instanceID compatible with v2 parameters

Signed-off-by: Aditya Ranshinge <aranshinge@rocketsoftware.com>
---
 bin/utils/convert-env.sh | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/bin/utils/convert-env.sh b/bin/utils/convert-env.sh
index e6fb8fd1..2308073d 100755
--- a/bin/utils/convert-env.sh
+++ b/bin/utils/convert-env.sh
@@ -56,13 +56,10 @@ export ZWES_ZIS_PARMLIB_MEMBER="ZWESIP00"
 
 
 
-# For backwards compatible behavior, only set the instance ID if it is non-default
-if [ -n "$ZOWE_INSTANCE" ]
+# For backwards compatible behavior
+if [ -n "$ZWE_zowe_rbacProfileIdentifier" ]
 then
-    if [ "$ZOWE_INSTANCE" != "1" ]
-    then
-        export ZWED_instanceID=$ZOWE_INSTANCE
-    fi
+  export ZWED_instanceID=$ZWE_zowe_rbacProfileIdentifier
 fi
 
 # shape old env vars into app-server compatible ones

From 96e28b13dfda9624efccc5ff079b59e67b5afd78 Mon Sep 17 00:00:00 2001
From: Aditya Ranshinge <aranshinge@rocketsoftware.com>
Date: Wed, 20 Apr 2022 00:36:32 +0530
Subject: [PATCH 4/4] Added cookieIdentifier env var to convert-env.sh

Signed-off-by: Aditya Ranshinge <aranshinge@rocketsoftware.com>
---
 bin/utils/convert-env.sh | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/bin/utils/convert-env.sh b/bin/utils/convert-env.sh
index 2308073d..a5f8bd1d 100755
--- a/bin/utils/convert-env.sh
+++ b/bin/utils/convert-env.sh
@@ -62,6 +62,11 @@ then
   export ZWED_instanceID=$ZWE_zowe_rbacProfileIdentifier
 fi
 
+if [ -n "$ZWE_zowe_cookieIdentifier" ]
+then
+  export ZWED_cookieIdentifier=$ZWE_zowe_cookieIdentifier
+fi
+
 # shape old env vars into app-server compatible ones
 # mediation layer
 if [ -z "$ZWED_node_mediationLayer_server_gatewayPort" ]