From 3954f0c1b97c2e493080c33430f1c9727a2f26b3 Mon Sep 17 00:00:00 2001 From: Pablo Carle Date: Mon, 8 Jul 2024 09:51:06 +0200 Subject: [PATCH] fix: update attls icsf condition (#3635) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --------- Signed-off-by: Pablo Hernán Carle Co-authored-by: Pablo Hernán Carle --- api-catalog-package/src/main/resources/bin/start.sh | 4 +++- caching-service-package/src/main/resources/bin/start.sh | 4 +++- cloud-gateway-package/src/main/resources/bin/start.sh | 4 +++- discovery-package/src/main/resources/bin/start.sh | 4 +++- gateway-package/src/main/resources/bin/start.sh | 4 +++- metrics-service-package/src/main/resources/bin/start.sh | 5 +++-- 6 files changed, 18 insertions(+), 7 deletions(-) diff --git a/api-catalog-package/src/main/resources/bin/start.sh b/api-catalog-package/src/main/resources/bin/start.sh index acac1179a7..0b322a49fa 100755 --- a/api-catalog-package/src/main/resources/bin/start.sh +++ b/api-catalog-package/src/main/resources/bin/start.sh @@ -188,7 +188,9 @@ if [ $JAVA_VERSION -ge 61 ]; then fi fi -if [ "${ATTLS_ENABLED}" = "true" ]; then +# Disable Java keyring loading for ICSF hardware private key storage. +# Only z/OSMF JWT authentication provider is supported with this type of keyrings. +if [ "${ATTLS_ENABLED}" = "true" -a "${APIML_ATTLS_LOAD_KEYRING:-false}" = "true" ]; then keystore_type= keystore_pass= key_pass= diff --git a/caching-service-package/src/main/resources/bin/start.sh b/caching-service-package/src/main/resources/bin/start.sh index 8b5c3a1004..feec61382b 100755 --- a/caching-service-package/src/main/resources/bin/start.sh +++ b/caching-service-package/src/main/resources/bin/start.sh @@ -174,7 +174,9 @@ if [ $JAVA_VERSION -ge 61 ]; then fi fi -if [ "${ATTLS_ENABLED}" = "true" ]; then +# Disable Java keyring loading for ICSF hardware private key storage. +# Only z/OSMF JWT authentication provider is supported with this type of keyrings. +if [ "${ATTLS_ENABLED}" = "true" -a "${APIML_ATTLS_LOAD_KEYRING:-false}" = "true" ]; then keystore_type= keystore_pass= key_pass= diff --git a/cloud-gateway-package/src/main/resources/bin/start.sh b/cloud-gateway-package/src/main/resources/bin/start.sh index 7656af3487..d11bb11bea 100755 --- a/cloud-gateway-package/src/main/resources/bin/start.sh +++ b/cloud-gateway-package/src/main/resources/bin/start.sh @@ -134,7 +134,9 @@ if [ $JAVA_VERSION -ge 61 ]; then fi fi -if [ "${ATTLS_ENABLED}" = "true" ]; then +# Disable Java keyring loading for ICSF hardware private key storage. +# Only z/OSMF JWT authentication provider is supported with this type of keyrings. +if [ "${ATTLS_ENABLED}" = "true" -a "${APIML_ATTLS_LOAD_KEYRING:-false}" = "true" ]; then keystore_type= keystore_pass= key_pass= diff --git a/discovery-package/src/main/resources/bin/start.sh b/discovery-package/src/main/resources/bin/start.sh index 39f319dd14..f9b727fd60 100755 --- a/discovery-package/src/main/resources/bin/start.sh +++ b/discovery-package/src/main/resources/bin/start.sh @@ -183,7 +183,9 @@ if [ $JAVA_VERSION -ge 61 ]; then fi fi -if [ "${ATTLS_ENABLED}" = "true" ]; then +# Disable Java keyring loading for ICSF hardware private key storage. +# Only z/OSMF JWT authentication provider is supported with this type of keyrings. +if [ "${ATTLS_ENABLED}" = "true" -a "${APIML_ATTLS_LOAD_KEYRING:-false}" = "true" ]; then keystore_type= keystore_pass= key_pass= diff --git a/gateway-package/src/main/resources/bin/start.sh b/gateway-package/src/main/resources/bin/start.sh index 06c4a00b37..f1e41478fe 100755 --- a/gateway-package/src/main/resources/bin/start.sh +++ b/gateway-package/src/main/resources/bin/start.sh @@ -252,7 +252,9 @@ if [ $JAVA_VERSION -ge 61 ]; then fi fi -if [ "${ATTLS_ENABLED}" = "true" ]; then +# Disable Java keyring loading for ICSF hardware private key storage. +# Only z/OSMF JWT authentication provider is supported with this type of keyrings. +if [ "${ATTLS_ENABLED}" = "true" -a "${APIML_ATTLS_LOAD_KEYRING:-false}" = "true" ]; then keystore_type= keystore_pass= key_pass= diff --git a/metrics-service-package/src/main/resources/bin/start.sh b/metrics-service-package/src/main/resources/bin/start.sh index b5ff0c2c76..870b499a16 100755 --- a/metrics-service-package/src/main/resources/bin/start.sh +++ b/metrics-service-package/src/main/resources/bin/start.sh @@ -107,7 +107,9 @@ truststore_pass="${ZWE_configs_certificate_truststore_password:-${ZWE_zowe_certi keystore_location="${ZWE_configs_certificate_keystore_file:-${ZWE_zowe_certificate_keystore_file}}" truststore_location="${ZWE_configs_certificate_truststore_file:-${ZWE_zowe_certificate_truststore_file}}" -if [ "${ATTLS_ENABLED}" = "true" ]; then +# Disable Java keyring loading for ICSF hardware private key storage. +# Only z/OSMF JWT authentication provider is supported with this type of keyrings. +if [ "${ATTLS_ENABLED}" = "true" -a "${APIML_ATTLS_LOAD_KEYRING:-false}" = "true" ]; then keystore_type= keystore_pass= key_pass= @@ -115,7 +117,6 @@ if [ "${ATTLS_ENABLED}" = "true" ]; then keystore_location= fi - # NOTE: these are moved from below # -Dapiml.service.ipAddress=${ZOWE_IP_ADDRESS:-127.0.0.1} \ # -Dapiml.service.preferIpAddress=${APIML_PREFER_IP_ADDRESS:-false} \