Merge branch 'hotfix/3.5.21'

Author: stmh

Changelog.md

@@ -1,5 +1,10 @@
 # Changelog
 
+## 3.5.21 / 2020-10-11
+
+### Fixed:
+  * Fix regression with `get:file`, `put:file` and `copy-from`
+
 ## 3.5.20 / 2020-10-11
 
 ### New:

src/Command/GetFileCommand.php

@@ -51,12 +51,20 @@ protected function execute(InputInterface $input, OutputInterface $output)
 
         $context = $this->createContext($input, $output);
         $context->set('sourceFile', $file);
-        $context->set('destFile', getcwd());
+        $context->set('destFile', getcwd() . '/' . basename($file));
 
         $context->io()->comment('Get file `' . $file . '` from `' . $this->getHostConfig()['configName']. '`');
 
         $this->getMethods()->runTask('getFile', $this->getHostConfig(), $context);
 
-        return $context->getResult('exitCode', 0);
+        $return_code = $context->getResult('exitCode', 0);
+        if (!$return_code) {
+            $context->io()->success(sprintf(
+                '`%s` copied to `%s`',
+                $file,
+                $context->getResult('targetFile', 'unknown')
+            ));
+        }
+        return $return_code;
     }
 }

src/Command/PutFileCommand.php

@@ -67,5 +67,6 @@ protected function execute(InputInterface $input, OutputInterface $output)
                 $context->getResult('targetFile', 'unknown')
             ));
         }
+        return $return_code;
     }
 }

src/Method/FilesMethod.php

@@ -47,7 +47,9 @@ public function putFile(HostConfig $config, TaskContextInterface $context)
         }
         /** @var ShellProviderInterface $shell */
         $shell = $this->getShell($config, $context);
-        $shell->putFile($source, $config['rootFolder'], $context, true);
+        $target_file_path = $config['rootFolder'] . '/' . basename($source);
+        $shell->putFile($source, $target_file_path, $context, true);
+        $context->setResult('targetFile', $target_file_path);
     }
 
     public function getFile(HostConfig $config, TaskContextInterface $context)
@@ -61,6 +63,7 @@ public function getFile(HostConfig $config, TaskContextInterface $context)
         /** @var ShellProviderInterface $shell */
         $shell = $this->getShell($config, $context);
         $shell->getFile($source, $dest, $context, true);
+        $context->setResult('targetFile', $dest);
     }
 
     public function backup(HostConfig $host_config, TaskContextInterface $context)

src/ShellProvider/KubectlShellProvider.php

@@ -147,7 +147,7 @@ public function getPutFileCommand(string $source, string $dest): array
         $command = $this->getKubeCmd();
         $command[] = 'cp';
         $command[] = trim($source);
-        $command[] = $this->hostConfig['kube']['podForCli'] . ':' . trim($dest) . '/' . basename($source);
+        $command[] = $this->hostConfig['kube']['podForCli'] . ':' . trim($dest);
 
         return $command;
     }
@@ -162,7 +162,7 @@ public function getGetFileCommand(string $source, string $dest): array
         $command = $this->getKubeCmd();
         $command[] = 'cp';
         $command[] = $this->hostConfig['kube']['podForCli'] . ':' . trim($source);
-        $command[] = trim($dest) . '/' . basename($source);
+        $command[] = trim($dest);
 
         return $command;
     }

src/Utilities/Utilities.php

@@ -9,7 +9,7 @@
 class Utilities
 {
 
-    const FALLBACK_VERSION = '3.5.20';
+    const FALLBACK_VERSION = '3.5.21';
     const COMBINED_ARGUMENTS = 'combined';
     const UNNAMED_ARGUMENTS = 'unnamedArguments';