Merge branch 'wdt942' into 'main'

working around windows scp upload issue

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

Author: robertpatrick

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

@@ -203,7 +203,6 @@ def __init__(self, model_context, exception_type):
             self._os_helper = SSHUnixCommandLineHelper()
 
         self.path_helper = path_helper.get_path_helper()
-
         self._logger.exiting(class_name=self._class_name, method_name=_method_name)
 
     def is_connected(self):
@@ -251,7 +250,7 @@ def download(self, source_path, target_path):
 
     def upload(self, source_path, target_path):
         _method_name = 'upload'
-        self._logger.entering(target_path, source_path, class_name=self._class_name, method_name=_method_name)
+        self._logger.entering(source_path, target_path, class_name=self._class_name, method_name=_method_name)
 
         if StringUtils.isEmpty(target_path):
             ex = exception_helper.create_exception(self._exception_type, 'WLSDPLY-32018')
@@ -272,9 +271,25 @@ def upload(self, source_path, target_path):
 
         try:
             remote_host = self._ssh_client.getRemoteHostname()
-            self._logger.info('WLSDPLY-32022', abs_source_path, remote_host, abs_target_path,
-                              class_name=self._class_name, method_name=_method_name)
-            self._ssh_client.newSCPFileTransfer().upload(abs_source_path, target_path)
+
+            # By default, sshj newSCPFileTransfer().upload() uses single quotes, which
+            # do not work on Windows.  Have to go another level down to make this works
+            # properly.
+            #
+            if self.is_windows:
+                from net.schmizz.sshj.xfer import FileSystemFile
+                from net.schmizz.sshj.xfer.scp.ScpCommandLine import EscapeMode
+
+                self._logger.info('WLSDPLY-32044', abs_source_path, remote_host, target_path,
+                                  class_name=self._class_name, method_name=_method_name)
+                self._ssh_client.newSCPFileTransfer().newSCPUploadClient().copy(FileSystemFile(abs_source_path),
+                                                                                target_path,
+                                                                                EscapeMode.DoubleQuote)
+            else:
+                self._logger.info('WLSDPLY-32022', abs_source_path, remote_host, abs_target_path,
+                                  class_name=self._class_name, method_name=_method_name)
+                self._ssh_client.newSCPFileTransfer().upload(abs_source_path, target_path)
+
             self._logger.info('WLSDPLY-32023', abs_source_path, remote_host, abs_target_path,
                               class_name=self._class_name, method_name=_method_name)
         except IOException,ioe:

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

@@ -2454,6 +2454,7 @@ WLSDPLY-32041=Skipping SSH initialization since SSH required Java 8 or higher
 WLSDPLY-32042=Failed to get the value of the environment variable {0} with command "{1}" on remote SSH host {2}: {3}
 WLSDPLY-32043=Failed to find the Windows temp directory for user {0} using the environment variable {1} on the remote \
   SSH host {2} because the environment variable {1} was not set
+WLSDPLY-32044=Uploading {0} to remote Windows server {1} path {2} using EscapeMode.DoubleQuote mode
 
 # verify_ssh.py
 WLSDPLY-32900=The -remote_test_file {0} argument was specified without the corresponding -local_output_dir argument.