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

Add zosmf scheme option for at-tls in api ml #3661

Merged
merged 13 commits into from
Nov 29, 2023
Merged

Add zosmf scheme option for at-tls in api ml #3661

Show file tree
Hide file tree
Changes from 9 commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
dda176d
add zosmf scheme option for at-tls in api ml
Nov 23, 2023
57e82ae
add common-java
Nov 24, 2023
72fdba7
common-java lib package
Nov 24, 2023
d7926bb
try without comp
Nov 24, 2023
e6d80bd
back to allowlist common-java-lib
Nov 24, 2023
00e6bc6
Merge branch 'v2.x/staging' into reboot/zosmf-scheme
MarkAckert Nov 27, 2023
0178373
Merge remote-tracking branch 'origin/v2.x/staging' into reboot/zosmf-…
Nov 28, 2023
6612637
Merge branch 'reboot/zosmf-scheme' of https://github.com/zowe/zowe-in…
Nov 28, 2023
7c7ff94
Merge branch 'v2.x/staging' into reboot/zosmf-scheme
pablocarle Nov 28, 2023
c5dffaf
remove env
Nov 28, 2023
ecd988d
Merge branch 'reboot/zosmf-scheme' of https://github.com/zowe/zowe-in…
Nov 28, 2023
4bf219c
Merge branch 'v2.x/staging' into reboot/zosmf-scheme
MarkAckert Nov 28, 2023
4f55f71
Merge branch 'v2.x/staging' into reboot/zosmf-scheme
pablocarle Nov 29, 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
2 changes: 1 addition & 1 deletion .pax/pre-packaging.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -295,7 +295,7 @@ done

echo "[$SCRIPT_NAME] process commands.install hooks"
# not all core components has commands.install
for component in app-server; do
for component in app-server common-java-lib; do
echo "[$SCRIPT_NAME] - ${component}"
# FIXME: these environment variables are changed in v2
ZOWE_ROOT_DIR=${ZOWE_ROOT_DIR} \
Expand Down
1 change: 1 addition & 0 deletions bin/libs/configmgr.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -506,6 +506,7 @@ const SPECIAL_ENV_MAPS = {
ZWE_java_home:'JAVA_HOME',
ZWE_zOSMF_host: 'ZOSMF_HOST',
ZWE_zOSMF_port: 'ZOSMF_PORT',
ZWE_zOSMF_scheme: 'ZOSMF_SCHEME',
ZWE_zOSMF_applId: 'ZOSMF_APPLID'
};

Expand Down
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 @@ -97,7 +97,7 @@
"exclusions": ["*PR*.zip"]
},
"org.zowe.apiml.sdk.common-java-lib-package": {
"version": "~2.0.0-SNAPSHOT",
"version": "^2.0.0-SNAPSHOT",
"artifact": "common-java-lib-*.zip",
"exclusions": ["*PR*.zip"]
},
Expand Down
12 changes: 12 additions & 0 deletions schemas/zowe-yaml-schema.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -578,6 +578,10 @@
"$ref": "#/$defs/port",
"description": "Port number of your z/OSMF instance."
},
"scheme": {
"$ref" : "#/$defs/scheme",
"description": "Scheme used to connect to z/OSMF instance. Optional for outbout AT-TLS, defaults to https"
},
"applId": {
"type": "string",
"description": "Appl ID of your z/OSMF instance."
Expand Down Expand Up @@ -627,6 +631,14 @@
"minimum": 0,
"maximum": 65535
},
"scheme": {
"type": "string",
"enum": [
"http",
"https"
],
"default": "https"
},
"certificate": {
"oneOf": [
{ "$ref": "#/$defs/pkcs12-certificate" },
Expand Down
Loading