Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update V3 staging #312

Merged
merged 59 commits into from
Aug 9, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
59 commits
Select commit Hold shift + click to select a range
bd97998
Zowe Suite v2.0.0-RC3.1
zowe-robot Apr 27, 2022
5275ef6
Zowe Suite v2.1.0
zowe-robot Jun 21, 2022
45cf784
Zowe Suite v2.3.0
zowe-robot Sep 27, 2022
d3b2759
Zowe Suite v2.4.0
zowe-robot Nov 1, 2022
94428fb
Zowe Suite v2.6.0
zowe-robot Feb 1, 2023
20cc192
Zowe Suite v2.7.0
zowe-robot Mar 21, 2023
007d605
Zowe Suite v2.8.0
zowe-robot Apr 27, 2023
57ce8aa
Zowe Suite v2.9.0
zowe-robot Jun 14, 2023
81b061c
Zowe Suite v2.10.0
zowe-robot Aug 1, 2023
c9b48f3
Zowe Suite v2.10.0
zowe-robot Aug 4, 2023
3e42412
Zowe Suite v2.11.0
zowe-robot Sep 12, 2023
11165fd
Zowe Suite v2.12.0
zowe-robot Oct 11, 2023
f7a6036
Zowe Suite v2.12.0
zowe-robot Oct 26, 2023
a94da2b
Zowe Suite v2.13.0
zowe-robot Nov 28, 2023
175cfee
Zowe Suite v2.14.0
zowe-robot Jan 9, 2024
182b673
Zowe Suite v2.14.0
zowe-robot Jan 29, 2024
e6aa05e
Update defaults.yaml
1000TurquoisePogs Feb 1, 2024
856c480
Merge pull request #294 from zowe/test/fix/v2/container-discovery
1000TurquoisePogs Feb 2, 2024
bf0e05e
Zowe Suite v2.15.0
zowe-robot Feb 20, 2024
5fd58de
Remove use of ncp and mkdirp
1000TurquoisePogs Mar 7, 2024
731273d
Update developer README
DivergentEuropeans Mar 27, 2024
a0a3550
Merge branch 'v2.x/staging' into update-dev
DivergentEuropeans Mar 27, 2024
369ec32
Fix defaults to allow attls
1000TurquoisePogs Apr 5, 2024
7498e3a
Update zowe.server to zowe.network.server
1000TurquoisePogs Apr 8, 2024
386c510
server.attls to server.tls.attls
1000TurquoisePogs Apr 8, 2024
37e5822
Merge pull request #299 from zowe/update-dev
DivergentEuropeans Apr 9, 2024
c9452af
Merge branch 'v2.x/staging' of github.com:zowe/zlux-app-server into f…
1000TurquoisePogs Apr 9, 2024
70da6c4
Fix node warning
1000TurquoisePogs Apr 29, 2024
00ad121
Merge pull request #301 from zowe/bugfix/v2/node-not-found-warning
1000TurquoisePogs Apr 29, 2024
8d9a7ef
Update README.md
kirkster96 Apr 30, 2024
24ce06d
Merge pull request #302 from kirkster96/patch-1
1000TurquoisePogs Apr 30, 2024
0a5b69a
Zowe Suite v2.16.0
zowe-robot May 1, 2024
8e2dc87
Merge branch 'v2.x/staging' into bugfix/v2/attls
1000TurquoisePogs May 28, 2024
fc336e4
Update CHANGELOG.md
1000TurquoisePogs May 28, 2024
176e9f6
Merge pull request #300 from zowe/bugfix/v2/attls
1000TurquoisePogs May 28, 2024
c97f441
Update zss.apiml_static_reg.yaml.template
1000TurquoisePogs Jun 14, 2024
7904ce1
Remove conditional setup of https
1000TurquoisePogs Jun 14, 2024
535986f
Update CHANGELOG.md
1000TurquoisePogs Jun 14, 2024
ae69a66
Update start.sh
1000TurquoisePogs Jun 14, 2024
c474f27
Update CHANGELOG.md
1000TurquoisePogs Jun 14, 2024
126645a
Update CHANGELOG.md
1000TurquoisePogs Jun 14, 2024
83cb2e1
Merge pull request #304 from zowe/chore/v2/node-14-dns-check
1000TurquoisePogs Jun 17, 2024
8a74629
Merge branch 'v2.x/staging' into chore/v2/attls-https-zss
1000TurquoisePogs Jun 17, 2024
f3dada2
Merge branch 'v2.x/staging' into feature/update-libraries
1000TurquoisePogs Jun 17, 2024
3e77948
Merge pull request #297 from zowe/feature/update-libraries
1000TurquoisePogs Jun 17, 2024
8e7e972
Delete plugins-init.sh as it is also no longer used
1000TurquoisePogs Jun 14, 2024
f553328
Fix missing comment
1000TurquoisePogs Jun 14, 2024
3bf60e8
Add YAML library for reading. This is already used in zlux-server-fra…
1000TurquoisePogs Jun 14, 2024
db2f734
Fix wrong variable names after testing
1000TurquoisePogs Jun 14, 2024
f8df0ab
Merge branch 'v2.x/staging' into chore/v2/attls-https-zss
1000TurquoisePogs Jun 18, 2024
7e1d67d
Fix missing getFilesInDirectory function by using readdirSync
1000TurquoisePogs Jun 20, 2024
2522f26
Handle mkdirp throwing eexist
1000TurquoisePogs Jun 20, 2024
fb79d60
Fix syntax error on mkdirp call
1000TurquoisePogs Jun 21, 2024
8f47e84
Merge pull request #305 from zowe/feature/v2/merge-plugin-init
1000TurquoisePogs Jun 24, 2024
c8a2165
Merge branch 'v2.x/staging' into chore/v2/attls-https-zss
1000TurquoisePogs Jul 1, 2024
267b7bd
Merge pull request #303 from zowe/chore/v2/attls-https-zss
1000TurquoisePogs Jul 1, 2024
62e47a6
Zowe Suite v2.17.0
zowe-robot Jul 2, 2024
497eaef
Merge pull request #310 from zowe/v2.x/rc
1000TurquoisePogs Aug 5, 2024
02a72a1
Merge branch 'v2.x/staging' into v3.x/staging
Aug 9, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,14 @@

All notable changes to the Zlux App Server package will be documented in this file.

## v2.17.0
- Enhancement: app-server can now use Zowe's standardized and simplified AT-TLS configuration simply by toggling `zowe.network.server.tls.attls: true` or `components.app-server.zowe.network.server.tls.attls: true`. If you wish to control client tls separately from server tls, you can also use `zowe.network.client.tls.attls` or `components.app-server.zowe.network.client.tls.attls`. (#300) (#303)
- Enhancement: The app-server configure stage performance increased due to combining two seperate processes in this stage (plugins-init.js and initInstance.js) into one. (#304)
- Enhancement: Remove dns check specific to node 14 and below to reduce startup time. Node 14 has not been supported since september 2023. (#304)

## v2.16.0
- Bugfix: Removed message saying node not found prior to discovery of node. Now, you will only get an error message if node is not found after lookup in NODE_HOME.

## v2.14.0
- Enhancement: Updated schema to specify multiple discovery servers.

Expand Down
6 changes: 4 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,8 @@ To build the App Server and Apps, the following is required:

* **NodeJS** - v14.x minimum (except v14.17.2) up to v16.x

Note & TODO: Node 17+ will fail on Windows when running full zlux build, [more information in this thread.](https://stackoverflow.com/questions/69692842/error-message-error0308010cdigital-envelope-routinesunsupported). An upgrade solution needs to be applied across multiple failing components

* **npm** - v6.4 minimum

* **jdk** - v8 minimum
Expand Down Expand Up @@ -79,7 +81,7 @@ On z/OS, git 2.14.4 is the minimum needed.
### Runtime
To use the App Server, the following is required:

* **NodeJS** - v14.x (except v14.17.2) up to v16.x is officially supported by the Zowe community.
* **NodeJS** - v16.x up to v18.x is officially supported by the Zowe community.

Plugins may depend upon other technologies, such as Java or ZSS. A plugin's [pluginDefinition](https://docs.zowe.org/stable/extend/extend-desktop/mvd-plugindefandstruct) or README will help you to understand if additional prerequisites are needed for that plugin.

Expand Down Expand Up @@ -143,7 +145,7 @@ When the App Server has started, one of the messages you will see as bootstrappi
### Troubleshooting
If you encounter an error message saying `No config file found, initializing`, it means that the App Server could not find a configuration file in the expected location.

To fix this issue, you need to create a zowe.yaml file in the following directory: `%USERPROFILE%\.zowe\workspace\app-server\serverConfig`. You can use [this](https://github.com/zowe/zlux-app-server/blob/v2.x/staging/defaults/serverConfig/zowe.yaml) template as a starting point.
To fix this issue, you need to create a zowe.yaml file in the following directory: `%USERPROFILE%\.zowe\workspace\app-server\serverConfig`. You can use [this](https://github.com/zowe/zlux-app-server/blob/v2.x/staging/defaults/serverConfig/defaults.yaml) template as a starting point.

### Server Logs
When the server starts, it writes logs to a text file. On z/OS, Unix, and Linux, the server also logs to the terminal via stdout.
Expand Down
15 changes: 0 additions & 15 deletions bin/configure.sh
Original file line number Diff line number Diff line change
Expand Up @@ -28,11 +28,6 @@ if [ "$ZWE_components_gateway_enabled" = "true" ]; then
if [ "${ZWE_RUN_ON_ZOS}" != "true" ]; then
zss_def_template="zss.apiml_static_reg.yaml.template"
export ZSS_PORT="${ZWE_components_zss_port}"
if [ "${ZWE_components_zss_tls}" != "false" ]; then
export ZSS_PROTOCOL=https
else
export ZSS_PROTOCOL=http
fi

if [ -n "${ZWE_STATIC_DEFINITIONS_DIR}" ]; then
zss_registration_yaml=${ZWE_STATIC_DEFINITIONS_DIR}/zss.apiml_static_reg_yaml_template.${ZWE_CLI_PARAMETER_HA_INSTANCE}.yml
Expand All @@ -43,7 +38,6 @@ if [ "$ZWE_components_gateway_enabled" = "true" ]; then
fi

unset ZSS_PORT
unset ZSS_PROTOCOL
fi
fi
fi
Expand All @@ -52,12 +46,3 @@ fi
. ./init/node-init.sh
cd ../lib
CONFIG_FILE=$ZWE_CLI_PARAMETER_CONFIG $NODE_BIN initInstance.js

cd ${COMPONENT_HOME}/share/zlux-app-server/bin/init
if [ "${ZWE_components_app_server_zowe_useConfigmgr}" = "false" ]; then
. ./plugins-init.sh
elif [ "${ZWE_zowe_useConfigmgr}" = "true" ]; then
_CEE_RUNOPTS="XPLINK(ON),HEAPPOOLS(OFF)" ${ZWE_zowe_runtimeDirectory}/bin/utils/configmgr -script "${ZWE_zowe_runtimeDirectory}/components/app-server/share/zlux-app-server/bin/init/plugins-init.js"
else
. ./plugins-init.sh
fi
221 changes: 0 additions & 221 deletions bin/init/plugins-init.js

This file was deleted.

51 changes: 0 additions & 51 deletions bin/init/plugins-init.sh

This file was deleted.

6 changes: 0 additions & 6 deletions bin/start.sh
Original file line number Diff line number Diff line change
Expand Up @@ -95,12 +95,6 @@ if [ "$ZWE_components_app_server_dns_lookupOrder" = "ipv6" ]; then
ZLUX_DNS_ORDER="--dns-result-order=verbatim"
fi

# not all versions of node support the above (14.18+ generally) so we can just try it to see what happens.
v4_check=$(${NODE_BIN} ${ZLUX_DNS_ORDER} -e "console.log('success');")
if [ "${v4_check}" != "success" ]; then
ZLUX_DNS_ORDER=
fi

if [ -z "${ZWED_FLAGS}" ]; then
ZWED_FLAGS="${ZLUX_DNS_ORDER} --harmony "
fi
Expand Down
2 changes: 1 addition & 1 deletion bin/validate.sh
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
#
# Copyright Contributors to the Zowe Project.

type node
result=$(type node)
if [ "$?" -ne "0" ]; then
if [ -e "${NODE_HOME}/bin/node" ]; then
echo "Node found in NODE_HOME"
Expand Down
Loading
Loading