User/markackert/v2x rc revert schema changes (#3678)

* Remove node 14 support node 14 is no longer supported. our documentation says so Signed-off-by: 1000TurquoisePogs <[email protected]> * Update node.sh Signed-off-by: 1000TurquoisePogs <[email protected]> * Update cicd-test.yml Signed-off-by: 1000TurquoisePogs <[email protected]> * Update cicd-test-readme.md Signed-off-by: 1000TurquoisePogs <[email protected]> * Update make_matrix.sh Signed-off-by: 1000TurquoisePogs <[email protected]> * Update node.sh Signed-off-by: 1000TurquoisePogs <[email protected]> * Tracing messages with correct function names (#3619) Signed-off-by: Martin Zeithaml <[email protected]> * Replace introspect URL with JWK for OIDC validation (#3614) * Replace introspect url with JWK Signed-off-by: at670475 <[email protected]> * fix name Signed-off-by: at670475 <[email protected]> * temporary change to test Signed-off-by: at670475 <[email protected]> * fix Signed-off-by: at670475 <[email protected]> * fix Signed-off-by: at670475 <[email protected]> * revert back the manifest.json Signed-off-by: at670475 <[email protected]> --------- Signed-off-by: at670475 <[email protected]> Co-authored-by: Mark Ackert <[email protected]> * Ensure workflow files are in ascii in final PAX (#3593) * build: convert workflow files to ascii before paxing Signed-off-by: MarkAckert <[email protected]> * chore: add changelog Signed-off-by: MarkAckert <[email protected]> * build: adjust dir base Signed-off-by: MarkAckert <[email protected]> * build: remove quotes from ls command Signed-off-by: MarkAckert <[email protected]> * build: fix quotes in iconv Signed-off-by: MarkAckert <[email protected]> * deleted hyphen Signed-off-by: mm667937 <[email protected]> * script was trying to convert files that are in input directory but it was trying it from working directory Signed-off-by: mm667937 <[email protected]> * build: fix variable Signed-off-by: MarkAckert <[email protected]> * build: correct conversion script; use find instead of ls Signed-off-by: MarkAckert <[email protected]> * Have to convert all the workflows back to IBM-1047 before copy into dataset(not going into pswi, just test dir) Signed-off-by: mm667937 <[email protected]> * update changelog target version Signed-off-by: MarkAckert <[email protected]> --------- Signed-off-by: MarkAckert <[email protected]> Signed-off-by: mm667937 <[email protected]> Co-authored-by: mm667937 <[email protected]> * Formatting in general pattern (#3615) Signed-off-by: Martin Zeithaml <[email protected]> Co-authored-by: Mark Ackert <[email protected]> * add new PTF numbers Signed-off-by: ojcelis <[email protected]> * Promote PTF after release v2.12.0 Signed-off-by: zowe-robot <[email protected]> * updated PTF bucket Signed-off-by: ojcelis <[email protected]> * Update cicd-test-readme.md Signed-off-by: 1000TurquoisePogs <[email protected]> * Update cicd-test.yml Signed-off-by: 1000TurquoisePogs <[email protected]> * update zowe version to next release Signed-off-by: ojcelis <[email protected]> * build: remove node v14/v16 refs; cicd defaults to v16 Signed-off-by: MarkAckert <[email protected]> * Make example-zowe.yaml certificate scenarios more accurate Signed-off-by: Leanid Astrakou <[email protected]> * Add global and component level network configuration options (#3509) * Add global and component level network configuration options Signed-off-by: Timothy Gerstel <[email protected]> * Use zoweIpv4 for bind addresses and update tls settings to enums Signed-off-by: Timothy Gerstel <[email protected]> * Deduplicate schema and separate server from client Also change "bind" to "listen" and tls prefix with TLSv, as seen in the majority of our servers. Signed-off-by: 1000TurquoisePogs <[email protected]> * Fix schema json syntax Signed-off-by: 1000TurquoisePogs <[email protected]> * Shorten tlsSettings to tls, and fix plural ipAddresses Signed-off-by: 1000TurquoisePogs <[email protected]> --------- Signed-off-by: Timothy Gerstel <[email protected]> Signed-off-by: 1000TurquoisePogs <[email protected]> Co-authored-by: 1000TurquoisePogs <[email protected]> * Build: fix failing chown from build step (#3658) * build: remove failing chown from build step Signed-off-by: MarkAckert <[email protected]> * build: update mkdir to _cmd, chown _super to _cmd Signed-off-by: MarkAckert <[email protected]> * chore: update comment Signed-off-by: MarkAckert <[email protected]> --------- Signed-off-by: MarkAckert <[email protected]> * zzow system updates (#3651) * build: zzow04 to zzow08 Signed-off-by: MarkAckert <[email protected]> * build: add port Signed-off-by: MarkAckert <[email protected]> * build: remove explicit pax vars. action defaults updated. Signed-off-by: MarkAckert <[email protected]> * build: update marist system names Signed-off-by: MarkAckert <[email protected]> * chore: update playbook hosts Signed-off-by: MarkAckert <[email protected]> * chore: change ansible port for new systems Signed-off-by: MarkAckert <[email protected]> * test: update failing vt test; system response correct Signed-off-by: MarkAckert <[email protected]> * build: update PSWI builds for zzow07 Signed-off-by: MarkAckert <[email protected]> * chore: lint fix Signed-off-by: MarkAckert <[email protected]> * chore: update random gen to create 6,7,8 Signed-off-by: MarkAckert <[email protected]> * build: temporarily disable vt test Signed-off-by: MarkAckert <[email protected]> * build: comment out entire file (lint errors) Signed-off-by: MarkAckert <[email protected]> --------- Signed-off-by: MarkAckert <[email protected]> * Update TLS settings (#3659) * Update TLS settings Signed-off-by: 1000TurquoisePogs <[email protected]> * Update zowe-yaml-schema.json Signed-off-by: 1000TurquoisePogs <[email protected]> --------- Signed-off-by: 1000TurquoisePogs <[email protected]> Co-authored-by: Mark Ackert <[email protected]> * Add getesm to build (#3663) * Add getesm to build Signed-off-by: 1000TurquoisePogs <[email protected]> * Update README.md Signed-off-by: Martin Zeithaml <[email protected]> --------- Signed-off-by: 1000TurquoisePogs <[email protected]> Signed-off-by: Martin Zeithaml <[email protected]> Co-authored-by: Martin Zeithaml <[email protected]> * Reduce string fields by introducing better typing (#3617) * Reduce string fields by introducing better typing Signed-off-by: 1000TurquoisePogs <[email protected]> * Add new reusable types Signed-off-by: 1000TurquoisePogs <[email protected]> --------- Signed-off-by: 1000TurquoisePogs <[email protected]> Signed-off-by: Mark Ackert <[email protected]> Co-authored-by: Mark Ackert <[email protected]> * build: update zzow matrix generator (#3665) Signed-off-by: MarkAckert <[email protected]> * Added more clarification to example-zowe.yaml (#3660) * Added more clarification Signed-off-by: Leanid Astrakou <[email protected]> * 512 char --> 126 Signed-off-by: Leanid Astrakou <[email protected]> --------- Signed-off-by: Leanid Astrakou <[email protected]> Co-authored-by: ojcelis <[email protected]> Co-authored-by: Mark Ackert <[email protected]> Co-authored-by: 1000TurquoisePogs <[email protected]> * Add zosmf scheme option for at-tls in api ml (#3661) * add zosmf scheme option for at-tls in api ml Signed-off-by: Pablo Hernán Carle <[email protected]> * add common-java Signed-off-by: Pablo Hernán Carle <[email protected]> * common-java lib package Signed-off-by: Pablo Hernán Carle <[email protected]> * try without comp Signed-off-by: Pablo Hernán Carle <[email protected]> * back to allowlist common-java-lib Signed-off-by: Pablo Hernán Carle <[email protected]> * remove env Signed-off-by: Pablo Hernán Carle <[email protected]> --------- Signed-off-by: Pablo Hernán Carle <[email protected]> Co-authored-by: Pablo Hernán Carle <[email protected]> Co-authored-by: Mark Ackert <[email protected]> * Revert "Reduce string fields by introducing better typing (#3617)" (#3674) This reverts commit 1190cbb. Signed-off-by: MarkAckert <[email protected]> * Revert "Reduce string fields by introducing better typing (#3617)" (#3674) This reverts commit 1190cbb. Signed-off-by: MarkAckert <[email protected]> --------- Signed-off-by: 1000TurquoisePogs <[email protected]> Signed-off-by: Martin Zeithaml <[email protected]> Signed-off-by: at670475 <[email protected]> Signed-off-by: MarkAckert <[email protected]> Signed-off-by: mm667937 <[email protected]> Signed-off-by: ojcelis <[email protected]> Signed-off-by: zowe-robot <[email protected]> Signed-off-by: ojcelis <[email protected]> Signed-off-by: Mark Ackert <[email protected]> Signed-off-by: Leanid Astrakou <[email protected]> Signed-off-by: Timothy Gerstel <[email protected]> Signed-off-by: Martin Zeithaml <[email protected]> Signed-off-by: Pablo Hernán Carle <[email protected]> Co-authored-by: 1000TurquoisePogs <[email protected]> Co-authored-by: Martin Zeithaml <[email protected]> Co-authored-by: Andrea Tabone <[email protected]> Co-authored-by: mm667937 <[email protected]> Co-authored-by: ojcelis <[email protected]> Co-authored-by: zowe-robot <[email protected]> Co-authored-by: ojcelis <[email protected]> Co-authored-by: Leanid Astrakou <[email protected]> Co-authored-by: Timothy Gerstel <[email protected]> Co-authored-by: Leanid Astrakou <[email protected]> Co-authored-by: Pablo Carle <[email protected]> Co-authored-by: Pablo Hernán Carle <[email protected]>
zowe · Dec 4, 2023 · 0defbff · 0defbff
1 parent 8a4ceaa
commit 0defbff
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 44 deletions.
diff --git 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
@@ -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": "<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"
                 }
               }
@@ -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": {