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

Language refactor ZWECONF.xml #3913

Closed
wants to merge 3 commits into from
Closed

Language refactor ZWECONF.xml #3913

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f65716e
language refactoring
janan07 Jul 15, 2024
63278ab
language refactor
janan07 Jul 15, 2024
fb6c65c
Merge branch 'v2.x/staging' into janan07-language-refactor-zwes1606w
janan07 Jul 16, 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
72 changes: 38 additions & 34 deletions workflows/files/ZWECONF.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<workflowInfo>
<workflowID scope="none">config_zowe_20</workflowID>
<workflowDefaultName>Configuration of Zowe 2.0</workflowDefaultName>
<workflowDescription>Use this workflow to configure the Zowe 2.0</workflowDescription>
<workflowDescription>Use this workflow to configure Zowe 2.0</workflowDescription>
<workflowVersion>###ZOWE_VERSION###</workflowVersion>
<vendor>Zowe</vendor>
<General/>
Expand Down Expand Up @@ -69,7 +69,7 @@
<variable name="zowe_setup_dataset_loadlibPlugin" scope="instance" visibility="public">
<label>Zowe setup Utilities and extensions library</label>
<abstract>Load library where Zowe stores libraries for Utilities for use by Zowe and extensions</abstract>
<description>Load library for Utilities for use by Zowe and extensions</description>
<description>Load library for Utilities used by Zowe and extensions</description>
<category>zowe</category>
<string valueMustBeChoice="false" multiLine="false">
<!-- Put validation here -->
Expand Down Expand Up @@ -101,8 +101,8 @@
</variable>
<variable name="zowe_setup_vsam_mode" scope="instance" visibility="public">
<label>Zowe setup VSAM mode</label>
<abstract>VSAM data set with Record-Level-Sharing enabled or not</abstract>
<description>VSAM data set with Record-Level-Sharing enabled or not</description>
<abstract>VSAM data set with Record-Level-Sharing enabled or disabled</abstract>
<description>VSAM data set with Record-Level-Sharing enabled or disabled</description>
<category>components</category>
<string valueMustBeChoice="false" multiLine="false">
<!-- Put validation here -->
Expand Down Expand Up @@ -138,11 +138,11 @@
<description>Existing Zowe runtime.&lt;br /&gt;
If you created ZOWE via PSWI, &lt;br /&gt;
zowe runtime is your Target Mount Point from PSWI deployment. &lt;br /&gt;
It is used by ZWESLSTC or by zwe command</description>
It is used by ZWESLSTC or by the zwe command</description>
<category>zowe</category>
<string valueMustBeChoice="false" multiLine="false">
<regularExpression>~?(\/[^\/]+)+</regularExpression>
<errorMessage>Please specify proper full USS path ending without a trailing slash.</errorMessage>
<errorMessage>Please specify the proper full USS path ending without a trailing slash.</errorMessage>
</string>
</variable>
<variable name="zowe_logDirectory" scope="instance" visibility="public">
Expand Down Expand Up @@ -268,7 +268,11 @@ some use cases, like containerization, this port could be different.</descriptio
</variable>
<variable name="zowe_certificate_keystore_file" scope="instance" visibility="public">
<label>Zowe certificate keystore file</label>
<abstract>Zowe certificate keystore file. In case of keyring the format is "safkeyring://OWNER/KEYRING".</abstract>
<<<<<<< Updated upstream
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

merge conflict

<abstract>Zowe certificate keystore file. In case of keyring, the format is "safkeyring://OWNER/KEYRING".</abstract>
=======
<abstract>Zowe certificate keystore file. For keyring, the format is "safkeyring://OWNER/KEYRING".</abstract>
>>>>>>> Stashed changes
<description>Zowe certificate keystore file</description>
<category>certificates</category>
<string valueMustBeChoice="false" multiLine="false">
Expand Down Expand Up @@ -377,12 +381,12 @@ some use cases, like containerization, this port could be different.</descriptio
How we want to verify SSL certificates of services. Valid values are:
- STRICT: will validate if the certificate is trusted in our trust store and
if the certificate Command Name and Subject Alternative Name (SAN)
is validate. This is recommended for the best security.
are validated. This is recommended for the highest level of security.
- NONSTRICT: will validate if the certificate is trusted in our trust store.
This mode does not validate certificate Common Name and Subject
This mode does not validate the certificate Common Name and Subject
Alternative Name (SAN).
- DISABLED: disable certificate validation. This is NOT recommended for
security
security.
]]> </description>
<category>certificates</category>
<string valueMustBeChoice="true" multiLine="false">
Expand Down Expand Up @@ -460,8 +464,8 @@ How we want to verify SSL certificates of services. Valid values are:
</variable>
<variable name="components_gateway_port" scope="instance" visibility="public">
<label>Gateway port</label>
<abstract>Port for the APIML gateway</abstract>
<description>Port for the APIML gateway</description>
<abstract>Port for the API ML gateway</abstract>
<description>Port for the API ML gateway</description>
<category>components</category>
<integer>
<!-- Put validation here -->
Expand Down Expand Up @@ -492,7 +496,7 @@ How we want to verify SSL certificates of services. Valid values are:
</string>
</variable>
<variable name="components_gateway_apiml_security_auth_zosmf_jwtAutoconfiguration" scope="instance" visibility="public">
<label>Gateway APIML security auth z/OSMF jwtAutoconfiguration</label>
<label>Gateway API ML security auth z/OSMF jwtAutoconfiguration</label>
<abstract>JWT auto configuration for gateway security auth</abstract>
<description>JWT auto configuration for gateway security auth</description>
<category>components</category>
Expand All @@ -503,7 +507,7 @@ How we want to verify SSL certificates of services. Valid values are:
</string>
</variable>
<variable name="components_gateway_apiml_security_auth_zosmf_serviceId" scope="instance" visibility="public">
<label>Gateway APIML security auth z/OSMF serviceId</label>
<label>Gateway API ML security auth z/OSMF serviceId</label>
<abstract>Service ID for gateway security auth</abstract>
<description>Service ID for gateway security auth</description>
<category>components</category>
Expand All @@ -514,7 +518,7 @@ How we want to verify SSL certificates of services. Valid values are:
</string>
</variable>
<variable name="components_gateway_apiml_security_authorization_endpoint_enabled" scope="instance" visibility="public">
<label>Enable gateway APIML security authorization endpoint</label>
<label>Enable gateway API ML security authorization endpoint</label>
<abstract>Use this to enable the security authorization endpoint</abstract>
<description>Use this to enable the security authorization endpoint</description>
<category>components</category>
Expand All @@ -525,7 +529,7 @@ How we want to verify SSL certificates of services. Valid values are:
</boolean>
</variable>
<variable name="components_gateway_apiml_security_authorization_provider" scope="instance" visibility="public">
<label>Gateway APIML security authorization provider</label>
<label>Gateway API ML security authorization provider</label>
<abstract>Security authorization provider for the gateway</abstract>
<description>Security authorization provider for the gateway</description>
<category>components</category>
Expand All @@ -535,7 +539,7 @@ How we want to verify SSL certificates of services. Valid values are:
</string>
</variable>
<variable name="components_gateway_apiml_security_x509_enabled" scope="instance" visibility="public">
<label>Enable gateway APIML security x509</label>
<label>Enable gateway API ML security x509</label>
<abstract>Check to enable the gateway security x509</abstract>
<description>Check to enable the gateway security x509</description>
<category>components</category>
Expand Down Expand Up @@ -646,8 +650,8 @@ How we want to verify SSL certificates of services. Valid values are:
</variable>
<variable name="components_api_catalog_enabled" scope="instance" visibility="public">
<label>Enable API catalog</label>
<abstract>Use this option to enable the API catalog</abstract>
<description>Use this option to enable the API catalog</description>
<abstract>Use this option to enable the API Catalog</abstract>
<description>Use this option to enable the API Catalog</description>
<category>components</category>
<boolean>
<!-- Put validation here -->
Expand All @@ -657,8 +661,8 @@ How we want to verify SSL certificates of services. Valid values are:
</variable>
<variable name="components_api_catalog_port" scope="instance" visibility="public">
<label>API catalog port</label>
<abstract>Port on which the API catalog should be running.</abstract>
<description>Port on which the API catalog should be running.</description>
<abstract>Port on which the API Catalog should be running.</abstract>
<description>Port on which the API Catalog should be running.</description>
<category>components</category>
<integer>
<!-- Put validation here -->
Expand All @@ -668,8 +672,8 @@ How we want to verify SSL certificates of services. Valid values are:
</variable>
<variable name="components_api_catalog_debug" scope="instance" visibility="public">
<label>API catalog debug</label>
<abstract>Extra debugging information from API catalog.</abstract>
<description>Extra debugging information from API catalog.</description>
<abstract>Extra debugging information from API Catalog.</abstract>
<description>Extra debugging information from API Catalog.</description>
<category>components</category>
<boolean>
<!-- Put validation here -->
Expand Down Expand Up @@ -711,9 +715,9 @@ How we want to verify SSL certificates of services. Valid values are:
</boolean>
</variable>
<variable name="components_caching_service_enabled" scope="instance" visibility="public">
<label>Enable caching service</label>
<abstract>Check to enable the caching service</abstract>
<description>Check to enable the caching service</description>
<label>Enable Caching service</label>
<abstract>Check to enable the Caching service</abstract>
<description>Check to enable the Caching service</description>
<category>components</category>
<boolean>
<!-- Put validation here -->
Expand All @@ -723,8 +727,8 @@ How we want to verify SSL certificates of services. Valid values are:
</variable>
<variable name="components_caching_service_port" scope="instance" visibility="public">
<label>Caching service port</label>
<abstract>Port for the caching service</abstract>
<description>Port for the caching service</description>
<abstract>Port for the Caching service</abstract>
<description>Port for the Caching service</description>
<category>components</category>
<integer>
<!-- Put validation here -->
Expand Down Expand Up @@ -758,8 +762,8 @@ How we want to verify SSL certificates of services. Valid values are:
</variable>
<variable name="components_caching_service_storage_mode" scope="instance" visibility="public">
<label>Caching service storage mode</label>
<abstract>Specifies the components caching service storage mode</abstract>
<description>Specifies the components caching service storage mode</description>
<abstract>Specifies the components Caching service storage mode</abstract>
<description>Specifies the components Caching service storage mode</description>
<category>components</category>
<string valueMustBeChoice="true" multiLine="false">
<!-- Put validation here -->
Expand Down Expand Up @@ -1455,7 +1459,7 @@ How we want to verify SSL certificates of services. Valid values are:
<description>Always true</description>
<targetStateSet>
<extendStateExpression>
<description>Skipped if App Server wasn't selected</description>
<description>Skipped if App Server was not selected</description>
<expression>!${instance-components_app_server_enabled}</expression>
<targetState>skipped</targetState>
</extendStateExpression>
Expand All @@ -1479,7 +1483,7 @@ How we want to verify SSL certificates of services. Valid values are:
<description>Always true</description>
<targetStateSet>
<extendStateExpression>
<description>Skips the step if ZSS wasn't selected</description>
<description>Skips the step if ZSS was not selected</description>
<expression>!${instance-components_zss_enabled}</expression>
<targetState>skipped</targetState>
</extendStateExpression>
Expand All @@ -1505,7 +1509,7 @@ How we want to verify SSL certificates of services. Valid values are:
<description>Always true</description>
<targetStateSet>
<extendStateExpression>
<description>Skips if the Jobs API wasn't selected</description>
<description>Skips if the Jobs API was not selected</description>
<expression>!${instance-components_jobs_api_enabled}</expression>
<targetState>skipped</targetState>
</extendStateExpression>
Expand All @@ -1529,7 +1533,7 @@ How we want to verify SSL certificates of services. Valid values are:
<description>Always true</description>
<targetStateSet>
<extendStateExpression>
<description>Skips this step if the Files API wasn't selected</description>
<description>Skips this step if the Files API was not selected</description>
<expression>!${instance-components_files_api_enabled}</expression>
<targetState>skipped</targetState>
</extendStateExpression>
Expand Down
Loading