Merge branch 'issue-1615-discover-rcu-decrypt' into 'main'

Avoid decrypting passwords unless specified, or discovering RCU datasources

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

Author: robertpatrick

core/src/main/python/discover.py

@@ -811,7 +811,7 @@ def __fix_discovered_template_datasource(model, model_context):
         properties = __get_urls_and_passwords(model_context, jdbc_system_resources, filtered_ds_patterns,
                                                                        urls, passwords, prefixes)
         if _can_generate_rcudb_info(passwords, urls, prefixes):
-            __set_rcuinfo_in_model(model, properties,  urls[0], passwords[0])
+            __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,  model_context.is_discover_passwords())
         else:

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

@@ -374,16 +374,17 @@ def _get_model_password_value(self, location, model_name, model_value):
 
                 filtered_datasource, model_value = self._get_decrypted_password_and_is_filtered_datasource(location,
                                                                                             password_encrypted_string)
-                
+
                 if self._model_context.is_encrypt_discovered_passwords() and not filtered_datasource:
                     model_value = encryption_utils.encrypt_one_password(
                         self._model_context.get_encryption_passphrase(), model_value)
+
+            elif self._model_context.is_discover_rcu_datasources():
+                filtered_datasource, model_value = \
+                    self._get_decrypted_password_and_is_filtered_datasource(location, model_value)
+
             else:
-                filtered_datasource, model_value = self._get_decrypted_password_and_is_filtered_datasource(location,
-                                                                                                           model_value)
-                temp_clear_pwd = self._model_context.is_discover_rcu_datasources() and filtered_datasource
-                if not temp_clear_pwd:
-                    model_value = alias_constants.PASSWORD_TOKEN
+                model_value = alias_constants.PASSWORD_TOKEN
 
         else:
             model_value = None