Merge pull request #1159 from ffazzini/copy-binary-data-to-pod

add overloading method to copy in memory binary data to pod

Author: k8s-ci-robot

util/src/main/java/io/kubernetes/client/Copy.java

@@ -19,6 +19,7 @@
 import io.kubernetes.client.openapi.models.V1Pod;
 import io.kubernetes.client.util.exception.CopyNotSupportedException;
 import java.io.BufferedInputStream;
+import java.io.ByteArrayInputStream;
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.FileOutputStream;
@@ -179,15 +180,7 @@ public void copyFileToPod(
       throws ApiException, IOException {
 
     // Run decoding and extracting processes
-    String parentPath = destPath.getParent() != null ? destPath.getParent().toString() : ".";
-    final Process proc =
-        this.exec(
-            namespace,
-            pod,
-            new String[] {"sh", "-c", "base64 -d | tar -xmf - -C " + parentPath},
-            container,
-            true,
-            false);
+    final Process proc = execCopyToPod(namespace, pod, container, destPath);
 
     // Send encoded archive output stream
     File srcFile = new File(srcPath.toUri());
@@ -205,6 +198,39 @@ public void copyFileToPod(
     }
   }
 
+  public void copyFileToPod(
+      String namespace, String pod, String container, byte[] src, Path destPath)
+      throws ApiException, IOException {
+
+    // Run decoding and extracting processes
+    final Process proc = execCopyToPod(namespace, pod, container, destPath);
+
+    try (ArchiveOutputStream archiveOutputStream =
+        new TarArchiveOutputStream(new Base64OutputStream(proc.getOutputStream(), true, 0, null))) {
+
+      ArchiveEntry tarEntry = new TarArchiveEntry(new File(destPath.getFileName().toString()));
+      ((TarArchiveEntry) tarEntry).setSize(src.length);
+
+      archiveOutputStream.putArchiveEntry(tarEntry);
+      ByteStreams.copy(new ByteArrayInputStream(src), archiveOutputStream);
+      archiveOutputStream.closeArchiveEntry();
+    } finally {
+      proc.destroy();
+    }
+  }
+
+  private Process execCopyToPod(String namespace, String pod, String container, Path destPath)
+      throws ApiException, IOException {
+    String parentPath = destPath.getParent() != null ? destPath.getParent().toString() : ".";
+    return this.exec(
+        namespace,
+        pod,
+        new String[] {"sh", "-c", "base64 -d | tar -xmf - -C " + parentPath},
+        container,
+        true,
+        false);
+  }
+
   private boolean isTarPresentInContainer(String namespace, String pod, String container)
       throws ApiException, IOException {
     final Process proc =

util/src/test/java/io/kubernetes/client/CopyTest.java

@@ -94,7 +94,7 @@ public void run() {
   }
 
   @Test
-  public void testCopyFileToPod() throws IOException, ApiException, InterruptedException {
+  public void testCopyFileToPod() throws IOException, InterruptedException {
 
     File testFile = File.createTempFile("testfile", null);
     testFile.deleteOnExit();
@@ -139,4 +139,50 @@ public void run() {
             .withQueryParam("command", equalTo("-c"))
             .withQueryParam("command", equalTo("base64 -d | tar -xmf - -C /")));
   }
+
+  @Test
+  public void testCopyBinaryDataToPod() throws InterruptedException {
+
+    byte[] testSrc = new byte[0];
+
+    Copy copy = new Copy(client);
+
+    wireMockRule.stubFor(
+        get(urlPathEqualTo("/api/v1/namespaces/" + namespace + "/pods/" + podName + "/exec"))
+            .willReturn(
+                aResponse()
+                    .withStatus(404)
+                    .withHeader("Content-Type", "application/json")
+                    .withBody("{}")));
+
+    // When attempting to write to the process outputstream in copyFileToPod, the
+    // WebSocketStreamHandler is in a wait state because no websocket is created by mock, which
+    // blocks the main thread. So here we execute the method in a thread.
+    Thread t =
+        new Thread(
+            new Runnable() {
+              public void run() {
+                try {
+                  copy.copyFileToPod(
+                      namespace, podName, "", testSrc, Paths.get("/copied-binarydata"));
+                } catch (IOException | ApiException ex) {
+                  ex.printStackTrace();
+                }
+              }
+            });
+    t.start();
+    Thread.sleep(2000);
+    t.interrupt();
+
+    verify(
+        getRequestedFor(
+                urlPathEqualTo("/api/v1/namespaces/" + namespace + "/pods/" + podName + "/exec"))
+            .withQueryParam("stdin", equalTo("true"))
+            .withQueryParam("stdout", equalTo("true"))
+            .withQueryParam("stderr", equalTo("true"))
+            .withQueryParam("tty", equalTo("false"))
+            .withQueryParam("command", equalTo("sh"))
+            .withQueryParam("command", equalTo("-c"))
+            .withQueryParam("command", equalTo("base64 -d | tar -xmf - -C /")));
+  }
 }