Wdt#350 do not log skipped method (#476)

* Jira#WDT-350-remove-skip-log-message

* Jira#WDT-log-set-attribute

Author: CarolynRountree

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

@@ -841,6 +841,29 @@ def get_model_password_attribute_names(self, location):
 
         return model_attribute_names
 
+    def is_model_password_attribute(self, location, model_name):
+        """
+        Determine if the attribute with the specified model_name is a password attribute.
+        :param location: current location context
+        :param model_name: specified model name to check if password
+        :return: True if the wlst type is password
+        """
+        _method_name = 'is_model_password_attribute'
+
+        is_password = False
+        module_folder = self._alias_entries.get_dictionary_for_location(location, resolve=False)
+
+        if ATTRIBUTES not in module_folder:
+            ex = exception_helper.create_alias_exception('WLSDPLY-08400', location.get_folder_path())
+            self._logger.throwing(ex, class_name=self._class_name, method_name=_method_name)
+            raise ex
+
+        if model_name in module_folder[ATTRIBUTES] and WLST_TYPE in module_folder[ATTRIBUTES][model_name] and \
+                module_folder[ATTRIBUTES][model_name][WLST_TYPE] == PASSWORD:
+            is_password = True
+
+        return is_password
+
     def get_model_uses_path_tokens_attribute_names(self, location):
         """
         Get the list of attribute names that "use path tokens" (i.e., ones whose values are file system paths).

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

@@ -318,6 +318,7 @@
 INSTALL_DIR = 'InstallDir'
 LISTEN_ADDRESS = 'ListenAddress'
 LISTEN_PORT = 'ListenPort'
+MASKED_PASSWORD = '<Masked>'
 MIME_MAPPING_FILE = 'MimeMappingFile'
 NAME = 'Name'
 NOTIFICATION = 'Notification'

core/src/main/python/wlsdeploy/tool/deploy/deployer.py

@@ -206,8 +206,6 @@ def _skip_setting_attribute(self, key, value, wlst_merge_value, restart_attribut
         :return: True if the attribute does not need to be set
         """
         _method_name = '_skip_setting_attribute'
-        self.logger.entering(str(key), str(value), str(wlst_merge_value), str(restart_attribute_names),
-                             class_name=self._class_name, method_name=_method_name)
 
         # Needs implementation. Return true if model key in restart attribute_names,
         # and WLST helper determines that set is required,

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

@@ -487,6 +487,24 @@ def get_model_password_type_attribute_names(self, location):
             raise ex
         return password_attribute_names
 
+    def is_model_password_attribute(self, location, model_name):
+        """
+        Determine if the model attribute at the location is a password type.
+        :param location: current location context
+        :param model_name: attribute model name in alias definitions
+        :return: True if the attribute is a password type
+        """
+        _method_name = 'is_model_password_attribute'
+
+        try:
+            is_password = self.__aliases.is_model_password_attribute(location, model_name)
+        except AliasException, ae:
+            ex = exception_helper.create_exception(self.__exception_type, 'WLSDPLY-19040', model_name,
+                                                   location.get_folder_path(), ae.getLocalizedMessage(), error=ae)
+            self.__logger.throwing(ex, class_name=self.__class_name, method_name=_method_name)
+            raise ex
+        return is_password
+
     def get_model_mbean_set_method_attribute_names_and_types(self, location):
         """
         Get the list of model attribute names and types where the set method requires an MBean.

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

@@ -40,6 +40,7 @@
 from wlsdeploy.aliases.model_constants import LOG_ACTION
 from wlsdeploy.aliases.model_constants import LOG_FILTER
 from wlsdeploy.aliases.model_constants import MACHINE
+from wlsdeploy.aliases.model_constants import MASKED_PASSWORD
 from wlsdeploy.aliases.model_constants import MAX_THREADS_CONSTRAINT
 from wlsdeploy.aliases.model_constants import MIGRATABLE_TARGET
 from wlsdeploy.aliases.model_constants import MIN_THREADS_CONSTRAINT
@@ -660,6 +661,15 @@ def set_attribute(self, location, model_key, model_value, wlst_merge_value=None,
             self.__logger.info('WLSDPLY-20012', model_key, str(model_value),
                                class_name=self._class_name, method_name=_method_name)
         else:
+            if self.__logger.is_finer_enabled():
+                print_model_value = model_value
+                print_wlst_value = wlst_value
+                if self.__alias_helper.is_model_password_attribute(location, model_key):
+                    print_model_value = MASKED_PASSWORD
+                    print_wlst_value = MASKED_PASSWORD
+                self.__logger.finer('WLSDPLY-19211', wlst_param, print_model_value, print_wlst_value,
+                                    location.get_folder_path(), class_name=self._class_name, method_name=_method_name)
+
             self.__wlst_helper.set(wlst_param, wlst_value)
         return
 

core/src/main/resources/oracle/weblogic/deploy/messages/wlsdeploy_rb.properties

@@ -1275,6 +1275,7 @@ WLSDPLY-19036=Failed to determine if the location ({0}) is a security provider:
 WLSDPLY-19037=Failed to decrypt password: {0}
 WLSDPLY-19038=List of attribute names to ignore for all MBeans {0}
 WLSDPLY-19039=Failed to convert the wlst attribute name to the model name at location ({0}) : {1}
+WLSDPLY-19040=Failed to determine if the model attributes {0} is a password for location ({0}): {1}
 
 # wlsdeploy/tool/util/wlst_helper.py
 WLSDPLY-19100=Failed to change to the WLST directory {0}: {1}
@@ -1339,6 +1340,7 @@ WLSDPLY-19207=Unable to locate resource manager {0} for partition {1}
 WLSDPLY-19208=Unable to locate log filter {0} for log at location {1}
 WLSDPLY-19209=Assign {0} {1} to {2} {3}
 WLSDPLY-19210={0} {1} not found in location {2}
+WLSDPLY-19211=Setting attribute {0} with model value {1} to value {2} in location {3}
 
 # wlsdeploy/tool/util/archive_helper.py
 WLSDPLY-19300=Failed to open archive file {0}: {1}