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

TEST - app server attls #3792

Closed
wants to merge 11 commits into from
Closed

TEST - app server attls #3792

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
2a2e5d8
Update manifest.json.template
1000TurquoisePogs Apr 8, 2024
9961828
Update example-zowe.yaml
1000TurquoisePogs Apr 8, 2024
74328c5
Update manifest.json.template
1000TurquoisePogs Apr 8, 2024
a8f6ef3
Merge branch 'test/attlsSchema' of github.com:zowe/zowe-install-packa…
1000TurquoisePogs Apr 9, 2024
c3c4a52
Merge branch 'test/attlsSchema' of github.com:zowe/zowe-install-packa…
1000TurquoisePogs Apr 9, 2024
0bbc976
Update manifest.json.template
1000TurquoisePogs Apr 10, 2024
34b27cf
Update manifest.json.template
1000TurquoisePogs Apr 10, 2024
c7e8b91
Fix schema to allow proper include or exclude of attls
1000TurquoisePogs Apr 16, 2024
fc6eb75
Merge branch 'bugfix/v2/app-server-attls' of github.com:zowe/zowe-ins…
1000TurquoisePogs Apr 16, 2024
09d3825
string to boolean change
1000TurquoisePogs Apr 17, 2024
8506978
Update manifest.json.template
1000TurquoisePogs Apr 17, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion manifest.json.template
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
},
"binaryDependencies": {
"org.zowe.zlux.zlux-core": {
"version": "^2.0.0-V2.X-STAGING-ZLUX-CORE",
"version": "^2.15.1-747-v2.x-staging-zlux-build",
"artifact": "*.pax"
},
"org.zowe.zlux.sample-angular-app": {
Expand Down
16 changes: 14 additions & 2 deletions schemas/zowe-yaml-schema.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -883,7 +883,19 @@
"nativeTlsSettings": {
"$anchor": "nativeTlsSettings",
"type": "object",
"additionalProperties": false,
"properties": {
"attls": {
"anyOf": [
{
"type": "string",
"enum": [ "", "false" ]
},
{
"const": false
}
]
},
"ciphers": {
"type": "array",
"description": "Acceptable TLS cipher suites for network connections, in IANA format.",
Expand Down Expand Up @@ -949,7 +961,7 @@
"description": "Whether or not to ensure that the port a server is about to use is available. Usually, servers will know this when they attempt to bind to a port, so this option allows you to disable the additional verification step."
},
"tls": {
"oneOf": [
"anyOf": [
{ "$ref": "#/$defs/attlsSetting" },
{ "$ref": "#/$defs/nativeTlsSettings" }
]
Expand All @@ -963,7 +975,7 @@
"description": "Optional, advanced network configuration parameters for Zowe servers when sending requests as clients.",
"properties": {
"tls": {
"oneOf": [
"anyOf": [
{ "$ref": "#/$defs/attlsSetting" },
{ "$ref": "#/$defs/nativeTlsSettings" }
]
Expand Down
Loading