Merge branch 'jira-wdt-897-lax-archive-validation' into 'main'

Avoid lax validation failures when files are missing from archive or no archive is specified

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

Author: robertpatrick

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

@@ -5,6 +5,8 @@
 import os
 import re
 
+from oracle.weblogic.deploy.util import WLSDeployArchive
+
 from wlsdeploy.aliases.model_constants import POLICY
 from wlsdeploy.aliases.model_constants import RESOURCE_ID
 from wlsdeploy.aliases.model_constants import WLS_POLICIES
@@ -99,12 +101,19 @@ def __validate_policy_object_fields_present(self, policy_name, policy_dict):
             pass
         elif isinstance(xacml_document, (str, unicode)) and not string_utils.is_empty(xacml_document):
             # validate xacml_document
-            if self._archive_helper is not None and \
-                    self._archive_helper.is_path_into_archive(xacml_document) and \
-                    not  self._archive_helper.contains_file(xacml_document):
-                self._logger.severe('WLSDPLY-12601', policy_name, XACML_DOCUMENT, xacml_document,
-                                    class_name=self.__class_name, method_name=_method_name)
-                is_valid = False
+            if WLSDeployArchive.isPathIntoArchive(xacml_document) and \
+                    (self._archive_helper is None or not self._archive_helper.contains_file(xacml_document)):
+
+                # log level depends on validate configuration
+                validate_configuration = self._model_context.get_validate_configuration()
+                if validate_configuration.allow_unresolved_archive_references():
+                    log_method = self._logger.info
+                else:
+                    log_method = self._logger.severe
+                    is_valid = False
+
+                log_method('WLSDPLY-12601', policy_name, XACML_DOCUMENT, xacml_document,
+                           class_name=self.__class_name, method_name=_method_name)
         else:
             self._logger.severe('WLSDPLY-12603', policy_name, POLICY, XACML_DOCUMENT,
                                 class_name=self.__class_name, method_name=_method_name)

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

@@ -8,6 +8,7 @@
 from oracle.weblogic.deploy.json import JsonException
 from oracle.weblogic.deploy.json import JsonStreamTranslator
 from oracle.weblogic.deploy.util import FileUtils
+from oracle.weblogic.deploy.util import WLSDeployArchive
 
 from wlsdeploy.aliases.model_constants import APPEND
 from wlsdeploy.aliases.model_constants import EXPRESSION
@@ -110,10 +111,15 @@ def validate_roles(self):
                         self.logger.severe('WLSDPLY-12502', role_name, UPDATE_MODE, role_update_mode,
                                            class_name=self.__class_name, method_name=_method_name)
                 elif not string_utils.is_empty(xacml_document):
-                    if self._archive_helper is not None and \
-                            self._archive_helper.is_path_into_archive(xacml_document) and \
-                            not self._archive_helper.contains_file(xacml_document):
-                        self.logger.severe('WLSDPLY-12503', role_name, xacml_document,
+                    if WLSDeployArchive.isPathIntoArchive(xacml_document) and \
+                            (self._archive_helper is None or not self._archive_helper.contains_file(xacml_document)):
+                        validate_configuration = self._model_context.get_validate_configuration()
+                        if validate_configuration.allow_unresolved_archive_references():
+                            log_method = self.logger.info
+                        else:
+                            log_method = self.logger.severe
+
+                        log_method('WLSDPLY-12503', role_name, xacml_document,
                                    class_name=self.__class_name, method_name=_method_name)
                 else:
                     self.logger.severe('WLSDPLY-12504', role_name, EXPRESSION, XACML_DOCUMENT,

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

@@ -197,12 +197,19 @@ def __validate_store_property(self, store_property, type_property, pwd_property,
             tns_admin = dictionary_utils.get_element(rcu_info_dict, DRIVER_PARAMS_NET_TNS_ADMIN)
             qualified_path = rcudbinfo_helper.get_qualified_store_path(tns_admin, store_value)
             if WLSDeployArchive.isPathIntoArchive(qualified_path):
+                # log level depends on validate configuration
+                validate_configuration = self._model_context.get_validate_configuration()
+                if validate_configuration.allow_unresolved_archive_references():
+                    log_method = self._logger.info
+                else:
+                    log_method = self._logger.severe
+
                 if not self._archive_helper:
-                    self._logger.severe('WLSDPLY-05311', qualified_path, RCU_DB_INFO, store_property,
-                                        class_name=self._class_name, method_name=_method_name)
+                    log_method('WLSDPLY-05311', qualified_path, RCU_DB_INFO, store_property,
+                               class_name=self._class_name, method_name=_method_name)
                 elif not self.__is_path_in_archive_wallet(qualified_path):
-                    self._logger.severe('WLSDPLY-05312', qualified_path, RCU_DB_INFO, store_property,
-                                        class_name=self._class_name, method_name=_method_name)
+                    log_method('WLSDPLY-05312', qualified_path, RCU_DB_INFO, store_property,
+                               class_name=self._class_name, method_name=_method_name)
 
     def __has_tns_path(self, rcu_info_dict):
         """