Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Revert "Reduce string fields by introducing better typing" #3674

Merged
merged 1 commit into from
Dec 1, 2023
+21 −44
Merged

Revert "Reduce string fields by introducing better typing" #3674

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 0 additions & 21 deletions schemas/server-common.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
44 changes: 21 additions & 23 deletions schemas/zowe-yaml-schema.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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": {
Expand All @@ -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": "<hlq>.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": "<hlq>.SZWEAUTH"
},
"authPluginLib": {
"$ref": "/schemas/v2/server-common#zoweDataset",
"type": "string",
"description": "APF authorized LOADLIB for Zowe ZIS Plugins"
}
}
Expand Down Expand Up @@ -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"
}
Expand All @@ -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"
}
Expand All @@ -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"
}
Expand Down Expand Up @@ -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": {
Expand Down Expand Up @@ -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": {
Expand All @@ -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."
}
}
Expand Down Expand Up @@ -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."
}
}
},
Expand Down Expand Up @@ -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",
Expand Down Expand Up @@ -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": {
Expand Down
Loading