From dda176d23b20ee02358f7ac0746179cf8175acbc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pablo=20Hern=C3=A1n=20Carle?= Date: Thu, 23 Nov 2023 15:24:23 +0100 Subject: [PATCH 1/6] add zosmf scheme option for at-tls in api ml MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Pablo Hernán Carle --- bin/libs/configmgr.ts | 1 + schemas/zowe-yaml-schema.json | 12 ++++++++++++ 2 files changed, 13 insertions(+) diff --git a/bin/libs/configmgr.ts b/bin/libs/configmgr.ts index 03863f3d7a..66981bef79 100644 --- a/bin/libs/configmgr.ts +++ b/bin/libs/configmgr.ts @@ -506,6 +506,7 @@ const SPECIAL_ENV_MAPS = { ZWE_java_home:'JAVA_HOME', ZWE_zOSMF_host: 'ZOSMF_HOST', ZWE_zOSMF_port: 'ZOSMF_PORT', + ZWE_zOSMF_scheme: 'ZOSMF_SCHEME', ZWE_zOSMF_applId: 'ZOSMF_APPLID' }; diff --git a/schemas/zowe-yaml-schema.json b/schemas/zowe-yaml-schema.json index 60a2f83374..8e5cc8f8d9 100644 --- a/schemas/zowe-yaml-schema.json +++ b/schemas/zowe-yaml-schema.json @@ -578,6 +578,10 @@ "$ref": "#/$defs/port", "description": "Port number of your z/OSMF instance." }, + "scheme": { + "$ref" : "#/$defs/scheme", + "description": "Scheme used to connect to z/OSMF instance. Optional for outbout AT-TLS, defaults to https" + }, "applId": { "type": "string", "description": "Appl ID of your z/OSMF instance." @@ -627,6 +631,14 @@ "minimum": 0, "maximum": 65535 }, + "scheme": { + "type": "string", + "enum": [ + "http", + "https" + ], + "default": "https" + }, "certificate": { "oneOf": [ { "$ref": "#/$defs/pkcs12-certificate" }, From 57e82ae056358c44b278ddef25e7d88860601ff6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pablo=20Hern=C3=A1n=20Carle?= Date: Fri, 24 Nov 2023 12:36:18 +0100 Subject: [PATCH 2/6] add common-java MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Pablo Hernán Carle --- .pax/pre-packaging.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.pax/pre-packaging.sh b/.pax/pre-packaging.sh index 8b4fe80b14..12c205930a 100755 --- a/.pax/pre-packaging.sh +++ b/.pax/pre-packaging.sh @@ -288,7 +288,7 @@ done echo "[$SCRIPT_NAME] process commands.install hooks" # not all core components has commands.install -for component in app-server; do +for component in app-server common-java-lib; do echo "[$SCRIPT_NAME] - ${component}" # FIXME: these environment variables are changed in v2 ZOWE_ROOT_DIR=${ZOWE_ROOT_DIR} \ From 72fdba764d2bb7c361c766eab78aaa1a9b1caf98 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pablo=20Hern=C3=A1n=20Carle?= Date: Fri, 24 Nov 2023 12:58:32 +0100 Subject: [PATCH 3/6] common-java lib package MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Pablo Hernán Carle --- manifest.json.template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.json.template b/manifest.json.template index d925e240e8..e3cfe183ca 100644 --- a/manifest.json.template +++ b/manifest.json.template @@ -97,7 +97,7 @@ "exclusions": ["*PR*.zip"] }, "org.zowe.apiml.sdk.common-java-lib-package": { - "version": "~2.0.0-SNAPSHOT", + "version": "^2.0.0-SNAPSHOT", "artifact": "common-java-lib-*.zip", "exclusions": ["*PR*.zip"] }, From d7926bb5d841182304e3d655cb4fbc92e9c7429c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pablo=20Hern=C3=A1n=20Carle?= Date: Fri, 24 Nov 2023 13:42:43 +0100 Subject: [PATCH 4/6] try without comp MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Pablo Hernán Carle --- .pax/pre-packaging.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.pax/pre-packaging.sh b/.pax/pre-packaging.sh index 12c205930a..8b4fe80b14 100755 --- a/.pax/pre-packaging.sh +++ b/.pax/pre-packaging.sh @@ -288,7 +288,7 @@ done echo "[$SCRIPT_NAME] process commands.install hooks" # not all core components has commands.install -for component in app-server common-java-lib; do +for component in app-server; do echo "[$SCRIPT_NAME] - ${component}" # FIXME: these environment variables are changed in v2 ZOWE_ROOT_DIR=${ZOWE_ROOT_DIR} \ From e6d80bd4bdfb64341929755fd28b65bca824f968 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pablo=20Hern=C3=A1n=20Carle?= Date: Fri, 24 Nov 2023 14:26:03 +0100 Subject: [PATCH 5/6] back to allowlist common-java-lib MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Pablo Hernán Carle --- .pax/pre-packaging.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.pax/pre-packaging.sh b/.pax/pre-packaging.sh index 8b4fe80b14..12c205930a 100755 --- a/.pax/pre-packaging.sh +++ b/.pax/pre-packaging.sh @@ -288,7 +288,7 @@ done echo "[$SCRIPT_NAME] process commands.install hooks" # not all core components has commands.install -for component in app-server; do +for component in app-server common-java-lib; do echo "[$SCRIPT_NAME] - ${component}" # FIXME: these environment variables are changed in v2 ZOWE_ROOT_DIR=${ZOWE_ROOT_DIR} \ From c5dffaf7deac8f37c9609fb7b88483da92b53c09 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pablo=20Hern=C3=A1n=20Carle?= Date: Tue, 28 Nov 2023 17:36:12 +0100 Subject: [PATCH 6/6] remove env MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Pablo Hernán Carle --- bin/libs/configmgr.ts | 1 - 1 file changed, 1 deletion(-) diff --git a/bin/libs/configmgr.ts b/bin/libs/configmgr.ts index 66981bef79..03863f3d7a 100644 --- a/bin/libs/configmgr.ts +++ b/bin/libs/configmgr.ts @@ -506,7 +506,6 @@ const SPECIAL_ENV_MAPS = { ZWE_java_home:'JAVA_HOME', ZWE_zOSMF_host: 'ZOSMF_HOST', ZWE_zOSMF_port: 'ZOSMF_PORT', - ZWE_zOSMF_scheme: 'ZOSMF_SCHEME', ZWE_zOSMF_applId: 'ZOSMF_APPLID' };