Merge pull request #581 from zowe/feature/various-keyring

Update defaults.yaml for other keyring types
zowe · Nov 16, 2023 · 49b1fad · 49b1fad
2 parents 031f072 + 8887103
commit 49b1fad
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,7 +2,8 @@
 
 All notable changes to the ZSS package will be documented in this file.
 
-## Recent Changes
+## `2.13.0`
+- Enhancement: Change pattern matching for keyrings to allow more types of keyrings in the future (#581)
 - Bugfix:  Corrected build environment file's use of IP address to github.com (#660)
 
 ## `2.10.0`

diff --git a/defaults.yaml b/defaults.yaml
@@ -14,8 +14,8 @@ components:
         fallback: true
         retryIntervalSeconds: 10
       https:
-        keyring: ${{ ()=> { if (components.zss.tls) { if (zowe.certificate.keystore.type == "JCERACFKS") { return zowe.certificate.keystore.file.replace(/safkeyring:\/+/,"") } else { return zowe.certificate.keystore.file } } else { return null } }() }}
-        password: ${{ ()=> { if (components.zss.tls) { if (zowe.certificate.keystore.type == "JCERACFKS") { return null } else { return zowe.certificate.keystore.password } } else { return null } }() }}
+        keyring: ${{ ()=> { if (components.zss.tls) { if (zowe.certificate.keystore.type.match(/JCE.*KS/)) { return zowe.certificate.keystore.file.replace(/safkeyring.*:\/+/,"") } else { return zowe.certificate.keystore.file } } else { return null } }() }}
+        password: ${{ ()=> { if (components.zss.tls) { if (zowe.certificate.keystore.type.match(/JCE.*KS/)) { return null } else { return zowe.certificate.keystore.password } } else { return null } }() }}
         label: ${{ ()=> { if (components.zss.tls) { return zowe.certificate.keystore.alias } else { return null } }() }}
         port: ${{ ()=> { if (components.zss.tls) { return  components.zss.port } else { return null } }() }}
         ipAddresses: ${{ ()=> { if (components.zss.tls){ if (zowe.environments?.ZWED_agent_https_ipAddresses){ return zowe.environments.ZWED_agent_https_ipAddresses.split(',') } else { return [ '0.0.0.0' ] } } else { return null } }() }}