From 12b74f5d573dfbdce7415e2dbb20e41d038cd749 Mon Sep 17 00:00:00 2001
From: 1000TurquoisePogs <sgrady@rocketsoftware.com>
Date: Wed, 15 Nov 2023 09:14:52 -0500
Subject: [PATCH] Switch keyring pattern to allow more types of keyrings

Signed-off-by: 1000TurquoisePogs <sgrady@rocketsoftware.com>
---
 defaults/serverConfig/defaults.yaml | 6 +++---
 schemas/app-server-config.json      | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/defaults/serverConfig/defaults.yaml b/defaults/serverConfig/defaults.yaml
index c2daa70..3274548 100644
--- a/defaults/serverConfig/defaults.yaml
+++ b/defaults/serverConfig/defaults.yaml
@@ -32,7 +32,7 @@ components:
                      } else { return Number(7556); } };
                 a() }}"
         keys: '${{ function a() {
-                     if (zowe.certificate?.keystore?.type == "JCERACFKS") {
+                     if (zowe.certificate?.keystore?.type && zowe.certificate.keystore.type.match("JCE.*KS")) {
                        return [ zowe.certificate.keystore.file+"&"+zowe.certificate.keystore.alias ];
                      } else if (zowe.certificate?.pem?.key) {
                        return [ zowe.certificate.pem.key ];
@@ -40,7 +40,7 @@ components:
                        return [ "../defaults/serverConfig/zlux.keystore.key" ]; } };
                 a() }}'
         certificates: '${{ function a(){
-                             if (zowe.certificate?.keystore?.type == "JCERACFKS") {
+                             if (zowe.certificate?.keystore?.type && zowe.certificate.keystore.type.match("JCE.*KS")) {
                                return [ zowe.certificate.keystore.file+"&"+zowe.certificate.keystore.alias ];
                              } else if (zowe.certificate?.pem?.certificate) {
                                return [ zowe.certificate.pem.certificate ];
@@ -48,7 +48,7 @@ components:
                                return [ "../defaults/serverConfig/zlux.keystore.cer" ]; } };
                         a() }}'
         certificateAuthorities: '${{ function a() {
-                                       if (zowe.certificate?.truststore?.type == "JCERACFKS") {
+                                       if (zowe.certificate?.truststore?.type && zowe.certificate.truststore.type.match("JCE.*KS")) {
                                           return [ zowe.certificate.truststore.file ];
                                        } else if(zowe.certificate?.pem?.certificateAuthorities) {
                                           if (Array.isArray(zowe.certificate.pem.certificateAuthorities)) {
diff --git a/schemas/app-server-config.json b/schemas/app-server-config.json
index e815562..03d733f 100644
--- a/schemas/app-server-config.json
+++ b/schemas/app-server-config.json
@@ -660,14 +660,14 @@
     },
     "safKeyringCertObject": {
       "type": "string",
-      "pattern": "^safkeyring:(\/\/)+.*$"
+      "pattern": "^safkeyring.*:(\/\/)+.*$"
     },
     "pathCertObject": {
       "type": "string",
       "not": {
         "anyOf": [
           { "pattern": "^file:\/\/.*$" },
-          { "pattern": "^safkeyring:(\/\/)+.*$" }
+          { "pattern": "^safkeyring.*:(\/\/)+.*$" }
         ]
       }
     },