Skip to content

Commit

Permalink
Merge branch 'v2.x/staging' into reboot/zosmf-scheme
Browse files Browse the repository at this point in the history
  • Loading branch information
@MarkAckert
MarkAckert authored Nov 28, 2023
2 parents ecd988d + d6234a2 commit 4bf219c
Show file tree
Hide file tree
Showing 3 changed files with 45 additions and 22 deletions.
2 changes: 1 addition & 1 deletion .github/scripts/cicd_test/make_matrix.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ if [[ ! -z "$test_force_system" ]]; then
else
if [[ -z "$dont_parse_test_server" ]]; then
if [[ "$test_server" == "Any zzow servers" ]]; then
test_server="zzow0"$(echo $(($RANDOM % 3 + 2)))
test_server="zzow0"$(echo $(($RANDOM % 3 + 6)))
fi
TEST_FILE_SERVER="$test_file($test_server)"
else
Expand Down
21 changes: 21 additions & 0 deletions schemas/server-common.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,27 @@
"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: 23 additions & 21 deletions schemas/zowe-yaml-schema.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,15 +21,15 @@
"description": "MVS data set related configurations",
"properties": {
"prefix": {
"type": "string",
"$ref": "/schemas/v2/server-common#zoweDataset",
"description": "Where Zowe MVS data sets will be installed"
},
"proclib": {
"type": "string",
"$ref": "/schemas/v2/server-common#zoweDataset",
"description": "PROCLIB where Zowe STCs will be copied over"
},
"parmlib": {
"type": "string",
"$ref": "/schemas/v2/server-common#zoweDataset",
"description": "Zowe PARMLIB"
},
"parmlibMembers": {
Expand All @@ -44,21 +44,21 @@
}
},
"jcllib": {
"type": "string",
"$ref": "/schemas/v2/server-common#zoweDataset",
"description": "JCL library where Zowe will store temporary JCLs during initialization"
},
"loadlib": {
"type": "string",
"$ref": "/schemas/v2/server-common#zoweDataset",
"description": "States the dataset where Zowe executable utilities are located",
"default": "<hlq>.SZWELOAD"
},
"authLoadlib": {
"type": "string",
"$ref": "/schemas/v2/server-common#zoweDataset",
"description": "The dataset that contains any Zowe core code that needs to run APF-authorized, such as ZIS",
"default": "<hlq>.SZWEAUTH"
},
"authPluginLib": {
"type": "string",
"$ref": "/schemas/v2/server-common#zoweDataset",
"description": "APF authorized LOADLIB for Zowe ZIS Plugins"
}
}
Expand Down Expand Up @@ -103,17 +103,17 @@
"description": "security group name",
"properties": {
"admin": {
"type": "string",
"$ref": "/schemas/v2/server-common#zoweGroupNameAnyCase",
"description": "Zowe admin user group",
"default": "ZWEADMIN"
},
"stc": {
"type": "string",
"$ref": "/schemas/v2/server-common#zoweGroupNameAnyCase",
"description": "Zowe STC group",
"default": "ZWEADMIN"
},
"sysProg": {
"type": "string",
"$ref": "/schemas/v2/server-common#zoweGroupNameAnyCase",
"description": "Zowe SysProg group",
"default": "ZWEADMIN"
}
Expand All @@ -125,12 +125,12 @@
"description": "security user name",
"properties": {
"zowe": {
"type": "string",
"$ref": "/schemas/v2/server-common#zoweUserAnyCase",
"description": "Zowe runtime user name of main service",
"default": "ZWESVUSR"
},
"zis": {
"type": "string",
"$ref": "/schemas/v2/server-common#zoweUserAnyCase",
"description": "Zowe runtime user name of ZIS",
"default": "ZWESIUSR"
}
Expand All @@ -142,17 +142,17 @@
"description": "STC names",
"properties": {
"zowe": {
"type": "string",
"$ref": "/schemas/v2/server-common#zoweJobname",
"description": "STC name of main service",
"default": "ZWESLSTC"
},
"zis": {
"type": "string",
"$ref": "/schemas/v2/server-common#zoweJobname",
"description": "STC name of ZIS",
"default": "ZWESISTC"
},
"aux": {
"type": "string",
"$ref": "/schemas/v2/server-common#zoweJobname",
"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": {
"type": "string",
"$ref": "/schemas/v2/server-common#zoweUserAnyCase",
"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": {
"type": "string",
"$ref": "/schemas/v2/server-common#zoweDataset",
"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": {
"type": "string",
"$ref": "/schemas/v2/server-common#zoweUserAnyCase",
"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,7 +339,8 @@
},
"country": {
"type": "string",
"description": "2 letters country code of certificate generated by Zowe."
"description": "2 letters country code of certificate generated by Zowe.",
"pattern": "[A-Z][A-Z]"
}
}
},
Expand Down Expand Up @@ -377,7 +378,8 @@
},
"volume": {
"type": "string",
"description": "Volume name if you are using VSAM in NONRLS mode"
"description": "Volume name if you are using VSAM in NONRLS mode",
"maxLength": 6
},
"storageClass": {
"type": "string",
Expand Down Expand Up @@ -409,7 +411,7 @@
"description": "Customize your Zowe z/OS JES job.",
"properties": {
"name": {
"type": "string",
"$ref": "/schemas/v2/server-common#zoweJobname",
"description": "Job name of Zowe primary ZWESLSTC started task."
},
"prefix": {
Expand Down

0 comments on commit 4bf219c

Please sign in to comment.