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

https standardization test #3638

Closed
wants to merge 9 commits into from
Closed

https standardization test #3638

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
ba958a1
Add global and component level network configuration options
timgerstel Jul 17, 2023
1fb66ad
Use zoweIpv4 for bind addresses and update tls settings to enums
timgerstel Jul 17, 2023
d01b726
Merge branch 'v2.x/staging' into schema/network/https
timgerstel Jul 19, 2023
ee94623
Merge branch 'v2.x/staging' into schema/network/https
timgerstel Jul 19, 2023
a2a3d52
Deduplicate schema and separate server from client
1000TurquoisePogs Oct 11, 2023
f984e95
Fix schema json syntax
1000TurquoisePogs Oct 27, 2023
89487c8
Shorten tlsSettings to tls, and fix plural ipAddresses
1000TurquoisePogs Nov 10, 2023
b593250
Update manifest.json.template
1000TurquoisePogs Oct 27, 2023
8818631
Merge branch 'v2.x/staging' into schema/network/https-test
1000TurquoisePogs Nov 10, 2023
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
4 changes: 2 additions & 2 deletions 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.12.0-zlux-app-server-PR-284",
"artifact": "*.pax"
},
"org.zowe.zlux.sample-angular-app": {
Expand Down Expand Up @@ -40,7 +40,7 @@
"artifact": "*.pax"
},
"org.zowe.zss": {
"version": "^2.0.0-STAGING",
"version": "^2.12.0-PR-659",
"artifact": "*.pax"
},
"org.zowe.explorer.jobs.jobs-api-package": {
Expand Down
101 changes: 87 additions & 14 deletions schemas/zowe-yaml-schema.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -419,20 +419,7 @@
}
},
"network": {
"type": "object",
"additionalProperties": false,
"description": "Optional, advanced network configuration parameters",
"properties": {
"vipaIp": {
"type": "string",
"description": "The IP address which all of the Zowe servers will be binding to. If you are using multiple DIPVA addresses, do not use this option."
},
"validatePortFree": {
"type": "boolean",
"default": true,
"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."
}
}
"$ref": "#/$defs/networkSettings"
},
"extensionRegistry": {
"type": "object",
Expand Down Expand Up @@ -854,6 +841,92 @@
"default": "yes"
}
}
},
"zowe": {
"type": "object",
"description": "Component level overrides for top level Zowe network configuration.",
"additionalProperties": false,
"properties": {
"network": {
"$ref": "#/$defs/networkSettings"
}
}
}
}
},
"tlsSettings": {
"$anchor": "tlsSettings",
"type": "object",
"properties": {
"ciphers": {
"type": "array",
"description": "Acceptable TLS cipher suites for network connections.",
"items": {
"type": "string"
}
},
"curves": {
"type": "array",
"description": "Acceptable key exchange elliptic curves for network connections.",
"items": {
"type": "string"
}
},
"maxTls": {
"type": "string",
"enum": ["TLSv1.0", "TLSv1.1", "TLSv1.2", "TLSv1.3"],
"default": "TLSv1.3",
"description": "Maximum TLS version allowed for network connections."
},
"minTls": {
"type": "string",
"enum": ["TLSv1.0", "TLSv1.1", "TLSv1.2", "TLSv1.3"],
"default": "TLSv1.3",
"description": "Minimum TLS version allowed for network connections, and less than network.maxTls."
}
}
},
"networkSettings": {
"type": "object",
"$anchor": "networkSettings",
"additionalProperties": false,
"description": "Optional, advanced network configuration parameters",
"properties": {
"server": {
"type": "object",
"additionalProperties": false,
"description": "Optional, advanced network configuration parameters for Zowe servers",
"properties": {
"tls": {
"$ref": "#/$defs/tlsSettings"
},
"listenAddresses": {
"type": "array",
"description": "The IP addresses which all of the Zowe servers will be binding on and listening to. Some servers may only support listening on the first element.",
"items": {
"$ref": "/schemas/v2/server-common#zoweIpv4"
}
},
"vipaIp": {
"type": "string",
"description": "The IP address which all of the Zowe servers will be binding to. If you are using multiple DIPVA addresses, do not use this option."
},
"validatePortFree": {
"type": "boolean",
"default": true,
"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."
}
}
},
"client": {
"type": "object",
"additionalProperties": false,
"description": "Optional, advanced network configuration parameters for Zowe servers when sending requests as clients.",
"properties": {
"tls": {
"$ref": "#/$defs/tlsSettings"
}
}
}
}
},
Expand Down
Loading