Prepare for 3.4.0 RC2

CHANGELOG.md

@@ -19,7 +19,7 @@ All notable changes to the Zowe Installer will be documented in this file.
 
 ## `3.3.1`
 
-- Bugfix: z/OSMF static definition is missing scheme information, this is needed for AT-TLS hybrid scenarios where connections to z/OSMF do not follow AT-TLS rules [#4512](https://github.com/zowe/zowe-install-packaging/pull/4512)
+- Bugfix: z/OSMF static definition is missing scheme information, this is needed for AT-TLS hybrid scenarios where connections TO z/OSMF do not follow AT-TLS rules [#4512](https://github.com/zowe/zowe-install-packaging/pull/4512)
 
 ## `3.3.0`
 

bin/libs/certificate.sh

@@ -1132,7 +1132,7 @@ keyring_export_to_pkcs12() {
 
     # export private key
     print_debug "- Export private key of \"${label}\" in PEM format"
-    result=$(keyring_util EXPORT "${keyring_owner}" "${keyring_name}" "${label}" -k -f "${uss_temp_target}.p12" -p "${keystore_password}")
+    result=$(keyring_util EXPORT "${keyring_owner}" "${keyring_name}" -l "${label}" -k -f "${uss_temp_target}.p12" -p "${keystore_password}")
     if [ $? -ne 0 ]; then
       return 1
     fi

bin/libs/zosmf.ts

@@ -26,7 +26,7 @@ export function validateZosmfHostAndPort(zosmfHost: string, zosmfPort: number, s
 
   let backupJobname = std.getenv('_BPX_JOBNAME');
   std.setenv('_BPX_JOBNAME', jobname);
-  const execReturn = shell.execOutSync(`${std.getenv('ZWE_zowe_runtimeDirectory')}/bin/utils/curl`, `${scheme}://${zosmfHost}:${zosmfPort}/zosmf/info`, `-k`, `-H`, `X-CSRF-ZOSMF-HEADER: true`, `-w`, `%{http_code}`, `-s`, `-o`, `/dev/null`);
+  const execReturn = shell.execOutSync(`${std.getenv('ZWE_zowe_runtimeDirectory')}/bin/utils/curl`, `${scheme}://${zosmfHost}:${zosmfPort}/zosmf/info`, `-k`, `-H`, `X-CSRF-ZOSMF-HEADER: true`, `-w`, `%{http_code}`, `--max-time`, `10`, `-s`, `-o`, `/dev/null`);
   //restore jobname
   if (backupJobname) {
     std.setenv('_BPX_JOBNAME', backupJobname);

files/defaults.yaml

@@ -137,7 +137,7 @@ zowe:
       # Individual startup checks will override the default behavior
       ports: "exit"
       # z/OSMF startup check - defaults to "warn"
-      zosmf: "warn"
+      zosmf: "exit"
 
   # >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
   # How we want to verify SSL certificates of services. Valid values are:

manifest.json.template

@@ -141,7 +141,7 @@
       "artifact": "*.pax"
     },
     "org.zopencommunity.curl": {
-      "version": "8.13.0",
+      "version": "8.17.0",
       "artifact": "*.pax.Z"
     },
     "org.zowe.utility-tools": {

schemas/zowe-yaml-schema.json

@@ -731,7 +731,7 @@
                 },
                 "zosmf": {
                   "type": "string",
-                  "default": "warn",
+                  "default": "exit",
                   "description": "Checks z/OSMF to see if it is running and meet's Zowe's requirements",
                   "enum": ["exit", "warn", "disabled"]
                 }

tests/zwe-remote-integration/src/__tests__/env/__snapshots__/env.test.ts.snap

@@ -75,7 +75,7 @@ ZWE_zowe_launchScript_logLevel=info
 ZWE_zowe_launchScript_onComponentConfigureFail=warn
 ZWE_zowe_launchScript_startupChecks_default=exit
 ZWE_zowe_launchScript_startupChecks_ports=disabled
-ZWE_zowe_launchScript_startupChecks_zosmf=warn
+ZWE_zowe_launchScript_startupChecks_zosmf=exit
 ZWE_zowe_logDirectory=/test/dir/logs
 ZWE_zowe_network_client_tls_attls=false
 ZWE_zowe_network_proxyType=https
@@ -214,7 +214,7 @@ ZWE_zowe_launchScript_logLevel=info
 ZWE_zowe_launchScript_onComponentConfigureFail=warn
 ZWE_zowe_launchScript_startupChecks_default=exit
 ZWE_zowe_launchScript_startupChecks_ports=disabled
-ZWE_zowe_launchScript_startupChecks_zosmf=warn
+ZWE_zowe_launchScript_startupChecks_zosmf=exit
 ZWE_zowe_logDirectory=/test/dir/logs
 ZWE_zowe_network_client_tls_attls=false
 ZWE_zowe_network_proxyType=https
@@ -351,7 +351,7 @@ ZWE_zowe_launchScript_logLevel=info
 ZWE_zowe_launchScript_onComponentConfigureFail=warn
 ZWE_zowe_launchScript_startupChecks_default=exit
 ZWE_zowe_launchScript_startupChecks_ports=disabled
-ZWE_zowe_launchScript_startupChecks_zosmf=warn
+ZWE_zowe_launchScript_startupChecks_zosmf=exit
 ZWE_zowe_logDirectory=/test/dir/logs
 ZWE_zowe_network_client_tls_attls=false
 ZWE_zowe_network_proxyType=https
@@ -472,7 +472,7 @@ ZWE_zowe_launchScript_logLevel=info
 ZWE_zowe_launchScript_onComponentConfigureFail=warn
 ZWE_zowe_launchScript_startupChecks_default=disabled
 ZWE_zowe_launchScript_startupChecks_ports=disabled
-ZWE_zowe_launchScript_startupChecks_zosmf=warn
+ZWE_zowe_launchScript_startupChecks_zosmf=exit
 ZWE_zowe_network_proxyType=https
 ZWE_zowe_rbacProfileIdentifier=1
 ZWE_zowe_runtimeDirectory=/test/dir
@@ -584,7 +584,7 @@ ZWE_zowe_launchScript_logLevel=info
 ZWE_zowe_launchScript_onComponentConfigureFail=warn
 ZWE_zowe_launchScript_startupChecks_default=exit
 ZWE_zowe_launchScript_startupChecks_ports=disabled
-ZWE_zowe_launchScript_startupChecks_zosmf=warn
+ZWE_zowe_launchScript_startupChecks_zosmf=exit
 ZWE_zowe_logDirectory=/test/dir/logs
 ZWE_zowe_network_client_tls_attls=false
 ZWE_zowe_network_proxyType=https

tests/zwe-remote-integration/src/config/ZoweYamlType.ts

@@ -863,7 +863,7 @@ const zoweSchema = zoweYamlSchema as {
                 };
                 zosmf: {
                   type: 'string';
-                  default: 'warn';
+                  default: 'exit';
                   description: "Checks z/OSMF to see if it is running and meet's Zowe's requirements";
                   enum: ['exit', 'warn', 'disabled'];
                 };