Discover overwrite existing archive and variable files

Author: robertpatrick

core/src/main/python/discover.py

@@ -169,11 +169,20 @@ def __process_archive_filename_arg(argument_map):
     else:
         archive_file_name = argument_map[CommandLineArgUtil.ARCHIVE_FILE_SWITCH]
         archive_dir_name = path_utils.get_parent_directory(archive_file_name)
-        if os.path.exists(archive_dir_name) is False:
+        if not os.path.exists(archive_dir_name):
             ex = exception_helper.create_cla_exception(ExitCode.ARG_VALIDATION_ERROR,
                                                        'WLSDPLY-06026', archive_file_name)
             __logger.throwing(ex, class_name=_class_name, method_name=_method_name)
             raise ex
+
+        # Delete any existing archive file for discoverDomain so that we always start with a fresh zip file.
+        archive_file_obj = FileUtils.getCanonicalFile(archive_file_name)
+        if archive_file_obj.exists() and not archive_file_obj.delete():
+            ex = exception_helper.create_cla_exception(ExitCode.ARG_VALIDATION_ERROR,'WLSDPLY-06047',
+                                                       _program_name, archive_file_name)
+            __logger.throwing(ex, class_name=_class_name, method_name=_method_name)
+            raise ex
+
         try:
             archive_file = WLSDeployArchive(archive_file_name)
         except (IllegalArgumentException, IllegalStateException), ie:
@@ -187,23 +196,27 @@ def __process_archive_filename_arg(argument_map):
 
 def __process_variable_filename_arg(optional_arg_map):
     """
-    If the variable filename argument is present, the required model variable injector json file must exist in
-    the WLSDEPLOY lib directory.
+    Validate the variable filename argument if present.
     :param optional_arg_map: containing the variable file name
-    :raises: CLAException: if this argument is present but the model variable injector json does not exist
+    :raises: CLAException: if this argument is present but fails validation
     """
     _method_name = '__process_variable_filename_arg'
 
     if CommandLineArgUtil.VARIABLE_FILE_SWITCH in optional_arg_map:
-        variable_injector_file_name = optional_arg_map[CommandLineArgUtil.VARIABLE_FILE_SWITCH]
-        try:
-            FileUtils.validateWritableFile(variable_injector_file_name)
-        except IllegalArgumentException, ie:
+        variable_file_name = optional_arg_map[CommandLineArgUtil.VARIABLE_FILE_SWITCH]
+        variable_dir_name = path_utils.get_parent_directory(variable_file_name)
+
+        if not os.path.exists(variable_dir_name):
             ex = exception_helper.create_cla_exception(ExitCode.ARG_VALIDATION_ERROR,
-                                                       'WLSDPLY-06021',
-                                                       optional_arg_map[CommandLineArgUtil.VARIABLE_FILE_SWITCH],
-                                                       variable_injector_file_name,
-                                                       ie.getLocalizedMessage(), error=ie)
+                                                       'WLSDPLY-06048', variable_file_name)
+            __logger.throwing(ex, class_name=_class_name, method_name=_method_name)
+            raise ex
+
+        # Delete any existing variable file for discoverDomain so that we always start with a fresh file.
+        variable_file_obj = FileUtils.getCanonicalFile(variable_file_name)
+        if variable_file_obj.exists() and not variable_file_obj.delete():
+            ex = exception_helper.create_cla_exception(ExitCode.ARG_VALIDATION_ERROR,'WLSDPLY-06049',
+                                                       _program_name, variable_file_name)
             __logger.throwing(ex, class_name=_class_name, method_name=_method_name)
             raise ex
 

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

@@ -57,7 +57,7 @@ def get_parent_directory(path):
     """
     result = path
     if path is not None:
-        result = JFile(path).getParentFile().getCanonicalPath()
+        result = JFile(path).getCanonicalFile().getParentFile().getCanonicalPath()
     return result
 
 

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

@@ -700,8 +700,7 @@ WLSDPLY-06017=Failed to read the WebLogic administrator username input from the
 WLSDPLY-06018=Please enter the WebLogic administrator password
 WLSDPLY-06019=Failed to read the WebLogic administrator password input from the user: {0}
 WLSDPLY-06020=Unable to get the domain name from the connected domain: {0}
-WLSDPLY-06021=The variables file command line argument {0} was used but the model variables injector file \
-  {1} does not exist: {2}
+WLSDPLY-06021=<EMPTY>
 WLSDPLY-06022=Discover domain {0}
 WLSDPLY-06023=No domain name found in the domain configuration
 WLSDPLY-06024=No variable file provided. Model passwords will contain the token '-- FIX ME --'
@@ -735,6 +734,9 @@ WLSDPLY-06045=The -remote parameter was used to update the domain. \
 WLSDPLY-06046=The -remote parameter was used to deploy to the domain. \
   The -archive_file contains paths that will not be updated on the remote system. \
   Please manually extract the files to the remote machine.
+WLSDPLY-06047={0} failed to delete the existing archive file {1}
+WLSDPLY-06048=Target directory for variable file argument {0} does not exist
+WLSDPLY-06049={0} failed to delete the existing variable file {1}
 
 # discoverer.py
 WLSDPLY-06100=Find attributes at location {0}

documentation/4.0/content/release-notes/_index.md

@@ -43,6 +43,9 @@ pre = "<b> </b>"
 - #1599 - Added support for the 12.2.1.4 and 14.1.1 January 2024 PSUs.
 - #1605 - Deprecated the Deploy Applications Tool.  The intention going forward is that users should be able to use
           the Update Domain Tool, which already does everything that the Deploy Applications Tool does and more.
+- #1613 - Added ability to use variable tokens in the SAML 2 data initialization property files that will be replaced
+          during domain creation or update processing.
+- #1614 - Updated Discover Domain Tool to overwrite existing variable and archive files if they already exist. 
 
 #### Bug Fixes
 - #1555 - Fixed issues with creating and discovering `UnixMachine` objects in online mode.