From 50a3caea712675334ce26ed0026d0be404e8bb33 Mon Sep 17 00:00:00 2001 From: Mark Ackert <35308966+MarkAckert@users.noreply.github.com> Date: Fri, 1 Dec 2023 09:27:16 -0500 Subject: [PATCH] Revert "Reduce string fields by introducing better typing (#3617)" This reverts commit 1190cbbd35e7ef5eb6e7234b830f856c1f6a970a. Signed-off-by: MarkAckert --- schemas/server-common.json | 21 ----------------- schemas/zowe-yaml-schema.json | 44 +++++++++++++++++------------------ 2 files changed, 21 insertions(+), 44 deletions(-) diff --git a/schemas/server-common.json b/schemas/server-common.json index cf9e0a6c80..4eaa81feb1 100644 --- a/schemas/server-common.json +++ b/schemas/server-common.json @@ -46,27 +46,6 @@ "minLength": 1, "maxLength": 8 }, - "userAnyCase": { - "$anchor": "zoweUserAnyCase", - "type": "string", - "pattern": "^([A-Za-z0-9$#@]){1,8}$", - "minLength": 1, - "maxLength": 8 - }, - "groupNameAnyCase": { - "$anchor": "zoweGroupNameAnyCase", - "type": "string", - "pattern": "[A-Z#$@][A-Z0-9Z#@]{0,7}", - "minLength": 1, - "maxLength": 8 - }, - "groupNameUppercase": { - "$anchor": "zoweGroup", - "type": "string", - "pattern": "[A-Za-z#$@][A-Za-z0-9Z#@]{0,7}", - "minLength": 1, - "maxLength": 8 - }, "token": { "$anchor": "zoweToken", "type": "string", diff --git a/schemas/zowe-yaml-schema.json b/schemas/zowe-yaml-schema.json index ceca72bcb0..23bebfff07 100644 --- a/schemas/zowe-yaml-schema.json +++ b/schemas/zowe-yaml-schema.json @@ -21,15 +21,15 @@ "description": "MVS data set related configurations", "properties": { "prefix": { - "$ref": "/schemas/v2/server-common#zoweDataset", + "type": "string", "description": "Where Zowe MVS data sets will be installed" }, "proclib": { - "$ref": "/schemas/v2/server-common#zoweDataset", + "type": "string", "description": "PROCLIB where Zowe STCs will be copied over" }, "parmlib": { - "$ref": "/schemas/v2/server-common#zoweDataset", + "type": "string", "description": "Zowe PARMLIB" }, "parmlibMembers": { @@ -44,21 +44,21 @@ } }, "jcllib": { - "$ref": "/schemas/v2/server-common#zoweDataset", + "type": "string", "description": "JCL library where Zowe will store temporary JCLs during initialization" }, "loadlib": { - "$ref": "/schemas/v2/server-common#zoweDataset", + "type": "string", "description": "States the dataset where Zowe executable utilities are located", "default": ".SZWELOAD" }, "authLoadlib": { - "$ref": "/schemas/v2/server-common#zoweDataset", + "type": "string", "description": "The dataset that contains any Zowe core code that needs to run APF-authorized, such as ZIS", "default": ".SZWEAUTH" }, "authPluginLib": { - "$ref": "/schemas/v2/server-common#zoweDataset", + "type": "string", "description": "APF authorized LOADLIB for Zowe ZIS Plugins" } } @@ -103,17 +103,17 @@ "description": "security group name", "properties": { "admin": { - "$ref": "/schemas/v2/server-common#zoweGroupNameAnyCase", + "type": "string", "description": "Zowe admin user group", "default": "ZWEADMIN" }, "stc": { - "$ref": "/schemas/v2/server-common#zoweGroupNameAnyCase", + "type": "string", "description": "Zowe STC group", "default": "ZWEADMIN" }, "sysProg": { - "$ref": "/schemas/v2/server-common#zoweGroupNameAnyCase", + "type": "string", "description": "Zowe SysProg group", "default": "ZWEADMIN" } @@ -125,12 +125,12 @@ "description": "security user name", "properties": { "zowe": { - "$ref": "/schemas/v2/server-common#zoweUserAnyCase", + "type": "string", "description": "Zowe runtime user name of main service", "default": "ZWESVUSR" }, "zis": { - "$ref": "/schemas/v2/server-common#zoweUserAnyCase", + "type": "string", "description": "Zowe runtime user name of ZIS", "default": "ZWESIUSR" } @@ -142,17 +142,17 @@ "description": "STC names", "properties": { "zowe": { - "$ref": "/schemas/v2/server-common#zoweJobname", + "type": "string", "description": "STC name of main service", "default": "ZWESLSTC" }, "zis": { - "$ref": "/schemas/v2/server-common#zoweJobname", + "type": "string", "description": "STC name of ZIS", "default": "ZWESISTC" }, "aux": { - "$ref": "/schemas/v2/server-common#zoweJobname", + "type": "string", "description": "STC name of Auxiliary Service", "default": "ZWESASTC" } @@ -244,7 +244,7 @@ "description": "Configure this section if you are using z/OS keyring", "properties": { "owner": { - "$ref": "/schemas/v2/server-common#zoweUserAnyCase", + "type": "string", "description": "keyring owner. If this is empty, Zowe will use the user ID defined as zowe.setup.security.users.zowe." }, "name": { @@ -282,7 +282,7 @@ "description": "Configure this section if you want to import existing certificate stored in data set to Zowe.", "properties": { "dsName": { - "$ref": "/schemas/v2/server-common#zoweDataset", + "type": "string", "description": "Name of the data set holds the certificate issued by other CA. This data set should be in PKCS12 format and contain private key." }, "password": { @@ -301,7 +301,7 @@ "description": "z/OSMF certificate authority alias" }, "user": { - "$ref": "/schemas/v2/server-common#zoweUserAnyCase", + "type": "string", "description": "z/OSMF user. Zowe initialization utility can detect alias of z/OSMF CA for RACF security system. The automated detection requires this z/OSMF user as input." } } @@ -339,8 +339,7 @@ }, "country": { "type": "string", - "description": "2 letters country code of certificate generated by Zowe.", - "pattern": "[A-Z][A-Z]" + "description": "2 letters country code of certificate generated by Zowe." } } }, @@ -378,8 +377,7 @@ }, "volume": { "type": "string", - "description": "Volume name if you are using VSAM in NONRLS mode", - "maxLength": 6 + "description": "Volume name if you are using VSAM in NONRLS mode" }, "storageClass": { "type": "string", @@ -411,7 +409,7 @@ "description": "Customize your Zowe z/OS JES job.", "properties": { "name": { - "$ref": "/schemas/v2/server-common#zoweJobname", + "type": "string", "description": "Job name of Zowe primary ZWESLSTC started task." }, "prefix": {