Skip to content

Commit fbed2b3

Browse files
authored
Zowe Suite v3.3.0
2 parents 8c20a61 + 6e04437 commit fbed2b3

File tree

9 files changed

+280
-142
lines changed

9 files changed

+280
-142
lines changed

CHANGELOG.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,12 @@
33
All notable changes to the Zowe Launcher package will be documented in this file.
44
This repo is part of the app-server Zowe Component, and the change logs here may appear on Zowe.org in that section.
55

6+
## 3.3
7+
- Bugfix: `zowe.sysMessages` feature was ignoring messages where the matching string was after the position of 126 ([#157]https://github.com/zowe/launcher/pull/157)
8+
- Enhancement: Launcher can now accept PARMLIB CONFIG entries that have more than one member name ([#146](https://github.com/zowe/launcher/pull/146))
9+
- Enhancement: Trimming the sys messages to print from the sys-message-id as optional based on the zowe.sysMessageTrim=true/false. (#147)
10+
- Enhancement: Avoid starting individual apiml components when apiml modulith is enabled ([#160](https://github.com/zowe/launcher/pull/160))
11+
612
## 3.1
713
- Bugfix: HEAPPOOLS and HEAPPOOLS64 no longer need to be set to OFF for launcher (#133)
814

README.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,10 @@ cd zowe-launcher/build
3232

3333
The launcher binary will be saved into the bin directory.
3434

35+
## Testing
36+
37+
See [details](./test/README.md) in `test` directory.
38+
3539
## Prerequisites
3640

3741
* Zowe 2.4.0

samplib/ZWESLSTC

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,8 +51,6 @@
5151
//* from files to their right.
5252
//* Typically the right-most file should be the Zowe default yaml.
5353
//*
54-
//* Note: All PARMLIB() entries must all have the same member name.
55-
//*
5654
//********************************************************************/
5755
//STDENV DD *
5856
_CEE_ENVFILE_CONTINUATION=\

src/main.c

Lines changed: 157 additions & 126 deletions
Large diffs are not rendered by default.

src/msg.h

Lines changed: 1 addition & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@
7979
#define MSG_CMD_RUN_ERR MSG_PREFIX "0064E" " failed to run command %s - %s\n"
8080
#define MSG_CMD_OUT_ERR MSG_PREFIX "0065E" " error reading output from command '%s' - %s\n"
8181
#define MSG_CMD_RCP_WARN MSG_PREFIX "0066W" " command '%s' ended with code %d\n"
82-
#define MSG_MEMBER_NAME_BAD MSG_PREFIX "0067E" " PARMLIB() entries must all have the same member name\n"
82+
// 67E retired, parmlib member name restriction removed
8383
#define MSG_MEMBER_MISSING MSG_PREFIX "0068E" " PARMLIB() entries must have a member name\n"
8484
#define MSG_CFG_VALID MSG_PREFIX "0069I" " Configuration is valid\n"
8585
#define MSG_CFG_INVALID MSG_PREFIX "0070E" " Configuration has validity exceptions:\n"
@@ -902,19 +902,6 @@
902902
//@
903903
//@ Review the error text to determine the action to take.
904904
//@
905-
// #define MSG_MEMBER_NAME_BAD MSG_PREFIX "0067E" " PARMLIB() entries must all have the same member name\n"
906-
//@### ZWEL0067E
907-
//@
908-
//@ PARMLIB() entries must all have the same member name
909-
//@
910-
//@ **Reason:**
911-
//@
912-
//@ PARMLIB() entries must all have the same member name.
913-
//@
914-
//@ **Action:**
915-
//@
916-
//@ Review the member names are identical for all PARMLIB() entries.
917-
//@
918905
// #define MSG_MEMBER_MISSING MSG_PREFIX "0068E" " PARMLIB() entries must have a member name\n"
919906
//@### ZWEL0068E
920907
//@

test/README.md

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
<!--
2+
This program and the accompanying materials are
3+
made available under the terms of the Eclipse Public License v2.0 which accompanies
4+
this distribution, and is available at https://www.eclipse.org/legal/epl-v20.html
5+
6+
SPDX-License-Identifier: EPL-2.0
7+
8+
Copyright Contributors to the Zowe Project.
9+
-->
10+
11+
# Tests
12+
13+
## Config-syntax
14+
15+
Simple shell script to test basic functionality, such as treating items in environment variable `CONFIG`, `haInstace` and typical start-up messages.
16+
Return code is the number detected errors. To see an output, use any parameter, for example `./config-syntax.sh print`.

test/config-syntax.sh

Lines changed: 92 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,92 @@
1+
#!/bin/sh
2+
3+
# This program and the accompanying materials are
4+
# made available under the terms of the Eclipse Public License v2.0 which accompanies
5+
# this distribution, and is available at https://www.eclipse.org/legal/epl-v20.html
6+
#
7+
# SPDX-License-Identifier: EPL-2.0
8+
#
9+
# Copyright Contributors to the Zowe Project.
10+
11+
# Start with_any_paramter -> prints output (diff style)
12+
# rc of this = number of errors found
13+
14+
print=
15+
errors=0
16+
17+
if [ ! -z "${1}" ]; then
18+
print='1'
19+
fi
20+
21+
LAUNCHER='../bin/zowe_launcher'
22+
ABS_PATH=$(cd .; pwd)
23+
24+
TEST_FILES='./files'
25+
ZOWE="${TEST_FILES}/zowe.runtime.dev.null.yaml"
26+
ZOWE_EMPTY="${TEST_FILES}/zowe.empty.yaml"
27+
ABS_ZOWE="${ABS_PATH}/${ZOWE}"
28+
ABS_ZOWE2="${ABS_PATH}/././././////./////${ZOWE}"
29+
30+
run_launcher() {
31+
# trim via awk
32+
config=$(echo "$1" | awk '{$1=$1};1')
33+
haInstance=$(echo "$2" | awk '{$1=$1};1')
34+
textMatch=$(echo "$3" | awk '{$1=$1};1')
35+
desc=$(echo "$4" | awk '{$1=$1};1')
36+
debug=$(echo "$5" | awk '{$1=$1};1')
37+
38+
export ZLDEBUG=
39+
if [ ! -z "${debug}" ]; then
40+
export ZLDEBUG='ON'
41+
fi
42+
43+
export CONFIG="${config}"
44+
# Filter out the long line when printing
45+
if [ -n "${print}" ]; then
46+
result=$($LAUNCHER "${haInstance}" 2>&1 | grep -v "INFO -- If you cant see '500'")
47+
else
48+
result=$($LAUNCHER "${haInstance}" 2>&1)
49+
fi
50+
51+
[ ! -z "${desc}" ] && [ ! -z "${print}" ] && echo "+ >>> ${desc}"
52+
[ ! -z "${print}" ] && echo "+ > CONFIG=${config}"
53+
[ ! -z "${haInstance}" ] && [ ! -z "${print}" ] && echo "+ > haInstance=${haInstance}"
54+
55+
[ ! -z "${print}" ] && echo "${result}"
56+
57+
if [ ! -z "${textMatch}" ]; then
58+
findText=$(echo "${result}" | grep "${textMatch}" )
59+
if [ -z "${findText}" ]; then
60+
echo "- > Not found: ${textMatch}"
61+
errors=`expr $errors + 1`
62+
else
63+
[ ! -z "${print}" ] && echo "+ > Found: ${textMatch}"
64+
fi
65+
fi
66+
67+
[ ! -z "${print}" ] && echo ""
68+
}
69+
70+
IFS='|'
71+
while read config haInstace textMatch desc debug; do
72+
# Skip the first line
73+
if [ "${config}" != "CONFIG " ]; then
74+
run_launcher $config $haInstace $textMatch $desc $debug
75+
fi
76+
done <<EOF
77+
CONFIG | HA-INSTANCE | TEXT-TO-FIND | DESCRIPTION | ZLDEBUG
78+
| | PANIC! readJson got null pathElement | No config leads to PANIC!
79+
FILE(${ZOWE_EMPTY}) | | ZWEL0318E - failed to get root node in YAML | Empty config leads to ZWEL0318E
80+
${ABS_ZOWE} | | ZWEL0021I Zowe Launcher starting | Check the basic message ZWEL0021I
81+
${ZOWE} | | INFO ZWEL0023I Zowe YAML config file is 'FILE(${ZOWE})' | ZWEL0023I wrapped by FILE()
82+
FILE(${ZOWE}) | | INFO ZWEL0023I Zowe YAML config file is 'FILE(${ZOWE})' | Same as previous test
83+
${ABS_ZOWE} | | INFO ZWEL0023I Zowe YAML config file is 'FILE(${ABS_ZOWE})' | ZWEL0023I wrapped by FILE()
84+
${ABS_ZOWE2} | | INFO ZWEL0023I Zowe YAML config file is 'FILE(${ABS_ZOWE2})' | Should be able to read the file
85+
FILE(${ZOWE}) | LPAR123 | ZWEL0024I HA_INSTANCE_ID is 'lpar123' | HaInstance should be sanitazed
86+
PARMLIB(ZOWE.TEST-1.A(A)) | hello | ZWEL0023I Zowe YAML config file is 'PARMLIB(ZOWE.TEST-1.A(A))' | Parmlib does not exist, but it should be in ZWEL00203I
87+
PARMLIB(ZOWE.TEST-1.A) | world | ZWEL0068E PARMLIB() entries must have a member name | Should detect missing member
88+
PARMLIB(ZOWE.TEST-1.A() | | ZWEL0068E PARMLIB() entries must have a member name | Should detect missing member
89+
PARMLIB(ZOWE.TEST-1.A()) | | ZWEL0068E PARMLIB() entries must have a member name | Should detect missing member
90+
EOF
91+
92+
exit $errors

test/files/zowe.empty.yaml

Whitespace-only changes.
Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
zowe:
2+
environments:
3+
hello: 'World!'
4+
runtimeDirectory: /dev/null

0 commit comments

Comments
 (0)