Merge branch 'fix-secprovider-customfiles-extraction' into 'main'

Fix archive custom files extraction orders

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

Author: robertpatrick

core/src/main/python/create.py

@@ -377,16 +377,12 @@ def main(model_context):
         if archive_file_name:
             domain_path = _get_domain_path(model_context, model_dictionary)
             archive_helper = ArchiveHelper(archive_file_name, domain_path, __logger, ExceptionType.CREATE)
+            if archive_helper:
+                if not os.path.exists(os.path.abspath(domain_path)):
+                    os.mkdir(os.path.abspath(domain_path))
 
-        if archive_helper:
-            domain_parent = model_context.get_domain_parent_dir()
-            domain_home = model_context.get_domain_home()
-            if domain_parent and domain_home is None:
-                domain_home = os.path.join(domain_parent, model_dictionary[model_constants.TOPOLOGY]['Name'])
-            if not os.path.exists(os.path.abspath(domain_home)):
-                os.mkdir(os.path.abspath(domain_home))
-
-            archive_helper.extract_all_database_wallets()
+                archive_helper.extract_all_database_wallets()
+                archive_helper.extract_custom_archive()
 
         has_atp, has_ssl = validate_rcu_args_and_model(model_context, model_dictionary, archive_helper, aliases)
 

core/src/main/python/update.py

@@ -24,6 +24,7 @@
 from wlsdeploy.tool.util import model_context_helper
 from wlsdeploy.tool.util import results_file
 from wlsdeploy.tool.util import wlst_helper
+from wlsdeploy.tool.util.archive_helper import ArchiveHelper
 from wlsdeploy.tool.util.wlst_helper import WlstHelper
 from wlsdeploy.tool.util.rcu_helper import RCUHelper
 from wlsdeploy.util import cla_helper
@@ -294,6 +295,15 @@ def main(model_context):
         model_dictionary = cla_helper.load_model(_program_name, model_context, aliases, "update", __wlst_mode,
                                                  validate_crd_sections=False)
         model = Model(model_dictionary)
+
+        archive_file_name = model_context.get_archive_file_name()
+        if archive_file_name:
+            domain_path = model_context.get_domain_home()
+            archive_helper = ArchiveHelper(archive_file_name, domain_path, __logger, ExceptionType.CREATE)
+            if archive_helper:
+                archive_helper.extract_all_database_wallets()
+                archive_helper.extract_custom_archive()
+
         _exit_code = __update(model, model_context, aliases)
     except DeployException, ex:
         _exit_code = ExitCode.ERROR

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

@@ -469,7 +469,6 @@ def __create_domain(self):
 
         self.library_helper.install_domain_libraries()
         self.library_helper.extract_classpath_libraries()
-        self.library_helper.extract_custom_files()
         self.library_helper.install_domain_scripts()
         self.wlsroles_helper.process_roles()
 

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

@@ -125,7 +125,6 @@ def update(self):
 
         self.library_helper.install_domain_libraries()
         self.library_helper.extract_classpath_libraries()
-        self.library_helper.extract_custom_files()
         self.library_helper.install_domain_scripts()
 
         domain_home = self.model_context.get_domain_home()

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

@@ -85,25 +85,6 @@ def extract_classpath_libraries(self):
                                  class_name=self.__class_name, method_name=_method_name)
         self.logger.exiting(class_name=self.__class_name, method_name=_method_name)
 
-    def extract_custom_files(self):
-        """
-        Extract any custom files in the archive to the domain home.
-        :raises: BundleAwareException of the specified type: if an error occurs
-        """
-        _method_name = 'extract_custom_files'
-
-        self.logger.entering(self.domain_home, class_name=self.__class_name, method_name=_method_name)
-        if self.archive_helper is None:
-            self.logger.info('WLSDPLY-12565', class_name=self.__class_name, method_name=_method_name)
-        else:
-            num_cp_libs = self.archive_helper.extract_custom_archive()
-            if num_cp_libs > 0:
-                self.logger.info('WLSDPLY-12566', num_cp_libs, self.domain_home,
-                                 class_name=self.__class_name, method_name=_method_name)
-            else:
-                self.logger.info('WLSDPLY-12567', self.model_context.get_archive_file_name(),
-                                 class_name=self.__class_name, method_name=_method_name)
-        self.logger.exiting(class_name=self.__class_name, method_name=_method_name)
 
     def install_domain_scripts(self):
         """