Merge branch 'rcu-db-role' into 'main'

Add oracle_database_admin_role to the RCUDbInfo section, and apply in RCU runner

See merge request weblogic-cloud/weblogic-deploy-tooling!1799

Author: robertpatrick

core/src/main/java/oracle/weblogic/deploy/create/RCURunner.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2024, Oracle and/or its affiliates.
+ * Copyright (c) 2017, 2025, Oracle and/or its affiliates.
  * Licensed under the Universal Permissive License v1.0 as shown at https://oss.oracle.com/licenses/upl.
  */
 package oracle.weblogic.deploy.create;
@@ -71,7 +71,6 @@ public class RCURunner {
     private static final String DB_CONNECT_SWITCH = "-connectString";
     private static final String DB_USER_SWITCH = "-dbUser";
     private static final String DB_ROLE_SWITCH = "-dbRole";
-    private static final String ORACLE_DB_ROLE = "SYSDBA";
     private static final String SCHEMA_PREFIX_SWITCH = "-schemaPrefix";
     private static final String COMPONENT_SWITCH = "-component";
     private static final String READ_STDIN_SWITCH = "-f";
@@ -104,14 +103,15 @@ public class RCURunner {
      * @param connectString     the database connect string
      * @param schemaPrefix      the schema prefix
      * @param dbUser            the database administrator user name
+     * @param dbRole            the database administrator role
      * @param componentsList    the list of RCU schemas
      * @param extraRcuArgsMap   any extra RCU arguments map
      * @param sslArgsProperties the SSL-related arguments map
      * @throws CreateException  if a parameter validation error occurs
      */
     public RCURunner(String oracleHome, String javaHome, String databaseType, String oracleDatabaseConnectionType,
-                     String connectString, String schemaPrefix, String dbUser, List<String> componentsList,
-                     PyDictionary extraRcuArgsMap, PyDictionary sslArgsProperties)
+                     String connectString, String schemaPrefix, String dbUser, String dbRole,
+                     List<String> componentsList, PyDictionary extraRcuArgsMap, PyDictionary sslArgsProperties)
         throws CreateException {
 
         this.oracleHome = validateExistingDirectory(oracleHome, "ORACLE_HOME");
@@ -128,7 +128,7 @@ public RCURunner(String oracleHome, String javaHome, String databaseType, String
 
         this.schemaPrefix = validateNonEmptyString(schemaPrefix, "rcu_prefix");
         this.dbUser = validateNonEmptyString(dbUser, "rcu_admin_user");
-        this.dbRole = computeDbRole();
+        this.dbRole = dbRole;
         this.componentsList = validateNonEmptyListOfStrings(componentsList, "rcu_schema_list");
         this.extraRcuArgsMap = extraRcuArgsMap;
         this.sslArgsProperties = sslArgsProperties;
@@ -206,14 +206,6 @@ private boolean isOracleDatabase() {
         return ORACLE_DB_TYPE.equals(this.databaseType) || EBR_DB_TYPE.equals(this.databaseType);
     }
 
-    private String computeDbRole() {
-        String dbRole = null;
-        if (isOracleDatabase() && !this.atpDB) {
-            dbRole = ORACLE_DB_ROLE;
-        }
-        return dbRole;
-    }
-
     private Map<String, String> getRcuDropEnv() {
         Map<String, String> env = new HashMap<>(1);
         env.put("JAVA_HOME", this.javaHome.getAbsolutePath());

core/src/main/python/wlsdeploy/aliases/model_constants.py

@@ -214,6 +214,7 @@
 OPSS_WALLET_PASSPHRASE = 'OPSSWalletPassphrase'
 OPTIONAL_FEATURE = 'OptionalFeature'
 OPTIONAL_FEATURE_DEPLOYMENT = 'OptionalFeatureDeployment'
+ORACLE_DATABASE_ADMIN_ROLE = 'oracle_database_admin_role'
 ORACLE_DATABASE_CONNECTION_TYPE = 'oracle_database_connection_type'
 ORACLE_OID_AUTHENTICATOR = 'OracleInternetDirectoryAuthenticator'
 ORACLE_OUD_AUTHENTICATOR = 'OracleUnifiedDirectoryAuthenticator'

core/src/main/python/wlsdeploy/tool/create/rcudbinfo_helper.py

@@ -1,5 +1,5 @@
 """
-Copyright (c) 2017, 2024, Oracle and/or its affiliates.
+Copyright (c) 2017, 2025, Oracle and/or its affiliates.
 Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 """
 import os
@@ -14,6 +14,7 @@
 from wlsdeploy.aliases import alias_utils
 from wlsdeploy.aliases.model_constants import ATP_DEFAULT_TABLESPACE
 from wlsdeploy.aliases.model_constants import ATP_TEMPORARY_TABLESPACE
+from wlsdeploy.aliases.model_constants import ORACLE_DATABASE_ADMIN_ROLE
 from wlsdeploy.aliases.model_constants import TNS_ENTRY
 # Deprecated in WDT 4.0.0
 from wlsdeploy.aliases.model_constants import DATABASE_TYPE
@@ -95,6 +96,15 @@ def get_rcu_database_type(self):
             rcu_database_type = ORACLE_DB_TYPE
         return rcu_database_type
 
+    def get_oracle_database_admin_role(self):
+        _method_name = 'get_oracle_database_admin_role'
+        oracle_db_admin_role = None
+        if self.is_oracle_database_type() and not self.is_use_atp():
+            oracle_db_admin_role = self._get_dictionary_element_value(ORACLE_DATABASE_ADMIN_ROLE)
+            if oracle_db_admin_role is None:
+                oracle_db_admin_role = "SYSDBA"
+        return oracle_db_admin_role
+
     def get_oracle_database_connection_type(self):
         _method_name = 'get_oracle_database_connection_type'
         oracle_db_conn_type = self._get_dictionary_element_value(ORACLE_DATABASE_CONNECTION_TYPE)

core/src/main/python/wlsdeploy/tool/util/rcu_helper.py

@@ -1,5 +1,5 @@
 """
-Copyright (c) 2017, 2024, Oracle and/or its affiliates.
+Copyright (c) 2017, 2025, Oracle and/or its affiliates.
 Licensed under the Universal Permissive License v1.0 as shown at https://oss.oracle.com/licenses/upl.
 """
 import exceptions
@@ -115,7 +115,7 @@ def check_or_run_rcu(self):
         # ####<Mar 29, 2024 3:19:53 PM> <SEVERE> <FanManager> <configure> <> <attempt to configure
         # ONS in FanManager failed with oracle.ons.NoServersAvailable: Subscription time out>
         #
-        
+
         if self._rcu_db_info.is_use_atp():
             System.setProperty('oracle.jdbc.fanEnabled', 'false')
 
@@ -399,6 +399,7 @@ def __run_rcu(self):
         oracle_home = self._model_context.get_oracle_home()
         java_home = self._model_context.get_java_home()
         rcu_database_type = rcu_db_info.get_rcu_database_type()
+        oracle_database_admin_role = rcu_db_info.get_oracle_database_admin_role()
         oracle_database_connection_type = rcu_db_info.get_oracle_database_connection_type()
         rcu_db_conn_string = rcu_db_info.get_rcu_db_conn_string()
         rcu_prefix = rcu_db_info.get_rcu_prefix()
@@ -430,8 +431,8 @@ def __run_rcu(self):
 
         disable_rcu_drop_schema = self._model_context.get_model_config().get_disable_rcu_drop_schema() == 'true'
         rcu_runner = RCURunner(oracle_home, java_home, rcu_database_type, oracle_database_connection_type,
-                               rcu_db_conn_string, rcu_prefix, rcu_admin_user, rcu_schemas, extra_rcu_args_map,
-                               ssl_conn_properties)
+                               rcu_db_conn_string, rcu_prefix, rcu_admin_user, oracle_database_admin_role,
+                               rcu_schemas, extra_rcu_args_map, ssl_conn_properties)
         rcu_runner.runRcu(rcu_admin_pass, rcu_schema_pass, disable_rcu_drop_schema)
 
         self.__run_post_create_rcu_schemas_script()

core/src/main/resources/oracle/weblogic/deploy/aliases/category_modules/RCUDbInfo.json

@@ -1,5 +1,5 @@
 {
-    "copyright": "Copyright (c) 2019, 2023, Oracle and/or its affiliates.",
+    "copyright": "Copyright (c) 2019, 2025, Oracle and/or its affiliates.",
     "license": "Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl",
     "wlst_type": "RCUDbInfo",
     "folders": {},
@@ -14,6 +14,7 @@
         "javax.net.ssl.trustStore":         [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "javax.net.ssl.trustStore",         "wlst_path": "WP001", "default_value": null,    "wlst_type": "string",  "uses_path_tokens":  "true" } ],
         "javax.net.ssl.trustStoreType":     [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "javax.net.ssl.trustStoreType",     "wlst_path": "WP001", "default_value": null,    "wlst_type": "string" } ],
         "javax.net.ssl.trustStorePassword": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "javax.net.ssl.trustStorePassword", "wlst_path": "WP001", "default_value": null,    "wlst_type": "password", "secret_suffix": "ssltruststore" } ],
+        "oracle_database_admin_role":       [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "oracle_database_admin_role",       "wlst_path": "WP001", "default_value": null,    "wlst_type": "string" } ],
         "oracle_database_connection_type":  [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "oracle_database_connection_type",  "wlst_path": "WP001", "default_value": null,    "wlst_type": "string",  "comment": "New parameter replacing the deprecated databaseType" } ],
         "oracle.net.tns_admin":             [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "oracle.net.tns_admin",             "wlst_path": "WP001", "default_value": null,    "wlst_type": "string",  "uses_path_tokens":  "true"} ],
         "rcu_admin_password":               [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "rcu_admin_password",               "wlst_path": "WP001", "default_value": null,    "wlst_type": "password" } ],