Merge branch 'fix-dspwd-discovery' into 'main'

fix discover regular datasource password

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

Author: robertpatrick

core/src/main/python/discover.py

@@ -830,7 +830,7 @@ def __fix_discovered_template_datasource(model, model_context, credential_inject
         prefixes = HashSet()
         properties = __get_urls_and_passwords(jdbc_system_resources, filtered_ds_patterns,
                                                                        urls, passwords, prefixes)
-        if _can_generate_rcudb_info(passwords, urls, prefixes):
+        if _can_generate_rcudb_info(model_context, passwords, urls, prefixes):
             __set_rcuinfo_in_model(model, properties, urls.iterator().next(), passwords.iterator().next())
             __remove_discovered_template_datasource(jdbc_system_resources, filtered_ds_patterns, model)
             __fix_rcudbinfo_passwords(model, model_context, credential_injector)
@@ -840,8 +840,9 @@ def __fix_discovered_template_datasource(model, model_context, credential_inject
     __logger.exiting(_class_name, _method_name)
 
 
-def _can_generate_rcudb_info(passwords, urls, prefixes):
-    return passwords.size() == 1 and urls.size() == 1 and prefixes.size() == 1
+def _can_generate_rcudb_info(model_context, passwords, urls, prefixes):
+    return ((passwords.size() == 1 and urls.size() == 1 and prefixes.size() == 1) and
+            model_context.get_model_config().get_discover_rcu_ds_generate_rcudb_info() == 'true')
 
 def __get_urls_and_passwords(jdbc_system_resources, filtered_ds_patterns, urls, passwords, prefixes):
     properties = None

core/src/main/python/wlsdeploy/tool/discover/discoverer.py

@@ -395,12 +395,10 @@ def _get_model_password_value(self, location, model_name, model_value):
     def _get_decrypted_password_and_is_filtered_datasource(self, location, model_value):
         # only do it for templated datasource
         filtered_datasource = self._is_filtered_datasource_location(location)
-        if filtered_datasource:
-            base_dir = self._model_context.get_domain_home()
-            if self._model_context.is_ssh():
-                base_dir = self.download_temporary_dir
-            model_value = self._weblogic_helper.decrypt(model_value, base_dir)
-        return filtered_datasource, model_value
+        base_dir = self._model_context.get_domain_home()
+        if self._model_context.is_ssh():
+            base_dir = self.download_temporary_dir
+        return filtered_datasource, self._weblogic_helper.decrypt(model_value, base_dir)
 
     def _is_filtered_datasource_location(self, location):
         filtered_datasource = False
@@ -413,7 +411,7 @@ def _is_filtered_datasource_location(self, location):
             if filtered_datasource:
                 return True
         return False
-
+    
     def _get_attributes_for_current_location(self, location):
         """
         Change to the mbean folder with the provided name using the current location and return

core/src/main/python/wlsdeploy/util/model_config.py

@@ -32,6 +32,8 @@
 DEPLOY_TIMEOUT_DEFAULT = '180000'
 DISABLE_RCU_DROP_SCHEMA_PROP='disable.rcu.drop.schema'
 DISABLE_RCU_DROP_SCHEMA_DEFAULT='false'
+DISCOVER_RCU_DS_GENERATE_RCUDB_INFO_PROP='discover.rcu.ds.generate_rcudb_info'
+DISCOVER_RCU_DS_GENERATE_RCUDB_INFO_DEFAULT='true'
 ENABLE_CREATE_DOMAIN_PASSWORD_VALIDATION_PROP = 'enable.create.domain.password.validation'
 ENABLE_CREATE_DOMAIN_PASSWORD_VALIDATION_DEFAULT = 'true'
 REDEPLOY_TIMEOUT_PROP = 'redeploy.timeout'
@@ -204,6 +206,13 @@ def get_ssh_private_key_default_file_name(self):
         """
         return self._get_from_dict(SSH_DEFAULT_PRIVATE_KEY_FILE_NAME_PROP, SSH_DEFAULT_PRIVATE_KEY_FILE_NAME_DEFAULT)
 
+    def get_discover_rcu_ds_generate_rcudb_info(self):
+        """
+        Return the default for generate RCUDbInfo if all rcu datasource urls and passwords are the same. Default is true
+        :return: the default for whether generating RCUDbInfo or not
+        """
+        return self._get_from_dict(DISCOVER_RCU_DS_GENERATE_RCUDB_INFO_PROP, DISCOVER_RCU_DS_GENERATE_RCUDB_INFO_DEFAULT)
+
     def use_ssh_compression(self):
         """
         Return whether to use SSH compression.