Add a utility for copying files.

Author: brendandburns

examples/src/main/java/io/kubernetes/client/examples/CopyExample.java

@@ -18,9 +18,9 @@
 import io.kubernetes.client.Configuration;
 import io.kubernetes.client.Copy;
 import io.kubernetes.client.util.Config;
-
 import java.io.IOException;
 import java.io.InputStream;
+import java.nio.file.Paths;
 
 /**
  * A simple example of how to use the Java API
@@ -39,8 +39,11 @@ public static void main(String[] args) throws IOException, ApiException, Interru
     Configuration.setDefaultApiClient(client);
 
     Copy copy = new Copy();
-    InputStream dataStream = copy.copyFile(namespace, podName, "/etc/motd");
-
+    InputStream dataStream = copy.copyFileFromPod(namespace, podName, "/etc/motd");
     ByteStreams.copy(dataStream, System.out);
+
+    copy.copyDirectoryFromPod(namespace, podName, null, "/etc", Paths.get("/tmp/etc"));
+
+    System.out.println("Done!");
   }
 }

util/pom.xml

@@ -32,6 +32,11 @@
             <artifactId>commons-codec</artifactId>
             <version>1.11</version>
         </dependency>
+        <dependency>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-compress</artifactId>
+            <version>1.18</version>
+        </dependency>
         <dependency>
             <groupId>org.apache.commons</groupId>
             <artifactId>commons-lang3</artifactId>

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

@@ -14,13 +14,17 @@
 
 import com.google.common.io.ByteStreams;
 import io.kubernetes.client.models.V1Pod;
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
+import java.io.BufferedInputStream;
+import java.io.File;
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
+import java.io.OutputStream;
 import java.nio.file.Path;
-import org.apache.commons.codec.binary.Base64;
+import org.apache.commons.codec.binary.Base64InputStream;
+import org.apache.commons.compress.archivers.ArchiveEntry;
+import org.apache.commons.compress.archivers.ArchiveInputStream;
+import org.apache.commons.compress.archivers.tar.TarArchiveInputStream;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -41,22 +45,22 @@ public Copy(ApiClient apiClient) {
     super(apiClient);
   }
 
-  public InputStream copyFile(String namespace, String pod, String srcPath)
+  public InputStream copyFileFromPod(String namespace, String pod, String srcPath)
       throws ApiException, IOException {
-    return copyFile(namespace, pod, null, srcPath);
+    return copyFileFromPod(namespace, pod, null, srcPath);
   }
 
-  public InputStream copyFile(V1Pod pod, String srcPath) throws ApiException, IOException {
-    return copyFile(pod, null, srcPath);
+  public InputStream copyFileFromPod(V1Pod pod, String srcPath) throws ApiException, IOException {
+    return copyFileFromPod(pod, null, srcPath);
   }
 
-  public InputStream copyFile(V1Pod pod, String container, String srcPath)
+  public InputStream copyFileFromPod(V1Pod pod, String container, String srcPath)
       throws ApiException, IOException {
-    return copyFile(
+    return copyFileFromPod(
         pod.getMetadata().getNamespace(), pod.getMetadata().getName(), container, srcPath);
   }
 
-  public InputStream copyFile(String namespace, String pod, String container, String srcPath)
+  public InputStream copyFileFromPod(String namespace, String pod, String container, String srcPath)
       throws ApiException, IOException {
     Process proc =
         this.exec(
@@ -66,21 +70,85 @@ public InputStream copyFile(String namespace, String pod, String container, Stri
             container,
             false,
             false);
-    try {
-      proc.waitFor();
-    } catch (InterruptedException ex) {
-      log.warn("Interrupted waiting for copy to complete", ex);
+    return new Base64InputStream(proc.getInputStream());
+  }
+
+  public void copyFileFromPod(
+      String namespace, String name, String container, String srcPath, Path destination)
+      throws ApiException, IOException {
+    try (InputStream is = copyFileFromPod(namespace, name, srcPath);
+        FileOutputStream fos = new FileOutputStream(destination.toFile())) {
+      ByteStreams.copy(is, fos);
+      fos.flush();
     }
-    ByteArrayOutputStream bos = new ByteArrayOutputStream();
-    ByteStreams.copy(proc.getInputStream(), bos);
+  }
 
-    return new ByteArrayInputStream(Base64.decodeBase64(bos.toByteArray()));
+  public void copyDirectoryFromPod(V1Pod pod, String srcPath, Path destination)
+      throws ApiException, IOException {
+    copyDirectoryFromPod(pod, null, srcPath, destination);
+  }
+
+  public void copyDirectoryFromPod(V1Pod pod, String container, String srcPath, Path destination)
+      throws ApiException, IOException {
+    copyDirectoryFromPod(
+        pod.getMetadata().getNamespace(),
+        pod.getMetadata().getName(),
+        container,
+        srcPath,
+        destination);
+  }
+
+  public void copyDirectoryFromPod(String namespace, String pod, String srcPath, Path destination)
+      throws ApiException, IOException {
+    copyDirectoryFromPod(namespace, pod, null, srcPath, destination);
+  }
+
+  public void copyDirectoryFromPod(
+      String namespace, String pod, String container, String srcPath, Path destination)
+      throws ApiException, IOException {
+    // TODO: Test that 'tar' is present in the container?
+    final Process proc =
+        this.exec(
+            namespace,
+            pod,
+            new String[] {"sh", "-c", "tar cf - " + srcPath + " | base64"},
+            container,
+            false,
+            false);
+    InputStream is = new Base64InputStream(new BufferedInputStream(proc.getInputStream()));
+    try (ArchiveInputStream archive =
+        new TarArchiveInputStream(is)) { // new GzipCompressorInputStream(is))) {
+      for (ArchiveEntry entry = archive.getNextEntry();
+          entry != null;
+          entry = archive.getNextEntry()) {
+        if (!archive.canReadEntryData(entry)) {
+          log.error("Can't read: " + entry);
+          continue;
+        }
+        File f = new File(destination.toFile(), entry.getName());
+        if (entry.isDirectory()) {
+          if (!f.isDirectory() && !f.mkdirs()) {
+            throw new IOException("create directory failed: " + f);
+          }
+        } else {
+          File parent = f.getParentFile();
+          if (!parent.isDirectory() && !parent.mkdirs()) {
+            throw new IOException("create directory failed: " + parent);
+          }
+          try (OutputStream fs = new FileOutputStream(f)) {
+            System.out.println("Writing: " + f.getCanonicalPath());
+            ByteStreams.copy(archive, fs);
+            fs.flush();
+          }
+        }
+      }
+    }
   }
 
-  public static void copyFile(String namespace, String pod, String srcPath, Path dest)
+  public static void copyFileFromPod(String namespace, String pod, String srcPath, Path dest)
       throws ApiException, IOException {
     Copy c = new Copy();
-    InputStream is = c.copyFile(namespace, pod, null, srcPath);
+    InputStream is = c.copyFileFromPod(namespace, pod, null, srcPath);
     FileOutputStream os = new FileOutputStream(dest.toFile());
     ByteStreams.copy(is, os);
     os.flush();