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

Jump to bottom

Update defaults.yaml for other keyring types #581

Merged
merged 7 commits into from
Nov 16, 2023
Merged

Update defaults.yaml for other keyring types #581

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
2e686d0
Update defaults.yaml
1000TurquoisePogs Mar 30, 2023
0b15722
Update defaults.yaml
1000TurquoisePogs Mar 30, 2023
a38d0ea
Merge branch 'v2.x/staging' into feature/various-keyring
JoeNemo Apr 5, 2023
42242df
Merge branch 'v2.x/staging' into feature/various-keyring
1000TurquoisePogs Jun 27, 2023
8a0d868
Merge branch 'v2.x/staging' into feature/various-keyring
1000TurquoisePogs Nov 15, 2023
83ffa19
Update CHANGELOG.md
1000TurquoisePogs Nov 16, 2023
8887103
Update CHANGELOG.md
1000TurquoisePogs Nov 16, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
3 changes: 2 additions & 1 deletion CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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`
Expand Down
4 changes: 2 additions & 2 deletions defaults.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 } }() }}
Expand Down