Merge branch 'model-validator-tokens' into 'main'

Resolve tokens before extended validation of attributes

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

Author: robertpatrick

core/src/main/python/wlsdeploy/tool/validate/domain_info_validator.py

@@ -189,12 +189,12 @@ def __validate_wls_credential_mappings_section(self, mappings_dict):
 
         remote_resources_dict = dictionary_utils.get_dictionary_element(mappings_dict, REMOTE_RESOURCE)
         for mapping_name, mapping_dict in remote_resources_dict.iteritems():
-            method = dictionary_utils.get_element(mapping_dict, METHOD)
+            method = self._get_validation_value(mapping_dict, METHOD)
             if method and method not in RESOURCE_METHODS:
                 self._logger.severe('WLSDPLY-05313', method, REMOTE_RESOURCE, mapping_name, METHOD,
                                     ', '.join(RESOURCE_METHODS), class_name=_class_name, method_name=_method_name)
 
-            protocol = dictionary_utils.get_element(mapping_dict, PROTOCOL)
+            protocol = self._get_validation_value(mapping_dict, PROTOCOL)
             if protocol and protocol not in RESOURCE_PROTOCOLS:
                 self._logger.severe('WLSDPLY-05313', protocol, REMOTE_RESOURCE, mapping_name, PROTOCOL,
                                     ', '.join(RESOURCE_PROTOCOLS), class_name=_class_name, method_name=_method_name)
@@ -211,29 +211,29 @@ def __validate_rcu_db_info_section(self, info_dict):
         self._check_deprecated_field(ATP_TEMPORARY_TABLESPACE, info_dict, RCU_DB_INFO, RCU_TEMP_TBLSPACE)
 
         # deprecated DATABASE_TYPE, must be ORACLE, ATP, or SSL if specified
-        old_database_type = dictionary_utils.get_element(info_dict, DATABASE_TYPE)
+        old_database_type = self._get_validation_value(info_dict, DATABASE_TYPE)
         if old_database_type and old_database_type not in DEPRECATED_DB_TYPES:
             self._logger.severe(
                 'WLSDPLY-05302', old_database_type, RCU_DB_INFO, DATABASE_TYPE,
                 ', '.join(DEPRECATED_DB_TYPES), class_name=_class_name, method_name=_method_name)
 
         # RCU_DATABASE_TYPE must be one of allowed types if specified
-        database_type = dictionary_utils.get_element(info_dict, RCU_DATABASE_TYPE)
+        database_type = self._get_validation_value(info_dict, RCU_DATABASE_TYPE)
         if database_type and database_type not in ALL_DB_TYPES:
             self._logger.severe(
                 'WLSDPLY-05302', database_type, RCU_DB_INFO, RCU_DATABASE_TYPE,
                 ', '.join(ALL_DB_TYPES), class_name=_class_name, method_name=_method_name)
 
         # ORACLE_DATABASE_CONNECTION_TYPE must be one of allowed types if specified
-        connection_type = dictionary_utils.get_element(info_dict, ORACLE_DATABASE_CONNECTION_TYPE)
+        connection_type = self._get_validation_value(info_dict, ORACLE_DATABASE_CONNECTION_TYPE)
         if connection_type and connection_type not in ORACLE_DB_CONNECTION_TYPES:
             self._logger.severe(
                 'WLSDPLY-05302', connection_type, RCU_DB_INFO, ORACLE_DATABASE_CONNECTION_TYPE,
                 ', '.join(ORACLE_DB_CONNECTION_TYPES), class_name=_class_name, method_name=_method_name)
 
         # *StoreType must be one of allowed types if specified
         for type_field in [DRIVER_PARAMS_TRUSTSTORETYPE_PROPERTY, DRIVER_PARAMS_KEYSTORETYPE_PROPERTY]:
-            type_value = dictionary_utils.get_element(info_dict, type_field)
+            type_value = self._get_validation_value(info_dict, type_field)
             if type_value and type_value.upper() not in STORE_TYPES:
                 self._logger.severe(
                     'WLSDPLY-05302', type_value, RCU_DB_INFO, type_field,

core/src/main/python/wlsdeploy/tool/validate/model_validator.py

@@ -617,6 +617,25 @@ def _log_context_invalid(self, message, method_name):
             log_method = self._logger.info
         log_method('WLSDPLY-05027', message, class_name=_class_name, method_name=method_name)
 
+    def _get_validation_value(self, model_dict, attribute_name):
+        """
+        Get the derived value of the specified attribute, de-tokenizing as needed.
+        If unresolved tokens remain in the value, None is returned to prevent further checks.
+        Validation has already checked for unresolved variables, depending on validation mode.
+        :param model_dict: the dictionary containing the value to be examined
+        :param attribute_name: the name of the attribute to be examined
+        :return: the value to use for additional validation checks
+        """
+        value = dictionary_utils.get_element(model_dict, attribute_name)
+        if isinstance(value, (str, unicode)) and variables.has_tokens(value):
+            value = variables.substitute_attribute(value, self._variable_properties, self._model_context,
+                                                   attribute_name=attribute_name)
+            if variables.has_tokens(value):
+                # avoid further checks if unresolved tokens remain.
+                # validation has already checked if unresolved tokens are errors.
+                return None
+        return value
+
     ####################################################################################
     #
     # Private methods, private inner classes and static methods only, beyond here please

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

@@ -565,6 +565,18 @@ def substitute_key(text, variables):
 
     return text
 
+def substitute_attribute(text, variables, model_context, attribute_name=None):
+    """
+    Return the de-tokenized value of the specified text.
+    Follow the rules of the configured validation mode.
+    :param text: the text to be evaluated
+    :param variables: the variable map
+    :param model_context: used to determine the validation mode
+    :param attribute_name: the name of the attribute
+    :return: the de-tokenized text value
+    """
+    error_info = {'errorCount': 0}
+    return _substitute(text, variables, model_context, error_info, attribute_name)
 
 def has_variables(text):
     """
@@ -575,6 +587,9 @@ def has_variables(text):
     matches = _property_pattern.findall(text)
     return len(matches) > 0
 
+def has_tokens(text):
+    matches = _unresolved_token_pattern.findall(text)
+    return len(matches) > 0
 
 def get_variable_matches(text):
     """