Skip to content

Commit ed5499b

Browse files
JCS-13594 Make the decriptions and titles consistent in 12c and 14c schema yaml files
- Escape double quotes in descriptions with URLs to fix parsing issue in ORM - Add the change for wls_admin_user to accept underscore (_) in the user name. This was accidentally removed
1 parent 9462be8 commit ed5499b

File tree

2 files changed

+17
-17
lines changed

2 files changed

+17
-17
lines changed

terraform/schema.yaml

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -462,7 +462,7 @@ variables:
462462
type: string
463463
title: "WebLogic Server Admin User Name"
464464
description: "The name of the administrator in the WebLogic Server domain"
465-
pattern: "^[a-zA-Z][a-zA-Z0-9]{7,127}$"
465+
pattern: "^[a-zA-Z][a-zA-Z0-9_]{7,127}$"
466466
minLength: 8
467467
maxLength: 128
468468
required: true
@@ -487,7 +487,7 @@ variables:
487487
type: boolean
488488
default: false
489489
title: "Configure Ports"
490-
description: "Configure the ports for administration server, managed server, and cluster. If not selected, default ports will be used. See <a target="_blank" href="https://docs.oracle.com/en/cloud/paas/weblogic-cloud/user/default-ports.html">Default Ports</a>."
490+
description: "Configure the ports for administration server, managed server, and cluster. If not selected, default ports will be used. See <a target=\"_blank\" href=\"https://docs.oracle.com/en/cloud/paas/weblogic-cloud/user/default-ports.html\">Default Ports</a>."
491491

492492
wls_nm_port:
493493
visible:
@@ -704,7 +704,7 @@ variables:
704704
type: string
705705
required: true
706706
title: "Acknowledge if Existing Network is Validated"
707-
description: "Enter YES to confirm if existing Virtual Cloud Network you selected is validated using the network validation script. See <a target="_blank" href="https://docs.oracle.com/pls/topic/lookup?ctx=en/cloud/paas/weblogic-cloud/user&id=oci_network_validate">Validate Existing Network Setup</a>"
707+
description: "Enter YES to confirm if existing Virtual Cloud Network you selected is validated using the network validation script. See <a target=\"_blank\" href=\"https://docs.oracle.com/pls/topic/lookup?ctx=en/cloud/paas/weblogic-cloud/user&id=oci_network_validate\">Validate Existing Network Setup</a>"
708708
pattern: "^[yY][eE][sS]$"
709709
visible:
710710
and:
@@ -1449,7 +1449,7 @@ variables:
14491449
create_policies:
14501450
type: boolean
14511451
title: "OCI Policies"
1452-
description: "Create policies to read Secrets from Vault and manage Autonomous Transaction Processing Database (if applicable). Deselecting this option is for Advanced users only. Before you deselect the check box, see <a target="_blank" href="https://docs.oracle.com/pls/topic/lookup?ctx=en/cloud/paas/weblogic-cloud&id=WLCUG-GUID-4E2AD7BF-592D-4C2C-AF66-D98CB26379A5">Create Root Policies</a> to create the required groups and relevant policies."
1452+
description: "Create policies to read Secrets from Vault and manage Autonomous Transaction Processing Database (if applicable). Deselecting this option is for Advanced users only. Before you deselect the check box, see <a target=\"_blank\" href=\"https://docs.oracle.com/pls/topic/lookup?ctx=en/cloud/paas/weblogic-cloud&id=WLCUG-GUID-4E2AD7BF-592D-4C2C-AF66-D98CB26379A5\">Create Root Policies</a> to create the required groups and relevant policies."
14531453
required: false
14541454
default: true
14551455

@@ -1487,7 +1487,7 @@ variables:
14871487
- "Database System"
14881488
type: boolean
14891489
title: "Use Database Connection String"
1490-
description: "Use database connection string to create a single instance datasource for JRF schemas. You cannot create an Active GridLink or a Multi Data Source using this database connection string. For the database connection string, see <a target="_blank" href="https://docs.oracle.com/en/cloud/paas/weblogic-cloud/user/create-jrf-enabled-domain.html#GUID-6A39A2A7-EF6C-408E-B5C7-C44089A9B134">Configure Database Parameters</a>."
1490+
description: "Use database connection string to create a single instance datasource for JRF schemas. You cannot create an Active GridLink or a Multi Data Source using this database connection string. For the database connection string, see <a target=\"_blank\" href=\"https://docs.oracle.com/en/cloud/paas/weblogic-cloud/user/create-jrf-enabled-domain.html#GUID-6A39A2A7-EF6C-408E-B5C7-C44089A9B134\">Configure Database Parameters</a>."
14911491
default: false
14921492

14931493
oci_db_connection_string:
@@ -1563,7 +1563,7 @@ variables:
15631563
compartmentId: ${atp_db_secret_compartment_id}
15641564
required: true
15651565
title: "Validated Secret for Autonomous Database Admin Password"
1566-
description: "The secret that contains the administration user password in the ATP database. To create secrets, see <a target="_blank" href="https://docs.oracle.com/en/cloud/paas/weblogic-cloud/user/you-begin-oracle-weblogic-cloud.html#GUID-0517A019-4A89-40ED-A568-DD2193733F8B"> Create Secrets for Passwords</a>."
1566+
description: "The secret that contains the administration user password in the ATP database. To create secrets, see <a target=\"_blank\" href=\"https://docs.oracle.com/en/cloud/paas/weblogic-cloud/user/you-begin-oracle-weblogic-cloud.html#GUID-0517A019-4A89-40ED-A568-DD2193733F8B\"> Create Secrets for Passwords</a>."
15671567

15681568
atp_db_level:
15691569
visible:
@@ -1883,7 +1883,7 @@ variables:
18831883
compartmentId: ${oci_db_secret_compartment_id}
18841884
required: true
18851885
title: "Validated Secret for OCI DB Admin Password"
1886-
description: "The secret that contains the database administration password. To create secrets, see <a target="_blank" href="https://docs.oracle.com/en/cloud/paas/weblogic-cloud/user/you-begin-oracle-weblogic-cloud.html#GUID-0517A019-4A89-40ED-A568-DD2193733F8B"> Create Secrets for Passwords</a>."
1886+
description: "The secret that contains the database administration password. To create secrets, see <a target=\"_blank\" href=\"https://docs.oracle.com/en/cloud/paas/weblogic-cloud/user/you-begin-oracle-weblogic-cloud.html#GUID-0517A019-4A89-40ED-A568-DD2193733F8B\"> Create Secrets for Passwords</a>."
18871887

18881888
db_vcn_lpg_id:
18891889
visible:
@@ -2001,7 +2001,7 @@ variables:
20012001
minLength: 1
20022002
maxLength: 1024
20032003
title: "IDCS Client ID"
2004-
description: "The client ID of a confidential application in Identity Cloud Service that is used to create the necessary artifacts in Identity Cloud Service. This application needs to be configured as client, and has to be granted with access to Identity Cloud Service Admin APIs, with Identity Domain Administrator app role. See <a target="_blank" href="https://docs.oracle.com/en/cloud/paas/weblogic-cloud/user/you-begin-oracle-weblogic-cloud.html#GUID-807D5863-04A3-47A3-8D65-443B859B80FD">Create a Confidential Application</a>."
2004+
description: "The client ID of a confidential application in Identity Cloud Service that is used to create the necessary artifacts in Identity Cloud Service. This application needs to be configured as client, and has to be granted with access to Identity Cloud Service Admin APIs, with Identity Domain Administrator app role. See <a target=\"_blank\" href=\"https://docs.oracle.com/en/cloud/paas/weblogic-cloud/user/you-begin-oracle-weblogic-cloud.html#GUID-807D5863-04A3-47A3-8D65-443B859B80FD\">Create a Confidential Application</a>."
20052005
required: true
20062006

20072007
idcs_secret_compartment_id:
@@ -2026,7 +2026,7 @@ variables:
20262026
minLength: 1
20272027
maxLength: 1024
20282028
title: "Validated Secret for IDCS Client"
2029-
description: "The secret that contains the client secret of the confidential application password in IDCS, which is used to create the necessary artifacts in IDCS. To create secrets, see <a target="_blank" href="https://docs.oracle.com/en/cloud/paas/weblogic-cloud/user/you-begin-oracle-weblogic-cloud.html#GUID-0517A019-4A89-40ED-A568-DD2193733F8B"> Create Secrets for Passwords</a>."
2029+
description: "The secret that contains the client secret of the confidential application password in IDCS, which is used to create the necessary artifacts in IDCS. To create secrets, see <a target=\"_blank\" href=\"https://docs.oracle.com/en/cloud/paas/weblogic-cloud/user/you-begin-oracle-weblogic-cloud.html#GUID-0517A019-4A89-40ED-A568-DD2193733F8B\"> Create Secrets for Passwords</a>."
20302030
required: true
20312031
dependsOn:
20322032
compartmentId: ${idcs_secret_compartment_id}
@@ -2155,7 +2155,7 @@ variables:
21552155
type: boolean
21562156
default: false
21572157
title: "Terms of use"
2158-
description: "I have reviewed and accept the <a target="_blank" href="https://objectstorage.us-phoenix-1.oraclecloud.com/n/axxu7cichsnt/b/terms/o/wlsoci_ee_terms_and_conditions.txt">Oracle terms of use</a>"
2158+
description: "I have reviewed and accept the <a target=\"_blank\" href=\"https://objectstorage.us-phoenix-1.oraclecloud.com/n/axxu7cichsnt/b/terms/o/wlsoci_ee_terms_and_conditions.txt\">Oracle terms of use</a>"
21592159
required: true
21602160

21612161
use_apm_service:

terraform/schema_14110.yaml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -460,7 +460,7 @@ variables:
460460
type: string
461461
title: "WebLogic Server Admin User Name"
462462
description: "The name of the administrator in the WebLogic Server domain"
463-
pattern: "^[a-zA-Z][a-zA-Z0-9]{7,127}$"
463+
pattern: "^[a-zA-Z][a-zA-Z0-9_]{7,127}$"
464464
minLength: 8
465465
maxLength: 128
466466
required: true
@@ -496,7 +496,7 @@ variables:
496496
type: boolean
497497
default: false
498498
title: "Configure Ports"
499-
description: "Configure the ports for administration server, managed server, and cluster. If not selected, default ports will be used. See <a target="_blank" href="https://docs.oracle.com/en/cloud/paas/weblogic-cloud/user/default-ports.html">Default Ports</a>."
499+
description: "Configure the ports for administration server, managed server, and cluster. If not selected, default ports will be used. See <a target=\"_blank\" href=\"https://docs.oracle.com/en/cloud/paas/weblogic-cloud/user/default-ports.html\">Default Ports</a>."
500500

501501
wls_nm_port:
502502
visible:
@@ -713,7 +713,7 @@ variables:
713713
type: string
714714
required: true
715715
title: "Acknowledge if Existing Network is Validated"
716-
description: "Enter YES to confirm if existing Virtual Cloud Network you selected is validated using the network validation script. See <a target="_blank" href="https://docs.oracle.com/pls/topic/lookup?ctx=en/cloud/paas/weblogic-cloud/user&id=oci_network_validate">Validate Existing Network Setup</a>"
716+
description: "Enter YES to confirm if existing Virtual Cloud Network you selected is validated using the network validation script. See <a target=\"_blank\" href=\"https://docs.oracle.com/pls/topic/lookup?ctx=en/cloud/paas/weblogic-cloud/user&id=oci_network_validate\">Validate Existing Network Setup</a>"
717717
pattern: "^[yY][eE][sS]$"
718718
visible:
719719
and:
@@ -1458,7 +1458,7 @@ variables:
14581458
create_policies:
14591459
type: boolean
14601460
title: "OCI Policies"
1461-
description: "Create policies to read Secrets from Vault and manage Autonomous Transaction Processing Database (if applicable). Deselecting this option is for Advanced users only. Before you deselect the check box, see <a target="_blank" href="https://docs.oracle.com/pls/topic/lookup?ctx=en/cloud/paas/weblogic-cloud&id=WLCUG-GUID-4E2AD7BF-592D-4C2C-AF66-D98CB26379A5">Create Root Policies</a> to create the required groups and relevant policies."
1461+
description: "Create policies to read Secrets from Vault and manage Autonomous Transaction Processing Database (if applicable). Deselecting this option is for Advanced users only. Before you deselect the check box, see <a target=\"_blank\" href=\"https://docs.oracle.com/pls/topic/lookup?ctx=en/cloud/paas/weblogic-cloud&id=WLCUG-GUID-4E2AD7BF-592D-4C2C-AF66-D98CB26379A5\">Create Root Policies</a> to create the required groups and relevant policies."
14621462
required: false
14631463
default: true
14641464

@@ -1539,7 +1539,7 @@ variables:
15391539
minLength: 1
15401540
maxLength: 1024
15411541
title: "IDCS Client ID"
1542-
description: "The client ID of a confidential application in Identity Cloud Service that is used to create the necessary artifacts in Identity Cloud Service. This application needs to be configured as client, and has to be granted with access to Identity Cloud Service Admin APIs, with Identity Domain Administrator app role. See <a target="_blank" href="https://docs.oracle.com/en/cloud/paas/weblogic-cloud/user/you-begin-oracle-weblogic-cloud.html#GUID-807D5863-04A3-47A3-8D65-443B859B80FD">Create a Confidential Application</a>."
1542+
description: "The client ID of a confidential application in Identity Cloud Service that is used to create the necessary artifacts in Identity Cloud Service. This application needs to be configured as client, and has to be granted with access to Identity Cloud Service Admin APIs, with Identity Domain Administrator app role. See <a target=\"_blank\" href=\"https://docs.oracle.com/en/cloud/paas/weblogic-cloud/user/you-begin-oracle-weblogic-cloud.html#GUID-807D5863-04A3-47A3-8D65-443B859B80FD\">Create a Confidential Application</a>."
15431543
required: true
15441544

15451545
idcs_secret_compartment_id:
@@ -1564,7 +1564,7 @@ variables:
15641564
minLength: 1
15651565
maxLength: 1024
15661566
title: "Validated Secret for IDCS Client"
1567-
description: "The secret that contains the client secret of the confidential application password in IDCS, which is used to create the necessary artifacts in IDCS. To create secrets, see <a target="_blank" href="https://docs.oracle.com/en/cloud/paas/weblogic-cloud/user/you-begin-oracle-weblogic-cloud.html#GUID-0517A019-4A89-40ED-A568-DD2193733F8B"> Create Secrets for Passwords</a>."
1567+
description: "The secret that contains the client secret of the confidential application password in IDCS, which is used to create the necessary artifacts in IDCS. To create secrets, see <a target=\"_blank\" href=\"https://docs.oracle.com/en/cloud/paas/weblogic-cloud/user/you-begin-oracle-weblogic-cloud.html#GUID-0517A019-4A89-40ED-A568-DD2193733F8B\"> Create Secrets for Passwords</a>."
15681568
required: true
15691569
dependsOn:
15701570
compartmentId: ${idcs_secret_compartment_id}
@@ -1692,7 +1692,7 @@ variables:
16921692
type: boolean
16931693
default: false
16941694
title: "Terms of use"
1695-
description: "I have reviewed and accept the <a target="_blank" href="https://objectstorage.us-phoenix-1.oraclecloud.com/n/axxu7cichsnt/b/terms/o/wlsoci_ee_terms_and_conditions.txt">Oracle terms of use</a>"
1695+
description: "I have reviewed and accept the <a target=\"_blank\" href=\"https://objectstorage.us-phoenix-1.oraclecloud.com/n/axxu7cichsnt/b/terms/o/wlsoci_ee_terms_and_conditions.txt\">Oracle terms of use</a>"
16961696
required: true
16971697

16981698
use_apm_service:

0 commit comments

Comments
 (0)