From 8c220246a726826e7ed7ee76a829998218605e54 Mon Sep 17 00:00:00 2001 From: James Struga Date: Mon, 8 Jan 2024 11:10:36 -0500 Subject: [PATCH 1/3] Add return code to zis plugin install Signed-off-by: James Struga --- bin/libs/component.sh | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/bin/libs/component.sh b/bin/libs/component.sh index 6494b53930..7f405e972f 100644 --- a/bin/libs/component.sh +++ b/bin/libs/component.sh @@ -551,6 +551,10 @@ zis_plugin_install() { if [ $changed -eq 1 ]; then copy_to_data_set "$parmlib_member_as_unix_file" "$zwes_zis_parmlib($zwes_zis_parmlib_member)" "" "true" + if [ $? != 0 ]; then + print_error "Error ZWEL0200E: Failed to copy USS file ${parmlib_member_as_unix_file} to MVS data set ${zwes_zis_parmlib}." + return 200 + fi fi } From 832bd260676afbc9d56213561b361ad76c7abafa Mon Sep 17 00:00:00 2001 From: James Struga Date: Mon, 8 Jan 2024 11:15:53 -0500 Subject: [PATCH 2/3] add typescript too Signed-off-by: James Struga --- bin/libs/component.ts | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/bin/libs/component.ts b/bin/libs/component.ts index 7318c3b4ff..1680ca3f61 100644 --- a/bin/libs/component.ts +++ b/bin/libs/component.ts @@ -672,7 +672,11 @@ export function zisPluginInstall(pluginPath: string, zisPluginlib: string, zisPa if (changed) { common.printDebug(`Parmlib modified, writing as \n${parmlibContents}`); xplatform.storeFileUTF8(parmlibMemberAsUnixFile, xplatform.AUTO_DETECT, parmlibContents); - zosdataset.copyToDataset(parmlibMemberAsUnixFile, `${zisParmlib}(${zisParmlibMember})`, "", true); + const rc = zosdataset.copyToDataset(parmlibMemberAsUnixFile, `${zisParmlib}(${zisParmlibMember})`, "", true); + if (rc != 0) { + common.printError(`Error ZWEL0200E: Failed to copy USS file ${parmlibMemberAsUnixFile} to MVS data set ${zisParmlib}.`); + return 200; + } } return 0; } From 62415b51de71ac63b7307e729c20e8447c692846 Mon Sep 17 00:00:00 2001 From: James Struga Date: Mon, 8 Jan 2024 14:12:46 -0500 Subject: [PATCH 3/3] Schema missing in staging Signed-off-by: James Struga --- schemas/zowe-yaml-schema.json | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/schemas/zowe-yaml-schema.json b/schemas/zowe-yaml-schema.json index 23bebfff07..32fe423772 100644 --- a/schemas/zowe-yaml-schema.json +++ b/schemas/zowe-yaml-schema.json @@ -861,11 +861,25 @@ "properties": { "network": { "$ref": "#/$defs/networkSettings" + }, + "job": { + "$ref": "#/$defs/componentJobSettings" } } } } }, + "componentJobSettings": { + "$anchor": "componentJobSettings", + "type": "object", + "description": "Component level overrides for job execution behavior", + "properties": { + "suffix": { + "type": "string", + "description": "Can be used by components to declare a jobname suffix to append to their job. This is not currently used by Zowe itself, it is up to components to use this value if desired. Zowe may use this value in the future." + } + } + }, "tlsSettings": { "$anchor": "tlsSettings", "type": "object",